diff options
871 files changed, 17020 insertions, 24004 deletions
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 9a87e0e3958..60ceb304ee8 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,6 +27,7 @@ jobs: uses: korthout/backport-action@v1.2.0 with: # Config README: https://github.com/korthout/backport-action#backport-action + copy_labels_pattern: 'severity:\ssecurity' pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 59984000652..4f76a0d732c 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -8,6 +8,7 @@ on: - master paths: - 'doc/**' + - 'lib/**' jobs: nixpkgs: diff --git a/doc/builders/images/makediskimage.section.md b/doc/builders/images/makediskimage.section.md index 833a6461e57..c4566e75310 100644 --- a/doc/builders/images/makediskimage.section.md +++ b/doc/builders/images/makediskimage.section.md @@ -101,6 +101,7 @@ in diskSize = "auto"; additionalSpace = "0M"; # Defaults to 512M. copyChannel = false; + memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. } ``` diff --git a/lib/ascii-table.nix b/lib/ascii-table.nix index c564e12bcc6..74989936ea4 100644 --- a/lib/ascii-table.nix +++ b/lib/ascii-table.nix @@ -1,4 +1,7 @@ -{ " " = 32; +{ "\t" = 9; + "\n" = 10; + "\r" = 13; + " " = 32; "!" = 33; "\"" = 34; "#" = 35; diff --git a/lib/default.nix b/lib/default.nix index dc4df957541..7948dbd5a1e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -100,7 +100,7 @@ let escapeShellArg escapeShellArgs isStorePath isStringLike isValidPosixName toShellVar toShellVars - escapeRegex escapeXML replaceChars lowerChars + escapeRegex escapeURL escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion diff --git a/lib/licenses.nix b/lib/licenses.nix index cf8caff2a78..00f469b61a8 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -81,7 +81,6 @@ in mkLicense lset) ({ apsl10 = { spdxId = "APSL-1.0"; fullName = "Apple Public Source License 1.0"; - url = "https://web.archive.org/web/20040701000000*/http://www.opensource.apple.com/apsl/1.0.txt"; }; apsl20 = { diff --git a/lib/options.nix b/lib/options.nix index 20e8fb8d5ed..4780a56fc1c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -110,10 +110,6 @@ rec { /* Creates an Option attribute set for an option that specifies the package a module should use for some purpose. - Type: mkPackageOption :: pkgs -> (string|[string]) -> - { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> - option - The package is specified in the third argument under `default` as a list of strings representing its attribute path in nixpkgs (or another package set). Because of this, you need to pass nixpkgs itself (or a subset) as the first argument. @@ -133,6 +129,8 @@ rec { If you wish to explicitly provide no default, pass `null` as `default`. + Type: mkPackageOption :: pkgs -> (string|[string]) -> { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> option + Example: mkPackageOption pkgs "hello" { } => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; } @@ -157,11 +155,11 @@ rec { # Name for the package, shown in option description name: { - # The attribute path where the default package is located + # The attribute path where the default package is located (may be omitted) default ? name, - # A string or an attribute path to use as an example + # A string or an attribute path to use as an example (may be omitted) example ? null, - # Additional text to include in the option description + # Additional text to include in the option description (may be omitted) extraDescription ? "", }: let diff --git a/lib/strings.nix b/lib/strings.nix index 68d93095066..3c3529c3285 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -4,6 +4,8 @@ let inherit (builtins) length; +asciiTable = import ./ascii-table.nix; + in rec { @@ -327,9 +329,7 @@ rec { => 40 */ - charToInt = let - table = import ./ascii-table.nix; - in c: builtins.getAttr c table; + charToInt = c: builtins.getAttr c asciiTable; /* Escape occurrence of the elements of `list` in `string` by prefixing it with a backslash. @@ -355,6 +355,21 @@ rec { */ escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list); + /* Escape the string so it can be safely placed inside a URL + query. + + Type: escapeURL :: string -> string + + Example: + escapeURL "foo/bar baz" + => "foo%2Fbar%20baz" + */ + escapeURL = let + unreserved = [ "A" "B" "C" "D" "E" "F" "G" "H" "I" "J" "K" "L" "M" "N" "O" "P" "Q" "R" "S" "T" "U" "V" "W" "X" "Y" "Z" "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" "k" "l" "m" "n" "o" "p" "q" "r" "s" "t" "u" "v" "w" "x" "y" "z" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "-" "_" "." "~" ]; + toEscape = builtins.removeAttrs asciiTable unreserved; + in + replaceStrings (builtins.attrNames toEscape) (lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape); + /* Quote string to be used safely within the Bourne shell. Type: escapeShellArg :: string -> string diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 406656dac1a..07d04f5356c 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -347,6 +347,15 @@ runTests { expected = "Hello\\x20World"; }; + testEscapeURL = testAllTrue [ + ("" == strings.escapeURL "") + ("Hello" == strings.escapeURL "Hello") + ("Hello%20World" == strings.escapeURL "Hello World") + ("Hello%2FWorld" == strings.escapeURL "Hello/World") + ("42%25" == strings.escapeURL "42%") + ("%20%3F%26%3D%23%2B%25%21%3C%3E%23%22%7B%7D%7C%5C%5E%5B%5D%60%09%3A%2F%40%24%27%28%29%2A%2C%3B" == strings.escapeURL " ?&=#+%!<>#\"{}|\\^[]`\t:/@$'()*,;") + ]; + testToInt = testAllTrue [ # Naive (123 == toInt "123") diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba2b124807e..0fdd8716f6c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -206,6 +206,12 @@ githubId = 22131756; name = "Aaqa Ishtyaq"; }; + aaronarinder = { + email = "aaronarinder@gmail.com"; + github = "aaronArinder"; + githubId = 26738844; + name = "Aaron Arinder"; + }; aaronjanse = { email = "aaron@ajanse.me"; matrix = "@aaronjanse:matrix.org"; @@ -3601,6 +3607,13 @@ githubId = 62989; name = "Demyan Rogozhin"; }; + dennajort = { + email = "gosselinjb@gmail.com"; + matrix = "@dennajort:matrix.org"; + github = "dennajort"; + githubId = 1536838; + name = "Jean-Baptiste Gosselin"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; @@ -8949,6 +8962,9 @@ github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; + keys = [{ + fingerprint = "62B9 9C26 F046 721E 26B0 04F6 D006 A998 C6AB FDF1"; + }]; }; ma9e = { email = "sean@lfo.team"; @@ -11938,6 +11954,12 @@ githubId = 146413; name = "Tobias Poschwatta"; }; + PowerUser64 = { + email = "blakelysnorth@gmail.com"; + github = "PowerUser64"; + githubId = 24578572; + name = "Blake North"; + }; ppenguin = { name = "Jeroen Versteeg"; email = "hieronymusv@gmail.com"; @@ -12286,6 +12308,12 @@ githubId = 314564; name = "Ryan Lahfa"; }; + ralismark = { + email = "nixpkgs@ralismark.xyz"; + github = "ralismark"; + githubId = 13449732; + name = "Temmie"; + }; raphaelr = { email = "raphael-git@tapesoftware.net"; matrix = "@raphi:tapesoftware.net"; @@ -12883,6 +12911,7 @@ email = "rrbutani+nix@gmail.com"; github = "rrbutani"; githubId = 7833358; + matrix = "@rbutani:matrix.org"; keys = [{ fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; }]; @@ -12978,6 +13007,12 @@ githubId = 12877905; name = "Roman Volosatovs"; }; + rxiao = { + email = "ben.xiao@me.com"; + github = "benxiao"; + githubId = 10908495; + name = "Ran Xiao"; + }; ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; @@ -15970,6 +16005,15 @@ fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; }]; }; + williamvds = { + email = "nixpkgs@williamvds.me"; + github = "williamvds"; + githubId = 26379999; + name = "William Vigolo"; + keys = [{ + fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; + }]; + }; willibutz = { email = "willibutz@posteo.de"; github = "WilliButz"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4f7e26ec58e..60389f9abb2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -19,6 +19,7 @@ fennel,,,,,,misterio77 fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, +haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, @@ -102,6 +103,8 @@ std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, +telescope.nvim,,,,,5.1, +telescope-manix,,,,,, tl,,,,,,mephistophiles vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 714b3efca20..2e07edd61c2 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -135,28 +135,32 @@ let } ''; + prepareManualFromMD = '' + cp -r --no-preserve=all $inputs/* . + + substituteInPlace ./manual.md \ + --replace '@NIXOS_VERSION@' "${version}" + substituteInPlace ./configuration/configuration.md \ + --replace \ + '@MODULE_CHAPTERS@' \ + ${lib.escapeShellArg (lib.concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)} + substituteInPlace ./nixos-options.md \ + --replace \ + '@NIXOS_OPTIONS_JSON@' \ + ${optionsDoc.optionsJSON}/share/doc/nixos/options.json + substituteInPlace ./development/writing-nixos-tests.section.md \ + --replace \ + '@NIXOS_TEST_OPTIONS_JSON@' \ + ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json + ''; + manual-combined = runCommand "nixos-manual-combined" { inputs = lib.sourceFilesBySuffices ./. [ ".xml" ".md" ]; nativeBuildInputs = [ pkgs.nixos-render-docs pkgs.libxml2.bin pkgs.libxslt.bin ]; meta.description = "The NixOS manual as plain docbook XML"; } '' - cp -r --no-preserve=all $inputs/* . - - substituteInPlace ./manual.md \ - --replace '@NIXOS_VERSION@' "${version}" - substituteInPlace ./configuration/configuration.md \ - --replace \ - '@MODULE_CHAPTERS@' \ - ${lib.escapeShellArg (lib.concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)} - substituteInPlace ./nixos-options.md \ - --replace \ - '@NIXOS_OPTIONS_JSON@' \ - ${optionsDoc.optionsJSON}/share/doc/nixos/options.json - substituteInPlace ./development/writing-nixos-tests.section.md \ - --replace \ - '@NIXOS_TEST_OPTIONS_JSON@' \ - ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json + ${prepareManualFromMD} nixos-render-docs -j $NIX_BUILD_CORES manual docbook \ --manpage-urls ${manpageUrls} \ @@ -193,7 +197,14 @@ in rec { # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" - { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { nativeBuildInputs = + if allowDocBook then [ + buildPackages.libxml2.bin + buildPackages.libxslt.bin + ] else [ + buildPackages.nixos-render-docs + ]; + inputs = lib.optionals (! allowDocBook) (lib.sourceFilesBySuffices ./. [ ".md" ]); meta.description = "The NixOS manual in HTML format"; allowedReferences = ["out"]; } @@ -201,23 +212,44 @@ in rec { # Generate the HTML manual. dst=$out/share/doc/nixos mkdir -p $dst - xsltproc \ - ${manualXsltprocOptions} \ - --stringparam id.warnings "1" \ - --nonet --output $dst/ \ - ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ${manual-combined}/manual-combined.xml \ - |& tee xsltproc.out - grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false - rm xsltproc.out - - mkdir -p $dst/images/callouts - cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ cp ${../../../doc/style.css} $dst/style.css cp ${../../../doc/overrides.css} $dst/overrides.css cp -r ${pkgs.documentation-highlighter} $dst/highlightjs + ${if allowDocBook then '' + xsltproc \ + ${manualXsltprocOptions} \ + --stringparam id.warnings "1" \ + --nonet --output $dst/ \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${manual-combined}/manual-combined.xml \ + |& tee xsltproc.out + grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false + rm xsltproc.out + + mkdir -p $dst/images/callouts + cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ + '' else '' + ${prepareManualFromMD} + + # TODO generator is set like this because the docbook/md manual compare workflow will + # trigger if it's different + nixos-render-docs -j $NIX_BUILD_CORES manual html \ + --manpage-urls ${manpageUrls} \ + --revision ${lib.escapeShellArg revision} \ + --generator "DocBook XSL Stylesheets V${docbook_xsl_ns.version}" \ + --stylesheet style.css \ + --stylesheet overrides.css \ + --stylesheet highlightjs/mono-blue.css \ + --script ./highlightjs/highlight.pack.js \ + --script ./highlightjs/loader.js \ + --toc-depth 1 \ + --chunk-toc-depth 1 \ + ./manual.md \ + $dst/index.html + ''} + mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products echo "doc manual $dst" >> $out/nix-support/hydra-build-products diff --git a/nixos/doc/manual/manual.md b/nixos/doc/manual/manual.md index 1972eaeda87..8cb766eeccf 100644 --- a/nixos/doc/manual/manual.md +++ b/nixos/doc/manual/manual.md @@ -47,7 +47,10 @@ development/development.md contributing-to-this-manual.chapter.md ``` -```{=include=} appendix +```{=include=} appendix html:into-file=//options.html nixos-options.md +``` + +```{=include=} appendix html:into-file=//release-notes.html release-notes/release-notes.md ``` diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index f7637ac89d2..3e63ddced61 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -8,6 +8,10 @@ In addition to numerous new and upgraded packages, this release has the followin <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> +- Core version changes: + + - default linux: 5.15 -\> 6.1, all supported kernels available + - Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. - KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed. @@ -105,7 +109,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. -- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100). +- `teleport` has been upgraded from major version 10 to major version 12. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and release notes for versions [11](https://goteleport.com/docs/changelog/#1100) and [12](https://goteleport.com/docs/changelog/#1201). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 11.x version by setting `services.teleport.package = pkgs.teleport_11`. Afterwards, this option can be removed to upgrade to the default version (12). - 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. @@ -138,6 +142,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. +- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround. + ## Other Notable Changes {#sec-release-23.05-notable-changes} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> @@ -170,6 +176,8 @@ In addition to numerous new and upgraded packages, this release has the followin - NixOS now defaults to using nsncd (a non-caching reimplementation in Rust) as NSS lookup dispatcher, instead of the buggy and deprecated glibc-provided nscd. If you need to switch back, set `services.nscd.enableNsncd = false`, but please open an issue in nixpkgs so your issue can be fixed. +- `services.borgmatic` now allows for multiple configurations, placed in `/etc/borgmatic.d/`, you can define them with `services.borgmatic.configurations`. + - The `dnsmasq` service now takes configuration via the `services.dnsmasq.settings` attribute set. The option `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 365fc1f03a5..d641d1289fe 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -154,6 +154,9 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag , # Shell code executed after the VM has finished. postVM ? "" +, # Guest memory size + memSize ? 1024 + , # Copy the contents of the Nix store to the root of the image and # skip further setup. Incompatible with `contents`, # `installBootLoader` and `configFile`. @@ -525,7 +528,7 @@ let format' = format; in let "-drive if=pflash,format=raw,unit=1,file=$efiVars" ] ); - memSize = 1024; + inherit memSize; } '' export PATH=${binPath}:$PATH diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index f9046a485a7..ecbde44971a 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -73,6 +73,9 @@ , # Shell code executed after the VM has finished. postVM ? "" +, # Guest memory size + memSize ? 1024 + , name ? "nixos-disk-image" , # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. @@ -242,6 +245,7 @@ let { QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report" + " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report"; + inherit memSize; preVM = '' PATH=$PATH:${pkgs.qemu_kvm}/bin mkdir $out diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index eb1e41a3d8d..763c2038f6d 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -61,9 +61,9 @@ with lib; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); - qt5 = super.qt5.overrideScope' (self': super': { + qt5 = super.qt5.overrideScope' (const (super': { qtbase = super'.qtbase.override { withGtk3 = false; }; - }); + })); stoken = super.stoken.override { withGTK3 = false; }; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 util-linux = super.util-linux.override { translateManpages = false; }; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d1b16d042d8..c2cca03e433 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -180,7 +180,7 @@ in # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ # firefox - # thunderbird + # tree # ]; # }; diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 2b14d7c7343..49d40ce7513 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -142,6 +142,7 @@ in # convert remainings logs and start eventually atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" '' set -e -u + shopt -s nullglob for logfile in "$LOGPATH"/atop_* do ${atop}/bin/atopconvert "$logfile" "$logfile".new diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix index 73c4acda393..e7cd6ae4bb5 100644 --- a/nixos/modules/services/backup/borgmatic.nix +++ b/nixos/modules/services/backup/borgmatic.nix @@ -5,44 +5,58 @@ with lib; let cfg = config.services.borgmatic; settingsFormat = pkgs.formats.yaml { }; + + cfgType = with types; submodule { + freeformType = settingsFormat.type; + options.location = { + source_directories = mkOption { + type = listOf str; + description = mdDoc '' + List of source directories to backup (required). Globs and + tildes are expanded. + ''; + example = [ "/home" "/etc" "/var/log/syslog*" ]; + }; + repositories = mkOption { + type = listOf str; + description = mdDoc '' + Paths to local or remote repositories (required). Tildes are + expanded. Multiple repositories are backed up to in + sequence. Borg placeholders can be used. See the output of + "borg help placeholders" for details. See ssh_command for + SSH options like identity file or port. If systemd service + is used, then add local repository paths in the systemd + service file to the ReadWritePaths list. + ''; + example = [ + "ssh://user@backupserver/./sourcehostname.borg" + "ssh://user@backupserver/./{fqdn}" + "/var/local/backups/local.borg" + ]; + }; + }; + }; + cfgfile = settingsFormat.generate "config.yaml" cfg.settings; -in { +in +{ options.services.borgmatic = { - enable = mkEnableOption (lib.mdDoc "borgmatic"); + enable = mkEnableOption (mdDoc "borgmatic"); settings = mkOption { - description = lib.mdDoc '' + description = mdDoc '' See https://torsion.org/borgmatic/docs/reference/configuration/ ''; - type = types.submodule { - freeformType = settingsFormat.type; - options.location = { - source_directories = mkOption { - type = types.listOf types.str; - description = lib.mdDoc '' - List of source directories to backup (required). Globs and - tildes are expanded. - ''; - example = [ "/home" "/etc" "/var/log/syslog*" ]; - }; - repositories = mkOption { - type = types.listOf types.str; - description = lib.mdDoc '' - Paths to local or remote repositories (required). Tildes are - expanded. Multiple repositories are backed up to in - sequence. Borg placeholders can be used. See the output of - "borg help placeholders" for details. See ssh_command for - SSH options like identity file or port. If systemd service - is used, then add local repository paths in the systemd - service file to the ReadWritePaths list. - ''; - example = [ - "user@backupserver:sourcehostname.borg" - "user@backupserver:{fqdn}" - ]; - }; - }; - }; + default = null; + type = types.nullOr cfgType; + }; + + configurations = mkOption { + description = mdDoc '' + Set of borgmatic configurations, see https://torsion.org/borgmatic/docs/reference/configuration/ + ''; + default = { }; + type = types.attrsOf cfgType; }; }; @@ -50,9 +64,13 @@ in { environment.systemPackages = [ pkgs.borgmatic ]; - environment.etc."borgmatic/config.yaml".source = cfgfile; + environment.etc = (optionalAttrs (cfg.settings != null) { "borgmatic/config.yaml".source = cfgfile; }) // + mapAttrs' + (name: value: nameValuePair + "borgmatic.d/${name}.yaml" + { source = settingsFormat.generate "${name}.yaml" value; }) + cfg.configurations; systemd.packages = [ pkgs.borgmatic ]; - }; } diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index 3d11728ebfd..55df83362cb 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -149,7 +149,7 @@ in else args+=(--token "$token") fi - ${cfg.package}/bin/config.sh "''${args[@]}" + ${cfg.package}/bin/Runner.Listener configure "''${args[@]}" # Move the automatically created _diag dir to the logs dir mkdir -p "$STATE_DIRECTORY/_diag" cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index a5fea3da484..a8006547fc6 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -288,11 +288,11 @@ in LimitNOFILE = 65535; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; LoadCredential = cfg.loadCredential; - ExecStartPre = '' + ExecStartPre = ['' ${pkgs.envsubst}/bin/envsubst \ -i ${configurationYaml} \ -o /run/dendrite/dendrite.yaml - ''; + '']; ExecStart = lib.strings.concatStringsSep " " ([ "${pkgs.dendrite}/bin/dendrite-monolith-server" "--config /run/dendrite/dendrite.yaml" diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 14bf6aebb68..014c5b16097 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.gitea; opt = options.services.gitea; - gitea = cfg.package; + exe = lib.getExe cfg.package; pg = config.services.postgresql; useMysql = cfg.database.type == "mysql"; usePostgresql = cfg.database.type == "postgres"; @@ -248,7 +248,7 @@ in staticRootPath = mkOption { type = types.either types.str types.path; - default = gitea.data; + default = cfg.package.data; defaultText = literalExpression "package.data"; example = "/var/lib/gitea/data"; description = lib.mdDoc "Upper level of template and static files path."; @@ -481,14 +481,14 @@ in # If we have a folder or symlink with gitea locales, remove it # And symlink the current gitea locales in place - "L+ '${cfg.stateDir}/conf/locale' - - - - ${gitea.out}/locale" + "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale" ]; systemd.services.gitea = { description = "gitea"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ gitea pkgs.git pkgs.gnupg ]; + path = [ cfg.package pkgs.git pkgs.gnupg ]; # In older versions the secret naming for JWT was kind of confusing. # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET @@ -512,7 +512,7 @@ in cp -f ${configFile} ${runConfig} if [ ! -s ${secretKey} ]; then - ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} + ${exe} generate secret SECRET_KEY > ${secretKey} fi # Migrate LFS_JWT_SECRET filename @@ -521,15 +521,15 @@ in fi if [ ! -s ${oauth2JwtSecret} ]; then - ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret} + ${exe} generate secret JWT_SECRET > ${oauth2JwtSecret} fi if [ ! -s ${lfsJwtSecret} ]; then - ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret} + ${exe} generate secret LFS_JWT_SECRET > ${lfsJwtSecret} fi if [ ! -s ${internalToken} ]; then - ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken} + ${exe} generate secret INTERNAL_TOKEN > ${internalToken} fi chmod u+w '${runConfig}' @@ -548,15 +548,15 @@ in ''} # run migrations/init the database - ${gitea}/bin/gitea migrate + ${exe} migrate # update all hooks' binary paths - ${gitea}/bin/gitea admin regenerate hooks + ${exe} admin regenerate hooks # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - ${gitea}/bin/gitea admin regenerate keys + ${exe} admin regenerate keys fi ''; @@ -565,7 +565,7 @@ in User = cfg.user; Group = "gitea"; WorkingDirectory = cfg.stateDir; - ExecStart = "${gitea}/bin/gitea web --pid /run/gitea/gitea.pid"; + ExecStart = "${exe} web --pid /run/gitea/gitea.pid"; Restart = "always"; # Runtime directory and mode RuntimeDirectory = "gitea"; @@ -597,7 +597,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @setuid @swap"; + SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap"; }; environment = { @@ -635,7 +635,7 @@ in systemd.services.gitea-dump = mkIf cfg.dump.enable { description = "gitea dump"; after = [ "gitea.service" ]; - path = [ gitea ]; + path = [ cfg.package ]; environment = { USER = cfg.user; @@ -646,7 +646,7 @@ in serviceConfig = { Type = "oneshot"; User = cfg.user; - ExecStart = "${gitea}/bin/gitea dump --type ${cfg.dump.type}" + optionalString (cfg.dump.file != null) " --file ${cfg.dump.file}"; + ExecStart = "${exe} dump --type ${cfg.dump.type}" + optionalString (cfg.dump.file != null) " --file ${cfg.dump.file}"; WorkingDirectory = cfg.dump.backupDir; }; }; @@ -658,5 +658,5 @@ in timerConfig.OnCalendar = cfg.dump.interval; }; }; - meta.maintainers = with lib.maintainers; [ srhb ma27 ]; + meta.maintainers = with lib.maintainers; [ srhb ma27 thehedgeh0g ]; } diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 667f16d98f8..4199e771330 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -6,6 +6,7 @@ let pkg = cfg.package; defaultUser = "paperless"; + nltkDir = "/var/cache/paperless/nltk"; # Don't start a redis instance if the user sets a custom redis connection enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig; @@ -15,6 +16,7 @@ let PAPERLESS_DATA_DIR = cfg.dataDir; PAPERLESS_MEDIA_ROOT = cfg.mediaDir; PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; + PAPERLESS_NLTK_DIR = nltkDir; GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; } // optionalAttrs (config.time.timeZone != null) { PAPERLESS_TIME_ZONE = config.time.timeZone; @@ -24,12 +26,14 @@ let lib.mapAttrs (_: toString) cfg.extraConfig ); - manage = let - setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); - in pkgs.writeShellScript "manage" '' - ${setupEnv} - exec ${pkg}/bin/paperless-ngx "$@" - ''; + manage = + let + setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); + in + pkgs.writeShellScript "manage" '' + ${setupEnv} + exec ${pkg}/bin/paperless-ngx "$@" + ''; # Secure the services defaultServiceConfig = { @@ -47,6 +51,7 @@ let cfg.dataDir cfg.mediaDir ]; + CacheDirectory = "paperless"; CapabilityBoundingSet = ""; # ProtectClock adds DeviceAllow=char-rtc r DeviceAllow = ""; @@ -170,7 +175,7 @@ in extraConfig = mkOption { type = types.attrs; - default = {}; + default = { }; description = lib.mdDoc '' Extra paperless config options. @@ -291,6 +296,33 @@ in }; }; + # Download NLTK corpus data + systemd.services.paperless-download-nltk-data = { + wantedBy = [ "paperless-scheduler.service" ]; + before = [ "paperless-scheduler.service" ]; + after = [ "network-online.target" ]; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + Type = "oneshot"; + # Enable internet access + PrivateNetwork = false; + # Restrict write access + BindPaths = []; + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/ssl/certs" + "-/etc/static/ssl/certs" + "-/etc/hosts" + "-/etc/localtime" + ]; + ExecStart = let pythonWithNltk = pkg.python.withPackages (ps: [ ps.nltk ]); in '' + ${pythonWithNltk}/bin/python -m nltk.downloader -d '${nltkDir}' punkt snowball_data stopwords + ''; + }; + }; + systemd.services.paperless-consumer = { description = "Paperless document consumer"; # Bind to `paperless-scheduler` so that the consumer never runs diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 4e332d489e4..ac02a93836b 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -269,6 +269,10 @@ in assertion = cfg.filterForward -> config.networking.nftables.enable; message = "filterForward only works with the nftables based firewall"; } + { + assertion = cfg.autoLoadConntrackHelpers -> lib.versionOlder config.boot.kernelPackages.kernel.version "6"; + message = "conntrack helper autoloading has been removed from kernel 6.0 and newer"; + } ]; networking.firewall.trustedInterfaces = [ "lo" ]; diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index bd13e8c9929..faff1dca89b 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -28,6 +28,32 @@ in <https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F>. ''; }; + + networking.nftables.checkRuleset = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Run `nft check` on the ruleset to spot syntax errors during build. + Because this is executed in a sandbox, the check might fail if it requires + access to any environmental factors or paths outside the Nix store. + To circumvent this, the ruleset file can be edited using the preCheckRuleset + option to work in the sandbox environment. + ''; + }; + + networking.nftables.preCheckRuleset = mkOption { + type = types.lines; + default = ""; + example = lib.literalExpression '' + sed 's/skgid meadow/skgid nogroup/g' -i ruleset.conf + ''; + description = lib.mdDoc '' + This script gets run before the ruleset is checked. It can be used to + create additional files needed for the ruleset check to work, or modify + the ruleset for cases the build environment cannot cover. + ''; + }; + networking.nftables.ruleset = mkOption { type = types.lines; default = ""; @@ -105,13 +131,24 @@ in wantedBy = [ "multi-user.target" ]; reloadIfChanged = true; serviceConfig = let - rulesScript = pkgs.writeScript "nftables-rules" '' - #! ${pkgs.nftables}/bin/nft -f - flush ruleset - ${if cfg.rulesetFile != null then '' - include "${cfg.rulesetFile}" - '' else cfg.ruleset} - ''; + rulesScript = pkgs.writeTextFile { + name = "nftables-rules"; + executable = true; + text = '' + #! ${pkgs.nftables}/bin/nft -f + flush ruleset + ${if cfg.rulesetFile != null then '' + include "${cfg.rulesetFile}" + '' else cfg.ruleset} + ''; + checkPhase = lib.optionalString cfg.checkRuleset '' + cp $out ruleset.conf + ${cfg.preCheckRuleset} + export NIX_REDIRECTS=/etc/protocols=${pkgs.buildPackages.iana-etc}/etc/protocols:/etc/services=${pkgs.buildPackages.iana-etc}/etc/services + LD_PRELOAD="${pkgs.buildPackages.libredirect}/lib/libredirect.so ${pkgs.buildPackages.lklWithFirewall.lib}/lib/liblkl-hijack.so" \ + ${pkgs.buildPackages.nftables}/bin/nft --check --file ruleset.conf + ''; + }; in { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/networking/teleport.nix b/nixos/modules/services/networking/teleport.nix index 6433554f87d..399af711c0e 100644 --- a/nixos/modules/services/networking/teleport.nix +++ b/nixos/modules/services/networking/teleport.nix @@ -11,6 +11,14 @@ in services.teleport = with lib.types; { enable = mkEnableOption (lib.mdDoc "the Teleport service"); + package = mkOption { + type = types.package; + default = pkgs.teleport; + defaultText = lib.literalMD "pkgs.teleport"; + example = lib.literalMD "pkgs.teleport_11"; + description = lib.mdDoc "The teleport package to use"; + }; + settings = mkOption { type = settingsYaml.type; default = { }; @@ -74,14 +82,14 @@ in }; config = mkIf config.services.teleport.enable { - environment.systemPackages = [ pkgs.teleport ]; + environment.systemPackages = [ cfg.package ]; systemd.services.teleport = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { ExecStart = '' - ${pkgs.teleport}/bin/teleport start \ + ${cfg.package}/bin/teleport start \ ${optionalString cfg.insecure.enable "--insecure"} \ ${optionalString cfg.diag.enable "--diag-addr=${cfg.diag.addr}:${toString cfg.diag.port}"} \ ${optionalString (cfg.settings != { }) "--config=${settingsYaml.generate "teleport.yaml" cfg.settings}"} diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index b08f1015e8b..8b025228cc1 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -461,7 +461,7 @@ let ${ipPreMove} link add dev "${name}" type wireguard ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''} - ${optionalString (values.mtu != null) ''${ipPreMove} link set "${name}" mtu ${toString values.mtu}''} + ${optionalString (values.mtu != null) ''${ipPostMove} link set "${name}" mtu ${toString values.mtu}''} ${concatMapStringsSep "\n" (ip: ''${ipPostMove} address add "${ip}" dev "${name}"'' diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index 5419940a68d..83dd1a8b35f 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -318,8 +318,8 @@ to make packages available in the chroot. {option}`services.systemd.akkoma.serviceConfig.BindPaths` and {option}`services.systemd.akkoma.serviceConfig.BindReadOnlyPaths` permit access to outside paths through bind mounts. Refer to -[{manpage}`systemd.exec(5)`](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#BindPaths=) -for details. +[`BindPaths=`](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#BindPaths=) +of {manpage}`systemd.exec(5)` for details. ### Distributed deployment {#modules-services-akkoma-distributed-deployment} diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index f262099354d..a9df391128e 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -5,7 +5,7 @@ let package = pkgs.dolibarr.override { inherit (cfg) stateDir; }; cfg = config.services.dolibarr; - vhostCfg = lib.optionalAttr (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}"; + vhostCfg = lib.optionalAttrs (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}"; mkConfigFile = filename: settings: let diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 7791a98965d..4d0296c8254 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -169,6 +169,9 @@ in }; services.udev.packages = [ pkgs.pantheon.gnome-settings-daemon + # Force enable KMS modifiers for devices that require them. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 + pkgs.pantheon.mutter ]; systemd.packages = [ pkgs.pantheon.gnome-settings-daemon diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 188f2f64dc8..d1ce3d13ee8 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1948,7 +1948,7 @@ in Extra command-line arguments to pass to systemd-networkd-wait-online. These also affect per-interface `systemd-network-wait-online@` services. - See [{manpage}`systemd-networkd-wait-online.service(8)`](https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html) for all available options. + See {manpage}`systemd-networkd-wait-online.service(8)` for all available options. ''; type = with types; listOf str; default = []; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 06210529eb8..c98916f60fa 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -108,9 +108,9 @@ let set -e - NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}") + NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" - if ! test -e "$NIX_DISK_IMAGE"; then + if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \ ${toString config.virtualisation.diskSize}M fi @@ -346,7 +346,7 @@ in virtualisation.diskImage = mkOption { - type = types.str; + type = types.nullOr types.str; default = "./${config.system.name}.qcow2"; defaultText = literalExpression ''"./''${config.system.name}.qcow2"''; description = @@ -354,6 +354,9 @@ in Path to the disk image containing the root filesystem. The image will be created on startup if it does not exist. + + If null, a tmpfs will be used as the root filesystem and + the VM's state will not be persistent. ''; }; @@ -990,12 +993,12 @@ in ]; virtualisation.qemu.drives = mkMerge [ - [{ + (mkIf (cfg.diskImage != null) [{ name = "root"; file = ''"$NIX_DISK_IMAGE"''; driveExtraOpts.cache = "writeback"; driveExtraOpts.werror = "report"; - }] + }]) (mkIf cfg.useNixStoreImage [{ name = "nix-store"; file = ''"$TMPDIR"/store.img''; @@ -1018,20 +1021,21 @@ in }) cfg.emptyDiskImages) ]; + fileSystems = mkVMOverride cfg.fileSystems; + # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to # allow this module to be applied to "normal" NixOS system # configuration, where the regular value for the `fileSystems' # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). - fileSystems = - let + virtualisation.fileSystems = let mkSharedDir = tag: share: { name = if tag == "nix-store" && cfg.writableStore - then "/nix/.ro-store" - else share.target; + then "/nix/.ro-store" + else share.target; value.device = tag; value.fsType = "9p"; value.neededForBoot = true; @@ -1039,44 +1043,42 @@ in [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" ] ++ lib.optional (tag == "nix-store") "cache=loose"; }; - in - mkVMOverride (cfg.fileSystems // - optionalAttrs cfg.useDefaultFilesystems { - "/".device = cfg.bootDevice; - "/".fsType = "ext4"; - "/".autoFormat = true; - } // - optionalAttrs config.boot.tmpOnTmpfs { - "/tmp" = { + in lib.mkMerge [ + (lib.mapAttrs' mkSharedDir cfg.sharedDirectories) + { + "/" = lib.mkIf cfg.useDefaultFilesystems (if cfg.diskImage == null then { + device = "tmpfs"; + fsType = "tmpfs"; + } else { + device = cfg.bootDevice; + fsType = "ext4"; + autoFormat = true; + }); + "/tmp" = lib.mkIf config.boot.tmpOnTmpfs { device = "tmpfs"; fsType = "tmpfs"; neededForBoot = true; # Sync with systemd's tmp.mount; options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ]; }; - } // - optionalAttrs cfg.useNixStoreImage { - "/nix/${if cfg.writableStore then ".ro-store" else "store"}" = { + "/nix/${if cfg.writableStore then ".ro-store" else "store"}" = lib.mkIf cfg.useNixStoreImage { device = "${lookupDriveDeviceName "nix-store" cfg.qemu.drives}"; neededForBoot = true; options = [ "ro" ]; }; - } // - optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) { - "/nix/.rw-store" = { + "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { fsType = "tmpfs"; options = [ "mode=0755" ]; neededForBoot = true; }; - } // - optionalAttrs cfg.useBootLoader { # see note [Disk layout with `useBootLoader`] - "/boot" = { + "/boot" = lib.mkIf cfg.useBootLoader { device = "${lookupDriveDeviceName "boot" cfg.qemu.drives}2"; # 2 for e.g. `vdb2`, as created in `bootDisk` fsType = "vfat"; noCheck = true; # fsck fails on a r/o filesystem }; - } // lib.mapAttrs' mkSharedDir cfg.sharedDirectories); + } + ]; boot.initrd.systemd = lib.mkIf (config.boot.initrd.systemd.enable && cfg.writableStore) { mounts = [{ diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index bb42e6de069..0da217fd1cb 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -81,7 +81,7 @@ in { extraDisk = mkOption { description = lib.mdDoc '' Optional extra disk/hdd configuration. - The disk will be an 'ext4' partition on a separate VMDK file. + The disk will be an 'ext4' partition on a separate file. ''; default = null; example = { @@ -183,8 +183,8 @@ in { export HOME=$PWD export PATH=${pkgs.virtualbox}/bin:$PATH - echo "creating VirtualBox pass-through disk wrapper (no copying involved)..." - VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage + echo "converting image to VirtualBox format..." + VBoxManage convertfromraw $diskImage disk.vdi ${optionalString (cfg.extraDisk != null) '' echo "creating extra disk: data-disk.raw" @@ -196,8 +196,8 @@ in { mkpart primary ext4 1MiB -1 eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K - echo "creating extra disk: data-disk.vmdk" - VBoxManage internalcommands createrawvmdk -filename data-disk.vmdk -rawdisk $dataDiskImage + echo "creating extra disk: data-disk.vdi" + VBoxManage convertfromraw $dataDiskImage data-disk.vdi ''} echo "creating VirtualBox VM..." @@ -209,10 +209,10 @@ in { ${lib.cli.toGNUCommandLineShell { } cfg.params} VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ - --medium disk.vmdk + --medium disk.vdi ${optionalString (cfg.extraDisk != null) '' VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ - --medium data-disk.vmdk + --medium data-disk.vdi ''} echo "exporting VirtualBox VM..." diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9652be5d85b..125086294d4 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -100,7 +100,6 @@ in rec { (onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.mutableUsers") - (onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.standalone") (onFullSupported "nixos.tests.networking.scripted.bond") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 05ff9ca2499..7be300bbcf3 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -118,7 +118,6 @@ in rec { "nixos.tests.ipv6" "nixos.tests.login" "nixos.tests.misc" - "nixos.tests.nat.firewall-conntrack" "nixos.tests.nat.firewall" "nixos.tests.nat.standalone" "nixos.tests.nfs3.simple" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 785a5621f57..07adf3dbeba 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -243,6 +243,7 @@ in { ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; + github-runner = handleTest ./github-runner.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; @@ -433,10 +434,8 @@ in { nagios = handleTest ./nagios.nix {}; nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; - nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nat.nftables.firewall = handleTest ./nat.nix { withFirewall = true; nftables = true; }; - nat.nftables.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; nftables = true; }; nat.nftables.standalone = handleTest ./nat.nix { withFirewall = false; nftables = true; }; nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; diff --git a/nixos/tests/atuin.nix b/nixos/tests/atuin.nix index 85213d1e53e..2bc5494f555 100644 --- a/nixos/tests/atuin.nix +++ b/nixos/tests/atuin.nix @@ -54,7 +54,7 @@ with lib; client.execute("echo 'sync_address = \"http://server:${toString testPort}\"' > ~/.config/atuin/config.toml") # log in to atuin server on client node - client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k {key}") + client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k \"{key}\"") # pull records from atuin server client.succeed("${atuin}/bin/atuin sync -f") diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix index 043263ec05d..77d6a7ab8be 100644 --- a/nixos/tests/clickhouse.nix +++ b/nixos/tests/clickhouse.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "clickhouse"; - meta.maintainers = with pkgs.lib.maintainers; [ ma27 ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes.machine = { services.clickhouse.enable = true; diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index d856ecca9a1..a8b5567c207 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem, config ? {}, - giteaPackage, + giteaPackage ? pkgs.gitea, pkgs ? import ../.. { inherit system config; } }: @@ -8,6 +8,21 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let + ## gpg --faked-system-time='20230301T010000!' --quick-generate-key snakeoil ed25519 sign + signingPrivateKey = '' + -----BEGIN PGP PRIVATE KEY BLOCK----- + + lFgEY/6jkBYJKwYBBAHaRw8BAQdADXiZRV8RJUyC9g0LH04wLMaJL9WTc+szbMi7 + 5fw4yP8AAQCl8EwGfzSLm/P6fCBfA3I9znFb3MEHGCCJhJ6VtKYyRw7ktAhzbmFr + ZW9pbIiUBBMWCgA8FiEE+wUM6VW/NLtAdSixTWQt6LZ4x50FAmP+o5ACGwMFCQPC + ZwAECwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEE1kLei2eMedFTgBAKQs1oGFZrCI + TZP42hmBTKxGAI1wg7VSdDEWTZxut/2JAQDGgo2sa4VHMfj0aqYGxrIwfP2B7JHO + GCqGCRf9O/hzBA== + =9Uy3 + -----END PGP PRIVATE KEY BLOCK----- + ''; + signingPrivateKeyId = "4D642DE8B678C79D"; + supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { name = "${giteaPackage.pname}-${type}"; @@ -21,8 +36,9 @@ let database = { inherit type; }; package = giteaPackage; settings.service.DISABLE_REGISTRATION = true; + settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; }; - environment.systemPackages = [ giteaPackage pkgs.jq ]; + environment.systemPackages = [ giteaPackage pkgs.gnupg pkgs.jq ]; services.openssh.enable = true; }; client1 = { config, pkgs, ... }: { @@ -59,6 +75,13 @@ let server.succeed("curl --fail http://localhost:3000/") server.succeed( + "su -l gitea -c 'gpg --homedir /var/lib/gitea/data/home/.gnupg " + + "--import ${toString (pkgs.writeText "gitea.key" signingPrivateKey)}'" + ) + + assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg") + + server.succeed( "curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. " + "Please contact your site administrator.'" ) diff --git a/nixos/tests/github-runner.nix b/nixos/tests/github-runner.nix new file mode 100644 index 00000000000..033365d6925 --- /dev/null +++ b/nixos/tests/github-runner.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "github-runner"; + meta = with pkgs.lib.maintainers; { + maintainers = [ veehaitch ]; + }; + nodes.machine = { pkgs, ... }: { + services.github-runners.test = { + enable = true; + url = "https://github.com/yaxitech"; + tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; + }; + + systemd.services.dummy-github-com = { + wantedBy = [ "multi-user.target" ]; + before = [ "github-runner-test.service" ]; + script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect"; + }; + networking.hosts."127.0.0.1" = [ "api.github.com" ]; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("dummy-github-com") + + try: + machine.wait_for_unit("github-runner-test") + except Exception: + pass + + out = machine.succeed("journalctl -u github-runner-test") + assert "Self-hosted runner registration" in out, "did not read runner registration header" + + machine.wait_until_succeeds("test -f /tmp/registration-connect") + ''; +}) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 912a04deae8..0b617cea777 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -3,7 +3,7 @@ # client on the inside network, a server on the outside network, and a # router connected to both that performs Network Address Translation # for the client. -import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nftables ? false, ... }: +import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... }: let unit = if nftables then "nftables" else (if withFirewall then "firewall" else "nat"); @@ -16,16 +16,11 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? networking.nat.internalIPs = [ "192.168.1.0/24" ]; networking.nat.externalInterface = "eth1"; } - (lib.optionalAttrs withConntrackHelpers { - networking.firewall.connectionTrackingModules = [ "ftp" ]; - networking.firewall.autoLoadConntrackHelpers = true; - }) ]; in { name = "nat" + (lib.optionalString nftables "Nftables") - + (if withFirewall then "WithFirewall" else "Standalone") - + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); + + (if withFirewall then "WithFirewall" else "Standalone"); meta = with pkgs.lib.maintainers; { maintainers = [ eelco rob ]; }; @@ -39,10 +34,6 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; networking.nftables.enable = nftables; } - (lib.optionalAttrs withConntrackHelpers { - networking.firewall.connectionTrackingModules = [ "ftp" ]; - networking.firewall.autoLoadConntrackHelpers = true; - }) ]; router = @@ -95,7 +86,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? client.succeed("curl -v ftp://server/foo.txt >&2") # Test whether active FTP works. - client.${if withConntrackHelpers then "succeed" else "fail"}("curl -v -P - ftp://server/foo.txt >&2") + client.fail("curl -v -P - ftp://server/foo.txt >&2") # Test ICMP. client.succeed("ping -c 1 router >&2") diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix index 25bf4848542..78d6da31bee 100644 --- a/nixos/tests/phosh.nix +++ b/nixos/tests/phosh.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...}: let in { name = "phosh"; meta = with pkgs.lib.maintainers; { - maintainers = [ zhaofengli ]; + maintainers = [ tomfitzhenry zhaofengli ]; }; nodes = { diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 8998716243a..4f1aef85414 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -170,8 +170,8 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; hosts = nodes: '' - ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test - ${nodes.client.config.networking.primaryIPAddress} client.nixos.test + ${nodes.pleroma.networking.primaryIPAddress} pleroma.nixos.test + ${nodes.client.networking.primaryIPAddress} client.nixos.test ''; in { name = "pleroma"; diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index 5d98114304b..f7f4863d17e 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -6,9 +6,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { enable = true; emergencyAccess = true; }; - fileSystems = lib.mkVMOverride { - "/".autoResize = true; - }; + virtualisation.fileSystems."/".autoResize = true; }; testScript = '' diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index 34bf1bc0c70..cdf762b1284 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -1,18 +1,28 @@ { system ? builtins.currentSystem , config ? { } , pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib }: with import ../lib/testing-python.nix { inherit system pkgs; }; let - minimal = { config, ... }: { - services.teleport.enable = true; + packages = with pkgs; { + "default" = teleport; + "11" = teleport_11; }; - client = { config, ... }: { + minimal = package: { services.teleport = { enable = true; + inherit package; + }; + }; + + client = package: { + services.teleport = { + enable = true; + inherit package; settings = { teleport = { nodename = "client"; @@ -37,9 +47,10 @@ let }]; }; - server = { config, ... }: { + server = package: { services.teleport = { enable = true; + inherit package; settings = { teleport = { nodename = "server"; @@ -64,36 +75,41 @@ let }; }; in -{ - minimal = makeTest { - # minimal setup should always work - name = "teleport-minimal-setup"; - meta.maintainers = with pkgs.lib.maintainers; [ ymatsiuk ]; - nodes = { inherit minimal; }; +lib.concatMapAttrs + (name: package: { + "minimal_${name}" = makeTest { + # minimal setup should always work + name = "teleport-minimal-setup"; + meta.maintainers = with pkgs.lib.maintainers; [ justinas ]; + nodes.minimal = minimal package; - testScript = '' - minimal.wait_for_open_port(3025) - minimal.wait_for_open_port(3080) - minimal.wait_for_open_port(3022) - ''; - }; + testScript = '' + minimal.wait_for_open_port(3025) + minimal.wait_for_open_port(3080) + minimal.wait_for_open_port(3022) + ''; + }; - basic = makeTest { - # basic server and client test - name = "teleport-server-client"; - meta.maintainers = with pkgs.lib.maintainers; [ ymatsiuk ]; - nodes = { inherit server client; }; + "basic_${name}" = makeTest { + # basic server and client test + name = "teleport-server-client"; + meta.maintainers = with pkgs.lib.maintainers; [ justinas ]; + nodes = { + server = server package; + client = client package; + }; - testScript = '' - with subtest("teleport ready"): - server.wait_for_open_port(3025) - client.wait_for_open_port(3022) + testScript = '' + with subtest("teleport ready"): + server.wait_for_open_port(3025) + client.wait_for_open_port(3022) - with subtest("check applied configuration"): - server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'") - server.wait_for_open_port(3000) - client.succeed("journalctl -u teleport.service --grep='DEBU'") - server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'") - ''; - }; -} + with subtest("check applied configuration"): + server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'") + server.wait_for_open_port(3000) + client.succeed("journalctl -u teleport.service --grep='DEBU'") + server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'") + ''; + }; + }) + packages diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix index 1790c45bb1f..d0eb009e110 100644 --- a/nixos/tests/wireguard/namespaces.nix +++ b/nixos/tests/wireguard/namespaces.nix @@ -39,6 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : { preSetup = '' ip netns add ${interfaceNamespace} ''; + mtu = 1280; inherit interfaceNamespace; }; }; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index eca4567984e..9e08d2380c1 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -10,6 +10,7 @@ , gtk3 , wayland , wayland-protocols +, libbsd , libxml2 , libxkbcommon , rustPlatform @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wx3fKRX/SPYGAFuR9u03JAvVRhtYIPUvW8mAsCdx83I="; + hash = "sha256-Mn0E+R/UzBLHPvarQHlEN4JBpf4VAaXdKdWLsFEyQE4="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { cp Cargo.lock.newer Cargo.lock ''; name = "${pname}-${version}"; - sha256 = "sha256-BbNkapqnqEW/NglrCse10Tm80SXYVQWWrOC5dTN6oi0="; + hash = "sha256-F2mef0HvD9WZRx05DEpQ1AO1skMwcchHZzJa74AHmsM="; }; mesonFlags = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { gnome-desktop wayland wayland-protocols + libbsd libxml2 libxkbcommon feedbackd diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4a652e1ac47..6d8f279dadb 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho="; + hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ="; }; postPatch = '' diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 886662faf47..e5d132ac6a6 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.63"; + version = "1.65"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU="; + sha256 = "sha256-Jo1qs0d8/o9FWR7jboWCJ7ntawBGTlm7yPzxxUnZLsI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index e0840022079..66f2a1a02d1 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; + hash = "sha256-Wc9HFvBSLQA7jT+LJj+tyHzRbszhR2XD1/3C+SdrAGA="; }; deleteVendor = true; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index f988e5cd1d4..a197be51680 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.5-1"; + version = "3.10.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; + sha256 = "sha256-QuOHeEgDOXvNFMfMoq0GOnmHKyMG1S8y1lgO9heMk3I="; }; postPatch = '' diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 7a1676e7873..590c695577c 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM="; + sha256 = "sha256-2A1yo2e1MawGLMTM6jWwpQJJuKOmljxFriORv90Jqg8="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 05647af2201..01bb8b6253e 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -1,33 +1,30 @@ -{lib, gcc10Stdenv, fetchurl}: +{ lib +, stdenv +, fetchzip +, cmake +}: -gcc10Stdenv.mkDerivation rec { - version = "3.99-u4-b5"; - pname = "monkeys-audio-old"; +stdenv.mkDerivation rec { + version = "9.20"; + pname = "monkeys-audio"; - patches = [ ./buildfix.diff ]; - - src = fetchurl { - /* - The real homepage is <https://monkeysaudio.com/>, but in fact we are - getting an old, ported to Linux version of the sources, made by (quoting - from the AUTHORS file found in the source): - - Frank Klemm : First port to linux (with makefile) - - SuperMMX <SuperMMX AT GMail DOT com> : Package the source, include the frontend and shared lib, - porting to Big Endian platform and adding other non-win32 enhancement. - */ - url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; + src = fetchzip { + url = "https://monkeysaudio.com/files/MAC_${ + builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; + sha256 = "sha256-8cJ88plR9jrrLdzRHzRotGBrn6qIqOWvl+oOTXxY/TE="; + stripRoot = false; }; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { - description = "Lossless audio codec"; + description = "APE codec and decompressor"; platforms = platforms.linux; # This is not considered a GPL license, but it seems rather free although # it's not standard, see a quote of it: # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551 license = licenses.free; - maintainers = [ ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index f8fac7d14a9..394812a586b 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -1,23 +1,25 @@ { lib, fetchFromGitHub +, pkg-config, meson ,ninja , python3Packages , gdk-pixbuf, glib, gobject-introspection, gtk3 , libnotify -, intltool , wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.4.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "1a5nhlbgi3ahnkcq16c2vgiaghgswy5lxg64pcrlbqssg1pj5gma"; + sha256 = "sha256-w31e8cJvdep/ZzmDBCfdCZotrPunQBl1cTTWjs3sE1w="; }; + format = "other"; + nativeBuildInputs = [ - glib.dev gobject-introspection gtk3 intltool wrapGAppsHook + glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 2e52d8232e4..a1a958c3d55 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -11,17 +11,18 @@ , pcre2 , gzip , perl +, jq }: stdenv.mkDerivation rec { pname = "mympd"; - version = "9.5.4"; + version = "10.2.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-0X/rEVfJ6zzX75R72xVntOfuCt8srp9PkiYOq3XbWPs="; + sha256 = "sha256-12hCIAwrLQkwiU9t9nNPBdIiHfMidfErSWOA0FPfhBQ="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { cmake gzip perl + jq ]; preConfigure = '' env MYMPD_BUILDDIR=$PWD/build ./build.sh createassets diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index a00f60e7328..1d9dbc59073 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.08"; + version = "6.3.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo="; + sha256 = "sha256-oidYxG3A0yZGAJzjf5WvspEIbh1d/SXNHJsxKsSRifI="; }; configurePhase = '' diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index a9cc966af2e..224c39c0c92 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.8"; + version = "0.9.9"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-GEnxxYul4qir/92hGq4L+29dnpy1MxHonM1llkzSLPw="; + sha256 = "sha256-6mVvLr+4kSkjp0Mc/XtFxSaO/OblhdsvicrV1luq8I8="; }; buildInputs = [ diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 3e0206a654b..bdf7dc79a1f 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.3.9"; + version = "0.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-KGZ67FF3WlKwUzVV3qz1DR/7i1mXsfXVVyuNoIR9uP0="; + sha256 = "sha256-bOg+7bNEhnemhb+Xi3x77ZEjqKFjUXSCFgvcLXrxz/E="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index d7b15ba0482..1ec2fa77393 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -5,10 +5,10 @@ let pname = "sonixd"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; + sha256 = "sha256-n4n16S8ktPiVc0iyjVNNIyo9oEIBwGIuzj0xgm/ETeo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix new file mode 100644 index 00000000000..da82fcc5a86 --- /dev/null +++ b/pkgs/applications/audio/sonobus/default.nix @@ -0,0 +1,83 @@ +{ lib +, pkg-config +, stdenv +, fetchFromGitHub +, autoPatchelfHook +, alsa-lib +, cmake +, freetype +, libGL +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr +, libjack2 +, libopus +, curl +, gtk3 +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "sonobus"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "sonosaurus"; + repo = "sonobus"; + rev = version; + sha256 = "sha256-/Pb+PYmoCYA6Qcy/tR1Ejyt+rZ3pfJeWV4j7bQWYE58="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + libopus + curl + gtk3 + webkitgtk + ]; + + runtimeDependencies = [ + libGL + libX11 + libXcursor + libXext + libXinerama + libXrandr + ]; + + postPatch = lib.optionalString (stdenv.isLinux) '' + # needs special setup on Linux, dunno if it can work on Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + # Also, I get issues with linking without that, not sure why + sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt + patchShebangs linux/install.sh + ''; + + # The program does not provide any CMake install instructions + installPhase = lib.optionalString (stdenv.isLinux) '' + runHook preInstall + cd ../linux + ./install.sh "$out" + runHook postInstall + ''; + + meta = with lib; { + description = "High-quality network audio streaming"; + homepage = "https://sonobus.net/"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ PowerUser64 ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix index 59f927443b7..287a711d234 100644 --- a/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -7,13 +7,13 @@ }: python3Packages.buildPythonApplication rec { pname = "chia-dev-tools"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "Chia-Network"; repo = pname; rev = "v${version}"; - hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA="; + hash = "sha256-qWWLQ+SkoRu5cLytwwrslqsKORy+4ebO8brULEFGaF0="; }; patches = [ diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 45854ddcd63..700a65f3a58 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "22.11.1"; + version = "23.02"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-F48jmG9voNp6+IMRVkJi6O0DXVQxKyYkOA0UBCKktIw="; + sha256 = "sha256-uvk7sApIwlrkH8eERBetf/nsAkN2d35T/IEtICFflzY="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 5aee9eaee9f..819f14ce456 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.53.2"; + version = "2.54.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-RGeJWUMZagXM/8SHHOpTpcnsz+BShnGp2yvt31qo5lI="; + hash = "sha256-3UCsMzpoHq4gD4bw/MT1qbl8AnXQnFJqpMi1mlPvv5w="; }; appimageContents = appimageTools.extractType2 { @@ -27,8 +27,8 @@ appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "Wallet app for Ledger Nano S and Ledger Blue"; - homepage = "https://www.ledger.com/live"; + description = "App for Ledger hardware wallets"; + homepage = "https://www.ledger.com/ledger-live/"; license = licenses.mit; maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index caac322020e..0464c2610b7 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -6,16 +6,32 @@ , trezorSupport ? true, libusb1, protobuf, python3 }: +let + # submodules + supercop = fetchFromGitHub { + owner = "monero-project"; + repo = "supercop"; + rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; + sha256 = "26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; + }; + trezor-common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0"; + sha256 = "VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI="; + }; + +in + stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.1.2"; + version = "0.18.2.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw="; - fetchSubmodules = true; + sha256 = "n2e5U3p0eG2atPYV86H2UAURwsIkeSOBm8iwYsDVAoc="; }; patches = [ @@ -23,8 +39,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # remove vendored libraries - rm -r external/{miniupnp,randomx,rapidjson} + # manually install submodules + rmdir external/{supercop,trezor-common} + ln -sf ${supercop} external/supercop + ln -sf ${trezor-common} external/trezor-common # export patched source for monero-gui cp -r . $source ''; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 1a39e68d8f6..4ddb746c30a 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.1.2"; + version = "0.18.2.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU="; + sha256 = "Bm6OpK1jjdWVqdp6HpirqP6+3GcMSZfZ/e70wcu+rQc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 7a7e461b1a2..096ff9bd9b0 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.38"; + version = "0.9.39"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4="; + hash = "sha256-ewjab9BtItJWtadEZO1PH5+2fOAafNof+2uVm8e78V4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o="; + cargoHash = "sha256-KqdUh+ES9UB01yrmNVXdiyYZPh9pjJOEjcuwlJr6Jxc="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 6c6a4fa29a4..aa50880cf6a 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { store historical records of the ledger and participate in consensus. ''; homepage = "https://www.stellar.org/"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ ]; license = licenses.asl20; }; diff --git a/pkgs/applications/blockchains/teos/add-cargo-lock.patch b/pkgs/applications/blockchains/teos/add-cargo-lock.patch deleted file mode 100644 index 04a49ab1214..00000000000 --- a/pkgs/applications/blockchains/teos/add-cargo-lock.patch +++ /dev/null @@ -1,3905 +0,0 @@ ---- a/Cargo.lock 2022-09-26 16:57:09.795022563 +0200 -+++ b/Cargo.lock 2022-09-29 10:21:19.312000000 +0200 -@@ -0,0 +1,3902 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "aead" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "ahash" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -+dependencies = [ -+ "getrandom 0.2.7", -+ "once_cell", -+ "version_check", -+] -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.65" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" -+ -+[[package]] -+name = "ascii-canvas" -+version = "3.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -+dependencies = [ -+ "term", -+] -+ -+[[package]] -+name = "assert-json-diff" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -+dependencies = [ -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "async-channel" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" -+dependencies = [ -+ "concurrent-queue", -+ "event-listener", -+ "futures-core", -+] -+ -+[[package]] -+name = "async-executor" -+version = "1.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -+dependencies = [ -+ "async-task", -+ "concurrent-queue", -+ "fastrand", -+ "futures-lite", -+ "once_cell", -+ "slab", -+] -+ -+[[package]] -+name = "async-global-executor" -+version = "2.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" -+dependencies = [ -+ "async-channel", -+ "async-executor", -+ "async-io", -+ "async-lock", -+ "blocking", -+ "futures-lite", -+ "once_cell", -+] -+ -+[[package]] -+name = "async-io" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" -+dependencies = [ -+ "autocfg", -+ "concurrent-queue", -+ "futures-lite", -+ "libc", -+ "log", -+ "once_cell", -+ "parking", -+ "polling", -+ "slab", -+ "socket2 0.4.7", -+ "waker-fn", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "async-lock" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" -+dependencies = [ -+ "event-listener", -+] -+ -+[[package]] -+name = "async-object-pool" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" -+dependencies = [ -+ "async-std", -+] -+ -+[[package]] -+name = "async-process" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" -+dependencies = [ -+ "async-io", -+ "autocfg", -+ "blocking", -+ "cfg-if 1.0.0", -+ "event-listener", -+ "futures-lite", -+ "libc", -+ "once_cell", -+ "signal-hook", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "async-std" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -+dependencies = [ -+ "async-channel", -+ "async-global-executor", -+ "async-io", -+ "async-lock", -+ "async-process", -+ "crossbeam-utils", -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-lite", -+ "gloo-timers", -+ "kv-log-macro", -+ "log", -+ "memchr", -+ "once_cell", -+ "pin-project-lite 0.2.9", -+ "pin-utils", -+ "slab", -+ "wasm-bindgen-futures", -+] -+ -+[[package]] -+name = "async-stream" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -+dependencies = [ -+ "async-stream-impl", -+ "futures-core", -+] -+ -+[[package]] -+name = "async-stream-impl" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "async-task" -+version = "4.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" -+ -+[[package]] -+name = "async-trait" -+version = "0.1.57" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "atomic-waker" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "backoff" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -+dependencies = [ -+ "futures-core", -+ "getrandom 0.2.7", -+ "instant", -+ "pin-project-lite 0.2.9", -+ "rand 0.8.5", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "base32" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" -+ -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ -+[[package]] -+name = "base64-compat" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7" -+dependencies = [ -+ "byteorder", -+] -+ -+[[package]] -+name = "basic-cookies" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" -+dependencies = [ -+ "lalrpop", -+ "lalrpop-util", -+ "regex", -+] -+ -+[[package]] -+name = "bech32" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" -+ -+[[package]] -+name = "bit-set" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -+dependencies = [ -+ "bit-vec", -+] -+ -+[[package]] -+name = "bit-vec" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -+ -+[[package]] -+name = "bitcoin" -+version = "0.28.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a" -+dependencies = [ -+ "base64-compat", -+ "bech32", -+ "bitcoin_hashes", -+ "secp256k1", -+ "serde", -+] -+ -+[[package]] -+name = "bitcoin_hashes" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "bitcoincore-rpc" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd0e67dbf7a9971e7f4276f6089e9e814ce0f624a03216b7d92d00351ae7fb3e" -+dependencies = [ -+ "bitcoincore-rpc-json", -+ "jsonrpc", -+ "log", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "bitcoincore-rpc-json" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1" -+dependencies = [ -+ "bitcoin", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "block-buffer" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+dependencies = [ -+ "block-padding", -+ "generic-array", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -+ -+[[package]] -+name = "blocking" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -+dependencies = [ -+ "async-channel", -+ "async-task", -+ "atomic-waker", -+ "fastrand", -+ "futures-lite", -+ "once_cell", -+] -+ -+[[package]] -+name = "bstr" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "buf_redux" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -+dependencies = [ -+ "memchr", -+ "safemem", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+ -+[[package]] -+name = "bytes" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -+ -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ -+[[package]] -+name = "cache-padded" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -+ -+[[package]] -+name = "castaway" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" -+ -+[[package]] -+name = "cc" -+version = "1.0.73" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "chacha20" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "cipher", -+ "cpufeatures", -+ "zeroize", -+] -+ -+[[package]] -+name = "chacha20poly1305" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" -+dependencies = [ -+ "aead", -+ "chacha20", -+ "cipher", -+ "poly1305", -+ "zeroize", -+] -+ -+[[package]] -+name = "chrono" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -+dependencies = [ -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "chunked_transfer" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" -+ -+[[package]] -+name = "cipher" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "clap" -+version = "2.34.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "cln-plugin" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2043841c090a404cb81b145c8ad3c66bae122ba722387fc322b93c157d596433" -+dependencies = [ -+ "anyhow", -+ "bytes 1.2.1", -+ "cln-rpc", -+ "futures", -+ "log", -+ "serde", -+ "serde_json", -+ "tokio 1.21.2", -+ "tokio-stream", -+ "tokio-util 0.6.10", -+] -+ -+[[package]] -+name = "cln-rpc" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18fb71ceca239c83a06fb494028b4a6b7b38ad4dd9c0410b7ea6013b90e15045" -+dependencies = [ -+ "anyhow", -+ "bytes 1.2.1", -+ "futures-util", -+ "hex", -+ "log", -+ "native-tls", -+ "serde", -+ "serde_json", -+ "tokio 1.21.2", -+ "tokio-util 0.6.10", -+] -+ -+[[package]] -+name = "colored" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -+dependencies = [ -+ "atty", -+ "lazy_static", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "concurrent-queue" -+version = "1.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -+dependencies = [ -+ "cache-padded", -+] -+ -+[[package]] -+name = "convert_case" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -+ -+[[package]] -+name = "core-foundation" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+ -+[[package]] -+name = "cpufeatures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.8.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "crunchy" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -+ -+[[package]] -+name = "crypto-common" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -+dependencies = [ -+ "generic-array", -+ "typenum", -+] -+ -+[[package]] -+name = "crypto-mac" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -+dependencies = [ -+ "generic-array", -+ "subtle", -+] -+ -+[[package]] -+name = "ctor" -+version = "0.1.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" -+dependencies = [ -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "curl" -+version = "0.4.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -+dependencies = [ -+ "curl-sys", -+ "libc", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "socket2 0.4.7", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "curl-sys" -+version = "0.4.56+curl-7.83.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" -+dependencies = [ -+ "cc", -+ "libc", -+ "libnghttp2-sys", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "curve25519-dalek" -+version = "3.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -+dependencies = [ -+ "byteorder", -+ "digest 0.9.0", -+ "rand_core 0.5.1", -+ "subtle", -+ "zeroize", -+] -+ -+[[package]] -+name = "data-encoding" -+version = "2.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" -+ -+[[package]] -+name = "der-oid-macro" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436" -+dependencies = [ -+ "num-bigint", -+ "num-traits", -+ "syn", -+] -+ -+[[package]] -+name = "der-parser" -+version = "6.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2" -+dependencies = [ -+ "der-oid-macro", -+ "nom", -+ "num-bigint", -+ "num-traits", -+ "rusticata-macros", -+] -+ -+[[package]] -+name = "derive_more" -+version = "0.99.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -+dependencies = [ -+ "convert_case", -+ "proc-macro2", -+ "quote", -+ "rustc_version", -+ "syn", -+] -+ -+[[package]] -+name = "diff" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "digest" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" -+dependencies = [ -+ "block-buffer 0.10.3", -+ "crypto-common", -+] -+ -+[[package]] -+name = "dirs-next" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "dirs-sys-next", -+] -+ -+[[package]] -+name = "dirs-sys-next" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "ed25519" -+version = "1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" -+dependencies = [ -+ "signature", -+] -+ -+[[package]] -+name = "ed25519-dalek" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -+dependencies = [ -+ "curve25519-dalek", -+ "ed25519", -+ "rand 0.7.3", -+ "serde", -+ "sha2", -+ "zeroize", -+] -+ -+[[package]] -+name = "either" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -+ -+[[package]] -+name = "ena" -+version = "0.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" -+dependencies = [ -+ "log", -+] -+ -+[[package]] -+name = "encoding_rs" -+version = "0.8.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "event-listener" -+version = "2.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -+ -+[[package]] -+name = "fallible-iterator" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -+ -+[[package]] -+name = "fallible-streaming-iterator" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "fixedbitset" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -+dependencies = [ -+ "percent-encoding", -+] -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+ -+[[package]] -+name = "fuchsia-zircon" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -+dependencies = [ -+ "bitflags", -+ "fuchsia-zircon-sys", -+] -+ -+[[package]] -+name = "fuchsia-zircon-sys" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -+ -+[[package]] -+name = "futures" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" -+ -+[[package]] -+name = "futures-lite" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -+dependencies = [ -+ "fastrand", -+ "futures-core", -+ "futures-io", -+ "memchr", -+ "parking", -+ "pin-project-lite 0.2.9", -+ "waker-fn", -+] -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project-lite 0.2.9", -+ "pin-utils", -+ "slab", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "wasi 0.11.0+wasi-snapshot-preview1", -+] -+ -+[[package]] -+name = "globset" -+version = "0.4.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" -+dependencies = [ -+ "aho-corasick", -+ "bstr", -+ "fnv", -+ "log", -+ "regex", -+] -+ -+[[package]] -+name = "gloo-timers" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "h2" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio 0.2.25", -+ "tokio-util 0.3.1", -+ "tracing", -+ "tracing-futures", -+] -+ -+[[package]] -+name = "h2" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" -+dependencies = [ -+ "bytes 1.2.1", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio 1.21.2", -+ "tokio-util 0.7.4", -+ "tracing", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -+dependencies = [ -+ "ahash", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[package]] -+name = "hashlink" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -+dependencies = [ -+ "hashbrown 0.11.2", -+] -+ -+[[package]] -+name = "headers" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" -+dependencies = [ -+ "base64", -+ "bitflags", -+ "bytes 1.2.1", -+ "headers-core", -+ "http", -+ "httpdate 1.0.2", -+ "mime", -+ "sha1", -+] -+ -+[[package]] -+name = "headers-core" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -+dependencies = [ -+ "http", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "hmac" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -+dependencies = [ -+ "crypto-mac", -+ "digest 0.9.0", -+] -+ -+[[package]] -+name = "home" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "http" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -+dependencies = [ -+ "bytes 1.2.1", -+ "fnv", -+ "itoa 1.0.3", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+dependencies = [ -+ "bytes 0.5.6", -+ "http", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -+dependencies = [ -+ "bytes 1.2.1", -+ "http", -+ "pin-project-lite 0.2.9", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -+ -+[[package]] -+name = "httpdate" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -+ -+[[package]] -+name = "httpdate" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -+ -+[[package]] -+name = "httpmock" -+version = "0.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd" -+dependencies = [ -+ "assert-json-diff", -+ "async-object-pool", -+ "async-trait", -+ "base64", -+ "basic-cookies", -+ "crossbeam-utils", -+ "form_urlencoded", -+ "futures-util", -+ "hyper 0.14.20", -+ "isahc", -+ "lazy_static", -+ "levenshtein", -+ "log", -+ "regex", -+ "serde", -+ "serde_json", -+ "serde_regex", -+ "similar", -+ "tokio 1.21.2", -+ "url", -+] -+ -+[[package]] -+name = "hyper" -+version = "0.13.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2 0.2.7", -+ "http", -+ "http-body 0.3.1", -+ "httparse", -+ "httpdate 0.3.2", -+ "itoa 0.4.8", -+ "pin-project", -+ "socket2 0.3.19", -+ "tokio 0.2.25", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper" -+version = "0.14.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -+dependencies = [ -+ "bytes 1.2.1", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2 0.3.14", -+ "http", -+ "http-body 0.4.5", -+ "httparse", -+ "httpdate 1.0.2", -+ "itoa 1.0.3", -+ "pin-project-lite 0.2.9", -+ "socket2 0.4.7", -+ "tokio 1.21.2", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-timeout" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -+dependencies = [ -+ "hyper 0.14.20", -+ "pin-project-lite 0.2.9", -+ "tokio 1.21.2", -+ "tokio-io-timeout", -+] -+ -+[[package]] -+name = "hyper-tls" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -+dependencies = [ -+ "bytes 1.2.1", -+ "hyper 0.14.20", -+ "native-tls", -+ "tokio 1.21.2", -+ "tokio-native-tls", -+] -+ -+[[package]] -+name = "idna" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -+dependencies = [ -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+dependencies = [ -+ "autocfg", -+ "hashbrown 0.12.3", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "iovec" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "ipnet" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -+ -+[[package]] -+name = "isahc" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -+dependencies = [ -+ "async-channel", -+ "castaway", -+ "crossbeam-utils", -+ "curl", -+ "curl-sys", -+ "encoding_rs", -+ "event-listener", -+ "futures-lite", -+ "http", -+ "log", -+ "mime", -+ "once_cell", -+ "polling", -+ "slab", -+ "sluice", -+ "tracing", -+ "tracing-futures", -+ "url", -+ "waker-fn", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" -+ -+[[package]] -+name = "itoa" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -+ -+[[package]] -+name = "js-sys" -+version = "0.3.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -+dependencies = [ -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "jsonrpc" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8" -+dependencies = [ -+ "base64-compat", -+ "serde", -+ "serde_derive", -+ "serde_json", -+] -+ -+[[package]] -+name = "jsonrpc-core" -+version = "17.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" -+dependencies = [ -+ "futures", -+ "futures-executor", -+ "futures-util", -+ "log", -+ "serde", -+ "serde_derive", -+ "serde_json", -+] -+ -+[[package]] -+name = "jsonrpc-http-server" -+version = "17.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2" -+dependencies = [ -+ "futures", -+ "hyper 0.13.10", -+ "jsonrpc-core", -+ "jsonrpc-server-utils", -+ "log", -+ "net2", -+ "parking_lot 0.11.2", -+ "unicase", -+] -+ -+[[package]] -+name = "jsonrpc-server-utils" -+version = "17.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures", -+ "globset", -+ "jsonrpc-core", -+ "lazy_static", -+ "log", -+ "tokio 0.2.25", -+ "tokio-util 0.3.1", -+ "unicase", -+] -+ -+[[package]] -+name = "keccak" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" -+ -+[[package]] -+name = "kernel32-sys" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -+dependencies = [ -+ "winapi 0.2.8", -+ "winapi-build", -+] -+ -+[[package]] -+name = "kv-log-macro" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -+dependencies = [ -+ "log", -+] -+ -+[[package]] -+name = "lalrpop" -+version = "0.19.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" -+dependencies = [ -+ "ascii-canvas", -+ "atty", -+ "bit-set", -+ "diff", -+ "ena", -+ "itertools", -+ "lalrpop-util", -+ "petgraph", -+ "pico-args", -+ "regex", -+ "regex-syntax", -+ "string_cache", -+ "term", -+ "tiny-keccak", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "lalrpop-util" -+version = "0.19.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" -+dependencies = [ -+ "regex", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "levenshtein" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" -+ -+[[package]] -+name = "libc" -+version = "0.2.133" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" -+ -+[[package]] -+name = "libnghttp2-sys" -+version = "0.1.7+1.45.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "libsqlite3-sys" -+version = "0.23.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58" -+dependencies = [ -+ "cc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "libz-sys" -+version = "1.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -+dependencies = [ -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "lightning" -+version = "0.0.108" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d885bf509066af86ae85354c8959028ad6192c22a2657ef8271e94029d30f9d0" -+dependencies = [ -+ "bitcoin", -+] -+ -+[[package]] -+name = "lightning-block-sync" -+version = "0.0.108" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f1ed50f41785af19f5cd1225b668e87ef0d59bb84e6f8ef2542933e6082a2c" -+dependencies = [ -+ "bitcoin", -+ "chunked_transfer", -+ "futures", -+ "lightning", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] -+name = "lightning-net-tokio" -+version = "0.0.108" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f0170619152c4d6b947d5ed0de427b85691482a293e0cae52d4336a2220a776" -+dependencies = [ -+ "bitcoin", -+ "lightning", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.4.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -+dependencies = [ -+ "autocfg", -+ "scopeguard", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "value-bag", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -+ -+[[package]] -+name = "mime" -+version = "0.3.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+ -+[[package]] -+name = "mime_guess" -+version = "2.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -+dependencies = [ -+ "mime", -+ "unicase", -+] -+ -+[[package]] -+name = "minimal-lexical" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -+ -+[[package]] -+name = "mio" -+version = "0.6.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "fuchsia-zircon", -+ "fuchsia-zircon-sys", -+ "iovec", -+ "kernel32-sys", -+ "libc", -+ "log", -+ "miow", -+ "net2", -+ "slab", -+ "winapi 0.2.8", -+] -+ -+[[package]] -+name = "mio" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -+dependencies = [ -+ "libc", -+ "log", -+ "wasi 0.11.0+wasi-snapshot-preview1", -+ "windows-sys", -+] -+ -+[[package]] -+name = "miow" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -+dependencies = [ -+ "kernel32-sys", -+ "net2", -+ "winapi 0.2.8", -+ "ws2_32-sys", -+] -+ -+[[package]] -+name = "multimap" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -+ -+[[package]] -+name = "multipart" -+version = "0.18.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" -+dependencies = [ -+ "buf_redux", -+ "httparse", -+ "log", -+ "mime", -+ "mime_guess", -+ "quick-error", -+ "rand 0.8.5", -+ "safemem", -+ "tempfile", -+ "twoway", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -+dependencies = [ -+ "lazy_static", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "net2" -+version = "0.2.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "new_debug_unreachable" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -+ -+[[package]] -+name = "nom" -+version = "7.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -+dependencies = [ -+ "memchr", -+ "minimal-lexical", -+] -+ -+[[package]] -+name = "num-bigint" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-integer" -+version = "0.1.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -+dependencies = [ -+ "autocfg", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "num_threads" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "oid-registry" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815" -+dependencies = [ -+ "der-parser", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+ -+[[package]] -+name = "openssl" -+version = "0.10.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -+dependencies = [ -+ "bitflags", -+ "cfg-if 1.0.0", -+ "foreign-types", -+ "libc", -+ "once_cell", -+ "openssl-macros", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -+ -+[[package]] -+name = "openssl-src" -+version = "111.22.0+1.1.1q" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.76" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "openssl-src", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "parking" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -+dependencies = [ -+ "instant", -+ "lock_api", -+ "parking_lot_core 0.8.5", -+] -+ -+[[package]] -+name = "parking_lot" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -+dependencies = [ -+ "lock_api", -+ "parking_lot_core 0.9.3", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "instant", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "windows-sys", -+] -+ -+[[package]] -+name = "pem" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" -+dependencies = [ -+ "base64", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -+ -+[[package]] -+name = "petgraph" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -+dependencies = [ -+ "fixedbitset", -+ "indexmap", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -+dependencies = [ -+ "siphasher", -+] -+ -+[[package]] -+name = "pico-args" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" -+ -+[[package]] -+name = "pin-project" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -+ -+[[package]] -+name = "polling" -+version = "2.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" -+dependencies = [ -+ "autocfg", -+ "cfg-if 1.0.0", -+ "libc", -+ "log", -+ "wepoll-ffi", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "poly1305" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -+dependencies = [ -+ "cpufeatures", -+ "opaque-debug", -+ "universal-hash", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -+ -+[[package]] -+name = "precomputed-hash" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.46" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "prost" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" -+dependencies = [ -+ "bytes 1.2.1", -+ "prost-derive 0.8.0", -+] -+ -+[[package]] -+name = "prost" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -+dependencies = [ -+ "bytes 1.2.1", -+ "prost-derive 0.9.0", -+] -+ -+[[package]] -+name = "prost-build" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -+dependencies = [ -+ "bytes 1.2.1", -+ "heck", -+ "itertools", -+ "lazy_static", -+ "log", -+ "multimap", -+ "petgraph", -+ "prost 0.9.0", -+ "prost-types", -+ "regex", -+ "tempfile", -+ "which", -+] -+ -+[[package]] -+name = "prost-derive" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" -+dependencies = [ -+ "anyhow", -+ "itertools", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "prost-derive" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -+dependencies = [ -+ "anyhow", -+ "itertools", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "prost-types" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -+dependencies = [ -+ "bytes 1.2.1", -+ "prost 0.9.0", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -+dependencies = [ -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "rdrand", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom 0.1.16", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -+dependencies = [ -+ "libc", -+ "rand_chacha 0.3.1", -+ "rand_core 0.6.4", -+] -+ -+[[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 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.4", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+dependencies = [ -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom 0.1.16", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -+dependencies = [ -+ "getrandom 0.2.7", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rcgen" -+version = "0.8.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" -+dependencies = [ -+ "chrono", -+ "pem", -+ "ring", -+ "x509-parser", -+ "yasna", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "redox_users" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -+dependencies = [ -+ "getrandom 0.2.7", -+ "redox_syscall", -+ "thiserror", -+] -+ -+[[package]] -+name = "regex" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "reqwest" -+version = "0.11.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" -+dependencies = [ -+ "base64", -+ "bytes 1.2.1", -+ "encoding_rs", -+ "futures-core", -+ "futures-util", -+ "h2 0.3.14", -+ "http", -+ "http-body 0.4.5", -+ "hyper 0.14.20", -+ "hyper-tls", -+ "ipnet", -+ "js-sys", -+ "log", -+ "mime", -+ "native-tls", -+ "once_cell", -+ "percent-encoding", -+ "pin-project-lite 0.2.9", -+ "serde", -+ "serde_json", -+ "serde_urlencoded", -+ "tokio 1.21.2", -+ "tokio-native-tls", -+ "tokio-socks", -+ "tower-service", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+ "winreg", -+] -+ -+[[package]] -+name = "ring" -+version = "0.16.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -+dependencies = [ -+ "cc", -+ "libc", -+ "once_cell", -+ "spin", -+ "untrusted", -+ "web-sys", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "rusqlite" -+version = "0.26.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7" -+dependencies = [ -+ "bitflags", -+ "fallible-iterator", -+ "fallible-streaming-iterator", -+ "hashlink", -+ "libsqlite3-sys", -+ "memchr", -+ "smallvec", -+] -+ -+[[package]] -+name = "rustc_version" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "rusticata-macros" -+version = "4.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -+dependencies = [ -+ "nom", -+] -+ -+[[package]] -+name = "rustls" -+version = "0.19.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -+dependencies = [ -+ "base64", -+ "log", -+ "ring", -+ "sct", -+ "webpki", -+] -+ -+[[package]] -+name = "rustls-pemfile" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -+dependencies = [ -+ "base64", -+] -+ -+[[package]] -+name = "rustversion" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" -+ -+[[package]] -+name = "ryu" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+ -+[[package]] -+name = "safemem" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+ -+[[package]] -+name = "schannel" -+version = "0.1.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -+dependencies = [ -+ "lazy_static", -+ "windows-sys", -+] -+ -+[[package]] -+name = "scoped-tls" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+ -+[[package]] -+name = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "sct" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "secp256k1" -+version = "0.22.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0" -+dependencies = [ -+ "secp256k1-sys", -+ "serde", -+] -+ -+[[package]] -+name = "secp256k1-sys" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "security-framework" -+version = "2.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "semver" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -+ -+[[package]] -+name = "serde" -+version = "1.0.145" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.145" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.85" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -+dependencies = [ -+ "indexmap", -+ "itoa 1.0.3", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "serde_regex" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -+dependencies = [ -+ "regex", -+ "serde", -+] -+ -+[[package]] -+name = "serde_urlencoded" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -+dependencies = [ -+ "form_urlencoded", -+ "itoa 1.0.3", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha-1" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "cpufeatures", -+ "digest 0.10.5", -+] -+ -+[[package]] -+name = "sha1" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "cpufeatures", -+ "digest 0.10.5", -+] -+ -+[[package]] -+name = "sha2" -+version = "0.9.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -+dependencies = [ -+ "block-buffer 0.9.0", -+ "cfg-if 1.0.0", -+ "cpufeatures", -+ "digest 0.9.0", -+ "opaque-debug", -+] -+ -+[[package]] -+name = "sha3" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -+dependencies = [ -+ "block-buffer 0.9.0", -+ "digest 0.9.0", -+ "keccak", -+ "opaque-debug", -+] -+ -+[[package]] -+name = "signal-hook" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -+dependencies = [ -+ "libc", -+ "signal-hook-registry", -+] -+ -+[[package]] -+name = "signal-hook-registry" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "signature" -+version = "1.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" -+ -+[[package]] -+name = "similar" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" -+ -+[[package]] -+name = "simple_logger" -+version = "2.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" -+dependencies = [ -+ "atty", -+ "colored", -+ "log", -+ "time", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "siphasher" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+ -+[[package]] -+name = "slab" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "sluice" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -+dependencies = [ -+ "async-channel", -+ "futures-core", -+ "futures-io", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" -+ -+[[package]] -+name = "socket2" -+version = "0.3.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "socket2" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -+dependencies = [ -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "spin" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -+ -+[[package]] -+name = "string_cache" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -+dependencies = [ -+ "new_debug_unreachable", -+ "once_cell", -+ "parking_lot 0.12.1", -+ "phf_shared", -+ "precomputed-hash", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "structopt" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "subtle" -+version = "2.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -+ -+[[package]] -+name = "syn" -+version = "1.0.101" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tempdir" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+dependencies = [ -+ "rand 0.4.6", -+ "remove_dir_all", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "fastrand", -+ "libc", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "teos" -+version = "0.1.2" -+dependencies = [ -+ "bitcoin", -+ "bitcoincore-rpc", -+ "hex", -+ "home", -+ "jsonrpc-http-server", -+ "lightning", -+ "lightning-block-sync", -+ "lightning-net-tokio", -+ "log", -+ "prost 0.9.0", -+ "rand 0.8.5", -+ "rcgen", -+ "rusqlite", -+ "serde", -+ "serde_json", -+ "simple_logger", -+ "structopt", -+ "tempdir", -+ "teos-common", -+ "tokio 1.21.2", -+ "tokio-stream", -+ "toml", -+ "tonic 0.6.2", -+ "tonic-build", -+ "torut", -+ "triggered", -+ "warp", -+] -+ -+[[package]] -+name = "teos-common" -+version = "0.1.2" -+dependencies = [ -+ "bitcoin", -+ "chacha20poly1305", -+ "hex", -+ "lightning", -+ "prost 0.9.0", -+ "rand 0.8.5", -+ "rusqlite", -+ "serde", -+ "serde_json", -+ "tonic 0.6.2", -+ "tonic-build", -+] -+ -+[[package]] -+name = "term" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -+dependencies = [ -+ "dirs-next", -+ "rustversion", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "time" -+version = "0.3.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" -+dependencies = [ -+ "itoa 1.0.3", -+ "libc", -+ "num_threads", -+ "time-macros", -+] -+ -+[[package]] -+name = "time-macros" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" -+ -+[[package]] -+name = "tiny-keccak" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -+dependencies = [ -+ "crunchy", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -+dependencies = [ -+ "tinyvec_macros", -+] -+ -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ -+[[package]] -+name = "tokio" -+version = "0.2.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "iovec", -+ "lazy_static", -+ "memchr", -+ "mio 0.6.23", -+ "num_cpus", -+ "pin-project-lite 0.1.12", -+ "slab", -+] -+ -+[[package]] -+name = "tokio" -+version = "1.21.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" -+dependencies = [ -+ "autocfg", -+ "bytes 1.2.1", -+ "libc", -+ "memchr", -+ "mio 0.8.4", -+ "num_cpus", -+ "pin-project-lite 0.2.9", -+ "signal-hook-registry", -+ "socket2 0.4.7", -+ "tokio-macros", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "tokio-io-timeout" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -+dependencies = [ -+ "pin-project-lite 0.2.9", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-native-tls" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -+dependencies = [ -+ "native-tls", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tokio-rustls" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -+dependencies = [ -+ "rustls", -+ "tokio 1.21.2", -+ "webpki", -+] -+ -+[[package]] -+name = "tokio-socks" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -+dependencies = [ -+ "either", -+ "futures-util", -+ "thiserror", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tokio-stream" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" -+dependencies = [ -+ "futures-core", -+ "pin-project-lite 0.2.9", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tokio-tungstenite" -+version = "0.17.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" -+dependencies = [ -+ "futures-util", -+ "log", -+ "tokio 1.21.2", -+ "tungstenite", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite 0.1.12", -+ "tokio 0.2.25", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.6.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -+dependencies = [ -+ "bytes 1.2.1", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite 0.2.9", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" -+dependencies = [ -+ "bytes 1.2.1", -+ "futures-core", -+ "futures-sink", -+ "pin-project-lite 0.2.9", -+ "tokio 1.21.2", -+ "tracing", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "tonic" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" -+dependencies = [ -+ "async-stream", -+ "async-trait", -+ "base64", -+ "bytes 1.2.1", -+ "futures-core", -+ "futures-util", -+ "h2 0.3.14", -+ "http", -+ "http-body 0.4.5", -+ "hyper 0.14.20", -+ "hyper-timeout", -+ "percent-encoding", -+ "pin-project", -+ "prost 0.8.0", -+ "prost-derive 0.8.0", -+ "tokio 1.21.2", -+ "tokio-rustls", -+ "tokio-stream", -+ "tokio-util 0.6.10", -+ "tower", -+ "tower-layer", -+ "tower-service", -+ "tracing", -+ "tracing-futures", -+] -+ -+[[package]] -+name = "tonic" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -+dependencies = [ -+ "async-stream", -+ "async-trait", -+ "base64", -+ "bytes 1.2.1", -+ "futures-core", -+ "futures-util", -+ "h2 0.3.14", -+ "http", -+ "http-body 0.4.5", -+ "hyper 0.14.20", -+ "hyper-timeout", -+ "percent-encoding", -+ "pin-project", -+ "prost 0.9.0", -+ "prost-derive 0.9.0", -+ "tokio 1.21.2", -+ "tokio-rustls", -+ "tokio-stream", -+ "tokio-util 0.6.10", -+ "tower", -+ "tower-layer", -+ "tower-service", -+ "tracing", -+ "tracing-futures", -+] -+ -+[[package]] -+name = "tonic-build" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -+dependencies = [ -+ "proc-macro2", -+ "prost-build", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "torut" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99febc413f26cf855b3a309c5872edff5c31e0ffe9c2fce5681868761df36f69" -+dependencies = [ -+ "base32", -+ "base64", -+ "derive_more", -+ "ed25519-dalek", -+ "hex", -+ "hmac", -+ "rand 0.7.3", -+ "serde", -+ "serde_derive", -+ "sha2", -+ "sha3", -+ "tokio 1.21.2", -+] -+ -+[[package]] -+name = "tower" -+version = "0.4.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -+dependencies = [ -+ "futures-core", -+ "futures-util", -+ "indexmap", -+ "pin-project", -+ "pin-project-lite 0.2.9", -+ "rand 0.8.5", -+ "slab", -+ "tokio 1.21.2", -+ "tokio-util 0.7.4", -+ "tower-layer", -+ "tower-service", -+ "tracing", -+] -+ -+[[package]] -+name = "tower-layer" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" -+ -+[[package]] -+name = "tower-service" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -+ -+[[package]] -+name = "tracing" -+version = "0.1.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "log", -+ "pin-project-lite 0.2.9", -+ "tracing-attributes", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-attributes" -+version = "0.1.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.29" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" -+dependencies = [ -+ "once_cell", -+] -+ -+[[package]] -+name = "tracing-futures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -+dependencies = [ -+ "pin-project", -+ "tracing", -+] -+ -+[[package]] -+name = "triggered" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "tungstenite" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -+dependencies = [ -+ "base64", -+ "byteorder", -+ "bytes 1.2.1", -+ "http", -+ "httparse", -+ "log", -+ "rand 0.8.5", -+ "sha-1", -+ "thiserror", -+ "url", -+ "utf-8", -+] -+ -+[[package]] -+name = "twoway" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -+ -+[[package]] -+name = "unicase" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+dependencies = [ -+ "version_check", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -+dependencies = [ -+ "tinyvec", -+] -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -+ -+[[package]] -+name = "universal-hash" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -+dependencies = [ -+ "generic-array", -+ "subtle", -+] -+ -+[[package]] -+name = "untrusted" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -+ -+[[package]] -+name = "url" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -+dependencies = [ -+ "form_urlencoded", -+ "idna", -+ "percent-encoding", -+] -+ -+[[package]] -+name = "utf-8" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -+ -+[[package]] -+name = "value-bag" -+version = "1.0.0-alpha.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -+dependencies = [ -+ "ctor", -+ "version_check", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "waker-fn" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "warp" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" -+dependencies = [ -+ "bytes 1.2.1", -+ "futures-channel", -+ "futures-util", -+ "headers", -+ "http", -+ "hyper 0.14.20", -+ "log", -+ "mime", -+ "mime_guess", -+ "multipart", -+ "percent-encoding", -+ "pin-project", -+ "rustls-pemfile", -+ "scoped-tls", -+ "serde", -+ "serde_json", -+ "serde_urlencoded", -+ "tokio 1.21.2", -+ "tokio-stream", -+ "tokio-tungstenite", -+ "tokio-util 0.7.4", -+ "tower-service", -+ "tracing", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "once_cell", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.33" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" -+ -+[[package]] -+name = "watchtower-plugin" -+version = "0.1.2" -+dependencies = [ -+ "backoff", -+ "bitcoin", -+ "cln-plugin", -+ "hex", -+ "home", -+ "httpmock", -+ "log", -+ "reqwest", -+ "rusqlite", -+ "serde", -+ "serde_json", -+ "tempdir", -+ "teos-common", -+ "tokio 1.21.2", -+ "tonic 0.5.2", -+] -+ -+[[package]] -+name = "web-sys" -+version = "0.3.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "webpki" -+version = "0.21.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "wepoll-ffi" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "which" -+version = "4.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" -+dependencies = [ -+ "either", -+ "libc", -+ "once_cell", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-build" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "windows-sys" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+dependencies = [ -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+ -+[[package]] -+name = "winreg" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "ws2_32-sys" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -+dependencies = [ -+ "winapi 0.2.8", -+ "winapi-build", -+] -+ -+[[package]] -+name = "x509-parser" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed" -+dependencies = [ -+ "base64", -+ "chrono", -+ "data-encoding", -+ "der-parser", -+ "lazy_static", -+ "nom", -+ "oid-registry", -+ "ring", -+ "rusticata-macros", -+ "thiserror", -+] -+ -+[[package]] -+name = "yasna" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" -+dependencies = [ -+ "chrono", -+] -+ -+[[package]] -+name = "zeroize" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -+dependencies = [ -+ "zeroize_derive", -+] -+ -+[[package]] -+name = "zeroize_derive" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index b1fb1a77c1d..a8ce5ca2420 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -1,77 +1,80 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, llvmPackages -, openssl -, perl , protobuf , rustfmt -, Security -, SystemConfiguration +, stdenv +, darwin +, pkg-config +, openssl }: let - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "talaia-labs"; repo = "rust-teos"; rev = "v${version}"; - hash = "sha256-N+srREYsADMTqz3uDXpeCuXrZZ62FopXO7DClGfyk9U="; + hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; }; - common.meta = with lib; { + meta = with lib; { homepage = "https://github.com/talaia-labs/rust-teos"; license = licenses.mit; maintainers = with maintainers; [ seberm ]; - platforms = platforms.unix; }; - - cargoPatches = [ ./add-cargo-lock.patch ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - - nativeBuildInputs = [ - perl # used by openssl-sys to configure - protobuf - rustfmt - rustPlatform.bindgenHook - ]; in { teos = rustPlatform.buildRustPackage { pname = "teos"; - cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc="; + inherit version src; + + cargoHash = "sha256-U0imKEPszlBOaS6xEd3kfzy/w2SYe3EY/E1e0L+ViDk="; + buildAndTestSubdir = "teos"; - inherit version src cargoPatches buildInputs nativeBuildInputs; + nativeBuildInputs = [ + protobuf + rustfmt + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + __darwinAllowLocalNetworking = true; - meta = common.meta // { + meta = meta // { description = "A Lightning watchtower compliant with BOLT13, written in Rust"; }; - - cargoTestFlags = [ - "--workspace" - ]; }; teos-watchtower-plugin = rustPlatform.buildRustPackage { pname = "teos-watchtower-plugin"; - cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM="; + inherit version src; + + cargoHash = "sha256-3ke1qTFw/4I5dPLuPjIGp1n2C/eRfPB7A6ErMFfwUzE="; + buildAndTestSubdir = "watchtower-plugin"; - inherit version src cargoPatches buildInputs nativeBuildInputs; + nativeBuildInputs = [ + pkg-config + protobuf + rustfmt + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; - meta = common.meta // { + __darwinAllowLocalNetworking = true; + + meta = meta // { description = "A Lightning watchtower plugin for clightning"; + mainProgram = "watchtower-client"; }; - - # The test is skipped due to following error: - # thread 'retrier::tests::test_manage_retry_unreachable' panicked at 'assertion failed: - # wt_client.lock().unwrap().towers.get(&tower_id).unwrap().status.is_unreachable()', watchtower-plugin/src/retrier.rs:518:9 - checkFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--skip=retrier::tests::test_manage_retry_unreachable" ]; }; } diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index c4c8de947f1..2a01220e71c 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.2.1"; + version = "2.0.2.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-kvUwWRZZmalJQL65tRNdgTg7ZQHhmIbfmsfHbHBYz7w="; + sha256 = "sha256-Mwr2TwJsA7+G5U2FHOC6SMgiYxuy6fAiA3t7oJGSVaA="; }; dontBuild = true; diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix new file mode 100644 index 00000000000..e989d9782b1 --- /dev/null +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, glib +, gtk4 +, pango +}: + +rustPlatform.buildRustPackage { + pname = "regreet"; + version = "unstable-2023-02-27"; + + src = fetchFromGitHub { + owner = "rharish101"; + repo = "ReGreet"; + rev = "2bbabe90f112b4feeb0aea516c265daaec8ccf2a"; + hash = "sha256-71ji4x/NUE4qmBuO5PkWTPE1a0uPXqJSwW1Ai1amPJE="; + }; + + cargoHash = "sha256-rz2eMMhoMtzBXCH6ZJOvGuYLeHSWga+Ebc4+ZO8Kk1g="; + + buildFeatures = [ "gtk4_8" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib gtk4 pango ]; + + meta = with lib; { + description = "Clean and customizable greeter for greetd"; + homepage = "https://github.com/rharish101/ReGreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fufexan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 9d22963ebff..08e6d7ea447 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.186.0"; + version = "1.186.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-CzCPz/Bny57nkxR21ACXjhAoplVVm4TVSbH6De+fKfI="; + hash = "sha256-qpxYzman93e+u0BHxdhBUyfnZOR4hjQpTuNikGDNQCA="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 842d32b5030..86854afd482 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.02.25", - "hash": "sha256-iTdb+eI1alS6chCn2rEbUAy9iVAgVvsNGURxds/2f7s=" + "rev": "2023.03.02", + "hash": "sha256-rZzcWED8c68wtejUho71kbPtLyDyOlXpS/eg8Ti0r2A=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 41329ec143e..6ee95f860a6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -366,6 +366,21 @@ license = lib.licenses.free; }; }) {}; + beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "beframe"; + ename = "beframe"; + version = "0.1.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar"; + sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/beframe.html"; + license = lib.licenses.free; + }; + }) {}; bind-key = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "bind-key"; @@ -1659,16 +1674,16 @@ license = lib.licenses.free; }; }) {}; - erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "erc"; ename = "erc"; - version = "5.4.1"; + version = "5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; - sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; + url = "https://elpa.gnu.org/packages/erc-5.5.tar"; + sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/erc.html"; license = lib.licenses.free; @@ -2612,10 +2627,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.9"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar"; - sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli"; + url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar"; + sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3047,10 +3062,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "3.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar"; - sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs"; + url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar"; + sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9"; }; packageRequires = [ emacs ]; meta = { @@ -3731,10 +3746,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.39"; + version = "0.4.42"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar"; - sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar"; + sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3"; }; packageRequires = [ emacs ]; meta = { @@ -3821,10 +3836,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar"; - sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b"; + url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar"; + sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j"; }; packageRequires = [ emacs ]; meta = { @@ -4422,10 +4437,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar"; - sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i"; + url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar"; + sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm"; }; packageRequires = [ emacs ]; meta = { @@ -4896,10 +4911,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar"; - sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar"; + sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -5035,10 +5050,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.0.1"; + version = "2.6.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar"; - sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8"; + url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar"; + sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci"; }; packageRequires = [ emacs ]; meta = { @@ -5140,10 +5155,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.2.3"; + version = "0.2.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.2.3.tar"; - sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39"; + url = "https://elpa.gnu.org/packages/triples-0.2.6.tar"; + sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm"; }; packageRequires = [ emacs seq ]; meta = { @@ -5411,10 +5426,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar"; - sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar"; + sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny"; }; packageRequires = [ emacs posframe vertico ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 22f60c8fd88..3f6cd1e40c0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -1,13 +1,14 @@ { lib, pkgs }: -self: with self; { - +self: +let + inherit (pkgs) callPackage; +in +{ agda-input = callPackage ./manual-packages/agda-input { }; agda2-mode = callPackage ./manual-packages/agda2-mode { }; - bqn-mode = callPackage ./manual-packages/bqn-mode { }; - cask = callPackage ./manual-packages/cask { }; control-lock = callPackage ./manual-packages/control-lock { }; @@ -86,8 +87,8 @@ self: with self; { sunrise-commander = callPackage ./manual-packages/sunrise-commander { }; # camelCase aliases for some of the kebab-case expressions above - colorThemeSolarized = color-theme-solarized; - emacsSessionManagement = session-management-for-emacs; - rectMark = rect-mark; - sunriseCommander = sunrise-commander; + colorThemeSolarized = self.color-theme-solarized; + emacsSessionManagement = self.session-management-for-emacs; + rectMark = self.rect-mark; + sunriseCommander = self.sunrise-commander; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix deleted file mode 100644 index 6430e56ef73..00000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -}: - -trivialBuild { - pname = "bqn-mode"; - version = "0.pre+date=2022-09-14"; - - src = fetchFromGitHub { - owner = "museoa"; - repo = "bqn-mode"; - rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013"; - hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a"; - }; - - meta = with lib; { - description = "Emacs mode for BQN programming language"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ sternenseemann AndersonTorres ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 7fbf06b9d11..33d489b60ab 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -425,6 +425,18 @@ let rtags-xref = dontConfigure super.rtags; + rime = super.rime.overrideAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; + preBuild = (old.preBuild or "") + '' + make lib + mkdir -p /build/rime-lib + cp *.so /build/rime-lib + ''; + postInstall = (old.postInstall or "") + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so + ''; + }); + shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ pkgs.haskellPackages.structured-haskell-mode ]; }); diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 801148d32fe..c4ad89429c8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -3182,10 +3182,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "22.9.20230207171612"; + version = "22.12.20230301220803"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar"; - sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar"; + sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 61557a95e1c..04a04cec07d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220930, - 52 + 20230303, + 2214 ], - "commit": "e92b5cffa4e87c221c24f3e72ae33959e1ec2b68", - "sha256": "1nl7wm4l30hjcbqrvdci66aa6ax32ih46n58q3imc46z8c6rhqxh" + "commit": "ddc2b7a58a2234477006af348b30e970f73bc2c1", + "sha256": "03rqj11xdkspxcx2zjd71fnk7lpcjr0lws0i729qhsi1nr98jjn4" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20220701, - 253 + 20230224, + 1507 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "dc563f4b1efeac8ae75f217532f4c99b4ba417de", - "sha256": "188hisppjbpia3bmrpsxvkfi8xkirisarnrpvkk3ya4k8lv4z13p" + "commit": "35eeaa3aaf1a38b183783dc693012242c7dd2053", + "sha256": "0mvmib4yscpahj7zq1w88x6gdf80y482icwdv5pr7ai3ysvb70b9" }, "stable": { "version": [ @@ -1917,14 +1917,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20230215, - 715 + 20230301, + 337 ], "deps": [ "consult" ], - "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", - "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" + "commit": "21a6c74157b02388f429e8d5f8c910d04aa16f08", + "sha256": "0yrmz7nlclizx7z90xx8c66bqlmi43iphx3sagqrmasik671a2rj" }, "stable": { "version": [ @@ -2556,14 +2556,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20221130, - 2354 + 20230224, + 1610 ], "deps": [ "all-the-icons" ], - "commit": "4da28584a1b36b222e0e78d46fd8d46bbd9116c7", - "sha256": "0b5m1djwhfbjakfda72ybqrw3rzmrq154yfpv4p8wgxknc5xjxfr" + "commit": "b08f053cee444546ab44a05fd541f59e8bc8983b", + "sha256": "1mfdhiv70ay7mlcvm6aibjx8fa9vdy75al4rmdkcms9wf9qv0g3l" } }, { @@ -3694,19 +3694,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20230219, - 100 + 20230225, + 1931 ], - "commit": "972b9906bf6d23f5a8e92129a4572a906bdfe45e", - "sha256": "1zjnhgkjhgg58c486k6a0p3kns9kap0lfk538059r65nrv4mkbzp" + "commit": "ffa8d5865118bb33299a429e9c25577a79410542", + "sha256": "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn" }, "stable": { "version": [ 3, - 1 + 2 ], - "commit": "5286b1c61c82755e9486cb210524ceed038b265f", - "sha256": "1145zh7nqadgz5r2llwjwgj2aciv08mn2cpp3zlf0rf3awg86yg7" + "commit": "ffa8d5865118bb33299a429e9c25577a79410542", + "sha256": "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn" } }, { @@ -4510,15 +4510,15 @@ "repo": "alpha22jp/atomic-chrome", "unstable": { "version": [ - 20220723, - 113 + 20230304, + 112 ], "deps": [ "let-alist", "websocket" ], - "commit": "061958ab96c31085b5daf449b1d826b052777b59", - "sha256": "0jfmw11d18v8qjcqcfkcmq66ccaa97jq7y5v7m67kf2hcawxk2a4" + "commit": "f1b077be7e414f457191d72dcf5eedb4371f9309", + "sha256": "01024ikcy23hkxjpy6qlsa8sj3cyf4p3igx5i31qkq21dm7b8xqv" }, "stable": { "version": [ @@ -6031,11 +6031,11 @@ "repo": "vutran1710/Ayu-Theme-Emacs", "unstable": { "version": [ - 20200521, - 1157 + 20230225, + 1600 ], - "commit": "ed98a9f41d9f0e08458ee71cc1038f66c50e1979", - "sha256": "1qdw9pq1daydky0b94x248q27sjzaxpfw9d027xk6ygi9hksvcsk" + "commit": "16fc8d8085ca7763915fecd782ad11a596ca5773", + "sha256": "01ipwi06hqhz8zac4gc3gqjfcb3bsbx6armkf2zy31hjpz9b59kh" } }, { @@ -6263,10 +6263,10 @@ }, { "ename": "baidu-translate", - "commit": "ccfcd6624cfcfa242f18c3d81127e09b34c333a3", - "sha256": "1icsbbwar20qv0cpy3qssmbnwwjm07nqn126a0vb3yyv9amh76xl", + "commit": "ffd4c67ca8cf6b45427cefa42c642399bdc86295", + "sha256": "1zmibqy35k31hmq345ryhzhg2r114wa5gl52v0b68x10v7288j5a", "fetcher": "github", - "repo": "LiShiZhensPi/baidu-translate", + "repo": "suxiaogang223/baidu-translate", "unstable": { "version": [ 20211130, @@ -6393,11 +6393,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20230208, - 1903 + 20230302, + 1959 ], - "commit": "25611eed1e086c4e8cdd335dbd38b1d796be5b8d", - "sha256": "0hqqb7dprwbyhjmymknxcixwqk13fm6aninbjhlaxgwv93i2ghfb" + "commit": "91d51ede0d9424766a0c174890a331385390f7fa", + "sha256": "00v492mnz663mhw1dzimsvswpqz9aipyp1fachjqsmgld2vh5b19" }, "stable": { "version": [ @@ -6915,20 +6915,20 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20220824, - 1605 + 20230303, + 754 ], - "commit": "d0aec04c05911a0d47b34625959e1950ead4e4bd", - "sha256": "17m0dv2z8yf3cnc9fbvxcbg6mbk9vycws38rw6x5b05dg4vpi1pf" + "commit": "61f1eb22718fcd9796b47a98702d161ff323a532", + "sha256": "0a5nr3zwcb36nw4j7xzknvd14gxp52ilgs07hddcjjyxmhrrfmav" }, "stable": { "version": [ 2, - 3, + 4, 0 ], - "commit": "62c75804ba7d74f4c01c0629722c061c11bed393", - "sha256": "17r8v1sjvgcmprywny9fdg54x4pssp8p7a9ivv5mrygkqjz1vykk" + "commit": "61f1eb22718fcd9796b47a98702d161ff323a532", + "sha256": "0a5nr3zwcb36nw4j7xzknvd14gxp52ilgs07hddcjjyxmhrrfmav" } }, { @@ -7757,11 +7757,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20220922, - 2045 + 20230224, + 1336 ], - "commit": "456596e00f8277eafd9a08c62a71df06e8cad2c5", - "sha256": "0ii9gib5r18cbjgg1l54m0va1c176hvv07rfn4vzwyfksrbibl4i" + "commit": "1e80b970b130d5c33031f2539c89eb2f13da2572", + "sha256": "0v3ny3mrnx4b1aghg7nk62hgvv6qm7lbagh7p07hysf9m1241pcg" }, "stable": { "version": [ @@ -7804,26 +7804,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20230113, - 2009 + 20230304, + 907 ], "deps": [ "posframe" ], - "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", - "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" + "commit": "a8c4b8c3c8b3add17b10b7323c86228e322513c3", + "sha256": "1wn89161rrad6sc3fqimic2nrvj78i12hq5v0a2lykzb510xvmk6" }, "stable": { "version": [ 0, - 5, + 6, 1 ], "deps": [ "posframe" ], - "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", - "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" + "commit": "85a7b2d203a8a505edd9977953fd7e902948c3ed", + "sha256": "0g7kslmlq97ys86w7zjdp5fzxmxjx5plp7h1f24rwgszmppki3v7" } }, { @@ -8314,16 +8314,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20230214, - 2035 + 20230304, + 1502 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "786cf085a9af60083279297c599d5ea0f744efba", - "sha256": "142gj7mxr8kg412y6xkicwicsy9y7jc3pjsmmnx3x4c7msh3hkqi" + "commit": "1e85d6a11a756519dd4632b1bb2029a1e9c61f5a", + "sha256": "1dkhlmx567c1qys6c2bi18aqj0iqikhicb3phkjhwri340rkr40x" }, "stable": { "version": [ @@ -8572,6 +8572,21 @@ } }, { + "ename": "brec-mode", + "commit": "344abaffa2bb5fab9c30a769e9ab91dd47f187db", + "sha256": "0yyayymrgv1naqfnf0yjp468np0234wclmjgk757i0kj9f734q6x", + "fetcher": "github", + "repo": "Michael-Allan/Breccia.Emacs", + "unstable": { + "version": [ + 20230227, + 1146 + ], + "commit": "8672af3d473985b4ccd1d06a41ab74bf0d745655", + "sha256": "0bp4jry9ys984wzm7bvyg305jnf252hdqr7j1rhddla37pjdaz5i" + } + }, + { "ename": "brf", "commit": "203e7d21e2387866107740ead4ec28787d82ebfb", "sha256": "0439bzzzy6kx536zh9azxrdmfpb69xrr8axxg5q7989892iaqi5m", @@ -8647,16 +8662,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20230118, - 407 + 20230223, + 554 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "c020975a891438e278ad1855213d4f3d62c9fccb", - "sha256": "0g78l8jkwxmnpiwjk3yjbd7528mywwh26i3zzgy9a3904fv37rcw" + "commit": "1c2a565bb7275bf78f23d471e32dd8c696523b8c", + "sha256": "1vyybg5yvhm0b1cz7sll6x314iqwvk2zk96pv18nb1bga2nk775q" }, "stable": { "version": [ @@ -10062,16 +10077,17 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20230220, - 226 + 20230222, + 525 ], "deps": [ + "beacon", "hierarchy", "ivy", "tree-mode" ], - "commit": "18a96dbabbedcd9e55817af7b6a0f303aea09faa", - "sha256": "1xdb2fiyavhxn7m5gg5b7vr8fydlzdriz0ckhsr95v19vjylkwg4" + "commit": "5fd5f3aad35e3561c253870e4d7fa34353b70b7b", + "sha256": "1x4s5h4qpw3cm2bqnpwz0fkpznbs2fyvdk2zssbikwn9wxvpfapi" }, "stable": { "version": [ @@ -10097,11 +10113,11 @@ "repo": "caldwell/calmer-forest-theme", "unstable": { "version": [ - 20130926, - 510 + 20230302, + 2149 ], - "commit": "31a0bed8e5db1e314557175a719a10804ac089f4", - "sha256": "1rqd46ngnjln6vvcx7vsmwsjn4r3wfdpip6gqjqbsznav2g74bra" + "commit": "09fc50730ea386d3589863f8809e02e5bdd459cf", + "sha256": "02r4526p0cdxlza39xy982ajkza3pywm0p02zv8vszri584nxcc3" } }, { @@ -10577,11 +10593,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20230221, - 737 + 20230223, + 808 ], - "commit": "046358639b3b6948f0779a16bef51cec44c606c3", - "sha256": "01r3xpx55i4wwk2xzrl3y7ajckkwzpxlyx4ccpzn0l3rl8dbsw9c" + "commit": "cc450390d0b3a8fdbb032ee96deb0aeaa1984ce0", + "sha256": "0a182x3jzn4vkk5z2wlc7hahrvf1mdcp8mpn057w8v4gck6af5rl" }, "stable": { "version": [ @@ -11702,16 +11718,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20230203, - 557 + 20230302, + 700 ], "deps": [ "dash", "seq", "ts" ], - "commit": "f131e996320715238e8403439a18dbc016b09520", - "sha256": "1p25way281k6ygkws1fmkz2z9imcj7p82n6zlrlfjz37192d8saq" + "commit": "015524bbeb4a112db7bb2af813408cc3c5c93240", + "sha256": "19gp6bcsinw8f52gasbg2c46v6sny3s0m5j5h37wrdj4khif1xz0" }, "stable": { "version": [ @@ -11865,8 +11881,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20230218, - 915 + 20230226, + 1413 ], "deps": [ "clojure-mode", @@ -11876,8 +11892,8 @@ "sesman", "spinner" ], - "commit": "1ed5163433c991c00ea83fdd4447e8daf4aeccbe", - "sha256": "1r8arjpzl12fzd5j27xdgvqk33srs0cl0nrp9lm54zhqzxc7gbw2" + "commit": "2e213f92d7bd84da9bf3826a42edb43a4e2fe7b3", + "sha256": "1mzp1pvy481x5i35cvdhvn421fvfzyf2pjr78xbkj8bdavkcskc5" }, "stable": { "version": [ @@ -12175,16 +12191,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20230218, - 2016 + 20230227, + 2247 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "5dac3d5bf287566f049b44465e415afb42f30ec3", - "sha256": "03ypp4kb6h0x2i3g22mq2vynybmd39qzfg0s31k9bx3dbxxf2j1b" + "commit": "5c4310321cd955b89951f8109a573c001d830bd3", + "sha256": "159cspnzfz0fk4pb90fil1pp844zvwp02k4wnhvspq4p82j5qd29" }, "stable": { "version": [ @@ -12302,8 +12318,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20230125, - 1818 + 20230228, + 1414 ], "deps": [ "dash", @@ -12314,8 +12330,8 @@ "s", "string-inflection" ], - "commit": "2623043b2546ee09a4bd86641870ca86332c0bcf", - "sha256": "1f2bcshnccfbvbnkhnynkdpszrs4zb3z82hqrrdp9hf3ig3h5750" + "commit": "290320fc579f886255f00d7268600df7fa5cc7e8", + "sha256": "131b6jcyyry4qpv536n4llf8d5xc3a98qq49rvsp0sqwipqhx4qs" }, "stable": { "version": [ @@ -13273,15 +13289,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20230220, - 1944 + 20230224, + 1619 ], "deps": [ "compat", "emacsql" ], - "commit": "b670b88c6f2785ddfdff91439ceb332b1bf8a8ce", - "sha256": "0hffljz4353id5y7ps2saw9gsclyj1ishpvfa4vclpc9kg7mw58n" + "commit": "0a7226331ff1f96142199915c0ac7940bac4afdd", + "sha256": "1769a96nkfxlczx4sbzqab1xnn2540mwbwrcrcaxq72h3akrciq8" }, "stable": { "version": [ @@ -13454,11 +13470,11 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20230215, - 1434 + 20230301, + 1443 ], - "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", - "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" + "commit": "6c0b3d2b7e3cfdf62e895d6827f103e2b3fd8ef8", + "sha256": "0alnv9ffivjc0a7v96fv6h7xhh6mfpvp1dwcna823f6lfg7ncki5" }, "stable": { "version": [ @@ -13466,10 +13482,10 @@ 26, 0, -1, - 3 + 5 ], - "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", - "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" + "commit": "6c0b3d2b7e3cfdf62e895d6827f103e2b3fd8ef8", + "sha256": "0alnv9ffivjc0a7v96fv6h7xhh6mfpvp1dwcna823f6lfg7ncki5" } }, { @@ -13537,20 +13553,20 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20230216, - 803 + 20230228, + 631 ], - "commit": "4b1bbf854009992858e86a19de49b8dc91e924eb", - "sha256": "1sab7az9rqzylvay5ai8k2rg656hqd0ga4qwsy2plnmn0fx9iv24" + "commit": "ca8ea16ac3a6faec4ff4cd20514e7d2cffdd70a2", + "sha256": "1xxdwvphz2nk08k92g0xaxj0g77hj2b3myp13gw129np7czpdr3d" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", - "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" + "commit": "f42f417e84af020e6dfd51ebb4b1c605001b96b6", + "sha256": "156qj5dkipa5a3f3scldf1mcfvmp1g199ds2wyi6jk5gqfv73zsd" } }, { @@ -13893,14 +13909,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20230210, - 2047 + 20230302, + 226 ], "deps": [ "dash" ], - "commit": "9fd09481bbcdb35712d974d5bc3667f5a5900ddb", - "sha256": "0rj860ypsr9w9i1bq8wf8ssj54yxb3kp0q5wp0b67nh27qycywx5" + "commit": "1bc474bdbb1086a73638effde51f37a9da748173", + "sha256": "113nnfi8jdxp7a8m7jjsn0ww2fqymk2ai4nzfdxzdfsk0q0bp49y" }, "stable": { "version": [ @@ -14480,11 +14496,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20230209, - 134 + 20230303, + 2331 ], - "commit": "2ca3e29abf87392714bc2b26e50e1c0f4b9f4e2c", - "sha256": "1z73yn7jyjxm4lf3d3r65rb549w8npjdba6iaxqawf2a8hkwjgy2" + "commit": "83c408b187b957f5939ee814de68d46993247d4f", + "sha256": "1h2k8vq1sv75ga17i4lr1iiq9g3csjg65fbqqna4scv7vhkqkbw1" }, "stable": { "version": [ @@ -16519,8 +16535,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20230221, - 1603 + 20230228, + 322 ], "deps": [ "dash", @@ -16528,8 +16544,8 @@ "pythonic", "s" ], - "commit": "28f51e49fd25abff14c1b46dea196a90a77ced64", - "sha256": "1wvlpsz68m4nq499nhyspg5xls2ib5sxcha3mf7vn13kyl994si6" + "commit": "f90598f54af78469e61497560ddad05344810a35", + "sha256": "0m3fgvj415nr5ziafbc3km3kqlzifgxkpjwjbdd9xld871d83v1y" }, "stable": { "version": [ @@ -16683,14 +16699,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20230218, - 1212 + 20230228, + 1346 ], "deps": [ "compat" ], - "commit": "ffaaf6da909dc9ff766e5a5f16eb265635aa6149", - "sha256": "16id9w0fiavr08g9lq5am0ary7ba7p900ilf4gnkizabgji0padi" + "commit": "5b2b9f572a9046d3235b4fae0e70ef129f735a26", + "sha256": "12aypq3d6xm115q94wrk5qkzkxgqisdwq56blf96zv5c2gkj64cf" }, "stable": { "version": [ @@ -16712,26 +16728,26 @@ "repo": "yadex205/consult-ag", "unstable": { "version": [ - 20220419, - 1721 + 20230227, + 406 ], "deps": [ "consult" ], - "commit": "2460ae6829e86c9f1186a852304d919526838cb8", - "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" + "commit": "9eb4df265aedf2628a714610c2ade6d2f21de053", + "sha256": "1gjyxahz0mi2yf1zxwlnlyai331dq7pbw7n12c6mpk4wxqk709sf" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 0 ], "deps": [ "consult" ], - "commit": "2460ae6829e86c9f1186a852304d919526838cb8", - "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" + "commit": "25d7a2a8fafbaa956610023e4ca17389294773fd", + "sha256": "0im966lbr3jwq6kif8cdx0sbxxjkl046vnsj7yhi1847kqb749ji" } }, { @@ -17111,15 +17127,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20230209, - 833 + 20230301, + 1555 ], "deps": [ "consult", "org-roam" ], - "commit": "8f9f122627a6b4e1613401b06d707e3efdb3c2d0", - "sha256": "1wni3lsjlkhs76wx27np74qhs3k8hwq98yn6vfnkb9h4dg7d8ll0" + "commit": "ede01c2710836f055351d2ef0d9fac70b885ac65", + "sha256": "05crx412wnffz2069l44py4acnp3qv04zg0279z427il24lincd4" } }, { @@ -17519,24 +17535,6 @@ } }, { - "ename": "corfu-doc", - "commit": "78440eba5512b37243de24364afd5d7f46f8fcca", - "sha256": "0vi12khc9c9gcz8lagw75zkx377f7f6qdlgjr6rg37nd3ip4pkj0", - "fetcher": "github", - "repo": "galeo/corfu-doc", - "unstable": { - "version": [ - 20221128, - 1533 - ], - "deps": [ - "corfu" - ], - "commit": "0e6125cd042506a048feb7b6446a5653eccfcff5", - "sha256": "1cpx9flv6m10h1rganjmbccc289c4hzss9kd9mw6krsxiik65xl7" - } - }, - { "ename": "corfu-prescient", "commit": "72a84587636e291bee48d7e9ad5723791ad02d7e", "sha256": "1w7w88l43bpybgzdlp4b195y9y0mikp143wlki91s38m1hg0n0rd", @@ -18801,11 +18799,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20221008, - 1847 + 20230223, + 2257 ], - "commit": "9bfb9f0f566e937cc6a2f2913d1b56978b81dc99", - "sha256": "0d81b296ifn65h29cplvlznqjq8955a4kpsj9kyiwmg44v88afzv" + "commit": "ea2da3c7701542ca4cf703c7c29eb783269d18f6", + "sha256": "11dxr6152gpns08blxzmz1vnhnsjdyz1sgr8k6sq86phc1r0lplq" }, "stable": { "version": [ @@ -19858,8 +19856,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20230220, - 1618 + 20230226, + 1910 ], "deps": [ "bui", @@ -19872,8 +19870,8 @@ "posframe", "s" ], - "commit": "f5a8f240d85ec4cfe87314a5ac0c245b60a7dfe0", - "sha256": "08d815lfx89wd9dligy3q9j89jhjzkcy4fffmnq0xpjdfnvmjd5n" + "commit": "2cff309019de6b49e8508b2b07e1a6c043d3df5f", + "sha256": "08j4rlmi74v3g7plwja0cvd1jl9yi3rzc2lzqhl4fa7nb1z0iq0y" }, "stable": { "version": [ @@ -20208,11 +20206,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20230220, - 1916 + 20230227, + 1853 ], - "commit": "221ee4b77db77199380c519c4ba52c06abc725e9", - "sha256": "19qkly4k0j326kd4979cn1z35jpjnnbbmycxdp4v2i5h7hp76954" + "commit": "243a5006d16f004d1a72b2e2e459e28ca0206fd3", + "sha256": "1vvyggwd1vakvcw9i9fsm53dwx338s2682qpssr8ikhqs1hx7abx" }, "stable": { "version": [ @@ -20606,16 +20604,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20230201, - 2329 + 20230301, + 636 ], "deps": [ "dash", "s", "spinner" ], - "commit": "0d3e0725a7fe605978692076ab1d8f1870d8a269", - "sha256": "07n6f4axckxvl59ccmfsbzcn1qkaxw145274bs4izscc9x27ss07" + "commit": "ce8a6fa1952213aa4b79a7f1fc972541ccb0ae75", + "sha256": "1irwr8pjl5261a3zcmfcywmj9rcfbc8gv58wq1mpwa3wy3dvry9v" }, "stable": { "version": [ @@ -21359,14 +21357,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20220519, - 1115 + 20230228, + 1005 ], "deps": [ "reformatter" ], - "commit": "c77f1c1e75b6d2725019c5275fc102ae98d25628", - "sha256": "0b0pahi122rnfqpjk2svdcyywka2md6sch609d0x7vqlpylk66dx" + "commit": "87ab69fe765d87b3bb1604a306a8c44d6887681d", + "sha256": "1h55bcn0csy7xacl6lqhr3vfva208rszjn15gsfq0pbwhx4n6zhx" } }, { @@ -21683,11 +21681,11 @@ "repo": "mgalgs/diffview-mode", "unstable": { "version": [ - 20220322, - 2334 + 20230224, + 1916 ], - "commit": "bba07de698b519c143bffb57143a780b3dac299d", - "sha256": "1hq0rx397i5vqjk69m5d7lq9qk8acnd05abxmma86nzq89xi3ba2" + "commit": "8f07c0ff4a1acef990589df0d3e32288f19c9d71", + "sha256": "05jg0p5qrs77h59mq8mi6fxil8djcb53w3raj441avsywzziigvy" }, "stable": { "version": [ @@ -22864,11 +22862,11 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20220508, - 805 + 20230224, + 1302 ], - "commit": "62b559e1d6b69834a56a57eb1832ac6ad4d2e5d0", - "sha256": "18ggh4x7gqdnrdaknd4vkd34jgi8aw5s7r3a2xv54p8z22ipxrhh" + "commit": "17e805763d57370c4eff2c92ed257b72eeb9f94a", + "sha256": "0p9fznvblw6md37lgqjpyw8ifvgp513v2sgfyh6sqwpvzz0zl80g" }, "stable": { "version": [ @@ -23275,9 +23273,9 @@ }, { "ename": "display-wttr", - "commit": "a60a6643b6d8a5691d48b47c31eb560e0f793d26", - "sha256": "1lhnv2cqff22z7d7n2sx7pqvskyg5fbiax2dhfznf2xjmqh22lzi", - "fetcher": "github", + "commit": "f09bbadd59823e05964c5608ee96ce3bdcee1dc1", + "sha256": "036d8339h71vikld4psyihsw8fwspp854ll3g20ka1k0625csn8x", + "fetcher": "sourcehut", "repo": "josegpt/display-wttr", "unstable": { "version": [ @@ -23770,8 +23768,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20221023, - 1201 + 20230302, + 2046 ], "deps": [ "aio", @@ -23780,8 +23778,8 @@ "tablist", "transient" ], - "commit": "cc0046e6a557dce0ccc4108dd22e04f21ba8b0dc", - "sha256": "11l8jpqj6m04ndhnfz41nhph1rqjvqbfd5vw334mph776aq1baln" + "commit": "4a308e6b2184a1b7745df5a8b8adafb29b3f7157", + "sha256": "0fa61yfr7bys4cmhhkkcpdbczn19x0b3gqyybhdfpn4cqsrfr83d" }, "stable": { "version": [ @@ -24129,15 +24127,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230219, - 1605 + 20230303, + 847 ], "deps": [ "compat", "shrink-path" ], - "commit": "6125309c2caa3c98591a4c802e9b4dd2f7ea83e9", - "sha256": "1klyfazdqxy2kdb72mbaxy0ravpfikw030q61rbbhl47sp41yxrv" + "commit": "c705089c8dd689e7d19edd3c148571cee2fb2864", + "sha256": "1wyvp58wzssk38ibmy0c2d3207nwpfv46lh6y07a7yh9hh6adwzc" }, "stable": { "version": [ @@ -24708,19 +24706,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220725, - 849 + 20230302, + 2151 ], - "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", - "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" + "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", + "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", - "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" + "commit": "07364ae07301f6f0a1713a8dff520c813849ffb3", + "sha256": "0rpl48rdmgi7rsv6kgl048vfafnfcqwmvb46ibm9z3wjxsmfg131" } }, { @@ -25399,11 +25397,11 @@ "repo": "earthly/earthly-emacs", "unstable": { "version": [ - 20221018, - 355 + 20230302, + 1709 ], - "commit": "0427c367768ab52c359c34941ed13dbf419d74d7", - "sha256": "01s1srcc1qp9x74gdjha1cmr1fjv1fbwjd2h4rk74alyrhhzhwn5" + "commit": "a242a4d68ebefce81879823c54155e0a04d3ea4a", + "sha256": "1wycm065l60jviqvy5a5qkkcq5xdfnb8bhjcgq15ip93ks6p4bgi" } }, { @@ -25624,14 +25622,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20230211, - 2228 + 20230221, + 2204 ], "deps": [ "parsebib" ], - "commit": "abe6ed461b334673001b930f7e30752aa8aff526", - "sha256": "03vn16nrsap8sdy4bindjr3sr1xqy8w9vffy5a970ksygfdv2j14" + "commit": "5a03e4662dccbffe63605bb8e88bfb691ebe0afa", + "sha256": "0yakr2ai341nzhvibs3r7z06wjf0wnzwdavvagklwciq693w2hz7" }, "stable": { "version": [ @@ -26161,14 +26159,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20230212, - 617 + 20230302, + 831 ], "deps": [ "nadvice" ], - "commit": "2d13945c8d4c0ceee1c9310a2c1c4375f88a3b1e", - "sha256": "12v6jj6nlql00xn76x080y3cb3331zr7k83pk04v67l6wlh9l813" + "commit": "e1a391a618ec33d157822dbcc51d010559289f1a", + "sha256": "1w39abjjrig030330jhs12qg1gaphh4llmriii60smkwqw01aaf1" }, "stable": { "version": [ @@ -26765,16 +26763,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20230219, - 605 + 20230228, + 102 ], "deps": [ "clomacs", "dash", "spinner" ], - "commit": "c9a602efd4b3a1b607c630e55e3124d4a63048fb", - "sha256": "0pnkg8m4ba8nmxc77lcb316hnjhl205jsdfr29gls8qidlfhxwwn" + "commit": "29308faad38e9cabd98fb5a8450df15db1e4a4cb", + "sha256": "0n3fwhj760d4cvlarkmnmys303iahrk5643wypc7p0qaai181z3c" }, "stable": { "version": [ @@ -26815,14 +26813,14 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20230221, - 602 + 20230304, + 619 ], "deps": [ "triples" ], - "commit": "cb3dfbf8c6faa0aa95f603b855eb37260acdc89d", - "sha256": "1za8smby0sshl0icfjqwh6rlwvjzj0mflhf4pwnhynf5n7p3jdjg" + "commit": "f19f25279cab76d025f710ce3d373b92f9fad0ca", + "sha256": "1lmh6f0bnil197lr9pr7rka84b0ja5b42khnvqlzw30gd1b446n6" } }, { @@ -27012,11 +27010,11 @@ "repo": "radian-software/el-patch", "unstable": { "version": [ - 20230219, - 214 + 20230226, + 2230 ], - "commit": "ad8b18578d224cf8ebb1cce9a3b1b5a3d93a0e69", - "sha256": "0w97dqmn5imqpnwrsp442k23bssx07s5r29xspp00rwp4kjdggwa" + "commit": "c4a1b435181596fe71e18b2422e07e693b75203c", + "sha256": "0sspbrnkks4bl16jz5bqdwgb75qh0kjv8j09cwr54axbd51mf078" }, "stable": { "version": [ @@ -27294,11 +27292,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20230203, - 101 + 20230303, + 457 ], - "commit": "43ae6c375811754e640b0bae4678bf33e72988e9", - "sha256": "03ljcpy7bf08l0zdrq27h2h2mf92rwc8yv26w8bl4gam83ypkk1c" + "commit": "e97283f8cdc3ca16a0179a14c78f1ba6e93cef80", + "sha256": "1pknwkvf7bvcmy048bpybyrgf1mnw3575mphycjn6r8x9glj073y" } }, { @@ -27367,11 +27365,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20221205, - 638 + 20230228, + 237 ], - "commit": "5c067f5c195198ffd16df2f455da95e46cc8ce02", - "sha256": "12vl8a5xqz1cbi9bg3i7h7rjb1kgwdbfin6pn7zvzajfmg0pi2qf" + "commit": "16fbf1f17f09a8308d5e5df3a3a97277baa5736a", + "sha256": "100dlzzwaf09i3vp0dj8maf1is0pnp3r21iix41ymxrfcafx6hi1" }, "stable": { "version": [ @@ -28036,11 +28034,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230221, - 1124 + 20230223, + 2328 ], - "commit": "153785d7e7d392ae07fe0f91a8ba3af6dd6d7df6", - "sha256": "1q1xbgwbsd2ma7axlajhkq20z446wk5x9an60wynsxshnsjxrlfy" + "commit": "70f7070f4e79db4117892a2c5291d101b84c0710", + "sha256": "023c32anhia1j1ici7b4g92scps16mv160k03s1q7dgf430lw5ry" } }, { @@ -28827,8 +28825,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20230220, - 2011 + 20230304, + 1228 ], "deps": [ "cl-lib", @@ -28837,8 +28835,8 @@ "lsp-mode", "trinary" ], - "commit": "2776cd0c0617f99cac2da3da764d2f221f62ff2a", - "sha256": "12f7svl0nikgqja87xwqhm5xw47sqwmx86f9lx90yadacw8v71qw" + "commit": "2126a72f6d5d632741d9f5209997fb4f11133fd7", + "sha256": "0ldf83nddj7fixd5wplbhfh9vw3a684rzbxd24qbb23nsivhpqim" } }, { @@ -29142,17 +29140,17 @@ }, { "ename": "emacsql", - "commit": "4872ef038dbbf67008bfa7951574ee372d6ff68d", - "sha256": "0mip1v0mrp7b538i949q9jrqlk9sl3i0qxa4jmm99llrs82mmdj0", + "commit": "2e40e3364a5dec38672753093c28ae97d85de189", + "sha256": "0chvx5y58zabp690fvxxizmvc8px62vqb88xq0s1qmi4k7w08bad", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230228, + 1040 ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "415dbfd846f46d921a70a351695f0d0e8f75da35", + "sha256": "01px4ybaywc4yl3cgry6f6anl8j4wgzr72ii7bqzvhc8yv5ml4g6" }, "stable": { "version": [ @@ -29172,14 +29170,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230225, + 2205 ], "deps": [ "emacsql" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", + "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" }, "stable": { "version": [ @@ -29202,15 +29200,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230224, + 1201 ], "deps": [ "emacsql", "pg" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", + "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" }, "stable": { "version": [ @@ -29234,14 +29232,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230225, + 2205 ], "deps": [ "emacsql" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", + "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" }, "stable": { "version": [ @@ -29264,14 +29262,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230225, + 2205 ], "deps": [ "emacsql" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", + "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" }, "stable": { "version": [ @@ -29294,14 +29292,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230224, + 1201 ], "deps": [ "emacsql" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" + "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", + "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" } }, { @@ -29312,45 +29310,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230221, - 1532 + 20230224, + 1201 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", - "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" - } - }, - { - "ename": "emacsql-sqlite3", - "commit": "402d5f088111264aaca5196da9ca3ffada3220c6", - "sha256": "0kb92kgbhxllyx72igxlky5kzp9z8175zw9m8irxjb8x523sf499", - "fetcher": "github", - "repo": "cireu/emacsql-sqlite3", - "unstable": { - "version": [ - 20220304, - 1014 - ], - "deps": [ - "emacsql" - ], - "commit": "2113618732665f2112cb932a66c0e89c404d8777", - "sha256": "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw" - }, - "stable": { - "version": [ - 1, - 0, - 2 - ], - "deps": [ - "emacsql" - ], - "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", - "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" + "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", + "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" } }, { @@ -29457,14 +29425,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230219, - 1700 + 20230301, + 1415 ], "deps": [ "compat" ], - "commit": "8e7c53a8ec6969a8d54a22c7cb76f15e2e7fa3f9", - "sha256": "0dj0qds3mqc7bi4z945519q260mc0jrkmwjh6cz74dlw4csd0c1a" + "commit": "a6ea648cac9edc06b60b9b08f9b2b2c392163bd9", + "sha256": "0qn02yk9gk3knsq6kwbkkjpcr5zf0b1v24faj1fxbh1s009n8wbn" }, "stable": { "version": [ @@ -30058,11 +30026,11 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20230203, - 2159 + 20230226, + 2322 ], - "commit": "a45a2a01a7e629c9126b444d952fe71bcc9a262f", - "sha256": "04hndxiq5k3zgh0wq8xcn8dzf65fg9zjqb9gav9w53dq3l236h81" + "commit": "4e42b9b066ff0cd970328d769d736655be635e7e", + "sha256": "1yjsqp00d1r3b7ykrcysgii09nywm4mampzcnh7fk00bhbmcsdlw" }, "stable": { "version": [ @@ -30468,8 +30436,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20230220, - 1945 + 20230222, + 1304 ], "deps": [ "closql", @@ -30477,8 +30445,8 @@ "emacsql", "llama" ], - "commit": "576ba9fedc360d2f7dfb724f9f767cc4688e5b7f", - "sha256": "1ghx8y814wi09zi3fa19nmxw7b0v6fp4mb49ibf46608k0vndq0y" + "commit": "62f4763fdf6d372d0fa28ad18d5ae84112798c61", + "sha256": "0drx1svf0szqjlqb5x01kb8rgrjyjh27b3pvrvcbjx0yiaplmpw0" }, "stable": { "version": [ @@ -32138,11 +32106,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20221204, - 1348 + 20230302, + 2111 ], - "commit": "b6aefb9ca231c3cbb1a6532b8afa4022c2678f81", - "sha256": "0xjj842cxqg6lka9h4a0qamdjc0iifnhcddpdafarbssh2qaxiys" + "commit": "86d1bce8b53522a5939924960025799e66d9414e", + "sha256": "074drba1z8h0cidj7y657905lpkxp7ysds3iipl1nz24lfx6s28n" }, "stable": { "version": [ @@ -32771,15 +32739,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230220, - 1805 + 20230304, + 949 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "22d76a4080e40381aae194c94f3bc16ba67a330a", - "sha256": "110gdl73jfy0r28vs34bipyq692h2v1wfinrgkpak1s09zwcmnd3" + "commit": "2b2ba3cbeabe1f239b6b0ebdaddcb68dd158bd1f", + "sha256": "018kdczyp7aq89xwwim6mr3mk60a4wdj27radkl0va5xqkgbdscd" }, "stable": { "version": [ @@ -32972,15 +32940,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20230214, - 1800 + 20230226, + 2219 ], "deps": [ "annalist", "evil" ], - "commit": "aaf3e0038e9255659fe0455729239c08498c4c0b", - "sha256": "1791240px7n98k18cxsi2shdbjiayn80r20y86qdmb8j82rpdqcn" + "commit": "4d10a2d3305bbe28c1e11a059e3e9c8d2cdaad01", + "sha256": "0w014pa2qfd88zq4ihsz80lgshhfya61mncafnjxbf5rz2c5cxls" }, "stable": { "version": [ @@ -35222,11 +35190,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20221210, - 407 + 20230228, + 828 ], - "commit": "a9ceb6c2e12df460ce1686d47cafd88f212d0291", - "sha256": "1sdnzdph6gck2ghmafad10xc99avj7i01ad2r9r6iixhpa5qbpb9" + "commit": "68ab3e5f78239774d1710874e8a68e3f8498cee3", + "sha256": "09nxvrpz26kszc57lba6acial7196vc68rh23x12jqr9mrri6vhi" } }, { @@ -35800,11 +35768,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20230109, - 536 + 20230223, + 2309 ], - "commit": "889e77c899cbf28673915b7b0161d45734bfdcb7", - "sha256": "1zxynjsa6h0nvlkrvbdrzvqkxq10sggsg62lpaf1gzx1wqshhfq4" + "commit": "d5d790dee6b07f866d203c5c174440ec8a2b2215", + "sha256": "0x2b5fp6f4klsnpwdgls99b1jdch1z0yqy69bgrpr51bd1axshkd" } }, { @@ -36796,8 +36764,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20230116, - 1124 + 20230225, + 1326 ], "deps": [ "async", @@ -36808,8 +36776,8 @@ "s", "transient" ], - "commit": "286bea5b4f27d906aa7fe71baa35c8f2bf55c286", - "sha256": "0g8sg0d1d6p9lwxnb0agj3cjnhqwyxgddqpvpi271l2hvvdaq7y0" + "commit": "c8143ff6d32d13f809688800e761250b113d1b0f", + "sha256": "05gwxb8w1d2kwp9yd7pcr7pqzmbal0yhkiwxqqf28m9j2vrcyn3n" }, "stable": { "version": [ @@ -37670,8 +37638,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20230218, - 2135 + 20230226, + 6 ], "deps": [ "dash", @@ -37679,8 +37647,8 @@ "pkg-info", "seq" ], - "commit": "55614401a955e73f5c0f05c0e098d9e717e3116d", - "sha256": "1ywsdyzagwzrj0mjifn4yzyv5xxgaxrr865rxrp6dj474h054dnj" + "commit": "2f73050144e1ec0aca312cbe37aee3233ba45217", + "sha256": "1nhyq2n2j5k0p067cvh6qj93p8174zzq0mi11qan6df4ha231hg4" }, "stable": { "version": [ @@ -38535,28 +38503,28 @@ "repo": "falcosecurity/flycheck-falco-rules", "unstable": { "version": [ - 20230213, - 1603 + 20230302, + 2340 ], "deps": [ "flycheck", "let-alist" ], - "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", - "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" + "commit": "1ad301d497ade9556327053ca571ee51bf0c0633", + "sha256": "0z1p2np23gmd07ssaaf9mp4halazf79fldmirff09m1zckcan5p9" }, "stable": { "version": [ + 1, 0, - 9, - 1 + 0 ], "deps": [ "flycheck", "let-alist" ], - "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", - "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" + "commit": "1ad301d497ade9556327053ca571ee51bf0c0633", + "sha256": "0z1p2np23gmd07ssaaf9mp4halazf79fldmirff09m1zckcan5p9" } }, { @@ -40634,11 +40602,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20221002, - 2307 + 20230301, + 1441 ], - "commit": "efbf9e1fcc6ba4959c4ad0435742c96099f4f96f", - "sha256": "0qmfwfi818l8v18srkbz7hsq59wdklgdlqx1q6824qjndbrb41nq" + "commit": "82b1345c699172b6092e13be2c4cc10551d88b90", + "sha256": "0clwrn05hkc45y46q76xv25bp2gdnrk9c96n43fzxadzhw8ivv7p" }, "stable": { "version": [ @@ -41631,20 +41599,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20220531, - 913 + 20230226, + 1024 ], - "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", - "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" + "commit": "020d2a33568c8069801db9dd6992b8961a58de8d", + "sha256": "0ccq6j8x43arxm43rys1mcfppmq60zlfp5hbznxbzy208jck47rv" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342", - "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8" + "commit": "0134f9f864749f30f8ea3c6a86865b35d4352cea", + "sha256": "00ys5k6xx3wcccj37n326749ypifc43dafjp28kmqgf218lrfng4" } }, { @@ -42346,8 +42314,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20230220, - 1945 + 20230222, + 1917 ], "deps": [ "closql", @@ -42361,8 +42329,8 @@ "transient", "yaml" ], - "commit": "3164739dc70ee5ecf05d87dba9dc803d62a89adf", - "sha256": "01mxlikyxjl9q4gc5bp0i5vy2jvg7fc9ramilajgx37yf7nf5gn2" + "commit": "ba35ffc9bafc6457cc95633904e53e34e544543f", + "sha256": "1s7mdprdl2rd9cwnig854gypxqgpyl4xy824vly3lp0rffw7n9v7" }, "stable": { "version": [ @@ -42417,15 +42385,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20221210, - 1608 + 20230223, + 2008 ], "deps": [ "inheritenv", "language-id" ], - "commit": "c156ffe5f3c979ab89fd941658e840801078d091", - "sha256": "0h6sv36psl9rp1xvg5xzz4w2c7xlrz5iykivf7cfnq5g48aqsihs" + "commit": "c6f33e6efb55b5e5112d3d1366fea910d3629de2", + "sha256": "07xrrkiz0mxkw4hn92j3f19ghpwljbxnkbmq77yi6mlah7lrgcqa" }, "stable": { "version": [ @@ -43566,11 +43534,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20230114, - 403 + 20230224, + 1236 ], - "commit": "1d80e76df0899e26196aea150c29fba95fc73ed6", - "sha256": "075v5ypn4clkgg9jb4jd9xrw3ldy7sz5f2vryf5kniwm8zhs85yi" + "commit": "f90ee73f9427ddce396fdca93a5be1ea04e56a1b", + "sha256": "1zyqwd81mpc0xy63s5rkbj8r33ljd0i8bz2iqd5j7a7y26ym9r5z" }, "stable": { "version": [ @@ -43831,14 +43799,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20230120, - 1738 + 20230228, + 345 ], "deps": [ "project" ], - "commit": "e54d5e6dc659c252d10c4280f4c4d78d38623df5", - "sha256": "13q78d6pgmv7nmv0c4nfggbf29l624q73sycz3gr6hqng6kdlsvb" + "commit": "bd12f2dc6c5949e260f094fb60737498cd0ae9a5", + "sha256": "16qi3vk1yps4f5v98ipdl5kq0jq5qlnlpx8c598csj9yk86p1hsw" }, "stable": { "version": [ @@ -43861,25 +43829,25 @@ "repo": "emacs-geiser/chez", "unstable": { "version": [ - 20221027, - 137 + 20230228, + 2253 ], "deps": [ "geiser" ], - "commit": "d64687c46dcd12aa3225a0fa38269f79a248dfb0", - "sha256": "0hjbml8jmix32wpzjlb9wh8kkbvzzr3lrj4nrm8srnp2zibyqw4q" + "commit": "04ab4387fed68659f21377dbe74513edac2fd134", + "sha256": "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca" }, "stable": { "version": [ 0, - 17 + 18 ], "deps": [ "geiser" ], - "commit": "48427d4aecc6fed751d266673f1ce2ad57ddbcfc", - "sha256": "03fc9ahb0pmznkcnxzgpni4clj1zgky6vaqkc94nf8b8swniwkm9" + "commit": "04ab4387fed68659f21377dbe74513edac2fd134", + "sha256": "19yv5brhzf10hsazmm8s1b058d434hv60a52s08m3kxyrkwr5sca" } }, { @@ -44626,16 +44594,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20230212, - 2209 + 20230301, + 1402 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "47b7dc9bb299d50647cd24efebaf41dbc07d9e90", - "sha256": "0k9zx62cwcb3pribmj1s4f7v7d4rg3msnscv1y2pjf2x740a1vj9" + "commit": "6a5de97649ff3eca9aa20b79f3526b4b3ab86b13", + "sha256": "1xn95k8fd55q5z5kv3bzhvivvgk860gxsvsrav8s7d5clrvl5ilm" }, "stable": { "version": [ @@ -46504,11 +46472,11 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20230218, - 1717 + 20230224, + 926 ], - "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", - "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" + "commit": "9a31a12903cd3d9eb413948ef206023917c0d469", + "sha256": "1g3gnbb684rhclwprrx1jm81wsn0l65zkw6zcy8mpgk0ryx1nkhz" }, "stable": { "version": [ @@ -47346,11 +47314,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20230112, - 1532 + 20230304, + 644 ], - "commit": "e8343e7d41af67f55c2da9231fb275a93382a4c8", - "sha256": "0f8d96pz676bl1b8rh2wxhdw1incaf691rkdlwzyzsar51c11dj9" + "commit": "cb8002277d44c6b548f7e924fa1715706b5f986a", + "sha256": "1ca7pcvfzl69qc1zsvx2ifz2za88hb79vvckaw924pxqzabrcix9" }, "stable": { "version": [ @@ -48018,6 +47986,30 @@ } }, { + "ename": "gptai", + "commit": "24a96bdf7802aacded56d84e8824d9394335a309", + "sha256": "15m3nxlgzw0was6c3f3wmq6zw98fx47ga7dlxsb5wl3pnpr8nxnc", + "fetcher": "github", + "repo": "antonhibl/gptai", + "unstable": { + "version": [ + 20230227, + 1036 + ], + "commit": "a8de3ae18fc0fcec220a236165a81dfdc042d79a", + "sha256": "0drg83jnsly60mms9l0jl50wlffv4nc810pgh6fggr1is6yq96nk" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "fde04c9905de2a7ded5a1590e8296fee801d313a", + "sha256": "1jb8v4fdx5kaf6jckzpfckpmkb6isl3jj8lcijh1wxcjwj7wdyjj" + } + }, + { "ename": "grab-mac-link", "commit": "e4cc8a72a9f161f024ed9415ad281dbea5f07a18", "sha256": "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3", @@ -48147,38 +48139,6 @@ } }, { - "ename": "grails-projectile-mode", - "commit": "35d49029c1f665ad40e543040d98d5a770bfea96", - "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn", - "fetcher": "github", - "repo": "yveszoundi/grails-projectile-mode", - "unstable": { - "version": [ - 20160327, - 1324 - ], - "deps": [ - "cl-lib", - "projectile" - ], - "commit": "8efca50ce92b556fe9d467b157d7aec635bcc017", - "sha256": "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1" - }, - "stable": { - "version": [ - 1, - 1, - 2 - ], - "deps": [ - "cl-lib", - "projectile" - ], - "commit": "8efca50ce92b556fe9d467b157d7aec635bcc017", - "sha256": "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1" - } - }, - { "ename": "grammarly", "commit": "6bfa47f73110bdf2ca1b223dbed16f73c08a12f2", "sha256": "14cmvd50g3v7c6d96mqck4d0pbjvs92s4axkhwc9zw1h2sl4wni2", @@ -48388,11 +48348,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20230213, - 1945 + 20230227, + 2008 ], - "commit": "a3cbfa969051dd638a993e1962e2b965067896f6", - "sha256": "01f0p4gkbr2n57qkr4hxgwqm7rsflqp3y806ab4l66g42xn1lp5j" + "commit": "3199817b54ffd6644b9c1c3fdd2d9317bf95a152", + "sha256": "19jj3j6r1pjq8y7vi7aw99zcphbcicjcvhamxbb42s5ix2zafpb3" }, "stable": { "version": [ @@ -49136,11 +49096,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20230115, - 2105 + 20230302, + 457 ], - "commit": "0ada8c575d4e94b4f3edb0092239cfa835b17726", - "sha256": "0jq43w12j6sf6qammahfyhmzcq78y2w00lmaxr2mjqdmq435vhah" + "commit": "3b65ee2496d6de3c7c47a821b38a5a19e0b64c2a", + "sha256": "1xs25f7di94fb32ahh6h5rkv37bn9vrdahkp0hp4c7s9jpvxf5im" } }, { @@ -49290,14 +49250,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20220825, - 127 + 20230227, + 1950 ], "deps": [ "s" ], - "commit": "26f06ffe82574f98e7da381e48202eceb8ef0793", - "sha256": "0sbrrwlr64dkb1dnfblx5l8ypwmcjxwbzf7ppqjnw0n2wx466751" + "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f", + "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm" }, "stable": { "version": [ @@ -49788,11 +49748,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20221113, - 1425 + 20230304, + 921 ], - "commit": "a34ccdc54be15043ff0d253c3c20087524255491", - "sha256": "1z2jcgdm5bc13zwl4y7fn5rxqqzs3i54qw32wb2hwpa42izwq159" + "commit": "20d4e2300302a9af673e82d0185d3f489bfb0f59", + "sha256": "1n6r2y26rrb4y6c849lwfkckz8426jpcx2d4dzv5jkycvhcpzw59" }, "stable": { "version": [ @@ -50038,11 +49998,11 @@ "repo": "purcell/emacs-hcl-mode", "unstable": { "version": [ - 20200315, - 2129 + 20230302, + 1029 ], - "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7", - "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i" + "commit": "35784854efd29fa8c9fe827654d747a2ace5cb19", + "sha256": "1glz8p89c6mfrh92wycinqr1ffk5b6skjjn9qpqw6n510ccpzhwg" }, "stable": { "version": [ @@ -50115,15 +50075,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230221, - 819 + 20230224, + 658 ], "deps": [ "helm-core", "popup" ], - "commit": "fb3df89c7b0a68c79d6725beb20d3dc6ccd348a1", - "sha256": "189d1ldhaw83ahvjpi1l5q6v1agglvbll9qimfyv8g2h4nj50730" + "commit": "4d42ea5d0797696e6301ee5e193707ea394631e2", + "sha256": "1yarkycw8ly7iamj5gb0alzq8izyfizcgzym9clz7mis73v87afp" }, "stable": { "version": [ @@ -51021,14 +50981,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230217, - 602 + 20230227, + 649 ], "deps": [ "async" ], - "commit": "dfd6403947c5cd9f32afcd6bc92a1756cc958c82", - "sha256": "03rw1j7cs7glwcnwxp69zl0csfj138csyzcg6g2yj1vsm31mx2mn" + "commit": "e8957d1b38abd554aecfb2bf87ffc88b8d3311a7", + "sha256": "1xnnslv3gdqniwakz5xlxzdbvyiq1kja4rfka6z9gav4jqbvck1a" }, "stable": { "version": [ @@ -55848,24 +55808,6 @@ } }, { - "ename": "hl-fill-column", - "commit": "68c40d7b6af664e01083b78c60b6a8e66b278a4e", - "sha256": "1kv77zfz1rd60cajjgljn8b04j6szqwwc3ialfxf6wdzh1w28jd3", - "fetcher": "github", - "repo": "laishulu/hl-fill-column", - "unstable": { - "version": [ - 20200607, - 757 - ], - "deps": [ - "names" - ], - "commit": "5782a91ba0182c4e562fa0db6379ff9dd472856b", - "sha256": "0sfki2844yjlvnjlaia0n46af3c5y1bi74x91icwxccqwlkyg8jg" - } - }, - { "ename": "hl-indent", "commit": "3aa6ce8f3d1349e28dd9dea8396c38257e3cea2f", "sha256": "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr", @@ -58817,14 +58759,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20221114, - 616 + 20230226, + 653 ], "deps": [ "clojure-mode" ], - "commit": "e5ce3839835b9b561fca5810f43f413c96c197d9", - "sha256": "04ggx767a795scidy0f58d577pm7ipgpxpi43rlqc2g9gcgzk9sd" + "commit": "fb9b5ea55f9ef02be32660cc29df15023968fb78", + "sha256": "0kf9hm3l95yq1mxm6has2s13jw0rhxzrv10x5ym4qvr390rc9dic" }, "stable": { "version": [ @@ -58916,11 +58858,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20230122, - 246 + 20230304, + 1512 ], - "commit": "0ce7f4049edcae188b4643b3163e5301f9ef09cc", - "sha256": "0ygm4y0iwvh1mz883x9727jlw0pnf0xgl4b1xysbvsyg6gplf0xv" + "commit": "6f1df882ab319758af43877fa20465f6566efbf3", + "sha256": "11my63lfb3lcd2df0ych1hq3c3jcriws4ljvrmx1qqgxphli3dsm" }, "stable": { "version": [ @@ -59385,10 +59327,10 @@ }, { "ename": "insecure-lock", - "commit": "1fe53161ec25badb9a4b1b415f42d2d520bb614c", - "sha256": "1j1xkwqyrcgprsnqihd7c9x85rrphskwcjnvc9firvyw8rs5k4sr", + "commit": "170ba8b01dbb8385260ef546ecb4e5239c6cc686", + "sha256": "0c256qyrbnanly930w1kj13mnysw0pvklnvqw51pdyjq9cs30y3x", "fetcher": "github", - "repo": "BlueFlo0d/insecure-lock", + "repo": "kchanqvq/insecure-lock", "unstable": { "version": [ 20221111, @@ -59748,14 +59690,14 @@ "repo": "emarsden/ipp-el", "unstable": { "version": [ - 20220830, - 1336 + 20230303, + 1138 ], "deps": [ "cl-lib" ], - "commit": "21d3b3fd5d1e655126ee03dac9d6b46cad9deef6", - "sha256": "1w0mbpprzrf0b24s0cdm6h3g1m6ydp844n3wyd3nx0rf3w980wsy" + "commit": "8011ef4f550ebfbeefcacc1196a103580c730cfe", + "sha256": "05l1ryj54h5ylqia3zwncbsdqdklpj7pzvrmarnmfrs722r1s5fg" }, "stable": { "version": [ @@ -60879,14 +60821,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20210409, - 931 + 20230228, + 608 ], "deps": [ "ivy" ], - "commit": "600b8183ed0be8668dcc548cc2c8cb94b001363b", - "sha256": "1dv6vr7fv32v5m04zdy02sdajpvrnpc4i3pbh2dwfv73ff8d8yxm" + "commit": "4fdd4669d69c9e8248b361b6e069b27d10e809e4", + "sha256": "1marlsm5rcnsd3ddiwy82q8q05pchrjw867ngp7vrrlvi17x5hcg" }, "stable": { "version": [ @@ -61854,11 +61796,11 @@ "repo": "ianyepan/jetbrains-darcula-emacs-theme", "unstable": { "version": [ - 20210602, - 1430 + 20230223, + 1901 ], - "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", - "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" + "commit": "46f153385e50998826ca13e18056c6a972768cfd", + "sha256": "1qpjipigq320ri48ah8mnl7lq4hf8drk5lnpqr4csa7cgi83md6l" }, "stable": { "version": [ @@ -62869,11 +62811,14 @@ "repo": "FelipeLema/julia-formatter.el", "unstable": { "version": [ - 20220106, - 1414 + 20230301, + 1807 + ], + "deps": [ + "session-async" ], - "commit": "a17490fbf8902fc11827651f567924edb22f81cb", - "sha256": "15ij7l80s847ykphdpmlcbj1jdhfx2ki6gkzqh90sbil3yby0qzs" + "commit": "6297a3e6b4b24ec0158b43b886be346043c2772f", + "sha256": "01r1mrnxn53fbz2p2cvzn967i35qq2gph7vp1r2sp8zv06k8ybaj" } }, { @@ -63201,20 +63146,20 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20221107, - 1633 + 20230303, + 2255 ], - "commit": "45a221063093f3461816913acdaba898e62b42ce", - "sha256": "08n2z3822g5gq2zdbj2nzmd5y4xwa8w4bpgcgdjffnc9casnjdwm" + "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", + "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" }, "stable": { "version": [ 0, 1, - 7 + 8 ], - "commit": "45a221063093f3461816913acdaba898e62b42ce", - "sha256": "08n2z3822g5gq2zdbj2nzmd5y4xwa8w4bpgcgdjffnc9casnjdwm" + "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", + "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" } }, { @@ -63679,6 +63624,25 @@ } }, { + "ename": "kconfig-ref", + "commit": "2edbef3c799e7832945898d2df91464d1c9b8008", + "sha256": "0npsv07jhzav22iv7jdr04k2gqavc7m5x41qgih4m0zwqq0y031v", + "fetcher": "github", + "repo": "seokbeomKim/kconfig-ref", + "unstable": { + "version": [ + 20230220, + 1207 + ], + "deps": [ + "projectile", + "ripgrep" + ], + "commit": "dfb127fa5ac003a06f108d2e876c84a1931e5678", + "sha256": "1rzqj7if1qk59rhp9ddmw0hjf52niacdvyacpdcyc7v7m49bnwil" + } + }, + { "ename": "kdeconnect", "commit": "c363866d30fb86ae636d30def8c3847711ada762", "sha256": "1bcwpnwmm1l2jzc5znw8z6f5knysinidsbm12v4r1j8v6v80ydw6", @@ -64302,14 +64266,14 @@ "repo": "debanjum/khoj", "unstable": { "version": [ - 20230218, - 231 + 20230301, + 423 ], "deps": [ "transient" ], - "commit": "61b6ee2857b92721fc2c7e1329ae476a8d41f040", - "sha256": "16rcjgyaqkncfxy8zihn339rj1dxc55pcr4h1m1z1hpq7dnk895a" + "commit": "e77a5ffc835dd006e17d9903307413dd495db729", + "sha256": "1pnl222qv1z1ggfhjk20x1ngi360jwkzwf5zil0v4lgrlmp6xf6i" }, "stable": { "version": [ @@ -64554,6 +64518,24 @@ } }, { + "ename": "kkp", + "commit": "dcae17bc6cc208122587fb2edaaedde2bc30a89c", + "sha256": "1izg1ga1djshr7vmkk0pxsywgyz64dcc7abnraianwb7005lsxgb", + "fetcher": "github", + "repo": "benjaminor/kkp", + "unstable": { + "version": [ + 20230301, + 2147 + ], + "deps": [ + "compat" + ], + "commit": "38440c0b64c12299dcf789622d59d1c9b85fca9e", + "sha256": "1vn219njvxlbcqkp0bg9y1wdsh0l46xiqih40wc3zqmpajciwpq2" + } + }, + { "ename": "klere-theme", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "05s3l0zzh9wrfi2mpw1krddqnqgzixgd7dmfcz7jnj2pda09j7bf", @@ -64576,11 +64558,11 @@ "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20220323, - 2215 + 20230303, + 2339 ], - "commit": "429abd82c97031948b7681197551bb77708bd174", - "sha256": "07yxqcq84hlj3h3b66cwlmmk4cfnwb7pfr5lqvgaxywvziv2hqng" + "commit": "913e08cfa377eb1537ed066e2a4f08b8d8d59a5e", + "sha256": "1dhpghbaqdjsmwkhf96qi7cakzbwm4gpw7wjr9l75dnw132fczn9" } }, { @@ -65109,16 +65091,15 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20220509, - 1234 + 20230302, + 1345 ], "deps": [ "aas", - "auctex", - "yasnippet" + "auctex" ], - "commit": "44533de4968fee924d9cc81ce9a23c9d82847db3", - "sha256": "13rflldz3684qv6xvg44sj6r1dzaqclmjcg0rxfnksf6cb47l1yg" + "commit": "7f4044918c4e0a9b71128f36f65f1d86842203f9", + "sha256": "1n2w97rskbdjgiic6wjsxdjfh536v05mpx0f14bbjasj9y0cjh1m" }, "stable": { "version": [ @@ -65302,11 +65283,11 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20230207, - 950 + 20230222, + 326 ], - "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", - "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" + "commit": "416abc7d1c1cbb31a9bddad458366215bad0089b", + "sha256": "1fw1xb7dbdv2frcnvvkplx30y20g0khp3xgb2s4p5ws97qpwqbf3" }, "stable": { "version": [ @@ -65344,15 +65325,14 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20230207, - 319 + 20230222, + 401 ], "deps": [ - "langtool", "popup" ], - "commit": "25b23a2dc592cdfe498740af87d975f7ef23a854", - "sha256": "0hbvkynasz54scd1avsskxav9nlb3z571wrmz2z10kyx3z6rnr9a" + "commit": "d86101eafe9a994eb0425e08e7c1795e9cb0cd42", + "sha256": "0wbjmkxlj79iffd7v64d6qpv97jc0jwfcy3849dglm8xygx9x7cg" }, "stable": { "version": [ @@ -66721,11 +66701,11 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20230130, - 541 + 20230302, + 1616 ], - "commit": "fa63e64ff3de4de78f74c2d270c0c0f000abec8f", - "sha256": "1gxpdr7ssdzmax4g7fcn15l3rr4m4zm2gv695iywa5x48k4syzn8" + "commit": "d1073474efc9e0a020a4bcdf5e0c12a217265a3a", + "sha256": "0ipk7l2dhfc6qv3nqdyhxasswyl11xg9cklka6s3hv4sly0c2lma" }, "stable": { "version": [ @@ -67505,13 +67485,13 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20221108, - 300 + 20221107, + 147 ], "deps": [ "units-mode" ], - "commit": "72e20233db66cb37306bdc066c68e6d7086ab3c4", + "commit": "45004b3a865771799b739d17ebb7849190fffa63", "sha256": "017lqavwks3f0q71aw0mw45k79d0ydjfdn2l9i66bmvdms5bjih5" }, "stable": { @@ -67591,11 +67571,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20221203, - 38 + 20230227, + 18 ], - "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", - "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" + "commit": "b0721520a55b34a86144ebee5dd3f2d8287bf34c", + "sha256": "14x1kl6bigpbfvppr1w3jxd5y0h9msxl6rc0qhcqhklbddvwj3hb" }, "stable": { "version": [ @@ -67931,10 +67911,11 @@ "stable": { "version": [ 1, - 6 + 6, + 1 ], - "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", - "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" + "commit": "5c31af49bfbb2f387fa505ba4aeb2004b249af2c", + "sha256": "05y2qvagcc4r3q594gvlabd37ljw51482wdhw8d49ls624fdcwyl" } }, { @@ -68722,26 +68703,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20230121, - 1846 + 20230228, + 1711 ], "deps": [ "lsp-mode" ], - "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", - "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" + "commit": "9200ad19c416b3945d62683dd606917d8a1b3fee", + "sha256": "1wclmi12y13hd85y76wbyh3qvny1w3cyxhg57ip73i2v8paxhn1f" }, "stable": { "version": [ 3, - 1, + 2, 0 ], "deps": [ "lsp-mode" ], - "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", - "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" + "commit": "9200ad19c416b3945d62683dd606917d8a1b3fee", + "sha256": "1wclmi12y13hd85y76wbyh3qvny1w3cyxhg57ip73i2v8paxhn1f" } }, { @@ -68828,8 +68809,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20230221, - 1558 + 20230304, + 1615 ], "deps": [ "dash", @@ -68840,8 +68821,8 @@ "markdown-mode", "spinner" ], - "commit": "e6293251a65554fa23f87d0e883d121b4f0aed4e", - "sha256": "1gkn3zw9h2kgpcmmpsadnh9aazgyyp9lmxkl6i7wd7gx5mg6fp49" + "commit": "eb9c9c914b50bfa281453ab1df09243b2eb0bf3b", + "sha256": "17m21i56wxg0mnqnbv4yjd8c841ibj1xy2bdd6v39xw3c8fhjfsv" }, "stable": { "version": [ @@ -68988,16 +68969,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20221201, - 1501 + 20230225, + 1118 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "4cd2adbb32287278d9d9da59a3212a53ecdf8036", - "sha256": "0ys76xd1bg9r0hkgq1h3aq6wxsjxqplxmk7cfwazzh9nwmgp9s22" + "commit": "54a2acddfdd7c3d31cb804a042305a3c6e60cf81", + "sha256": "1256q00zsh4q4p3qx5jwih1j7j7nfgmwvv9m0bn6j588wj97aiy2" }, "stable": { "version": [ @@ -69581,14 +69562,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20230215, - 142 + 20230224, + 49 ], "deps": [ "transient" ], - "commit": "e7b16e8b78db6d7fcc17eb05fa3a2a4ed439f2f2", - "sha256": "1kzxq9qcsn63lqx22d21zd4c8wm80d4nhqfsvh5m3p88as9ff29q" + "commit": "b56f47a2ba386a4ff68d249ba9675b1a22135a45", + "sha256": "1d3j6savqgp4fgbh0lvmyspar6ic090w2js5fdrpn71vk3hmxsf4" } }, { @@ -69775,8 +69756,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230221, - 648 + 20230302, + 2135 ], "deps": [ "compat", @@ -69786,8 +69767,8 @@ "transient", "with-editor" ], - "commit": "97a95f70079b6613bf98d2306279d3e03fe51234", - "sha256": "1mm13lpq2ank0pnnf6q4qfpaw4k6fw3zjd1qgdi73l4lw8rrbvrx" + "commit": "b926ab0e051e497e8ed43754cfd2012d23dbfc4c", + "sha256": "1k1hdhj9nwv0ylwkwg3mvkgv5mhnyzscdck8qdfn18s7x2p5952x" }, "stable": { "version": [ @@ -70297,15 +70278,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230213, - 2018 + 20230302, + 2130 ], "deps": [ "compat", "dash" ], - "commit": "deb10e984e16201182b0569f7df7d30ec3b8afa9", - "sha256": "0qh8170mb2bm2zmncpzd7zz11s7bvbw9pzpwf52cbai3qk90b544" + "commit": "410e4583e01b7fac31a4748e78f4c613859d3c41", + "sha256": "0g188jxvc7v8fhjwfd17i000fv1qf5mgi5bm7dvl9pjlawx2qgcn" }, "stable": { "version": [ @@ -70321,6 +70302,21 @@ } }, { + "ename": "magit-stats", + "commit": "89f49701d5760a927fd3ddfeac035f1d27c81fe8", + "sha256": "06k6jj2i2ll9kq12i3rh7097grz9vv4vkjwkjsajky0l6qild3s4", + "fetcher": "github", + "repo": "LionyxML/magit-stats", + "unstable": { + "version": [ + 20230223, + 1819 + ], + "commit": "41b18e5fc664dba93981a7931f476632c5b54a7d", + "sha256": "0ggl29cqxskmwjzj4aqahdd3a9228wxwryj1kaa613vvfc96cgyq" + } + }, + { "ename": "magit-stgit", "commit": "8528698b6e61e62b35a95d9c297d5b868a81a3db", "sha256": "0v8vc4swp3y0z4dsiqmlp6znlvpl1q8bypslq6wnhd36m4mcn0l1", @@ -70422,8 +70418,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20220822, - 2224 + 20230222, + 132 ], "deps": [ "async", @@ -70435,8 +70431,8 @@ "s", "transient" ], - "commit": "c5030cc27c7c1a48db52b0134bf2648a59a43176", - "sha256": "0j32zslcbiaq2a6ppyzdq4x59payya5hzd2kpw3mdj0p479byz19" + "commit": "c6f3fd03aa5b750636c2647253f21cc03329566c", + "sha256": "1nmym73i90fik9949cwzh615bm7h8vj9k6fbn6i4ms97f6wy715p" }, "stable": { "version": [ @@ -70733,16 +70729,16 @@ "repo": "Olivia5k/makefile-executor.el", "unstable": { "version": [ - 20220928, - 936 + 20230224, + 1329 ], "deps": [ "dash", "f", "s" ], - "commit": "170d14d834a0d163cd618d642d4580ff75b014be", - "sha256": "1g9mzic9k27fhpzcfpvlirgks2ip13z4xn8bfqabmp0xgq41ga5j" + "commit": "d1d98eaf522a767561f6c7cbd8d2526be58b3ec5", + "sha256": "0wm0i2m124dglwq0szp6pdh2r0dln0xpgscw2immi9cchcmgcy4f" } }, { @@ -71107,14 +71103,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20230217, - 2050 + 20230302, + 252 ], "deps": [ "compat" ], - "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", - "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" + "commit": "6aa48ab592d209449800e1dc04c083007b5a6fcf", + "sha256": "02ycfa6j2hg11r3b92yfzyn2abydmahzgwnakbl48dca6k84xz3m" }, "stable": { "version": [ @@ -71233,11 +71229,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20230212, - 1208 + 20230227, + 342 ], - "commit": "c765b73b370f0fcaaa3cee28b2be69652e2d2c39", - "sha256": "1i9qw8pyf44zvdfc8nh5gjpiihhafvjjqwgc6z7r6jl2gn4bmyri" + "commit": "f4567202bbe76a211e454525e6d093a86a1cef14", + "sha256": "0zbfrpqb3aa1imn746gnnr76q6gphir056aqgbin9lbzzzipw979" }, "stable": { "version": [ @@ -71563,16 +71559,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20230219, - 2053 + 20230301, + 2133 ], "deps": [ "persist", "request", "ts" ], - "commit": "4f9a7be4926dbf3f33a717fcbed12de78c22b331", - "sha256": "0grgilbfzn1fhmzriq5wynxm119dlav8d975inhr2gi49sg8bx1d" + "commit": "6eb7c27bef937ec76f3dba0ae19b57de4561bf8f", + "sha256": "0rh0a1bpba5zmkpa4rnyz7czdb8ggj3gwzyxqld9jb00ahwlrdfp" }, "stable": { "version": [ @@ -72252,11 +72248,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20230213, - 200 + 20230226, + 101 ], - "commit": "1e69067c1647ea634c87c021c5acf4a81152f4b2", - "sha256": "125g3ya4n7whj88ja80gl8pfg3zwnkbmizkxyvs1hfwla1xr559p" + "commit": "8754857b800e0bf22c85bebad07488e85146e81d", + "sha256": "1pcg06m17nh202w0lry3mhjhy9g6m9xa87rb9fhk8dkavrff1p0m" }, "stable": { "version": [ @@ -72285,13 +72281,12 @@ "stable": { "version": [ 4, - 7, - 1, + 8, -4, 500 ], - "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", - "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" + "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", + "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" } }, { @@ -72315,8 +72310,7 @@ "stable": { "version": [ 4, - 7, - 1, + 8, -4, 500 ], @@ -72324,8 +72318,8 @@ "auto-complete", "merlin" ], - "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", - "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" + "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", + "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" } }, { @@ -72349,8 +72343,7 @@ "stable": { "version": [ 4, - 7, - 1, + 8, -4, 500 ], @@ -72358,8 +72351,8 @@ "company", "merlin" ], - "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", - "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" + "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", + "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" } }, { @@ -72412,8 +72405,7 @@ "stable": { "version": [ 4, - 7, - 1, + 8, -4, 500 ], @@ -72421,8 +72413,8 @@ "iedit", "merlin" ], - "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", - "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" + "commit": "1fbb47f7559fd4145cee3661cb70e2fae711df53", + "sha256": "1qyzynvaz010zxmg7sq5dxlxclrr2fkirny2izan8i2j1s2vrzwr" } }, { @@ -73213,14 +73205,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20230212, - 2213 + 20230228, + 1944 ], "deps": [ "compat" ], - "commit": "c5e8b65620558409a79766e86e3e8263cef765df", - "sha256": "1prs6zr924smh1kiq1rljz0vim4rl2ngi5rj7lrq60k0hq1vyddl" + "commit": "199b6022f82dc54e7cd58ca302810e16dc506b53", + "sha256": "1j3jc2yryi8b32b8y9gp5qjpxd2qx0rs8s0kmfkq5xm8gf9cxrl2" }, "stable": { "version": [ @@ -73928,20 +73920,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230220, - 1859 + 20230228, + 2011 ], - "commit": "f4282839d880a88062acaafbd8acea2708d3932b", - "sha256": "0nn5mkm2pn59l1bchxaz59zsl9xhvjxmqc5vizrgl77y9mjkws96" + "commit": "d8e92a50f003908c72a2f588beb1856041dc9cda", + "sha256": "0p01ji9rnxc82pcvn80w6xs47khqyxqia4s9wm6ap8003pj2nzq6" }, "stable": { "version": [ 4, - 0, - 2 + 1, + 0 ], - "commit": "ca4d92aa0dd2046a06821281b12201bcaa95bb1d", - "sha256": "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f" + "commit": "829d06d9d3f6753dfcba3d811237cc138c5ffeb1", + "sha256": "1rfnn7c6qv3qmzpksdzy7623qijbldnmr7hl9ka2kwnhdarsigkk" } }, { @@ -74096,11 +74088,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20210417, - 12 + 20230222, + 2153 ], - "commit": "72c7cd21b7b995c476e938fd0b92a494aa25c3a7", - "sha256": "03khwadd3x3s9wrggdfjj8cff0nr64fj6hzc9yqbn2baxfkgrn8l" + "commit": "7046eee5fc9ac625924382cb4a82b0d8efcd9ff0", + "sha256": "01k3qfhh0ly9x88azsh0skxsxsjv0b80s1ydg6m59cxis2jc7gxc" }, "stable": { "version": [ @@ -74302,11 +74294,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20220911, - 2344 + 20230224, + 1234 ], - "commit": "9029cd76ba037ca31cc7b91453ff5f8510747cb6", - "sha256": "0p2xwsv77ygcqblc80xcdd92f37vag8zsldw4vvd9c7hr5n5m4s2" + "commit": "864bee4e121771a055fab2b9f3e53cb3b8a8e02a", + "sha256": "0j1v4l3kj522jcpc5xz2k1mjadgwa8jvjbk10yjpx6w5rwlh2ypz" }, "stable": { "version": [ @@ -76064,11 +76056,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20230215, - 623 + 20230304, + 551 ], - "commit": "508bf3505e9bf60163b68056b89c084df97b48aa", - "sha256": "0x1n41c8bvi1ynsa9ka8wz7plk0a04c18ynyswcff3shrzayyr7d" + "commit": "3b5a6eb800a78df66a8e1c08c2465110ec36c10c", + "sha256": "0hzqzr1fdys4v0lad24ns9gj58ha69j2qlj5ir2l1gsa3c961dgc" } }, { @@ -76666,20 +76658,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20230217, - 957 + 20230302, + 1337 ], - "commit": "abea182499897eda40088d24b647e66099ef94ed", - "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" + "commit": "350c7ce94060bb0a6e57b32d35c37d9b17d88970", + "sha256": "0fs209m3bn3jm6zwwhfx10w5f0xssddc1mpzwjdzk1q41f5wryjp" }, "stable": { "version": [ 0, 1, - 56 + 57 ], - "commit": "abea182499897eda40088d24b647e66099ef94ed", - "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" + "commit": "350c7ce94060bb0a6e57b32d35c37d9b17d88970", + "sha256": "0fs209m3bn3jm6zwwhfx10w5f0xssddc1mpzwjdzk1q41f5wryjp" } }, { @@ -77515,16 +77507,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20220604, - 2100 + 20230222, + 1441 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "ec99d579b9fa26fdb5f5e00dfd77e968ed8386f0", - "sha256": "0bnalbgf3bdvwnvmdjy1vq439n6vkfzmp9a5rgn0kdr32ar75kfw" + "commit": "bf0ff5d4a079004f937e7440ba282c156f24dced", + "sha256": "129kp12rbggq3hy6w14264svf4a2lf3l5j9mnlf47f35w9zvwxd6" } }, { @@ -77586,6 +77578,24 @@ } }, { + "ename": "no-clown-fiesta-theme", + "commit": "3004633d97d78a997b4e904b36dc13f87df1503f", + "sha256": "0cvg8ldnn90sqdkrk64im42kbr6f3z3zk9skbda9v530l456m38l", + "fetcher": "github", + "repo": "ranmaru22/no-clown-fiesta-theme.el", + "unstable": { + "version": [ + 20230220, + 1019 + ], + "deps": [ + "autothemer" + ], + "commit": "e143cdfa7cecac6383328eca88586105f308bca9", + "sha256": "1j986mbr49rlfxx3dsq5fjipif1gpkwjhx6f7sm9zppnf51r875h" + } + }, + { "ename": "no-emoji", "commit": "af6b04c1f95468254f2cf361964df9fd25d23586", "sha256": "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2", @@ -77653,16 +77663,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220812, - 1535 + 20230228, + 2331 ], "deps": [ "kv", "request", "s" ], - "commit": "c691e770da0f1ed5b83c656087dfbc2ff231bef7", - "sha256": "01whmrfikxmxz2dmg1hy7myp68cvnblvb9blvk872k30y8yv074n" + "commit": "4a4f2169a840902799348e589c6f0211073c9d96", + "sha256": "1x3s25ai1g93gql5hdwbdq9lkhx4dyg4skz0xzfas12xv398pqb9" } }, { @@ -78836,11 +78846,11 @@ "repo": "nickanderson/ob-cfengine3", "unstable": { "version": [ - 20191011, - 1721 + 20230226, + 1954 ], - "commit": "195ba4694a0ec18d3fb89342e8e0988b382a5b1a", - "sha256": "0a18fv141s35vh1mza2d6q5japrfjg5g6l7gp6qq4k4im3gmaf86" + "commit": "52aa32fdfa412860837e795d17d50dac237e56e4", + "sha256": "1gskkxm3ah8x5flhwzf6x4i7v75fzls20g20bg6r8xranyp7av8v" } }, { @@ -79668,14 +79678,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20220819, - 2228 + 20230301, + 1951 ], "deps": [ "restclient" ], - "commit": "1b021ce1c67c97fa1aa4d2c0816edb7add129e48", - "sha256": "1bcjj01q5n9w2cch6brbz8pzwnwsmdlgaa4sf5s97b9frmqb2ffg" + "commit": "ded3b7eb7b0592328a7a08ecce6f25278cba4a1d", + "sha256": "0992xs7mkljgql7g4jrbvnm1dqkbzajfaj7jfrrxfrcd4b7i5ny6" } }, { @@ -80196,20 +80206,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20220718, - 1147 + 20230224, + 907 ], - "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", - "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" + "commit": "c94ead524c8294a8496b9efde7a6817a9a79f26b", + "sha256": "1h8pr68wql5qia3wqgfczz0m5m4ql44c39bbnhlnld039fsva42y" }, "stable": { "version": [ 0, - 24, - 1 + 25, + 0 ], - "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", - "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" + "commit": "c94ead524c8294a8496b9efde7a6817a9a79f26b", + "sha256": "1h8pr68wql5qia3wqgfczz0m5m4ql44c39bbnhlnld039fsva42y" } }, { @@ -80393,14 +80403,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20221229, - 727 + 20230225, + 556 ], "deps": [ "org-re-reveal" ], - "commit": "a2dde292e464bfb9b4d8ab470bb9a6a37b5cb6b9", - "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" + "commit": "e124770d9d728155f53432f3adb47f5d2fbd17c7", + "sha256": "08q2z2d06kcg1z9mycwgwjqrfn6a8a90rzg7iqb77qlvpayf24n4" }, "stable": { "version": [ @@ -81895,11 +81905,11 @@ "repo": "inickey/org-clock-reminder", "unstable": { "version": [ - 20230217, - 728 + 20230222, + 1956 ], - "commit": "fd3d2ca9d5ca1a804c0e70193f89f650c69a8dc1", - "sha256": "119ad38hnj4i1wbsp9hkl5sa3s8z17aqly2y5ml37dbfid05w0ps" + "commit": "d3bf97113fd519aa08198e2283ba9c236a6df168", + "sha256": "026isn6qa4ra69ivm1b12k63dbcz4dcbz34ks6c6fby95rcbmhis" } }, { @@ -81972,14 +81982,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20221221, - 431 + 20230227, + 1417 ], "deps": [ "org" ], - "commit": "bb4032eb12c20d34555a4e670f28696cf31a7b54", - "sha256": "149s34d4j68f8crp66xmscd22svwkar1a6zifznxlyhvszg0zl27" + "commit": "ae45b9413e24abdc431d12858dced54e0dee6e39", + "sha256": "0dgw33db262pbm58l8z04bkh3jk21ddzziiblkbxzm736g6ckivq" } }, { @@ -82905,15 +82915,16 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20230220, - 812 + 20230222, + 514 ], "deps": [ + "beacon", "ivy", "org" ], - "commit": "e7170ff613734f24edace3309d69e23ef73f4b0f", - "sha256": "0sp6qpzj69n1hir9widxdbhz3781ld5hg1h98s23v1lqqxa6ddk9" + "commit": "7f2afd8c196e3723ae6ac4dd229367ece9acd3bf", + "sha256": "1k3l2zhwmnbxbslxrp07zsvg5xrzawiklskw90bpfvwakrbnsh88" } }, { @@ -82924,16 +82935,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220725, - 1808 + 20230228, + 1619 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "9510f2010750c5c74b6c1be7e06939afd64aa39b", - "sha256": "1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl" + "commit": "13457755932565306f42074c69076759a428568a", + "sha256": "0syrrk7xf44hxdxa6iff31vzkvbp4lqlrmxj2rinf2rr4fp47h6q" }, "stable": { "version": [ @@ -82958,14 +82969,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20230109, - 1217 + 20230224, + 1529 ], "deps": [ "org" ], - "commit": "c84f1a771933d662695c20b73832a6415b7d3603", - "sha256": "0djypcb09iwx42mrnwq3nr381qmz0ssavwmsvzmq4rfpdj3gh5ly" + "commit": "64a1fbc504269f407b9270cc2c4c5e34a85508c0", + "sha256": "1lysha39rc11skgvv74axdxsw9p16988kyg7l4l9syn7dw8zffa4" }, "stable": { "version": [ @@ -83111,14 +83122,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230221, - 1311 + 20230304, + 1214 ], "deps": [ "all-the-icons" ], - "commit": "370535e4259888f686cb6cedcabb79c5b389e6bb", - "sha256": "113q1axrhl1y5lq5pf799nlh0i7vinrikphb90fwmx35y0gkpgj7" + "commit": "8e0e45bf5bb06996895e99a223ee038fa9da5bf9", + "sha256": "0biiky3c50cbnwfyy76vwjlhdk2s6nmjwbzsy4mg21pbqq43xbxa" } }, { @@ -83207,11 +83218,11 @@ "repo": "aimebertrand/org-mac-link", "unstable": { "version": [ - 20220616, - 2340 + 20230222, + 2228 ], - "commit": "0b18c1d070b9601cc65c40e902169e367e4348c9", - "sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g" + "commit": "16734797b56b5bd1f49929b59f7cd8fcdcd268e0", + "sha256": "0cs6j6gkqkspf9g7ci37vm63bvsdl9914w4lx2y6b8mn4phd2wn2" }, "stable": { "version": [ @@ -84155,28 +84166,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20230220, - 848 + 20230228, + 1655 ], "deps": [ "htmlize", "org" ], - "commit": "611d6bd1f66eedf5ee2590426990efd4ca990076", - "sha256": "1l8qjzijgbjzy4skhy9n0z05bczqlyh9lxwsd98f83mv956ghbkd" + "commit": "bf4e23e2ce9109d35957c9f42fafe9c9edb6bf4a", + "sha256": "0v9403zjxays4c66xq3zq2285h77pn2ha7afx70xffjyynmvnz6i" }, "stable": { "version": [ 3, - 17, - 0 + 18, + 2 ], "deps": [ "htmlize", "org" ], - "commit": "91cdd82c47b86990b5eb41fe34446a042194cc83", - "sha256": "1bp3kz2awy2mizs59qsa2yl7wfa0197fklnramzifz6z2zv5kbrx" + "commit": "bf4e23e2ce9109d35957c9f42fafe9c9edb6bf4a", + "sha256": "0v9403zjxays4c66xq3zq2285h77pn2ha7afx70xffjyynmvnz6i" } }, { @@ -84334,8 +84345,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20230131, - 1743 + 20230301, + 1259 ], "deps": [ "avy", @@ -84350,8 +84361,8 @@ "parsebib", "s" ], - "commit": "4c691f7b4cafbd9bf8c9608fe9d590f7c4894d67", - "sha256": "01yym610ffmf38vp3m3h9vc00y9gfx46pn83js6zwksq2rf6n96l" + "commit": "348cb860e5cfc2b32870e826218df16cf90e7d75", + "sha256": "02fmnhxag40182xcnpsiwf1r32fm13fs4j79xijgyvkdrljwrcsq" }, "stable": { "version": [ @@ -84498,8 +84509,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20221231, - 2122 + 20230223, + 645 ], "deps": [ "dash", @@ -84508,8 +84519,8 @@ "magit-section", "org" ], - "commit": "74422df546a515bc984c2f3d3a681c09d6f43916", - "sha256": "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9" + "commit": "e73807efe135c5797d7a94c0f205a7fbd4b2e781", + "sha256": "1d75paijz6dv1qqpj68j412wbcrpxqxdlqhpp3wg4d1gx414cniy" }, "stable": { "version": [ @@ -85153,15 +85164,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20221211, - 941 + 20230228, + 1622 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "5eb75d86c143c1801c71b54fe0da832affc3adc3", - "sha256": "17hq54v6f1b4cbjf9dsxq7f72ls5bal8lmhfjd27kkbhj2h5ky1w" + "commit": "1902d475b47b342d250c934ad26e2b35d6aafb4d", + "sha256": "0i4cr0yqry2m3grk11nqlpa9jaz8vwfa17qia5hpvnsxi9q5jzdi" } }, { @@ -85435,11 +85446,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20221016, - 1623 + 20230304, + 726 ], - "commit": "d6529bc2df727d09014e0e56abf4f15a8e8fc20f", - "sha256": "1br32mpwarmrn158y2pkkmfl2ssv8q8spzknkg2avr16fil0j1pz" + "commit": "badeab8bed56b41979ce65894e8c267db3ae9663", + "sha256": "0z8pgx5l16h14hal7401vq8ng64m5vzi7b533pamxcnsv1czkhxa" }, "stable": { "version": [ @@ -89028,11 +89039,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20221007, - 1402 + 20230228, + 1530 ], - "commit": "1efca921cbb49380396df9d81308b32e55fc8b63", - "sha256": "054s29rbqjrsn50d8ckvg0b9581bpq5bp1yb4905p8p2sbhjgmsp" + "commit": "ace9df707108b17759c004c7387655277122d4c1", + "sha256": "02h5sbg2bqkmksj1ap4z7301hnsp5ga6951jrnwy89ds0xvrbg6l" }, "stable": { "version": [ @@ -90040,20 +90051,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20230113, - 318 + 20230225, + 1439 ], - "commit": "f9c1361ad69073af8133174f9e37b594df9be361", - "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" + "commit": "5ff41262f158d3eb966826314516f23e0cb86c04", + "sha256": "187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj" }, "stable": { "version": [ 0, 3, - 8 + 9 ], - "commit": "f9c1361ad69073af8133174f9e37b594df9be361", - "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" + "commit": "5ff41262f158d3eb966826314516f23e0cb86c04", + "sha256": "187cyl005csmmmh292km1v3ffl8x49h5qyn87i4adz9l5sqnpdgj" } }, { @@ -90337,14 +90348,14 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20220917, - 2111 + 20230301, + 111 ], "deps": [ "f" ], - "commit": "7620c18223f126c384dbf42b0b167a6066a81dd1", - "sha256": "0azkf569fm8z8igd7wwgmf8w6wl3gd7r24j5nsbji16k8jfvq03c" + "commit": "9d2d747b18c3f1d330bf9f09c9f64af9446c1268", + "sha256": "18srb4m56jrbz059b0yl4ryl319pn0qwwl8kmqm010kzsg5xbjiz" }, "stable": { "version": [ @@ -91597,14 +91608,14 @@ "repo": "mtekman/planemo-mode.el", "unstable": { "version": [ - 20201216, - 1122 + 20230227, + 1139 ], "deps": [ "dash" ], - "commit": "9a981f79a2727f87689ae5a07368c41d35902a67", - "sha256": "1hx1mdbb25hggg4kwga97m3wysm0yj11hnnycmbwa85c9rn96jzv" + "commit": "537ebe40688ca8f3786aa1e9842265e6f34584d2", + "sha256": "0q9k8djb4f8c2q1649cxmjml2w8zzdgwnj5n7vi01n03qp85mhzd" } }, { @@ -92190,15 +92201,15 @@ "repo": "cybniv/poetry.el", "unstable": { "version": [ - 20220915, - 801 + 20230304, + 1540 ], "deps": [ "pyvenv", "transient" ], - "commit": "3da3990d3cea17f84c90257cc206540d4ea1b6c6", - "sha256": "0gz31v1c4v8yzl5wmzgh115083g17n9wndhgvw3wkx9xharkzhgr" + "commit": "5ca52b221e57bb9dce7c89f62e7b01da1346a273", + "sha256": "1622lb747ihk24saiz9kl7k55iwa1cp4bifgg2shchhcdn7mj8vg" }, "stable": { "version": [ @@ -92294,16 +92305,16 @@ "repo": "polymode/poly-R", "unstable": { "version": [ - 20210930, - 1921 + 20230303, + 1140 ], "deps": [ "poly-markdown", "poly-noweb", "polymode" ], - "commit": "e4a39caaf48e1c2e5afab3865644267b10610537", - "sha256": "19s99k0madr5yp9v523yj1990fmark09vixn31lzfmghi8nmdmck" + "commit": "f2e85391efe2d5a9516687422b4784d185af5241", + "sha256": "0i6wjmqanzngk3jh9lmm2i54hy0m9zg420ky2f8jqgqjykfpx6fs" }, "stable": { "version": [ @@ -92846,11 +92857,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20230120, - 751 + 20230302, + 2055 ], - "commit": "da70c8296a3b3b69626b11f2d202a38075f00c7b", - "sha256": "02lls6fh0fyxq3hwnwb5kih26q29fgl9g4isq1qk6j7bvv53gb04" + "commit": "76b1a1f1bce412296d564056c76dd174bcf8ec64", + "sha256": "1x842h2yps3l0llbd8akilgr3drsh9hal603l4is270c631b6c2c" }, "stable": { "version": [ @@ -93111,20 +93122,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20230212, - 808 + 20230222, + 53 ], - "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", - "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" + "commit": "dace2dcf105e9685b4085836645b3392dc7e2211", + "sha256": "1hr0hcxkqsdzl8gnn8iap67p675rlxp76dbr3yygq97475klyrk1" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 0 ], - "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", - "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" + "commit": "dace2dcf105e9685b4085836645b3392dc7e2211", + "sha256": "1hr0hcxkqsdzl8gnn8iap67p675rlxp76dbr3yygq97475klyrk1" } }, { @@ -93293,15 +93304,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20220414, - 1453 + 20230304, + 1454 ], "deps": [ "request", "s" ], - "commit": "88bc5229cba1604c8f74db0a1456d99259d538cc", - "sha256": "19fvibfv3skvs77k3bsd0q5cg3shn9wrdjfyrcybgc9sjfcngv7n" + "commit": "0765581ee2b2b16f4f762193335630064c229477", + "sha256": "0sj0khimvzmiiwfj5dy19adwypcinjg8y0rqm9dbq7ii55cbiv26" } }, { @@ -94237,11 +94248,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20230219, - 647 + 20230228, + 706 ], - "commit": "fd257811c46f89f53143dd0ccbc134fc9459d6bb", - "sha256": "0rawixwdya1cva40r0ppq8c22ifdlprgyz6nw1a99w3bgny284zn" + "commit": "5143d32abd92ed111dc0cb69bf21946de7c6eadc", + "sha256": "0f8fr177s8khrd01bw6b6rqyi2g3x6a1gvsryz23xms6w0d636hl" }, "stable": { "version": [ @@ -94823,11 +94834,11 @@ "url": "https://repo.or.cz/proxy-mode.git", "unstable": { "version": [ - 20220210, - 1410 + 20230303, + 706 ], - "commit": "620e48c6afaf760d0ee9f5bdf583fd91cd9d0ec6", - "sha256": "0xlla1ymqgpb15bycxl4xijlgcwir01krcvsyhxl4anmrpj2c0hm" + "commit": "eca6f0b8a17fcf9eb961ed0426f57a5b7ca4e1f6", + "sha256": "0mmlkci81m116gvak6z7pi8yskbl62209y3h7h3lfjb30jx77zww" } }, { @@ -95604,16 +95615,16 @@ "repo": "andcarnivorous/pyconf", "unstable": { "version": [ - 20230127, - 2046 + 20230225, + 1741 ], "deps": [ "pyenv-mode", "pyvenv", "transient" ], - "commit": "f78e7f269210c7d7e06001752d87c8fbfd8b9084", - "sha256": "019c1hcdfr9cnpcag2qyg2lkf1scg1m6aw0nllwn31cwa8mvyyga" + "commit": "25adcbdc007011f2b6f4b5b0a6748298ab229fc2", + "sha256": "18sg6cgfs43mwcz7b845v3nj48q2qm7z8wgj4l6rrykz5716ihn1" } }, { @@ -96095,11 +96106,11 @@ "repo": "thisch/python-cell.el", "unstable": { "version": [ - 20220105, - 2315 + 20230224, + 1925 ], - "commit": "9a111dcee0cbb5922662bfecb37b6983b740950a", - "sha256": "17izy7sd7v2144yhshv0nymqx6bkrc1grb60imz5ipqhm6b6yf92" + "commit": "cb8e6381b1fab16bcf475d115bb22fef503bea32", + "sha256": "11drjn5a9k25wsw3z870yvy911772v1giq7j2j0d72483kimlq0d" } }, { @@ -98628,11 +98639,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20200815, - 1555 + 20230221, + 1803 ], - "commit": "51e4c51e6078ebf0681e65f7dea4f328f0c91cfe", - "sha256": "04x0vi92bd7zz026zhk40bxh82559wzrv144rnh0yq92l6dscfm9" + "commit": "9c2a3193ccf32f8fa48578a6b8826b2959dac120", + "sha256": "0qj9vnl5zqw288aw84nrwy21fqzi40b2yiv0g4km8y5pq7w13rw2" } }, { @@ -98741,11 +98752,11 @@ "repo": "DamienCassou/related-files", "unstable": { "version": [ - 20221125, - 1824 + 20230225, + 1900 ], - "commit": "0c2e38d0bb0db45a50a082d3e8362c07fc60a1f2", - "sha256": "0n87x3ilnn7kc607pa5zffrkpbnkv4xa9hlzyx8ga8xj756zk558" + "commit": "5f0888e6427c49b9ca62e5e21f135db0966a2194", + "sha256": "0jz5gf9alp8qbywi1y509w9h7fjp1bwjsgkvwfym72hmx34v7lbw" }, "stable": { "version": [ @@ -99511,11 +99522,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20221123, - 1643 + 20230302, + 1422 ], - "commit": "53ec006aa6aa4fae9c6c64004692aa3d01b38275", - "sha256": "0qfl774796wpplzsv8ns31472615sb6hh6r7z2mvqhm3i0a5d35z" + "commit": "01b37d63e498eab3ac6ad2588777438cfd4d7f60", + "sha256": "1k6zlj419zcvm84df50icy112p43ahw3g4lzr4a9k0jnnfkvyr6z" }, "stable": { "version": [ @@ -99535,15 +99546,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20230201, - 1819 + 20230223, + 1846 ], "deps": [ "transient", "wgrep" ], - "commit": "e7afc1573922dd6ec8e8ccd178e054ff8c99e5bf", - "sha256": "0cng9kra880gma19jl9c8wwrsz94qcha7ymjrw279zq3244750j1" + "commit": "f09de8b43ebc88e3ddce686dc717dfb79159ee90", + "sha256": "045jswyndsviagmqk0ffybhg53207g07f4p2zrzvfxh9d1ix3kr2" }, "stable": { "version": [ @@ -100182,11 +100193,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20221212, - 1047 + 20230226, + 826 ], - "commit": "b437e46bee8f64eec1b8e61f86476977dab6cdb4", - "sha256": "0vbadwr5gmr7px40mhphm4v11ix302bj9f4m8mw7h5mwm8y84skb" + "commit": "a0d33da83424deeea484565a13c6930bda9b176a", + "sha256": "0y7zx4m3h3zm0slmmmsmrwrsv57hwc1nwfd1jn8cjl7hrrkj3z03" } }, { @@ -102839,14 +102850,14 @@ "repo": "FelipeLema/session-async.el", "unstable": { "version": [ - 20220302, - 2008 + 20230223, + 313 ], "deps": [ "jsonrpc" ], - "commit": "427238bdfde880106dd39cf5845b559975e52f4f", - "sha256": "0zrcfycfgy87bpfm3jcfzp72ky5marbd5w4xf4rqvnw9spml6sya" + "commit": "e06835ea181b3a15099280527c9a4590d2fa61d1", + "sha256": "10yh94bvvnq2aszg64xvbkn8zbr4bmhj3x7q44i71qqpblb5jwj5" } }, { @@ -103397,20 +103408,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20230116, - 805 + 20230226, + 320 ], - "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", - "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" + "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b", + "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", - "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" + "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b", + "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9" } }, { @@ -104533,14 +104544,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20220721, - 1600 + 20230302, + 1219 ], "deps": [ "terminal-focus-reporting" ], - "commit": "d7a415b00bb1ddcf940d82afdd01e8b793d5466b", - "sha256": "1vj1yr6likmsapr6nrkbr3sf2bk9w16jxa8hra0328b3q8afh21f" + "commit": "24360d83e25fc040792a7888ec4a032b8949e09c", + "sha256": "1g7s2qvfpxagsqylw0n0gymsc508jwfnm838fp4xpa1s2cap1pj8" } }, { @@ -104875,15 +104886,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20230215, - 2125 + 20230222, + 1526 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "5e8fc7cad5ae7dc19b434c559ebaee3185d80b98", - "sha256": "1jllc6zk1vmh7g2zq9y1a5kihclawjf9zkizqz8kzs4hsyp6racs" + "commit": "e193bc5f3431a2f71f1d7a0e3f28e6dc4dd5de2d", + "sha256": "1ykbi3rzmh454j22gchl3z0as9ffbs0jgk9i2ry9jbgilrs8ydcl" }, "stable": { "version": [ @@ -105114,11 +105125,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20230216, - 1140 + 20230224, + 911 ], - "commit": "fa70fc8ab1bc1f1c21661d672834e41b1d0abd39", - "sha256": "1bfigrb4nnx4sv50jsx15jsyh2yfbb72g5nhjbhcpmv8apkq4818" + "commit": "f34c22289a2b3ab10e607f9f8822d62bb5c98cf5", + "sha256": "1i64iid9drc4iqmmgvgsfzm28v8128rbq29ccj2a0rn0465jk3wc" } }, { @@ -105614,15 +105625,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20230219, - 1728 + 20230225, + 1026 ], "deps": [ "cl-lib", "dash" ], - "commit": "f0c863268d296e38d4b5374f4c165cf9a823cd8c", - "sha256": "0f65wwjz4nxk2v49qmqck14xlyv1hfqnzjsf8ny1dv82l0v1by4s" + "commit": "1d5cd5e8d46e182b935f8cd3cf29c8c4410aab0a", + "sha256": "16hfqyq7rb214v8cwixnx0jjcyhi98arzzzz2l6sg9bmqv9d1nig" }, "stable": { "version": [ @@ -106646,20 +106657,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20230102, - 1459 + 20230227, + 1454 ], - "commit": "7669770034f773bd96a71bb5e0cde93a8f0495e9", - "sha256": "05n2fjvs94s8023xmnbcrdbpqa25mh5j8l7naw4xhlggzynjfvan" + "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", + "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "0b30ee125571a715d069846b4dafc5de8923cedd", - "sha256": "1vqhnajljx104yw11q6r1ywdxhdwsz5cf314wmq718zc58w68xrg" + "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", + "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" } }, { @@ -106939,8 +106950,8 @@ "repo": "TheBB/spaceline", "unstable": { "version": [ - 20211120, - 1636 + 20230221, + 2314 ], "deps": [ "cl-lib", @@ -106948,8 +106959,8 @@ "powerline", "s" ], - "commit": "9a81afa52738544ad5e8b71308a37422ca7e25ba", - "sha256": "0m4542wba9zi18qv8lzhgz8f9dbf01l3dca7vv7i0wmnjsg9bsj9" + "commit": "e0f848cc116d9046a04a09f5728fabf892863b7e", + "sha256": "0pbx1s4g6hwwbf0wg8lb58h2iidrr9fpzvybjvd2yb5p9mz4l1nl" }, "stable": { "version": [ @@ -107137,11 +107148,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20230220, - 118 + 20230224, + 116 ], - "commit": "7ae6710a95a02c90b0f13486e8f20be3a746bee2", - "sha256": "159hxs3pa9pmjbhm9i3c2271zllvajw68g8sdcggx6lf3mp5w402" + "commit": "66afaeda787edbb509b24fd3999763493822d3f5", + "sha256": "17h6qqglxrj11m9ck2r1cija916bsrpdlyy2iwg7xarmk9dxwpc8" } }, { @@ -107765,11 +107776,11 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20221110, - 1050 + 20230228, + 2310 ], - "commit": "108521be0242bedf232775a28728588da9699336", - "sha256": "0xcybd9470lvlw3nwlnpz0s8nx1h2r1qfwcd1sqk65p8p3gi60q9" + "commit": "50b814063bef617028e4ace4e2315e5d29ed62b9", + "sha256": "0xb01xvb74bflb7mklza17rkh22c7sn8hlqzzf866qqim9mlz1kj" }, "stable": { "version": [ @@ -107805,6 +107816,21 @@ } }, { + "ename": "squirrel-mode", + "commit": "f4179f87b96fa1aaad9320c53d0e844d68e68a20", + "sha256": "07pgwadlzlz1bljcjl0fk5airakiha290p9057559qjmyf3qc2ki", + "fetcher": "github", + "repo": "thechampagne/squirrel-mode", + "unstable": { + "version": [ + 20221227, + 232 + ], + "commit": "1af79dfe70c4c8e6f0f144bfd2eb65c077aca785", + "sha256": "0pmk410i5ik8rbkn7zk4i1iq0ax7hkvdv0y7ikyi3m159rjbfnaa" + } + }, + { "ename": "sr-speedbar", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", "sha256": "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052", @@ -107873,11 +107899,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20230205, - 2247 + 20230228, + 2212 ], - "commit": "7e92ae3b4c4a7f3386bf1d7d620e5cd29e6e3b37", - "sha256": "0apccq1hj4sydkd7sa5iziavpi6swzaj6w7gckp5n8pjzibnqlx8" + "commit": "5599488e07c538d893e296da1f55fa24ac9f194a", + "sha256": "0yd4p45m5wrsxysgcsmwyzg0jpjq8nc5arilpj4l6s90sra5c6lm" }, "stable": { "version": [ @@ -108150,11 +108176,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20230209, - 21 + 20230221, + 1620 ], - "commit": "f910112a76f0ec62f7150a3a2d4f1337a1809ff7", - "sha256": "1zcdbg69aicwsr53h6sbsms7cwq3l6zdhlb0fm8jy6r1rn9clwv8" + "commit": "5ef623020e6a2d43ac82a2a9b71c434d4e8a0585", + "sha256": "0v10v89h0vhhvlkpvc3j3yfmmsmjggwq08lyyxm4r05zk1pk2wr0" } }, { @@ -108309,20 +108335,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20221212, - 1619 + 20230224, + 2315 ], - "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", - "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" + "commit": "327d1dbed318a21b96d8234b6ee11e58efe442cc", + "sha256": "1zzvj1wwd4dvcd1ydyanxrhf35bs9zjsc2pg2yf5jyhkigxim3sv" }, "stable": { "version": [ 2, - 1, + 2, 0 ], - "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", - "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" + "commit": "327d1dbed318a21b96d8234b6ee11e58efe442cc", + "sha256": "1zzvj1wwd4dvcd1ydyanxrhf35bs9zjsc2pg2yf5jyhkigxim3sv" } }, { @@ -108378,11 +108404,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230209, - 1359 + 20230227, + 852 ], - "commit": "518b7ad3b6b8234d5a34dca1301f218f786e0a1c", - "sha256": "0066ddnw8ijxbh3snqkkysalf84qj0r5rk4d5zpvzbsals6dhcr3" + "commit": "85bee715164c186114d986332b7d694a0c9c068c", + "sha256": "0yq6gy0k0bk1zna2scbrikg81jsyqqnirgjbmjnmf15zfbdzmqvx" } }, { @@ -109990,14 +110016,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20230221, - 937 + 20230225, + 1508 ], "deps": [ "cl-lib" ], - "commit": "830fc4d4fb5d31a018d32319c6e0d2dc29e3de34", - "sha256": "01i3vc0a7jngfwa16yp4knlyiwnak3srxp4lxjnw5fdq2hvgwhz1" + "commit": "290d18e12b4c485292c4e3feb3e2e4848706aa57", + "sha256": "0pw9wbhbk51r5ja93bhv78rgfv3bza7rfjwrh6xdr0n7yd0fbpr4" } }, { @@ -110587,11 +110613,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20230111, - 1606 + 20230225, + 1245 ], - "commit": "5525e49357d066c0dca4ccc12ca69804e46577f2", - "sha256": "0vcvhksiwc2gpz90gl5911nmds4rqgdhk1v3gbpj7cbhi1imrfx5" + "commit": "4b58447097c2e0a3e5c364b1308b56b37cc3ab7f", + "sha256": "14nbx12jvkxq6zxhrp3gyc0v9jyn5zn0dnnyp57kzah5i73sgssz" }, "stable": { "version": [ @@ -110802,15 +110828,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20230212, - 1547 + 20230304, + 1158 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "37e7eb805bc247ecc644308f1f2a4ed9a6d30624", - "sha256": "0bc0v7ix59cq269raxl6pdq12qd4rnq7012mix55rmy6llb17jb4" + "commit": "2af8f15c6b7ef1a338a11e479d375a97b647fb45", + "sha256": "009x87dywz5l5n4hqribx5mvzfpqmzshkpff6c6jjzh234fyh093" }, "stable": { "version": [ @@ -110952,14 +110978,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20230103, - 2244 + 20230303, + 942 ], "deps": [ "tempel" ], - "commit": "7ef22ea7aaf699632a1d02d47a9a505ae8bc52c3", - "sha256": "0gvvxkgmj84ivnav0v98m6nhas6mbkhxqqj1ba5gj334h7gxyl4n" + "commit": "4d0ae7b9355b45aa24dfa5e072ff50baf63f752a", + "sha256": "0ba182nbnyc7hx4vwddxrb6n9wf6acqjzc29sw8aa8wsq4m568hy" } }, { @@ -111469,26 +111495,28 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20230130, - 2153 + 20230301, + 1502 ], "deps": [ "dash", "hcl-mode" ], - "commit": "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d", - "sha256": "1ancpn3v176lzxd95xshbsna307y55idirbqjsfhpivhvcq6y9g7" + "commit": "7b1e482530c76dcf856ec4a20aee6586eb2e8ccf", + "sha256": "0npmj39b74h1lmqbvnnwcy3jqnaifgawi9p4sb242fcngiy2ppxf" }, "stable": { "version": [ + 1, 0, - 6 + 0 ], "deps": [ + "dash", "hcl-mode" ], - "commit": "6286aa42132a7fcad49271d63be33deeeb8d4efc", - "sha256": "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx" + "commit": "7b1e482530c76dcf856ec4a20aee6586eb2e8ccf", + "sha256": "0npmj39b74h1lmqbvnnwcy3jqnaifgawi9p4sb242fcngiy2ppxf" } }, { @@ -112005,21 +112033,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20230220, - 336 + 20230222, + 2028 ], - "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", - "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" + "commit": "cbc3de581fdf36ba474b0c135b9e785e504f1c1e", + "sha256": "189rqa9vbl7469gga6rybk75rarzbmz00m3w2i6piq3ggw350pbh" }, "stable": { "version": [ 2023, 2, - 20, + 27, 0 ], - "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", - "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" + "commit": "cbc3de581fdf36ba474b0c135b9e785e504f1c1e", + "sha256": "189rqa9vbl7469gga6rybk75rarzbmz00m3w2i6piq3ggw350pbh" } }, { @@ -112563,11 +112591,11 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20221109, - 1501 + 20230301, + 136 ], - "commit": "2b5d53571bd30b75d4f5a642aa129055803a6bfb", - "sha256": "0i58abjzxi6qkfclwhphp7ljdc4sx80cj7izcq76glkpkif6sysn" + "commit": "1b09d2032491d3904bd7ee9bf5ba7c7503db6593", + "sha256": "0qdv5yhvs4mnb4lszglhli80pv1436mknbap9qrm9riixfg6zlvv" } }, { @@ -112593,11 +112621,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230207, - 1438 + 20230304, + 59 ], - "commit": "26fb81d2667c88bef4f571c87bd9842d1be21234", - "sha256": "0lkvsqgp5cwi39n37b32dfjrdsk21j6r3q5lx4px84w2sqhm5gg1" + "commit": "3baca29f5d8a60abac52cdd1ce2966c5cdebfbd8", + "sha256": "1xvklkl8rg1arx5zdxcwpw9ahskhkhj2j78m0wk8z7rmj97l7i5a" } }, { @@ -112779,11 +112807,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20230220, - 1320 + 20230303, + 1924 ], - "commit": "4dd1efcab11576c0989c52f67c89759a43e07f0b", - "sha256": "0s4bamim86y42ahg529hj2sf7654lab1p0fb06srn1gqj8zapndj" + "commit": "5ceaecbaf359745d7bc6d407535895b7e84217c1", + "sha256": "1dxmy8wps01kwp5w72m66kvmgp618wvq77mk9ndh0xsv486a50yx" } }, { @@ -113293,14 +113321,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20230220, - 1425 + 20230304, + 1149 ], "deps": [ "compat" ], - "commit": "0204a2432862aa187745995f1c378e6d875b35cb", - "sha256": "06qbc8ad3s4z5vihbpvyl8xdlppxkhvprnhxq0kxsasy7psfqdns" + "commit": "75a5076def1e6f5265eb2346a951ba9d97502fc9", + "sha256": "1j5kkg3nj1zqq1g4rchxafm0k5c5cqayay5wh07insi8mrw60nal" }, "stable": { "version": [ @@ -114159,20 +114187,20 @@ "repo": "emacs-elsa/trinary-logic", "unstable": { "version": [ - 20230213, - 1217 + 20230301, + 2044 ], - "commit": "4268556d89831889a722302241c0de680de3731b", - "sha256": "17a9asi08vi6baagmhlm8qmsh8sbb52gphyg9jdydn1hji0qlk40" + "commit": "d4869d260f22d13a9a71327a6d40edc6980d022e", + "sha256": "17982dsjrm1xcw1fmq64shp4qlydj6v4c4yna24l45q90fhxd6mm" }, "stable": { "version": [ 1, - 0, - 0 + 2, + 1 ], - "commit": "dc10294af106ff3b110c372841eef0a8ec4c29c7", - "sha256": "0a1437hkcx2ba3jvvrn7f0x0gca36wagnhbq4ll2mlkmvdkac6is" + "commit": "d4869d260f22d13a9a71327a6d40edc6980d022e", + "sha256": "17982dsjrm1xcw1fmq64shp4qlydj6v4c4yna24l45q90fhxd6mm" } }, { @@ -115254,11 +115282,11 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20210106, - 222 + 20230227, + 1349 ], - "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", - "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" + "commit": "075052ce0b4451d7d3ede013ce5a77e6a7a92360", + "sha256": "06wa1f3j0l2bqsqm05zfix6sl74mw3kx7vgd1d23yddz37vkcvr8" }, "stable": { "version": [ @@ -116920,11 +116948,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20221113, - 2327 + 20230301, + 2117 ], - "commit": "b8ff1a0bbf84920fe26c56b9658bd289f43ad100", - "sha256": "0vmrmjfkky17sj8qrvibbnv621dnfksm21wn2h7kn40qi5h5kxb4" + "commit": "0fa5259eb7e9404a5d665fb3fdf3f2c19d043189", + "sha256": "030yxnlyky89v8n4j48dh1q1zcqdmlx2xm0lm2fq93y9hpr8s7b6" }, "stable": { "version": [ @@ -117682,11 +117710,11 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20230220, - 1415 + 20230301, + 1402 ], - "commit": "513c8b73cd3bc06cb9936a100468c227f649851c", - "sha256": "0a2r492plzxcl5sl2n75xqywk6yjkgj07xzbkcabvibj33bf1mz7" + "commit": "fcf6e2778454ce514c189a7d1fe70e03ad81c325", + "sha256": "13ag9p2k7snzrc8qllr7hb3mlfqfhwzprlwhykk110nglba1hjrd" }, "stable": { "version": [ @@ -120276,14 +120304,14 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20230214, - 1735 + 20230304, + 1307 ], "deps": [ "s" ], - "commit": "8ccda3422fc30fba23602327cc8e7de9f53bfa1d", - "sha256": "12lhaqhri3yh2l010a2kajzys5jvvad1yg0rcwiyn6hlr6wsg60a" + "commit": "ea741be7ff0979552f7dfb591596075add0293b7", + "sha256": "0yxpj8r6cb4si298cj4i0kmnw0dl3za6w65bfs43h4jza49isrn9" } }, { @@ -121866,14 +121894,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20230220, - 1659 + 20230227, + 1504 ], "deps": [ "yasnippet" ], - "commit": "9580874944cce78b3bb2296ae10de1443b0a57e8", - "sha256": "0ig8ywpw1ql49fp1nlxrgaiadd6zxf2npxnpiv09vj6vij0pank4" + "commit": "ffdabd7990013718f6b765bfd5e3f1899430d2cc", + "sha256": "1jp90khhkzhyk52lkpxrvz0319d0hkgl69hb3a4n47yiayikjzf0" }, "stable": { "version": [ @@ -122165,11 +122193,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20221024, - 20 + 20230225, + 740 ], - "commit": "59cf53110ed73344c7f96da8136b88b039b69602", - "sha256": "0sgyq59hpib2q0yrih4l33pdcvg6hk17cwfv27khhayf4hf92cnn" + "commit": "ba9427329ac49fa2e060da2c16507feed62ad890", + "sha256": "0f57qz8fxn4bncmd8ak9n0s8h4b0kba7nfmkb475djlhn2n2xxl9" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 27a92ac659b..1a39a8ac8b0 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1275"; + version = "9.0.1369"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-WDnlYi9o2Kv/f3Fh1MHcfTlBTe1fxw4UyKJlKY04fyA="; + hash = "sha256-2YjWd07RMyiITnuI3/L0D9MiAxl2+9QVT1nrMBA9/dI="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 92813ed4637..436a6781e83 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-02-13"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "3f6fd348df53b9d15aa0a58709562cf0a3b4636a"; - sha256 = "1dyxlam666wvydhmpxvyli3j7immifmw8yb1fyxhdrllivnrkd00"; + rev = "1ebbec2053a5d79bfbffc5291396fdbeea41329b"; + sha256 = "0finyr9xzy69pdgniwzhv08mkasg4kpay6g0viw0vskv4a5a58ki"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-02-21"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "0f9606ee3e7c0e2d3437b88b6aad77ed82609e97"; - sha256 = "0kks1rlblniwimzxdjjqypz4s7l6c6lv0bxhsgkyhl2vw978n2xx"; + rev = "44badee0f1aa5ec72b570634d18985fd70c68983"; + sha256 = "1if1aqby7l1k9947a8vyhm95dz7yvbwh9sqjmhy0x7rphngr60ll"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-02-15"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a4798a9fb5fd3ac8e132065597b397cab347d3ca"; - sha256 = "0al1dri6yv3n7a0xdf5lln6dvq4h5zqlxmyc1lgii260kk7zirgq"; + rev = "809c05360a0dabfc018093a090045d292d362ef4"; + sha256 = "0snw06vb1vi34j99r4ivil4byqd40hv35f0qcfsrzga25s8gi055"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,12 +353,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-02-19"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "6333a123c8681415ae141edc0943d0f7b377e619"; - sha256 = "0f2nbcjcsi993c5lf8mvm5ma80clm793iqhwdq4amjmxxqsdipxp"; + rev = "4c07aa025f5ec3c35159942fd4f913499cbed3cc"; + sha256 = "0grpcsdswa2ig2v3dw225qw67hz7cpvd7fhszbnnvqwfmnmzqyz9"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-02-07"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; - sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; + rev = "0de94d11f9286ecd176aa8a7299aabb8646d16c9"; + sha256 = "0lfq8vsh46sdjf310fn6zvc6hpbr2z12cac6shrvvjdwn4wpbfz0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-02-19"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "faadebfd77f176bd8acfab8bc9decac4abba26b0"; - sha256 = "0jzbapmrca4pqxl5nwra4wm29hgfcq5v0zng2a5hivbbjqrk7zzs"; + rev = "5b788392ec571621891e1b73887af5ac12056610"; + sha256 = "1m2jlhxwqpgl7v8q60pjwcim9brzaaywb6ax44ddbnyj31b86cby"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2023-01-05"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "bc77f9f7565928169fe35d64123736b7d918f30c"; - sha256 = "0bn4712rwyr0fwwb8fx1cpxpz7x6fppfh24l20xpgaphdg0j78ih"; + rev = "436d3d9d490367c9f47c6ef427daca1c0942ea22"; + sha256 = "1fm02v0npvl6cfddq5yy55rw3a0h76x76vvcglgcw8w9xcq9aviv"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-02-13"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c3f9bccb8c04b01d5d0712b8691658af0b0ddb16"; - sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; + rev = "c8e914604963063b7bb827e9b6f5a6ca741dad60"; + sha256 = "1qsj1gpgg946q49awy700a5z2kdn4dhlnswqjx6qi7jdv8ly8slv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,24 +583,24 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; - sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; + rev = "4b0ba68022d8612b04b26844f1ce5e708c0d23b0"; + sha256 = "06vswjzazbnybj2a6prsd9ckgk36fwj0059vhk55qjxsalrh0zfv"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2023-01-07"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2"; - sha256 = "1rj1c4jljz83w1509y39lagmr86xngivzsjzngrdivnw3swbc59y"; + rev = "44d2886a9ec38abac61b4c73c2e57fb752232cfe"; + sha256 = "1kd6l0vy1mnpmchjjrmfmfizia5vs8rsnin9cdwb8awa4hlsf37h"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -691,12 +691,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2023-01-18"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "bd240b2a2ac5c975216744fda57abe5ff8f39957"; - sha256 = "0mwrn4kxqn96n1jyr3sk1y39g8smgpa9kcdip3928p5vzsa8lbir"; + rev = "80750a80e7999318f14d754bb68b64de7af93bc3"; + sha256 = "1z3mg13q862lcypb9cj0im2kwng4m79g76mzph5pvdi2yhj3y0n5"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -787,12 +787,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-16"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "08b362ba12af1053871b192614b627bcb3c5299d"; - sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; + rev = "8fb04cef34aff609fb84ab6dd753dc2d6babfad8"; + sha256 = "1bx5gxlsiav8ix8npc5vwm1lnhhvxvbri8qf2jwl0xc6f3p5dgx1"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -847,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-02-16"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; - sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; + rev = "b2956f1a3cb8a8e1b6cd4d3f678cc40abdb5ec92"; + sha256 = "1b57ryzcl9ff4nky8zq3lzg9g96pl3ig3c4kmiz8dg0zjgsn0x4p"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-20"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "55eb481d2554c7e612e52b68aa23be2090dc58cf"; - sha256 = "1fff73c663z6pcvkic9ngr9hs9vn6fpxw72x2ivwwiz7d983i93q"; + rev = "23348f3979912fb36a1442fb0d07e8d2e739aea2"; + sha256 = "0lwpx013yxq28s0k5k0sbbyb8nxmjr8nl6xsy2zjillb3rkkaf7v"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -919,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-02-12"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; - sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; + rev = "426d29708064d5b1bfbb040424651c92af1f3f64"; + sha256 = "12vpiznrnj1kw47bp8q3d6pgnb1j84mqvp1svarmqzbsg621gd0r"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1015,24 +1015,24 @@ final: prev: bufferize-vim = buildVimPluginFrom2Nix { pname = "bufferize.vim"; - version = "2022-06-25"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "bufferize.vim"; - rev = "013857c12340bc14e285727eaf7d0bfb9807c768"; - sha256 = "1f4681p7zxchzi628n633j54y6mw13ayjcw0sf6yy2iywrrppdfy"; + rev = "ec7c4445a97f19e5784a6fb6ad3c3d4a8ff505ac"; + sha256 = "1jnk54w1px4dklyjhkng684vd659j0p4vkd1qh8rxaqy7i8a9314"; }; meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-02-20"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "cbb798dd2db7841550cd2c6c6dde12dfda055928"; - sha256 = "0wy8cdrsirk94il9qyv1c29mcysr41mjrr8f595pkb5zyd45lb34"; + rev = "3677aceb9a72630b0613e56516c8f7151b86f95c"; + sha256 = "10dkqgyidvzj710yj65ygzd34n0ixcih61r2zmyp0y9njjsa5qdn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-02-08"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; - sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; + rev = "66e6d0955efb6beb68912dce3ff484e8805d975c"; + sha256 = "0ij73gqpsbs663sqjy0nl04s9hgsn4700bqfg7hsk6534q72mxi3"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1087,12 +1087,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-01-22"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; - sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; + rev = "e66fd3a18eff0c9c4c772a5e5fd9ad68753c6d8e"; + sha256 = "0205xra3ag9x6l173y5gfxjkmhzgp02slfarx5930j50k0mmn5is"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1315,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-02-17"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; - sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; + rev = "6f3f7cd71ddae4f8526b433213a81105422d6317"; + sha256 = "0ab316nm2l8w1lhqlwadhbxx8f7kd4d62x54qzavamg53p5833q9"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1387,12 +1387,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-02-14"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "191ec4788656c3d1ad59c9edc3d96e132f93e039"; - sha256 = "0ln32vw0kqjfc8m4qn963f656hivg3v275dj0xqis25pcdwqpidg"; + rev = "a798a25b21e7204597f56029af2e8a17d65e2518"; + sha256 = "07n5a8lz1n2i2rc5ff5r8r4mwf5k30jw5xys4sla730xlfxarvm4"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1555,12 +1555,12 @@ final: prev: cmp-pandoc-nvim = buildVimPluginFrom2Nix { pname = "cmp-pandoc.nvim"; - version = "2022-05-03"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "aspeddro"; repo = "cmp-pandoc.nvim"; - rev = "cb2980263e14fb3c1b776edbd2c7a312b67c65ae"; - sha256 = "0d439njzdnm1qhnig2qr9ywq3q72vpb6wqxwil9czhqzn80swrj9"; + rev = "30faa4456a7643c4cb02d8fa18438fd484ed7602"; + sha256 = "0fl903hcy85f21xmgf1dx31lxjwgplkcg4m8i989yhqr6irwwi6f"; }; meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; @@ -1615,12 +1615,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2023-02-19"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "1b1c0235c54e3fc9e77504ed8d36028f64e6f48d"; - sha256 = "12ivpbxpqvxb6c2p0snpr65d45ppx57l8aylnb3l39ciabknjhdm"; + rev = "a6cb553143573861d2d98da86ceb3074c87fc536"; + sha256 = "1w2g2zdhdw15mmy3pigx059kvfhr192w92yxpfqnsqf80dhvf56s"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-20"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "bf9bde0a86022c494c995778a5bf7210f2420601"; - sha256 = "0fyyq22f33q949v5cabjynbj311279cxfm4wb3mi6v1agzpxh8lb"; + rev = "995a70cde230fd5ae0b670ff75b8b00b45312126"; + sha256 = "1yfrbrwl1iq3h25xlgcnxwnz31d0bxcpcxjw76fjfhxwa2l7iy5g"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1831,12 +1831,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2023-01-23"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; - sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; + rev = "83b9859aaf8066d95892e01eb9c01571a4b325dd"; + sha256 = "11nab2bvna9q8h87ikjj44mzc4irf80xa2hh3r2lmq65z6p1kpdw"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -2047,12 +2047,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-01-07"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "d2e69a13b32e8574decfe81ea275292234eba6ea"; - sha256 = "0b1f0dx5xknm83b0ydq8ndf4207a5nqzvsbjzh4rngwxpc5kf5nc"; + rev = "82cdd72049fc729854d69747be2673bc8ba8d97f"; + sha256 = "0qpc4fqjyq9kyb1rvwgp192v34fzmv5nacdsvc0pycyanbmh04hf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2083,24 +2083,24 @@ final: prev: copilot-cmp = buildVimPluginFrom2Nix { pname = "copilot-cmp"; - version = "2023-01-07"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760"; - sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3"; + rev = "92535dfd9c430b49ca7d9a7da336c5db65826b65"; + sha256 = "14kacnvskly4p7r5k0zkx8lcxqcc7g29zw16xsyr3mj7xp3lpvq6"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-02-17"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5304ea7079f38df200f4357401f1510fd00560a8"; - sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; + rev = "b41d4c9c7d4f5e0272bcf94061b88e244904c56f"; + sha256 = "1r2mllgpdsnk4c1jzfshyy9sqsw0vcjv0d4r3ja9abzk7jpq5x4z"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2119,24 +2119,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "eba0531cea9fe292059dbecf677d36a07f9c28b2"; - sha256 = "059p1rjjhk4i2fxi9zgd923j7ksj9cfx4f9smhnqdqgmkm57lnwd"; + rev = "3a32343a473cce5288a9732f90df67c533642427"; + sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "531faab60ba9418eb180a4a127a661bed98b46a2"; - sha256 = "0lkkyd9iz89lnalvf2i8yz9ssiwiavvnmavxzn0siw7p69x2fkr2"; + rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6"; + sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "272a39c8f483c0bf6137dd382363639aab83a23e"; - sha256 = "0yy9lyh9wx7wa4s6ishqg3g0lb0z3c6hhywghpvyd16kldf6lrd9"; + rev = "a25bbdd8fb1bf0259f255c73e1119c3a75727a93"; + sha256 = "11ddr1prx4k3vkg66h6fwwjdlr1l0zc69j73l80sgjy6v8n32dvm"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-02-10"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; - sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; + rev = "c33aae75745877ee1ef16f5781478f4f2f120623"; + sha256 = "1yd7msvgvbmvnnvv94izl33cnny36bmpnv4hkw757j7p88yxpan5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "0d5e201629a85617fb7efef61c3212fb4529f31a"; - sha256 = "1jylspgsfana9chd5ywx3ylk54fkgj5r2jhy5x7145k1zmwq49qv"; + rev = "d6362d5dc18caee23e580ce4b39cdca71d99a7f3"; + sha256 = "1mjlqs8pvccqrmq0wygnr7arydllyvzznj68bzki23wmbdpa256n"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2395,12 +2395,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-11-24"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "3926c67752a14acecc293dedd1cbf9d9bfb68541"; - sha256 = "1l3xfxg9hzhvq9wi401dpfx58ajxd39f628kjca6id0rhziz8wmc"; + rev = "28acc58a394b5faf718ad40243164e5f588f2df5"; + sha256 = "0p9fcvn1x5hng9z8ra3v7nyybdshsq53vw76gl554klwg91gn8ak"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2685,12 +2685,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-02-06"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; - sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; + rev = "ffeff288c47739a1fcb411343716b993bfaa48e5"; + sha256 = "0hbcsigr7i02krr4wnbw6ib2c202iz2vrnckck32a89si01m1l38"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2745,12 +2745,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-02-05"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; - sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; + rev = "5f44f829481640be0f96759c965ae22a3bcaf7ce"; + sha256 = "1z3mvrli3bn5jpx1n1mdp79q3w1iybfpaxzk7i1dwc7ixhzz1lgk"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2769,12 +2769,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-25"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; - sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; + rev = "bc581eccc5a5f7f2cebbe48df23080f2178f32bc"; + sha256 = "09p4p4a5mvy5n3an4rfb8hzm9bc76jgsjg5hmravl1faz176h8vp"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2855,24 +2855,24 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-25"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; - sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; + rev = "164a44fe8655ff66073189bf6b0a718bfaffa0c0"; + sha256 = "19n2sa0frq62qppfp0j82vqp83pf44sv5lzk2avrv0clc55ncggl"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2022-09-18"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "760d27a7674140c1c1a838b363c52fd705163045"; - sha256 = "19n0gaiilwp6idv6ahy0mkyv3jv73lsal8i71ks029zjw0dfifjm"; + rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3"; + sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -2987,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-02-18"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "dca3e56021cb5c39f401c9d83531743416c3365f"; - sha256 = "0hrkidscljbggsvkajvmqn1x79raa1bpjbwiqjgp3b1vckhyzz3h"; + rev = "8a5bde3dc52c58c40ddc9784149ba21489371021"; + sha256 = "1mnf46i1xydms08kzp52d58k9hk0f8qx0h83hnxvy1yv09q4q4cr"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-02-13"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "980e80e8fe44caaeb9de501c8e97a559b17db2f4"; - sha256 = "1aw5455gin4ki3sn2ml38acqi2w94mhbx37pkajfbb5bfagdpdb0"; + rev = "4c1739137acd3e7f03e2065a7be8a4dc41c7e461"; + sha256 = "0bvbdfs9gnncrsca5azb82cd7h3va1v6j6xa2sjn580maqmyyv4z"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3060,24 +3060,24 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-02-05"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; - sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; + rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa"; + sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-12-21"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "8a4c961330cc4688087f23d18fa7d2f1af9a4902"; - sha256 = "1s7ckv8xj8pjbl99niz3bb15ybhjvhqhs0vxj1a0vanfi8n4pjlb"; + rev = "ed949c13e1a942db29ababa35e8c7864ced90eb6"; + sha256 = "06cvpzfhbhsxvkwp05v776jj675g02w3zbc5n2gz0acy7rb37cqx"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-02-19"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; - sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; + rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1"; + sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-21"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "b15ef042f7006827e7413baad89a0e8541079c9e"; - sha256 = "0svjfw6nsczqpfqic1zvpnz3bn9iivzp81i5kkq7vqgks11ji0w9"; + rev = "d4c2e3f32da453afb55e1becbe4b92357576db9b"; + sha256 = "0hji2bm5d8yvz7m07bab7qb58is3n17z9xl8sfxhj19k20917bbz"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3240,12 +3240,12 @@ final: prev: gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags.vim"; - version = "2022-07-05"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "1a503e591ce2a4f891dab006a6f9c6008783fc7c"; - sha256 = "1i65f9svr17c252bv5np8fzar6ybxvy2k0cb8k84vajyv9sx060a"; + rev = "6542d8e3036aae43f2a821f48b291d6c31990654"; + sha256 = "04vmnvncddm8xaqzc4qhlhv2d9js59ja550921227cn8dzipadan"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; @@ -3300,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-02-07"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; - sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; + rev = "1ad47c6454a5a53d3f4ffdd4022e84f4a6e376cb"; + sha256 = "07119ndsavmhi3km0jkdfk3xw6rhainxdp8vhgqrg54286aqj1d3"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-16"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f388995990aba04cfdc7c3ab870c33e280601109"; - sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; + rev = "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be"; + sha256 = "07r6qplvm4svc0cj4khsa83bc66dkrv93jbb1vg9l0v9h5ds8b9p"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3408,24 +3408,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-02-10"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; - sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; + rev = "5a8ccfb1876b1b2e29ea32c63221be6df45870d1"; + sha256 = "0zgjwp7ijbgbg6m5m1nqkyxsvswkppp61ars4vrhlyd8zf2pd1bw"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "7a6c02dd199f62e4c87c4e9641b0963c6b0ad81f"; - sha256 = "1jzl73fxpa370jxh9i134jpgnm9badim3i581h5n5id8qgfnibng"; + rev = "0225f85e0a3246c6daf1ecbbbf9009d754879643"; + sha256 = "0pdy3856p9apll1jlm0z7knkjkx61c03pbi0997zsgaskxr3h6qr"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3468,24 +3468,24 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-12-31"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "54a5e18f6a42b39021b7aef62aae4dda8680d666"; - sha256 = "1bbrjmywbdggl4l7mzg7fahp86qwr0gi4nw2b8arpj2cr8r9hy9f"; + rev = "390a8bf9f83cc0e31a5154357bc4bfad8e79b889"; + sha256 = "0yv32yd78gs7cqgwcsiwm8zyc2fabfbfakfljdfihcfaa3y2lzap"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; goyo-vim = buildVimPluginFrom2Nix { pname = "goyo.vim"; - version = "2022-09-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "7f5d35a65510083ea5c2d0941797244b9963d4a9"; - sha256 = "1gb34x4djv34z3s1v6c1kcngwzfyx9vslhjx5vm73lbxyxs2nkjl"; + rev = "fa0263d456dd43f5926484d1c4c7022dfcb21ba9"; + sha256 = "1xiqviqbwhiaclax0zlazsahda5f54waqmd9zgjwxwklivj7cqxv"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -3540,24 +3540,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-22"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; - sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; + rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65"; + sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-02-11"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; - sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; + rev = "3e31f9ab01fed42ebac75738c681daacb8c82bff"; + sha256 = "0klqcd3cdyzvbbl26yz482a3sj2qyfb9f2xkf91hnzb2dx2cazhz"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3611,24 +3611,24 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2023-01-23"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; - sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; + rev = "f7040fd0c44e7a4010369136547de5604b9c22a1"; + sha256 = "1l6szs047f0hhpxwifr0gwpf70bx1ypl2p0w1hny7vfxh6yhybbk"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; - haskell-tools-nvim = buildVimPluginFrom2Nix { + haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "f95c5b019777768c0498bef05e1ee095f7d9398f"; - sha256 = "0pz4xma58zwzi1705lmv7q6ijjqcrgydip47cbp6h7si1sl42kl4"; + rev = "29a1619e56a0ff024587e0c482d1a691576343d3"; + sha256 = "1zd50s1h44lhp6apy6nvddl0l0mapl4m96gjasgyg2bsrsyczz6l"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4091,12 +4091,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-01-16"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "4c8d48726621a7f3998c7ed35b2c2535abc22def"; - sha256 = "0fq022r5wyvhrrmr6calw7bcz31hf30smz412y0g8g3bxildql3i"; + rev = "193427320939d111845bd095b301d9d57e6f28f6"; + sha256 = "0wd6wkgbr9vfsji7g7b0zbsxykq1yiya8nsy9r8qkdxq1cn1isjg"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4175,24 +4175,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2023-02-20"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "d22d54c7558415faf6f518db1e00d995d595a99d"; - sha256 = "0v7j8bjd5naf5qbr362r82nqa4grwj2r9wk68s5dv9zg576ybm0p"; + rev = "92a7cc4e4122e38f5fd5ee68f34416b3cf9f477d"; + sha256 = "0pgh22lv711iafkivbpfbpdkb3fw8zfrqpz30glxcdamva178fx5"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "8077428e63feb0f3bf795d53b23ba1695b28ab0e"; - sha256 = "12bq0ppdm7frjgd336lvp3crw9ivsl5lj33f7fjvpqgsib7gy87r"; + rev = "e89acede13f46a5db229133cf0c87aee74938c56"; + sha256 = "0ynhwx4q73fqzlkkyfahlxd4rd231w1bymmjj621k3dpkcw1gw7k"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4247,12 +4247,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; - sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; + rev = "d34680b16af977928228e57c68e5a162f1649e3c"; + sha256 = "1ykqzjakhpyr8znxilg4w0xgadkq3p93d6mkp3n4my886i6d4881"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4523,12 +4523,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-23"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; - sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; + rev = "2bbe7541747fd339bdd8923fc45631a09bb4f1e5"; + sha256 = "0vmsgp0ld2y5r339q0pqm4qi1vlhbbp6c4mbgbip2li3mb6b1w3w"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4559,12 +4559,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2023-02-06"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; - sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; + rev = "1423a6114f5540681a694330c22c36b0ca21f1d4"; + sha256 = "1rwrhn32izidzzhs0vjanqr5id5b9jszk03xzxxmkmk4f34lhchb"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4595,12 +4595,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-02-19"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "674a60c7d4f2a90c75d66fe98603d7ca708939dc"; - sha256 = "1iha7i85bsamnb7gqnnhh784xycfwfg8vbyc93d42wpsksm7yjzr"; + rev = "79d2091809a295aba94f9ea72cd622bca198d046"; + sha256 = "0vq1n4c2qk84vr4axzkqy2svc3z2kanvqd7apdiqb0zh59qc8bw6"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4702,12 +4702,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "92276ba735056dab04b0508e421a6a5d729e3f81"; - sha256 = "1vfkra9xygdm6ffdlkdca636i97hazhv1l66zpn3lwlliyqi1pzv"; + rev = "9b5be5e9b460fad7134991d3fd0434466959db08"; + sha256 = "197yzj8i7bqbnikhq89cza9wj1hbhd4yhyj77b5iwv26p252jnbq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,24 +4763,24 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2023-01-07"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1"; - sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm"; + rev = "76aca5069c5ce5c0099e30168649e6393e494f26"; + sha256 = "1m20a1sl9dhsdh981vf3gzi0fx9lacr147kh24v5p54ami9ch0l7"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-02-14"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "93e58e100f37ef4fb0f897deeed20599dae9d128"; - sha256 = "1d6ym8g3fix2m6412485kbm43mb61wdb3ggm3q6ddqxxvh06n41c"; + rev = "e4badf7984f7a5f0ac7dc10657dbedbd99a82f94"; + sha256 = "0s7jrvbd75zfhf07jf3gihv2j6rrvwfbvdwd07k14hzhm46xw914"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4799,12 +4799,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "b8a6632a0f2d263199d5d480ca85477fe0f414ab"; - sha256 = "0622x0k1xi5z6jdz2bpqvym34ysk38axfyjq45m6hhl6qcy0ysxg"; + rev = "8dbd5ca28c70f15814d1749717f86da9bfd1c8ba"; + sha256 = "0v8irgx18spljayrv1pdpnmnl4c9qsl74fny9b6kf9lrp2xbmfwk"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2023-01-13"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "c5f6a24d526a8ddcd651c5d1291de89a51f923fa"; - sha256 = "1lwrxaaa11q9fwmiagy4zgx0chc69fdapqq5kw2nqc7f4wrqc6mm"; + rev = "bd945ff7374dedebd0868f262aa8452d5f0f1910"; + sha256 = "1pqsnnqb7byia9figdjnkqrn0ppria39d039xx772n2nsyz9n070"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4871,12 +4871,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-02-14"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "369f16f29559cb15931d3d5acfcf253969f74066"; - sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p"; + rev = "c65901227e5a3671dbcb054745566a1c78f9f0c8"; + sha256 = "1100nsfnryg2xdjza1ar01s080jahafwwcpzn01fgkkr32kvvkrj"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4919,12 +4919,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-08-13"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "6d7208e3bcf53862d52e82c3a3db61116ce61f4c"; - sha256 = "1n5axz0xv3wdvy0ic60897cdb16pn1bgsvyl0qcpq5xnlbbw53d4"; + rev = "fe7862463624e5fb186551ede702605d8d9322e3"; + sha256 = "1ch9glxa82z71yyb3n54hbmrkbwxwn0kcpjkjfdmb3mgp2bjgfnc"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -5207,12 +5207,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-02-12"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "245cf1e68840defcc75a16297740f6203f5a045d"; - sha256 = "1w933phd5p0jdgmcdxcsv6ddhs7zx11amp5ziixzfh91a845shmf"; + rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4"; + sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "ca85eea7841f043671ebd6c784771f08b9d34231"; - sha256 = "0pf44ydg6m70haban92fl7yvl3755jqw6h1icaglci8p198gsvln"; + rev = "c2604560ea764ad5f72e52f38c52ef7fc2d1be98"; + sha256 = "1azfgk373wy883lmfwv7kp4y213nx9kcxn76v274mb5dl2bi4k4n"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5255,48 +5255,48 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-02-13"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac"; - sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i"; + rev = "c6b8ff8f0d261c8fb99a55ec7cc5dcf9cb928293"; + sha256 = "1zsj7rbvv0sjz5sbhwp7zzbap490vgivispbqnvgafxyk0v78xni"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "16bd62efc3fcdcd0f6682ea47f1f6070850f9963"; - sha256 = "1d5bqxfdg01hnx239v7bi301325ihvdypy0p4b1ay5py5jckld9h"; + rev = "891fad5829f91cbc3d0866f7abd028d233b8763e"; + sha256 = "0288iqk9rymsql0qnr9093qpadcwiqbd88grq25vkygs33czbif6"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-01-16"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06"; - sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3"; + rev = "93d997dbddfe084e77ba4541c54a7b8bfd754fb1"; + sha256 = "1yqmpgjrlqkqvmmk0ib8bwkcn8z78sm21yl6xlbq4pa219zwdm1z"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-02-20"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "bde758e658c1cdc794293afbde698b5aaa93c5de"; - sha256 = "093gg1k7z0afhg8m2zvpkbf6aqb2ggjz50lrrf3wq0j25qsj1f4i"; + rev = "85380916cec322b1351785cac4f4e3f24de36b2a"; + sha256 = "0pyykjbwih2zswigqrganm9aaw6brdpxacy8vyr2p9xkv2nsli1k"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5351,12 +5351,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-17"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; - sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; + rev = "764dec5de14947f2f5d08bd3e0452324538e9a4d"; + sha256 = "0qii2n70xlh5s8icnpgb1yn86w262p6smk0a2qyqrgy2m64ayjin"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5411,24 +5411,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-02-17"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; - sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; + rev = "95f95e346090ad96c657f021ad4d47f93c915598"; + sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; - sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; + rev = "2cbceaf57884b2548bb5516acea342944c983216"; + sha256 = "03wfi20l278yx0v95a5hwj91zcriqzjdl3hdl34hjkw6glj3sr3h"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5555,12 +5555,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-02-17"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; - sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; + rev = "3f647a560306306cb35854d639b39717f5390175"; + sha256 = "0vlq852jr1mjaf2x1npi27jh3i6bl8npvpfkcrgjcigd8hwcr206"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5591,12 +5591,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-21"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "cbe9ee8184e46311efbce79d9806f3ee803a2521"; - sha256 = "16jv396s6mpk6w9fhrkh1wgc484647x1vs05y05j6smgi5h1hrlg"; + rev = "7be82f345f82f304ae817e3910d001aa96be01b1"; + sha256 = "1skrfbn196q1vhbvkh2z57ix32lfyhycbgkzpaf80f59jkcclwrq"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5627,24 +5627,24 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "c97c44bc86522ceead8c9c9b775b2e1215549158"; - sha256 = "03zyfnzqj20yv9cy6pvh8r5j5v0mgcay7jv4lmgi3gsp0z4qa8ia"; + rev = "1e46896d9096a878355cc5163624f4ae9217c5d6"; + sha256 = "06lkkpp2ax5llxzwyrz79y3jnm27d0nhb1id54fn4dhh1w79yx31"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-02-07"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; - sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; + rev = "c22651651da01239fc4afac4cdb7261797d5f02e"; + sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5699,36 +5699,36 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-02-01"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "d147222a1300901656f3ebd5b95f91732785a329"; - sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; + rev = "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be"; + sha256 = "0gwbfrwki6mm6w5lvzh7g154m1g4c2kajbbhb0i37492kwc4syn4"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-02-20"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "689cdd78f70af20a37b5309ebc287ac645ae4f76"; - sha256 = "1fja54wrmqafqww1ifkpmidwq52r246sana9j57dm92j3l39fv5q"; + rev = "456cd2754c56c991c5e4df60a807d054c1bc7148"; + sha256 = "03nhv5iby38x6whs3ialqsi16482w96mz5dhkq5qki3mkcaqin8z"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2022-10-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1"; - sha256 = "1g8nnrxyfgn3v9k4xi7dh1b29vnp73k5x7vz002q7xar4alj468z"; + rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; + sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -5771,24 +5771,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-02-17"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; - sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; + rev = "ab49517cfd1765b3f3de52c1f0fda6190b44e27b"; + sha256 = "059whyg91hi7abr14fg60pfpnm87cl1iqz31hfl5wiiwrfaa1fsf"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-02-16"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; - sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; + rev = "0cab02bac9ca02a70db9e1d07e25fdb630b18a21"; + sha256 = "1id7k4kknckivgxjxp90b5hkxyyfrfka4kvyiid6aa2lz1nmcbpb"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5819,12 +5819,12 @@ final: prev: nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2023-02-17"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; - sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; + rev = "9f1ed6ef6594df9a74762a86f469d12036584976"; + sha256 = "0fcvhxsr6nfi1sg5cy46dyy20rzc7g25y7ha0bhl2cprvz3frph1"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5843,12 +5843,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8202df9561b90102b41dbc1ad71945534ef4ea39"; - sha256 = "15mpzg05x36vnbq9gs5q71fw9hin8b635r5lf42v6crdqw8wghmf"; + rev = "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a"; + sha256 = "0rx3k5wj5fx6s6chg0cpj85cdii9kmqn0yknsvl82gnv4nc480dc"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2022-10-29"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193"; - sha256 = "0zqwdj7qk8sldz99c3f5m2xmvl2kj7n18f9jr9q17nb70rz490xn"; + rev = "dde3084106a70b9a79d48f426f6d6fec6fd203f7"; + sha256 = "1nk72p1lqs5gl5lr8fp1nd6qpif90xlp38pc7znaflgyp9lm0a45"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -5951,12 +5951,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; - sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; + rev = "c1bfcd89ef440a44d02ade7e71befb1e5aa358ca"; + sha256 = "151xls5s4zg3w0sia0wbypaqxfwyw4zmzifjvs9z9g53anb7zffv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5987,12 +5987,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-02-18"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; - sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; + rev = "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd"; + sha256 = "1l45dcmirnyryy5qkf007bzmb35nvyhqn56myfz47h835w0qhn44"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6083,12 +6083,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-02-14"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "dbd396e7729ad35c9c238f9e20fe3c701d63bb3d"; - sha256 = "07l52iv763rjzwkwl9avd8p7kb8wf0ir6nvayi0pl38dfphb2qhm"; + rev = "ab18169ccf4251d455edca3f6448a559c6322b10"; + sha256 = "0d4nslrj1yyddkqd09m0y6wanhlnismbzz2i876bg2v9pi8d1prg"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6119,24 +6119,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-09"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; - sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; + rev = "db08bfb87300fca2db91d15b64ca88a62970fb58"; + sha256 = "0rybpdkcja0kadf9arwx6r33nj7mzmadq660w7jcni3niy7545sw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2023-02-19"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "4c4082cf94ccd32f5780859c875f91ddef763694"; - sha256 = "0clqgq8whvcnpxlqhyw721kyljhsyvmx8mqfq8qaxys8b6cf8fwy"; + rev = "11b1d0368e5b23b9c356da8e5f70bb5827f27f62"; + sha256 = "1sv9p5kn0v7m2r8zq6j43hvg2bavai3qhymxh7mc4bw9jfa621md"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6179,12 +6179,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; - sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; + rev = "cadebae41e11610ba22a7c95dcf5ebc0f8af8f13"; + sha256 = "0v3ywf8cbv52h02dc04q5d59zxj3ag87rcgjxnzb7zz89kbb1dbg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6203,12 +6203,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b5db147e28337319331d516a826b00976f3584de"; - sha256 = "14hjgk0g81mn26xwd3hspzi2jqiy1viiyc6pz3zqnmn66g958bfl"; + rev = "1a2d5f5224c65b0709bf5da0ccd9cad29272083a"; + sha256 = "1qhq71zbyz9idmm56wxq64k1i46dmn4n2cpjxmpawlab7m2wvi3c"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6251,12 +6251,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-27"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; - sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; + rev = "0da75dcb1fdea2e7f3ae6c7b1f1036243fbd66a9"; + sha256 = "1javf9in4vjf8jb8vjyi7hq2rz3yn1alsr1vr335k6byx7d7zxdx"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6275,12 +6275,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-02-04"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6"; - sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m"; + rev = "cdd24539bcf114a499827e9b32869fe74836efe7"; + sha256 = "1iwpfls99mibmp8s2zw21hngvhqhnj6v03ddrv17qd2pwgdaarm4"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6311,12 +6311,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2023-01-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "bdd647f61a05c9b8a57c83b78341a0690e9c29d7"; - sha256 = "0fnn4jarxmp43jyk4j13wpk9zd7r7pjjmgqbr8brzfd3f9xabx6c"; + rev = "281e4d793c550c866bea3fb85d39de1f0188fb50"; + sha256 = "0zdjhbyi2hg4cincnykp2xdhqzcg9213vyim5lrwqaj0wwvlakyw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -6335,24 +6335,24 @@ final: prev: nvim-osc52 = buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2023-02-16"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; - sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + rev = "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31"; + sha256 = "0x6fxayhyabag688r142bj10lilyg13ba65d0rbk9jcx1y4702j9"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2022-11-16"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "2e48f2e1ebc198f3624645f13f5ce64d20708272"; - sha256 = "0gim4d50k7y0w0gp108lkkn2300jhgk5jspqv17y2gagv28brr1q"; + rev = "82251c54cd60f8504dfd9acd853eae57fe832447"; + sha256 = "0zix075fb342a1j162xxiqajs0ayaxa7l3zbya3jkvp1d497s1m3"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; @@ -6419,24 +6419,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-02-17"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; - sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; + rev = "b71b64afe9fedbfdd25a8abec897ff4af3bd553a"; + sha256 = "0qbfjzmwfl70fahsi6g0vcdx03znfmzwp6wxqry6h141f62xv6vb"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-02-17"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; - sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; + rev = "8680311f6de05d45b010883db7cc1912b7f0d0e4"; + sha256 = "0svkczs2xiy72vbcnsbkd4jbivq1raspmy89mb6q3zz6b1r0p5rv"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6467,24 +6467,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c"; - sha256 = "1qdz4ark1xjwc3xkcc3dm9cxinnfhd8mi0kawb8qjy87gw73i9mz"; + rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c"; + sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-22"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ba35d094c1dfffa652e9c20971c51bd5271c1d25"; - sha256 = "0kvp7wd14q4z7a4y7yscbl3ksbjqzwm10f79jfwigfxgd7f0h5r3"; + rev = "980f0816cc28c20e45715687a0a21b5b39af59eb"; + sha256 = "1w1n2z4qbp72nwg6nvsch1c4pzfsx19r8z11yqpqq19k4vky36vc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6527,12 +6527,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-02-18"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2f3583001e2bf793480f38cf0d055571787b0259"; - sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; + rev = "4b30081d2736e09f90c890a8a7adfe4df36f5b36"; + sha256 = "1w6wv5mpw05hmx0p4y3r3nir81wwrp6alj23gjwrqpzcjhdvh4z9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6551,59 +6551,59 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2023-01-16"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "a0f89563ba36b3bacd62cf967b46beb4c2c29e52"; - sha256 = "0z91g5yn4i24myiv1dw0w28nd5j5vkgfp2jrn8wfkrrkmdmj6yqw"; + rev = "729d83ecb990dc2b30272833c213cc6d49ed5214"; + sha256 = "1ddfnz7cscnfl7g0i7kv5x15pnbd87v2qm1lgzxap1x63vm1m7vh"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-02-13"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "496ff7ea19cdd4e4b7cf2aeeb6780d015f3f9fa5"; - sha256 = "0li2mcxppk37dqxpln6py056i7mzwf541f7mcd037h1zy14075bs"; + rev = "81f9a2e752edc793a34355be952dd1ebb1d5701b"; + sha256 = "1zc8p31dmlwsqrz8p9r6xnhq9zwgvq82crgr339w0ndn3m0wy508"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-20"; + version = "2023-03-03"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "99768947820b969bcd99c4252c6166a984f99be4"; - sha256 = "0swhhj6algx9j9020rcwbra8qw0nxk5c2pan0vjv4g18byya7i2y"; + rev = "293e12e90f0928845582b9a3db7258eaa8e92a65"; + sha256 = "069nyc2bxi5wyvbnyqmdif2vqk7fv0kfgz3b7r7xgjf6s4kgw9yl"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-ufo = buildVimPluginFrom2Nix { pname = "nvim-ufo"; - version = "2023-02-03"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "b70c9ef0f8e2673a11387a39185ff249e00df19f"; - sha256 = "1fx3w2mlc23m55whvvrs1g648yg862i50100wfxxljmfkvnc12yv"; + rev = "9e829d5cfa3de6a2ff561d86399772b0339ae49d"; + sha256 = "1fwarqkjsmpwaj63ijb27g4glc235f3fjiw3mjapvcxajpl05lfy"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-02-19"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "4709a504d2cd2680fb511675e64ef2790d491d36"; - sha256 = "0b3h95x2xhrhwspfazibpknxrli70vjahbf52h74yda4ji0n2x4a"; + rev = "b2060eac2fbc84e0637ea706378ff66451e7c424"; + sha256 = "1x31lcf20cq8bb2cwdvx1cmsa18m315ni70qxrx99gncab6vwkz0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6682,24 +6682,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-02-13"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "f336322f865cfa310ae15435c6bec337687b6b20"; - sha256 = "1gyf9avw82fpdw8cvn611xzl0kq140b4ik7b4cc7mblmk6xmdqwp"; + rev = "ab5dbe20dc276348019676e5c3e97cb391e46b1b"; + sha256 = "0w463ylm4x09qxxwmi6rq98bdnra28p3izrqmcjrh87j44qrbhvh"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-02-12"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; - sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; + rev = "b36ba91b7a4d05ee43617383f68cf6ed6fc2f08e"; + sha256 = "1xnyv6wlvh87yzjhbmxirp8agc3w1p6hgiw1gayfv9x72jvp4c8m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6755,12 +6755,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; - sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; + rev = "435a38f7d84373584f3f3b283fe5b1d7c0fb8abf"; + sha256 = "167k6j4n01djxb39l9zq1d8xmbd7lxjz1272d112myp01ccycp3x"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6827,12 +6827,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "0dcf03dc2d9c96166d20b82875ce7eea484b5fdc"; - sha256 = "1qvwcfid1vs9a0k3xn2ki5iiwgv246qkdzsl2pndsrv04gk42j07"; + rev = "149e8dec961562c63091ad6910fec4ead61eaa7f"; + sha256 = "0y628knjcc4hbqaq5vblxjfmn7ihfai1zx0axwb8rqwq13kwbpz0"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -7068,12 +7068,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-10-29"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "685bc8e3890d2feb07ccf919522c97f7d33b94e4"; - sha256 = "0s734kpy3hslb7n6y94cv08clvxh5qp6br1ns3178y99ysv36vkx"; + rev = "1c2e9c93c7c85126c2197f5e770054f53b1926fb"; + sha256 = "1q3lqngb54gnnbzvqy02lxdrzbmk9lyd2rl4q8caj3xx0wfbxlpb"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -7333,12 +7333,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-02-15"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "cd0311d65cb3b8f8737b52f3294eb77d2fcec826"; - sha256 = "08n5ri9d9zm8r7mss6wxfjpyzsdvgrb18795ngvgyg34c10i0pcg"; + rev = "5edff6189cb0f4fae77ee751de5109a8f87cb9c7"; + sha256 = "03wn00adx79p86yk204zqrrxz6gpwkdm7ghscw77y1fxjkmaik0v"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7573,12 +7573,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2023-01-17"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "e683ed0fc57eda718c6b28dce0ff5190089d13d3"; - sha256 = "09d34043bn9n89f2gg5y9whiza0rh6rf63qspl0r9bgiygl534b1"; + rev = "eb7f35f6a652f60d3b4f262d64d4846adbd4d104"; + sha256 = "0n3n80sq9kxamih47q1z6lsbh7adic612cklikva379kqygmvdlj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -7622,12 +7622,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-02-13"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c"; - sha256 = "16wsgb62xcps24xickrly8hqwdvdc5kiylq965xq0q5g74kiz9jh"; + rev = "52b521618511b3a874255c8a717ace7155fd5f21"; + sha256 = "1nhyrwwf05q9dvc8r4dwpcb8ira1rz2wicnq260splh9hv1wqly3"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7682,12 +7682,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-24"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; - sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; + rev = "296f7fa3432f7d9b55b27ad0023f8824701cfec4"; + sha256 = "01ba785c8bc8ya6nf2xa2xlc96ls2rpga4nxlspykj6lncjpmql1"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7802,12 +7802,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2023-02-19"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "cdc1eb05496c2ecdeea7c7bf7ab0b6ab5b421f24"; - sha256 = "0rm8ml6nxkl0sgwbhsp5xjjjn45dq2pdg8amaywp0vjdnjcq9pi5"; + rev = "26ca36c698eeb9d7257562b0102fd9735a8ba2ac"; + sha256 = "1j0j62j1y69n8kkiibx8canhb52v0q04kpdmwxvxsgy23slnl289"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -7851,12 +7851,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-12-27"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "e6a11a702483d26f767f937575d549ac73b2fea3"; - sha256 = "0f8674wisl5l7xwglk6zw956yd0s9ml20dwfvxmvslz0c1an8q0c"; + rev = "97a9e1e319eec2d7e9731be4c6ac9638a1a2d79d"; + sha256 = "1fzrp7jdlgw5f27m3jwvsq0knaf5zlhh5b72if493xaajibil0bx"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7995,12 +7995,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-02-03"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; - sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; + rev = "a3fd7bf4d61fdbe00356a646744b2fe6f97524b6"; + sha256 = "03crzap4czx1am4jsxq6c58nf6f5kg9wrmvcf9l5cic2vj5gwh6a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -8153,12 +8153,12 @@ final: prev: targets-vim = buildVimPluginFrom2Nix { pname = "targets.vim"; - version = "2019-12-08"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; - sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; + rev = "642d3a4ce306264b05ea3219920b13ea80931767"; + sha256 = "0mwi2m75j8cxwa0nx53ivg53vc67v2ncq8gx86s8bvwyfl4249q7"; }; meta.homepage = "https://github.com/wellle/targets.vim/"; }; @@ -8237,12 +8237,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-02-19"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "6eb6bb45b7a9bed94a464a3e1dadfe870459628c"; - sha256 = "0b96wrjvy9mp9qpjhi4jb1mrzsfwww21lahjhgx8kk9y4ml503dg"; + rev = "61b3769065131129716974f7fb63f82ee409bd80"; + sha256 = "0qxnr7fkjbj9f4cvdqwnq8hxv50v0z5d8dzdjpfzr0x4f3ahcdvx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8322,17 +8322,17 @@ final: prev: telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { pname = "telescope-lsp-handlers.nvim"; - version = "2021-09-07"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "gbrlsnchs"; repo = "telescope-lsp-handlers.nvim"; - rev = "d6d5983b0131ee2c386ca9e349f6621e12d971cb"; - sha256 = "1x51mlj1c3cwmcjqssh89049q91423jxm3rv8s25pcw493zb2x6b"; + rev = "de02085d6af1633942549a238bc7a5524fa9b201"; + sha256 = "0z1pja96hzsjv30bnzps8pwgmmy5rc1rkramrqm0r6wlplg36302"; }; meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/"; }; - telescope-manix = buildVimPluginFrom2Nix { + telescope-manix = buildNeovimPluginFrom2Nix { pname = "telescope-manix"; version = "2023-02-03"; src = fetchFromGitHub { @@ -8452,14 +8452,14 @@ final: prev: meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; - telescope-nvim = buildVimPluginFrom2Nix { + telescope-nvim = buildNeovimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "a486ac3e8fb2198f3636da1927ed57a28836fbd8"; - sha256 = "1a2qdqxvp3d1i1wlc7gac1vqfbp0idcnk6y78vmjgziksamj4579"; + rev = "a3f17d3baf70df58b9d3544ea30abe52a7a832c2"; + sha256 = "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8695,24 +8695,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-02-20"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ecf9dacccbcf0d66d9aa9074fdbb5ed51575399a"; - sha256 = "12x47qf98lxwvc6hpw60vwax9aw7wnh21y9j2kxzndzjxi7v6lik"; + rev = "31d38d11390bcd35a568fcc65a79b7d6ec89de62"; + sha256 = "1g134rc5gwrdpi2w3ab1k07v4spl5frimc68mkw7jx14ipwxf7q8"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-02-09"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; - sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; + rev = "a310c1ddb3a7d8b940834238f79f7bfd494ba76a"; + sha256 = "0wz9n7jmhwz1c7fdqfbpr51qls4n464r1rrp05ygrw1f7kbcw12d"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8743,12 +8743,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-02-10"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; - sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; + rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59"; + sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8767,24 +8767,24 @@ final: prev: trim-nvim = buildVimPluginFrom2Nix { pname = "trim.nvim"; - version = "2022-10-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "909150606eab44979eb9595145796f5bcb067955"; - sha256 = "0fd7cknf1cwbn3hlsf94323m6k2g4a9kiil4dqmkazvllqn83pg7"; + rev = "f33e8856b8fa085bed9d7dd36a8ff2c34aaf0c36"; + sha256 = "14wr23kclfs1hvp5bpyd112q3b21m0vckywypbhi16v87781aks0"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-02-20"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "3b754285635a66a93aeb15fa71a23417d8997217"; - sha256 = "0bgm93g4yh5f84nf7h2w9gb3glaffk2dl2p5b0cp38x033lz1yk9"; + rev = "67337644e38144b444d026b0df2dc5fa0038930f"; + sha256 = "0v6s890dr5xq1d9zgs7rink7s5aqgx8ybvjwjzyy0f0qr6f2b5z5"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8863,12 +8863,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2023-02-17"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; - sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; + rev = "485f01efde4e22cb1ce547b9e8c9238f36566f21"; + sha256 = "13bpnacif1r40ncln14m013gnh6n9dnbvawnnna44splr6x39dan"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -8887,12 +8887,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-02-17"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; - sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; + rev = "5f4f9e3c6c745a222d6ab9e3b7dc1ef796a3e81f"; + sha256 = "14kh6bk6dh6ilj7n2rfjfipn6r1nl2g439w0kxqw05rgidzrnnq5"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -8911,12 +8911,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-30"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; - sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; + rev = "12d716b8e53ff8188af309a750d622edfa3eccb5"; + sha256 = "0g0i9v7plbbgz079aas5dgd39xyp7bkrlcjbvb5m1zx1f58vdrbb"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8983,12 +8983,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-02-15"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c28c3fd97b25776038f51b8062790395bc2dae21"; - sha256 = "1npfs6dy0k89wf848wsjx48mkaphswxwlmwhvddxkqfwmld26xgp"; + rev = "d0bceccaea6bd3fe017f4f609e7c91ff712196e3"; + sha256 = "06694178b5a4yqhc6wml0wkw1qfdpn6w29cgzg726j55lizf9mi5"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9067,12 +9067,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-02-20"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "c164cac033087d73b3a94650c02f6c092ee56115"; - sha256 = "0n3gj93ankh8nwiwsmydgg0v8vz4bxbymbh551kgj4aigpivip01"; + rev = "880a562ff9176773897930b5a26a496f68e5a985"; + sha256 = "0id4l89cbwkfkhxj90n8mc6vmqkgig5w21l3brvvfzc8hsrs15a6"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9163,12 +9163,12 @@ final: prev: vim-addon-local-vimrc = buildVimPluginFrom2Nix { pname = "vim-addon-local-vimrc"; - version = "2015-03-19"; + version = "2023-02-28"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; + rev = "28514f4aedba1fd824fad8ccbd65fb41bb8057f0"; + sha256 = "1xhdywcyyr86jvrpghn46avgc6qy220fnyjg6rg3pqvf20hz6ld1"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; @@ -10255,12 +10255,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2023-02-03"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a"; - sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18"; + rev = "c3411c95290063f56dfe13b485882111ef403c6e"; + sha256 = "0dip6vajky1hyc3xs8bjbwv5dycrv4lmyzicj6g7y8pgbddl283a"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -10435,24 +10435,24 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-01-14"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "06c73980682f61307e890fe652d1343be82e7ec7"; - sha256 = "0xwf9613h5lq8wsjh4y4k4pz80cpbnc8kddhsk77jfpnf305pi4c"; + rev = "ca44a13a379d9af75092bc2fe2efee8c5248e876"; + sha256 = "046gfn5hxhcd9fnbz4fi0l59cgngc73y1x2hvxvdyy698fx56wz0"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-01-29"; + version = "2023-03-03"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; - sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; + rev = "e180763212c10664d1405449dfcd5cd00e8bd4d7"; + sha256 = "0vi9vyv978rb9kmnbfhk6nwg1mardyd5yr73k4d460nsxsf15c5a"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10507,12 +10507,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-02-09"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; - sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; + rev = "caf1bc99b63a80cc3a35cc9d05320dfa75d7ebfa"; + sha256 = "12ldjrmip3wgyb2sk1a9d9ikdwg642cw077pmn2x9xim9p88b6y7"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10603,12 +10603,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-12-21"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "00df1089b6267f47c7c0f13536789feb9db1e65b"; - sha256 = "1qj22fhkhamva23jn1f1044vj01p3n4203zdhqasn8836jpw0f82"; + rev = "edb607cc4b329099da825c028c53b1264dbd2350"; + sha256 = "0n8vxdck4xx7y2jr04izvgiqjfqljk8j157hxgy5vvf1fg3jzs2s"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -10651,12 +10651,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b8a41085bfd67fee97ad075c6df65590ce7417a7"; - sha256 = "0m477wpyjxx0g7gdrcwnnhp6s8z23wlb7nljd6lrjkf1lqphb5i7"; + rev = "23cc4bca2f586c8c2f7d2cb78bbbfec4b7361763"; + sha256 = "0hi17i24wrcj0lbs8c7p8m92bzhxp4f531c0612z5iqjxadsi66v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10964,14 +10964,14 @@ final: prev: vim-indent-guides = buildVimPluginFrom2Nix { pname = "vim-indent-guides"; - version = "2021-10-13"; + version = "2023-02-22"; src = fetchFromGitHub { - owner = "nathanaelkane"; + owner = "preservim"; repo = "vim-indent-guides"; - rev = "765084d38bf102a95ab966fb06472e83fa7deff7"; - sha256 = "0gffchphg5chg3311x0mb8xd4ir8psdmdscqpx37bxz5w9n7qsdp"; + rev = "9a106c73f64b16f898276ca87cd55326a2e5cf4c"; + sha256 = "1vm1c7bc3ny6s1nw8zrwr43xym9ryhsmn6xr00i89zphkyci9q55"; }; - meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; + meta.homepage = "https://github.com/preservim/vim-indent-guides/"; }; vim-indent-object = buildVimPluginFrom2Nix { @@ -11265,12 +11265,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-02-05"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; - sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; + rev = "8e735f84d2d954229ee65f4dc71bfc0bec897d98"; + sha256 = "09dl9i2y5drvgnvbid075w5sd0ad7ry1p1am2bfgykjcs1pz3jp1"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11325,12 +11325,12 @@ final: prev: vim-llvm = buildVimPluginFrom2Nix { pname = "vim-llvm"; - version = "2022-09-06"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "acad2bd168778545972d6eef58560376869da373"; - sha256 = "0cjg5dpv68k6cji3k1qjwg24ghadbxzkcfq8i2a3cs18pchmr18x"; + rev = "fcf5358f55ccc93202e496772f49f70b94230268"; + sha256 = "03fx1v6wq00zspg635c5km75ylidm7j93lipns8s3gsa3h1vs76a"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; @@ -11385,12 +11385,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-02-06"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; - sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; + rev = "80cd62f8f2c9c571aa31027b77ab7b8aac3d6346"; + sha256 = "1sykxwg2xhv1gsrlwhv3j6mm1gyl7ph5zscw9bnb1qffs4iqd4a6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11457,12 +11457,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-11-24"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "df4be8626e2c5b2a42eb60e1f100fce469b81f7d"; - sha256 = "0z0lgxjxs2vjbzkmmp1286rrc57am5l7igiapq4fx4jr5bzyrbz6"; + rev = "5d3d1b6cbdc4be0b4c6105c1ab1f769d76d3c68f"; + sha256 = "0rp8nwdhqf73fmzlyvcksqyaqcbyk0qcp6vhkfx4h0r8spd890xb"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -11926,12 +11926,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-11-24"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "e6298736a7835bcb365dd45a8e8bfe86d935c1f8"; - sha256 = "0j08s46s8v2zgh9bf3djkdbga94mycr9if8bh3d4yq68bw8q463b"; + rev = "14685fcc4f487ca42dfe786dd54e4b2913370085"; + sha256 = "1svilmpw4ln2734978llwgxzgn5fpnmqswfq4mmq67ibkv68205j"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11974,12 +11974,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2023-02-05"; + version = "2023-02-24"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; - sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; + rev = "d4fc6f8234c37eef16b6de8055c5fe53b7d7316a"; + sha256 = "03papfmlyrn410c7dflwbxinwymlvizdmwvyvrg24gdxc5vvp24q"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -12202,12 +12202,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2023-01-05"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "3a088946adb24a2fac7b47f3dea97a3b99f52ddd"; - sha256 = "11vklmj35gj7l4n84fpn503rhpmbg7inlmwlvs3adgc0bfpccflf"; + rev = "e5144baa1f5937de3081c38122b6906e094b2b24"; + sha256 = "1v5g77vr24ry0lgxr93whx04wssfysivv29k02x7nzzaqblmdkhc"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -12538,12 +12538,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2023-01-06"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "16283468becaa6985839f96fea212f8634fbd7d2"; - sha256 = "0grp80kahfnjkns5mbkprigr2j2vh38ajy0r7rh7pp17s3awdy7i"; + rev = "a7eea09ba654a371a90ca77186bf10930b897e80"; + sha256 = "1pch0f3xwzm0kj70in7n9yza05sgnw34rm8fgxmjfm5n19vslrz5"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12646,12 +12646,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-01-15"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "5308556987857eb0fc5f1a774496b29d8dd70f34"; - sha256 = "0c0bqc3cs4k6vzfrpamzay98rxqi7pjg3vgr8sxj0z7ljc5x1101"; + rev = "bea75d10247cc81632747084c290f4a7138e7d69"; + sha256 = "1cjflfxljzr4jx1n2rqrv97s1ci2lb6m9j2hkhivnkhzbazzr8h5"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12754,12 +12754,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-02-13"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b"; - sha256 = "05x30vn156x5r57pz4p0ha44riwbprxph4rc98fl507229mnmp60"; + rev = "c7e61b73a546c9dd0525cd158cc1613bb48e414a"; + sha256 = "02m3pq8lk1qk0mdjjila59grsg2bpsir02jlrir1dmk3ifsy38wh"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -13187,12 +13187,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-02-18"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2b61cd2726d2f2cab5ab66761732143268f78b5c"; - sha256 = "07z5sialjki7w8qipqplpg67jgshgbckv9nmp83x40vrjypsiml9"; + rev = "7c94396ca10e53b09c2c0da8e0dab0fbf5a8acf1"; + sha256 = "03pd044wqxh24c5jm2wwa15icbhf9dd1cw3645lphy1zsyy59rsx"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13487,12 +13487,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2022-07-05"; + version = "2023-02-26"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "5dd613ed68a0ecf0fc6c11cd4098c03583786bf0"; - sha256 = "0p9ykfwdl9m0016v7yi622w9lz8xgi7562gh8xpjzwbzszxds76i"; + rev = "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1"; + sha256 = "1jc4kylbwp6qp84bhdx21lh45gjrqdkzjlvgi9bkdbjs1v7did6s"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -13523,12 +13523,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2023-01-06"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "c75c8bfb0ce01d17bb41cf2c351f98ee3c019bb7"; - sha256 = "0zjbfhz2k414y61kksbh2za6b90ixrshgczppss377jcrxv2y0fi"; + rev = "6e7ebd59489f2e4d0562850ff2ba04831a26b00b"; + sha256 = "17x5sn33kg8zg7jxm5wg4fzj0733vgz3z43d6r0f03zg5l7p27lf"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13727,12 +13727,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-02-07"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; - sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; + rev = "1dba52e6e886bc60184da405a11f8ec22d2f2b49"; + sha256 = "0xgjm626bzs8pf6c79syn49nriprllz289pi62jkwsnh2hxkncxn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13740,12 +13740,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-02-20"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8bbd3b0308ba8238c4d00a24d68a6074e19ccc0a"; - sha256 = "10ahwp0nzz34iq4i8rv1lx45c87zp87wvwg0fn3rwy9hd35gpnn9"; + rev = "6f7e507ed1c397838798e43a8249612864c929ba"; + sha256 = "0qvp05ad880qpmsnxiv43yas6i2wzd344gmlg2x9ydh1h5bgm2m8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13848,12 +13848,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-02-10"; + version = "2023-03-02"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "5224c261825263f46f6771f1b644cae33cd06995"; - sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; + rev = "fb027738340502b556c3f43051f113bcaa7e8e63"; + sha256 = "15f9n7j73rq119qkv4kk3mgw605z93921n7af0x6qywrwaq3smp1"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -14029,12 +14029,12 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-02-08"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; - sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; + rev = "4f2e70d75b7ece1c2a7c852664db492537078996"; + sha256 = "1g19pgxla0f04wihw1k43and7mf07fb23a1ca0zq8f6gsczbxgjq"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -14113,24 +14113,24 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2023-01-18"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "f247421ca0c1934b8bb29abe06d334f0adc93d14"; - sha256 = "1h17aqjicfhp4qsrbwgw3vry8cvy8raxj9bq013n2vzq6h38392h"; + rev = "e50df0b0160363f5dcae60c4f633ade78e59bdc8"; + sha256 = "0qviqfbdss95jz51afpxwrxbvml4lcqpspn8gzv2q0m8avqnlrq8"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-02-21"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "22e55672793be043a5ce9790e7617322ef4ab445"; - sha256 = "0smpk37fiwq4rmgiy2b3f3yyhkwynfy6i70hrxblqn9as5kk7cjc"; + rev = "5e2c9cf8277c42fb634007126c36d765fd176f4a"; + sha256 = "0g9sjx5l0b71wvbgz71v3rm8y55dhi3bmx790aj8bs4f96npdvnp"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14149,12 +14149,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-02-19"; + version = "2023-03-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ea91862411d16f4e4bed9c6fef452b8c1b2a662f"; - sha256 = "0fm3kkfvr816n90pl07wyy8mhzpz4rn93xy61hys7cj53q99fngq"; + rev = "1188c4a39167237d551d279c9f84a3e34c7c2329"; + sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14173,12 +14173,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2023-02-19"; + version = "2023-02-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "d724faa9bfcd37f1995071e678e30af2229eb1a1"; - sha256 = "0ibcifqm3vrdvq2dzm4qyh7y0i134653irq33jg3kmqijxzzrb58"; + rev = "484eb68c69345b5185e370d91ba631accd522776"; + sha256 = "1l74j5hq3gs4pfln7inbidza1vfrrl8z5pg77njmb7yx1ilc4l9q"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -14197,12 +14197,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-20"; + version = "2023-03-06"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "73380b25ec27e9df788752174703cfdad98e66dd"; - sha256 = "0z50c074bk2jsvsglwdw532i8zp0w8yb2sfk5izgm9hk02n2niys"; + rev = "109286f8def4187c3a35494b8760fd14105e9d8c"; + sha256 = "0pf2q8m4jsh9mlxyw0788mh80lfx8wnj1k0h3xg1d0czxdlad9w8"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; @@ -14233,12 +14233,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-01-18"; + version = "2023-03-04"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "845a6ad5443e3559dde42910c4523a5835c9233b"; - sha256 = "189h3x01jz0hqcvrldfpicnl64f05v00hr93vyldj2isdrspm3pc"; + rev = "f977f0885384776e5f0e3bffa51abbbfd57d90cc"; + sha256 = "1kav03xi1vwasvl56dlwcjy7bli6vynpkf0afhrm8r4dqzxfa6cc"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3ed61e541d9..13d540a829d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -91,6 +91,17 @@ }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex"; }; + bicep = buildGrammar { + language = "bicep"; + version = "b94a098"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-bicep"; + rev = "b94a0983b69ebb75e9129329a188199ad6ebcec0"; + hash = "sha256-YCVOgLmtCWd4FwfwmQUZhSzP2wS2ZDLwXP1BRrpE0Ls="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; + }; blueprint = buildGrammar { language = "blueprint"; version = "6ef91ca"; @@ -104,34 +115,34 @@ }; c = buildGrammar { language = "c"; - version = "7175a6d"; + version = "f357890"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; - hash = "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A="; + rev = "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"; + hash = "sha256-TLaqolQEN3m3YuNo8JbuRyaEmbWQCWyJJUaDDv4GFDY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "5b6c4d0"; + version = "fcacbeb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; - hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; + rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d"; + hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; capnp = buildGrammar { language = "capnp"; - version = "cb85cdd"; + version = "fc6e2ad"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; - hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; + rev = "fc6e2addf103861b9b3dffb82c543eb6b71061aa"; + hash = "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -148,12 +159,12 @@ }; clojure = buildGrammar { language = "clojure"; - version = "262d6d6"; + version = "421546c"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; - hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; + rev = "421546c2547c74d1d9a0d8c296c412071d37e7ca"; + hash = "sha256-GfDaUZjvTELXkRzJXK303QyPDQr7ozfrz/4iOQNDQTU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -201,14 +212,25 @@ }; meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; + cpon = buildGrammar { + language = "cpon"; + version = "eedb93b"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-cpon"; + rev = "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"; + hash = "sha256-8x+oUbiwt7prGc5cli5HabHoH3q/mBnQzO1Wy2Bauac="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-cpon"; + }; cpp = buildGrammar { language = "cpp"; - version = "56cec4c"; + version = "03fa93d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; - hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; + rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076"; + hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -225,15 +247,26 @@ }; cuda = buildGrammar { language = "cuda"; - version = "a02c214"; + version = "91c3ca3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; - hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; + rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847"; + hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; + cue = buildGrammar { + language = "cue"; + version = "4ffcda8"; + src = fetchFromGitHub { + owner = "eonpatapon"; + repo = "tree-sitter-cue"; + rev = "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2"; + hash = "sha256-a72Z67LXmEuHF/mKIaxi1Y9TNzqLjAiPYR3+VUu9fso="; + }; + meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; + }; d = buildGrammar { language = "d"; version = "c2fbf21"; @@ -269,6 +302,17 @@ generate = true; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; + dhall = buildGrammar { + language = "dhall"; + version = "affb6ee"; + src = fetchFromGitHub { + owner = "jbellerb"; + repo = "tree-sitter-dhall"; + rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8"; + hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ="; + }; + meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall"; + }; diff = buildGrammar { language = "diff"; version = "f69bde8"; @@ -382,12 +426,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "2422bc9"; + version = "9fe5cdf"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "2422bc9373094bfa97653ac540e08759f812523c"; - hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; + rev = "9fe5cdfab0f0d753112e9949a3501f64b75a3d92"; + hash = "sha256-nJikCiksuOAEXEvX2eQ2jZoVmzPQLJ36l4mk0irPW3c="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -426,12 +470,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "67cf1c9"; + version = "31552ac"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a"; - hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ="; + rev = "31552ac43ecaffa443a12ebea68cc526d334892f"; + hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -470,12 +514,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "31ebb7c"; + version = "a4b57cc"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"; - hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw="; + rev = "a4b57cc3bcbfc24550e858159647e9238e7ad1ac"; + hash = "sha256-31FQlLVn5T/9858bPsZQkvejGVjO0ok5T5A13a+S91Y="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -637,12 +681,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "3bdba07"; + version = "0da7f82"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; - hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; + rev = "0da7f826e85b3e589e217adf69a6fd89ee4301b9"; + hash = "sha256-5PCwcbF+UOmn4HE99RgBoDvC7w/QP1lo870+11S6cok="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -692,12 +736,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "8e2f090"; + version = "306d485"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; - hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; + rev = "306d48516a6b3dbb18a184692e8edffa8403018f"; + hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -758,23 +802,23 @@ }; java = buildGrammar { language = "java"; - version = "dd597f1"; + version = "3c24aa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; - hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; + rev = "3c24aa9365985830421a3a7b6791b415961ea770"; + hash = "sha256-06spTQhAIJvixfZ858vPKKv6FJ1AC4JElQzkugxfTuo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "15e85e8"; + version = "5720b24"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; - hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; + rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7"; + hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -857,12 +901,12 @@ }; kdl = buildGrammar { language = "kdl"; - version = "c3c4856"; + version = "e36f054"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "c3c4856464842e05366b1f3ebc4434c9194cad43"; - hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg="; + rev = "e36f054a60c4d9e5ae29567d439fdb8790b53b30"; + hash = "sha256-ZZLe7WBDIX1x1lmuHE1lmZ93YWXTW3iwPgXXbxXR/n4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; @@ -890,12 +934,12 @@ }; latex = buildGrammar { language = "latex"; - version = "6b7ea83"; + version = "376f640"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; - hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs="; + rev = "376f64097b7a26691a2ca60dc94e4dfa417be932"; + hash = "sha256-9hcmCr9HfhKt5dkNN24haubrOySqpxzMoLVEGO53lxk="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -932,6 +976,17 @@ }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; + luap = buildGrammar { + language = "luap"; + version = "bfb38d2"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-luap"; + rev = "bfb38d254f380362e26b5c559a4086ba6e92ba77"; + hash = "sha256-HpKqesIa+x3EQGnWV07jv2uEW9A9TEN4bPNuecXEaFI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-luap"; + }; m68k = buildGrammar { language = "m68k"; version = "d097b12"; @@ -956,28 +1011,39 @@ }; markdown = buildGrammar { language = "markdown"; - version = "7e7aa9a"; + version = "fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; - hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; + rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"; + hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "7e7aa9a"; + version = "fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; - hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; + rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"; + hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; + matlab = buildGrammar { + language = "matlab"; + version = "2d5d3d5"; + src = fetchFromGitHub { + owner = "mstanciu552"; + repo = "tree-sitter-matlab"; + rev = "2d5d3d5193718a86477d4335aba5b34e79147326"; + hash = "sha256-Rpa/F3MIFRmHunJFsuvbs3h3vDlR3U7UZ+sTN5tJS8U="; + }; + meta.homepage = "https://github.com/mstanciu552/tree-sitter-matlab"; + }; menhir = buildGrammar { language = "menhir"; version = "db7953a"; @@ -1002,12 +1068,12 @@ }; meson = buildGrammar { language = "meson"; - version = "5f3138d"; + version = "3d6dfbd"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; - hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s="; + rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"; + hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; @@ -1113,14 +1179,25 @@ }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; + passwd = buildGrammar { + language = "passwd"; + version = "2023939"; + src = fetchFromGitHub { + owner = "ath3"; + repo = "tree-sitter-passwd"; + rev = "20239395eacdc2e0923a7e5683ad3605aee7b716"; + hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4="; + }; + meta.homepage = "https://github.com/ath3/tree-sitter-passwd"; + }; perl = buildGrammar { language = "perl"; - version = "749d26f"; + version = "ff1f0ac"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; - rev = "749d26fe13fb131b92e6515416096e572575b981"; - hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE="; + rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"; + hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4="; }; meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; @@ -1157,6 +1234,17 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + po = buildGrammar { + language = "po"; + version = "d6aed22"; + src = fetchFromGitHub { + owner = "erasin"; + repo = "tree-sitter-po"; + rev = "d6aed225290bc71a15ab6f06305cb11419360c56"; + hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg="; + }; + meta.homepage = "https://github.com/erasin/tree-sitter-po"; + }; poe_filter = buildGrammar { language = "poe_filter"; version = "80dc101"; @@ -1190,6 +1278,17 @@ }; meta.homepage = "https://github.com/mitchellh/tree-sitter-proto"; }; + prql = buildGrammar { + language = "prql"; + version = "5f6c4e4"; + src = fetchFromGitHub { + owner = "PRQL"; + repo = "tree-sitter-prql"; + rev = "5f6c4e4a90633b19e2077c1d37248989789d64be"; + hash = "sha256-unmRen1XJgT60lMfsIsp0PBghfBGqMoiEN9nB8Hu6gQ="; + }; + meta.homepage = "https://github.com/PRQL/tree-sitter-prql"; + }; pug = buildGrammar { language = "pug"; version = "884e225"; @@ -1203,12 +1302,12 @@ }; python = buildGrammar { language = "python"; - version = "528855e"; + version = "6282715"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "528855eee2665210e1bf5556de48b8d8dacb8932"; - hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo="; + rev = "62827156d01c74dc1538266344e788da74536b8a"; + hash = "sha256-hVtX4Dyqrq+cSvKTmKMxLbAplcCdR8dfFDoIZNtPFA0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1223,6 +1322,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; + qmldir = buildGrammar { + language = "qmldir"; + version = "6b2b5e4"; + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "tree-sitter-qmldir"; + rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"; + hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4="; + }; + meta.homepage = "https://github.com/Decodetalkers/tree-sitter-qmldir"; + }; qmljs = buildGrammar { language = "qmljs"; version = "ab75be9"; @@ -1258,12 +1368,12 @@ }; racket = buildGrammar { language = "racket"; - version = "1a5df02"; + version = "c2f7baa"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b"; - hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk="; + rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985"; + hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1346,12 +1456,12 @@ }; rust = buildGrammar { language = "rust"; - version = "f7fb205"; + version = "fbf9e50"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; - hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU="; + rev = "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"; + hash = "sha256-hWooQfE7sWXfOkGai3hREoEulcwWT6XPT4xAc+dfjKk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -1401,12 +1511,12 @@ }; smali = buildGrammar { language = "smali"; - version = "5a742af"; + version = "a67a429"; src = fetchFromSourcehut { owner = "~yotam"; repo = "tree-sitter-smali"; - rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5"; - hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM="; + rev = "a67a429784dafa0ca4342d71e6530137ca803883"; + hash = "sha256-Pby6RZKPXyPR41E9m2iRsLgVt7bOn2AZyyb4lvcwYwY="; }; meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali"; }; @@ -1423,14 +1533,14 @@ }; solidity = buildGrammar { language = "solidity"; - version = "52ed088"; + version = "1680203"; src = fetchFromGitHub { - owner = "YongJieYongJie"; + owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; - hash = "sha256-ZyeUYtE0pyQIPnZhza6u6yQO0Mx8brgAUmUpIXYZwb4="; + rev = "168020304759ad5d8b4a88a541a699134e3730c5"; + hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560="; }; - meta.homepage = "https://github.com/YongJieYongJie/tree-sitter-solidity"; + meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; sparql = buildGrammar { language = "sparql"; @@ -1445,16 +1555,27 @@ }; sql = buildGrammar { language = "sql"; - version = "3a3f92b"; + version = "1cb7c7a"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380"; - hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs="; + rev = "1cb7c7a11015983f6d173847d5a3574f8e20107b"; + hash = "sha256-zdaFE5G19MLH4W5ZF0HfRNNMJV9Evp+X70eXHDmD/pA="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; + starlark = buildGrammar { + language = "starlark"; + version = "8ad93a7"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-starlark"; + rev = "8ad93a74c2a880bc16325affba3cc66c14bb2bde"; + hash = "sha256-HHGE7P/QAPCyu7wecRiDLrQIm8lndFjKOOb9xiyXsfc="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; + }; supercollider = buildGrammar { language = "supercollider"; version = "90c6d9f"; @@ -1490,12 +1611,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0c32d29"; + version = "fe2e325"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "0c32d2948b79939b6464d9ced40fca43912cd486"; - hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4="; + rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508"; + hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1604,12 +1725,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "5d20856"; + version = "c6e56d4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "5d20856f34315b068c41edaee2ac8a100081d259"; - hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; + rev = "c6e56d44c686a67c89e29e773e662567285d610f"; + hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1638,24 +1759,35 @@ }; typescript = buildGrammar { language = "typescript"; - version = "5d20856"; + version = "c6e56d4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "5d20856f34315b068c41edaee2ac8a100081d259"; - hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; + rev = "c6e56d44c686a67c89e29e773e662567285d610f"; + hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; + ungrammar = buildGrammar { + language = "ungrammar"; + version = "debd26f"; + src = fetchFromGitHub { + owner = "Philipp-M"; + repo = "tree-sitter-ungrammar"; + rev = "debd26fed283d80456ebafa33a06957b0c52e451"; + hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU="; + }; + meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; + }; v = buildGrammar { language = "v"; - version = "136f3a0"; + version = "66cf9d3"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; - hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; + rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"; + hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1759,14 +1891,25 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-yang"; }; + yuck = buildGrammar { + language = "yuck"; + version = "48af129"; + src = fetchFromGitHub { + owner = "Philipp-M"; + repo = "tree-sitter-yuck"; + rev = "48af129ab5411cd6f7ae2b36f53c1192572fa030"; + hash = "sha256-G/aY771G7R78FhS7WxktlMf/0K+PR80WqfwmH+gQhwQ="; + }; + meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; + }; zig = buildGrammar { language = "zig"; - version = "6b3f578"; + version = "f3bc9ff"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; - hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; + rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"; + hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c21444afa00..28d0c8193f5 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -39,6 +39,7 @@ , statix , stylish-haskell , tabnine +, taskwarrior , tmux , tup , vim @@ -894,6 +895,10 @@ self: super: { }; }); + taskwarrior = buildVimPluginFrom2Nix { + inherit (taskwarrior) version pname; + src = "${taskwarrior.src}/scripts/vim"; + }; telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9fde08c747a..c178aec8651 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h"; - x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0"; - aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5"; - aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x"; - armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx"; + x86_64-linux = "00n7mykr8dyn9chiwsp0s8pk53c39by4wl0hyx1inb0zqxaszw25"; + x86_64-darwin = "1q41x23jbpisbwcxgmx18g0bcdsj5g1w3pbj9m6mxlssvbc2xiw6"; + aarch64-linux = "1kaj8g50m8imk34whf6sq41a2b1751mjqxvpwnprlx0i7xj2l832"; + aarch64-darwin = "1h6plmyv3xkkbpwka5rrkc1bdrgj9d8jp0q6qyhch368x8mp781m"; + armv7l-linux = "0q46nzhn8agsif9s50dbdbx6ds3ll39yp5lrp9n7y9a26m4cwjmv"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.75.1"; + version = "1.76.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 91f6cb0de1a..45257fbf754 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-26"; + version = "2.0-28"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE="; + hash = "sha256-qKrj3XPtFVy0/KH18D0oCeVUQQmIdkYJYrCKD82c/+s="; }; patches = [ diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index baa283d1178..233dffca405 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -1,10 +1,15 @@ -{ alsa-lib -, copyDesktopItems +{ lib +, stdenv , fetchFromGitHub +, SDL2 +, SDL2_image +, SDL2_net +, alsa-lib +, copyDesktopItems , fluidsynth , glib , gtest -, lib +, irr1 , libGL , libGLU , libjack2 @@ -20,22 +25,17 @@ , ninja , opusfile , pkg-config -, irr1 -, SDL2 -, SDL2_image -, SDL2_net , speexdsp -, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dosbox-staging"; version = "0.80.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "dosbox-staging"; + repo = "dosbox-staging"; + rev = "v${self.version}"; hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; @@ -91,17 +91,16 @@ stdenv.mkDerivation rec { # original dosbox. Doing it this way allows us to work with frontends and # launchers that expect the binary to be named dosbox, but get out of the # way of vanilla dosbox if the user desires to install that as well. - mv $out/bin/dosbox $out/bin/${pname} + mv $out/bin/dosbox $out/bin/dosbox-staging makeWrapper $out/bin/dosbox-staging $out/bin/dosbox - # Create a symlink to dosbox manual instead of merely copying it + # Create a symlink to dosbox manual instead of copying it pushd $out/share/man/man1/ - mv dosbox.1.gz ${pname}.1.gz - ln -s ${pname}.1.gz dosbox.1.gz + ln -s dosbox.1.gz dosbox-staging.1.gz popd ''; - meta = with lib; { + meta = { homepage = "https://dosbox-staging.github.io/"; description = "A modernized DOS emulator"; longDescription = '' @@ -110,10 +109,10 @@ stdenv.mkDerivation rec { existing DOSBox codebase while leveraging modern development tools and practices. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ joshuafern AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ joshuafern AndersonTorres ]; + platforms = lib.platforms.unix; priority = 101; }; -} +}) # TODO: report upstream about not finding SDL2_net diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ed9e24a910f..28efcf5875b 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -108,9 +108,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]))); patches = [ ] - # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available - # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. - ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch + ++ lib.optionals stdenv.isDarwin [ + # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available + # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + ./darwin-metal-compat.patch + # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. + ./darwin-qos.patch + ] ++ patches'; configureFlags = prevConfigFlags diff --git a/pkgs/applications/emulators/wine/darwin-qos.patch b/pkgs/applications/emulators/wine/darwin-qos.patch new file mode 100644 index 00000000000..e9bd813feaa --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-qos.patch @@ -0,0 +1,12 @@ +diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c +index cde37c48b0d..be237bc0ad3 100644 +--- a/dlls/ntdll/unix/loader.c ++++ b/dlls/ntdll/unix/loader.c +@@ -65,6 +65,7 @@ + # undef LoadResource + # undef GetCurrentThread + # include <pthread.h> ++# include <pthread/qos.h> + # include <mach/mach.h> + # include <mach/mach_error.h> + # include <mach-o/getsect.h> diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0d7ac403ad1..19c230dc857 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -145,8 +145,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20220411"; - hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; + version = "20230212"; + hash = "sha256-pd37QTcqY5ZaVBssGecuqziOIq1p0JH0ZDB+oLmp9JU="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix index 5f4b7771fb5..2ea3583edd7 100644 --- a/pkgs/applications/emulators/yapesdl/default.nix +++ b/pkgs/applications/emulators/yapesdl/default.nix @@ -5,20 +5,21 @@ , SDL2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "yapesdl"; - version = "0.70.2"; + version = "0.71.2"; src = fetchFromGitHub { owner = "calmopyrin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-51P6wNaSfVA3twu+yRUKXguEmVBvuuEnHxH1Zl1vsCc="; + repo = "yapesdl"; + rev = "v${self.version}"; + hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL2 ]; @@ -27,17 +28,17 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install --directory $out/bin $out/share/doc/$pname - install yapesdl $out/bin/ - install README.SDL $out/share/doc/$pname/ + install -Dm755 yapesdl -t $out/bin/ + install -Dm755 README.SDL -t $out/share/doc/yapesdl/ runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://yape.plus4.net/"; description = "Multiplatform Commodore 64 and 264 family emulator"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix new file mode 100644 index 00000000000..3f5fc3d12f7 --- /dev/null +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, xorg +, argyllcms +, wrapGAppsHook +, gtk3 +, librsvg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "displaycal"; + version = "3.9.10"; + format = "setuptools"; + + src = python3.pkgs.fetchPypi { + pname = "DisplayCAL"; + inherit version; + hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gtk3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + build + certifi + wxPython_4_2 + dbus-python + distro + PyChromecast + send2trash + ]; + + buildInputs = [ + gtk3 + librsvg + ] ++ (with xorg; [ + libX11 + libXxf86vm + libXext + libXinerama + libXrandr + ]); + + doCheck = false; # Tests try to access an X11 session and dbus in weird locations. + + pythonImportsCheck = [ "DisplayCAL" ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : ${lib.makeBinPath [ argyllcms ]} + --prefix PYTHONPATH : $PYTHONPATH + ) + ''; + + meta = with lib; { + description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)"; + homepage = "https://github.com/eoyilmaz/displaycal-py3"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ toastal ]; + }; +} diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 7d9a039a5b0..ee466865ef0 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, ninja, xxd, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida +, libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler +, gspell, libtiff, libwebp , wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: @@ -12,31 +14,26 @@ stdenv.mkDerivation rec { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw="; + sha256 = "sha256-0GOX77vZ4KZkvwnR1vlv52tlbR+ciwl3ycxbOIcDOqU="; }; - patches = [ - # Do not build the changelog as this requires markdown. - (fetchpatch { - name = "geeqie-1.4-goodbye-changelog.patch"; - url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; - sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; - }) - ]; - postPatch = '' patchShebangs . + # libtiff detection is broken and looks for liblibtiff... + # fixed upstream, to remove for 2.1 + substituteInPlace meson.build --replace 'libtiff' 'tiff' ''; - preConfigure = "./autogen.sh"; - nativeBuildInputs = - [ pkg-config autoconf automake gettext intltool + [ pkg-config gettext intltool wrapGAppsHook doxygen + meson ninja xxd ]; buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida + libarchive djvulibre libheif openjpeg libjxl libraw lua5_3 poppler + gspell libtiff libwebp ]; postInstall = '' diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9da51083c5a..9e746cfbd7a 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,17 +10,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.8"; + version = "2.13.2"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk="; + hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q="; }; - patches = [ - ./ffmpeg5-compat.patch - ]; - nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = diff --git a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch deleted file mode 100644 index ff522735fe3..00000000000 --- a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/t/351_unpaper.t -+++ b/t/351_unpaper.t -@@ -88,8 +88,10 @@ - - # if we use unlike, we no longer - # know how many tests there will be -- if ( $msg !~ --/(deprecated|Encoder did not produce proper pts, making some up)/ -+ if ( $msg !~ /( deprecated | -+ \Qdoes not contain an image sequence pattern\E | -+ \QEncoder did not produce proper pts, making some up\E | -+ \Quse the -update option\E )/x - ) - { - fail 'no warnings'; diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 1f25332e852..e1b7087cf73 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z0OpRnjVfU6vcyZsxkdD2x3l+a9GkDHZcFveGunDYww="; + sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; }; - cargoSha256 = "sha256-uSoyfgPlsHeUwnTHE49ErrlB65wcfl5dxn/YrW5EKZw="; + cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 4952ecf84f2..171f4a2c5b1 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.13"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI="; + sha256 = "sha256-l3vJDF2c6h/trfnAGxu7XEoDoj7bB4tATBUlxKFYfUs="; }; - vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM="; + vendorSha256 = "sha256-611eLYm+OPIdmax2KwYNjuQEGqyZd6SXvhUHzRdLzaI="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 0af4a390982..1dcb3c5802a 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.14"; + version = "0.5.16"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU="; + hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M="; + hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index a2e90571e93..c20859f6dd0 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 81ae24b71c8..91f2e0be1cc 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1875 +4,1875 @@ { akonadi = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-22.12.2.tar.xz"; - sha256 = "19cqzpn28xw8g1m9g4z45wh0z2waygx0cbir8yp6xwl78ax9qss1"; - name = "akonadi-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-22.12.3.tar.xz"; + sha256 = "18w0rrdqawxsgzzv3a9f6fic0dcj3cgq58xa74d09s7150k377mp"; + name = "akonadi-22.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-22.12.2.tar.xz"; - sha256 = "0y9dxh3c7044bilky05xhmx15mk3bq1yfpsirn1w6r0pygnrhvgs"; - name = "akonadi-calendar-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-22.12.3.tar.xz"; + sha256 = "1bksdbghqzql055lz7k90npjd7ql925ykpprshdgsaf3kxrw9qpb"; + name = "akonadi-calendar-22.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-tools-22.12.2.tar.xz"; - sha256 = "12p0702gddh0ssz8hnk0vxklj8bpq3n81qz565i4biifamn0zids"; - name = "akonadi-calendar-tools-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-tools-22.12.3.tar.xz"; + sha256 = "0fi96vdh92y9in1yzphc59zjnisd9i9wck1d28542c2s2qbmjmcn"; + name = "akonadi-calendar-tools-22.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-contacts-22.12.2.tar.xz"; - sha256 = "04q72c7k5jnwh16sxap3wlany5kl1wcxaidwk8s7zyssf4zpri1h"; - name = "akonadi-contacts-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-contacts-22.12.3.tar.xz"; + sha256 = "1vh34g7665all7bxps3akxvlg40rhddrwk8mw9nfpv4gfzyqv33p"; + name = "akonadi-contacts-22.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-import-wizard-22.12.2.tar.xz"; - sha256 = "1iiagyj1q321vn54azq69fkiqjf1ky01bb2ddd97zzll7z4ly5q0"; - name = "akonadi-import-wizard-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-import-wizard-22.12.3.tar.xz"; + sha256 = "0j7jav3nymhajwwhixapip9dvw7gx8wcjrf94ap1d1xr44kvmh32"; + name = "akonadi-import-wizard-22.12.3.tar.xz"; }; }; akonadi-mime = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-mime-22.12.2.tar.xz"; - sha256 = "08d8hd5xxmwf2fxnc4g41almcr76pp6gdx54ndxs3n1s3l31mmip"; - name = "akonadi-mime-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-mime-22.12.3.tar.xz"; + sha256 = "00y1w9nzvdy7124552gi587z320c17gfqghxacvc45hiwq4c5p45"; + name = "akonadi-mime-22.12.3.tar.xz"; }; }; akonadi-notes = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-notes-22.12.2.tar.xz"; - sha256 = "1n61acjdhsr7nhy5jr261x4h97a2fcf3hlrig7vin4sjp263ik6f"; - name = "akonadi-notes-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-notes-22.12.3.tar.xz"; + sha256 = "13gc8ihraqh80a467cw7q9yf9h4l5m55n27h38inj4aw503zb4j7"; + name = "akonadi-notes-22.12.3.tar.xz"; }; }; akonadi-search = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadi-search-22.12.2.tar.xz"; - sha256 = "1zg0sqzw4vgxghp32k3yb5kixh4nivzpx3gacr94f22jq8h2pgny"; - name = "akonadi-search-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadi-search-22.12.3.tar.xz"; + sha256 = "1hp5aq4w85fwml8r45q6gxwss2ihh6rsb3hdhxsdsvyyx5lr0mqv"; + name = "akonadi-search-22.12.3.tar.xz"; }; }; akonadiconsole = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akonadiconsole-22.12.2.tar.xz"; - sha256 = "158xgm4z9hk8gzf9z8fnf5mqbryhf6rw3d68195gwfp9i0f3b488"; - name = "akonadiconsole-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akonadiconsole-22.12.3.tar.xz"; + sha256 = "0ch93g5dajgp96yzsrh9sj0xbhy494bci1xx8jrfz6zdl3m6l9hr"; + name = "akonadiconsole-22.12.3.tar.xz"; }; }; akregator = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/akregator-22.12.2.tar.xz"; - sha256 = "14s2rcfb7p3yyp46lf91a5ssi0bnh5ff2rcq2sd6z9d8yi01vl9s"; - name = "akregator-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/akregator-22.12.3.tar.xz"; + sha256 = "1zrcfw9h8plrmba7ax0pg34mc8zgqc4yvb8bvqfcq635ahgb9cdm"; + name = "akregator-22.12.3.tar.xz"; }; }; analitza = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/analitza-22.12.2.tar.xz"; - sha256 = "07ch3vsaf9dily42gdyvph52rnvbrcrfnmsav5nvs98ymvkqj241"; - name = "analitza-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/analitza-22.12.3.tar.xz"; + sha256 = "155rv5lg4acf5bpamv2ksw63m61zndmjybvh64mr9cdgpip2db3r"; + name = "analitza-22.12.3.tar.xz"; }; }; ark = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ark-22.12.2.tar.xz"; - sha256 = "1hsh1anm555b5mckn60cj9p4sdl5h5g2m01k6ia784l2k4zsrvvb"; - name = "ark-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ark-22.12.3.tar.xz"; + sha256 = "06kw6l0r0ynfcaq0icw55xs3yimbl3ybw717i08ksg96ks9rggl2"; + name = "ark-22.12.3.tar.xz"; }; }; artikulate = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/artikulate-22.12.2.tar.xz"; - sha256 = "1cvs0v0x2g8048ksrb9xb41bsvm7lq1g30gch1rjdj86vv3ysraa"; - name = "artikulate-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/artikulate-22.12.3.tar.xz"; + sha256 = "1lpx9rwcfsyhwxa9xzggy2l8kdbrjcfvccb4m309j2ww4n0ym6ij"; + name = "artikulate-22.12.3.tar.xz"; }; }; audiocd-kio = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/audiocd-kio-22.12.2.tar.xz"; - sha256 = "1z46gk6lnar280chigjbw45l8zsr6majyk1gxd1kfnpyqgfh6pzj"; - name = "audiocd-kio-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/audiocd-kio-22.12.3.tar.xz"; + sha256 = "19fi0ph9h5hk2n55qmg3jygq8zzynjz8xxyca2k60z0d426m23mq"; + name = "audiocd-kio-22.12.3.tar.xz"; }; }; baloo-widgets = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/baloo-widgets-22.12.2.tar.xz"; - sha256 = "1041m3r4a3dps5br3m4fmg91fg4d0ww6c6yl2qngyh27arc1ashn"; - name = "baloo-widgets-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/baloo-widgets-22.12.3.tar.xz"; + sha256 = "0cl4n591yjw6i6wjav56pq0070cn514ydqcap1jhkpw7xhi0d785"; + name = "baloo-widgets-22.12.3.tar.xz"; }; }; blinken = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/blinken-22.12.2.tar.xz"; - sha256 = "0hz6sa3g7d5x388arsawspgbjzkhv0p85fpkmm8px8ysqa5vn189"; - name = "blinken-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/blinken-22.12.3.tar.xz"; + sha256 = "0kn04iagw9dkpn1l75c9djl20waiyay4dxfs8iq8r7l6ai36v806"; + name = "blinken-22.12.3.tar.xz"; }; }; bomber = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/bomber-22.12.2.tar.xz"; - sha256 = "1ipzk0lys8s9wwmb8mrrsi9c7scdak19ggcbazq6dqzb2iqn381m"; - name = "bomber-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/bomber-22.12.3.tar.xz"; + sha256 = "0jwgrca2lq3jg42kk2211040s0z8667ckmh32vip267h2zvs33jd"; + name = "bomber-22.12.3.tar.xz"; }; }; bovo = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/bovo-22.12.2.tar.xz"; - sha256 = "12j9g84bi4mkj2gw7jdvbmwf8bmgb4l0imxivifn0i1pz2bjaia1"; - name = "bovo-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/bovo-22.12.3.tar.xz"; + sha256 = "12rffxwshsbmzi3cflx5dl1hpr3nwdx0680qpzpi86vsk46jj9zs"; + name = "bovo-22.12.3.tar.xz"; }; }; calendarsupport = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/calendarsupport-22.12.2.tar.xz"; - sha256 = "172j3n6s06aax5p3r49kj1c5mx1hz1zljbhvkjdrm4fj6kxwl829"; - name = "calendarsupport-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/calendarsupport-22.12.3.tar.xz"; + sha256 = "1dbvn1n947r4miabh2hqfgfs2b02i0wdvd0dxlpmc44xm2r0a8ka"; + name = "calendarsupport-22.12.3.tar.xz"; }; }; cantor = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/cantor-22.12.2.tar.xz"; - sha256 = "0yv8vq6wkybx0qdbkq0d5qm3xzcla80zlppf7wpf7icdvxqa9g76"; - name = "cantor-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/cantor-22.12.3.tar.xz"; + sha256 = "0awjlnqwvy003gpsmyhp3g865xfxfl1h3vmqgxhrjwwgnv0f4xxn"; + name = "cantor-22.12.3.tar.xz"; }; }; cervisia = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/cervisia-22.12.2.tar.xz"; - sha256 = "0dl16s49msf4z59s3y03c552zkpq9b565fg4yan5950587sbpvfg"; - name = "cervisia-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/cervisia-22.12.3.tar.xz"; + sha256 = "0ksvidsvnzc678gar1dry5yv535x9q022c4cxspl02kyiaqwm2y2"; + name = "cervisia-22.12.3.tar.xz"; }; }; colord-kde = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/colord-kde-22.12.2.tar.xz"; - sha256 = "028f50ab0w08zg70ckisjdqnii3xs5hx5zgmhvvvfjgcacdpgvvb"; - name = "colord-kde-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/colord-kde-22.12.3.tar.xz"; + sha256 = "0k2qjhlwdm4q7xhlzwxhafcf4fq88saq3v8m4m50xs2gipanmvxf"; + name = "colord-kde-22.12.3.tar.xz"; }; }; dolphin = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/dolphin-22.12.2.tar.xz"; - sha256 = "0gjpvvwpghs7zf8cm1l7y7821459kggh42rc5jv5vybn1v8wzqg0"; - name = "dolphin-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/dolphin-22.12.3.tar.xz"; + sha256 = "0nhbfra4gkk5338fhv91gbndznr3mkki7m1kcvrzs91x067m79qs"; + name = "dolphin-22.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/dolphin-plugins-22.12.2.tar.xz"; - sha256 = "1y2jkx7rq2kb5zsp5r8d3lhfil3p2nr8vfhlfiaqyisqaj138by1"; - name = "dolphin-plugins-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/dolphin-plugins-22.12.3.tar.xz"; + sha256 = "0fglzs9gix4lqnrb4h3bw4dxxmzx6gmv1dbc5q52q3k1ihgi9fyb"; + name = "dolphin-plugins-22.12.3.tar.xz"; }; }; dragon = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/dragon-22.12.2.tar.xz"; - sha256 = "0qbhhl3kpq0syik17xhsfgfym16mw5nkz83c620dl0n5c65dyva9"; - name = "dragon-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/dragon-22.12.3.tar.xz"; + sha256 = "1qiq626wm1skrcz2xvhadr8d3rxypvhal1f8ii9qgra1nwhbmxls"; + name = "dragon-22.12.3.tar.xz"; }; }; elisa = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/elisa-22.12.2.tar.xz"; - sha256 = "09kz7k7w6rs419sv6f2z5m5nqz3j3cdlmcn3ig9f5v9hlci1x1sr"; - name = "elisa-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/elisa-22.12.3.tar.xz"; + sha256 = "0gxjrf5vxxaz3pwq2vnibxmsw0ppmp1cdkjysg6sl1zy5rj2zcbr"; + name = "elisa-22.12.3.tar.xz"; }; }; eventviews = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/eventviews-22.12.2.tar.xz"; - sha256 = "127bxj6pnmkppjchv3pr8wqs75hw2nb3jsx3bgmr11zvm2mbivwc"; - name = "eventviews-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/eventviews-22.12.3.tar.xz"; + sha256 = "0s9n7gq6s4dc5xrx1snc9c4qp79il1r55mjkcjjc7a38h1j0xzrn"; + name = "eventviews-22.12.3.tar.xz"; }; }; falkon = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/falkon-22.12.2.tar.xz"; - sha256 = "1d6xxq18lx57aw20pzrv7mh0rdw84sli04l15ingvxj6crqkha4f"; - name = "falkon-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/falkon-22.12.3.tar.xz"; + sha256 = "081cf6qs3ziimzmhx2m976i3cfn0d89ncaxnnmqbamalsdvs5hcf"; + name = "falkon-22.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ffmpegthumbs-22.12.2.tar.xz"; - sha256 = "0ykmlr4acx0lbg255xmhjva5kb448mmsbb8xq1xm763qbf9xkdrr"; - name = "ffmpegthumbs-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ffmpegthumbs-22.12.3.tar.xz"; + sha256 = "14y1w7v34ilmbs4hb1sypgmq67cxrik5yfa63z1wlvmx3ww37w7s"; + name = "ffmpegthumbs-22.12.3.tar.xz"; }; }; filelight = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/filelight-22.12.2.tar.xz"; - sha256 = "1kapmwhzpsmvs7757lgbm3d7nv7iaarn0vv5w7ndv3aygxf719d7"; - name = "filelight-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/filelight-22.12.3.tar.xz"; + sha256 = "105v861b8w3a89rng7agjhhcx4kh58djrpi6n0azd6r01f8yxhmc"; + name = "filelight-22.12.3.tar.xz"; }; }; granatier = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/granatier-22.12.2.tar.xz"; - sha256 = "1hngcg7zvgra7j26iksipxg635snmx9bpqxiw7r1v6qfk97hq6a7"; - name = "granatier-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/granatier-22.12.3.tar.xz"; + sha256 = "1l8w9frqnh6lqyq8345igilsabavg37wk8vaabzjh4bg5lv5ngxl"; + name = "granatier-22.12.3.tar.xz"; }; }; grantlee-editor = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/grantlee-editor-22.12.2.tar.xz"; - sha256 = "0fiyinazfmh82rxr97icfs3qgrzgydczicdghr2i1pb7frpgpxh1"; - name = "grantlee-editor-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/grantlee-editor-22.12.3.tar.xz"; + sha256 = "09rrgqwjk1430vl84bp3xm3wbfdm0kz952kk723jz9b7xhm0sz0k"; + name = "grantlee-editor-22.12.3.tar.xz"; }; }; grantleetheme = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/grantleetheme-22.12.2.tar.xz"; - sha256 = "055cff24fbjhlgc5y7501yy3vyfkgqhsqsc10qbfx24xkgbjfb2i"; - name = "grantleetheme-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/grantleetheme-22.12.3.tar.xz"; + sha256 = "0lpsjj8k3dq0b9i2q9psk1smgkh07kjc7bsha3z0kxwy7ldadaz4"; + name = "grantleetheme-22.12.3.tar.xz"; }; }; gwenview = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/gwenview-22.12.2.tar.xz"; - sha256 = "1dkggydnnhn8db2crlxnj7jz47rrrllpjqxg158rgf740dnhdhbx"; - name = "gwenview-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/gwenview-22.12.3.tar.xz"; + sha256 = "0q2l01zapw6lnm6qcsp3vhvbfsq837hzszmmzb2w7xnpaq4wf7aa"; + name = "gwenview-22.12.3.tar.xz"; }; }; incidenceeditor = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/incidenceeditor-22.12.2.tar.xz"; - sha256 = "0qy4kd1gf72mpi3kks1acdcqn625gys4hjy98cfgn6hz3vp7dfcb"; - name = "incidenceeditor-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/incidenceeditor-22.12.3.tar.xz"; + sha256 = "15g9432175wqrkl5s9mj558lyrc2bdc7w54skkwkaai14i14s0pm"; + name = "incidenceeditor-22.12.3.tar.xz"; }; }; itinerary = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/itinerary-22.12.2.tar.xz"; - sha256 = "13xm73wdwz2fsmmfvikyyq0x98x48j3vzpvijfafj8a1k82zc7g1"; - name = "itinerary-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/itinerary-22.12.3.tar.xz"; + sha256 = "1qlx401vw6xh6hdcypvzm7wbcw72ljkzaxp6sywpcdz4xfpkdml0"; + name = "itinerary-22.12.3.tar.xz"; }; }; juk = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/juk-22.12.2.tar.xz"; - sha256 = "1hi1ywbragllsbx2vf0hmv8a0jnnjnq4jinanxrpkpl2h9hj31bf"; - name = "juk-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/juk-22.12.3.tar.xz"; + sha256 = "0y3v0754ax0w6zn9rbydl0jfshgpm5czcckyz3vp7p2sv2bkmqmc"; + name = "juk-22.12.3.tar.xz"; }; }; k3b = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/k3b-22.12.2.tar.xz"; - sha256 = "08979ns5mm92x5swphd6cf4jvin3nly65h3vzsr85g1h2vi5hywz"; - name = "k3b-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/k3b-22.12.3.tar.xz"; + sha256 = "0alavrz6rd8i1amb06b0fynadygqsh9pwx9njvli6gl959paj94r"; + name = "k3b-22.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-integration-22.12.2.tar.xz"; - sha256 = "171jz49j565myd3iprhlfxla2pc5rs608w815z84qya8y0s9ji8q"; - name = "kaccounts-integration-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-integration-22.12.3.tar.xz"; + sha256 = "0rp8km77vbrjmxyg1sizq6cprl7hjx1x31qqj12pnr35vmzbi8fa"; + name = "kaccounts-integration-22.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-providers-22.12.2.tar.xz"; - sha256 = "0pdkhpprbxd6damdzx4zxd32gs0fdy27s9vhfg79hgb9a94ar8p3"; - name = "kaccounts-providers-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-providers-22.12.3.tar.xz"; + sha256 = "1x1lf24aw9phyr20cjfqhwmmlb6r1iqlb4kvk39hdjzapzw3g505"; + name = "kaccounts-providers-22.12.3.tar.xz"; }; }; kaddressbook = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kaddressbook-22.12.2.tar.xz"; - sha256 = "1vwxfhjh4dk94aijazfnb25fdjwbd7520a90hg59g5cxrd3yrlqb"; - name = "kaddressbook-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kaddressbook-22.12.3.tar.xz"; + sha256 = "1dhcifdm15q0har47z9xicjgk5rffr8q7l6bvzza5i281nkxbdby"; + name = "kaddressbook-22.12.3.tar.xz"; }; }; kajongg = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kajongg-22.12.2.tar.xz"; - sha256 = "1a2ps3vvrh89ryclz4hh072q4mfayys3kgkhp0r9b74yskjln8zv"; - name = "kajongg-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kajongg-22.12.3.tar.xz"; + sha256 = "13bn6mgfbjxpp4xp6xn3nbxjrxfhxblvjnhjcvc3qxcbkjniqzlh"; + name = "kajongg-22.12.3.tar.xz"; }; }; kalarm = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kalarm-22.12.2.tar.xz"; - sha256 = "16aaxl4j1027p3xwrfilgriddr4dlm33vrbhz26w1kdanq7jicp9"; - name = "kalarm-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kalarm-22.12.3.tar.xz"; + sha256 = "074c99an6hawvklgpm6jc415cffa8fadv7r1c5sbiydl7jxkwlh5"; + name = "kalarm-22.12.3.tar.xz"; }; }; kalendar = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kalendar-22.12.2.tar.xz"; - sha256 = "13wkxl4cv7h0jaf5c973ppkflfy5h8x4njmkzgg01fkb4zaxdkdy"; - name = "kalendar-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kalendar-22.12.3.tar.xz"; + sha256 = "1d82hs7dlrpixfp097i7kh3s1hi23h61cb491rbx0y76c2kp9ian"; + name = "kalendar-22.12.3.tar.xz"; }; }; kalgebra = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kalgebra-22.12.2.tar.xz"; - sha256 = "1c8z2mpk2k737dshsg76bvipd1msf6fbp4zqjm167ar29bn5s52j"; - name = "kalgebra-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kalgebra-22.12.3.tar.xz"; + sha256 = "1rv72c3z1zwbym4lrmd1k9mnsh6bk3jhgwg9jynlsbn68wwk2d6y"; + name = "kalgebra-22.12.3.tar.xz"; }; }; kalzium = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kalzium-22.12.2.tar.xz"; - sha256 = "0z0brsxh4ivrna0250j76is9slswmpvkj6n3i6vd9j7x5ayh8kr2"; - name = "kalzium-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kalzium-22.12.3.tar.xz"; + sha256 = "0vd6r2n3vlszwn4qnapasczgkmi7llh8izk1mn4cfc3dprp2jq8b"; + name = "kalzium-22.12.3.tar.xz"; }; }; kamera = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kamera-22.12.2.tar.xz"; - sha256 = "0i8l0happ7sg6ch4jp1680c4ikqvf99dfj6d3cfi0k35wh828x32"; - name = "kamera-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kamera-22.12.3.tar.xz"; + sha256 = "03hfc8rb3ykkmcgyjvm8ywxr5cs98zr6yk468n380pax523c958h"; + name = "kamera-22.12.3.tar.xz"; }; }; kamoso = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kamoso-22.12.2.tar.xz"; - sha256 = "1x1w0kgf5fh8jj5bha7q5sr7f8q93jr987v40h9h5d4xlj576n7n"; - name = "kamoso-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kamoso-22.12.3.tar.xz"; + sha256 = "1pisjv5c8d79j8hvssajwc60w1dkp0xnmlask15qaywk1a8ql7p4"; + name = "kamoso-22.12.3.tar.xz"; }; }; kanagram = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kanagram-22.12.2.tar.xz"; - sha256 = "0dgialia8qc09y2gv8031m2g2dn5dhfn5zyvrh3yb7p1bviw301c"; - name = "kanagram-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kanagram-22.12.3.tar.xz"; + sha256 = "1cliapj1lshs153h012wkqsl6366x96pp69wrn5k70bkxa2pr7hl"; + name = "kanagram-22.12.3.tar.xz"; }; }; kapman = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kapman-22.12.2.tar.xz"; - sha256 = "1xm3bkp0l9if06l0mnfyk5ywmdd8q0vvdwgjy9xm12k06jqkyhgh"; - name = "kapman-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kapman-22.12.3.tar.xz"; + sha256 = "0wy1b60gpwl6495kq06jxrc604y5k0cglhg9brvqd15yqvrpiwm7"; + name = "kapman-22.12.3.tar.xz"; }; }; kapptemplate = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kapptemplate-22.12.2.tar.xz"; - sha256 = "0l95qpw7bdj9na5x32glm465rghylxdmjacfc3372k934vm8ckdl"; - name = "kapptemplate-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kapptemplate-22.12.3.tar.xz"; + sha256 = "0v115r2b108l22bf4vyqhw71mnqzkb30vsy7k385hjirzkpfjx1h"; + name = "kapptemplate-22.12.3.tar.xz"; }; }; kate = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kate-22.12.2.tar.xz"; - sha256 = "199c807yj5vliy1aa0iz3ryymr3zxviakdkidr71imz4bq8v3m70"; - name = "kate-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kate-22.12.3.tar.xz"; + sha256 = "0gj4iwc5bs5kb4m92h4gq47cyyny866rk8d03lqcghyhvaw0bysv"; + name = "kate-22.12.3.tar.xz"; }; }; katomic = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/katomic-22.12.2.tar.xz"; - sha256 = "000d28jl01sn6nil1d57j1iy1flmrv7z6yjc3ci7kjmapi1167mc"; - name = "katomic-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/katomic-22.12.3.tar.xz"; + sha256 = "064khd6c2zrw02f0jjp52qmx073p0zrlzn9vbqbq6rswpzbskam8"; + name = "katomic-22.12.3.tar.xz"; }; }; kbackup = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kbackup-22.12.2.tar.xz"; - sha256 = "1vyl303j7fzyay55agisbn5vj73g26hdk8ilnlwm946rg6nrcf67"; - name = "kbackup-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kbackup-22.12.3.tar.xz"; + sha256 = "04nq7sfynk9bsb1jhra7qrhiyc8hm2gwyb4x68jsqajszl3krjqg"; + name = "kbackup-22.12.3.tar.xz"; }; }; kblackbox = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kblackbox-22.12.2.tar.xz"; - sha256 = "17x4rgji7pnnmnq4dl6mhmdsc8csn3wnwap92jg3lc9r04vpfk5h"; - name = "kblackbox-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kblackbox-22.12.3.tar.xz"; + sha256 = "0gn1kj5az1i35jfcsj2dbx8h2ndq5iiqjwhv3v0gil98vfk11zxi"; + name = "kblackbox-22.12.3.tar.xz"; }; }; kblocks = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kblocks-22.12.2.tar.xz"; - sha256 = "1qf1qf3r659ya8rr00pqikdxb69c05s0v8dzk2j8ajnbzc19w8sa"; - name = "kblocks-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kblocks-22.12.3.tar.xz"; + sha256 = "0pnad7p16cfb8arffn0b019ciq0li6bnb7qmwr32jad6gvjhnbx4"; + name = "kblocks-22.12.3.tar.xz"; }; }; kbounce = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kbounce-22.12.2.tar.xz"; - sha256 = "1lbdicwnv1zz3jlg4v2yblm2xjxslkb64nq0z94cgfp1nzwavq3n"; - name = "kbounce-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kbounce-22.12.3.tar.xz"; + sha256 = "1hjw9g0wivxyr6qd08dfbqlfhynvaxg5hfr2zrl6kh0fh7wywzpi"; + name = "kbounce-22.12.3.tar.xz"; }; }; kbreakout = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kbreakout-22.12.2.tar.xz"; - sha256 = "0cx2m4hqw39kpzp4y5rsxa1y264q318q5qsbjwcflbnm50fdbjpd"; - name = "kbreakout-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kbreakout-22.12.3.tar.xz"; + sha256 = "0s32fq3dlakql44db4grizgs0gaavm4scsn8vjj7rabqwmqx2nxs"; + name = "kbreakout-22.12.3.tar.xz"; }; }; kbruch = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kbruch-22.12.2.tar.xz"; - sha256 = "1rc8kjyipknrraiyq7wabjzm3i00jsjkd75d8qfk50i2sdxm47kv"; - name = "kbruch-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kbruch-22.12.3.tar.xz"; + sha256 = "0pr1440p8cwwf9pixli5si1imj0sxlhkpadjmzy58hdwi5yf8dxg"; + name = "kbruch-22.12.3.tar.xz"; }; }; kcachegrind = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcachegrind-22.12.2.tar.xz"; - sha256 = "065lp2g5cp2pmisjfb2m2m64f20r1c18vridlp7zdkran5d3fq0k"; - name = "kcachegrind-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcachegrind-22.12.3.tar.xz"; + sha256 = "1c2azm416xn33val3bf3q9ffa2bva0hqngfh6kd28x96vrj7chr7"; + name = "kcachegrind-22.12.3.tar.xz"; }; }; kcalc = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcalc-22.12.2.tar.xz"; - sha256 = "021njz922hah1bwrq2mqc96fzg0ap59ffa3n5ycgb66jld1vnn3n"; - name = "kcalc-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcalc-22.12.3.tar.xz"; + sha256 = "16gxpxnydqcg59i15dsrbz85wcy7jrr9bqbdcnbl03jiwqjkkrjj"; + name = "kcalc-22.12.3.tar.xz"; }; }; kcalutils = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcalutils-22.12.2.tar.xz"; - sha256 = "1kd2nci8j76r847jh91pjhpcy386ilg82caq0npq2n64li2lq0dq"; - name = "kcalutils-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcalutils-22.12.3.tar.xz"; + sha256 = "0szw42iyrqxfxq8hy5fnn0iyjxj9l9dwy1z3r6v578390z98gqig"; + name = "kcalutils-22.12.3.tar.xz"; }; }; kcharselect = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcharselect-22.12.2.tar.xz"; - sha256 = "1zhj2yzapcxi4vjx64k8mxqd45qknsb825s1la0bkbilkgzljg3p"; - name = "kcharselect-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcharselect-22.12.3.tar.xz"; + sha256 = "1pd3f9vcjfdqfrniz3adksvjq3hkdpdxvhx04qrv0dbq05qzah1l"; + name = "kcharselect-22.12.3.tar.xz"; }; }; kcolorchooser = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcolorchooser-22.12.2.tar.xz"; - sha256 = "0zysz6z08xsxv0psyma0cym57w6fj9j2np14jka097qp58hpjkzi"; - name = "kcolorchooser-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcolorchooser-22.12.3.tar.xz"; + sha256 = "0h6s4r739n1s54kvn2vsq825qigpdyan2jma9195xf2w5ix42im0"; + name = "kcolorchooser-22.12.3.tar.xz"; }; }; kcron = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kcron-22.12.2.tar.xz"; - sha256 = "1mnb47igwh3kgy75z0ggizj730wajmc2s6kjxbddc6qj33hlrg1k"; - name = "kcron-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kcron-22.12.3.tar.xz"; + sha256 = "0khqkdgzbxckksy95p4hqqjyk0gv6vi508gf40zy7mwsjzg04jgb"; + name = "kcron-22.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-scripts-22.12.2.tar.xz"; - sha256 = "1sr8ykj8n2h4hg85zbz5x68m7kq9sb84k1d6wrxy67n3lzsklswj"; - name = "kde-dev-scripts-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-scripts-22.12.3.tar.xz"; + sha256 = "0y8jhxcbdmb3kq6aq4zpq80p6flgfxqw12v3phqrma7jzxfbi79c"; + name = "kde-dev-scripts-22.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-utils-22.12.2.tar.xz"; - sha256 = "1vq1mfys07513gprlj1vmxhl5ijj2p2dxx4ddj2iwg0i9qapjr25"; - name = "kde-dev-utils-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-utils-22.12.3.tar.xz"; + sha256 = "022vx350xn8kmwvfniclc06qdixw5gi5v70n5alcrw5h7j3l0y10"; + name = "kde-dev-utils-22.12.3.tar.xz"; }; }; kdebugsettings = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdebugsettings-22.12.2.tar.xz"; - sha256 = "07zw0icfvqg3ispalkyc5h13kln6mpfzgkirwkgnplksd059wzyv"; - name = "kdebugsettings-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdebugsettings-22.12.3.tar.xz"; + sha256 = "12hhimcclp5xm9wpb027d5j25k9n9q6iqyclpgd4gdcclmzcgmiv"; + name = "kdebugsettings-22.12.3.tar.xz"; }; }; kdeconnect-kde = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdeconnect-kde-22.12.2.tar.xz"; - sha256 = "09h0by43jrizq2qcmhcr5jbsvhjkcqrgrblzy9i2r0ihhvlkwg87"; - name = "kdeconnect-kde-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdeconnect-kde-22.12.3.tar.xz"; + sha256 = "16c0p8liq8mw56yczq1zckwbpys874f9i43ii9y6j0avfvldxnib"; + name = "kdeconnect-kde-22.12.3.tar.xz"; }; }; kdeedu-data = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdeedu-data-22.12.2.tar.xz"; - sha256 = "1nffvgy2imi1csq9z45v2yf7p7d22k8nh25ciiph2dax9w3qlj81"; - name = "kdeedu-data-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdeedu-data-22.12.3.tar.xz"; + sha256 = "1j4x84qhrx5qhp87xmhy11szjx8mzvyg824dxvh9rr7aqycr8543"; + name = "kdeedu-data-22.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-mobipocket-22.12.2.tar.xz"; - sha256 = "1ly3jv64jdzppnipnzr3chm3s8azwfq1pn94pfxm7hj6p6ywn9fn"; - name = "kdegraphics-mobipocket-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-mobipocket-22.12.3.tar.xz"; + sha256 = "1wd8z2jkcys91wghp2xfvxm3dhps13agyq98k71069xi77b26h2g"; + name = "kdegraphics-mobipocket-22.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-thumbnailers-22.12.2.tar.xz"; - sha256 = "0rzy6icli31fp5z1l3jvnxgwq3fgfijlb3kfi5ci3d8raddyzf6r"; - name = "kdegraphics-thumbnailers-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-thumbnailers-22.12.3.tar.xz"; + sha256 = "027hlv38f9185pvkjaalyffciskcpahrj1l541sykrbdl9pqy0h7"; + name = "kdegraphics-thumbnailers-22.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdenetwork-filesharing-22.12.2.tar.xz"; - sha256 = "0z94la60pj8qnsnikr7j297mxhbyd4sdjhyccdix1dxdglskzqpy"; - name = "kdenetwork-filesharing-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdenetwork-filesharing-22.12.3.tar.xz"; + sha256 = "1yr7lh46x20b6ra5ax8ikvwy3cr5whz9jmyg7282niw1vjk52pj8"; + name = "kdenetwork-filesharing-22.12.3.tar.xz"; }; }; kdenlive = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdenlive-22.12.2.tar.xz"; - sha256 = "1g5ylks4i1sfpdhzimyvvw6ljawk19b28242zsk8nz9cn8gbr786"; - name = "kdenlive-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdenlive-22.12.3.tar.xz"; + sha256 = "0s9wgii294irbxcg9rgnjpwpq0d54zjf1h2900bh6brhwfxhrvkj"; + name = "kdenlive-22.12.3.tar.xz"; }; }; kdepim-addons = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdepim-addons-22.12.2.tar.xz"; - sha256 = "059p7bb0rkp1ph7cigyld3777ib3i4likhr3rcr9q843ksbws43m"; - name = "kdepim-addons-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdepim-addons-22.12.3.tar.xz"; + sha256 = "0yapb2mq5jk6pysdi95s4ivrdlxap08lh97r2kd95v06028b95bd"; + name = "kdepim-addons-22.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdepim-runtime-22.12.2.tar.xz"; - sha256 = "16j6w6y0c05w9vni6wa633b6g0j3f7z5algn5y2292zqnfa9apzd"; - name = "kdepim-runtime-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdepim-runtime-22.12.3.tar.xz"; + sha256 = "0mvjnzncx52dsr54g6ra8hj06gayxw85chc8ywdv154sch3pbc3x"; + name = "kdepim-runtime-22.12.3.tar.xz"; }; }; kdesdk-kio = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-kio-22.12.2.tar.xz"; - sha256 = "0nahw5747fcyvgzp0axm8cvhjfnlwjwl1q4020whp95nw9pa5yjz"; - name = "kdesdk-kio-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-kio-22.12.3.tar.xz"; + sha256 = "0j3bh7dxgx2javsb3v4c53i15a85x6k00kq0myj9l9272jl9wqbb"; + name = "kdesdk-kio-22.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-thumbnailers-22.12.2.tar.xz"; - sha256 = "1d79xrxwi760sfjfbv6pjp2hp7n77r17lm6dyvn9m3i5gakq2njx"; - name = "kdesdk-thumbnailers-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-thumbnailers-22.12.3.tar.xz"; + sha256 = "0l1hhygdvqcp9rxwwvl0y1is8z86vsqppijvmjvhyyfm6fn5kkg6"; + name = "kdesdk-thumbnailers-22.12.3.tar.xz"; }; }; kdev-php = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdev-php-22.12.2.tar.xz"; - sha256 = "1ds27qf3dbf4m5i8fp5fljx8z41hmhc2915wwm5cqwpyzzmvvx8d"; - name = "kdev-php-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdev-php-22.12.3.tar.xz"; + sha256 = "1iki8zj4a5z69wv7nvycn3fqfndxgqrcaxy9nn4xd97i7bdfzrm8"; + name = "kdev-php-22.12.3.tar.xz"; }; }; kdev-python = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdev-python-22.12.2.tar.xz"; - sha256 = "0c348lrysz3hnb12763f92xw7p8asihc8qnry4mznk8plzrg4895"; - name = "kdev-python-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdev-python-22.12.3.tar.xz"; + sha256 = "0ybfjgdbfwk9hhvh2h1grzkl3zzkqd6bysbrbfkpbhi3kx8l0rps"; + name = "kdev-python-22.12.3.tar.xz"; }; }; kdevelop = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdevelop-22.12.2.tar.xz"; - sha256 = "1jayqbvwx32n6mskdph2mcxf0azzbyc4qc206hfyf2myn5g5xy2p"; - name = "kdevelop-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdevelop-22.12.3.tar.xz"; + sha256 = "0hq6y0qf572fsqxf5h4k7jxqxdp08d57hx1gw2v6ca5dl69dmrfa"; + name = "kdevelop-22.12.3.tar.xz"; }; }; kdf = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdf-22.12.2.tar.xz"; - sha256 = "0vsy1m7lp7lkqg6pmdl5f351rgpcjdizzvihgc1cr6sr1mw4hsmg"; - name = "kdf-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdf-22.12.3.tar.xz"; + sha256 = "157bk2mgn7dqn97lnnbhcy9aanymdzx6lgp4wf9camrlkpzlmv20"; + name = "kdf-22.12.3.tar.xz"; }; }; kdialog = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdialog-22.12.2.tar.xz"; - sha256 = "1lr6w8j5c38gzlm9qwbchapgn2bc696w7lz4amxb89ixb45miibj"; - name = "kdialog-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdialog-22.12.3.tar.xz"; + sha256 = "0bgcrc0dqjqc4i2c965bkv4jckmj2v4vgga3s7wa1hx8j1qwm323"; + name = "kdialog-22.12.3.tar.xz"; }; }; kdiamond = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kdiamond-22.12.2.tar.xz"; - sha256 = "14z8gy1yzwx6cqgx5dsrn4wy7vnwg4ynlxpm4zzqnpn0ry1v5ba3"; - name = "kdiamond-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kdiamond-22.12.3.tar.xz"; + sha256 = "0xf4ganqm6wvzvqi1sy4wy8nh53779fx894kn0khawxivav69r6c"; + name = "kdiamond-22.12.3.tar.xz"; }; }; keditbookmarks = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/keditbookmarks-22.12.2.tar.xz"; - sha256 = "0cgc6biqar78f7q355fcf1ds8zsbzvl24376s5ahgzm8ffcl3m6x"; - name = "keditbookmarks-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/keditbookmarks-22.12.3.tar.xz"; + sha256 = "0b1bpqaf3v4y668sspzangsh6jw9hp3li8a9smkg61qnpxlv0ix6"; + name = "keditbookmarks-22.12.3.tar.xz"; }; }; kfind = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kfind-22.12.2.tar.xz"; - sha256 = "0p0bgyrxvjryzsr1fwxccv3gdbkbvsdwsc9plq9hq1z2wd078ps4"; - name = "kfind-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kfind-22.12.3.tar.xz"; + sha256 = "1a0ms6cnzbq3p20q6vfc0m1zddpsdxsaw0y6dsfz804gy1lswk7x"; + name = "kfind-22.12.3.tar.xz"; }; }; kfloppy = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kfloppy-22.12.2.tar.xz"; - sha256 = "0bv9xkn8wdm4kxb379alx3l6l2l3k5ainmjgwafgz2hwgn52369m"; - name = "kfloppy-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kfloppy-22.12.3.tar.xz"; + sha256 = "119m06av50fj5sbbhdcwcjkwxz7jmzhdl74x7g6k742bzf6nn2b6"; + name = "kfloppy-22.12.3.tar.xz"; }; }; kfourinline = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kfourinline-22.12.2.tar.xz"; - sha256 = "1cyvpg07y0q8dh1zl7840qkbppx7ndg52v1z95xwcxvggasmgqj6"; - name = "kfourinline-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kfourinline-22.12.3.tar.xz"; + sha256 = "1b8w96n788md83r8kjk21wjc3wplbsfq385jrcxq1ivjfyzjzzps"; + name = "kfourinline-22.12.3.tar.xz"; }; }; kgeography = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kgeography-22.12.2.tar.xz"; - sha256 = "1qcwdg9qkql7ky9m33fx21d1g6585xbm1z2z179sdsnbcpjmx34c"; - name = "kgeography-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kgeography-22.12.3.tar.xz"; + sha256 = "0i7d2n3a2phgvlr3zw2w8lq4mfw2l818z52fqc4y30n85gvzs0m2"; + name = "kgeography-22.12.3.tar.xz"; }; }; kget = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kget-22.12.2.tar.xz"; - sha256 = "00z3h6b5f78cvczapzvbz8q12lr69668n6sryijsv5a2aykimgs7"; - name = "kget-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kget-22.12.3.tar.xz"; + sha256 = "048i7ny857k8fsx3ybmcq316pfxlrag06b11l868hrhxnj361mk1"; + name = "kget-22.12.3.tar.xz"; }; }; kgoldrunner = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kgoldrunner-22.12.2.tar.xz"; - sha256 = "134dp60a86p1a9rn8svzn8ia2ji7kan7bv53gnis4vgric97dm2v"; - name = "kgoldrunner-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kgoldrunner-22.12.3.tar.xz"; + sha256 = "10g85x4hks3p35smvfj69g1gfaaggzsms3nqrpmqp5b949z6zjrn"; + name = "kgoldrunner-22.12.3.tar.xz"; }; }; kgpg = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kgpg-22.12.2.tar.xz"; - sha256 = "02qa3148rkcda21a3n83id1cqkr53y2cilhwlsm52cm5998xr4pd"; - name = "kgpg-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kgpg-22.12.3.tar.xz"; + sha256 = "1qrkgq4q391s20azrs8d2nm9x1raz8fbx7yxkg13mcc4gp7zzvp6"; + name = "kgpg-22.12.3.tar.xz"; }; }; khangman = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/khangman-22.12.2.tar.xz"; - sha256 = "1iw40hmxylhgla3cf40c67vcf1whgag18jkvlprbw9pap47qn6ql"; - name = "khangman-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/khangman-22.12.3.tar.xz"; + sha256 = "1p1szzisdhsbbid6nb7cngapvpw025263d1lfp03r0x767r5w9zx"; + name = "khangman-22.12.3.tar.xz"; }; }; khelpcenter = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/khelpcenter-22.12.2.tar.xz"; - sha256 = "1xjmyw92711y5sfdc37q9al6y70css1h914nyn400m93pijl15kp"; - name = "khelpcenter-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/khelpcenter-22.12.3.tar.xz"; + sha256 = "1sv1rpdr57rp2yyfvyfw2iy1k2cq0k0bszd40gb009r0f6zywy0i"; + name = "khelpcenter-22.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kidentitymanagement-22.12.2.tar.xz"; - sha256 = "08021m509msn4sp7l89lrki0bzqdpnjmix3shg2y86pa7sq3r55h"; - name = "kidentitymanagement-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kidentitymanagement-22.12.3.tar.xz"; + sha256 = "0nr1172ajn4n09zk7dxd1zfsmcrcy50mlmisv9bby7c0lmwzv1pf"; + name = "kidentitymanagement-22.12.3.tar.xz"; }; }; kig = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kig-22.12.2.tar.xz"; - sha256 = "0r7wl2vpg38hyvx865kdfx39yjjijnyd4cyriq82vj6h4s60lkfh"; - name = "kig-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kig-22.12.3.tar.xz"; + sha256 = "1ndiwmgg2bawq2is4sspdrssfwamnkpghpq81bs5lxazi0ixnyk5"; + name = "kig-22.12.3.tar.xz"; }; }; kigo = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kigo-22.12.2.tar.xz"; - sha256 = "1wh929p33iq38yw1836zz1hhaz4wyr0834chx9x6zps0f4qbn6f7"; - name = "kigo-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kigo-22.12.3.tar.xz"; + sha256 = "1j5pplhyb6cq76b4avflw0rb4r8lmkas38mh70s2mjw5c8mj19gg"; + name = "kigo-22.12.3.tar.xz"; }; }; killbots = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/killbots-22.12.2.tar.xz"; - sha256 = "1kx4c6gaijfxr7ylazlpr07bbby43fk6x3kgv0n9d9d87fkqwigr"; - name = "killbots-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/killbots-22.12.3.tar.xz"; + sha256 = "1xchgipbs61azzcf0qjm1liwdkppg7nml9ga0mwswhzpw9ylp5yi"; + name = "killbots-22.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kimagemapeditor-22.12.2.tar.xz"; - sha256 = "01kmvlir5p3ip7rylvd9j9xg7zdp6b8f8i5b5qn9d5d220p2n59j"; - name = "kimagemapeditor-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kimagemapeditor-22.12.3.tar.xz"; + sha256 = "0f2nif2wlcgql345xfg1h0x31ms2l6w1i8wwc2iy0a679971w8mx"; + name = "kimagemapeditor-22.12.3.tar.xz"; }; }; kimap = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kimap-22.12.2.tar.xz"; - sha256 = "03qxfybh8wp5pyyympqhzndbv0dxfj141wh7imwazgvhq5hxy1ia"; - name = "kimap-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kimap-22.12.3.tar.xz"; + sha256 = "1xn5gmry4fgm9yc5z6dn9g7yp2hyjry5r5fvkdhm3jh3n11bgq6j"; + name = "kimap-22.12.3.tar.xz"; }; }; kio-extras = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kio-extras-22.12.2.tar.xz"; - sha256 = "1420kwhff103h57ii60z23m9w2nr2yqys23faa39b59kg4bx01na"; - name = "kio-extras-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kio-extras-22.12.3.tar.xz"; + sha256 = "15qh2w6fm1j33scvlb2cjjimvfvisa0vp7d5n4mwm82s15a7ahv5"; + name = "kio-extras-22.12.3.tar.xz"; }; }; kio-gdrive = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kio-gdrive-22.12.2.tar.xz"; - sha256 = "00vfrfd9j5qp6g71a4yz0sqckw2rgwd6l16agqkbvb7adiyhwlax"; - name = "kio-gdrive-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kio-gdrive-22.12.3.tar.xz"; + sha256 = "12r44b68vyzc1yhfm4pmp7g1af2ysqybvjzr12pl8xw4zgyd3qd3"; + name = "kio-gdrive-22.12.3.tar.xz"; }; }; kio-zeroconf = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kio-zeroconf-22.12.2.tar.xz"; - sha256 = "13rbxds754yc7c7pa52am29ynv01dh7v9rl24znnckr674kw532d"; - name = "kio-zeroconf-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kio-zeroconf-22.12.3.tar.xz"; + sha256 = "1azx6f6dh2nwmzp4vbn4qwxlh4f4zxq211p4pqvf29yi2fyp8ix1"; + name = "kio-zeroconf-22.12.3.tar.xz"; }; }; kipi-plugins = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kipi-plugins-22.12.2.tar.xz"; - sha256 = "09nk8fg97gjbrv7facdns64i65q0as592wfng8fc1ayr897rlf3i"; - name = "kipi-plugins-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kipi-plugins-22.12.3.tar.xz"; + sha256 = "1zfp05biddxpggl3b158dg2sdjrqp8rdbymqfbr9p3w7gl6hk7av"; + name = "kipi-plugins-22.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kirigami-gallery-22.12.2.tar.xz"; - sha256 = "0rx9dvimwb9wyxvamcmx2pndzm4gi23nz7lfsdk21vs61swhff03"; - name = "kirigami-gallery-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kirigami-gallery-22.12.3.tar.xz"; + sha256 = "1zbsnfs25nqkwfqhkjn7idcypzhzfb0ldjxarlp104ycjh70v5ls"; + name = "kirigami-gallery-22.12.3.tar.xz"; }; }; kiriki = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kiriki-22.12.2.tar.xz"; - sha256 = "1pvadk48qbc1qbzmdvn70zpr4idvabgw4gddccslgpx1kh1mv6lq"; - name = "kiriki-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kiriki-22.12.3.tar.xz"; + sha256 = "05csmqy7kdn5kga1lrg6bf7qjg36w7wyd23c0nnizzh51d7h13f7"; + name = "kiriki-22.12.3.tar.xz"; }; }; kiten = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kiten-22.12.2.tar.xz"; - sha256 = "0x7f820r6ql19zrfgmgka4766ni2qp2jrwz3qpz1fidkcxrifnhr"; - name = "kiten-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kiten-22.12.3.tar.xz"; + sha256 = "0xqj62hwlqsar1ziwgzrmk7bj9hqwwxpfwhrfm661vib0qsn82kn"; + name = "kiten-22.12.3.tar.xz"; }; }; kitinerary = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kitinerary-22.12.2.tar.xz"; - sha256 = "0773yb328msavm0azlmpfq9f3fnajcnwwz1njw1zxrgcmknx002h"; - name = "kitinerary-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kitinerary-22.12.3.tar.xz"; + sha256 = "0qrfhrf9fgslagds6qr46a9p5iwzy5d07ilk8r29xcvm6l9s95x6"; + name = "kitinerary-22.12.3.tar.xz"; }; }; kjumpingcube = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kjumpingcube-22.12.2.tar.xz"; - sha256 = "07vcf7n61izfzfpmci82v00k2sbqlj9lpir730cxiq4nxh4z7jqx"; - name = "kjumpingcube-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kjumpingcube-22.12.3.tar.xz"; + sha256 = "09wg0k92yb4wfqfq3hhai2rbviwpj7kwgi3m19dv1xr40n7kfgaz"; + name = "kjumpingcube-22.12.3.tar.xz"; }; }; kldap = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kldap-22.12.2.tar.xz"; - sha256 = "08ij0iv5pk2j7zbnf2dwq20jqcxbmbw8gkpyk45bsw4wv840kspc"; - name = "kldap-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kldap-22.12.3.tar.xz"; + sha256 = "0a0cmr7vjpk7c0mkgvbnf65qq24dqwx8f1cyv6phfb6yr8ffwcqd"; + name = "kldap-22.12.3.tar.xz"; }; }; kleopatra = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kleopatra-22.12.2.tar.xz"; - sha256 = "1rk0jpab600hfkw35zj2zv5bi1avix61xjxfwywzh5ql1kyv0cka"; - name = "kleopatra-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kleopatra-22.12.3.tar.xz"; + sha256 = "15nrg63xyb2jaxix8ijnp3ikbnj74d430ilvxa9k7kbzjp59kw9i"; + name = "kleopatra-22.12.3.tar.xz"; }; }; klettres = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/klettres-22.12.2.tar.xz"; - sha256 = "1cp8w8fy85ij434nrl6ksivd8dw0nkz3vhwhwmwalrx2pj7h6dpa"; - name = "klettres-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/klettres-22.12.3.tar.xz"; + sha256 = "09s2fiyqhbr9jhm76v84rlzvrbcbwrra1m3ajbf2vkrk7fiwaav2"; + name = "klettres-22.12.3.tar.xz"; }; }; klickety = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/klickety-22.12.2.tar.xz"; - sha256 = "0zq33801das6l9ph3f20mcx5wfrz10yms11v1dvwnzsjszb4mxb9"; - name = "klickety-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/klickety-22.12.3.tar.xz"; + sha256 = "10xiwd1yr1y7gfw7hb8qsxs2x689xsxcimwdnwyi6bcy5kcj63zi"; + name = "klickety-22.12.3.tar.xz"; }; }; klines = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/klines-22.12.2.tar.xz"; - sha256 = "18p7hls5pns5n6asdm4ccm6540qin8n7w4sbmlhrq2qqk07csq3z"; - name = "klines-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/klines-22.12.3.tar.xz"; + sha256 = "1l3j4ig2sjga64vrl75z409dy0kgc2f784ggza94v6hklq39p06z"; + name = "klines-22.12.3.tar.xz"; }; }; kmag = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmag-22.12.2.tar.xz"; - sha256 = "11ar70m4b4s2n30rw7b5a0r4bkasraxqcfzfbafyzh2bk51166m6"; - name = "kmag-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmag-22.12.3.tar.xz"; + sha256 = "0lj6glichvs0wk9fdzznplas3mdvi98m6m92whimgvkj4fslwknv"; + name = "kmag-22.12.3.tar.xz"; }; }; kmahjongg = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmahjongg-22.12.2.tar.xz"; - sha256 = "1snkxbdsvc0nzqknsgq7cg42imz9ay43ddxxqzf7d47fqsvwac4f"; - name = "kmahjongg-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmahjongg-22.12.3.tar.xz"; + sha256 = "1rsvk0vy85z27g0ldli8lm6bqywggvwp0kkz860yfjnlbi0wznxr"; + name = "kmahjongg-22.12.3.tar.xz"; }; }; kmail = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmail-22.12.2.tar.xz"; - sha256 = "0cj56i27bkxmnl26r20dp7s9qzihp3nlwhznj2nz1xzk6dri6fhb"; - name = "kmail-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmail-22.12.3.tar.xz"; + sha256 = "13h2s78bsmzbdc45iixvpc6ba23zng2f579s81935pvcb412lvbq"; + name = "kmail-22.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmail-account-wizard-22.12.2.tar.xz"; - sha256 = "1ldypandladx520qhbrkasqb775i3ld1jnq8h2cm7549zm8rdjxj"; - name = "kmail-account-wizard-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmail-account-wizard-22.12.3.tar.xz"; + sha256 = "0ij54xx7clz7nxgfzw3kf9xjb84qn1llm041x0l6cydfhw60bjw8"; + name = "kmail-account-wizard-22.12.3.tar.xz"; }; }; kmailtransport = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmailtransport-22.12.2.tar.xz"; - sha256 = "0x34fhn12prrc4l01yiwar0kvjr8mbyg7p1sjqvq1gz7pjqflyfa"; - name = "kmailtransport-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmailtransport-22.12.3.tar.xz"; + sha256 = "1h53mmd25ydyqdazn4h9k2gq24d694khdbwsb0dpw7fv4x9ihvyk"; + name = "kmailtransport-22.12.3.tar.xz"; }; }; kmbox = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmbox-22.12.2.tar.xz"; - sha256 = "1xk44ndglf15fipd9hpqviv2j46linj41lprj5x84w9i3lxcflrf"; - name = "kmbox-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmbox-22.12.3.tar.xz"; + sha256 = "0wshp1i789j3ijn6p230xx0bdkpx439imaif5acxw0m9bjrvbfrd"; + name = "kmbox-22.12.3.tar.xz"; }; }; kmime = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmime-22.12.2.tar.xz"; - sha256 = "1i3cfdh79wnmkrgidfbvgc3mdn3b8cfchy2zlkj1kbigx06l8cbc"; - name = "kmime-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmime-22.12.3.tar.xz"; + sha256 = "1n6353diasl50xd280ydpdmg3c1966q5sxfx8h96gbjfcqgiyg4v"; + name = "kmime-22.12.3.tar.xz"; }; }; kmines = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmines-22.12.2.tar.xz"; - sha256 = "0n2nzx6b0fn9kkqiyavnijjgks7jgfpv4smzqrm55jskwcni9vry"; - name = "kmines-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmines-22.12.3.tar.xz"; + sha256 = "05zmhzh09bdgi3jx2hv2m1lycnj6ifhgr86l2jkqfby6yl6n7sf6"; + name = "kmines-22.12.3.tar.xz"; }; }; kmix = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmix-22.12.2.tar.xz"; - sha256 = "170rdwm18ld4khy3zck8d2936026cc90r1d37y0f70lw4p37lwpm"; - name = "kmix-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmix-22.12.3.tar.xz"; + sha256 = "0s8ff91daa9gf90vz39hzryv19biy4jlvn1slimqvbrlpvii7p2v"; + name = "kmix-22.12.3.tar.xz"; }; }; kmousetool = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmousetool-22.12.2.tar.xz"; - sha256 = "0pl0203zl989wjzpqg6rjqhr8k1fw22r7cw3plvbq2sgl1rlk7i2"; - name = "kmousetool-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmousetool-22.12.3.tar.xz"; + sha256 = "1j2gqdbrif78cp0jvxhq1dmj5vrqdmnqaipx478h50r8ykzc8yfs"; + name = "kmousetool-22.12.3.tar.xz"; }; }; kmouth = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmouth-22.12.2.tar.xz"; - sha256 = "0cx3lnx9909d630ccv6ln9sahgvpcxrpf56xm77rrrx1a8b7483l"; - name = "kmouth-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmouth-22.12.3.tar.xz"; + sha256 = "1kp03hr07qk8707zqvlh3w6hsdmv6ry9gaydi3klc832w57y21b9"; + name = "kmouth-22.12.3.tar.xz"; }; }; kmplot = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kmplot-22.12.2.tar.xz"; - sha256 = "0nb937war0ss0r4a2hp99qf4y9ac5cp8xfm0abnibsa9fykj9lsa"; - name = "kmplot-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kmplot-22.12.3.tar.xz"; + sha256 = "0hg77qg6yzhk7d7jfbp1544qlmw5wwgv97p9p992lxcm234h560j"; + name = "kmplot-22.12.3.tar.xz"; }; }; knavalbattle = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/knavalbattle-22.12.2.tar.xz"; - sha256 = "0nkkdzysmhn1a7yadzsd829xpsl3aqmizm5rb8yadspfv2kkf6pb"; - name = "knavalbattle-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/knavalbattle-22.12.3.tar.xz"; + sha256 = "17zsmk7n2cxdfaxk63c958aydparcca2dw10yfdafq4a3wjhnqqf"; + name = "knavalbattle-22.12.3.tar.xz"; }; }; knetwalk = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/knetwalk-22.12.2.tar.xz"; - sha256 = "1a4gv5pb8j2jfavwz2f0qh022ng84ib4851rfzx2piky6wajpx8f"; - name = "knetwalk-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/knetwalk-22.12.3.tar.xz"; + sha256 = "16p57ixq1h8wfv4ggv91m8d8pfjy486phi2yvsxnkib12yiv13yj"; + name = "knetwalk-22.12.3.tar.xz"; }; }; knights = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/knights-22.12.2.tar.xz"; - sha256 = "1l1igm2fvz9aw2hmpb30cajppdnszhpqya7w980m3snm2br8b45b"; - name = "knights-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/knights-22.12.3.tar.xz"; + sha256 = "1rc2xrb6s1ncqnbbxr5c3ccy98mk2ljhxp32nmfzxd6l97qm0mnj"; + name = "knights-22.12.3.tar.xz"; }; }; knotes = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/knotes-22.12.2.tar.xz"; - sha256 = "073az341ycmrls3mv9m0rr1d8jps0yrsp62sawirk6sqy18i4ngw"; - name = "knotes-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/knotes-22.12.3.tar.xz"; + sha256 = "1nav1c1q65f3zsrwyq2j5nikhxp4mz45yg0zfymw24n4qi2b9xc2"; + name = "knotes-22.12.3.tar.xz"; }; }; kolf = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kolf-22.12.2.tar.xz"; - sha256 = "08kz6gc6dx0v1ldaa518z1sz1n4dilsik2w8f9rggbl6p1ry53bj"; - name = "kolf-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kolf-22.12.3.tar.xz"; + sha256 = "01czns2gqvjnydc2bz8y2gq4m4lz50l9z71i0nf3nidihvgs96vl"; + name = "kolf-22.12.3.tar.xz"; }; }; kollision = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kollision-22.12.2.tar.xz"; - sha256 = "0pkz2lv9pwal4dy9y8bi5vwbp8x9z69g3n9vhwbxc4fv9hcqndnm"; - name = "kollision-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kollision-22.12.3.tar.xz"; + sha256 = "1dfr4ghg9yly0fv8fyjcs4ahf2xp9c08sssli1kph6qspvpmd8qq"; + name = "kollision-22.12.3.tar.xz"; }; }; kolourpaint = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kolourpaint-22.12.2.tar.xz"; - sha256 = "07zpc8fxlvm49v53cprz7syj59d73733vi3372gbmzir03q3xcw0"; - name = "kolourpaint-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kolourpaint-22.12.3.tar.xz"; + sha256 = "1gwpf5rb1hx49a18d5hd4l4p72bpgamy4yqiyixa75hmxhj09kwq"; + name = "kolourpaint-22.12.3.tar.xz"; }; }; kompare = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kompare-22.12.2.tar.xz"; - sha256 = "14hyp72942alzrqzpv7mig3m4sgh4iivsnvnh1yacd9y4y1sdapy"; - name = "kompare-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kompare-22.12.3.tar.xz"; + sha256 = "0bg76vgz6b6dx0zrnh92r4ny1dh0bdakkyb17jl4fd28crixy4ds"; + name = "kompare-22.12.3.tar.xz"; }; }; konqueror = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/konqueror-22.12.2.tar.xz"; - sha256 = "1k3vf7sh21iy2v8j8bqxl83nnlpxisj14b6mbi1ldxxgsh6vzyly"; - name = "konqueror-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/konqueror-22.12.3.tar.xz"; + sha256 = "1m4szi3jskcjzqdgqqhniydrv8qcbq0p0s8cb6q3b1iap9b509xh"; + name = "konqueror-22.12.3.tar.xz"; }; }; konquest = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/konquest-22.12.2.tar.xz"; - sha256 = "1haa4zcfsgm25fcr20nvrr5pmy0ynz261q70qj722qh3ljz8cvgy"; - name = "konquest-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/konquest-22.12.3.tar.xz"; + sha256 = "0p2h1vj90p7xg30b5d002kfk724apj0zifi1nk4nlrmnb2iwmani"; + name = "konquest-22.12.3.tar.xz"; }; }; konsole = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/konsole-22.12.2.tar.xz"; - sha256 = "0d9lqq373vxw0fi54ipfll5qi7dz5ylaa7053csnfp26dmmhky9j"; - name = "konsole-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/konsole-22.12.3.tar.xz"; + sha256 = "0vzqmdn2pl3nxdsvx7db8ah9wklkap729cq41jifpjkf8javraar"; + name = "konsole-22.12.3.tar.xz"; }; }; kontact = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kontact-22.12.2.tar.xz"; - sha256 = "11l7zd12yfqw66lak5bvacz7fc6ahv5820vkfx8iacynvm43x94f"; - name = "kontact-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kontact-22.12.3.tar.xz"; + sha256 = "1j10hnp4lk9wsa2m5w00h198wafzvbhz3z28rg2xgwf426q7hp91"; + name = "kontact-22.12.3.tar.xz"; }; }; kontactinterface = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kontactinterface-22.12.2.tar.xz"; - sha256 = "0yxpz4az4988yvjxy6za93ayiz8w6q61cqpgi48az2q74kc99qik"; - name = "kontactinterface-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kontactinterface-22.12.3.tar.xz"; + sha256 = "1nx06c08xi3as8kms9fdbkc35d2m8f0vdskg31khl9wi2c8skxya"; + name = "kontactinterface-22.12.3.tar.xz"; }; }; kontrast = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kontrast-22.12.2.tar.xz"; - sha256 = "1x8y26g9iy2hmiyadl3w22c5k3jwh9l59747px1nm7rjzsf11hf7"; - name = "kontrast-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kontrast-22.12.3.tar.xz"; + sha256 = "1hhmjjdpb8ppsv7djxi8dlzmz2chivw9wjpx83vghlyx8463gicc"; + name = "kontrast-22.12.3.tar.xz"; }; }; konversation = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/konversation-22.12.2.tar.xz"; - sha256 = "1w12ld2xmncz2bmcsf9k5hxmd2djczbm7y8sh86f512km94m8dzg"; - name = "konversation-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/konversation-22.12.3.tar.xz"; + sha256 = "0p404wpdhsiz9w04kgwx8smmsbnh2szikdkf3c74krcl7w1ksckl"; + name = "konversation-22.12.3.tar.xz"; }; }; kopeninghours = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kopeninghours-22.12.2.tar.xz"; - sha256 = "10bc9a0nljj345cgwpw676mcybp4mffzl4d6kfhc3qvcypagbnw7"; - name = "kopeninghours-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kopeninghours-22.12.3.tar.xz"; + sha256 = "1p55w3h300gjpyd970l5ka2lfa5srbiprzc50rsanl1z8l9k9zic"; + name = "kopeninghours-22.12.3.tar.xz"; }; }; kopete = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kopete-22.12.2.tar.xz"; - sha256 = "0ans8fi0x3n8p13qw6ylviv952zf4i1zwa0m0qb0saqq11my0c1d"; - name = "kopete-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kopete-22.12.3.tar.xz"; + sha256 = "1r87rck04jws5khim95mq70c7g2yr4kzf5hf8icv5nc4c820im0m"; + name = "kopete-22.12.3.tar.xz"; }; }; korganizer = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/korganizer-22.12.2.tar.xz"; - sha256 = "0gvplwpvrm0ylx75sig9khwpqz5gq7q7qlyjx37r9apd3jgjxmyd"; - name = "korganizer-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/korganizer-22.12.3.tar.xz"; + sha256 = "0hmdmg7njvm12xz64xcasz9bvx72s0f2s1430d6h75b6f2x8fhmc"; + name = "korganizer-22.12.3.tar.xz"; }; }; kosmindoormap = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kosmindoormap-22.12.2.tar.xz"; - sha256 = "1nn5jafz2v262kwf45cgcy4hh8r7sccmzm36kjfinsbcjqci1vfq"; - name = "kosmindoormap-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kosmindoormap-22.12.3.tar.xz"; + sha256 = "1m2cyp4irr1r4fssx6pw78f273i6hlzjdqcrrcsh1r01z0klpbzp"; + name = "kosmindoormap-22.12.3.tar.xz"; }; }; kpat = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kpat-22.12.2.tar.xz"; - sha256 = "0qm6xizw8978xwysb0n120nqv4b1m5paw0hakw2v2sv5kn10mrns"; - name = "kpat-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kpat-22.12.3.tar.xz"; + sha256 = "0m8kwcf69wxl7x7z6bjkwyf34dwd7qw55pwbsh77wv0l9mk2v8gf"; + name = "kpat-22.12.3.tar.xz"; }; }; kpimtextedit = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kpimtextedit-22.12.2.tar.xz"; - sha256 = "1g08j89dfw3444chndqmn9jwpr07k279rry10sd45l8rv77kdwdf"; - name = "kpimtextedit-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kpimtextedit-22.12.3.tar.xz"; + sha256 = "0z4j02g73lrc88rf3b1vjyav6nsqkfwsfw8nxcyf8x51skczchy7"; + name = "kpimtextedit-22.12.3.tar.xz"; }; }; kpkpass = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kpkpass-22.12.2.tar.xz"; - sha256 = "1a8jgqyiv721plglvwsn7yj8zwh4rdz33g68qc23ka6g39s05nqn"; - name = "kpkpass-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kpkpass-22.12.3.tar.xz"; + sha256 = "1pg6p3b41vpg07bf6xfxqw98x8s681h18x0bm5b031ais0p10dv8"; + name = "kpkpass-22.12.3.tar.xz"; }; }; kpmcore = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kpmcore-22.12.2.tar.xz"; - sha256 = "1a7clvrqm7mn4qqxq9qba9lbvsj6y717xzdx8cwhkfkv1wwi92xj"; - name = "kpmcore-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kpmcore-22.12.3.tar.xz"; + sha256 = "07mzxb7qjbqkz5khafmyj16yj7221c6pwp0p72ayilwykwwrylsi"; + name = "kpmcore-22.12.3.tar.xz"; }; }; kpublictransport = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kpublictransport-22.12.2.tar.xz"; - sha256 = "1r1hrnc17jkdd73qi9hr2f94f1ca19w1vf4hvc51hnzfmf71blqk"; - name = "kpublictransport-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kpublictransport-22.12.3.tar.xz"; + sha256 = "1ljxz5dl4rpkdbm1jqlhnzls1cjmcyya1q5q7pzdwr99czs7jpwc"; + name = "kpublictransport-22.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kqtquickcharts-22.12.2.tar.xz"; - sha256 = "0m2zapifyi7lxidnhiwic3gp0sz8b5mvhxkz098zzbyygfs8pzwr"; - name = "kqtquickcharts-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kqtquickcharts-22.12.3.tar.xz"; + sha256 = "1rv4fava7zjhvdxgj1l6lh823fz93dpawmgdkjw95y1h2fc85jd1"; + name = "kqtquickcharts-22.12.3.tar.xz"; }; }; krdc = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/krdc-22.12.2.tar.xz"; - sha256 = "1nalhjx4gjr783vbdf9rq5b7ix4af20sxnq446qmkcj923m5rlpy"; - name = "krdc-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/krdc-22.12.3.tar.xz"; + sha256 = "1pyxx48vkjidzrivccpz55ys1b3bipdd8pkfz1sn3b70vw4h3rs2"; + name = "krdc-22.12.3.tar.xz"; }; }; kreversi = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kreversi-22.12.2.tar.xz"; - sha256 = "0hsf6xkhradd5yy22rj338550h4ls058wzx820qbz3is0l7yh515"; - name = "kreversi-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kreversi-22.12.3.tar.xz"; + sha256 = "1cwl9yhl54nd7wqasfic09a6lwjz65w72kmracknrvihpz4b3ilk"; + name = "kreversi-22.12.3.tar.xz"; }; }; krfb = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/krfb-22.12.2.tar.xz"; - sha256 = "1fxzk5xrg57g84pwd23ibzmp587ly1l8i415mn5kiqkrvqb7i82i"; - name = "krfb-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/krfb-22.12.3.tar.xz"; + sha256 = "1r4n66abm01n5vkxzpw93f4rgxh963azq8jpkhhhsdlz22wjd3fw"; + name = "krfb-22.12.3.tar.xz"; }; }; kross-interpreters = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kross-interpreters-22.12.2.tar.xz"; - sha256 = "18i86hh9rcjmmx8j30k5z8k6i56qk6rh1nyz2z8zzlcdmnzcnv36"; - name = "kross-interpreters-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kross-interpreters-22.12.3.tar.xz"; + sha256 = "1ypi1r62nmw023xr6zsgs9iigmkxpbzmr2j9ibxdpidm2nnjw2w8"; + name = "kross-interpreters-22.12.3.tar.xz"; }; }; kruler = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kruler-22.12.2.tar.xz"; - sha256 = "0pspihnp7bbmb26jzj6d616j8xmly65cs1h4w6mj5727pnprb4hf"; - name = "kruler-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kruler-22.12.3.tar.xz"; + sha256 = "0v8qmrgvc8k4cc8rxjvypsfb8j13whpz036kn144hr8jfzb6mb3g"; + name = "kruler-22.12.3.tar.xz"; }; }; ksanecore = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksanecore-22.12.2.tar.xz"; - sha256 = "133j2q1dm3lxyq10aflaxbjaprzcg875hpfk59z0214cfgnln6hy"; - name = "ksanecore-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksanecore-22.12.3.tar.xz"; + sha256 = "0m3dbx1vww11qg7ydixb75xpazdgxss9fbxhpjpi4m1vv6siq6zg"; + name = "ksanecore-22.12.3.tar.xz"; }; }; kshisen = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kshisen-22.12.2.tar.xz"; - sha256 = "0siqribywssqkzjglb3vzizibjzxv8rgizjqbzxsf9frvm9pwc8d"; - name = "kshisen-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kshisen-22.12.3.tar.xz"; + sha256 = "0n7vq7qvh0sdnxwv9fvbna4cimbb9002pnx6a56f6i6v0f6i5gyb"; + name = "kshisen-22.12.3.tar.xz"; }; }; ksirk = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksirk-22.12.2.tar.xz"; - sha256 = "0i79iiaxqy0w2ikqx503vkdpf6ipwvhkcghhy8rmcqhvc8d1mglq"; - name = "ksirk-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksirk-22.12.3.tar.xz"; + sha256 = "0vyrlqxp026i8i6f111fsh290jkhdvzhm19s488bdrfm0xhh8y71"; + name = "ksirk-22.12.3.tar.xz"; }; }; ksmtp = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksmtp-22.12.2.tar.xz"; - sha256 = "0d04n4i18zglmmdghbzqg75h7qpi19562mgch9aff7jdavx4w582"; - name = "ksmtp-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksmtp-22.12.3.tar.xz"; + sha256 = "1yzhf02fn6h7xx7kl9hghbd8ppzx1favgkr0jd7nf6i479n03cw8"; + name = "ksmtp-22.12.3.tar.xz"; }; }; ksnakeduel = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksnakeduel-22.12.2.tar.xz"; - sha256 = "08wcqi4cwsb2icf40skkkzhvvpr2gshmjaa33al23b4fmmjbfxyq"; - name = "ksnakeduel-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksnakeduel-22.12.3.tar.xz"; + sha256 = "1s8iiknfpi0k1577ywm6d6y4fm92sp7zpwjylf8mys0a6yqbwbfc"; + name = "ksnakeduel-22.12.3.tar.xz"; }; }; kspaceduel = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kspaceduel-22.12.2.tar.xz"; - sha256 = "0ky59mrph08gpqs2yb6ykxb527qfaj6qgz5hs417a0bripjrznrm"; - name = "kspaceduel-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kspaceduel-22.12.3.tar.xz"; + sha256 = "1lkz6w2is3pjzn1is3zv2yy1vy5pga5jv4y955inm194b94v8amp"; + name = "kspaceduel-22.12.3.tar.xz"; }; }; ksquares = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksquares-22.12.2.tar.xz"; - sha256 = "1dxnhqr671mb2drzz1ybvg5iqm2sy3b6vmal0xyfda29zfs1pvia"; - name = "ksquares-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksquares-22.12.3.tar.xz"; + sha256 = "1dqc16bibpykya03104inr8pvn86m174ilrs94y4wc26w21a4i3i"; + name = "ksquares-22.12.3.tar.xz"; }; }; ksudoku = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksudoku-22.12.2.tar.xz"; - sha256 = "13s44cq0bz0r914ybll8p2f5jr9nfdvz4jx0inc2wzx58rcf6xw9"; - name = "ksudoku-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksudoku-22.12.3.tar.xz"; + sha256 = "1sk7cs521jgdlr51wpm9vdxv8m83nwgd02y4qkx705f0hvqmwwb9"; + name = "ksudoku-22.12.3.tar.xz"; }; }; ksystemlog = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ksystemlog-22.12.2.tar.xz"; - sha256 = "10ax7x6qy7wnnf4pjazjqw43dp8y8lycibqv3sxqqykwkvvfhmyi"; - name = "ksystemlog-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ksystemlog-22.12.3.tar.xz"; + sha256 = "0plf5p34l8727xdy5mlvv7wlkfb15xip7jdraifnvkiy9x82gk05"; + name = "ksystemlog-22.12.3.tar.xz"; }; }; kteatime = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kteatime-22.12.2.tar.xz"; - sha256 = "1pa58lmp7gv8vm34b1pypv4m5rw8xlw6iydbsq0j6g2xlwjypx6f"; - name = "kteatime-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kteatime-22.12.3.tar.xz"; + sha256 = "1wjr2nndrflly27dvp9gbgvk25cvm2nd32h0whb399dwl3niva1f"; + name = "kteatime-22.12.3.tar.xz"; }; }; ktimer = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktimer-22.12.2.tar.xz"; - sha256 = "1hmg5hni3yqyrz7p1nm54gr14p2iz7q9yr803sh8k5f60xmr58j4"; - name = "ktimer-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktimer-22.12.3.tar.xz"; + sha256 = "1kxpnlz8k5hxbp4irbnhnz52jxfwh1yz9d63l8dxhw3likcbp52j"; + name = "ktimer-22.12.3.tar.xz"; }; }; ktnef = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktnef-22.12.2.tar.xz"; - sha256 = "03rjdpavqvhipla84lr9x9fq5jmx7zvfnngzldn94acra2806sbj"; - name = "ktnef-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktnef-22.12.3.tar.xz"; + sha256 = "08j7a0lzkqxb2s2fzm5h26i560lk4l1f3r4wjb24znf1rk9zjslj"; + name = "ktnef-22.12.3.tar.xz"; }; }; ktorrent = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktorrent-22.12.2.tar.xz"; - sha256 = "008676q9v9psyb0jdkmbj7zbmp6y1mjn3ihbx4zmxv3swzd95dgz"; - name = "ktorrent-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktorrent-22.12.3.tar.xz"; + sha256 = "07ppw041zwywkkjd87n6bwr37a2a6va78nr5yxshlxckz8x17bl5"; + name = "ktorrent-22.12.3.tar.xz"; }; }; ktouch = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktouch-22.12.2.tar.xz"; - sha256 = "1f50wm5xqdyk5v15k144dq15schb3l5xfpawqv38n0r16jj3ql1b"; - name = "ktouch-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktouch-22.12.3.tar.xz"; + sha256 = "0hzz0lnx4w0bl7kd52n01z8h165icycfx9kw8rgaidq1r5csp2fm"; + name = "ktouch-22.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-accounts-kcm-22.12.2.tar.xz"; - sha256 = "1lcchdhxj9xba2l8sqv6xhan1559asncy753idy95lzbk10algqf"; - name = "ktp-accounts-kcm-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-accounts-kcm-22.12.3.tar.xz"; + sha256 = "04g68x1xl9s46sinnwknb43pgvz6w71f8pn1j9bpgmg3qmmqx84g"; + name = "ktp-accounts-kcm-22.12.3.tar.xz"; }; }; ktp-approver = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-approver-22.12.2.tar.xz"; - sha256 = "1696p98aarmi8lf9n4pzv6rhpbdzn6gs5ci5ms2ypazv1a6jsi3v"; - name = "ktp-approver-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-approver-22.12.3.tar.xz"; + sha256 = "06a856xx2xnw7ryazcyhwwwwhc23w22wrrjvbxs8ram54pzvphyh"; + name = "ktp-approver-22.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-auth-handler-22.12.2.tar.xz"; - sha256 = "033g8ail8qkv34g1h2ns9wyp64qmz59v1180n83bc9k3jzsnrk2q"; - name = "ktp-auth-handler-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-auth-handler-22.12.3.tar.xz"; + sha256 = "0mrj12c7igs8z6904ishx5zv5qvsasv3c4i7zyrr9i5f6ncdgrh6"; + name = "ktp-auth-handler-22.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-call-ui-22.12.2.tar.xz"; - sha256 = "030rzda1l5vir1hcahdirh5n3d49c74m1ijag3cxjip7mv39q7mq"; - name = "ktp-call-ui-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-call-ui-22.12.3.tar.xz"; + sha256 = "1a2gys0p42kmar7mxxwzwmcjfvdcwa6b23cb913c1ficwx4rbma2"; + name = "ktp-call-ui-22.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-common-internals-22.12.2.tar.xz"; - sha256 = "1d9kzlbf28gprncw98ldwd32cvi4gpi5njb281z5fn1z8m2q6qxl"; - name = "ktp-common-internals-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-common-internals-22.12.3.tar.xz"; + sha256 = "0rapw141bvrgaaa9wb7vbs1m0z01pky8c0pdsm294i72kiadrcw3"; + name = "ktp-common-internals-22.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-list-22.12.2.tar.xz"; - sha256 = "1xwx74870gqgamb5j6mnngc9l4vyjplnhi7bjf0ik7srg1lq4f34"; - name = "ktp-contact-list-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-list-22.12.3.tar.xz"; + sha256 = "171d48s1dh2i8zk43sd7xl3nrialij0nvn0ib82f45fag2wa4f8v"; + name = "ktp-contact-list-22.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-runner-22.12.2.tar.xz"; - sha256 = "13j9vjdscdm5ljkqi4hy2kghz5w2r6lha78chyyzg3yjdrwayqp5"; - name = "ktp-contact-runner-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-runner-22.12.3.tar.xz"; + sha256 = "0a4bhaq3jc9290lf1cgnlaysw2jszdfqwk9l6fi0bmdk2mx0xl3d"; + name = "ktp-contact-runner-22.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-desktop-applets-22.12.2.tar.xz"; - sha256 = "1dxb0n8lq9d31yqrhx5jrqxj9j69x5qq5yq89lfipjz3xmqvws84"; - name = "ktp-desktop-applets-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-desktop-applets-22.12.3.tar.xz"; + sha256 = "18w4dq676yxhmgwmq5bv7nnfcai18xiy1hwyj7pxmb45f42vxzh2"; + name = "ktp-desktop-applets-22.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-filetransfer-handler-22.12.2.tar.xz"; - sha256 = "0dqp2rzld67qlxxj85bi331jn8m6rc7mdd851h3396j6cz6g8bm5"; - name = "ktp-filetransfer-handler-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-filetransfer-handler-22.12.3.tar.xz"; + sha256 = "1qlx2bhm22nzrizcyvxn355g3m3fkmcr4ics8gl0m2m80mgr70v0"; + name = "ktp-filetransfer-handler-22.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-kded-module-22.12.2.tar.xz"; - sha256 = "0bpvmf9a9hkiz5f482fnc4qf0imys82ax5iz0rz32blp5j8cydil"; - name = "ktp-kded-module-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-kded-module-22.12.3.tar.xz"; + sha256 = "1rhq3ry126ds5kd3jdjsla6q1185xhs1zni24vdkvx045f7l9ppd"; + name = "ktp-kded-module-22.12.3.tar.xz"; }; }; ktp-send-file = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-send-file-22.12.2.tar.xz"; - sha256 = "0alfkv94s2zxxsxcm67dxvw3j9r5qj8wcn5w40wrp8qw93wigddy"; - name = "ktp-send-file-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-send-file-22.12.3.tar.xz"; + sha256 = "0qlw5z1im54sl3n1ysgz58f66chph35q5hf7831dnva8ahnzaa6w"; + name = "ktp-send-file-22.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktp-text-ui-22.12.2.tar.xz"; - sha256 = "0ryvi9qsi9bh6c1jjpq69bpgzshp3qi1ap7m9xar8icjbih3nllh"; - name = "ktp-text-ui-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktp-text-ui-22.12.3.tar.xz"; + sha256 = "0ypasdncgljjy5hg4na1lrxql8rjqfwyawhsb4gif8ihfvc8ibw1"; + name = "ktp-text-ui-22.12.3.tar.xz"; }; }; ktuberling = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/ktuberling-22.12.2.tar.xz"; - sha256 = "13ks4ai28mb3fhjz2nvlwpb1997pp95l7bdw851i9d3lp2rr8bgn"; - name = "ktuberling-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/ktuberling-22.12.3.tar.xz"; + sha256 = "0njl3g7pygk5v8cirmjg7pmlpyrhalpgwywr8na55cv5ib54m3s9"; + name = "ktuberling-22.12.3.tar.xz"; }; }; kturtle = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kturtle-22.12.2.tar.xz"; - sha256 = "18zcq2y48l7nzg20bv8kx370s4rfwl6xix452p6bhbbik7msfr85"; - name = "kturtle-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kturtle-22.12.3.tar.xz"; + sha256 = "0idbfmxz3fx23xcssdvfhs6xyrv0y56k3jl7g4f22p0yvcp0lkb2"; + name = "kturtle-22.12.3.tar.xz"; }; }; kubrick = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kubrick-22.12.2.tar.xz"; - sha256 = "02npa6jlzy73zn10kl6nnglagwpzbynk3m6q4a92897xmlzsx537"; - name = "kubrick-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kubrick-22.12.3.tar.xz"; + sha256 = "0b3v5daa6h0rr4gwp605rvn1ygnx29z49h2lv8mcdpd8k4wm5jac"; + name = "kubrick-22.12.3.tar.xz"; }; }; kwalletmanager = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kwalletmanager-22.12.2.tar.xz"; - sha256 = "1khbxnzciyi4l5dv6xkk5pjw1qk2wbn6l5n8v01azwkllh7wps4q"; - name = "kwalletmanager-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kwalletmanager-22.12.3.tar.xz"; + sha256 = "1vilih22nfhavqkcbjphkwz978w2alqw2nic3nfvxwdnpa17j6hb"; + name = "kwalletmanager-22.12.3.tar.xz"; }; }; kwave = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kwave-22.12.2.tar.xz"; - sha256 = "0fz23sxn7yp5qvahyjp3ifl7fp7wm18jv20p0fiaq6xsj1q6nf2r"; - name = "kwave-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kwave-22.12.3.tar.xz"; + sha256 = "0dyyd5pddk4gp3gpzsfjgwhj6s8i04cgx916hyaxac75wpffbbv1"; + name = "kwave-22.12.3.tar.xz"; }; }; kwordquiz = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/kwordquiz-22.12.2.tar.xz"; - sha256 = "0jadvh00pxjy9bzs2kvn3raywl569rva1n9pa3v0jjgpaa6pkck8"; - name = "kwordquiz-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/kwordquiz-22.12.3.tar.xz"; + sha256 = "176hxsfcgjb5x4a6mk0q5azv7466y861xa64vskss2f5ivznx26j"; + name = "kwordquiz-22.12.3.tar.xz"; }; }; libgravatar = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libgravatar-22.12.2.tar.xz"; - sha256 = "1paxv6x8sqzm8xhhnv7f2llk3vyyg9nir2fkdly1gi6b9nl1649q"; - name = "libgravatar-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libgravatar-22.12.3.tar.xz"; + sha256 = "0a7954m4i78nqf50yp81a3nlzx4pa5i9i44xn7lcxpglkl9qgd9r"; + name = "libgravatar-22.12.3.tar.xz"; }; }; libkcddb = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkcddb-22.12.2.tar.xz"; - sha256 = "1z04y7ybyfpdzapa0i27w5ryymqfbk7p96ifkhmzf79xvl04g805"; - name = "libkcddb-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkcddb-22.12.3.tar.xz"; + sha256 = "06ks0lggbaimj8c42cm273z4j3aif7xqx6vqzv40jm6mgcvmw2jk"; + name = "libkcddb-22.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkcompactdisc-22.12.2.tar.xz"; - sha256 = "169hbqyxy7nhddv3428ynv487fga2yz1m89cj9gjyhpj07pv3df4"; - name = "libkcompactdisc-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkcompactdisc-22.12.3.tar.xz"; + sha256 = "0wh89q2lf0fvly9bpg4b7aflb7bmaz0bd4v8gvslkff5nzi01y5h"; + name = "libkcompactdisc-22.12.3.tar.xz"; }; }; libkdcraw = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkdcraw-22.12.2.tar.xz"; - sha256 = "11pnbbavviiryyia0ciyfrdhby4f76j988jd91s2hbg2pwh0l1hz"; - name = "libkdcraw-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkdcraw-22.12.3.tar.xz"; + sha256 = "1287jjnw0x869bxhd34vmb83igskhx98nmyp6gs136rdms8war0f"; + name = "libkdcraw-22.12.3.tar.xz"; }; }; libkdegames = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkdegames-22.12.2.tar.xz"; - sha256 = "1x5bi4r6lsxrc68swvrapmszb1hi041aim5pkkp96mka3s97ybrz"; - name = "libkdegames-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkdegames-22.12.3.tar.xz"; + sha256 = "072zabp7ss6x8241fl3gnvxx0ihw68h8znzk6wf277idj296x3ww"; + name = "libkdegames-22.12.3.tar.xz"; }; }; libkdepim = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkdepim-22.12.2.tar.xz"; - sha256 = "1c3bry6z9qi3fhybv018rbrwy4an5km94gygb5jyrkfgpdy94w7h"; - name = "libkdepim-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkdepim-22.12.3.tar.xz"; + sha256 = "13p6j3vk0rg2hhxvv7b21lvz52ciwwwsb1rfd0nvyw6qc6b9a97v"; + name = "libkdepim-22.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkeduvocdocument-22.12.2.tar.xz"; - sha256 = "1ndzfyf7fn0saska59gvwhidq81arxnxx28ji66fdy7kvbr4a1bg"; - name = "libkeduvocdocument-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkeduvocdocument-22.12.3.tar.xz"; + sha256 = "04igxxmp5y2pwj914wf14shfaa38q0aif1is634j9yibja874x2g"; + name = "libkeduvocdocument-22.12.3.tar.xz"; }; }; libkexiv2 = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkexiv2-22.12.2.tar.xz"; - sha256 = "0034lcsgcfdlkmz6vghxbbsvw3cr32hv6vh9hffz033j2035vc8l"; - name = "libkexiv2-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkexiv2-22.12.3.tar.xz"; + sha256 = "151a6dkww9k150xh52jn2s335nkaidw0y2xvpcycfvbfpcl6x7bg"; + name = "libkexiv2-22.12.3.tar.xz"; }; }; libkgapi = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkgapi-22.12.2.tar.xz"; - sha256 = "1n418dsic6jshqahby5drcngd72z6wg23fa9f1wi3h64z76qdddz"; - name = "libkgapi-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkgapi-22.12.3.tar.xz"; + sha256 = "0f2phhcmmbx60rfh5qjl990mjxrz871jgk6wisfv9ndylkxk3k4p"; + name = "libkgapi-22.12.3.tar.xz"; }; }; libkipi = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkipi-22.12.2.tar.xz"; - sha256 = "05vrh94vhklyq7bvpfd9wj54hs48zhbn2z17ln75snvzans7mjq9"; - name = "libkipi-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkipi-22.12.3.tar.xz"; + sha256 = "0p96cgivrsilam8laagc2imlh0966fiqn4mhpy1l0il2iwka8rsl"; + name = "libkipi-22.12.3.tar.xz"; }; }; libkleo = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkleo-22.12.2.tar.xz"; - sha256 = "10w14qvflqc9cx5wrgapgyidnj43ik6dl6s36y2k2qw691a3jrrx"; - name = "libkleo-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkleo-22.12.3.tar.xz"; + sha256 = "0na8155w79kgzqby1xl1v35sc2ragmx0cjbp7jhx9dfrprz4q544"; + name = "libkleo-22.12.3.tar.xz"; }; }; libkmahjongg = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkmahjongg-22.12.2.tar.xz"; - sha256 = "0h09d2zb2lihwvr18vl77k5bl64zrpp5wn2nlf1czwkafna83pzy"; - name = "libkmahjongg-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkmahjongg-22.12.3.tar.xz"; + sha256 = "04sc6362nsdbihy9w00ppp0x9dkllf0gj45cxi9mxg8q1nbn86m0"; + name = "libkmahjongg-22.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libkomparediff2-22.12.2.tar.xz"; - sha256 = "1gwc1dga01f8s2gapngw6zrvns3ks5sdkga0hmv5hrxi2zyx7vm3"; - name = "libkomparediff2-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libkomparediff2-22.12.3.tar.xz"; + sha256 = "1m7n25b7hlrkspq59n54gxfid4jjj28fa2dya5mc21r5z6jxn3jr"; + name = "libkomparediff2-22.12.3.tar.xz"; }; }; libksane = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libksane-22.12.2.tar.xz"; - sha256 = "0xj7vc2hnzgg0z14nh1z5ik4fqkszxjvvjh68qn64xrsf57g4994"; - name = "libksane-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libksane-22.12.3.tar.xz"; + sha256 = "1kfvh4ggdrwj5gbzc9x20b7qahjklvq0qshraf3nyjp1fh237l6d"; + name = "libksane-22.12.3.tar.xz"; }; }; libksieve = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libksieve-22.12.2.tar.xz"; - sha256 = "16507jn2zzvcg4a4ka870q716m696j1sbjfgnsh46vdy71zkxnrr"; - name = "libksieve-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libksieve-22.12.3.tar.xz"; + sha256 = "04ch9ffscmbfwmq0s173bz8pxnssqr87zwiqrz4sl2jy446r3a04"; + name = "libksieve-22.12.3.tar.xz"; }; }; libktorrent = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/libktorrent-22.12.2.tar.xz"; - sha256 = "15npc4n6p5s9z472ww3j8hxbmnvsdjp032zl4004794gwi7iph0r"; - name = "libktorrent-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/libktorrent-22.12.3.tar.xz"; + sha256 = "0rf9q4gy3l3mqs88kckwcicabrzz5hm1nsff259i9bzvbzhbzhlw"; + name = "libktorrent-22.12.3.tar.xz"; }; }; lokalize = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/lokalize-22.12.2.tar.xz"; - sha256 = "1fmi1szwif5absg3czzjzh28nwa6k9j332gsi39c9jrznrkfsmyr"; - name = "lokalize-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/lokalize-22.12.3.tar.xz"; + sha256 = "0cqpikx65mpz2as8idlcq5hy149vpqlhx7jq58pkjaj0dnig8hf1"; + name = "lokalize-22.12.3.tar.xz"; }; }; lskat = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/lskat-22.12.2.tar.xz"; - sha256 = "1199glblbi2hbkyr2bd67v7ybsd9qpbmj9nbyswdis9gmk4jd0fp"; - name = "lskat-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/lskat-22.12.3.tar.xz"; + sha256 = "0rld0xljg4pxja2qzp7qw9dylcv4d455qihd1hapy1gf8mpdc2dn"; + name = "lskat-22.12.3.tar.xz"; }; }; mailcommon = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/mailcommon-22.12.2.tar.xz"; - sha256 = "171p4s5mfsa9lib6yk4jinircsz4rgry1x517ixxp8j5y7gm06b7"; - name = "mailcommon-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/mailcommon-22.12.3.tar.xz"; + sha256 = "03ffsh5b1w70bywyifbirsmiv0kxxbx1x0szg7xw9aw4nfvnmzaf"; + name = "mailcommon-22.12.3.tar.xz"; }; }; mailimporter = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/mailimporter-22.12.2.tar.xz"; - sha256 = "1mvbvj7h476a3s2nxgzwbpsv48l53h6gvlkwa9lpj0llsl3xzc4z"; - name = "mailimporter-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/mailimporter-22.12.3.tar.xz"; + sha256 = "0i740gn18z4lmc5c4vgqq6gjvz9v7vpk88xf954rd100b21wlvj8"; + name = "mailimporter-22.12.3.tar.xz"; }; }; marble = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/marble-22.12.2.tar.xz"; - sha256 = "0fnsxpa75h2s5ak5ydv6v1wpsdxgkq7aqa2ywb65fl2w7knnm6pd"; - name = "marble-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/marble-22.12.3.tar.xz"; + sha256 = "0wcdjqvmiiy8fwl3yxnmq0wi585zck5g1fxaqy4w7jvvn4qislc8"; + name = "marble-22.12.3.tar.xz"; }; }; markdownpart = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/markdownpart-22.12.2.tar.xz"; - sha256 = "1w1p8q7rzbmw6q16nawiz2pzi1hgz3bsw6gzccwlpz76gsqrlfpy"; - name = "markdownpart-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/markdownpart-22.12.3.tar.xz"; + sha256 = "1jzzgm666pmgxgas73mm611k19lg2593j5ffq53l1wwiva3278j9"; + name = "markdownpart-22.12.3.tar.xz"; }; }; mbox-importer = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/mbox-importer-22.12.2.tar.xz"; - sha256 = "00lccs9jm02j2rr5ia8wamx6y220z8ix5mjn8c3i6gampybv0446"; - name = "mbox-importer-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/mbox-importer-22.12.3.tar.xz"; + sha256 = "09aglnys5j5imjn8yhk5jay3sqlhkiza7p9x877s3lyy3xlfch5x"; + name = "mbox-importer-22.12.3.tar.xz"; }; }; messagelib = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/messagelib-22.12.2.tar.xz"; - sha256 = "11c199q82w16nkx9mwswzg83lj4mv06vnv9dm4gqsg5rk7vf3jsz"; - name = "messagelib-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/messagelib-22.12.3.tar.xz"; + sha256 = "19l27l5qbp0cfjpqcbw5dvi2granzrj1293dahf9z77v0m9bxmjm"; + name = "messagelib-22.12.3.tar.xz"; }; }; minuet = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/minuet-22.12.2.tar.xz"; - sha256 = "1j9n7wqmvw27zwmk0ayl7jlr2i9wmd25b84m7pa9vhm34kgi1cc3"; - name = "minuet-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/minuet-22.12.3.tar.xz"; + sha256 = "0m3w3vcg3i532i0rza8igx5sp344k9jlm4wmhzkmw1mln1nqynnl"; + name = "minuet-22.12.3.tar.xz"; }; }; okular = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/okular-22.12.2.tar.xz"; - sha256 = "0l0iakc8zyj8xnv70hwf9kp1h0ayai7hffwi06p6v6nk5f0wnbjw"; - name = "okular-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/okular-22.12.3.tar.xz"; + sha256 = "00ns8qmf6vpp1fxqg71rzhzq2za9h1fs5a12rmd0vklkb5sjivq1"; + name = "okular-22.12.3.tar.xz"; }; }; palapeli = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/palapeli-22.12.2.tar.xz"; - sha256 = "19s05d7v1x06ywcdfz5ch61nm4igj1493h9v3vkvp9ky4q6asspi"; - name = "palapeli-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/palapeli-22.12.3.tar.xz"; + sha256 = "0wlr086374fg4kj827xcnqn6zk00sxpb36jdzc62q3w0sjzw1irj"; + name = "palapeli-22.12.3.tar.xz"; }; }; parley = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/parley-22.12.2.tar.xz"; - sha256 = "0sdls4f31k99p3ls3ibg0qqcrgq6c3lf8wmllcj4xaps84y1ar5k"; - name = "parley-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/parley-22.12.3.tar.xz"; + sha256 = "0jrddgfwc77lpdmfmydwmgpcqa0figv6rmmjw0xlw2f8dd4i2ghd"; + name = "parley-22.12.3.tar.xz"; }; }; partitionmanager = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/partitionmanager-22.12.2.tar.xz"; - sha256 = "1l3nkk4jbzz4kmv1ibyzji5milnjjnpbq9xblazd8y52knqlaqk0"; - name = "partitionmanager-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/partitionmanager-22.12.3.tar.xz"; + sha256 = "0bdxf19yb4wnrb50vapabqjqwxccfvp3gaspagh4wgcyz7p5icjp"; + name = "partitionmanager-22.12.3.tar.xz"; }; }; picmi = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/picmi-22.12.2.tar.xz"; - sha256 = "0dhqln0y366jrf5xs9q6ml8cc4rzi3brcaww96i4zhs707xiv8bb"; - name = "picmi-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/picmi-22.12.3.tar.xz"; + sha256 = "0ygryzl5x94icgr0p1qvwp4fmk51wiqzk2frj9768m4pzk0b6y50"; + name = "picmi-22.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/pim-data-exporter-22.12.2.tar.xz"; - sha256 = "11qxbvrdcfhfbvnnc7f5v6vmfx04vkavwam60q39bvm5y1qyhnq3"; - name = "pim-data-exporter-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/pim-data-exporter-22.12.3.tar.xz"; + sha256 = "113yfrz68wab4bmzncwqmzh5bz18lidp0naax4kbaa30p95qd40b"; + name = "pim-data-exporter-22.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/pim-sieve-editor-22.12.2.tar.xz"; - sha256 = "0d2hsrp53wv1vzrijnqzx1faz1aqfdkx020v6l132haywz1f44jh"; - name = "pim-sieve-editor-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/pim-sieve-editor-22.12.3.tar.xz"; + sha256 = "19wgpgzmmpfakm249val3fjxjx4wzb3ip4yk9m00aa0d2lb99ysn"; + name = "pim-sieve-editor-22.12.3.tar.xz"; }; }; pimcommon = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/pimcommon-22.12.2.tar.xz"; - sha256 = "1d2m256kd8lyv165jvswqw91wkkhxgpxf73hfw1rlwzvdlpyy5qd"; - name = "pimcommon-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/pimcommon-22.12.3.tar.xz"; + sha256 = "1yp0h8rp9nqgwc70f4knp05jnqhygb78z8sbdxq5dn5k09ciqr8v"; + name = "pimcommon-22.12.3.tar.xz"; }; }; poxml = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/poxml-22.12.2.tar.xz"; - sha256 = "0n3y1208ffya4p1lbbyj2g2g1mcw63h27wihxijax3iyp6lv6wwx"; - name = "poxml-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/poxml-22.12.3.tar.xz"; + sha256 = "03ymrkqp8ysmnc10brqp83zq58mjcrksafjwlpd3sqcc2crpjy90"; + name = "poxml-22.12.3.tar.xz"; }; }; print-manager = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/print-manager-22.12.2.tar.xz"; - sha256 = "1w1jrqvw10brn7gcpkzcq5618wcjbl9lqplr9nw5h2ag31b8gzhs"; - name = "print-manager-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/print-manager-22.12.3.tar.xz"; + sha256 = "0rblnlv95zxdflnd7wb63wp8j45k2ysmykyh5l3vkyni1k2127mm"; + name = "print-manager-22.12.3.tar.xz"; }; }; rocs = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/rocs-22.12.2.tar.xz"; - sha256 = "0xjxb1hgcyglnycywgq529sh5722chdngmby5cm4bhcjnmysr3vh"; - name = "rocs-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/rocs-22.12.3.tar.xz"; + sha256 = "0pgsvvdq5qnsfhh9a48ww6sbk5194c1h52dvmvz0gqgsp8k1kd47"; + name = "rocs-22.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/signon-kwallet-extension-22.12.2.tar.xz"; - sha256 = "1b7dhmpycdvvz269kphbddk9xrbhnq3d51mjxvp4aahziyqvjhr2"; - name = "signon-kwallet-extension-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/signon-kwallet-extension-22.12.3.tar.xz"; + sha256 = "0afzrn88nl3hn33a5zqhz8zf0dsg1n4i53ml0xw4ri57p9yfz6wm"; + name = "signon-kwallet-extension-22.12.3.tar.xz"; }; }; skanlite = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/skanlite-22.12.2.tar.xz"; - sha256 = "17jjx74syb2j7lrqjwfpym3wlk9cq5adgpf539k4zkszxhcqd4i0"; - name = "skanlite-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/skanlite-22.12.3.tar.xz"; + sha256 = "1kf776842hdq1jiln3dvk2qa0xh1ak96cag5lpc0yg344lvarvrz"; + name = "skanlite-22.12.3.tar.xz"; }; }; skanpage = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/skanpage-22.12.2.tar.xz"; - sha256 = "0ylh3grlfl77my135lszlz53fbhxvwyazf5aanhj33ryqwwyy925"; - name = "skanpage-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/skanpage-22.12.3.tar.xz"; + sha256 = "0hazx7i09gs3gmglv33pnch99s17lji7vbww875lq8jsyad12rzz"; + name = "skanpage-22.12.3.tar.xz"; }; }; spectacle = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/spectacle-22.12.2.tar.xz"; - sha256 = "1gsz3wsir41a8ncyjlmfk8313c88x215myqgs3917wsb9f8x358j"; - name = "spectacle-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/spectacle-22.12.3.tar.xz"; + sha256 = "01yd2x3k019bzjk4m4hc0k1w6c9brnrnv9hkc92j0fyayiqlnzj9"; + name = "spectacle-22.12.3.tar.xz"; }; }; step = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/step-22.12.2.tar.xz"; - sha256 = "056lhpnfjayv6qnng0g6pbr91zqhj0vzk2k87kj7k6snbhbvfm1w"; - name = "step-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/step-22.12.3.tar.xz"; + sha256 = "08gk72l57c9x7malksg76aclxh6bmmikpnn7bg8adm92jl0jlmpy"; + name = "step-22.12.3.tar.xz"; }; }; svgpart = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/svgpart-22.12.2.tar.xz"; - sha256 = "0c3b3l86a1di6k6jjf359hdrdxpyxj2fif7kci41y1ig4hipra4x"; - name = "svgpart-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/svgpart-22.12.3.tar.xz"; + sha256 = "0x0ynzjq550f0k79rm9zrqikhv6bp4a49m5ngg556kzfhzvswlxk"; + name = "svgpart-22.12.3.tar.xz"; }; }; sweeper = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/sweeper-22.12.2.tar.xz"; - sha256 = "0mj3vhlhjm768zqi0fzs1zwcm566gpr23d36pl436y0rb3d9fm2c"; - name = "sweeper-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/sweeper-22.12.3.tar.xz"; + sha256 = "0cr92xzdirwwb8v30r5qkr7n54gn47sjspbig2czrzh8jrmr9dc0"; + name = "sweeper-22.12.3.tar.xz"; }; }; umbrello = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/umbrello-22.12.2.tar.xz"; - sha256 = "0l5rpi7nmky2q2rcnq66jx7g1wra2a21b2dq0hpnjn1f9fskxa97"; - name = "umbrello-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/umbrello-22.12.3.tar.xz"; + sha256 = "0i7h9nfljc860hyfy7xxrk4w3y5f6pqviylz7qs6gzmq4yi0q45b"; + name = "umbrello-22.12.3.tar.xz"; }; }; yakuake = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/yakuake-22.12.2.tar.xz"; - sha256 = "07av7ikj70kj4xwjml2him4lin76gqzs3zrrz2w7q75m6m9qqzpj"; - name = "yakuake-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/yakuake-22.12.3.tar.xz"; + sha256 = "1nqdixfdha1gxq0zhzq347v5s6ym90aj25gq8jb5df0qp0w432mx"; + name = "yakuake-22.12.3.tar.xz"; }; }; zanshin = { - version = "22.12.2"; + version = "22.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.2/src/zanshin-22.12.2.tar.xz"; - sha256 = "18df7by60w5vcjy330y10pnzg3xar8i6273q9zba81qkvpvqkwn2"; - name = "zanshin-22.12.2.tar.xz"; + url = "${mirror}/stable/release-service/22.12.3/src/zanshin-22.12.3.tar.xz"; + sha256 = "0mx4wazlqp6aw2lgg5fmyr2x4yvfigds6j5ibvplzhz05d64clzj"; + name = "zanshin-22.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 5ec64fc0a55..fd0efc3f29f 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.30.0"; + version = "0.31.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-LifJc5mLbnt5wBXGM1n1uice0B6mCY80LYf3kEFJy90="; + sha256 = "sha256-s8al0R9G478A+PymQcdcdRpw6tpKkG+WIZsXZYEvf/o="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index ced6a70a246..abd2962e138 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config -, ncursesSupport ? true, ncurses ? null -, waylandSupport ? true, wayland ? null, wayland-protocols ? null -, x11Support ? true, xorg ? null +, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, ncursesSupport ? true, ncurses +, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner +, x11Support ? true, xorg }: -assert ncursesSupport -> ncurses != null; -assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; -assert x11Support -> xorg != null; - stdenv.mkDerivation rec { pname = "bemenu"; version = "0.6.14"; @@ -20,14 +16,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8="; }; - nativeBuildInputs = [ pkg-config pcre ]; - - makeFlags = ["PREFIX=$(out)"]; - - buildFlags = ["clients"] - ++ lib.optional ncursesSupport "curses" - ++ lib.optional waylandSupport "wayland" - ++ lib.optional x11Support "x11"; + strictDeps = true; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = with lib; [ cairo @@ -42,6 +33,13 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; + makeFlags = ["PREFIX=$(out)"]; + + buildFlags = ["clients"] + ++ lib.optional ncursesSupport "curses" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index fb3e149bc8e..db18ec5d131 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { name = "cotp"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; + hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls="; }; - cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE="; + cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index f237998f53a..a380a06741e 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "effitask"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sanpii"; repo = pname; rev = version; - sha256 = "sha256-nZn+mINIqAnaCKZCiywG8/BOPx6TlSe0rKV/8gcW/B4="; + sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ="; }; - cargoSha256 = "sha256-aCjZRJNsxx75ghK0N95Q9w0h5H5mW9/77j/fumDrvyM="; + cargoHash = "sha256-ScqDNfWMFT8a1HOPjpw4J8EBrVSusIkOYReYeArZvZ8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/fead/default.nix b/pkgs/applications/misc/fead/default.nix new file mode 100644 index 00000000000..bfd645c4331 --- /dev/null +++ b/pkgs/applications/misc/fead/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromSourcehut, python3, help2man }: + +stdenv.mkDerivation rec { + pname = "fead"; + version = "0.1.3"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "sha256-cW0GxyvC9url2QAAWD0M2pR4gBiPA3eeAaw77TwMV/0="; + }; + + nativeBuildInputs = [ help2man ]; + buildInputs = [ python3 ]; + + # Needed for man page generation in build phase + postPatch = '' + patchShebangs src/fead.py + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + # Already done in postPatch phase + dontPatchShebangs = true; + + # The package has no tests. + doCheck = false; + + meta = with lib; { + description = "Advert generator from web feeds"; + homepage = "https://git.sr.ht/~cnx/fead"; + license = licenses.agpl3Plus; + changelog = "https://git.sr.ht/~cnx/fead/refs/${version}"; + maintainers = with maintainers; [ McSinyx ]; + }; +} diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 781bdfcb90f..e3dd4f94b86 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -2,6 +2,8 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, docutils +, gi-docgen , gobject-introspection , gtk-doc , libxslt @@ -22,30 +24,33 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.0.20220523"; - sha256 = "sha256-RyUZj+tpJSYhyoK+E98CTIoHwXwBdB1YHVnO5821exo="; + rev = "v0.1.0"; + sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; }; in stdenv.mkDerivation rec { pname = "feedbackd"; - # Not an actual upstream project release, - # only a Debian package release that is tagged in the upstream repo - version = "0.0.1"; + version = "0.1.0"; - outputs = [ "out" "dev" ] - # remove if cross-compiling gobject-introspection works - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ="; + hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc="; + fetchSubmodules = true; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ docbook-xsl-nons + docutils # for rst2man + gi-docgen gobject-introspection gtk-doc libxslt @@ -64,11 +69,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dgtk_doc=true" "-Dman=true" - # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868 - # can be removed if cross-compiling gobject-introspection works. - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; nativeCheckInputs = [ @@ -83,6 +85,17 @@ stdenv.mkDerivation rec { cp ${themes}/data/* $out/share/feedbackd/themes/ ''; + postFixup = '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + if [[ -d "$out/share/doc" ]]; then + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + fi + ''; + meta = with lib; { description = "A daemon to provide haptic (and later more) feedback on events"; homepage = "https://source.puri.sm/Librem5/feedbackd"; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fef4f8ce787..c6280232b8e 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.36"; + version = "6.4.37"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo="; + sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 3508ff01225..94d63a9a3a4 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY="; + sha256 = "sha256-vYsJBMtdkbe87Xn8Ah0eT+azFWfm3ZUooejs7oB2KVQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f4f4f579ef5..5fc8dd5e9d4 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.110.0"; + version = "0.111.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-7B0C8191lUGsv81+0eKDrBm+5hLlFjID3RTuajSg/RM="; + hash = "sha256-3bg7cmM05ekR5gtJCEJk3flplw8MRc9hVqlZx3ZUIaw="; }; - vendorHash = "sha256-GtywXjtAF5Q4jUz2clfseUJVqiU+eSguG/ZoKy2TzuA="; + vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI="; doCheck = false; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 360c97d4a29..91db91efa09 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18646"; + version = "18678"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; + hash = "sha256-p0HjjF4SLPsD/KcAPNyHasuGrDPSQ/2KHjX1R2eywNo="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; + hash = "sha256-YlSFHx37RkdTlQ3/ZAqj+ezv+cSVifsxR7s6S7pDd4o="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index a40b253d4ba..87aa8945409 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.1.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI="; + sha256 = "sha256-/9focZIm6tVnkAGIZYTJ9uewXKLv/x74LEMUZbXInb0="; }; - vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts="; + vendorHash = "sha256-Zc8X29tsSsM/tkSYvplF1LxBS76eSs+cm5Li3OE/3o8="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index e1f9baa6088..a31d6d5a90a 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.9"; + version = "0.7.10"; pname = "mwic"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i7DSvUBUMOvn2aYpwYOCDHKq0nkleknD7k2xopo+C5s="; + sha256 = "sha256-dmIHPehkxpSb78ymVpcPCu4L41coskrHQOg067dprOo="; }; makeFlags=["PREFIX=\${out}"]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ba618219bc5..a7af7ff8d37 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.15"; + version = "1.1.16"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; + sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4ca54221c2f..c1a4f6aec92 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -16,7 +16,7 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ ( - # with version 3 of flask-limiter octoprint 1.8.6 fails to start with + # with version 3 of flask-limiter octoprint 1.8.7 fails to start with # TypeError: Limiter.__init__() got multiple values for argument 'key_func' self: super: { flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { @@ -105,13 +105,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ="; + hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc="; }; propagatedBuildInputs = with self; [ diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index ba8324a02fb..50fc4ec9fec 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.2.3"; + version = "0.2.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-J+3wi1nqkxR3ZDfR+F3rvFjUz1DJ7/jhjmcvFdMzWYc="; + sha256 = "sha256-wYGaBXorAcwFnlUixrOP63s32WV1V7/8SUOBXIeLB7o="; }; - cargoHash = "sha256-oQPCUm/X2vt6wN5AKhtgq8tzQQrp0H42bBK7Az+I9BE="; + cargoHash = "sha256-rdzr6oOrJNTX3dCSO3ZdKNFZ31/CHdupKL7QmmuuX7I="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 5dd8fac6de8..06642f7e496 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho="; + sha256 = "sha256-qFEfrXX2Rpmo4eF1Z/dKBN/NxMovK3mDfQPxYp85eB8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 0fae80fc14e..79ffb3fdbf9 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { description = "Wayland compositor for mobile phones like the Librem 5"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat zhaofengli ]; + maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 67c1c7e815c..967904c6e19 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.40.2"; + version = "0.43.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-+09gLeifEFwG2Ou1tQP29hYHhr0Qn0hOKj7p7PB8Jfc="; + hash = "sha256-yNYoVz6vITKkAkqH/0p7D4sifTpjtEZS4syFSwN4v98="; # 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-g82JRmfbKH/XEZx2aLZOcyen23vOxQXR7VyeAYxCSi4="; + vendorHash = "sha256-iiGn0dYHNEp5Bs54X44sHbsG3HD92Xs4oah4iZXqqvQ="; doCheck = false; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 8e4d5cdc0a5..d1d7aff156a 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-5xHY8DOQnOdYqNyfAS2kMuW2vxAuoSe6RaOItnAJCkQ="; + hash = "sha256-Q9NHkVOWVWAty6iIhN0GmUkKB+nDqmxiPVnhbQvup9M="; }; - cargoHash = "sha256-3IOtx1aeth6QBjY6aILtzxhjZddovD7KIKzNhVCabfU="; + cargoHash = "sha256-YSD7RXU3eBlELx76gU5eNOGkSoK9SRQZOV+7lil1fyQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 7987208b885..7a84f85a9e2 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -5,7 +5,7 @@ , qtsvg , qmake , leptonica -, tesseract +, tesseract4 }: mkDerivation { @@ -19,7 +19,7 @@ mkDerivation { hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4="; }; - buildInputs = [ qtbase qtsvg leptonica tesseract ]; + buildInputs = [ qtbase qtsvg leptonica tesseract4 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 1429aabcd80..7225eb4c3fc 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -8,18 +8,16 @@ with python3.pkgs; buildPythonPackage rec { pname = "shell-genie"; - version = "unstable-2023-01-27"; + version = "0.2.6"; format = "pyproject"; - src = fetchFromGitHub { - owner = "dylanjcastillo"; - repo = pname; - rev = "d6da42a4426e6058a0b5ae07837d8c003cd1239e"; - hash = "sha256-MGhQaTcl3KjAJXorOmMRec07LxH02T81rNbV2mYEpRA="; + src = fetchPypi { + pname = "shell_genie"; + inherit version; + hash = "sha256-MgQFHsBXrihfWBB/cz45ITf8oJG2gSenf1wzdbrAbjw="; }; nativeBuildInputs = [ - poetry poetry-core ]; @@ -35,9 +33,14 @@ buildPythonPackage rec { # No tests available doCheck = false; + pythonImportsCheck = [ + "shell_genie" + ]; + meta = with lib; { description = "Describe your shell commands in natural language"; homepage = "https://github.com/dylanjcastillo/shell-genie"; + # https://github.com/dylanjcastillo/shell-genie/issues/3 license = licenses.unfree; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index ac8170ed551..4f022d81f62 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + '' + preBuild = '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) ''; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 5d583181ce6..99404d38efe 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -19,30 +19,25 @@ , kioPluginSupport ? true , plasmoidSupport ? true , systemdSupport ? true +/* It is possible to set via this option an absolute exec path that will be +written to the `~/.config/autostart/syncthingtray.desktop` file generated +during runtime. Alternatively, one can edit the desktop file themselves after +it is generated See: +https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ +, autostartExecPath ? "syncthingtray" }: mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-0rmfDkPvgubVqfbIOZ+mnv/x1p2sb88zGeg/Q2JCy3I="; + sha256 = "sha256-zLZw6ltdgO66dvKdLXhr/a6r8UhbSAx06jXrgMARHyw="; }; - patches = [ - # Fix Exec= path in runtime-generated - # ~/.config/autostart/syncthingtray.desktop file - this is required because - # we are wrapping the executable. We can't use `substituteAll` because we - # can't use `${placeholder "out"}` because that will produce the $out of - # the patch derivation itself, and not of syncthing's "out" placeholder. - # Hence we use a C definition with NIX_CFLAGS_COMPILE - ./use-nix-path-in-autostart.patch - ]; - env.NIX_CFLAGS_COMPILE = "-DEXEC_NIX_PATH=\"${placeholder "out"}/bin/syncthingtray\""; - buildInputs = [ qtbase cpp-utilities @@ -70,6 +65,7 @@ mkDerivation rec { ''; cmakeFlags = [ + "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" ] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"] diff --git a/pkgs/applications/misc/syncthingtray/use-nix-path-in-autostart.patch b/pkgs/applications/misc/syncthingtray/use-nix-path-in-autostart.patch deleted file mode 100644 index a0907496ff9..00000000000 --- a/pkgs/applications/misc/syncthingtray/use-nix-path-in-autostart.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/widgets/settings/settingsdialog.cpp w/widgets/settings/settingsdialog.cpp -index 4deff1f..16845b5 100644 ---- i/widgets/settings/settingsdialog.cpp -+++ w/widgets/settings/settingsdialog.cpp -@@ -802,7 +802,7 @@ bool setAutostartEnabled(bool enabled) - desktopFile.write("[Desktop Entry]\n" - "Name=" APP_NAME "\n" - "Exec=\""); -- desktopFile.write(qEnvironmentVariable("APPIMAGE", QCoreApplication::applicationFilePath()).toUtf8().data()); -+ desktopFile.write(qEnvironmentVariable("APPIMAGE", EXEC_NIX_PATH).toUtf8().data()); - desktopFile.write("\" qt-widgets-gui --single-instance\nComment=" APP_DESCRIPTION "\n" - "Icon=" PROJECT_NAME "\n" - "Type=Application\n" diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 56baa1e9d82..ff778d4d0a4 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }: stdenv.mkDerivation rec { pname = "taskwarrior"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open" ''; - nativeBuildInputs = [ cmake libuuid gnutls python3 ]; + nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ]; doCheck = true; preCheck = '' @@ -26,10 +26,17 @@ stdenv.mkDerivation rec { checkTarget = "test"; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" - ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash" - mkdir -p "$out/share/fish/vendor_completions.d" - ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" + # ZSH is installed automatically from some reason, only bash and fish need + # manual installation + installShellCompletion --cmd task \ + --bash $out/share/doc/task/scripts/bash/task.sh \ + --fish $out/share/doc/task/scripts/fish/task.fish + rm -r $out/share/doc/task/scripts/bash + rm -r $out/share/doc/task/scripts/fish + # Install vim and neovim plugin + mkdir -p $out/share/vim-plugins $out/share/nvim/site + mv $out/share/doc/task/scripts/vim $out/share/vim-plugins/task + ln -s $out/share/vim-plugins/task $out/share/nvim/site/task ''; meta = with lib; { diff --git a/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch b/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch new file mode 100644 index 00000000000..1cd4c613e35 --- /dev/null +++ b/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch @@ -0,0 +1,25 @@ +From 4952ceece60ff2e7eabec45411b8824da6673bff Mon Sep 17 00:00:00 2001 +From: m <m@linuxistsuper.de> +Date: Sun, 5 Mar 2023 11:25:40 +0100 +Subject: [PATCH] update version in lock file + +--- + Cargo.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.lock b/Cargo.lock +index d571155..ca28bef 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1554,7 +1554,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + + [[package]] + name = "udict" +-version = "0.1.1" ++version = "0.1.2" + dependencies = [ + "reqwest", + "scraper", +-- +2.38.4 + diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix new file mode 100644 index 00000000000..0a8522669e9 --- /dev/null +++ b/pkgs/applications/misc/udict/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "udict"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "lsmb"; + repo = "udict"; + rev = "v${version}"; + hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY="; + }; + + cargoHash = "sha256-WI+dz7FKa3kot3gWr/JK/v6Ua/u2ioZ04Jwk8t9r1ls="; + + cargoPatches = [ + ./0001-update-version-in-lock-file.patch + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Urban Dictionary CLI - written in Rust"; + homepage = "https://github.com/lsmb/udict"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index f2e8a5d3b82..6ef894c168e 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM="; + hash = "sha256-lzobtncxL/7Lf/+kVzIdyP0dTzerMJRAoT7OBFdeEgc="; }; - vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8="; + vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 09417129199..389261af965 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "111.0.5563.41", - "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay", - "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w", + "version": "111.0.5563.50", + "sha256": "1iygqlgr7qqac489kb0s4z5mwvchhi7wkibj84ziqcxlbqlfrmni", + "sha256bin64": "0pgrqb18hbp1q54flg0c63v85bi11m4rc6f25f0h0x90lvl65d05", "deps": { "gn": { "version": "2022-12-12", diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index c8a8a85c372..246cd15af3f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b6"; + version = "111.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1ee70baaef25a9e412c3c4b57f86bd6875390dc5e342a74aa42a1a8ed6317340"; + sha256 = "269dc39cbd876a480c7e5ffba2e2485b0d38bea9acb575a6de7597decf211ae0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20c8f0710d6bebcb51fe27e3969048a61e1957a680843751ed9c526668932e5d"; + sha256 = "2d96546d48f3048b6a2ce46e1b4aaede84e6a303d70458983b05dffcd9c08e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3eb9397dfbc37bb54ed8193c3c28eafcf85e3c439b50470a171a591c0ba14049"; + sha256 = "793a8d77b4addf0ced87d5f15d53c6c1e82ceb95d2c0056ce2c6a98d694751c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "eaa2b0a1177b476a6e4da80ca11c4719872e649f7bec0ac1006bd347e6b627cd"; + sha256 = "fb8624c6bc03bdcc0a30f10e9b81dbdb16cdcb35f89ad6c7485102ba8bdbf513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "637676aa8418dc6f1d3061d2dc2f6a19b80df26b5aa5b04d2fea697c417c75fa"; + sha256 = "d4509b771d11ea1c896f16d76762dc2c43585650aa1039adb8747095b444857c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2e1b4ad6c88cfb4369299b952ee7c1d1ddf97461c82d496b1687a6558d008518"; + sha256 = "89444c573fe9854a6f8bfeb700b4e6867b0b4653ce77691b1625ef1a663bc570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6d3fac5c4402889a9fab97747e397082a75de3651c450ffde52e61b6a105d09e"; + sha256 = "2f66c9a6a4e32a229e18c0a25964b675f360b6f49237e6057a4c95fac345eb44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8c0a04a1d4aa8c27a1afd33251dc6b789b82c8cb2a946a4314032ee211a50d62"; + sha256 = "6e36ae61a32eeec05f629a996ca66d3b5149da42a1ba7814095f8e49ae368bc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "fe5a611afd91bd0724d03ba65acdc5bdef79693771c769bb7ea25ead33d8a61e"; + sha256 = "55f9b57bd28300368d346ea23eff96183909a4bf1c7dfca40fa826e82e092d8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "10beb0d6cfa7a384090e42827b200eea2bd53454aef1dd9f1a4a49f43d4d82b1"; + sha256 = "0d080e978ecb9749d7584c523e09fbe5821a13021c2be0a86100e3b89bc0d020"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ec8a5e0ca3484c3d422d87a09f014ab9efc0b0c0e11785233d6da72b649d24e8"; + sha256 = "be4f73c95edbef52d0758e4d7a1bd727ce761aa544a8893a25492330982554f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "15a12109eb1a129fdda1171102aec0bf2e5483d10b0ca3739ec26d6433fe0d33"; + sha256 = "8c81f99a4f3c1b2a60e3ab13f16ae99fc86a60dbf866b1626401e84335fe9f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "71025d3cb8b72f0110cdf0243164115f188c1a4bd864f6ff17304f2e58190cfa"; + sha256 = "1aa57869adfcbfd93abf27dbefec6b804227f2154ab5892b827fd0d68fabe059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1a0eaad50ef10bafcfeba322950fe2d8872c3ea8d2e09146c1cb1c245bc2ddd2"; + sha256 = "c657012c8907084eb4ce301e7833fe669e0be96a0f32ee270040c99358c63e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "06a5f8b14a92d611bb9977f7c574e498b1cf83b4a7ccf7c0517bef8cc1b5c4c0"; + sha256 = "a446f29ac2668f2cef6deb6330f193407e1ab250e08c1033fbb1ae775c2c12e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fff902bed4909de9044a6e4217b1525a791a854ea148b0f31f0c7ab06efad667"; + sha256 = "dc187d329fff2c6cd84ddb6cf47c047ff41d7ee7d795dc7c9a2523362c3d515e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "172fbee0184cb829755b0c681593de7f146156f01b8b5fa1c093549d66b091d4"; + sha256 = "311da7ac12ad5748f4f301374f6fe474053ed7448d76fd8d0eee0427274b4fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4f4734b7b68fc3002250cfe3b78cb27925a7267553be5b4c86aaeefea3666f29"; + sha256 = "6b1634343ad72f9f917fb2491f7593d7f59eed963c263abbe72cceeee44e01d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a29da2c2bbe243fa1b5080962b68b77260d91ea3d16b68c4033c4c683f49d929"; + sha256 = "608e1981096855d4b11e035fe2f0520574bf4d6126f0ca695c76ad7e71859fdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d0aa992170821e77222daaace13d059bb077e53ff38bda23a1218a99e2a4f994"; + sha256 = "e6e508da92c33e92cbb35c8faeaf0e97a42ea60496e1082b17471c5310f4fc48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b0e00806bb1d55a0c911b7e022282f3d066158401192fd432bb47e968c9a980c"; + sha256 = "74619673bbef29b09055a6ad7f9793f184a752ef08b97bb10872548cfad74385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "891ca73ee7608902b4a2a0311c615bad9aff1d6514983597202c1baad26b6477"; + sha256 = "70bd112e0803b92789ef9bbc18dad26444c35788c7f8eb65f8677aa7a9690033"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1b8650ac822e3176ef2f47e32a6deca53bb53193289dc1b63562831fad2e70a6"; + sha256 = "69fd115da6f9262e0ff9c1ffc45575fdbcdfd54d377289d622d0266cbf390ae3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0a8b46212f36890f4e7671f97a400a0a3a18583bd5fc6a112e6bdadc360a910f"; + sha256 = "d7e31eed1e72f2edfec79e8a10fc7d7f56fcb3c51f99b59ab075cbb06d7a8c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9e3df1097dec9dd8e624d974bf2266a48ec064f2b1ea3cffd6a7f6fa99672cb6"; + sha256 = "1c2493d9aee6a9d82df2fabd29d8fc25032cf7d16480db772d7bae9b50d55267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f2f91fb924b27f9449cf58439a5216e313f77b1ee607a57ed3ba64473b2c8a9e"; + sha256 = "75ec2c9d79fdd9af3a8cdaf2fd644a936cd8bf7338f0a66ec1e2e2812b2b3d69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0a6eeed4f58e19f62ba6a35d4ee59190ee3bff0c4a6194c6ce3c2a3b6d75aa74"; + sha256 = "5b4d3cd852dbb075c78a0e05a55dcc5a072e6f17111343d4a444a93f738a343c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b10f6abce1f7e9bb7a2bd0977d2fa4d76b587c868e7636b49f95da5e1e502a94"; + sha256 = "f3eaf9e6a2288f52f08adaffaef18f3057dc78888da96138b5fca1ec1f82fcf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "72478742a27db5ba63b06b4f26edc3a03b1719227cb2bb177b965c2805628d25"; + sha256 = "e74d817c9d8c9cfd0fb4b0e6ceb55a9825880323daeb283dff08ec10ac3d03a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9a232a430c8108bd944395dfaceb1d3f350482cd10f1f3f54e30f86691c52e65"; + sha256 = "58499484b222c68aea2386f62eafbeac6179dae1df5fb60a22d57f63f91e77ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "180da12ee212d6a4d387f8d365998de80910727d8999a84d3cd23357289af485"; + sha256 = "4685a514ed0f627b58464ab7949e2570fe1f3eb903e21816e384d599728f294f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "892750a511be03e2e30e4cc7bb9da509f0ee027b08a7480d01f7d84f912ea648"; + sha256 = "ffab5a17ba7a8dc900a7727b380c5cda427c634acac6f5d856da09e6186b555d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "da3f23947dd3796dd3011dad46bde701f151a777e23290ac1519f9e06b72ec35"; + sha256 = "1d89d921b2dd9644fbb2b600573b4aad3ac832f2da66a3bee44607a53e268008"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9db563609d6d740e60606d1d1abff553c04ae2d8ad7873ec375fd15f6a2e1cf2"; + sha256 = "054ad2f7a95fd0dac604d1e709c736cd6ada53adeae63b8468a2d1dd0e9f60c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e8fefc8bbd9f489b5eaa14c14d8c1456557b1c85fdb9188fc2ec14f7b7a53794"; + sha256 = "a46fc891c9f658b6610d901aefb83f9bd7e5ae19a64b429c1077691bcbca045b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5067b3002fbcdb76b42b452d200d1fcd9cc3cedcab81d4b97aa39541fa93dc65"; + sha256 = "4f7390dff95dbce0c5b0489602e0659b330c1868ed76c7901ddf5860a4df8ee8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "29ad1bb43e2cf17510fe94a9bbb0f6b03149ae997ecf362cf40a74586787734a"; + sha256 = "7eb0fe2607754d2f6f2c7ce67b2e9d6a52b61695fd603ab2a9750cedb83be589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5096da1af9fc8dc358d86512f4ec416e114df0eac1d6f4a0bbae5b2a9bc37906"; + sha256 = "e48ff3117f7b12a5e62431c49a26745ba556e674b09499803966163377f90597"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e3e68af4c1c4e6a2c5c2328584af7fbac6b1160cbe20face8d02ae713cab735f"; + sha256 = "b2a7fa276e1e42a5b2d6f2e9f6b0cf8c4d5a06a11d5961ddf36e4e244e583593"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "713b63f6c31f620f2d079147a1c547e3622b31cde6bbb77ac6ab764145a3624f"; + sha256 = "4ba54e390d4ca56c5fa247453f5eedb9a76ca5765da53c1c4537eb10f9ed45a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b2b5390fad804c3708f1a4931cfc2d182e4ae27df47fef552a44099119c6b0ab"; + sha256 = "0fc2f5c3fa0ffc29b290316f68021687e692495d858d66362bd09d7755ca61a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c3287d8e8c3b4431f9b3a1da523d482372f2b461146fc5146e387176f11122bc"; + sha256 = "1d164328ff99d9f052ba9d3efd4cd9c14fd3a665c9e515e3666125363519e7a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "af1f514e8014a808659b7f01ec5274db11e5a682342dfabd69ba5338732af465"; + sha256 = "ec7e4ca3529624db58e413c9e36bd367ab108f73aa09e20587d7b680e854a95b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6039e0b4c76e1a86d0e76eb64682c6e57588b0f385249e2b88cbd280f712c5f3"; + sha256 = "6c9f1ddee7ba12c6f075819dc86a36522cf1d58e88d41378d14b6c6fa2a923d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2bc580b09cb87a8bee5f19ad25da43db92c61ee76d68f94ed75ba750f9074c1c"; + sha256 = "007f641d8f3a4348fc53efe404aeeeb018bb8003048826e16bae2107f7f791a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9f9b0381fe4c044020e9fc1c66203d9d521156b1050ea6ef9b9fd32197333974"; + sha256 = "26449a321dda6ee431207f0c412bd4e7bd65663f43979c1c294627f2cb97c4d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ab640bb474b99f786546fb198439f3ec9216ca7a1e9d9ff829fe9edc869d5ad8"; + sha256 = "039254afb85950ab3aafd335328a0dfd0b4b2009aa58d78233853bbaf3156e25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6146c01a30e33f05b8e33e9cb296b98c3564a413f4360bf657bd13c1e875a89f"; + sha256 = "249f3b342d8f7399c74a2bfc613af09af0d5e7accc020bc6963e20d0cacd56b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "58d8cfd0ff22c434aa897d709b7b6d9dd631448b348021641443b50c05116a24"; + sha256 = "452c2bd007a2759d3bcead151de1da48a744958d60160d35786c04be90917dd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ae41be247d71227f68f419b81b547a71625a10ff21e93271598fc38de528d696"; + sha256 = "8e53044f6659e853a4df3f5213320343355548357d519221525a040e0a97dfb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2ce9ca925b47853ae07efe2370bac839b270c867dd650578461f37ffb109a08a"; + sha256 = "0c60fe915d8fee0adc05a432e2985209f2f86bf4972d434e2090249b8b1c8ea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "36798fe697913dd15c8831fd9ba287c6e9a1ff9bfa7d57ae518055ff5f097ae9"; + sha256 = "5221ae7ccd0793e4a752deda5363c390c6bd54e54700f7022f6b723f1196f835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "74e394513597d01ab3eb9ea373ed1eabe081b7ff3d14a486b5133e05784ee212"; + sha256 = "f762705b947ea334b4e15007c6123a75e28fa416d609955e3c35040737728e45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f20b4c48e5864a32c9b44068618cbf0eaec0f157398a735ef5bd66738c546995"; + sha256 = "e39779eef6d953aa87b6ccd2ab5b71802b5201e9cd333de45388894359bc62de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e144c1a15cfa846be6cbf5c0bd2130c515ee36cc5f4748bcc705facd40f812a2"; + sha256 = "eb3b95d9f579bd14e8d6eab765c14ecbfd6a93d4b222f5e4a16708f9bb169662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "85a71e0baf24a1d0dd856f20b9cba5e03db6acdde4e4d19f4958c37bfdd82b6c"; + sha256 = "6589fede696924d56ede3590d6af100dd558e7e7ca6f44a55fea37140915f095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "744e378a3a3006ddf00aacbb9ca635ca4e7bc98b1b2d63af51a3c9c2f4bf23c1"; + sha256 = "6976e3c805dac1409cc6a541b81a057cdc312f15ef3387f1ff9a05d6b529c6e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "100a1f77b83d80c319021a185eade6cb21e95036c57290ae7f0c8326c1195b32"; + sha256 = "773e04d3e9e4c818aab45fa5fbfc0baa1edf2e8d3cc0fcedb55ae2bc495b844d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e9006a9e8ecdb35b473b34f43088609507e8e5c23656ceb1071ddf7e30254a46"; + sha256 = "a5b9e9eca192461672e1f29d951686c4f606566c6f024f2b8664aff85cc72a2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4d1da84d06562f7d81f0a7911ec5b0cf01f59dfa88862602cd8c554bcb8dbde9"; + sha256 = "0b1f166f08d62949c0ba4f72225c8149befc9ba94913bcc54ff2dda687a01c1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6b0251405bfde6ec7ce719143d56f74ec0557f5603e491ec78048e2409322c79"; + sha256 = "82aac072c7299281c1d0133616c6e0c3f5c03df72e892e48731ac19b11f04e24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "100d05845b95841cc7c084cc2657602e1c0520a7e6ae9073c9b8f33dcfbbbc67"; + sha256 = "fd31c8f26fec85b85c09370b91e71e8ad577984d4e77d965f528388101a645c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b2fd3304bb6a6f0ac370177d244ee14d973abd088152b861b4e583d9a02cd600"; + sha256 = "6fc6484f7163d9aa5b29b10fb1c9e4f5c865c38d481414383e62a688db0ab981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0b235d44c0c77bdff0c3a5d24d16c0231145099d36a382c3e25c08f2607f6005"; + sha256 = "e56aa4c8bbd75bfa303aeee791a7f54df47ca45a90c40828a11de28261fc12d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "413625b9d9a7795db98b1597146afbb634405ac1865a56c9eda5c1c0c8ba8a74"; + sha256 = "e59ed8962cd267eacadd8c273c109b05b2c7d8abd89ebbf9c0505ac598330847"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "223101645d322985b119597bf750cb811856ec081ca0109736cee556549a4a76"; + sha256 = "e07856e116d21f71221fe6d09baa9de7b39c393466ab397e83e05a6072ed53cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fd664ec6f9f3c7d01c27dd3a538bdceded371a995cc2b4f3f5754014ee50af30"; + sha256 = "5eb1a0b5aa86304bda9b135354798c4bf273a542bfafdae58493b861fe9bf1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a9c71bbc38faf6485292c989a47b35ffdee930f112809c06396359107f2928fe"; + sha256 = "827c5e383d8bcb6c8351e94b62d28d98837bf22e5c0ab7b20f0ee7c3fd7df7fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "67f72c9bfde8f68720e52eb96a986195edcb0fc36eb5b122ac460a6c5506f0be"; + sha256 = "4e33cbedb9ec4294bc3c590d50f050f955a95973ac2a888bf7246482d8ef38c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0bc28ca44d311a409fde1f628fc4f511875d7e56aebc8b234599b755a06f7d1b"; + sha256 = "aaf09e1bc3021619edba3b86d0599360705cf8282202d19d68b3945772906f86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "28b367b1b201486bde7ea970ca1e124a1abacf99715b103e79bda7dc779aca02"; + sha256 = "388ca99b77bad8b85256ef8c94f42d5e94eb1e541e696b5616e871dc0380c857"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "41ccdb0645ca0010dcd96659eaf7cb87eb9ae9fef24f701f196bc9f92c6b1f76"; + sha256 = "7f9254889e2e26295dfd878fc5a1296a535ad12bc97832c652c611289c1fdf94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6ae80689d049c3dbc3b86ba8478815dcc68805f3f9a61afa286d76a4243de66b"; + sha256 = "ea983344e14e43e57761de7ff86622c370353be8b9098cc65789f015ffa08302"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4f4533b7e443b8cde10baee0a68b3db9cab9762344c4f9376c9ff2aca34c2813"; + sha256 = "1ceab92a1c89cf6c281da104736bdb07245c6b493640bbb0d289d3304b8f76f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa5e0cd6774e03884683394450abd7172180058ec02c706ba986ecbe67f387eb"; + sha256 = "c01a0ffee6bd39435cc49856c112df51c3ef10c3aec1f916980bd09e2ac3ba28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "0f73dc37b643df022b3d914f5f544fcbadcbf1bdf85f4abb6d186cdd2ef6b730"; + sha256 = "64a0065aa656ff81b9d4354d325becbc46344a767eaace692ce6c662d591c26c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bfc9c8fe82bced904268c3cfce53c1b34066879f298ee45944812639eb8cca99"; + sha256 = "143591dd532ea1250decb6d36296075e575746293f554498a51a86c82515e354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "fbb01fa4b75d25004cc5a79d21ca2013ab0833bd394f42867fba70c0a7091e44"; + sha256 = "b77079edc573f00a2e1fd840a18a9d8a1b275f0adc9e2d56d35c8963b9433000"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d73b8c6bf55b42e58410205a99d15af98bdbfec550434cd5815451955bd8598a"; + sha256 = "28f71392241f5f7871cf10e40d4eaf951615666e8780e79f560f7997748e7cc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f5d030c94c6f9a074ebbd97f18a6c14eeef9b00f73d11421614d1cf7e4b05efe"; + sha256 = "9e968c177b199b5bb6dc196c591b64aef4b8c3f801f203cc3e41f77234d4e218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8c6b3810988ba862c2419e583f3d14dd9722dfbf7c1a55d7e72b9d09cd2d46d1"; + sha256 = "0e58438f597a87218d9d50f44b60d397f807f11179b8f854ca9387705ec6ccc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8aa97c4ce2484735a009399ebeeadc8270fbce1806890ae17e5d42b6bf69338d"; + sha256 = "b66743d01ef65d1fc3be41741c9458350062df8167dea418bb8e3d7ff3c9e510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "57018f57ba6721ff11b5944e6b1d1825894ddd5b422b6bb3c1730be31437aedd"; + sha256 = "106a68c050abf166fcbe6b0e8aa96b6c3f75c4165bb467fb628f0b9ed0284c96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "48f5b50ad9f7d96ddc26b091f70c195e7f1abcce1347de74cc994364a47e045b"; + sha256 = "bd712df03192b43cd45202673f34dbfcc4a28d6299d0a0a5c7a4ceaab06eac27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d69e319133bc57559273111e85d573389151e841bc4381b909fa767a4b7fa634"; + sha256 = "32b4563a2a1a595d95299eee00731614e9ec117675b8a0063cd2fe37c5d3cc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1e06f9e2071c846aa703ee1da367512ba27f5854237e041b6c1f03ef2d8b3c07"; + sha256 = "17767bd33ca9f86236b909ec58116bfaa61b3440afa698e4fc9ae3fac89de0f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ffbec68627bb7660a2a5e55982e4405d74d48d56912506aca96ec42198e82337"; + sha256 = "af69ccf3e497a9c3c5e36f9b808f21c7c6a81b2f8e5fdbb5187d53d2e880976f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "add9451aaa5c20c3b963fda1cc0e75eb4ba4b84311f10ba405c10b8392d78ab9"; + sha256 = "ff8b14add93bc4395e8be6fa8f6630d8a7a2183a64a038a8e152ce30dea73ebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "da0772a5156e0ec08a5ce30c6ee7dc9cefe51cfd72790cbc53d6f2f3eb25a8e4"; + sha256 = "b9db822d4afc8d72cade1e03b396db1bfa96bc00caa66fc93be70f8509e0768c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "604d1b9e09334a639164dbbf5c3b974cbdfd0607d0823cb154381a406e43997d"; + sha256 = "67ce391735971500b8b6739282fefb781cb9a67140e8d508d65715d2e613d792"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2e1469c867e54ad1c6ba8504cf594ebb2f7167f619dce35073bc19c42f0db52f"; + sha256 = "aea24e2cadbfd9cbae87a21b5ff8a24c8a8fdde1f79b2b44637a779eccd2ecfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3310fcff33e6e6c93a17f73ef9a4c7557245e6881b87fef89fba61e24cf18aa6"; + sha256 = "d4960566c8b33b4c8fe2b7c50d6af9e5bba2cfc2e3ef6dd0c3e96b36a85d4a0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e9efa109578943b4779a89206ff2d096c4067bc996789d1a5a28885978a9acd4"; + sha256 = "fcedca9235e77dd06a53afe0ffcec131a49fc99ca0fe5edefe9d31287cfcb5da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b83faddf077b8c346b5ca76c7e78c23bdcaabd7b2edef2747a89de5eff19179b"; + sha256 = "b5b041aee3b4c4f205e8ef59d22f6284112b18a273fbc2432d2ba3f440b71b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "610732c62364f6c4a5873ba4003d549011eb424e312795749d76c58fe90c85ad"; + sha256 = "192ea167b65a86b9834982d017b9100865fab79cc0cbc174df137d7c1d4a213e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d0da17dac024d6cc3e636408f4736f586fc6695dd6b6614166ce4d6cf9321761"; + sha256 = "f6abb675ed43c2a6b346b8700603fea938482e2492d4241ec63620b19ad6f93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e90b17a36ea6dcd9189e1c6b0d8f152b0d56a852922ddf9e4ca9abf3bed724dd"; + sha256 = "17a48c248e13751476e83be211ab94643311d62051ca7b32cdff942623a9a301"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5d8fd0e91d7c8e3930a4be87560d6293680bd17f7e275ab619b23b772093ec95"; + sha256 = "a60b7f5c90c043c9c2540527dcd689d08e693a8348d1c2c1241e1f63e66472fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e67450564d27eeb7e605b673ccebd86924195a76d6eb7aa52603f1d8e3198f57"; + sha256 = "13684be7d69c332457e7c1f97072869ed87900744ccfa5dd9c9b198716c3b4b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7822b37160091511fc120ab7c6d11ebaab8cd601e1c4c89931140917a28f6e6b"; + sha256 = "eda9bc5547a095dbdfda0554a07970d75c5b8b4a421c5c79bf7ff06ce44245ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "67c634da5c832ad7d39088b397d0e34c69837e0e6c36604ffef4ada917df9341"; + sha256 = "cf0f925a584c5317b420d36bc79f8cde96d59f6996b65a200908f43990a12914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c08af1538f18f6c19eaad1c830b115ae168db2b5554e223f5be985e57e156e6a"; + sha256 = "18be90927891a5c05ceec6572004dd0a6f1a0859c6e01b476473908f91212f5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "922d7f8217b29e2bd22c237b47db29fe510a33587df0281cbc55ed75da17dac3"; + sha256 = "5f63450e0539fddcc1038610be1ba0cc6b2be4662fd9eb6719fdc5d4c31c6c68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "68f64732c29def431f7d87fc90d35e3fcc74f8e284c30ec959f2ef8a5fce4445"; + sha256 = "f636c78f6658e83adc5610b4c27c75bd3673a60ad107a9844a8618eb097766ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "423ffa467fd8001614882e36aa26857dcaa9466fdd3a819decd7cd5816ae7ffc"; + sha256 = "67f4263d9f41b46403ef98bf13b0be52b25b495cb3b65ea215e987178af717f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5d349b29dca8f2e3f8b7f3815811c87e2bdea47c0686dd6bb2272546d4c94586"; + sha256 = "0992a93710781628687b5869338b6cbe76a1c8341f76057bed213eed08c2eb5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8c9d2818217257bfeca1aff0250530fdaad569436f1c9218fa8ff839bbeb42fc"; + sha256 = "6e3b6835ad6d71af0f7b9945f26cb3bdeae35143297f56850bdae17ede9e87df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1ea72a0bc20a3c5a986ae5d2ec43e6347b0631f21e98ef9d2e5847e76e6686b0"; + sha256 = "acb71ef9be3016e639db77aaa0c7ad74e47797d88ad42bdaecdda7f63bca0b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "895b803948074af1c6b4fcc12a17594179a5af35d58b3a85ece79e40cea6d56b"; + sha256 = "184dba37d13b8b59c9398644ecd674af2284054803f1d576e0949a6b865a0f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "87c6538c14fb8e51c464df8e3b6999f0fc8cd20ac3b1285d5a0856271f9fd1fd"; + sha256 = "1c08acbea74425df40948691c2212631fdfe6e0c2eae32db0c695623ab0cb88d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7085d95b9d9afdf17becec98b86a76d815cddb3fe43cbae15831156daeda337d"; + sha256 = "52d15fa6ac4bcdbd7e2eaed2ca782ca35392ead5481f5b2388b3d6e7f98874b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "251524d2ec9988ca5d72128cc4de2ad0aa4a80c576a1517dc27081fe158c99b3"; + sha256 = "59ea849914caf82346401f0831add849c7db0812a8cc737fc3d927d82223ea96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ef87a4bb863140d72542e7cc02172028bac7781f806d0f52d51339acc7d49efa"; + sha256 = "79393e803a125b2026d8ac4a7ca39e4ea08792c4337046241578684960746665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "37d34d26264da9ce96829d5c2cb7ab1156c9420043a3d6cea7ef4e87256b9417"; + sha256 = "ad08d645469f71030af139985de3c2fec86d98a2d212e31a24975e899cf5a9ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "463e68256aa98781f77c8a2467f58c40a89ff43ba38d728fba648b4f76da0850"; + sha256 = "9096779a6ebfe0c3f95afce66e6dc8c27fe8a5380ae95d1f252a70f6571ece46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a479727e6546452cd4ad14f90fbb48136f336734abf0dc0e92a56065ed4679c1"; + sha256 = "f2c98d60f624a4bb19482516abb0734f6066600cd4883c0a5ba8fd2e05018bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a39b122fbef49420cbe7c12b0cfda10a061ba644aba36e77971b08bfaa213862"; + sha256 = "0e26278a6b4c7ba649842256cbebcc8130513f9dc76d5f878f9610ba59801df1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e653f75cb2e7616389e93737a2bba59c7422a11ca7cf7f670fc9c868fc089be2"; + sha256 = "33c184d7f74dcdc7004206bb4db1810c8d96b8b64adeb9f5b9d312922b3100ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d9b02475bf5146d232f8fb2e96b4da93142c2a4090addb9fc8f636d38de021b6"; + sha256 = "46833d7749b4eaa54c2cebee5d62a4ae473f55a136617c57db60c2c3da264e47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dfdc5682800de16e0327549b1f444eff08bf6a4cf5a38d9cb7a6909207afd324"; + sha256 = "20754336bc44e34cb8619d77fb4843068ea2eb8c2c9516060af650a17ebec943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "81e9791af2c7a896c38a752178b9fbff6da0f95ae84ae0fc0a0b315161b4b8f9"; + sha256 = "a1843a6aee18f2b996a2cadf5a07994138b9a721e9bfe8790b168021bd77724f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "59083c9ba66dbd20079d96f24e94fb44d9152dcc973f4e283574de0ca3818dee"; + sha256 = "8db377519662f9d2cc9a55f493105ec184c157dbb2426fb86a1f3b109cca213c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6fb7a30e23479614dc4f77b728af3736bac41af0a9f45a43ad776d5c0b22e260"; + sha256 = "7ff7a066239aea60634796291196b083bc2d5eb855bfb4e9d7beaa24f6f8d262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5af5000ff60d6c647317d9026bfe75b2af93fa7078414d9ca7e33d078e894b5d"; + sha256 = "3326717180afc0580b20f36a2a94e375baa72194f459f09c01f72266c51fb4fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ec88b3bb69c589cac44b07194904c73dd77b6ccb6cf4f0df5b3d668f70a96968"; + sha256 = "f8fadc3a9a8406e4b408c80900ecfdf0e982217ec9f8c0347f0882698c5a11b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9b459d0782b0e2d7efe60a23bb3f81d546978f5bc8e230644de8fe3618231c06"; + sha256 = "8ab2d5752ccc1e33620650f76bdde525f078fcb2b30769641a639de3fe90b6b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "35f382b4387d8f4b89fd9ea9dd73da1765098f00942714e5de39ff51230a54f5"; + sha256 = "547994faad72d930850d7fe824ad734f6ddebeaed9b27d9f60324ed472b8a11c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "90d90cb11ca58f16018b270608882754ffcf89503811f4d17ca14645e1935284"; + sha256 = "d23ad96f1a70355e4a710e751f7d1222b5abb630e8e28136cb455c4ffbef998c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "92ee0798472b4c17c0d30145ec4db414ba0f641b1f58904d43726d6cad826149"; + sha256 = "f8d8bac8b2fc2f5267f53f2bf7b83b92bc64d58cbd53f718c49ed8da5c7318a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "76fb6ee46121973a20a8edc737781980e04ced07761418e0d9d9121eb0209585"; + sha256 = "587ad4225cfca77855961d170c1cee0680459b115793f4dd123ba38767abce92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ebf40f448c55b455da214a4822c83b55f6a7010101167eeefa0ee7b554802f66"; + sha256 = "6d54ea2900492a74f4de0720d8b6630b21708ccb0460654a7ed6fb0defd34cf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "861bc300603dae711b152cf20b8be1f6a6247c8e1c87b92dd44c30e71f5437a8"; + sha256 = "2309289fe4450928b37cdab4070aaf555b2f707018bdd0af1879763dc495fa02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4fdd7c7eda0730a168d913f437435dd0f46e3e97a69bfa7b7e3abd3817e81edc"; + sha256 = "614c2710d7498d8527c467e344ff4475e1e6741376166ada64c320335f9db7ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3b17ff465c8956ab8baaa71ee3eb7fac5ff12daca655629ed7d50b0ee0500253"; + sha256 = "3384f827b4d4abf8955a277706ce0de2a2f3307580d42534b7183e861b86310e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "efdea88bba602a91e2935f6dd53f874f8ef1fb33ccba045b5392c25650a85637"; + sha256 = "f9c8c5b61f23182cad2f028903b921d7d0b106324278c9b9e7057ce35bd592f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8c75c2bb5f61b94f9a44027293340532e104b5899f7e4555b27a00d3bb2ad4fa"; + sha256 = "3a6ca2363b6eb2a240c53e13bef7a8feabce2e9450d15cbd99d0267406af4853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "21853766ad4f9cb09fe2a5919353dc3ec71e99b1034ded1c82725dfa0d489720"; + sha256 = "5f8d2a9234dbff2c7c3b416bdaad877a945346d6ecd3faad98f25643cdb32e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "86dca0143ddfef6fec63cf70d5dfa5322cca8561f4270cfef936340eec8dd4ca"; + sha256 = "7f30aec3a02c3f092810482e3d90ddf93aa7304988a75d8391eaebabaf474bee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0bc4e3af051329405f2b660319f8f984c136133b86f54594d96523ad148d98a5"; + sha256 = "df750038ae58b9ad47db756ed5e009c3d633e9444f48b9d1b2ba0e9de5784318"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d5308fe2d705d127496097e627e0943feae7b6068642733c36d5ef9dfb812678"; + sha256 = "325d66bf2399ebc62c95f263b20a2c294b396ebac31de454d94d31f32ee6f6fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "674d7f3f9af1bd63f0ac5bf690c23fb051461259baa4c5fe49f914804291cbcf"; + sha256 = "1f2b583782ceaa153cb52ce0a787c51541131f771682cca2753dfe3d96cb92a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "bba2bc622a90f1051ad4ceb74f502580ec30a1b5df56a27d7ed6e3a0fa6797b1"; + sha256 = "aa5f1242cdad391c66bd799977c4512e494333f20ca66db180089c5916fdac6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b2dcbbfd89a03fd0408ca292fcf40f879a5df920823aae5a9ee13f57fe22ea01"; + sha256 = "9e3ec577fd89ed029a05170a707ad20b650282fc646a39ebff63f858a2f259b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec0e866ccde7b96ed65f4d0f06bab2e232319a20edd38fcaa19bce650635a4e5"; + sha256 = "119e846be03a97aaaccd846b9dfcc4ffd9b74db6065ddb9e20c9755c455d3d10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d14f7c7b93034f8f2ee6807e64de7f73f600b3071744ec6d5cf1b996ae56b357"; + sha256 = "efa3e76e979f1dbb01fb04254de7a307c78770acdeabdd8dcad3d042177ac72e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6c6fcc5fa0333a589f8a897fdb05957b93016e4afc0c476995ceb148df6454c1"; + sha256 = "44b163479d1c4cd7aba090433dd212a71ef17502484f9476036f0feaff471fb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a3c967dbf2f276a6a2e60e60c5e225211d6372619fc052e11ee4b0132e174cd4"; + sha256 = "a2ff925d483f13b08aadd94444dc01836b1efd66be4989ee643f347933cfec01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "16f6e527fc617738e7e153b9bc7c012c4bc0b6c242f641465d2db01d48ff89fe"; + sha256 = "84a2b7f5ba2713cfb0d208c8727c52c51d55a9f3fac879a069c523b3529b67d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7e27cd38b5defe430189554f929f43be72278c0d5ed010c5ac78920d52993934"; + sha256 = "aef00fda24e748c845acf9357e84c2136c399cf6b859227dca8a4775ad8bed83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c7faad118878aa68078c850730ebc0abc4d4f199625af975eecc76900e920f4f"; + sha256 = "34dbed0bfd8dc823247746938b81d76f7679d99da8e133927c477ec62ab31b50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5b30917c8f689882813f9f25870ea104d780fc476329231cb37b9358ce2c1bc0"; + sha256 = "47a2e1c02cc85cac00c97342c8f4ef329c2925ca7b7427b20b426a440d4f3dd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a3916d54ad28297316294065b41cfe99237acf29752b9bf8a6ea886ea77000e6"; + sha256 = "9dbc7e2a054d9d0a4579a52ec0755d5e9e18a80a5a8ab14f10ff799d2a0c9e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "65ca0ebc62d144c0a5f7a8f29544de601487523628544ad8050b8367d02e1f31"; + sha256 = "5bd5aaa044b2a2873d6174ceabac557a8592f9b79e76afaab22e3f7a9bd03486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "af9939e9f2be3b7aa823649e285e027565275d602148f7049001176f2bf3cd56"; + sha256 = "b476b0141126a7bd877fede45f3e3b5d6cc3011b5fcdd4386ab7122a5d7b086c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "536481db78eecb11c9b5dd7e9cdf5cea0fae6593b373aeb6774dc55b97e9e749"; + sha256 = "b66cdf440275d4799e71d34a07fef436dd12eff18f51448b4f2f02020dcc6ceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "181d1bd71d1cb96370e54bfe678deb50d3884b9042b0b7fb901e65faeee9e3c8"; + sha256 = "fa7bdf3c2da92f7a6636bfa24658ab355edee1631f579f3ecfa9cf8cd8ce3de7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2c52d62b7a45259460a1198fbc176bafda3c826a5e30d085ec9fae622100fd5d"; + sha256 = "4dbbd458324f85b8a7eab2db3f14db21fbdcf13f6e1149e8c11b9101f6518ffb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7cdc34f750e7fcdf68c07169cbd23dfd5225a77a325ab4e5056a5e75be488536"; + sha256 = "3f26be2ade71d4bae842918ab87db1603703aae22f868cdc0e803b6066644986"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "dcf20c70faa4fc6434b86418f49658b564a312d7c05045e9d7bbbe08e3412b92"; + sha256 = "be1f40281f13d8381bd2d3c33f4cfff9d6a7e2bf7e759ed9a03b2928aa71b0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a0f837de6a7ea9ae287b2bd8aa8d07d3e495489a4a4e25877547ecbd1aa635de"; + sha256 = "e09be22cd422296513b6139640e33e9288abd82361f0d7c4951eb40786f4dbf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "29bd052f0fc211f15b0449104047359f0e54a7395b615d1bc0f25a3a1e2f747e"; + sha256 = "3233d65c85aa14f48e98fa013a96a65ec690e85518519dcef64e2af1700e708f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cae243bcd0f790ca156f7aa9c6602a0dcf9e482e2fd98890b741729be27c63f"; + sha256 = "d5521848f261eafcba30c2b7270b2265cd6cecb2bc0a072c2cb4659f34e19bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "42adf4de407edb938b98ed3a27b1491dbe463d42fdf3e63c60a7ce83eaab1d7a"; + sha256 = "a87019f3b1870f6d4a074c26505a271c5820e43bfb9741b63903fd8b1a33ef8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f1e3e7db826643527896e7d1568a9040ac534327858bad653953e1be9c960e52"; + sha256 = "245f864d137c8ca72015f342c747d7e67c49de94893e58fb010d1bb3244993b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b1a51f7770ee6c3a23859c90fab894aaa3c2aa36f49c3fb9d520542a9492e044"; + sha256 = "4b6a71cec55eb771e61f7e083954cc0423c38efc4e04f2352cd64ff7b208d0d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9688da318359cbb4e0f37ff0dd7a9ec727dbb9e997ab1c0247cfbfffbb8820f0"; + sha256 = "a92cfb32046d6f246e1ab1acbc7d4fc1ddca12c93638b11ffffeb7522cc4bebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "e5fc128298e297d2d7b6fc788ce1566bfcdf868962441dd4ee11af3acbafb7d9"; + sha256 = "b7cb0ee3f8dd4e1b8b5550444a9c3cee50a64c622febe9e545f6aec463286630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "53e10046449208e44acd8f9cc11d2500cb0be0e0fabc2dc7883cc8347a436aa2"; + sha256 = "eaf0f00ba24966d15aaaedff25d572891e9c4762b046b8349cdf02aefe2e3a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a36cbe8b97febd8ad1fdcedace1a0a087dfde07586e207ae92a9f4f7b6fa7538"; + sha256 = "fa744ec3cfff9346070094ef055641cf7704cea2cd1acb728ec940c9157fdb7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "46db41b7ae8c30a889131c7f9e1f6adf2af8fe13d872d951134b06a3591e5e27"; + sha256 = "8097c48bec46e426b22e0bdce252b0ea67c173a6ab3612e66735a4d8392a997c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b07dfb59d5bdd02ea2e55ab0684bd2d4192e888578670e536b847823f49e7b1f"; + sha256 = "911ecca7d29a5d6ad6371fc2785238a3ed4a99481b752924fc6b48e37779c0e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1bd366a3ebf1eecc4eeb30e6f43852fe55c00d0db330607d90647fac00cff9fb"; + sha256 = "541b825482e5446e020529a09d29c25b8742953315fc30f074c5ce2dc575a419"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "99cfa9de6bc60f84b5cb44a4e139d3a609cab4f1bec126b4cd6c6c6b287dfbed"; + sha256 = "7d5a22eb6eb9317c278dedbc016d25a882462a094c0f3e4006594930925bb39a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "352fcdad76adf69d708638e81468add5542fe6298ec3b13ba500f8dd7d2a7907"; + sha256 = "ccd5a185c8da07def1ed7fab0b4ed4279f8b8b73e9135073bfe6a7a928722410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "24015a6e677171ea1609cf551e038f10606f34d5c8fdc9f28263e83d219442fd"; + sha256 = "7cffec4453563a4eaf94f5f53422dabf1b4087470bd5cc5d25cca2781ef46f44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f3fcb0597580ec67a33aee155bc9ad626fd01b40ca8aee9bbd51b372361f09fc"; + sha256 = "00cb10d57f563da7cf7272a4c169446e29f956d7dda8d877c7088d35c167e31d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "5fe26295471bf18171b64eb9a5204453556459763b439b7ea0a5afc5b2115b5a"; + sha256 = "18fb8e71fe1b9d76ca51da60346c54c4c0b92b0e95b855871fbb5fcf89e1195d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "295ce6d814f4b7b356ea01da7fd0c83ac443614a21d45da89c0691f0dc914705"; + sha256 = "488614b08b8850028e14dead6cbfd69bb680475e3ef08cc09954d201cf614c1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a1b85d136a2a1086da69592739d8fc1429e34aa7f180c56f3b270630fee8a6a2"; + sha256 = "a4bd6d0bac1396ebc9f233468d4c258bd1700fb25c9af473a8b040d1ca3876f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "eed2e61f123ef88c71d2d9a1f0fa6019856c2c0e7cc5d3de760091785741f897"; + sha256 = "7ef48eb84c4a667ae3faac898e112fa595c1db561a3dfe9116a843b07b8779fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "66d6ed76a9e659703b2d586b97a76ae8b7af22dac3a01d4d902cd5747ee3735b"; + sha256 = "08660dbb36d937a42a0f9d223db550dcb916cf538c9adf4fdea8e72b12b586dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "24644a2feda81a5e5f2ad70d420a018a4d36507130699f0175d0e3a9837d3e9d"; + sha256 = "d31009f1e1e506772db2b43b64ee66e91d6f069d9c423645847c5e67212b2798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a1b5d23e4c1cb67cbdc9842e2ea5878f4b6be9b9899bfa59d0e5689d589f3e0f"; + sha256 = "f6768a336fe0bb6a8ac92633238cde92fae73e58338379ad27be8f6ab07a93e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "879c5b1f90b6fa51a648417e70a770479f844f5fc4cc124b0b7ea68eb458dbe6"; + sha256 = "aa1a1fa5d64c611bc53bab303ca463949f1e0e2d5d8b3ff7ba9b33ac7b0d9c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "94f19f7e0ef54acbf79d16b1228367704c968aebd10d3b8afaa0379f503ccd4c"; + sha256 = "a185a54d5f29b4d6f2d34a530b498fd3a67636b068279a01427f6f0c29bd221b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2efa5241fdf5211e8452e5b8c6d07a989fc3585a7ee00b0a60fccdac140ab531"; + sha256 = "401677189e0c0a2c17f433aa4574cf92075ff7e4f028eb6a1a9092e1dd30a5cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8a18cbed900564fcaa0cf52d6be461f3e7e6146841568006f409fcc8f5241bea"; + sha256 = "c0039e65a43f59f9495c7a2022d4982849a0ea6fc611b25d348c02ed3dd7d671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ef901fe934af0978089b7463f743f583e9f2c46c617234b2206cc5e0c31daaaa"; + sha256 = "bfce50f6e107d4a49d0349e1ef8234c4b7bb67d6f135f8dddb5512364464e6a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6847dca8150ba6dac5f7082ae518b9fcba129320e93909b9340ce5adeae6540f"; + sha256 = "aacb23547b2a20b4ca5b548694ab3e265ea18ff5fe77d7d77dd00298e73fd801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ac72b502b1fc8cea75ec2b878b957d52fa8fcc29663b7003c334ec6932e5ece5"; + sha256 = "f87db79ce94e8e964b3ff3a89efd0d53e4a5753854778845f9548aa7d41ffba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1f2ef4a9dd341c3151c7e66c8d9fc1e0f62f33ec397e3ff399bb56dee89532a4"; + sha256 = "e7e786a25afb44e53c52b19ac545ee455ff505cef4393fe698057df6d5fbff3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6026af884fb2f1c899fbd28f99d383ca34fd4e6540c37e08904155df3d6e2907"; + sha256 = "426ee6932fca23e26a4cc6943adacd798c74406c47fd71a023c2f2ef503855fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "36f70f8275de2201ee29387c2724f908ae92a22d8e1c830f5e4572f2d8a8838b"; + sha256 = "47ed2f1510095a6a9120f3962f8ae817c5cc2e6431c6b80583fd64e7650593fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f46da613145e3ecbcaff8334fe54e340dbce9b0c4fffa0121958abd6fd1e1445"; + sha256 = "14dc9e8d8301d7ca3a5af0f61d4a2db35c29cad07d083e272aa947454fa47d4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "048b6285f5600b2c09a63f5c90c2b8fde0159e6c3bc7f282482bf4e3b0581e78"; + sha256 = "f02797ca77be238488ca7511d940307d8946b1ceeb31f3ed46e242e2a46fda2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "21da3f9a45abb3156ca14c399c2b6329801135d37c3e969b0e7f615311649a72"; + sha256 = "05f8d37542245f10bcd6cae6aaea5e171d6ead2c2ae3ee1dfdf663a47a127ee9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e0e6509645516ae50f044755da40a30685edf2d33ee38d213000507db3a25d34"; + sha256 = "6f254c3ac71ec2eac74c907b89064f72840cabe1555a827a4941aec060edfbcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b8904a816b1f6f3290bb2b9d79e2bbe92d01dd5fef059c7ebe4a70cdcdd4cc74"; + sha256 = "262b3d430b34a3da6020e1d1ae60414049347f0869e8cde4273601da0d55c258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "307a472ac7ca779883e162a5dd780cc9ef69cd1e09f8aa03f33cb0501960bc32"; + sha256 = "2db8e3c9f6438576ed774b76b962650cb7f037c97b07f4d1e18f03ab02d1b017"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ffc5c9f740ef19167a463de5b5a85d75aa9cdad85f0d476734b01350c48de9e3"; + sha256 = "4d0eff7854d49607316218489212f7a61bbf7b95118140fea8f44a72431f576c"; } ]; } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index b91e5b05b62..4a3d98d6474 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y="; + hash = "sha256-BKDN2DtLoG+E+R+yBSBpF4PWv+pRLNYZvX/3BqEIxVQ="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 009569f9c5c..4739c7d5a37 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "110.0-1", + "packageVersion": "110.0.1-1", "source": { - "rev": "110.0-1", - "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p" + "rev": "110.0.1-1", + "sha256": "06k33gf2q77w3airgbqmki555pp2yv33cbkivbi4hgz80zl1m4i3" }, "firefox": { - "version": "110.0", - "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9" + "version": "110.0.1", + "sha512": "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21" } } diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix index 41021cfdaa7..b9ba40a2932 100644 --- a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -1,18 +1,26 @@ -{ lib, stdenv, fetchzip +{ lib +, stdenv +, fetchzip }: stdenv.mkDerivation rec { pname = "widevine-cdm"; - version = "4.10.2449.0"; + version = "4.10.2557.0"; src = fetchzip { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; + hash = "sha256-XxTjuPjWy06SmHC6GaIVIp3zD76isCVATWwwdZljntE="; stripRoot = false; }; installPhase = '' - install -vD libwidevinecdm.so $out/libwidevinecdm.so + runHook preInstall + + install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json + install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt + install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so + + runHook postInstall ''; meta = with lib; { @@ -21,6 +29,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jlamur ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a3bddd44fed..b20cb19bf12 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -144,7 +144,7 @@ buildPythonApplication { --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} - ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} ) ''; diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 5a0e81f4a4b..e9b690e933c 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,25 +1,24 @@ -{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: +{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, nix-update-script, lib }: -let - srcInfo = builtins.fromJSON (builtins.readFile ./pin.json); -in -mkYarnPackage rec { +buildNpmPackage rec { pname = "vieb"; - inherit (srcInfo) version; + version = "9.6.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - inherit (srcInfo) sha256; + hash = "sha256-846yfD8B0/fX5cJOK62f/Uc+iS5WY0odKN7CXAUL6qY="; }; - packageJSON = ./package.json; - yarnLock = ./yarn.lock; - yarnNix = ./yarn.nix; - yarnFlags = [ "--production" ]; + postPatch = '' + sed -i '/"electron"/d' package.json + ''; + + npmDepsHash = "sha256-IOlYip1AXsqsjRD/5Cd/E+hsT3ZbXP7qSHfCDzESisc="; + dontNpmBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; desktopItem = makeDesktopItem { name = "vieb"; @@ -37,25 +36,22 @@ mkYarnPackage rec { }; postInstall = '' - unlink $out/libexec/vieb/deps/vieb/node_modules - ln -s $out/libexec/vieb/node_modules $out/libexec/vieb/deps/vieb/node_modules - install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop - pushd $out/libexec/vieb/node_modules/vieb/app/img/icons + pushd $out/lib/node_modules/vieb/app/img/icons for file in *.png; do install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png done popd makeWrapper ${electron}/bin/electron $out/bin/vieb \ - --add-flags $out/libexec/vieb/node_modules/vieb/app \ + --add-flags $out/lib/node_modules/vieb/app \ --set npm_package_version ${version} ''; distPhase = ":"; # disable useless $out/tarballs directory - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script {}; meta = with lib; { homepage = "https://vieb.dev/"; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json deleted file mode 100644 index 28704db5c9e..00000000000 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "vieb", - "productName": "Vieb", - "version": "9.5.1", - "description": "Vim Inspired Electron Browser", - "main": "app/index.js", - "scripts": { - "dev": "electron app --datafolder=./ViebData/", - "fix": "eslint --fix app .eslintrc.js build.js", - "lint": "eslint app .eslintrc.js build.js", - "start": "electron app", - "test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u", - "test:all": "npm run test && npm run lint && echo 'All good :)'" - }, - "repository": "https://github.com/Jelmerro/Vieb", - "homepage": "https://vieb.dev", - "keywords": [ - "Vim", - "Electron", - "Browser", - "Internet" - ], - "author": "Jelmer van Arnhem", - "email": "Jelmerro@users.noreply.github.com", - "funding": "https://github.com/sponsors/Jelmerro/", - "license": "GPL-3.0-or-later", - "devDependencies": { - "electron": "22.0.3", - "electron-builder": "24.0.0-alpha.10", - "eslint": "8.32.0", - "eslint-plugin-sort-keys": "2.3.5", - "jest": "29.3.1", - "jest-environment-jsdom": "29.3.1", - "terser-webpack-plugin": "5.3.6", - "webpack": "5.75.0", - "webpack-cli": "5.0.1", - "webpack-node-externals": "3.0.0" - }, - "dependencies": { - "@cliqz/adblocker-electron": "1.25.2", - "@cliqz/adblocker-electron-preload": "1.25.2", - "@mozilla/readability": "0.4.2", - "darkreader": "4.9.58", - "highlight.js": "11.7.0", - "jsdom": "21.0.0", - "marked": "4.2.12", - "picomatch": "2.3.1" - } -} diff --git a/pkgs/applications/networking/browsers/vieb/pin.json b/pkgs/applications/networking/browsers/vieb/pin.json deleted file mode 100644 index 5efefe84055..00000000000 --- a/pkgs/applications/networking/browsers/vieb/pin.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "9.5.1", - "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw=" -} diff --git a/pkgs/applications/networking/browsers/vieb/update.sh b/pkgs/applications/networking/browsers/vieb/update.sh deleted file mode 100755 index 3efc2523589..00000000000 --- a/pkgs/applications/networking/browsers/vieb/update.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash wget jq yarn yarn2nix nix-prefetch-github - -set -euo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" - -if [ "$#" -gt 1 ] || [[ "${1:-}" == -* ]]; then - echo "Regenerates packaging data for the vieb package." - echo "Usage: $0 [git release tag]" - exit 1 -fi - -version="${1:-}" - -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/Jelmerro/Vieb/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -SRC="https://raw.githubusercontent.com/Jelmerro/Vieb/$version" - -tmpdir="$(mktemp -d --tmpdir update-vieb-XXXXXX)" -pushd "$tmpdir" - -wget "$SRC/package-lock.json" -wget "$SRC/package.json" -yarn import -yarn2nix >yarn.nix - -popd -cp -ft . "$tmpdir/"{package.json,yarn.lock,yarn.nix} -rm -rf "$tmpdir" - -src_hash=$(nix-prefetch-github Jelmerro Vieb --rev "${version}" | jq -r .sha256) - -cat > pin.json << EOF -{ - "version": "$version", - "sha256": "$src_hash" -} -EOF diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock deleted file mode 100644 index d238d1428ba..00000000000 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ /dev/null @@ -1,5177 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== - -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/compat-data@^7.20.5": - version "7.20.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" - integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== - -"@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" - integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helpers" "^7.20.7" - "@babel/parser" "^7.20.7" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.12" - "@babel/types" "^7.20.7" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" - -"@babel/generator@^7.20.7", "@babel/generator@^7.7.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" - integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== - dependencies: - "@babel/types" "^7.20.7" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== - dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - lru-cache "^5.1.1" - semver "^6.3.0" - -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-transforms@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" - integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.10" - "@babel/types" "^7.20.7" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== - -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== - dependencies: - "@babel/types" "^7.20.2" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helpers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" - integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" - integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-import-meta@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.7.2": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" - integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": - version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" - integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" - integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== - -"@cliqz/adblocker-content@^1.25.2": - version "1.25.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz#8835d7307c7829e85a2e38e7e3bfd161024ae4d7" - integrity sha512-Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ== - dependencies: - "@cliqz/adblocker-extended-selectors" "^1.25.2" - -"@cliqz/adblocker-electron-preload@1.25.2", "@cliqz/adblocker-electron-preload@^1.25.2": - version "1.25.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz#67263683cce7cd036dbc0c37761c4f5eed6508ad" - integrity sha512-d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g== - dependencies: - "@cliqz/adblocker-content" "^1.25.2" - -"@cliqz/adblocker-electron@1.25.2": - version "1.25.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz#1b0ec106cc395f5826d97fcfe8fbe4c333d39695" - integrity sha512-GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ== - dependencies: - "@cliqz/adblocker" "^1.25.2" - "@cliqz/adblocker-electron-preload" "^1.25.2" - tldts-experimental "^5.6.21" - -"@cliqz/adblocker-extended-selectors@^1.25.2": - version "1.25.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz#77256c148b1f0a6792c1adad9e8b246cde65b37d" - integrity sha512-acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ== - -"@cliqz/adblocker@^1.25.2": - version "1.25.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz#f2bd7c48afa650f887ac59a9950bfb220ea8cc52" - integrity sha512-wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw== - dependencies: - "@cliqz/adblocker-content" "^1.25.2" - "@cliqz/adblocker-extended-selectors" "^1.25.2" - "@remusao/guess-url-type" "^1.1.2" - "@remusao/small" "^1.1.2" - "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.206" - "@types/firefox-webext-browser" "^94.0.0" - tldts-experimental "^5.6.21" - -"@develar/schema-utils@~2.6.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" - integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== - dependencies: - ajv "^6.12.0" - ajv-keywords "^3.4.1" - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@electron/asar@^3.2.1": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e" - integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - -"@electron/get@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" - integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^11.8.5" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - -"@electron/notarize@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644" - integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.1" - -"@electron/osx-sign@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" - integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g== - dependencies: - compare-version "^0.1.2" - debug "^4.3.4" - fs-extra "^10.0.0" - isbinaryfile "^4.0.8" - minimist "^1.2.6" - plist "^3.0.5" - -"@electron/rebuild@^3.2.10": - version "3.2.10" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6" - integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg== - dependencies: - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.1.1" - detect-libc "^2.0.1" - fs-extra "^10.0.0" - got "^11.7.0" - lzma-native "^8.0.5" - node-abi "^3.0.0" - node-api-version "^0.1.4" - node-gyp "^9.0.0" - ora "^5.1.0" - semver "^7.3.5" - tar "^6.0.5" - yargs "^17.0.1" - -"@electron/universal@1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777" - integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg== - dependencies: - "@electron/asar" "^3.2.1" - "@malept/cross-spawn-promise" "^1.1.0" - debug "^4.3.1" - dir-compare "^3.0.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" - -"@eslint/eslintrc@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" - integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.4.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@gar/promisify@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" - integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== - -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== - dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== - -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" - integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - get-package-type "^0.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== - -"@jest/console@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583" - integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg== - dependencies: - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^29.3.1" - jest-util "^29.3.1" - slash "^3.0.0" - -"@jest/core@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1" - integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw== - dependencies: - "@jest/console" "^29.3.1" - "@jest/reporters" "^29.3.1" - "@jest/test-result" "^29.3.1" - "@jest/transform" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - ci-info "^3.2.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-changed-files "^29.2.0" - jest-config "^29.3.1" - jest-haste-map "^29.3.1" - jest-message-util "^29.3.1" - jest-regex-util "^29.2.0" - jest-resolve "^29.3.1" - jest-resolve-dependencies "^29.3.1" - jest-runner "^29.3.1" - jest-runtime "^29.3.1" - jest-snapshot "^29.3.1" - jest-util "^29.3.1" - jest-validate "^29.3.1" - jest-watcher "^29.3.1" - micromatch "^4.0.4" - pretty-format "^29.3.1" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6" - integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag== - dependencies: - "@jest/fake-timers" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - jest-mock "^29.3.1" - -"@jest/expect-utils@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6" - integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g== - dependencies: - jest-get-type "^29.2.0" - -"@jest/expect@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd" - integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg== - dependencies: - expect "^29.3.1" - jest-snapshot "^29.3.1" - -"@jest/fake-timers@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67" - integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A== - dependencies: - "@jest/types" "^29.3.1" - "@sinonjs/fake-timers" "^9.1.2" - "@types/node" "*" - jest-message-util "^29.3.1" - jest-mock "^29.3.1" - jest-util "^29.3.1" - -"@jest/globals@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6" - integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q== - dependencies: - "@jest/environment" "^29.3.1" - "@jest/expect" "^29.3.1" - "@jest/types" "^29.3.1" - jest-mock "^29.3.1" - -"@jest/reporters@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310" - integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^29.3.1" - "@jest/test-result" "^29.3.1" - "@jest/transform" "^29.3.1" - "@jest/types" "^29.3.1" - "@jridgewell/trace-mapping" "^0.3.15" - "@types/node" "*" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^5.1.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.1.3" - jest-message-util "^29.3.1" - jest-util "^29.3.1" - jest-worker "^29.3.1" - slash "^3.0.0" - string-length "^4.0.1" - strip-ansi "^6.0.0" - v8-to-istanbul "^9.0.1" - -"@jest/schemas@^29.0.0": - version "29.0.0" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" - integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== - dependencies: - "@sinclair/typebox" "^0.24.1" - -"@jest/source-map@^29.2.0": - version "29.2.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744" - integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.15" - callsites "^3.0.0" - graceful-fs "^4.2.9" - -"@jest/test-result@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50" - integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw== - dependencies: - "@jest/console" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d" - integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA== - dependencies: - "@jest/test-result" "^29.3.1" - graceful-fs "^4.2.9" - jest-haste-map "^29.3.1" - slash "^3.0.0" - -"@jest/transform@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d" - integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^29.3.1" - "@jridgewell/trace-mapping" "^0.3.15" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^2.0.0" - fast-json-stable-stringify "^2.1.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.3.1" - jest-regex-util "^29.2.0" - jest-util "^29.3.1" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - write-file-atomic "^4.0.1" - -"@jest/types@^29.3.1": - version "29.3.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3" - integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - -"@malept/cross-spawn-promise@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" - integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== - dependencies: - cross-spawn "^7.0.1" - -"@malept/flatpak-bundler@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" - integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.0" - lodash "^4.17.15" - tmp-promise "^3.0.2" - -"@mozilla/readability@0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz#a425f3dccdbe777d45a4e791bd703ebe633ebb87" - integrity sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw== - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@npmcli/fs@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" - integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== - dependencies: - "@gar/promisify" "^1.1.3" - semver "^7.3.5" - -"@npmcli/move-file@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" - integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@remusao/guess-url-type@^1.1.2": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" - integrity sha512-rbOqre2jW8STjheOsOaQHLgYBaBZ9Owbdt8NO7WvNZftJlaG3y/K9oOkl8ZUpuFBisIhmBuMEW6c+YrQl5inRA== - -"@remusao/small@^1.1.2": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.1.tgz#63bfe4548832289f94ac868a0c305970c9a0e5f9" - integrity sha512-7MjoGt0TJMVw1GPKgWq6SJPws1SLsUXQRa43Umht+nkyw2jnpy3WpiLNqGdwo5rHr5Wp9B2W/Pm5RQp656UJdw== - -"@remusao/smaz-compress@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.1.tgz#fc75eaf9bcac2d58bc4c3d518183a7cb9612d275" - integrity sha512-E2f48TwloQu3r6BdLOGF2aczeH7bJ/32oJGqvzT9SKur0cuUnLcZ7ZXP874E2fwmdE+cXzfC7bKzp79cDnmeyw== - dependencies: - "@remusao/trie" "^1.4.1" - -"@remusao/smaz-decompress@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.1.tgz#8094f997e8fb591a678cda9cf08c209c825eba5b" - integrity sha512-TfjKKprYe3n47od8auhvJ/Ikj9kQTbDTe71ynKlxslrvvUhlIV3VQSuwYuMWMbdz1fIs0H/fxCN1Z8/H3km6/A== - -"@remusao/smaz@^1.7.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.1.tgz#a2b9b045385f81e1615a68d932b7cc8b04c9db8d" - integrity sha512-e6BLuP8oaXCZ9+v46Is4ilAZ/Vq6YLgmBP204Ixgk1qTjXmqvFYG7+AS7v9nsZdGOy96r9DWGFbbDVgMxwu1rA== - dependencies: - "@remusao/smaz-compress" "^1.9.1" - "@remusao/smaz-decompress" "^1.9.1" - -"@remusao/trie@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz#755d09f8a007476334e611f42719b2d581f00720" - integrity sha512-yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q== - -"@sinclair/typebox@^0.24.1": - version "0.24.51" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" - integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== - -"@sindresorhus/is@^4.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" - integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== - -"@sinonjs/commons@^1.7.0": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" - integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^9.1.2": - version "9.1.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" - integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== - dependencies: - "@sinonjs/commons" "^1.7.0" - -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@types/babel__core@^7.1.14": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" - integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== - dependencies: - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.6.4" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" - integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" - integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.18.3" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" - integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== - dependencies: - "@babel/types" "^7.3.0" - -"@types/cacheable-request@^6.0.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" - integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "^3.1.4" - "@types/node" "*" - "@types/responselike" "^1.0.0" - -"@types/chrome@^0.0.206": - version "0.0.206" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz#ad1fd9799f368b5993d7c240492d4adaf5efbd8c" - integrity sha512-fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg== - dependencies: - "@types/filesystem" "*" - "@types/har-format" "*" - -"@types/debug@^4.1.6": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== - dependencies: - "@types/ms" "*" - -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" - integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - -"@types/filesystem@*": - version "0.0.32" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf" - integrity sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ== - dependencies: - "@types/filewriter" "*" - -"@types/filewriter@*": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz#a48795ecadf957f6c0d10e0c34af86c098fa5bee" - integrity sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ== - -"@types/firefox-webext-browser@^94.0.0": - version "94.0.1" - resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-94.0.1.tgz#52afb975253dc0fd350d5d58c7fe9fd1a01f64a1" - integrity sha512-I6iHRQJSTZ+gYt2IxdH2RRAMvcUyK8v5Ig7fHQR0IwUNYP7hz9+cziBVIKxLCO6XI7fiyRsNOWObfl3/4Js2Lg== - -"@types/fs-extra@^9.0.11": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - -"@types/graceful-fs@^4.1.3": - version "4.1.6" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" - integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== - dependencies: - "@types/node" "*" - -"@types/har-format@*": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz#7b4e1e0ada4d17684ac3b05d601a4871cfab11fc" - integrity sha512-o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg== - -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" - integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jsdom@^20.0.0": - version "20.0.1" - resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" - integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== - dependencies: - "@types/node" "*" - "@types/tough-cookie" "*" - parse5 "^7.0.0" - -"@types/json-schema@*", "@types/json-schema@^7.0.8": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/keyv@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" - integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== - dependencies: - "@types/node" "*" - -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - -"@types/ms@*": - version "0.7.31" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" - integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== - -"@types/node@*", "@types/node@^16.11.26": - version "16.18.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz#cbb15c12ca7c16c85a72b6bdc4d4b01151bb3cae" - integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA== - -"@types/plist@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" - integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== - dependencies: - "@types/node" "*" - xmlbuilder ">=11.0.1" - -"@types/prettier@^2.1.5": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" - integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== - -"@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - -"@types/stack-utils@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" - integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== - -"@types/tough-cookie@*": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" - integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== - -"@types/verror@^1.10.3": - version "1.10.6" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" - integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.16", "@types/yargs@^17.0.8": - version "17.0.20" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz#107f0fcc13bd4a524e352b41c49fe88aab5c54d5" - integrity sha512-eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A== - dependencies: - "@types/yargs-parser" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" - integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== - -"@webpack-cli/info@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" - integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== - -"@webpack-cli/serve@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" - integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -abbrev@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -acorn-globals@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" - integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== - dependencies: - acorn "^8.1.0" - acorn-walk "^8.0.2" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn-walk@^8.0.2: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== - -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -agentkeepalive@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" - integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== - dependencies: - debug "^4.1.0" - depd "^1.1.2" - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - -anymatch@^3.0.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== - -app-builder-lib@24.0.0-alpha.10: - version "24.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz#244803adf93a6279dab09bc8d278c06ebc4f91b4" - integrity sha512-gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg== - dependencies: - "7zip-bin" "~5.1.1" - "@develar/schema-utils" "~2.6.5" - "@electron/notarize" "^1.2.3" - "@electron/osx-sign" "^1.0.4" - "@electron/rebuild" "^3.2.10" - "@electron/universal" "1.3.4" - "@malept/flatpak-bundler" "^0.4.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "24.0.0-alpha.8" - builder-util-runtime "9.2.0-alpha.2" - chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.8" - electron-publish "24.0.0-alpha.8" - form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" - is-ci "^3.0.0" - isbinaryfile "^5.0.0" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - minimatch "^5.1.1" - read-config-file "6.3.2" - sanitize-filename "^1.6.3" - semver "^7.3.8" - tar "^6.1.12" - temp-file "^3.4.0" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" - integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-exit-hook@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" - integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== - -async@^3.2.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" - integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -babel-jest@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44" - integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA== - dependencies: - "@jest/transform" "^29.3.1" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.2.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-plugin-istanbul@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094" - integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.1.14" - "@types/babel__traverse" "^7.0.6" - -babel-preset-current-node-syntax@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" - -babel-preset-jest@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc" - integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA== - dependencies: - babel-plugin-jest-hoist "^29.2.0" - babel-preset-current-node-syntax "^1.0.0" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bl@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bluebird-lst@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" - integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== - dependencies: - bluebird "^3.5.5" - -bluebird@^3.5.5: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.14.5, browserslist@^4.21.3: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== - dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" - -bser@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" - integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== - dependencies: - node-int64 "^0.4.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - -buffer-equal@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" - integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.1.0, buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builder-util-runtime@9.2.0-alpha.2: - version "9.2.0-alpha.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz#771a2787b247a15297377de23a916e9fc91050e6" - integrity sha512-MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - -builder-util@24.0.0-alpha.8: - version "24.0.0-alpha.8" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz#501de9052228ca8f87d43b53c01009dd069ad466" - integrity sha512-18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg== - dependencies: - "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" - bluebird-lst "^1.0.9" - builder-util-runtime "9.2.0-alpha.2" - chalk "^4.1.2" - cross-spawn "^7.0.3" - debug "^4.3.4" - fs-extra "^10.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-ci "^3.0.0" - js-yaml "^4.1.0" - source-map-support "^0.5.19" - stat-mode "^1.0.0" - temp-file "^3.4.0" - -cacache@^16.1.0: - version "16.1.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" - integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== - dependencies: - "@npmcli/fs" "^2.1.0" - "@npmcli/move-file" "^2.0.0" - chownr "^2.0.0" - fs-minipass "^2.1.0" - glob "^8.0.1" - infer-owner "^1.0.4" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - mkdirp "^1.0.4" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^9.0.0" - tar "^6.1.11" - unique-filename "^2.0.0" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - -cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^4.0.0" - lowercase-keys "^2.0.0" - normalize-url "^6.0.1" - responselike "^2.0.0" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -caniuse-lite@^1.0.30001400: - version "1.0.30001446" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz#6d4ba828ab19f49f9bcd14a8430d30feebf1e0c5" - integrity sha512-fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -char-regex@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== - -ci-info@^3.2.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" - integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== - -cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinners@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone-response@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" - integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== - dependencies: - mimic-response "^1.0.0" - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== - -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" - integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -colorette@^2.0.14: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -commander@^9.4.1: - version "9.5.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" - integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== - -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -config-file-ts@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99" - integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ== - dependencies: - glob "^7.1.6" - typescript "^4.0.2" - -console-control-strings@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - -convert-source-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" - integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - -crc@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== - dependencies: - buffer "^5.1.0" - -cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -cssom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" - integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - -darkreader@4.9.58: - version "4.9.58" - resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz#6544d6cb51fa643dc7995d128d32b357e1650e49" - integrity sha512-D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ== - -data-urls@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" - integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== - dependencies: - abab "^2.0.6" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -decimal.js@^10.4.2: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== - -deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -defaults@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" - integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== - dependencies: - clone "^1.0.2" - -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - -define-properties@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - -depd@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -detect-libc@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" - integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== - -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -diff-sequences@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" - integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== - -dir-compare@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" - integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== - dependencies: - buffer-equal "^1.0.0" - minimatch "^3.0.4" - -dmg-builder@24.0.0-alpha.10: - version "24.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz#74b3e03c220486ad8a04ad9b8aac6ca6074ceef3" - integrity sha512-kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg== - dependencies: - app-builder-lib "24.0.0-alpha.10" - builder-util "24.0.0-alpha.8" - builder-util-runtime "9.2.0-alpha.2" - fs-extra "^10.1.0" - iconv-lite "^0.6.2" - js-yaml "^4.1.0" - optionalDependencies: - dmg-license "^1.0.11" - -dmg-license@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" - integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== - dependencies: - "@types/plist" "^3.0.1" - "@types/verror" "^1.10.3" - ajv "^6.10.0" - crc "^3.8.0" - iconv-corefoundation "^1.1.7" - plist "^3.0.4" - smart-buffer "^4.0.2" - verror "^1.10.0" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -domexception@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" - integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== - dependencies: - webidl-conversions "^7.0.0" - -dotenv-expand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" - integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== - -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== - -ejs@^3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== - dependencies: - jake "^10.8.5" - -electron-builder@24.0.0-alpha.10: - version "24.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz#1713da06493bffd02e76a6809b1e7147e0a4339c" - integrity sha512-10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA== - dependencies: - "@types/yargs" "^17.0.16" - app-builder-lib "24.0.0-alpha.10" - builder-util "24.0.0-alpha.8" - builder-util-runtime "9.2.0-alpha.2" - chalk "^4.1.2" - dmg-builder "24.0.0-alpha.10" - fs-extra "^10.1.0" - is-ci "^3.0.0" - lazy-val "^1.0.5" - read-config-file "6.3.2" - simple-update-notifier "^1.1.0" - yargs "^17.6.2" - -electron-publish@24.0.0-alpha.8: - version "24.0.0-alpha.8" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz#d2326a33938ddc73bab83f149dbd9bab67b85804" - integrity sha512-DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ== - dependencies: - "@types/fs-extra" "^9.0.11" - builder-util "24.0.0-alpha.8" - builder-util-runtime "9.2.0-alpha.2" - chalk "^4.1.2" - fs-extra "^10.1.0" - lazy-val "^1.0.5" - mime "^2.5.2" - -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -electron@22.0.3: - version "22.0.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d" - integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g== - dependencies: - "@electron/get" "^2.0.0" - "@types/node" "^16.11.26" - extract-zip "^2.0.1" - -emittery@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" - integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -encoding@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -entities@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-plugin-sort-keys@2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-sort-keys/-/eslint-plugin-sort-keys-2.3.5.tgz#f28d5cd2f5ee0fc5192f5ff879f56f8516aac57b" - integrity sha512-2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg== - dependencies: - natural-compare "1.4.0" - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== - -eslint@8.32.0: - version "8.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" - integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== - dependencies: - "@eslint/eslintrc" "^1.4.1" - "@humanwhocodes/config-array" "^0.11.8" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.4.0" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-sdsl "^4.1.4" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.1" - regexpp "^3.2.0" - strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" - text-table "^0.2.0" - -espree@^9.4.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" - integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== - dependencies: - acorn "^8.8.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== - -expect@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6" - integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA== - dependencies: - "@jest/expect-utils" "^29.3.1" - jest-get-type "^29.2.0" - jest-matcher-utils "^29.3.1" - jest-message-util "^29.3.1" - jest-util "^29.3.1" - -extract-zip@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== - dependencies: - reusify "^1.0.4" - -fb-watchman@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" - integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== - dependencies: - bser "2.1.1" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -filelist@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatted@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0, fs-minipass@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gauge@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" - integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-package-type@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" - integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^8.0.1: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - dependencies: - boolean "^3.0.1" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.19.0: - version "13.19.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" - integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -got@^11.7.0, got@^11.8.5: - version "11.8.6" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" - integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== - dependencies: - "@sindresorhus/is" "^4.0.0" - "@szmarczak/http-timer" "^4.0.5" - "@types/cacheable-request" "^6.0.1" - "@types/responselike" "^1.0.0" - cacheable-lookup "^5.0.3" - cacheable-request "^7.0.2" - decompress-response "^6.0.0" - http2-wrapper "^1.0.0-beta.5.2" - lowercase-keys "^2.0.0" - p-cancelable "^2.0.0" - responselike "^2.0.0" - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -highlight.js@11.7.0: - version "11.7.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz#3ff0165bc843f8c9bce1fd89e2fda9143d24b11e" - integrity sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ== - -hosted-git-info@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -html-encoding-sniffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" - integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== - dependencies: - whatwg-encoding "^2.0.0" - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - -iconv-corefoundation@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" - integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== - dependencies: - cli-truncate "^2.1.0" - node-addon-api "^1.6.3" - -iconv-lite@0.6.3, iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^5.2.0: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -interpret@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" - integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== - -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-ci@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" - integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== - dependencies: - ci-info "^3.2.0" - -is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-generator-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" - integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== - -is-glob@^4.0.0, is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -isbinaryfile@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isbinaryfile@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" - integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" - integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== - -istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" - integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" - integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" - integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - -jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" - -jest-changed-files@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289" - integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA== - dependencies: - execa "^5.0.0" - p-limit "^3.1.0" - -jest-circus@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a" - integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg== - dependencies: - "@jest/environment" "^29.3.1" - "@jest/expect" "^29.3.1" - "@jest/test-result" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^0.7.0" - is-generator-fn "^2.0.0" - jest-each "^29.3.1" - jest-matcher-utils "^29.3.1" - jest-message-util "^29.3.1" - jest-runtime "^29.3.1" - jest-snapshot "^29.3.1" - jest-util "^29.3.1" - p-limit "^3.1.0" - pretty-format "^29.3.1" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-cli@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d" - integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ== - dependencies: - "@jest/core" "^29.3.1" - "@jest/test-result" "^29.3.1" - "@jest/types" "^29.3.1" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - import-local "^3.0.2" - jest-config "^29.3.1" - jest-util "^29.3.1" - jest-validate "^29.3.1" - prompts "^2.0.1" - yargs "^17.3.1" - -jest-config@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6" - integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg== - dependencies: - "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^29.3.1" - "@jest/types" "^29.3.1" - babel-jest "^29.3.1" - chalk "^4.0.0" - ci-info "^3.2.0" - deepmerge "^4.2.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-circus "^29.3.1" - jest-environment-node "^29.3.1" - jest-get-type "^29.2.0" - jest-regex-util "^29.2.0" - jest-resolve "^29.3.1" - jest-runner "^29.3.1" - jest-util "^29.3.1" - jest-validate "^29.3.1" - micromatch "^4.0.4" - parse-json "^5.2.0" - pretty-format "^29.3.1" - slash "^3.0.0" - strip-json-comments "^3.1.1" - -jest-diff@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527" - integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.3.1" - jest-get-type "^29.2.0" - pretty-format "^29.3.1" - -jest-docblock@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82" - integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A== - dependencies: - detect-newline "^3.0.0" - -jest-each@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132" - integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA== - dependencies: - "@jest/types" "^29.3.1" - chalk "^4.0.0" - jest-get-type "^29.2.0" - jest-util "^29.3.1" - pretty-format "^29.3.1" - -jest-environment-jsdom@29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639" - integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA== - dependencies: - "@jest/environment" "^29.3.1" - "@jest/fake-timers" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/jsdom" "^20.0.0" - "@types/node" "*" - jest-mock "^29.3.1" - jest-util "^29.3.1" - jsdom "^20.0.0" - -jest-environment-node@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74" - integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag== - dependencies: - "@jest/environment" "^29.3.1" - "@jest/fake-timers" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - jest-mock "^29.3.1" - jest-util "^29.3.1" - -jest-get-type@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" - integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== - -jest-haste-map@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843" - integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A== - dependencies: - "@jest/types" "^29.3.1" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^29.2.0" - jest-util "^29.3.1" - jest-worker "^29.3.1" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.2" - -jest-leak-detector@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518" - integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA== - dependencies: - jest-get-type "^29.2.0" - pretty-format "^29.3.1" - -jest-matcher-utils@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572" - integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ== - dependencies: - chalk "^4.0.0" - jest-diff "^29.3.1" - jest-get-type "^29.2.0" - pretty-format "^29.3.1" - -jest-message-util@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb" - integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.3.1" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.3.1" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-mock@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e" - integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA== - dependencies: - "@jest/types" "^29.3.1" - "@types/node" "*" - jest-util "^29.3.1" - -jest-pnp-resolver@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" - integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== - -jest-regex-util@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b" - integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA== - -jest-resolve-dependencies@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf" - integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA== - dependencies: - jest-regex-util "^29.2.0" - jest-snapshot "^29.3.1" - -jest-resolve@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7" - integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw== - dependencies: - chalk "^4.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.3.1" - jest-pnp-resolver "^1.2.2" - jest-util "^29.3.1" - jest-validate "^29.3.1" - resolve "^1.20.0" - resolve.exports "^1.1.0" - slash "^3.0.0" - -jest-runner@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d" - integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA== - dependencies: - "@jest/console" "^29.3.1" - "@jest/environment" "^29.3.1" - "@jest/test-result" "^29.3.1" - "@jest/transform" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.13.1" - graceful-fs "^4.2.9" - jest-docblock "^29.2.0" - jest-environment-node "^29.3.1" - jest-haste-map "^29.3.1" - jest-leak-detector "^29.3.1" - jest-message-util "^29.3.1" - jest-resolve "^29.3.1" - jest-runtime "^29.3.1" - jest-util "^29.3.1" - jest-watcher "^29.3.1" - jest-worker "^29.3.1" - p-limit "^3.1.0" - source-map-support "0.5.13" - -jest-runtime@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a" - integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A== - dependencies: - "@jest/environment" "^29.3.1" - "@jest/fake-timers" "^29.3.1" - "@jest/globals" "^29.3.1" - "@jest/source-map" "^29.2.0" - "@jest/test-result" "^29.3.1" - "@jest/transform" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - cjs-module-lexer "^1.0.0" - collect-v8-coverage "^1.0.0" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-haste-map "^29.3.1" - jest-message-util "^29.3.1" - jest-mock "^29.3.1" - jest-regex-util "^29.2.0" - jest-resolve "^29.3.1" - jest-snapshot "^29.3.1" - jest-util "^29.3.1" - slash "^3.0.0" - strip-bom "^4.0.0" - -jest-snapshot@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e" - integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA== - dependencies: - "@babel/core" "^7.11.6" - "@babel/generator" "^7.7.2" - "@babel/plugin-syntax-jsx" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/traverse" "^7.7.2" - "@babel/types" "^7.3.3" - "@jest/expect-utils" "^29.3.1" - "@jest/transform" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/babel__traverse" "^7.0.6" - "@types/prettier" "^2.1.5" - babel-preset-current-node-syntax "^1.0.0" - chalk "^4.0.0" - expect "^29.3.1" - graceful-fs "^4.2.9" - jest-diff "^29.3.1" - jest-get-type "^29.2.0" - jest-haste-map "^29.3.1" - jest-matcher-utils "^29.3.1" - jest-message-util "^29.3.1" - jest-util "^29.3.1" - natural-compare "^1.4.0" - pretty-format "^29.3.1" - semver "^7.3.5" - -jest-util@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1" - integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ== - dependencies: - "@jest/types" "^29.3.1" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-validate@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a" - integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g== - dependencies: - "@jest/types" "^29.3.1" - camelcase "^6.2.0" - chalk "^4.0.0" - jest-get-type "^29.2.0" - leven "^3.1.0" - pretty-format "^29.3.1" - -jest-watcher@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a" - integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg== - dependencies: - "@jest/test-result" "^29.3.1" - "@jest/types" "^29.3.1" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - emittery "^0.13.1" - jest-util "^29.3.1" - string-length "^4.0.1" - -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest-worker@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b" - integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw== - dependencies: - "@types/node" "*" - jest-util "^29.3.1" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest@29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122" - integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA== - dependencies: - "@jest/core" "^29.3.1" - "@jest/types" "^29.3.1" - import-local "^3.0.2" - jest-cli "^29.3.1" - -js-sdsl@^4.1.4: - version "4.3.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" - integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsdom@21.0.0: - version "21.0.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" - integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== - dependencies: - abab "^2.0.6" - acorn "^8.8.1" - acorn-globals "^7.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.2" - decimal.js "^10.4.2" - domexception "^4.0.0" - escodegen "^2.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" - parse5 "^7.1.1" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - ws "^8.11.0" - xml-name-validator "^4.0.0" - -jsdom@^20.0.0: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== - dependencies: - abab "^2.0.6" - acorn "^8.8.1" - acorn-globals "^7.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.2" - decimal.js "^10.4.2" - domexception "^4.0.0" - escodegen "^2.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" - parse5 "^7.1.1" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - ws "^8.11.0" - xml-name-validator "^4.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -json5@^2.2.0, json5@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== - dependencies: - json-buffer "3.0.1" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== - -lazy-val@^1.0.4, lazy-val@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" - integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== - -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash@^4.17.15: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lru-cache@^7.7.1: - version "7.14.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" - integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== - -lzma-native@^8.0.5: - version "8.0.6" - resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665" - integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA== - dependencies: - node-addon-api "^3.1.0" - node-gyp-build "^4.2.1" - readable-stream "^3.6.0" - -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-fetch-happen@^10.0.3: - version "10.2.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" - integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== - dependencies: - agentkeepalive "^4.2.1" - cacache "^16.1.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-fetch "^2.0.3" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - promise-retry "^2.0.1" - socks-proxy-agent "^7.0.0" - ssri "^9.0.0" - -makeerror@1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" - integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== - dependencies: - tmpl "1.0.5" - -marked@4.2.12: - version "4.2.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" - integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12, mime-types@^2.1.27: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@^2.5.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^5.0.1, minimatch@^5.1.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== - -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-fetch@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" - integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== - dependencies: - minipass "^3.1.6" - minipass-sized "^1.0.3" - minizlib "^2.1.2" - optionalDependencies: - encoding "^0.1.13" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" - integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== - dependencies: - yallist "^4.0.0" - -minipass@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" - integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== - dependencies: - yallist "^4.0.0" - -minizlib@^2.1.1, minizlib@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -ms@2.1.2, ms@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -natural-compare@1.4.0, natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -negotiator@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -node-abi@^3.0.0: - version "3.31.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" - integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== - dependencies: - semver "^7.3.5" - -node-addon-api@^1.6.3: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" - integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== - -node-addon-api@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-api-version@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" - integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== - dependencies: - semver "^7.3.5" - -node-gyp-build@^4.2.1: - version "4.6.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" - integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== - -node-gyp@^9.0.0: - version "9.3.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" - integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^10.0.3" - nopt "^6.0.0" - npmlog "^6.0.0" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== - -node-releases@^2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" - integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== - -nopt@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" - integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== - dependencies: - abbrev "^1.0.0" - -normalize-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" - integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== - dependencies: - are-we-there-yet "^3.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.3" - set-blocking "^2.0.0" - -nwsapi@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" - integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -ora@^5.1.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@^7.0.0, parse5@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== - dependencies: - entities "^4.4.0" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pirates@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -plist@^3.0.4, plist@^3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" - integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^15.1.1" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - -pretty-format@^29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da" - integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg== - dependencies: - "@jest/schemas" "^29.0.0" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - -prompts@^2.0.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" - integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== - dependencies: - kleur "^3.0.3" - sisteransi "^1.0.5" - -psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - -read-config-file@6.3.2: - version "6.3.2" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" - integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== - dependencies: - config-file-ts "^0.2.4" - dotenv "^9.0.2" - dotenv-expand "^5.1.0" - js-yaml "^4.1.0" - json5 "^2.2.0" - lazy-val "^1.0.4" - -readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -rechoir@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" - integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== - dependencies: - resolve "^1.20.0" - -regexpp@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve.exports@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" - integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== - -resolve@^1.20.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -responselike@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" - integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== - dependencies: - lowercase-keys "^2.0.0" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@^3.0.0, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -"safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -saxes@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" - integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== - dependencies: - xmlchars "^2.2.0" - -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - -semver@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== - dependencies: - randombytes "^2.1.0" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -simple-update-notifier@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" - integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== - dependencies: - semver "~7.0.0" - -sisteransi@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -smart-buffer@^4.0.2, smart-buffer@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -socks-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" - integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== - dependencies: - ip "^2.0.0" - smart-buffer "^4.2.0" - -source-map-support@0.5.13: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.19, source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== - -ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== - dependencies: - minipass "^3.1.1" - -stack-utils@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" - integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== - dependencies: - escape-string-regexp "^2.0.0" - -stat-mode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" - integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== - -string-length@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" - integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== - dependencies: - char-regex "^1.0.2" - strip-ansi "^6.0.0" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^4.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp-file@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" - integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== - dependencies: - async-exit-hook "^2.0.1" - fs-extra "^10.0.0" - -terser-webpack-plugin@5.3.6, terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser@^5.14.1: - version "5.16.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880" - integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -tldts-core@^5.7.104: - version "5.7.104" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz#4313a9663e4085332750a5fb04bfa0b0d91b826d" - integrity sha512-8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ== - -tldts-experimental@^5.6.21: - version "5.7.104" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz#f23e526240f674039857b653361f5da549dae758" - integrity sha512-GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA== - dependencies: - tldts-core "^5.7.104" - -tmp-promise@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" - integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== - dependencies: - tmp "^0.2.0" - -tmp@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -tmpl@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - -tr46@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" - integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== - dependencies: - punycode "^2.1.1" - -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== - dependencies: - utf8-byte-length "^1.0.1" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - -type-detect@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -typescript@^4.0.2: - version "4.9.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" - integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== - -unique-filename@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" - integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== - dependencies: - unique-slug "^3.0.0" - -unique-slug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" - integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== - dependencies: - imurmurhash "^0.1.4" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -update-browserslist-db@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== - -util-deprecate@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -v8-to-istanbul@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" - integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== - dependencies: - "@jridgewell/trace-mapping" "^0.3.12" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - -verror@^1.10.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" - integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -w3c-xmlserializer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" - integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== - dependencies: - xml-name-validator "^4.0.0" - -walker@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" - integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== - dependencies: - makeerror "1.0.12" - -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== - dependencies: - defaults "^1.0.3" - -webidl-conversions@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" - integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== - -webpack-cli@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" - integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.0.1" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.1" - colorette "^2.0.14" - commander "^9.4.1" - cross-spawn "^7.0.3" - envinfo "^7.7.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^3.1.1" - rechoir "^0.8.0" - webpack-merge "^5.7.3" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-node-externals@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" - integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ== - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@5.75.0: - version "5.75.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" - integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -whatwg-encoding@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" - integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== - dependencies: - iconv-lite "0.6.3" - -whatwg-mimetype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" - integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== - -whatwg-url@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" - integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - -which@^2.0.1, which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -write-file-atomic@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" - integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - -ws@^8.11.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== - -xml-name-validator@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" - integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== - -xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2: - version "17.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix deleted file mode 100644 index eaf66d689df..00000000000 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ /dev/null @@ -1,5557 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; - }; - } - { - name = "_ampproject_remapping___remapping_2.2.0.tgz"; - path = fetchurl { - name = "_ampproject_remapping___remapping_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz"; - sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; - }; - } - { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - } - { - name = "_babel_compat_data___compat_data_7.20.10.tgz"; - path = fetchurl { - name = "_babel_compat_data___compat_data_7.20.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; - }; - } - { - name = "_babel_core___core_7.20.12.tgz"; - path = fetchurl { - name = "_babel_core___core_7.20.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz"; - sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; - }; - } - { - name = "_babel_generator___generator_7.20.7.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; - sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; - }; - } - { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; - }; - } - { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - } - { - name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; - }; - } - { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; - path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; - sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; - }; - } - { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; - path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; - sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.20.2.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.20.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; - sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - } - { - name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; - path = fetchurl { - name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; - sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - } - { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; - }; - } - { - name = "_babel_helpers___helpers_7.20.7.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; - }; - } - { - name = "_babel_highlight___highlight_7.18.6.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - } - { - name = "_babel_parser___parser_7.20.7.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; - }; - } - { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - } - { - name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; - sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; - }; - } - { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - } - { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; - sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; - }; - } - { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - } - { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; - sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; - }; - } - { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - } - { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - } - { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - } - { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - } - { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - } - { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - } - { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - } - { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"; - sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; - }; - } - { - name = "_babel_template___template_7.20.7.tgz"; - path = fetchurl { - name = "_babel_template___template_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; - sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; - }; - } - { - name = "_babel_traverse___traverse_7.20.12.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.20.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; - }; - } - { - name = "_babel_types___types_7.20.7.tgz"; - path = fetchurl { - name = "_babel_types___types_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; - }; - } - { - name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; - path = fetchurl { - name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; - sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; - }; - } - { - name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz"; - sha512 = "Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ=="; - }; - } - { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz"; - sha512 = "d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g=="; - }; - } - { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz"; - sha512 = "GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ=="; - }; - } - { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz"; - sha512 = "acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ=="; - }; - } - { - name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; - path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz"; - sha512 = "wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw=="; - }; - } - { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - path = fetchurl { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; - }; - } - { - name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; - path = fetchurl { - name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; - sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; - }; - } - { - name = "_electron_asar___asar_3.2.3.tgz"; - path = fetchurl { - name = "_electron_asar___asar_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz"; - sha512 = "wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg=="; - }; - } - { - name = "_electron_get___get_2.0.2.tgz"; - path = fetchurl { - name = "_electron_get___get_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; - sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; - }; - } - { - name = "_electron_notarize___notarize_1.2.3.tgz"; - path = fetchurl { - name = "_electron_notarize___notarize_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz"; - sha512 = "9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ=="; - }; - } - { - name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; - path = fetchurl { - name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; - sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; - }; - } - { - name = "_electron_rebuild___rebuild_3.2.10.tgz"; - path = fetchurl { - name = "_electron_rebuild___rebuild_3.2.10.tgz"; - url = "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz"; - sha512 = "SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg=="; - }; - } - { - name = "_electron_universal___universal_1.3.4.tgz"; - path = fetchurl { - name = "_electron_universal___universal_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz"; - sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; - }; - } - { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; - sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; - }; - } - { - name = "_gar_promisify___promisify_1.1.3.tgz"; - path = fetchurl { - name = "_gar_promisify___promisify_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz"; - sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; - }; - } - { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; - sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; - }; - } - { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; - sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; - }; - } - { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - } - { - name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; - path = fetchurl { - name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; - }; - } - { - name = "_istanbuljs_schema___schema_0.1.3.tgz"; - path = fetchurl { - name = "_istanbuljs_schema___schema_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz"; - sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; - }; - } - { - name = "_jest_console___console_29.3.1.tgz"; - path = fetchurl { - name = "_jest_console___console_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz"; - sha512 = "IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg=="; - }; - } - { - name = "_jest_core___core_29.3.1.tgz"; - path = fetchurl { - name = "_jest_core___core_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz"; - sha512 = "0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw=="; - }; - } - { - name = "_jest_environment___environment_29.3.1.tgz"; - path = fetchurl { - name = "_jest_environment___environment_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz"; - sha512 = "pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag=="; - }; - } - { - name = "_jest_expect_utils___expect_utils_29.3.1.tgz"; - path = fetchurl { - name = "_jest_expect_utils___expect_utils_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz"; - sha512 = "wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g=="; - }; - } - { - name = "_jest_expect___expect_29.3.1.tgz"; - path = fetchurl { - name = "_jest_expect___expect_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz"; - sha512 = "QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg=="; - }; - } - { - name = "_jest_fake_timers___fake_timers_29.3.1.tgz"; - path = fetchurl { - name = "_jest_fake_timers___fake_timers_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz"; - sha512 = "iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A=="; - }; - } - { - name = "_jest_globals___globals_29.3.1.tgz"; - path = fetchurl { - name = "_jest_globals___globals_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz"; - sha512 = "cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q=="; - }; - } - { - name = "_jest_reporters___reporters_29.3.1.tgz"; - path = fetchurl { - name = "_jest_reporters___reporters_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz"; - sha512 = "GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA=="; - }; - } - { - name = "_jest_schemas___schemas_29.0.0.tgz"; - path = fetchurl { - name = "_jest_schemas___schemas_29.0.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz"; - sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA=="; - }; - } - { - name = "_jest_source_map___source_map_29.2.0.tgz"; - path = fetchurl { - name = "_jest_source_map___source_map_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz"; - sha512 = "1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ=="; - }; - } - { - name = "_jest_test_result___test_result_29.3.1.tgz"; - path = fetchurl { - name = "_jest_test_result___test_result_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz"; - sha512 = "qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw=="; - }; - } - { - name = "_jest_test_sequencer___test_sequencer_29.3.1.tgz"; - path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz"; - sha512 = "IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA=="; - }; - } - { - name = "_jest_transform___transform_29.3.1.tgz"; - path = fetchurl { - name = "_jest_transform___transform_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz"; - sha512 = "8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug=="; - }; - } - { - name = "_jest_types___types_29.3.1.tgz"; - path = fetchurl { - name = "_jest_types___types_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz"; - sha512 = "d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA=="; - }; - } - { - name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; - path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; - }; - } - { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; - }; - } - { - name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; - path = fetchurl { - name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - } - { - name = "_jridgewell_set_array___set_array_1.1.2.tgz"; - path = fetchurl { - name = "_jridgewell_set_array___set_array_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - } - { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - } - { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; - path = fetchurl { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - } - { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; - path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; - sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; - }; - } - { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - path = fetchurl { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; - }; - } - { - name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; - path = fetchurl { - name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; - sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; - }; - } - { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - path = fetchurl { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; - }; - } - { - name = "_mozilla_readability___readability_0.4.2.tgz"; - path = fetchurl { - name = "_mozilla_readability___readability_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz"; - sha512 = "48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw=="; - }; - } - { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - } - { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - } - { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - } - { - name = "_npmcli_fs___fs_2.1.2.tgz"; - path = fetchurl { - name = "_npmcli_fs___fs_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz"; - sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; - }; - } - { - name = "_npmcli_move_file___move_file_2.0.1.tgz"; - path = fetchurl { - name = "_npmcli_move_file___move_file_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz"; - sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; - }; - } - { - name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; - path = fetchurl { - name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz"; - sha512 = "rbOqre2jW8STjheOsOaQHLgYBaBZ9Owbdt8NO7WvNZftJlaG3y/K9oOkl8ZUpuFBisIhmBuMEW6c+YrQl5inRA=="; - }; - } - { - name = "_remusao_small___small_1.2.1.tgz"; - path = fetchurl { - name = "_remusao_small___small_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.1.tgz"; - sha512 = "7MjoGt0TJMVw1GPKgWq6SJPws1SLsUXQRa43Umht+nkyw2jnpy3WpiLNqGdwo5rHr5Wp9B2W/Pm5RQp656UJdw=="; - }; - } - { - name = "_remusao_smaz_compress___smaz_compress_1.9.1.tgz"; - path = fetchurl { - name = "_remusao_smaz_compress___smaz_compress_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.1.tgz"; - sha512 = "E2f48TwloQu3r6BdLOGF2aczeH7bJ/32oJGqvzT9SKur0cuUnLcZ7ZXP874E2fwmdE+cXzfC7bKzp79cDnmeyw=="; - }; - } - { - name = "_remusao_smaz_decompress___smaz_decompress_1.9.1.tgz"; - path = fetchurl { - name = "_remusao_smaz_decompress___smaz_decompress_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.1.tgz"; - sha512 = "TfjKKprYe3n47od8auhvJ/Ikj9kQTbDTe71ynKlxslrvvUhlIV3VQSuwYuMWMbdz1fIs0H/fxCN1Z8/H3km6/A=="; - }; - } - { - name = "_remusao_smaz___smaz_1.9.1.tgz"; - path = fetchurl { - name = "_remusao_smaz___smaz_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.1.tgz"; - sha512 = "e6BLuP8oaXCZ9+v46Is4ilAZ/Vq6YLgmBP204Ixgk1qTjXmqvFYG7+AS7v9nsZdGOy96r9DWGFbbDVgMxwu1rA=="; - }; - } - { - name = "_remusao_trie___trie_1.4.1.tgz"; - path = fetchurl { - name = "_remusao_trie___trie_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz"; - sha512 = "yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q=="; - }; - } - { - name = "_sinclair_typebox___typebox_0.24.51.tgz"; - path = fetchurl { - name = "_sinclair_typebox___typebox_0.24.51.tgz"; - url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz"; - sha512 = "1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="; - }; - } - { - name = "_sindresorhus_is___is_4.6.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; - sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; - }; - } - { - name = "_sinonjs_commons___commons_1.8.6.tgz"; - path = fetchurl { - name = "_sinonjs_commons___commons_1.8.6.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz"; - sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; - }; - } - { - name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; - path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"; - sha512 = "BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw=="; - }; - } - { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - path = fetchurl { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; - sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; - }; - } - { - name = "_tootallnate_once___once_2.0.0.tgz"; - path = fetchurl { - name = "_tootallnate_once___once_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - } - { - name = "_types_babel__core___babel__core_7.20.0.tgz"; - path = fetchurl { - name = "_types_babel__core___babel__core_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz"; - sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; - }; - } - { - name = "_types_babel__generator___babel__generator_7.6.4.tgz"; - path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.4.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz"; - sha512 = "tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg=="; - }; - } - { - name = "_types_babel__template___babel__template_7.4.1.tgz"; - path = fetchurl { - name = "_types_babel__template___babel__template_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz"; - sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; - }; - } - { - name = "_types_babel__traverse___babel__traverse_7.18.3.tgz"; - path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.18.3.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"; - sha512 = "1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w=="; - }; - } - { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - path = fetchurl { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; - sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; - }; - } - { - name = "_types_chrome___chrome_0.0.206.tgz"; - path = fetchurl { - name = "_types_chrome___chrome_0.0.206.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz"; - sha512 = "fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg=="; - }; - } - { - name = "_types_debug___debug_4.1.7.tgz"; - path = fetchurl { - name = "_types_debug___debug_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - } - { - name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; - path = fetchurl { - name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; - }; - } - { - name = "_types_eslint___eslint_8.4.10.tgz"; - path = fetchurl { - name = "_types_eslint___eslint_8.4.10.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz"; - sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; - }; - } - { - name = "_types_estree___estree_0.0.51.tgz"; - path = fetchurl { - name = "_types_estree___estree_0.0.51.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - } - { - name = "_types_filesystem___filesystem_0.0.32.tgz"; - path = fetchurl { - name = "_types_filesystem___filesystem_0.0.32.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz"; - sha512 = "Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ=="; - }; - } - { - name = "_types_filewriter___filewriter_0.0.29.tgz"; - path = fetchurl { - name = "_types_filewriter___filewriter_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz"; - sha512 = "BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ=="; - }; - } - { - name = "_types_firefox_webext_browser___firefox_webext_browser_94.0.1.tgz"; - path = fetchurl { - name = "_types_firefox_webext_browser___firefox_webext_browser_94.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-94.0.1.tgz"; - sha512 = "I6iHRQJSTZ+gYt2IxdH2RRAMvcUyK8v5Ig7fHQR0IwUNYP7hz9+cziBVIKxLCO6XI7fiyRsNOWObfl3/4Js2Lg=="; - }; - } - { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; - }; - } - { - name = "_types_glob___glob_7.2.0.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; - }; - } - { - name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; - path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; - }; - } - { - name = "_types_har_format___har_format_1.2.10.tgz"; - path = fetchurl { - name = "_types_har_format___har_format_1.2.10.tgz"; - url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz"; - sha512 = "o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg=="; - }; - } - { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - path = fetchurl { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; - sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; - }; - } - { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; - sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; - }; - } - { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; - }; - } - { - name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; - path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; - sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; - }; - } - { - name = "_types_jsdom___jsdom_20.0.1.tgz"; - path = fetchurl { - name = "_types_jsdom___jsdom_20.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz"; - sha512 = "d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ=="; - }; - } - { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - } - { - name = "_types_keyv___keyv_3.1.4.tgz"; - path = fetchurl { - name = "_types_keyv___keyv_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; - sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; - }; - } - { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - path = fetchurl { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; - }; - } - { - name = "_types_ms___ms_0.7.31.tgz"; - path = fetchurl { - name = "_types_ms___ms_0.7.31.tgz"; - url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; - }; - } - { - name = "_types_node___node_16.18.11.tgz"; - path = fetchurl { - name = "_types_node___node_16.18.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz"; - sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; - }; - } - { - name = "_types_plist___plist_3.0.2.tgz"; - path = fetchurl { - name = "_types_plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; - }; - } - { - name = "_types_prettier___prettier_2.7.2.tgz"; - path = fetchurl { - name = "_types_prettier___prettier_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz"; - sha512 = "KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg=="; - }; - } - { - name = "_types_responselike___responselike_1.0.0.tgz"; - path = fetchurl { - name = "_types_responselike___responselike_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; - }; - } - { - name = "_types_stack_utils___stack_utils_2.0.1.tgz"; - path = fetchurl { - name = "_types_stack_utils___stack_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz"; - sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; - }; - } - { - name = "_types_tough_cookie___tough_cookie_4.0.2.tgz"; - path = fetchurl { - name = "_types_tough_cookie___tough_cookie_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz"; - sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; - }; - } - { - name = "_types_verror___verror_1.10.6.tgz"; - path = fetchurl { - name = "_types_verror___verror_1.10.6.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz"; - sha512 = "NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ=="; - }; - } - { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; - }; - } - { - name = "_types_yargs___yargs_17.0.20.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_17.0.20.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz"; - sha512 = "eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A=="; - }; - } - { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; - }; - } - { - name = "_webassemblyjs_ast___ast_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_ast___ast_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; - sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; - }; - } - { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; - sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; - }; - } - { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; - sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; - }; - } - { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; - sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; - }; - } - { - name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; - sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; - sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; - sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; - }; - } - { - name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; - sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; - }; - } - { - name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; - sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; - }; - } - { - name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; - sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; - }; - } - { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; - sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; - }; - } - { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; - sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; - }; - } - { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; - sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; - }; - } - { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; - sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; - }; - } - { - name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; - sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; - }; - } - { - name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; - path = fetchurl { - name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz"; - sha512 = "njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A=="; - }; - } - { - name = "_webpack_cli_info___info_2.0.1.tgz"; - path = fetchurl { - name = "_webpack_cli_info___info_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz"; - sha512 = "fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA=="; - }; - } - { - name = "_webpack_cli_serve___serve_2.0.1.tgz"; - path = fetchurl { - name = "_webpack_cli_serve___serve_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz"; - sha512 = "0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw=="; - }; - } - { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - path = fetchurl { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - } - { - name = "_xtuc_long___long_4.2.2.tgz"; - path = fetchurl { - name = "_xtuc_long___long_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - } - { - name = "abab___abab_2.0.6.tgz"; - path = fetchurl { - name = "abab___abab_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; - sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - } - { - name = "acorn_globals___acorn_globals_7.0.1.tgz"; - path = fetchurl { - name = "acorn_globals___acorn_globals_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz"; - sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; - }; - } - { - name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; - path = fetchurl { - name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; - sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; - }; - } - { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - } - { - name = "acorn_walk___acorn_walk_8.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - } - { - name = "acorn___acorn_8.8.1.tgz"; - path = fetchurl { - name = "acorn___acorn_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; - }; - } - { - name = "agent_base___agent_base_6.0.2.tgz"; - path = fetchurl { - name = "agent_base___agent_base_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - } - { - name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; - path = fetchurl { - name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; - sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; - }; - } - { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - path = fetchurl { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; - }; - } - { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - } - { - name = "ajv___ajv_6.12.6.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - } - { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } - { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - } - { - name = "ansi_styles___ansi_styles_5.2.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz"; - sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; - }; - } - { - name = "anymatch___anymatch_3.1.3.tgz"; - path = fetchurl { - name = "anymatch___anymatch_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz"; - sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; - }; - } - { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - path = fetchurl { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz"; - sha512 = "xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA=="; - }; - } - { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; - path = fetchurl { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz"; - sha512 = "gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg=="; - }; - } - { - name = "aproba___aproba_2.0.0.tgz"; - path = fetchurl { - name = "aproba___aproba_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; - sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; - }; - } - { - name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; - sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; - }; - } - { - name = "argparse___argparse_1.0.10.tgz"; - path = fetchurl { - name = "argparse___argparse_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - } - { - name = "astral_regex___astral_regex_2.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; - }; - } - { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - path = fetchurl { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; - }; - } - { - name = "async___async_3.2.4.tgz"; - path = fetchurl { - name = "async___async_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - } - { - name = "at_least_node___at_least_node_1.0.0.tgz"; - path = fetchurl { - name = "at_least_node___at_least_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - } - { - name = "babel_jest___babel_jest_29.3.1.tgz"; - path = fetchurl { - name = "babel_jest___babel_jest_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz"; - sha512 = "aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA=="; - }; - } - { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; - path = fetchurl { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"; - sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; - }; - } - { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz"; - sha512 = "TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA=="; - }; - } - { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; - path = fetchurl { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"; - sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; - }; - } - { - name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; - path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz"; - sha512 = "z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA=="; - }; - } - { - name = "balanced_match___balanced_match_1.0.2.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "bl___bl_4.1.0.tgz"; - path = fetchurl { - name = "bl___bl_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - } - { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - path = fetchurl { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; - }; - } - { - name = "bluebird___bluebird_3.7.2.tgz"; - path = fetchurl { - name = "bluebird___bluebird_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - } - { - name = "boolean___boolean_3.2.0.tgz"; - path = fetchurl { - name = "boolean___boolean_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; - sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - } - { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - } - { - name = "braces___braces_3.0.2.tgz"; - path = fetchurl { - name = "braces___braces_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - } - { - name = "browserslist___browserslist_4.21.4.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.21.4.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; - }; - } - { - name = "bser___bser_2.1.1.tgz"; - path = fetchurl { - name = "bser___bser_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; - sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; - }; - } - { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - path = fetchurl { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; - }; - } - { - name = "buffer_equal___buffer_equal_1.0.1.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; - sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "buffer___buffer_5.7.1.tgz"; - path = fetchurl { - name = "buffer___buffer_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - } - { - name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; - path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz"; - sha512 = "MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ=="; - }; - } - { - name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; - path = fetchurl { - name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz"; - sha512 = "18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg=="; - }; - } - { - name = "cacache___cacache_16.1.3.tgz"; - path = fetchurl { - name = "cacache___cacache_16.1.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz"; - sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; - }; - } - { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - path = fetchurl { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; - sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; - }; - } - { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; - sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; - }; - } - { - name = "callsites___callsites_3.1.0.tgz"; - path = fetchurl { - name = "callsites___callsites_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - } - { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - } - { - name = "camelcase___camelcase_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz"; - sha512 = "fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw=="; - }; - } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } - { - name = "chalk___chalk_4.1.2.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - } - { - name = "char_regex___char_regex_1.0.2.tgz"; - path = fetchurl { - name = "char_regex___char_regex_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; - sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; - }; - } - { - name = "chownr___chownr_2.0.0.tgz"; - path = fetchurl { - name = "chownr___chownr_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - } - { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - } - { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - path = fetchurl { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; - }; - } - { - name = "ci_info___ci_info_3.7.1.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; - sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; - }; - } - { - name = "cjs_module_lexer___cjs_module_lexer_1.2.2.tgz"; - path = fetchurl { - name = "cjs_module_lexer___cjs_module_lexer_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"; - sha512 = "cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="; - }; - } - { - name = "clean_stack___clean_stack_2.2.0.tgz"; - path = fetchurl { - name = "clean_stack___clean_stack_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; - }; - } - { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - } - { - name = "cli_spinners___cli_spinners_2.7.0.tgz"; - path = fetchurl { - name = "cli_spinners___cli_spinners_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz"; - sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; - }; - } - { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - path = fetchurl { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; - }; - } - { - name = "cliui___cliui_8.0.1.tgz"; - path = fetchurl { - name = "cliui___cliui_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - } - { - name = "clone_deep___clone_deep_4.0.1.tgz"; - path = fetchurl { - name = "clone_deep___clone_deep_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; - sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; - }; - } - { - name = "clone_response___clone_response_1.0.3.tgz"; - path = fetchurl { - name = "clone_response___clone_response_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz"; - sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; - }; - } - { - name = "clone___clone_1.0.4.tgz"; - path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - } - { - name = "co___co_4.6.0.tgz"; - path = fetchurl { - name = "co___co_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; - }; - } - { - name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; - path = fetchurl { - name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; - sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "color_support___color_support_1.1.3.tgz"; - path = fetchurl { - name = "color_support___color_support_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; - sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; - }; - } - { - name = "colorette___colorette_2.0.19.tgz"; - path = fetchurl { - name = "colorette___colorette_2.0.19.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - } - { - name = "commander___commander_2.20.3.tgz"; - path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - } - { - name = "commander___commander_5.1.0.tgz"; - path = fetchurl { - name = "commander___commander_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - } - { - name = "commander___commander_9.5.0.tgz"; - path = fetchurl { - name = "commander___commander_9.5.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz"; - sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; - }; - } - { - name = "compare_version___compare_version_0.1.2.tgz"; - path = fetchurl { - name = "compare_version___compare_version_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - } - { - name = "config_file_ts___config_file_ts_0.2.4.tgz"; - path = fetchurl { - name = "config_file_ts___config_file_ts_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz"; - sha512 = "cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ=="; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - } - { - name = "convert_source_map___convert_source_map_2.0.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz"; - sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.2.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; - }; - } - { - name = "crc___crc_3.8.0.tgz"; - path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - } - { - name = "cssom___cssom_0.5.0.tgz"; - path = fetchurl { - name = "cssom___cssom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz"; - sha512 = "iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="; - }; - } - { - name = "cssom___cssom_0.3.8.tgz"; - path = fetchurl { - name = "cssom___cssom_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; - }; - } - { - name = "cssstyle___cssstyle_2.3.0.tgz"; - path = fetchurl { - name = "cssstyle___cssstyle_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; - }; - } - { - name = "darkreader___darkreader_4.9.58.tgz"; - path = fetchurl { - name = "darkreader___darkreader_4.9.58.tgz"; - url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz"; - sha512 = "D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ=="; - }; - } - { - name = "data_urls___data_urls_3.0.2.tgz"; - path = fetchurl { - name = "data_urls___data_urls_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz"; - sha512 = "Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ=="; - }; - } - { - name = "debug___debug_4.3.4.tgz"; - path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - } - { - name = "decimal.js___decimal.js_10.4.3.tgz"; - path = fetchurl { - name = "decimal.js___decimal.js_10.4.3.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz"; - sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; - }; - } - { - name = "decompress_response___decompress_response_6.0.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; - sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; - }; - } - { - name = "dedent___dedent_0.7.0.tgz"; - path = fetchurl { - name = "dedent___dedent_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; - sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; - }; - } - { - name = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - } - { - name = "deepmerge___deepmerge_4.2.2.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; - }; - } - { - name = "defaults___defaults_1.0.4.tgz"; - path = fetchurl { - name = "defaults___defaults_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz"; - sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; - }; - } - { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - path = fetchurl { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; - sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; - }; - } - { - name = "define_properties___define_properties_1.1.4.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - } - { - name = "depd___depd_1.1.2.tgz"; - path = fetchurl { - name = "depd___depd_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - } - { - name = "detect_libc___detect_libc_2.0.1.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; - }; - } - { - name = "detect_newline___detect_newline_3.1.0.tgz"; - path = fetchurl { - name = "detect_newline___detect_newline_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; - sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; - }; - } - { - name = "detect_node___detect_node_2.1.0.tgz"; - path = fetchurl { - name = "detect_node___detect_node_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - } - { - name = "diff_sequences___diff_sequences_29.3.1.tgz"; - path = fetchurl { - name = "diff_sequences___diff_sequences_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz"; - sha512 = "hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ=="; - }; - } - { - name = "dir_compare___dir_compare_3.3.0.tgz"; - path = fetchurl { - name = "dir_compare___dir_compare_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz"; - sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; - }; - } - { - name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; - path = fetchurl { - name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz"; - sha512 = "kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg=="; - }; - } - { - name = "dmg_license___dmg_license_1.0.11.tgz"; - path = fetchurl { - name = "dmg_license___dmg_license_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; - sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; - }; - } - { - name = "doctrine___doctrine_3.0.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - } - { - name = "domexception___domexception_4.0.0.tgz"; - path = fetchurl { - name = "domexception___domexception_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz"; - sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; - }; - } - { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - path = fetchurl { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - } - { - name = "dotenv___dotenv_9.0.2.tgz"; - path = fetchurl { - name = "dotenv___dotenv_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; - }; - } - { - name = "ejs___ejs_3.1.8.tgz"; - path = fetchurl { - name = "ejs___ejs_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; - }; - } - { - name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; - path = fetchurl { - name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz"; - sha512 = "10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA=="; - }; - } - { - name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; - path = fetchurl { - name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz"; - sha512 = "DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ=="; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; - }; - } - { - name = "electron___electron_22.0.3.tgz"; - path = fetchurl { - name = "electron___electron_22.0.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz"; - sha512 = "eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g=="; - }; - } - { - name = "emittery___emittery_0.13.1.tgz"; - path = fetchurl { - name = "emittery___emittery_0.13.1.tgz"; - url = "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz"; - sha512 = "DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - } - { - name = "encoding___encoding_0.1.13.tgz"; - path = fetchurl { - name = "encoding___encoding_0.1.13.tgz"; - url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; - sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; - }; - } - { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - } - { - name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"; - sha512 = "QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ=="; - }; - } - { - name = "entities___entities_4.4.0.tgz"; - path = fetchurl { - name = "entities___entities_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; - sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; - }; - } - { - name = "env_paths___env_paths_2.2.1.tgz"; - path = fetchurl { - name = "env_paths___env_paths_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - } - { - name = "envinfo___envinfo_7.8.1.tgz"; - path = fetchurl { - name = "envinfo___envinfo_7.8.1.tgz"; - url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; - sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; - }; - } - { - name = "err_code___err_code_2.0.3.tgz"; - path = fetchurl { - name = "err_code___err_code_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; - sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - } - { - name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; - path = fetchurl { - name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; - url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; - }; - } - { - name = "es6_error___es6_error_4.1.1.tgz"; - path = fetchurl { - name = "es6_error___es6_error_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - } - { - name = "escodegen___escodegen_2.0.0.tgz"; - path = fetchurl { - name = "escodegen___escodegen_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - } - { - name = "eslint_plugin_sort_keys___eslint_plugin_sort_keys_2.3.5.tgz"; - path = fetchurl { - name = "eslint_plugin_sort_keys___eslint_plugin_sort_keys_2.3.5.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-sort-keys/-/eslint-plugin-sort-keys-2.3.5.tgz"; - sha512 = "2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg=="; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - } - { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - } - { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - } - { - name = "eslint___eslint_8.32.0.tgz"; - path = fetchurl { - name = "eslint___eslint_8.32.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz"; - sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; - }; - } - { - name = "espree___espree_9.4.1.tgz"; - path = fetchurl { - name = "espree___espree_9.4.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz"; - sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - } - { - name = "esquery___esquery_1.4.0.tgz"; - path = fetchurl { - name = "esquery___esquery_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - } - { - name = "esrecurse___esrecurse_4.3.0.tgz"; - path = fetchurl { - name = "esrecurse___esrecurse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "estraverse___estraverse_5.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "events___events_3.3.0.tgz"; - path = fetchurl { - name = "events___events_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - } - { - name = "execa___execa_5.1.1.tgz"; - path = fetchurl { - name = "execa___execa_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; - }; - } - { - name = "exit___exit_0.1.2.tgz"; - path = fetchurl { - name = "exit___exit_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="; - }; - } - { - name = "expect___expect_29.3.1.tgz"; - path = fetchurl { - name = "expect___expect_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz"; - sha512 = "gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA=="; - }; - } - { - name = "extract_zip___extract_zip_2.0.1.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; - }; - } - { - name = "extsprintf___extsprintf_1.4.1.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; - path = fetchurl { - name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; - url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; - sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; - }; - } - { - name = "fastq___fastq_1.15.0.tgz"; - path = fetchurl { - name = "fastq___fastq_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz"; - sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; - }; - } - { - name = "fb_watchman___fb_watchman_2.0.2.tgz"; - path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz"; - sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; - }; - } - { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - path = fetchurl { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; - }; - } - { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - } - { - name = "filelist___filelist_1.0.4.tgz"; - path = fetchurl { - name = "filelist___filelist_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - } - { - name = "fill_range___fill_range_7.0.1.tgz"; - path = fetchurl { - name = "fill_range___fill_range_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - } - { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - } - { - name = "find_up___find_up_5.0.0.tgz"; - path = fetchurl { - name = "find_up___find_up_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; - sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; - }; - } - { - name = "flat_cache___flat_cache_3.0.4.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - } - { - name = "flatted___flatted_3.2.7.tgz"; - path = fetchurl { - name = "flatted___flatted_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; - }; - } - { - name = "form_data___form_data_4.0.0.tgz"; - path = fetchurl { - name = "form_data___form_data_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fs_extra___fs_extra_8.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - } - { - name = "fs_extra___fs_extra_9.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - } - { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - } - { - name = "fsevents___fsevents_2.3.2.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "gauge___gauge_4.0.4.tgz"; - path = fetchurl { - name = "gauge___gauge_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; - sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; - }; - } - { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - path = fetchurl { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - } - { - name = "get_package_type___get_package_type_0.1.0.tgz"; - path = fetchurl { - name = "get_package_type___get_package_type_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; - sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; - }; - } - { - name = "get_stream___get_stream_5.2.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - } - { - name = "get_stream___get_stream_6.0.1.tgz"; - path = fetchurl { - name = "get_stream___get_stream_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; - sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; - }; - } - { - name = "glob_parent___glob_parent_6.0.2.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - } - { - name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; - path = fetchurl { - name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - } - { - name = "glob___glob_7.2.3.tgz"; - path = fetchurl { - name = "glob___glob_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - } - { - name = "glob___glob_8.1.0.tgz"; - path = fetchurl { - name = "glob___glob_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz"; - sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; - }; - } - { - name = "global_agent___global_agent_3.0.0.tgz"; - path = fetchurl { - name = "global_agent___global_agent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; - }; - } - { - name = "globals___globals_11.12.0.tgz"; - path = fetchurl { - name = "globals___globals_11.12.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - } - { - name = "globals___globals_13.19.0.tgz"; - path = fetchurl { - name = "globals___globals_13.19.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; - }; - } - { - name = "globalthis___globalthis_1.0.3.tgz"; - path = fetchurl { - name = "globalthis___globalthis_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - } - { - name = "got___got_11.8.6.tgz"; - path = fetchurl { - name = "got___got_11.8.6.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; - sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - path = fetchurl { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; - sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; - }; - } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - } - { - name = "has_flag___has_flag_4.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "highlight.js___highlight.js_11.7.0.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_11.7.0.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz"; - sha512 = "1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; - sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; - }; - } - { - name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; - path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; - sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; - }; - } - { - name = "html_escaper___html_escaper_2.0.2.tgz"; - path = fetchurl { - name = "html_escaper___html_escaper_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; - sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; - }; - } - { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - } - { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - path = fetchurl { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; - sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - } - { - name = "human_signals___human_signals_2.1.0.tgz"; - path = fetchurl { - name = "human_signals___human_signals_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; - sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; - }; - } - { - name = "humanize_ms___humanize_ms_1.2.1.tgz"; - path = fetchurl { - name = "humanize_ms___humanize_ms_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; - }; - } - { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; - sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "ieee754___ieee754_1.2.1.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - } - { - name = "ignore___ignore_5.2.4.tgz"; - path = fetchurl { - name = "ignore___ignore_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz"; - sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; - }; - } - { - name = "import_fresh___import_fresh_3.3.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - } - { - name = "import_local___import_local_3.1.0.tgz"; - path = fetchurl { - name = "import_local___import_local_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz"; - sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } - { - name = "indent_string___indent_string_4.0.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - } - { - name = "infer_owner___infer_owner_1.0.4.tgz"; - path = fetchurl { - name = "infer_owner___infer_owner_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "interpret___interpret_3.1.1.tgz"; - path = fetchurl { - name = "interpret___interpret_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz"; - sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ=="; - }; - } - { - name = "ip___ip_2.0.0.tgz"; - path = fetchurl { - name = "ip___ip_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - } - { - name = "is_ci___is_ci_3.0.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; - }; - } - { - name = "is_core_module___is_core_module_2.11.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.11.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - } - { - name = "is_extglob___is_extglob_2.1.1.tgz"; - path = fetchurl { - name = "is_extglob___is_extglob_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - } - { - name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; - path = fetchurl { - name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; - }; - } - { - name = "is_glob___is_glob_4.0.3.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - } - { - name = "is_interactive___is_interactive_1.0.0.tgz"; - path = fetchurl { - name = "is_interactive___is_interactive_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz"; - sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; - }; - } - { - name = "is_lambda___is_lambda_1.0.1.tgz"; - path = fetchurl { - name = "is_lambda___is_lambda_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; - sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; - }; - } - { - name = "is_number___is_number_7.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } - { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - } - { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; - path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; - sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; - }; - } - { - name = "is_stream___is_stream_2.0.1.tgz"; - path = fetchurl { - name = "is_stream___is_stream_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - } - { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - path = fetchurl { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; - sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; - sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; - sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - } - { - name = "isobject___isobject_3.0.1.tgz"; - path = fetchurl { - name = "isobject___isobject_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; - }; - } - { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; - path = fetchurl { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; - sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; - }; - } - { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; - path = fetchurl { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; - sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; - }; - } - { - name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - path = fetchurl { - name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; - }; - } - { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; - path = fetchurl { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; - sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; - }; - } - { - name = "istanbul_reports___istanbul_reports_3.1.5.tgz"; - path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; - sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; - }; - } - { - name = "jake___jake_10.8.5.tgz"; - path = fetchurl { - name = "jake___jake_10.8.5.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; - sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; - }; - } - { - name = "jest_changed_files___jest_changed_files_29.2.0.tgz"; - path = fetchurl { - name = "jest_changed_files___jest_changed_files_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz"; - sha512 = "qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA=="; - }; - } - { - name = "jest_circus___jest_circus_29.3.1.tgz"; - path = fetchurl { - name = "jest_circus___jest_circus_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz"; - sha512 = "wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg=="; - }; - } - { - name = "jest_cli___jest_cli_29.3.1.tgz"; - path = fetchurl { - name = "jest_cli___jest_cli_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz"; - sha512 = "TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ=="; - }; - } - { - name = "jest_config___jest_config_29.3.1.tgz"; - path = fetchurl { - name = "jest_config___jest_config_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz"; - sha512 = "y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg=="; - }; - } - { - name = "jest_diff___jest_diff_29.3.1.tgz"; - path = fetchurl { - name = "jest_diff___jest_diff_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz"; - sha512 = "vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw=="; - }; - } - { - name = "jest_docblock___jest_docblock_29.2.0.tgz"; - path = fetchurl { - name = "jest_docblock___jest_docblock_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz"; - sha512 = "bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A=="; - }; - } - { - name = "jest_each___jest_each_29.3.1.tgz"; - path = fetchurl { - name = "jest_each___jest_each_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz"; - sha512 = "qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA=="; - }; - } - { - name = "jest_environment_jsdom___jest_environment_jsdom_29.3.1.tgz"; - path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz"; - sha512 = "G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA=="; - }; - } - { - name = "jest_environment_node___jest_environment_node_29.3.1.tgz"; - path = fetchurl { - name = "jest_environment_node___jest_environment_node_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz"; - sha512 = "xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag=="; - }; - } - { - name = "jest_get_type___jest_get_type_29.2.0.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz"; - sha512 = "uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA=="; - }; - } - { - name = "jest_haste_map___jest_haste_map_29.3.1.tgz"; - path = fetchurl { - name = "jest_haste_map___jest_haste_map_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz"; - sha512 = "/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A=="; - }; - } - { - name = "jest_leak_detector___jest_leak_detector_29.3.1.tgz"; - path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz"; - sha512 = "3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA=="; - }; - } - { - name = "jest_matcher_utils___jest_matcher_utils_29.3.1.tgz"; - path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz"; - sha512 = "fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ=="; - }; - } - { - name = "jest_message_util___jest_message_util_29.3.1.tgz"; - path = fetchurl { - name = "jest_message_util___jest_message_util_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz"; - sha512 = "lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA=="; - }; - } - { - name = "jest_mock___jest_mock_29.3.1.tgz"; - path = fetchurl { - name = "jest_mock___jest_mock_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz"; - sha512 = "H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA=="; - }; - } - { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; - path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"; - sha512 = "+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w=="; - }; - } - { - name = "jest_regex_util___jest_regex_util_29.2.0.tgz"; - path = fetchurl { - name = "jest_regex_util___jest_regex_util_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz"; - sha512 = "6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA=="; - }; - } - { - name = "jest_resolve_dependencies___jest_resolve_dependencies_29.3.1.tgz"; - path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz"; - sha512 = "Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA=="; - }; - } - { - name = "jest_resolve___jest_resolve_29.3.1.tgz"; - path = fetchurl { - name = "jest_resolve___jest_resolve_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz"; - sha512 = "amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw=="; - }; - } - { - name = "jest_runner___jest_runner_29.3.1.tgz"; - path = fetchurl { - name = "jest_runner___jest_runner_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz"; - sha512 = "oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA=="; - }; - } - { - name = "jest_runtime___jest_runtime_29.3.1.tgz"; - path = fetchurl { - name = "jest_runtime___jest_runtime_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz"; - sha512 = "jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A=="; - }; - } - { - name = "jest_snapshot___jest_snapshot_29.3.1.tgz"; - path = fetchurl { - name = "jest_snapshot___jest_snapshot_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz"; - sha512 = "+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA=="; - }; - } - { - name = "jest_util___jest_util_29.3.1.tgz"; - path = fetchurl { - name = "jest_util___jest_util_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz"; - sha512 = "7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ=="; - }; - } - { - name = "jest_validate___jest_validate_29.3.1.tgz"; - path = fetchurl { - name = "jest_validate___jest_validate_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz"; - sha512 = "N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g=="; - }; - } - { - name = "jest_watcher___jest_watcher_29.3.1.tgz"; - path = fetchurl { - name = "jest_watcher___jest_watcher_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz"; - sha512 = "RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg=="; - }; - } - { - name = "jest_worker___jest_worker_27.5.1.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; - }; - } - { - name = "jest_worker___jest_worker_29.3.1.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz"; - sha512 = "lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw=="; - }; - } - { - name = "jest___jest_29.3.1.tgz"; - path = fetchurl { - name = "jest___jest_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz"; - sha512 = "6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA=="; - }; - } - { - name = "js_sdsl___js_sdsl_4.3.0.tgz"; - path = fetchurl { - name = "js_sdsl___js_sdsl_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz"; - sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; - }; - } - { - name = "js_tokens___js_tokens_4.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - } - { - name = "js_yaml___js_yaml_3.14.1.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - } - { - name = "jsdom___jsdom_21.0.0.tgz"; - path = fetchurl { - name = "jsdom___jsdom_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; - sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; - }; - } - { - name = "jsdom___jsdom_20.0.3.tgz"; - path = fetchurl { - name = "jsdom___jsdom_20.0.3.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; - sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; - }; - } - { - name = "jsesc___jsesc_2.5.2.tgz"; - path = fetchurl { - name = "jsesc___jsesc_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - } - { - name = "json_buffer___json_buffer_3.0.1.tgz"; - path = fetchurl { - name = "json_buffer___json_buffer_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; - sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; - }; - } - { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - path = fetchurl { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - } - { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; - }; - } - { - name = "json5___json5_2.2.3.tgz"; - path = fetchurl { - name = "json5___json5_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; - sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "keyv___keyv_4.5.2.tgz"; - path = fetchurl { - name = "keyv___keyv_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; - }; - } - { - name = "kind_of___kind_of_6.0.3.tgz"; - path = fetchurl { - name = "kind_of___kind_of_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - } - { - name = "kleur___kleur_3.0.3.tgz"; - path = fetchurl { - name = "kleur___kleur_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; - sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; - }; - } - { - name = "lazy_val___lazy_val_1.0.5.tgz"; - path = fetchurl { - name = "lazy_val___lazy_val_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; - }; - } - { - name = "leven___leven_3.1.0.tgz"; - path = fetchurl { - name = "leven___leven_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; - sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; - }; - } - { - name = "levn___levn_0.4.1.tgz"; - path = fetchurl { - name = "levn___levn_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - } - { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - } - { - name = "loader_runner___loader_runner_4.3.0.tgz"; - path = fetchurl { - name = "loader_runner___loader_runner_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - } - { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - } - { - name = "locate_path___locate_path_6.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; - sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; - }; - } - { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - } - { - name = "lodash___lodash_4.17.21.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - } - { - name = "log_symbols___log_symbols_4.1.0.tgz"; - path = fetchurl { - name = "log_symbols___log_symbols_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; - sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; - }; - } - { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; - }; - } - { - name = "lru_cache___lru_cache_5.1.1.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - } - { - name = "lru_cache___lru_cache_7.14.1.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_7.14.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; - }; - } - { - name = "lzma_native___lzma_native_8.0.6.tgz"; - path = fetchurl { - name = "lzma_native___lzma_native_8.0.6.tgz"; - url = "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz"; - sha512 = "09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA=="; - }; - } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } - { - name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; - path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; - sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; - }; - } - { - name = "makeerror___makeerror_1.0.12.tgz"; - path = fetchurl { - name = "makeerror___makeerror_1.0.12.tgz"; - url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz"; - sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; - }; - } - { - name = "marked___marked_4.2.12.tgz"; - path = fetchurl { - name = "marked___marked_4.2.12.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz"; - sha512 = "yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="; - }; - } - { - name = "matcher___matcher_3.0.0.tgz"; - path = fetchurl { - name = "matcher___matcher_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; - }; - } - { - name = "merge_stream___merge_stream_2.0.0.tgz"; - path = fetchurl { - name = "merge_stream___merge_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - } - { - name = "micromatch___micromatch_4.0.5.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - } - { - name = "mime_db___mime_db_1.52.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.52.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - } - { - name = "mime_types___mime_types_2.1.35.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.35.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - } - { - name = "mime___mime_2.6.0.tgz"; - path = fetchurl { - name = "mime___mime_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; - }; - } - { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - } - { - name = "mimic_response___mimic_response_1.0.1.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; - }; - } - { - name = "mimic_response___mimic_response_3.1.0.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; - sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; - }; - } - { - name = "minimatch___minimatch_3.1.2.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - } - { - name = "minimatch___minimatch_5.1.6.tgz"; - path = fetchurl { - name = "minimatch___minimatch_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - } - { - name = "minimist___minimist_1.2.7.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; - }; - } - { - name = "minipass_collect___minipass_collect_1.0.2.tgz"; - path = fetchurl { - name = "minipass_collect___minipass_collect_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; - }; - } - { - name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; - path = fetchurl { - name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; - sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; - }; - } - { - name = "minipass_flush___minipass_flush_1.0.5.tgz"; - path = fetchurl { - name = "minipass_flush___minipass_flush_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; - sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; - }; - } - { - name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; - path = fetchurl { - name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; - sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; - }; - } - { - name = "minipass_sized___minipass_sized_1.0.3.tgz"; - path = fetchurl { - name = "minipass_sized___minipass_sized_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; - sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; - }; - } - { - name = "minipass___minipass_3.3.6.tgz"; - path = fetchurl { - name = "minipass___minipass_3.3.6.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz"; - sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; - }; - } - { - name = "minipass___minipass_4.0.0.tgz"; - path = fetchurl { - name = "minipass___minipass_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; - }; - } - { - name = "minizlib___minizlib_2.1.2.tgz"; - path = fetchurl { - name = "minizlib___minizlib_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - } - { - name = "natural_compare___natural_compare_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare___natural_compare_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - } - { - name = "negotiator___negotiator_0.6.3.tgz"; - path = fetchurl { - name = "negotiator___negotiator_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - } - { - name = "neo_async___neo_async_2.6.2.tgz"; - path = fetchurl { - name = "neo_async___neo_async_2.6.2.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - } - { - name = "node_abi___node_abi_3.31.0.tgz"; - path = fetchurl { - name = "node_abi___node_abi_3.31.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; - }; - } - { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - path = fetchurl { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; - }; - } - { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; - path = fetchurl { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; - sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; - }; - } - { - name = "node_api_version___node_api_version_0.1.4.tgz"; - path = fetchurl { - name = "node_api_version___node_api_version_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz"; - sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; - }; - } - { - name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; - path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; - }; - } - { - name = "node_gyp___node_gyp_9.3.1.tgz"; - path = fetchurl { - name = "node_gyp___node_gyp_9.3.1.tgz"; - url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz"; - sha512 = "4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg=="; - }; - } - { - name = "node_int64___node_int64_0.4.0.tgz"; - path = fetchurl { - name = "node_int64___node_int64_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; - }; - } - { - name = "node_releases___node_releases_2.0.8.tgz"; - path = fetchurl { - name = "node_releases___node_releases_2.0.8.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; - }; - } - { - name = "nopt___nopt_6.0.0.tgz"; - path = fetchurl { - name = "nopt___nopt_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz"; - sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; - }; - } - { - name = "normalize_path___normalize_path_3.0.0.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - } - { - name = "normalize_url___normalize_url_6.1.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - } - { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; - }; - } - { - name = "npmlog___npmlog_6.0.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; - sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; - }; - } - { - name = "nwsapi___nwsapi_2.2.2.tgz"; - path = fetchurl { - name = "nwsapi___nwsapi_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz"; - sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - } - { - name = "onetime___onetime_5.1.2.tgz"; - path = fetchurl { - name = "onetime___onetime_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } - { - name = "optionator___optionator_0.9.1.tgz"; - path = fetchurl { - name = "optionator___optionator_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - } - { - name = "ora___ora_5.4.1.tgz"; - path = fetchurl { - name = "ora___ora_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz"; - sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; - }; - } - { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; - sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; - }; - } - { - name = "p_limit___p_limit_2.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - } - { - name = "p_limit___p_limit_3.1.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; - }; - } - { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - } - { - name = "p_locate___p_locate_5.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; - sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; - }; - } - { - name = "p_map___p_map_4.0.0.tgz"; - path = fetchurl { - name = "p_map___p_map_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; - }; - } - { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - } - { - name = "parent_module___parent_module_1.0.1.tgz"; - path = fetchurl { - name = "parent_module___parent_module_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - } - { - name = "parse_json___parse_json_5.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - } - { - name = "parse5___parse5_7.1.2.tgz"; - path = fetchurl { - name = "parse5___parse5_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz"; - sha512 = "Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw=="; - }; - } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - } - { - name = "path_key___path_key_3.1.1.tgz"; - path = fetchurl { - name = "path_key___path_key_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - } - { - name = "path_parse___path_parse_1.0.7.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - } - { - name = "pend___pend_1.2.0.tgz"; - path = fetchurl { - name = "pend___pend_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; - }; - } - { - name = "picocolors___picocolors_1.0.0.tgz"; - path = fetchurl { - name = "picocolors___picocolors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - } - { - name = "picomatch___picomatch_2.3.1.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - } - { - name = "pirates___pirates_4.0.5.tgz"; - path = fetchurl { - name = "pirates___pirates_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz"; - sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; - }; - } - { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - } - { - name = "plist___plist_3.0.6.tgz"; - path = fetchurl { - name = "plist___plist_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz"; - sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - } - { - name = "pretty_format___pretty_format_29.3.1.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_29.3.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz"; - sha512 = "FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg=="; - }; - } - { - name = "progress___progress_2.0.3.tgz"; - path = fetchurl { - name = "progress___progress_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - } - { - name = "promise_inflight___promise_inflight_1.0.1.tgz"; - path = fetchurl { - name = "promise_inflight___promise_inflight_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; - }; - } - { - name = "promise_retry___promise_retry_2.0.1.tgz"; - path = fetchurl { - name = "promise_retry___promise_retry_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; - sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; - }; - } - { - name = "prompts___prompts_2.4.2.tgz"; - path = fetchurl { - name = "prompts___prompts_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz"; - sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="; - }; - } - { - name = "psl___psl_1.9.0.tgz"; - path = fetchurl { - name = "psl___psl_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - } - { - name = "pump___pump_3.0.0.tgz"; - path = fetchurl { - name = "pump___pump_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - } - { - name = "punycode___punycode_2.3.0.tgz"; - path = fetchurl { - name = "punycode___punycode_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; - }; - } - { - name = "querystringify___querystringify_2.2.0.tgz"; - path = fetchurl { - name = "querystringify___querystringify_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; - sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; - }; - } - { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - path = fetchurl { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - } - { - name = "quick_lru___quick_lru_5.1.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; - }; - } - { - name = "randombytes___randombytes_2.1.0.tgz"; - path = fetchurl { - name = "randombytes___randombytes_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - } - { - name = "react_is___react_is_18.2.0.tgz"; - path = fetchurl { - name = "react_is___react_is_18.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz"; - sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; - }; - } - { - name = "read_config_file___read_config_file_6.3.2.tgz"; - path = fetchurl { - name = "read_config_file___read_config_file_6.3.2.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz"; - sha512 = "M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q=="; - }; - } - { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - } - { - name = "rechoir___rechoir_0.8.0.tgz"; - path = fetchurl { - name = "rechoir___rechoir_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz"; - sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; - }; - } - { - name = "regexpp___regexpp_3.2.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - } - { - name = "requires_port___requires_port_1.0.0.tgz"; - path = fetchurl { - name = "requires_port___requires_port_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - } - { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - path = fetchurl { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; - sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; - }; - } - { - name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; - path = fetchurl { - name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; - sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; - }; - } - { - name = "resolve_from___resolve_from_4.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - } - { - name = "resolve_from___resolve_from_5.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; - }; - } - { - name = "resolve.exports___resolve.exports_1.1.1.tgz"; - path = fetchurl { - name = "resolve.exports___resolve.exports_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz"; - sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; - }; - } - { - name = "resolve___resolve_1.22.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - } - { - name = "responselike___responselike_2.0.1.tgz"; - path = fetchurl { - name = "responselike___responselike_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; - sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; - }; - } - { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - } - { - name = "retry___retry_0.12.0.tgz"; - path = fetchurl { - name = "retry___retry_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; - }; - } - { - name = "reusify___reusify_1.0.4.tgz"; - path = fetchurl { - name = "reusify___reusify_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - } - { - name = "roarr___roarr_2.15.4.tgz"; - path = fetchurl { - name = "roarr___roarr_2.15.4.tgz"; - url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; - }; - } - { - name = "run_parallel___run_parallel_1.2.0.tgz"; - path = fetchurl { - name = "run_parallel___run_parallel_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - path = fetchurl { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - } - { - name = "saxes___saxes_6.0.0.tgz"; - path = fetchurl { - name = "saxes___saxes_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; - sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; - }; - } - { - name = "schema_utils___schema_utils_3.1.1.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; - }; - } - { - name = "semver_compare___semver_compare_1.0.0.tgz"; - path = fetchurl { - name = "semver_compare___semver_compare_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - } - { - name = "semver___semver_7.3.8.tgz"; - path = fetchurl { - name = "semver___semver_7.3.8.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - } - { - name = "semver___semver_7.0.0.tgz"; - path = fetchurl { - name = "semver___semver_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - } - { - name = "serialize_error___serialize_error_7.0.1.tgz"; - path = fetchurl { - name = "serialize_error___serialize_error_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; - }; - } - { - name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; - sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; - }; - } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - } - { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - path = fetchurl { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; - }; - } - { - name = "shebang_command___shebang_command_2.0.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - } - { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - } - { - name = "signal_exit___signal_exit_3.0.7.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - } - { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - path = fetchurl { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; - sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; - }; - } - { - name = "sisteransi___sisteransi_1.0.5.tgz"; - path = fetchurl { - name = "sisteransi___sisteransi_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; - sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; - }; - } - { - name = "slash___slash_3.0.0.tgz"; - path = fetchurl { - name = "slash___slash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - } - { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; - }; - } - { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - path = fetchurl { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - } - { - name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; - path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; - sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; - }; - } - { - name = "socks___socks_2.7.1.tgz"; - path = fetchurl { - name = "socks___socks_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.13.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.21.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.21.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - } - { - name = "ssri___ssri_9.0.1.tgz"; - path = fetchurl { - name = "ssri___ssri_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz"; - sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; - }; - } - { - name = "stack_utils___stack_utils_2.0.6.tgz"; - path = fetchurl { - name = "stack_utils___stack_utils_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz"; - sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; - }; - } - { - name = "stat_mode___stat_mode_1.0.0.tgz"; - path = fetchurl { - name = "stat_mode___stat_mode_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; - }; - } - { - name = "string_length___string_length_4.0.2.tgz"; - path = fetchurl { - name = "string_length___string_length_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz"; - sha512 = "+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="; - }; - } - { - name = "string_width___string_width_4.2.3.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - } - { - name = "string_decoder___string_decoder_1.3.0.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - } - { - name = "strip_bom___strip_bom_4.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; - sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; - }; - } - { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - path = fetchurl { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; - }; - } - { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - } - { - name = "sumchecker___sumchecker_3.0.1.tgz"; - path = fetchurl { - name = "sumchecker___sumchecker_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; - }; - } - { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - } - { - name = "supports_color___supports_color_7.2.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - } - { - name = "supports_color___supports_color_8.1.1.tgz"; - path = fetchurl { - name = "supports_color___supports_color_8.1.1.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; - }; - } - { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - path = fetchurl { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - } - { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - path = fetchurl { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - } - { - name = "tapable___tapable_2.2.1.tgz"; - path = fetchurl { - name = "tapable___tapable_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; - }; - } - { - name = "tar___tar_6.1.13.tgz"; - path = fetchurl { - name = "tar___tar_6.1.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; - }; - } - { - name = "temp_file___temp_file_3.4.0.tgz"; - path = fetchurl { - name = "temp_file___temp_file_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; - }; - } - { - name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.tgz"; - path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; - sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; - }; - } - { - name = "terser___terser_5.16.1.tgz"; - path = fetchurl { - name = "terser___terser_5.16.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; - }; - } - { - name = "test_exclude___test_exclude_6.0.0.tgz"; - path = fetchurl { - name = "test_exclude___test_exclude_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; - sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; - }; - } - { - name = "text_table___text_table_0.2.0.tgz"; - path = fetchurl { - name = "text_table___text_table_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - } - { - name = "tldts_core___tldts_core_5.7.104.tgz"; - path = fetchurl { - name = "tldts_core___tldts_core_5.7.104.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz"; - sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; - }; - } - { - name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; - path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz"; - sha512 = "GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA=="; - }; - } - { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - path = fetchurl { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; - }; - } - { - name = "tmp___tmp_0.2.1.tgz"; - path = fetchurl { - name = "tmp___tmp_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; - }; - } - { - name = "tmpl___tmpl_1.0.5.tgz"; - path = fetchurl { - name = "tmpl___tmpl_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz"; - sha512 = "3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="; - }; - } - { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - path = fetchurl { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - } - { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - } - { - name = "tough_cookie___tough_cookie_4.1.2.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz"; - sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; - }; - } - { - name = "tr46___tr46_3.0.0.tgz"; - path = fetchurl { - name = "tr46___tr46_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz"; - sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; - }; - } - { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - path = fetchurl { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; - }; - } - { - name = "type_check___type_check_0.4.0.tgz"; - path = fetchurl { - name = "type_check___type_check_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - } - { - name = "type_detect___type_detect_4.0.8.tgz"; - path = fetchurl { - name = "type_detect___type_detect_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; - }; - } - { - name = "type_fest___type_fest_0.13.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.13.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; - }; - } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "type_fest___type_fest_0.21.3.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.21.3.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; - }; - } - { - name = "typescript___typescript_4.9.4.tgz"; - path = fetchurl { - name = "typescript___typescript_4.9.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; - }; - } - { - name = "unique_filename___unique_filename_2.0.1.tgz"; - path = fetchurl { - name = "unique_filename___unique_filename_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz"; - sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; - }; - } - { - name = "unique_slug___unique_slug_3.0.0.tgz"; - path = fetchurl { - name = "unique_slug___unique_slug_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz"; - sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - } - { - name = "universalify___universalify_0.2.0.tgz"; - path = fetchurl { - name = "universalify___universalify_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz"; - sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; - path = fetchurl { - name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; - sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; - }; - } - { - name = "uri_js___uri_js_4.4.1.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - } - { - name = "url_parse___url_parse_1.5.10.tgz"; - path = fetchurl { - name = "url_parse___url_parse_1.5.10.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; - sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; - }; - } - { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - path = fetchurl { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - name = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; - path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"; - sha512 = "74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w=="; - }; - } - { - name = "verror___verror_1.10.1.tgz"; - path = fetchurl { - name = "verror___verror_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; - }; - } - { - name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; - path = fetchurl { - name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; - sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; - }; - } - { - name = "walker___walker_1.0.8.tgz"; - path = fetchurl { - name = "walker___walker_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz"; - sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; - }; - } - { - name = "watchpack___watchpack_2.4.0.tgz"; - path = fetchurl { - name = "watchpack___watchpack_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - } - { - name = "wcwidth___wcwidth_1.0.1.tgz"; - path = fetchurl { - name = "wcwidth___wcwidth_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; - sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; - }; - } - { - name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; - }; - } - { - name = "webpack_cli___webpack_cli_5.0.1.tgz"; - path = fetchurl { - name = "webpack_cli___webpack_cli_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz"; - sha512 = "S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A=="; - }; - } - { - name = "webpack_merge___webpack_merge_5.8.0.tgz"; - path = fetchurl { - name = "webpack_merge___webpack_merge_5.8.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; - sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; - }; - } - { - name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; - path = fetchurl { - name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz"; - sha512 = "LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ=="; - }; - } - { - name = "webpack_sources___webpack_sources_3.2.3.tgz"; - path = fetchurl { - name = "webpack_sources___webpack_sources_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - } - { - name = "webpack___webpack_5.75.0.tgz"; - path = fetchurl { - name = "webpack___webpack_5.75.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz"; - sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; - }; - } - { - name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; - path = fetchurl { - name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; - sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; - }; - } - { - name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; - path = fetchurl { - name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; - sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; - }; - } - { - name = "whatwg_url___whatwg_url_11.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz"; - sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; - }; - } - { - name = "which___which_2.0.2.tgz"; - path = fetchurl { - name = "which___which_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - } - { - name = "wide_align___wide_align_1.1.5.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - } - { - name = "wildcard___wildcard_2.0.0.tgz"; - path = fetchurl { - name = "wildcard___wildcard_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; - sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - } - { - name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; - sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; - }; - } - { - name = "ws___ws_8.12.0.tgz"; - path = fetchurl { - name = "ws___ws_8.12.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz"; - sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; - }; - } - { - name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; - path = fetchurl { - name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; - sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; - }; - } - { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; - }; - } - { - name = "xmlchars___xmlchars_2.2.0.tgz"; - path = fetchurl { - name = "xmlchars___xmlchars_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; - sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; - }; - } - { - name = "y18n___y18n_5.0.8.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - } - { - name = "yallist___yallist_3.1.1.tgz"; - path = fetchurl { - name = "yallist___yallist_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - } - { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - } - { - name = "yargs___yargs_17.6.2.tgz"; - path = fetchurl { - name = "yargs___yargs_17.6.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; - sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; - }; - } - { - name = "yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; - }; - } - { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; - }; - } - ]; -} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 0238fc61bcf..ec9ba8dddb9 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -11,7 +11,7 @@ , wayland, pipewire , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null -, enableWidevine ? false, vivaldi-widevine ? null +, enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" , pulseSupport ? stdenv.isLinux, libpulseaudio }: @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' - ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm + ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm '' + '' runHook postInstall ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix deleted file mode 100644 index 65c58775874..00000000000 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchzip -}: - -stdenv.mkDerivation rec { - pname = "widevine"; - version = "4.10.2449.0"; - - src = fetchzip { - url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; - stripRoot = false; - }; - - installPhase = '' - install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json - install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt - install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - ''; - - meta = with lib; { - description = "Widevine support for Vivaldi"; - homepage = "https://www.widevine.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ betaboon ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 518a4423296..a386004c82c 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,19 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv, callPackage }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, callPackage +}: buildGoModule rec { pname = "cloudflared"; - version = "2023.2.1"; + version = "2023.3.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; - rev = version; - hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc="; + rev = "refs/tags/${version}"; + hash = "sha256-LEK809MswDVwPJ6CuC13Fxb7fvliugixS/NOKBajqKM="; }; vendorSha256 = null; - ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" + ]; preCheck = '' # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory @@ -52,11 +62,6 @@ buildGoModule rec { substituteInPlace "ingress/icmp_posix_test.go" \ --replace "TestReuseFunnel" "SkipReuseFunnel" - # Workaround for: supervisor_test.go:49: - # Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused - substituteInPlace "supervisor/supervisor_test.go" \ - --replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol" - # Workaround for: manager_test.go:197: # Should be false substituteInPlace "datagramsession/manager_test.go" \ @@ -70,6 +75,7 @@ buildGoModule rec { meta = with lib; { description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; homepage = "https://www.cloudflare.com/products/tunnel"; + changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; license = licenses.asl20; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index cc79ae5d59f..a1f9eb227ab 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.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; + hash = "sha256-X4EXF6t6RzjHCbo2+oB69sFoqeRc5blSmB7x1iQCYIA="; }; - vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; + vendorHash = "sha256-cx+7vbVpoeNwE4mNaQKuguALObyCrEA7EQPdnJ0H9mM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 266ec0e6a45..09d31ffcb2a 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-HdYbrcz1uumwfUleDayc7obv4Grpg3TiUxKr8aF5bXM="; + sha256 = "sha256-MpiKdPjQRF1LzNxBvPucoeRkDfboJdStfQ6X+d2jiwk="; }; vendorHash = "sha256-ZIFZCMyhpfKK/Irq2/MvkXuXX1jExDaSK/nXZgzCZgU="; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 86af4aef106..f0ceb7f269b 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.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-H/jrjU3iIlO75eN2Av/zuGe2G5KbJw9Xj6MCbWgTFEs="; + sha256 = "sha256-l2cuCS5CtAbmv7wHvccNA+DJ8+hN5/xHWTqZFGyBKGQ="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 11ee9a8b356..4ca3338eeaa 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-0o6keMr+bAAZ3gmaDhsU2r3T8hRxpkbqCnNVLqWvK+k="; + sha256 = "sha256-iCyffRVMZq0ajM/I6EY8XypLsGRiJR+9CmrlPNr+K58="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 7ff0a0101c9..f8543f3dc0b 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.6.0"; + version = "8.6.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-SApjp6rdyOyZD6onE0aZ1AeiR6XyPUT9SVJJe/ROEQQ="; + sha256 = "sha256-wW2oemRz+NI/+ke+4MFc8qCIiGIBYlb1KCEHvRbhZ/U="; }; vendorHash = "sha256-xydewlruZvtWHm0IvVWuvv31+Z7/PLVC9gTZcQLaowk="; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 3f614815f7a..e27ebb58bd4 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY="; + hash = "sha256-e6rs7cCSZiklMtPiFozea6EqRylepD2gfoDqQaUuly4="; }; vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index 555f1e69c17..4ee0a4fd97b 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.12"; + version = "0.12.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-Fp52PL0oNqpvisiLLqZ+iQ4RSzLaL3UH7S/CAR5h9LA="; + sha256 = "sha256-lnr2zMp6gpOM1DtUFIniDd38zR1qnXCmcftlt7dL6P4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; - vendorSha256 = "sha256-97m8xz46lvTtZoxO2+pjWmZyZnB2atPuVzYgS9DV+gI="; + vendorHash = "sha256-97m8xz46lvTtZoxO2+pjWmZyZnB2atPuVzYgS9DV+gI="; postConfigure = '' substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \ diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 6a02127405d..6df6b472a42 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kluctl"; - version = "2.19.0"; + version = "2.19.2"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao="; + hash = "sha256-7+hXjYaCqInhP3O8IS8IwkUTGhnmcIWRR1qqvA6UQoc="; }; vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 461b29aed69..46747974dd2 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-41hctulZdFSBc+Yw4p2haR2VNIpa0bwntPCz3WUJyZg="; + hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA="; }; vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw="; diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 3d569d4bdca..7a0f33fbb5b 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.6"; + version = "1.6.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go="; + hash = "sha256-NREZF27fzVKW/s7uCfsmTesEALwEzVBS4cUaatwDJJw="; }; - vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; + vendorHash = "sha256-riuEIR8V0j828S4XZrJULvYoe8ttJrA8MME0nxkaTwM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/applications/networking/cluster/lens/darwin.nix new file mode 100644 index 00000000000..e64bcf8f95f --- /dev/null +++ b/pkgs/applications/networking/cluster/lens/darwin.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, undmg, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lens"; + version = "2022.12"; + build = "${version}.11410-latest"; + appName = "Lens"; + + sourceRoot = "${appName}.app"; + + src = fetchurl { + url = "https://api.k8slens.dev/binaries/Lens-${build}-arm64.dmg"; + sha256 = "sha256-PKWJ2CZ/wacbJnrCZdYwYJzbFVhjIGAw60UGhdw11Mc="; + }; + + buildInputs = [ undmg ]; + installPhase = '' + mkdir -p "$out/Applications/${appName}.app" + cp -R . "$out/Applications/${appName}.app" + ''; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + platforms = [ "aarch64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index cd75bad0a0f..937c694e0e8 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,44 +1,6 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }: +{ stdenv, callPackage }: -let - pname = "lens"; - version = "6.3.0"; - build = "2022.12.221341-latest"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc="; - name = "${pname}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - inherit name src; - }; - -in -appimageTools.wrapType2 { - inherit name src; - - extraInstallCommands = - '' - mv $out/bin/${name} $out/bin/${pname} - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=lens' 'Icon=${pname}' \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.mit; - maintainers = with maintainers; [ dbirks RossComputerGuy ]; - platforms = [ "x86_64-linux" ]; - }; -} +if stdenv.isDarwin then + callPackage ./darwin.nix { } +else + callPackage ./linux.nix { } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix new file mode 100644 index 00000000000..cd75bad0a0f --- /dev/null +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -0,0 +1,44 @@ +{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }: + +let + pname = "lens"; + version = "6.3.0"; + build = "2022.12.221341-latest"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; + sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc="; + name = "${pname}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in +appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = + '' + mv $out/bin/${name} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Icon=lens' 'Icon=${pname}' \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks RossComputerGuy ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9f3169b88b4..b1b807d9648 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.2.3"; - sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9"; - vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw="; + version = "23.3.1"; + sha256 = "10vl3lay9f823qp0cqh4a7fzfkh8qcl0k6jwdjvrd93d4rasvnsm"; + vendorSha256 = "sha256-DPYGh2lUgyYqquaNVRWb2CCAAFi0bm3ZKHNOoVq6dJ4="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index bc57c87b2f8..2896c9e7b11 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.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; + hash = "sha256-/M/uAgAVqsd+jsVhiS+rDHM5HaryvDV5rXAIKMIHa1c="; }; - vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; + vendorHash = "sha256-CNWN8UWCy5EssUEyFrLMKW3HSr91/RZWMLUX9N2sY+0="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 4c4ececb71e..e7f01e9916e 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.65"; + version = "0.1.66"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-UzHGVK/HZ5eH8nO4+G92NunOQi9AWnqv4vgcHjtoPDw="; + sha256 = "sha256-iOgDWqP9sFd5/0e5/+WP6R3PpJa8AiUE4EjI39HwWX8="; }; - vendorSha256 = "sha256-4pqXap1WayqdXuwwLktE71D7x6Ao9MkIKSzIKtVyP84="; + vendorHash = "sha256-yY/X0LVIH1ULegx8MIZyUxD1wPNxxISSCBxj9aY2wtA="; # Strip the final binary. ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 244c581b6f9..93040240a1e 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,51 +1,55 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: -let - ver = "1.2.331.0"; - source = { - url = rec { - "x86_64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - "aarch64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_arm64/session-manager-plugin.deb"; - "x86_64-darwin" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - "aarch64-darwin" = x86_64-darwin; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - sha256 = rec { - "x86_64-linux" = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; - "aarch64-linux" = "sha256-QE6+EjLoydTPuLitG6fALXAtvIkfyoFuWij8Z2HT6+Q="; - "x86_64-darwin" = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; - "aarch64-darwin" = x86_64-darwin; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; -in -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchFromGitHub +, buildGo120Package +}: + +buildGo120Package rec { pname = "ssm-session-manager-plugin"; - version = ver; + version = "1.2.398.0"; - src = fetchurl source; + goPackagePath = "github.com/aws/session-manager-plugin"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook - dpkg - ] ++ lib.optionals stdenv.isDarwin [ - unzip - ]; + src = fetchFromGitHub { + owner = "aws"; + repo = "session-manager-plugin"; + rev = version; + sha256 = "ufNnr/sxOHUDUsGXwxp1yloVAI6DMtuEdjcQZ2XaHRg="; + }; - unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; + postPatch = '' + mv vendor{,-old} + mv vendor-old/src vendor + rm -r vendor-old + ''; - installPhase = '' - runHook preInstall + preBuild = '' + pushd go/src/${lib.escapeShellArg goPackagePath} + echo -n ${lib.escapeShellArg version} > VERSION + go run src/version/versiongenerator/version-gen.go + popd + ''; + + doCheck = true; + checkFlags = "-skip TestSetSessionHandlers"; - install -m755 -D ${archivePath}/bin/session-manager-plugin $out/bin/session-manager-plugin + preCheck = '' + if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then + echo 'wrong version' + exit 1 + fi + ''; + installPhase = '' + runHook preInstall + install -Dm555 go/bin/sessionmanagerplugin-main "$out/bin/session-manager-plugin" runHook postInstall ''; meta = with lib; { homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ mbaillie ]; + license = licenses.asl20; + maintainers = with maintainers; [ amarshall mbaillie ]; }; } diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 9fe3edcbb99..f7b4a32a388 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -25,6 +25,9 @@ buildGoModule rec { installPhase = '' runHook preInstall + mkdir -p $out/share + cp -r ./schema $out/share/ + install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6e858269bd7..8f58a0473ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -37,20 +37,20 @@ "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, "akamai": { - "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", + "hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.3.0", + "rev": "v3.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" + "vendorHash": "sha256-JOaw8rKH7eb3RiP/FD+M7VEXCRfVuarTjfEusz1yGmQ=" }, "alicloud": { - "hash": "sha256-Cf3plUhdewlq3MvOqZGcICP0j9R3vg0nZdBMrk/Et7k=", + "hash": "sha256-QefplcJVXduBbado4Ykg2Ngybb/oxf6/ulCgRqJGm0A=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.199.0", + "rev": "v1.200.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -82,13 +82,13 @@ "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-3hAfDzK7iO4D68OsCvuXQx5Gk0VOtoBiw21tBJjDJtQ=", + "hash": "sha256-d5zM6FKFT9UFUyrm+5aF2wRvGsdtkq3Z8NvlsvZib7c=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.44.0", + "rev": "v0.44.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-UP9A0lcW5QbTuur1MMjKMlvC8S3nenqs0WjpoqvwEQI=" + "vendorHash": "sha256-vcKw8G9SqbP0wBnhLKJUz9ua1nGdP5ioZ+5ACxkeCZk=" }, "avi": { "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", @@ -110,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-qopoHOcCdOAkgpZq3AvCnsq00sjvNSFdUKzn7SQ0G5k=", + "hash": "sha256-U9mzz/r3xb6bl9n1Go6JiM6CemB2Nwsu6LEhc5ypV3c=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.56.0", + "rev": "v4.57.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OBWwMNDpeoPR6NLIgsjiYGQdePEWDMWGN1Y0nHsecYs=" + "vendorHash": "sha256-dK1NGOpX8h4XvcDtp4DEaVrxHaGmzTXldKbsfFoVWu4=" }, "azuread": { - "hash": "sha256-vfkheaRQoDpItMEFzuDkkOOoVvj07MyCkAaybef71nc=", + "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.35.0", + "rev": "v2.36.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-fCs03D+Z/90w9Hup9Cppcx6irsP+oA0HK72tgVm+ZmA=", + "hash": "sha256-PvlW3BB2ZATZA18nOGgxMSWzjC8YIjUY9ofw7XwnbmU=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.45.0", + "rev": "v3.46.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -146,11 +146,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", + "hash": "sha256-htNkDa60XHpH0aoJhMvsMiqUl8Ldqa/ZMl5dp7OKwGA=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.4", + "rev": "v1.19.5", "spdx": "MPL-2.0", "vendorHash": null }, @@ -328,13 +328,13 @@ "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", + "hash": "sha256-du0i4z7Eg/TjA/keIOXq9w+z8Oh6tNOZigV8hpbaGn4=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.16.0", + "rev": "v0.16.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" + "vendorHash": "sha256-Id1rL/Mu/aES7OFQ/rQRMmm3D/GSbGofZludqbWffKo=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", @@ -355,11 +355,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", + "hash": "sha256-zyRPpAaDgjRafn5RcrzmbVTzO6gGS1HMmvLR8VFdKow=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.12.0", + "rev": "v1.13.0", "spdx": "MIT", "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, @@ -382,22 +382,22 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-oaBVVbeJdmzkx3hphW9Llh/ZUujo8QNeZd6guDkBiCY=", + "hash": "sha256-OODPVNHFW8hnpofWLvzn7qukngB8okZADYI5t9muHpQ=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.1.0", + "rev": "v3.2.0", "spdx": "MPL-2.0", "vendorHash": null }, "flexibleengine": { - "hash": "sha256-uT8BmACMMJKVPAhL/7rudCXG9AOb4kS1Lswr5ZxY6M4=", + "hash": "sha256-0wpyi397+5YAa3epZZII312rK1SnPU5k9a1/iVTbqmU=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.36.0", + "rev": "v1.36.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-obBN7Q/gKbvERJIUVz+GgPjn7/OKjXCiFI6WuOd0hic=" + "vendorHash": "sha256-HcyUGKbgj322fU7keN/lBEn6UJhV3QXScBJHZHJkCII=" }, "fortios": { "deleteVendor": true, @@ -540,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=", + "hash": "sha256-x/5jt31yPTJRHSHRZqSrrjNdERWho6l71jvS7x6dR0c=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.2", + "rev": "v1.45.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -567,13 +567,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", + "hash": "sha256-7TuvaeCRtQcYkJe6KbinGdK3JvmEbT4yxwHbzLR6jfE=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.50.0", + "rev": "v1.51.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" + "vendorHash": "sha256-l+Q4ix50ItXI/i5aDvqSC2kTk3tDBPZgO/6aok+P0hQ=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -621,11 +621,11 @@ "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { - "hash": "sha256-HtZ+uEbI+UFO51rj9P8rKWNjRZaX6QhIZ1c9TO1USvI=", + "hash": "sha256-mq0wE9jkn67HFyg0MgtD9lY7lk0+4/rnPLJ4mXX0xwY=", "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", "repo": "terraform-provider-ksyun", - "rev": "v1.3.62", + "rev": "v1.3.66", "spdx": "MPL-2.0", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, @@ -783,13 +783,13 @@ "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { - "hash": "sha256-2w9x/FTtieWB88CIEkP7BH5saC6dt4IxdROBucczios=", + "hash": "sha256-fPeWs1VMsCY+OywHdwP9EUyjpoTYquBqP8W08Z/0DAA=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v1.13.4", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/Rgerbd8c6Owo79LrYsR9O0JNBrDOODFD+k1Yd5G6cY=" + "vendorHash": "sha256-R4q9ASqTdKv4BG4zNktKsLxa6UU42UzWTLYHuRnJ4Zg=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -811,11 +811,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=", + "hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.109.0", + "rev": "v4.110.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -847,13 +847,13 @@ "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, "openstack": { - "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", + "hash": "sha256-KUv921SV88aUAsEkJY8TUgmO1h2xC5aUcapcRN1FEys=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" + "vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g=" }, "opentelekomcloud": { "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", @@ -1009,13 +1009,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=", + "hash": "sha256-VvL5lGPNtcjrtpB/p//7UXuUQxjV/+Deb+R3p+V8GtM=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.22.0", + "rev": "v6.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" + "vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1027,11 +1027,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=", + "hash": "sha256-MMWObJRS7FKvOfor2j0QywRMRbGsE5QcyDGbY2CXjo4=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.57.0", + "rev": "v0.58.0", "spdx": "MIT", "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" }, @@ -1045,13 +1045,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-mbO0APaGWLHowhs5tDvloUBYKt4+pvx3qqN2gtrAzGY=", + "hash": "sha256-bUFX6Ok7cYyaoYHElUIcEwl6DRGK8q+opKBCABo8CVM=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.101.0", + "rev": "v1.103.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU=" + "vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" }, "tencentcloud": { - "hash": "sha256-aqi6lEGVj0PhIMwUfU/4lu5uGgbU4+R42UhINbHgMjY=", + "hash": "sha256-91efifPY9ErjqtNPzm3+XSy1Jy+eQs2znxYzez74J/0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.12", + "rev": "v1.79.13", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index d683fc520a1..23df7ddd9a6 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.44.0"; + version = "0.44.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6LL/ipDqNoiNWR/H5WzJVsJcgorYx6+jo+TjlfifsDo="; + hash = "sha256-Y+7Q9b6c6oetlFUgSQXUcOuGywgrQGK9Lb6oiwiyp7M="; }; - vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; + vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 13d097c5b4b..a25fad93128 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.202"; + version = "1.2.204"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-jBsANHQ+l5zD3Liq7V/y+WzFQxRWzOC43UN5ES6D7PE="; + hash = "sha256-/AMOnoED7MKvX/UTRWVGyXw8xuAHQWCnBnA6aQujXiE="; }; vendorHash = "sha256-SzqGcbfDtBfgnu6CRPyk2tPdwNDhM1RfteKTXVvivw4="; diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 76464c0d980..5f857caee92 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-PMjgEZ7D1peoW5ubOB/QrnmKVZs4/ToIBKH9zBT1J10="; + hash = "sha256-O6dTbhnZPWd7BKMwaPfUOPwcvwzQoHUKR9Zj7uKqtGM="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-Ne3+NJsEJKjvkLShJxiiOq/UoORF7ggv/j7ltPgrSfQ="; + vendorHash = "sha256-nJA83SfMv+5xKKyJTtaSRsro1XR+3sNiszBeXRRY5NA="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 3e66621b571..e9c1d3dde5f 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.26.0"; + version = "3.27.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wkPBMFsPLJFfilKuA3bGNn7NtC+wsnXZf+qkVpF2fWc="; + sha256 = "sha256-WXYmV4QE0OPv1reYX+YrmqGdnRUDHXBt60NIUDLTDLk="; }; - vendorHash = "sha256-U7RQPrvByTADC2/8O0cvcf0nmDgIeVkuyRGV0fpSCPk="; + vendorHash = "sha256-FxKmFDx5ckLm8uJB9ouYSwjX+Pu20In6ertGzhhlEwA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index f0f09c8de7e..e79a387e07f 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook +{ lib +, stdenv +, fetchurl , pkg-config , glib , ronn @@ -11,14 +12,11 @@ stdenv.mkDerivation rec { pname = "castget"; - version = "2.0.0"; + version = "2.0.1"; - src = fetchFromGitHub { - owner = "mlj"; - repo = pname; - # Upstream uses `_` instead of `.` for the version - rev = "rel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1129x64rw587q3sdpa3lrgs0gni5f0siwbvmfz8ya4zkbhgi2ik7"; + src = fetchurl { + url = "http://savannah.nongnu.org/download/castget/castget-${version}.tar.bz2"; + hash = "sha256-Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU="; }; # without this, the build fails because of an encoding issue with the manual page. @@ -29,12 +27,16 @@ stdenv.mkDerivation rec { export LC_ALL="en_US.UTF-8"; ''; - buildInputs = [ glib curl id3lib libxml2 ]; + buildInputs = [ + glib + curl + id3lib + libxml2 + ]; nativeBuildInputs = [ ronn # See comment on locale above glibcLocales - autoreconfHook pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index f4eb47428b5..b7280468b75 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.107.1"; + version = "1.110.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; + hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; + hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.4"; + version = "1.34.5"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; + hash = "sha256-gNcYcxyztUrcxbOO7kaTSCyxqdykjp7Esm3jPJ/d4gc="; }; - npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; + npmDepsHash = "sha256-I0PhE+GXFgOdvH5aLZRyn3lVmXgATX2kmltXYC9chog="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d9288c4a446..37195c117f1 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; + sha256 = "sha256-1czey1/Zn96JneCUnhPMyffG9FVV4bA9aidNB7Ozkpo="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py index a7217d0ad6e..5413c93665f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py +++ b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py @@ -22,21 +22,23 @@ XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join( settings_path = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json") settings_path_temp = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json.tmp") -try: + +if os.path.exists(settings_path): with settings_path.open(encoding="utf-8") as settings_file: settings = json.load(settings_file) +else: + settings = {} - if settings.get("SKIP_HOST_UPDATE"): - print("[Nix] Disabling updates already done") - else: - skip_host_update = {"SKIP_HOST_UPDATE": True} - settings.update(skip_host_update) +if settings.get("SKIP_HOST_UPDATE"): + print("[Nix] Disabling updates already done") +else: + skip_host_update = {"SKIP_HOST_UPDATE": True} + settings.update(skip_host_update) - with settings_path_temp.open("w", encoding="utf-8") as settings_file_temp: - json.dump(settings, settings_file_temp, indent=2) + os.makedirs(os.path.dirname(settings_path), exist_ok=True) - settings_path_temp.rename(settings_path) - print("[Nix] Disabled updates") + with settings_path_temp.open("w", encoding="utf-8") as settings_file_temp: + json.dump(settings, settings_file_temp, indent=2) -except IOError: - print("[Nix] settings.json doesn't yet exist, can't disable it yet") + settings_path_temp.rename(settings_path) + print("[Nix] Disabled updates") diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index bf1458c264e..05cfe1d87b6 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.23", - "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", - "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", - "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", - "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" + "version": "1.11.24", + "desktopSrcHash": "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=", + "desktopYarnHash": "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97", + "webSrcHash": "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=", + "webYarnHash": "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y" } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c3b9caf9ab4..3793b3a6686 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }: -stdenv.mkDerivation rec { +(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230223-1"; + version = "20230304-3"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; + hash = "sha256-y6ApImUkS25kUPih/hl1ngLAkeBAX+MhJ6XuiVU9aZQ="; }; postPatch = '' @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 6a21fe8a9ef..347fa9d2e61 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.21"; + version = "1.2.27"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220915175906if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "0icxn5whsvwmdmfbkfk4xnl3dn4iif5s5yw5hsimmyx066fq0qhb"; + url = "https://web.archive.org/web/20230302151220/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "0jx271zwqja7i7qdvhiyq5m6g19a12falfvxbkxrw7ab3ycds2px"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index be19ec25742..521e2436008 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,7 +1,7 @@ {fetchurl, lib, stdenv, dpkg, makeWrapper, alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, - nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + nspr, nss, openssl_1_1, systemd, wayland, xorg, zlib, ... }: stdenv.mkDerivation { @@ -39,7 +39,7 @@ stdenv.mkDerivation { libxslt nspr nss - openssl + openssl_1_1 stdenv.cc.cc systemd wayland diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index ebb9d2ad15a..6d1f534877e 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "ircdog"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "goshuirc"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw="; - fetchSubmodules = true; + repo = "ircdog"; + rev = "refs/tags/v${version}"; + hash = "sha256-uqqgXmEpGEJHnd1mtgpp13jFhKP5fbhE5wtcZNZL8t4="; }; + vendorSha256 = null; meta = with lib; { diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index a02be05d647..d3debb243a4 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.17.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.18.1"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-Ls46Dds8lRP2KTOkjiVWtqB8aqPW5jdQ/xwBcQYIwbQ="; + hash = "sha256-xAOx4QOdD5MfFLqKTQRGMOnTZt14H523/quOLY5gBMk="; }; # tarball contains multiple files/directories @@ -53,7 +53,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A global, versioned, peer-to-peer filesystem"; + description = "An IPFS implementation in Go"; homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7e896038274..1d15ed3c265 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.17"; + version = "1.4.18"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-Qq5JS60pQdn2R8SMPtmMOLqapc8/5I+w/gblttrfi9U="; + sha256 = "sha256-YJmVAYT30JSngtHnq5gzc28SMI00pUSlm0aoRx2fhbc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 1bda56c5420..16fafadb798 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2022.5"; + version = "2023.1"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-G3B4kb+ugukYtCVH3HHI43u3n9G0dX6WyYUA3X/sZ+o="; + sha256 = "sha256-+Nh4CYjivjrCmohzQMSjb9z5bgACAvot5oUABPUFExQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index a9289e0a8a5..0d62c3c7ce9 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -3,6 +3,7 @@ , writeText , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , protobuf , makeWrapper @@ -11,21 +12,32 @@ , libnftnl , libmnl , libwg +, enableOpenvpn ? true , openvpn-mullvad , shadowsocks-rust }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2022.5"; + version = "2023.1"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-LiaELeEBIn/GZibKf25W3DHe+IkpaTY8UC7ca/7lp8k="; + hash = "sha256-BoduliiDOpzEPYHAjr636e7DbrhFnC/v9au6Mp9T/Qs="; }; - cargoHash = "sha256-KpBhdZce8Ug3ws7f1qg+5LtOMQw2Mf/uJsBg/TZSYyk="; + cargoHash = "sha256-5kK2IA0Z1dQbHlnGXNZHD+BycurshfpqrwcIEveWKT0="; + + patches = [ + # https://github.com/mullvad/mullvadvpn-app/pull/4389 + # can be removed after next release + (fetchpatch { + name = "mullvad-version-dont-check-git.patch"; + url = "https://github.com/mullvad/mullvadvpn-app/commit/8062cc74fc94bbe073189e78328901606c859d41.patch"; + hash = "sha256-1BhCId0J1dxhPM3oOmhZB+07N+k1GlvAT1h6ayfx174="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -51,12 +63,12 @@ rustPlatform.buildRustPackage rec { # Place all binaries in the 'mullvad-' namespace, even though these # specific binaries aren't used in the lifetime of the program. '' - for bin in relay_list translations-converter; do + for bin in relay_list translations-converter tunnel-obfuscation; do mv "$out/bin/$bin" "$out/bin/mullvad-$bin" done '' + # Files necessary for OpenVPN tunnels to work. - '' + lib.optionalString enableOpenvpn '' mkdir -p $out/share/mullvad cp dist-assets/ca.crt $out/share/mullvad ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 0b08453a962..096df023c6f 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -22,6 +22,15 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; + "@authenio/xml-encryption-2.0.2" = { + name = "_at_authenio_slash_xml-encryption"; + packageName = "@authenio/xml-encryption"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@authenio/xml-encryption/-/xml-encryption-2.0.2.tgz"; + sha512 = "cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -40,22 +49,22 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.1" = { + "@azure/core-client-1.7.2" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; - sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz"; + sha512 = "ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag=="; }; }; - "@azure/core-http-2.3.1" = { + "@azure/core-http-3.0.0" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz"; - sha512 = "cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz"; + sha512 = "BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -85,13 +94,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.10.1" = { + "@azure/core-rest-pipeline-1.10.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; - sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz"; + sha512 = "e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q=="; }; }; "@azure/core-tracing-1.0.0-preview.12" = { @@ -121,13 +130,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.1.1" = { + "@azure/core-util-1.2.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; - sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; }; }; "@azure/identity-1.5.2" = { @@ -157,13 +166,13 @@ let sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; }; }; - "@azure/logger-1.0.3" = { + "@azure/logger-1.0.4" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz"; - sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz"; + sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; "@azure/ms-rest-azure-env-2.0.0" = { @@ -247,49 +256,49 @@ let sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; - "@azure/storage-blob-12.12.0" = { + "@azure/storage-blob-12.13.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.12.0"; + version = "12.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.12.0.tgz"; - sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.13.0.tgz"; + sha512 = "t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA=="; }; }; - "@babel/parser-7.20.15" = { + "@babel/parser-7.21.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.15"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; - sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; }; - "@babel/runtime-7.20.13" = { + "@babel/runtime-7.21.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.13"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; - sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; + sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; }; }; - "@codemirror/autocomplete-6.4.0" = { + "@codemirror/autocomplete-6.4.2" = { name = "_at_codemirror_slash_autocomplete"; packageName = "@codemirror/autocomplete"; - version = "6.4.0"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.0.tgz"; - sha512 = "HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA=="; + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz"; + sha512 = "8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ=="; }; }; - "@codemirror/commands-6.2.0" = { + "@codemirror/commands-6.2.1" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.0.tgz"; - sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz"; + sha512 = "FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA=="; }; }; "@codemirror/lang-css-6.0.2" = { @@ -301,31 +310,31 @@ let sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; }; }; - "@codemirror/lang-javascript-6.1.3" = { + "@codemirror/lang-javascript-6.1.4" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz"; - sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz"; + sha512 = "OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A=="; }; }; - "@codemirror/language-6.5.0" = { + "@codemirror/language-6.6.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.5.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.5.0.tgz"; - sha512 = "dI+dV/u2klIt0Y9kE3TH9vuBidAB3xuuDPofwzvnW8ZKqJnKTbT3EjyV7DeKcmrRgXMhlPTL7AdH1V5KOCYuHQ=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz"; + sha512 = "cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg=="; }; }; - "@codemirror/lint-6.1.0" = { + "@codemirror/lint-6.2.0" = { name = "_at_codemirror_slash_lint"; packageName = "@codemirror/lint"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.0.tgz"; - sha512 = "mdvDQrjRmYPvQ3WrzF6Ewaao+NWERYtpthJvoQ3tK3t/44Ynhk8ZGjTSL9jMEv8CgSMogmt75X8ceOZRDSXHtQ=="; + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz"; + sha512 = "KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg=="; }; }; "@codemirror/state-6.2.0" = { @@ -337,13 +346,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.8.1" = { + "@codemirror/view-6.9.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.8.1"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.8.1.tgz"; - sha512 = "bXWs42i1mnBexaktPABaEpYbt4FbJMnlesObDLF0GE8poRiNaRgm7H/2NfXfD5Swas1ULdFgONLLs4ncwHuz8g=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz"; + sha512 = "bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg=="; }; }; "@colors/colors-1.5.0" = { @@ -535,13 +544,13 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.4" = { + "@grpc/proto-loader-0.7.5" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; - sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.5.tgz"; + sha512 = "mfcTuMbFowq1wh/Rn5KQl6qb95M21Prej3bewD9dUQMurYGVckGO/Pbe2Ocwto6sD05b/mxZLspvqwx60xO2Rg=="; }; }; "@icetee/ftp-0.3.15" = { @@ -616,49 +625,49 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsplumb/browser-ui-5.13.2" = { + "@jsplumb/browser-ui-5.13.4" = { name = "_at_jsplumb_slash_browser-ui"; packageName = "@jsplumb/browser-ui"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz"; - sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ=="; + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.4.tgz"; + sha512 = "N+Sp/jrrpYhWd7KTcMhsqoMjzmlNE/9RUYslKh7D9U9V9p0pTVfRftU7dSsoaP76Gi+juZmIGU/drSqG+z64OA=="; }; }; - "@jsplumb/common-5.13.2" = { + "@jsplumb/common-5.13.4" = { name = "_at_jsplumb_slash_common"; packageName = "@jsplumb/common"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz"; - sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q=="; + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.4.tgz"; + sha512 = "pgWUAYmMbdpTyZV252N1sT+dyGFuRrl5yIprhQk1xlhTgh4korYVrzNH4594KujQB45gBuIKpSyauwh5FzlFAA=="; }; }; - "@jsplumb/connector-bezier-5.13.2" = { + "@jsplumb/connector-bezier-5.13.4" = { name = "_at_jsplumb_slash_connector-bezier"; packageName = "@jsplumb/connector-bezier"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz"; - sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg=="; + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.4.tgz"; + sha512 = "ucnzBRwgWWwNQwgyUKZSg4QM5Pu19rYhpozHI5/FrZ8jxk1f3xEa4jv8teHvZO1MKs5ZGXfBobuy54wT5O+gtw=="; }; }; - "@jsplumb/core-5.13.2" = { + "@jsplumb/core-5.13.4" = { name = "_at_jsplumb_slash_core"; packageName = "@jsplumb/core"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz"; - sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A=="; + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.4.tgz"; + sha512 = "dlgvw1oYGmakV+HrfyRf1hJB9XwmfmgCakwuhLoSJz+IEaJ136QjEmmcoH/mf4x5GCnraUieI6LaYUskjDhtmQ=="; }; }; - "@jsplumb/util-5.13.2" = { + "@jsplumb/util-5.13.4" = { name = "_at_jsplumb_slash_util"; packageName = "@jsplumb/util"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz"; - sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g=="; + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.4.tgz"; + sha512 = "dLwr9qb7kQy0KKaiFRfe+6lxN9StxpZAxT/QQwfBkYE2Iwify372pK92vM5HEc62Me12pS/s6F3qXj3sDKlUmQ=="; }; }; "@kafkajs/confluent-schema-registry-1.0.6" = { @@ -715,13 +724,13 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; - "@lezer/html-1.3.1" = { + "@lezer/html-1.3.3" = { name = "_at_lezer_slash_html"; packageName = "@lezer/html"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz"; - sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw=="; + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz"; + sha512 = "04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA=="; }; }; "@lezer/javascript-1.4.1" = { @@ -841,13 +850,13 @@ let sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; }; }; - "@oclif/core-1.26.1" = { + "@oclif/core-1.26.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.1.tgz"; - sha512 = "g+OWJcM7JOVI53caTEtq0BB1nPotWctRLUyFODPgvDqXhVR7QED+Qz3LwFAMD8dt7/Ar2ZNq15U3bnpnOv453A=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.2.tgz"; + sha512 = "6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw=="; }; }; "@oclif/errors-1.3.6" = { @@ -994,6 +1003,60 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; + "@redis/bloom-1.2.0" = { + name = "_at_redis_slash_bloom"; + packageName = "@redis/bloom"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; + sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; + }; + }; + "@redis/client-1.5.6" = { + name = "_at_redis_slash_client"; + packageName = "@redis/client"; + version = "1.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.6.tgz"; + sha512 = "dFD1S6je+A47Lj22jN/upVU2fj4huR7S9APd7/ziUXsIXDL+11GPYti4Suv5y8FuXaN+0ZG4JF+y1houEJ7ToA=="; + }; + }; + "@redis/graph-1.1.0" = { + name = "_at_redis_slash_graph"; + packageName = "@redis/graph"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz"; + sha512 = "16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg=="; + }; + }; + "@redis/json-1.0.4" = { + name = "_at_redis_slash_json"; + packageName = "@redis/json"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz"; + sha512 = "LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw=="; + }; + }; + "@redis/search-1.1.2" = { + name = "_at_redis_slash_search"; + packageName = "@redis/search"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.2.tgz"; + sha512 = "/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA=="; + }; + }; + "@redis/time-series-1.0.4" = { + name = "_at_redis_slash_time-series"; + packageName = "@redis/time-series"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"; + sha512 = "ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng=="; + }; + }; "@rudderstack/rudder-sdk-node-1.0.6" = { name = "_at_rudderstack_slash_rudder-sdk-node"; packageName = "@rudderstack/rudder-sdk-node"; @@ -1003,13 +1066,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.15.19" = { + "@sap/hana-client-2.15.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.15.19"; + version = "2.15.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; - sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.22.tgz"; + sha512 = "mzqWiZ5Its8aCXGdv9EA4ROgwoLdqKoEgbKOnLjUtk2xuliGJ2L9Y54xcMSTtzDAUUEhZCKMDPTXloCqYAUpCQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1030,49 +1093,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.37.1" = { + "@sentry/core-7.40.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz"; - sha512 = "eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.40.0.tgz"; + sha512 = "OPAobQG0GTY++r5LWUcOA1lS+2TY2Lmw/i5s4kL9WbY+f08dbLNEGNBObY7/V98OL4f7OG+nWaPFybgM7kqUTQ=="; }; }; - "@sentry/integrations-7.37.1" = { + "@sentry/integrations-7.40.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.37.1.tgz"; - sha512 = "/7VZXw7/DxZPsGNEaU/gcKRNPtmK75mz9oM71C5UbRDDEdFSEeVq2jG+tOq2lIsd2VQlsAmN3DG5yqiGA9C4eQ=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.40.0.tgz"; + sha512 = "8TLo7RKKpTXRDdeeBFNaA3YA4NG5hbAkl2o9wDHJW5NJouyr7IK6ia6qd2v94RXJAVB7nnjtQUdnkXGR59E4RA=="; }; }; - "@sentry/node-7.37.1" = { + "@sentry/node-7.40.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz"; - sha512 = "nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.40.0.tgz"; + sha512 = "S2pcLBUsCg3+WYlyQbXKPey3H1yaZPt9fpJTPAoabbidYXweBAbtFjSCRwPFwCQMzWusWxlYEwWRT77C07pHVg=="; }; }; - "@sentry/types-7.37.1" = { + "@sentry/types-7.40.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz"; - sha512 = "c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.40.0.tgz"; + sha512 = "dIbqBenbmDx1F8pvfC11C88J83ecwumUhV+YOIxcmVd1fmlPF2hXWZ01+NTkTDkCu341sJx4wPQogByFy8FwGA=="; }; }; - "@sentry/utils-7.37.1" = { + "@sentry/utils-7.40.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.37.1"; + version = "7.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz"; - sha512 = "/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.40.0.tgz"; + sha512 = "ZdCbTpAXPiVVfvNJVftnDhsctOui71MDUhVIdLkgg4Cuic+WHGPRmmZ+H6uZdp7vRaeB+Uvnn5+t2iSAVo/mAA=="; }; }; "@servie/events-1.0.0" = { @@ -1093,22 +1156,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.35" = { + "@swc/core-1.3.37" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.35"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz"; - sha512 = "KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.37.tgz"; + sha512 = "VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw=="; }; }; - "@swc/wasm-1.3.35" = { + "@swc/wasm-1.3.37" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.35"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.35.tgz"; - sha512 = "8xBOgl9eziAuqF4HYwYx4Kh6eHfOQECvO0ZMlrFNW0jgE+ntqxcRjBhuzZ6iWb24nifzXbuGLQntbns4IJYJgQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.37.tgz"; + sha512 = "cRlyLuQrMKE6ppo07jVcYAEK69l+O+g+u5xZBon466vA416IK86jHYxGZqXRP+HEF6P/imntLbJgj9F/AGFEBA=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1327,13 +1390,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.13.0" = { + "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.13.0"; + version = "18.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; - sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; + sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1372,13 +1435,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/serve-static-1.15.0" = { + "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; + sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; }; }; "@types/stack-trace-0.0.29" = { @@ -1426,22 +1489,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/uuid-9.0.0" = { + "@types/uuid-9.0.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz"; - sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz"; + sha512 = "rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA=="; }; }; - "@types/validator-13.7.12" = { + "@types/validator-13.7.13" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.12"; + version = "13.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; - sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.13.tgz"; + sha512 = "EMfHccxNKXaSxTK6DN0En9WsXa7uR4w3LQtx31f6Z2JjG5hJQeVX5zUYMZoatjZgnoQmRcT94WnNWwi0BzQW6Q=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1588,13 +1651,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.1" = { + "agentkeepalive-4.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; - sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; }; }; "aggregate-error-3.1.0" = { @@ -1966,13 +2029,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1313.0" = { + "aws-sdk-2.1328.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1313.0"; + version = "2.1328.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz"; - sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1328.0.tgz"; + sha512 = "ud8ieE+hGX/cWHkQ9kMxQw6w+onbv71PDrcPmP2j8cmYv5IPlM5Zh8/tpsmXApLYDmQMuZ3TtssiB1KmoSbzgA=="; }; }; "aws-sign2-0.7.0" = { @@ -2227,6 +2290,15 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; + "body-parser-1.20.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"; + sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; + }; + }; "body-parser-xml-2.0.3" = { name = "body-parser-xml"; packageName = "body-parser-xml"; @@ -2479,6 +2551,15 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; + "camelcase-6.3.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; + }; + }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -2623,6 +2704,15 @@ let sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="; }; }; + "class-transformer-0.5.1" = { + name = "class-transformer"; + packageName = "class-transformer"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz"; + sha512 = "SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="; + }; + }; "class-validator-0.14.0" = { name = "class-validator"; packageName = "class-validator"; @@ -2677,13 +2767,13 @@ let sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; }; }; - "cli-progress-3.11.2" = { + "cli-progress-3.12.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.11.2"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz"; - sha512 = "lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz"; + sha512 = "tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A=="; }; }; "cli-width-3.0.0" = { @@ -3064,13 +3154,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.27.2" = { + "core-js-3.29.0" = { name = "core-js"; packageName = "core-js"; - version = "3.27.2"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; - sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; "core-util-is-1.0.2" = { @@ -3136,13 +3226,13 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; - "cron-parser-4.7.1" = { + "cron-parser-4.8.0" = { name = "cron-parser"; packageName = "cron-parser"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"; - sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.0.tgz"; + sha512 = "VjwVZx26j7lukZmG3gtAvPYkD6wuMuIdYhEzrmpHtSGO9dvKkv+EhReFY7HQPsGuGUfy+by3IOriuzyrzxl9MQ=="; }; }; "cross-spawn-4.0.2" = { @@ -3388,6 +3478,15 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; + "deep-equal-2.2.0" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"; + sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -3496,15 +3595,6 @@ let sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -3730,13 +3820,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "element-ui-2.15.12" = { + "element-ui-2.15.13" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.12"; + version = "2.15.13"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.12.tgz"; - sha512 = "Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.13.tgz"; + sha512 = "LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg=="; }; }; "emoji-regex-8.0.0" = { @@ -3865,6 +3955,15 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-get-iterator-1.1.3" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"; + sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; + }; + }; "es-set-tostringtag-2.0.1" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; @@ -4972,13 +5071,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-9.0.3" = { + "html-to-text-9.0.4" = { name = "html-to-text"; packageName = "html-to-text"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; - sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.4.tgz"; + sha512 = "ckrQ5N2yZS7qSgKxUbqrBZ02NxD5cSy7KuYjCNIf+HWbdzY3fbjYjQsoRIl6TiaZ4+XWOi0ggFP8/pmgCK/o+A=="; }; }; "htmlparser2-6.1.0" = { @@ -5323,13 +5422,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.1" = { + "is-array-buffer-3.0.2" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; }; }; "is-arrayish-0.3.2" = { @@ -5476,6 +5575,15 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; + "is-map-2.0.2" = { + name = "is-map"; + packageName = "is-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; + sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; + }; + }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -5575,6 +5683,15 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; + "is-set-2.0.2" = { + name = "is-set"; + packageName = "is-set"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; + sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; + }; + }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -5647,6 +5764,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-weakmap-2.0.1" = { + name = "is-weakmap"; + packageName = "is-weakmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; + sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; + }; + }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -5656,6 +5782,15 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; + "is-weakset-2.0.2" = { + name = "is-weakset"; + packageName = "is-weakset"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; + sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -5692,13 +5827,22 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.6.5" = { + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; + "isbot-3.6.6" = { name = "isbot"; packageName = "isbot"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.5.tgz"; - sha512 = "BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.6.tgz"; + sha512 = "98aGl1Spbx1led422YFrusDJ4ZutSNOymb2avZ2V4BCCjF3MqAF2k+J2zoaLYahubaFkb+3UyvbVDVlk/Ngrew=="; }; }; "isexe-2.0.0" = { @@ -5755,13 +5899,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.11.4" = { + "jose-4.13.1" = { name = "jose"; packageName = "jose"; - version = "4.11.4"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.11.4.tgz"; - sha512 = "94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ=="; + url = "https://registry.npmjs.org/jose/-/jose-4.13.1.tgz"; + sha512 = "MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ=="; }; }; "jquery-3.6.3" = { @@ -6043,13 +6187,13 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "ldapts-4.2.2" = { + "ldapts-4.2.4" = { name = "ldapts"; packageName = "ldapts"; - version = "4.2.2"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.2.tgz"; - sha512 = "UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ=="; + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.4.tgz"; + sha512 = "crE50bd+UA7bJcbOy2IynWJHTQwrG2FeySo1AqokGtApG7xoCVxz/sO5JLe2Xso1zb/Z+Zh65ERHkpJaGRJaEA=="; }; }; "leac-0.6.0" = { @@ -6097,13 +6241,22 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.19" = { + "libmime-5.2.1" = { + name = "libmime"; + packageName = "libmime"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz"; + sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; + }; + }; + "libphonenumber-js-1.10.21" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.19"; + version = "1.10.21"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; - sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.21.tgz"; + sha512 = "/udZhx49av2r2gZR/+xXSrwcR8smX/sDNrVpOFrvW+CA26TfYTVZfwb3MIDvmwAYMLs7pXuJjZX0VxxGpqPhsA=="; }; }; "libpq-1.8.12" = { @@ -6196,6 +6349,24 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha512 = "hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw=="; + }; + }; + "lodash.assignwith-4.2.0" = { + name = "lodash.assignwith"; + packageName = "lodash.assignwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; + sha512 = "ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g=="; + }; + }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -6205,6 +6376,15 @@ let sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; }; }; + "lodash.clone-4.5.0" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"; + sha512 = "GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg=="; + }; + }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -6214,13 +6394,22 @@ let sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; + "lodash.compact-3.0.1" = { + name = "lodash.compact"; + packageName = "lodash.compact"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + url = "https://registry.npmjs.org/lodash.compact/-/lodash.compact-3.0.1.tgz"; + sha512 = "2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ=="; + }; + }; + "lodash.concat-4.5.0" = { + name = "lodash.concat"; + packageName = "lodash.concat"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.concat/-/lodash.concat-4.5.0.tgz"; + sha512 = "US6b1Nqek3shg2qmv1IjTN5P7tPL1RKu77VpdGtVprxmnTI/HlsHGqI2Oa5Irznk0ZB5IXHwocMeMZK8vf4+CA=="; }; }; "lodash.defaults-4.2.0" = { @@ -6232,6 +6421,51 @@ let sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; }; }; + "lodash.difference-4.5.0" = { + name = "lodash.difference"; + packageName = "lodash.difference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; + }; + }; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha512 = "TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="; + }; + }; + "lodash.every-4.6.0" = { + name = "lodash.every"; + packageName = "lodash.every"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.every/-/lodash.every-4.6.0.tgz"; + sha512 = "isF82d+65/sNvQ3aaQAW7LLHnnTxSN/2fm4rhYyuufLzA4VtHz6y6S5vFwe6PQVr2xdqUOyxBbTNKDpnmeu50w=="; + }; + }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha512 = "yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg=="; + }; + }; + "lodash.first-3.0.0" = { + name = "lodash.first"; + packageName = "lodash.first"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.first/-/lodash.first-3.0.0.tgz"; + sha512 = "FnBs6c5eWZY1P88K2+NHiLZjp+pBRbLbt9kDGBCtiY+tfRGhR7LmIxTphpspmRXxyQeJXM5LHoq62yVjcBjcCw=="; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -6241,6 +6475,15 @@ let sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; + "lodash.flow-3.5.0" = { + name = "lodash.flow"; + packageName = "lodash.flow"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz"; + sha512 = "ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="; + }; + }; "lodash.get-4.4.2" = { name = "lodash.get"; packageName = "lodash.get"; @@ -6277,6 +6520,15 @@ let sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; }; + "lodash.isarray-4.0.0" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; + sha512 = "V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g=="; + }; + }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -6286,6 +6538,15 @@ let sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; }; }; + "lodash.isempty-4.4.0" = { + name = "lodash.isempty"; + packageName = "lodash.isempty"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha512 = "oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="; + }; + }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -6313,6 +6574,15 @@ let sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; }; }; + "lodash.isobject-3.0.2" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha512 = "3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -6340,6 +6610,33 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; + "lodash.last-3.0.0" = { + name = "lodash.last"; + packageName = "lodash.last"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz"; + sha512 = "14mq7rSkCxG4XMy9lF2FbIOqqgF0aH0NfPuQ3LPR3vIh0kHnUvIYP70dqa1Hf47zyXfQ8FzAg0MYOQeSuE1R7A=="; + }; + }; + "lodash.lt-3.9.2" = { + name = "lodash.lt"; + packageName = "lodash.lt"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.lt/-/lodash.lt-3.9.2.tgz"; + sha512 = "WMyxj1+48IlnUWMYALOD6+o61apx5xdiXDtHBOp6QlkeZ19QpX7LiqHMXCnZWGd35QMZoZV/iJIhIhM01WPz3A=="; + }; + }; + "lodash.map-4.6.0" = { + name = "lodash.map"; + packageName = "lodash.map"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; + sha512 = "worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q=="; + }; + }; "lodash.merge-4.6.2" = { name = "lodash.merge"; packageName = "lodash.merge"; @@ -6349,6 +6646,15 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; + "lodash.mergewith-4.6.2" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; + sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; + }; + }; "lodash.omit-4.5.0" = { name = "lodash.omit"; packageName = "lodash.omit"; @@ -6376,6 +6682,15 @@ let sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; }; }; + "lodash.partialright-4.2.1" = { + name = "lodash.partialright"; + packageName = "lodash.partialright"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz"; + sha512 = "yebmPMQZH7i4El6SdJTW9rn8irWl8VTcsmiWqm/I4sY8/ZjbSo0Z512HL6soeAu3mh5rhx5uIIo6kYJOQXbCxw=="; + }; + }; "lodash.pick-4.4.0" = { name = "lodash.pick"; packageName = "lodash.pick"; @@ -6385,6 +6700,24 @@ let sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; + "lodash.pickby-4.6.0" = { + name = "lodash.pickby"; + packageName = "lodash.pickby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"; + sha512 = "AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q=="; + }; + }; + "lodash.reduce-4.6.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha512 = "6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw=="; + }; + }; "lodash.remove-4.7.0" = { name = "lodash.remove"; packageName = "lodash.remove"; @@ -6412,6 +6745,24 @@ let sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; }; }; + "lodash.some-4.6.0" = { + name = "lodash.some"; + packageName = "lodash.some"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"; + sha512 = "j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ=="; + }; + }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; + }; + }; "lodash.split-4.4.2" = { name = "lodash.split"; packageName = "lodash.split"; @@ -6430,6 +6781,42 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; + "lodash.tonumber-4.0.3" = { + name = "lodash.tonumber"; + packageName = "lodash.tonumber"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz"; + sha512 = "SY0SwuPOHRwKcCNTdsntPYb+Zddz5mDUIVFABzRMqmAiL41pMeyoQFGxYAw5zdc9NnH4pbJqiqqp5ckfxa+zSA=="; + }; + }; + "lodash.tostring-4.1.4" = { + name = "lodash.tostring"; + packageName = "lodash.tostring"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.4.tgz"; + sha512 = "xWHJ0LY7cSz/C/4ghNNiYA1Ong0VLdzAzrjDHvOzN+eJHzDEHme2+k+w/9Pk8dtdwcASMUbxN1/mtj6mFI25Ng=="; + }; + }; + "lodash.trim-4.5.1" = { + name = "lodash.trim"; + packageName = "lodash.trim"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.trim/-/lodash.trim-4.5.1.tgz"; + sha512 = "nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg=="; + }; + }; + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; + }; + }; "lodash.unionby-4.8.0" = { name = "lodash.unionby"; packageName = "lodash.unionby"; @@ -6466,6 +6853,24 @@ let sha512 = "bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="; }; }; + "lodash.upperfirst-4.3.1" = { + name = "lodash.upperfirst"; + packageName = "lodash.upperfirst"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; + sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; + }; + }; + "lodash.zip-4.2.0" = { + name = "lodash.zip"; + packageName = "lodash.zip"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz"; + sha512 = "C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="; + }; + }; "lodash.zipobject-4.1.3" = { name = "lodash.zipobject"; packageName = "lodash.zipobject"; @@ -6547,13 +6952,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.14.1" = { + "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.14.1"; + version = "7.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; "lru-memoizer-2.2.0" = { @@ -6574,22 +6979,22 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-3.2.1" = { + "luxon-3.3.0" = { name = "luxon"; packageName = "luxon"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"; - sha512 = "QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz"; + sha512 = "An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="; }; }; - "mailparser-3.6.3" = { + "mailparser-3.6.4" = { name = "mailparser"; packageName = "mailparser"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.3.tgz"; - sha512 = "Yi6poKSsZsmjEcUexv3H4w4+TIeyN9u3+TCdC43VK7fe4rUOGDJ3wL4kMhNLiTOScCA1Rpzldv1hcf6g1MLtZQ=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.4.tgz"; + sha512 = "4bDgbLdlcBKX8jtVskfn/G93nZo3lf7pyuLbAQ031SHQLihEqxtRwHrb9SXMTqiTkEGlOdpDrZE5uH18O+2A+A=="; }; }; "mailsplit-5.4.0" = { @@ -6880,13 +7285,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.3" = { + "minipass-4.2.4" = { name = "minipass"; packageName = "minipass"; - version = "4.0.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz"; - sha512 = "OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; + sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; }; }; "minipass-collect-1.0.2" = { @@ -6961,13 +7366,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-2.1.3" = { + "mkdirp-2.1.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; - sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.5.tgz"; + sha512 = "jbjfql+shJtAPrFoKxHOXip4xS+kul9W3OzfzzrqueWK2QMGon2bFH2opl6W9EagBThjEz+iysyi/swOoVfB/w=="; }; }; "mkdirp-classic-0.5.3" = { @@ -6997,13 +7402,13 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.40" = { + "moment-timezone-0.5.41" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.40"; + version = "0.5.41"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz"; + sha512 = "e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg=="; }; }; "monaco-editor-0.33.0" = { @@ -7096,13 +7501,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.3" = { + "msgpackr-1.8.4" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; - sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.4.tgz"; + sha512 = "BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg=="; }; }; "mssql-7.3.5" = { @@ -7159,49 +7564,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.154.1" = { + "n8n-core-0.157.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.154.1"; + version = "0.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz"; - sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.157.0.tgz"; + sha512 = "NYUqQGUJKNNEf39ZDzQsGSBlSxsTV47S0LPLvAy+7jlOXw9ZiITJC2bX9s3DHotN0rPm+asBGs3aZeUWb+Ygyw=="; }; }; - "n8n-design-system-0.53.0" = { + "n8n-design-system-0.56.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.53.0"; + version = "0.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.53.0.tgz"; - sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.56.0.tgz"; + sha512 = "DY7U6jCp9MxHc0n69WqdGSVBCZTv4O5S/FuPrppYWH+OkI2kZxxidFi28HmTM/VnQo53A3pKFG5oDBbZDFt8wA=="; }; }; - "n8n-editor-ui-0.181.1" = { + "n8n-editor-ui-0.184.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.181.1"; + version = "0.184.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz"; - sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.184.0.tgz"; + sha512 = "fXxMKEhcgx205P5flp1sqTinrgtZIL6xthCZ92uEoT90pnTiZ54nCCgmY8QftMwhuAgomaJ/Ud6i93LJo0CA8A=="; }; }; - "n8n-nodes-base-0.213.1" = { + "n8n-nodes-base-0.216.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.213.1"; + version = "0.216.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz"; - sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.216.0.tgz"; + sha512 = "/78YbR/SQCXrkYNwco7Y2kzu+IneHNDPULfySPgbstqFrpiUvJhcaQbb7fAVGA/L/C+Wk9+EEXknZdjrvFVzow=="; }; }; - "n8n-workflow-0.136.1" = { + "n8n-workflow-0.139.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.136.1"; + version = "0.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz"; - sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.139.0.tgz"; + sha512 = "dNf58QHqORHQCpxPlrkydonKapKo+goNRIvS43L5zupNsLqvGbvu8p6GkdeUQwXEO7RnJ/xcUIaLrKMm+8nE9A=="; }; }; "named-placeholders-1.1.3" = { @@ -7402,13 +7807,13 @@ let sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.4" = { + "node-html-parser-6.1.5" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.4"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.4.tgz"; - sha512 = "3muP9Uy/Pz7bQa9TNYVQzWJhNZMqyCx7xJle8kz2/y1UgzAUyXXShc1IcPaJy6u07CE3K5rQcRwlvHzmlySRjg=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.5.tgz"; + sha512 = "fAaM511feX++/Chnhe475a0NHD8M7AxDInsqQpz6x63GRF7xYNdS8Vo5dKsIVPgsOvG7eioRRTZQnWBrhDHBSg=="; }; }; "node-machine-id-1.1.12" = { @@ -7447,15 +7852,6 @@ let sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; - "nodemailer-6.8.0" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; - sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; - }; - }; "nodemailer-6.9.1" = { name = "nodemailer"; packageName = "nodemailer"; @@ -7591,6 +7987,15 @@ let sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -7690,13 +8095,13 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.4.1" = { + "open-8.4.2" = { name = "open"; packageName = "open"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; - sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; + url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; + sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; }; }; "openapi-types-10.0.0" = { @@ -7861,6 +8266,15 @@ let sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; "param-case-3.0.4" = { name = "param-case"; packageName = "param-case"; @@ -8266,13 +8680,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.30" = { + "pinia-2.0.32" = { name = "pinia"; packageName = "pinia"; - version = "2.0.30"; + version = "2.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; - sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.32.tgz"; + sha512 = "8Tw4OrpCSJ028UUyp0gYPP/wyjigLoEceuO/x1G+FlHVf73337e5vLm4uDmrRIoBG1hvaed/eSHnrCFjOc4nkA=="; }; }; "popsicle-12.1.0" = { @@ -8392,13 +8806,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.4.0" = { + "posthog-node-2.5.4" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.4.0"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; - sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.5.4.tgz"; + sha512 = "CdywlVh0CZU05/3MrBc0qY/zsLdU2X9XSz/yL1qMRhbyZhD8lrnuGlI69G2cpzZtli6S/nu64wcmULz/mFFA5w=="; }; }; "prebuild-install-7.1.1" = { @@ -8770,6 +9184,15 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "raw-body-2.5.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -8797,22 +9220,22 @@ let sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readable-web-to-node-stream-3.0.2" = { @@ -8869,6 +9292,15 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; + "redis-4.6.5" = { + name = "redis"; + packageName = "redis"; + version = "4.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-4.6.5.tgz"; + sha512 = "O0OWA36gDQbswOdUuAhRL6mTZpHFN525HlgZgDaVNgCJIAZR3ya06NTESb0R+TUZ+BFaDpz6NnnVvoMx9meUFg=="; + }; + }; "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; @@ -9193,13 +9625,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.7.3" = { + "samlify-2.8.10" = { + name = "samlify"; + packageName = "samlify"; + version = "2.8.10"; + src = fetchurl { + url = "https://registry.npmjs.org/samlify/-/samlify-2.8.10.tgz"; + sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; + }; + }; + "sanitize-html-2.9.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.7.3"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.3.tgz"; - sha512 = "jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.9.0.tgz"; + sha512 = "KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg=="; }; }; "sax-1.2.1" = { @@ -9445,13 +9886,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.16.0" = { + "simple-git-3.17.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; - sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.17.0.tgz"; + sha512 = "JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw=="; }; }; "simple-lru-cache-0.0.2" = { @@ -9499,13 +9940,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.18" = { + "snowflake-sdk-1.6.19" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.18"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; - sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.19.tgz"; + sha512 = "aTN9/aqIy7oqz3KPb4iJVfmG7na+FvEQgJVZtSHODAnhOAH4OVBtvdlTTK15rld5NixxYYhIyzi1K6oXythEPA=="; }; }; "socks-2.7.1" = { @@ -9769,6 +10210,15 @@ let sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; + "stop-iteration-iterator-1.0.0" = { + name = "stop-iteration-iterator"; + packageName = "stop-iteration-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"; + sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ=="; + }; + }; "stoppable-1.1.0" = { name = "stoppable"; packageName = "stoppable"; @@ -9976,22 +10426,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.15.5" = { + "swagger-ui-dist-4.17.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.5"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; - sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.17.0.tgz"; + sha512 = "31zNkTaOItkhyoKQMs1HIRZ+0kwBPcmp1R0TcVsAmZpT8QGWFI6k9wfTfllQ1t2oE8IoHVUwL5V0VTAKUosvNg=="; }; }; - "swagger-ui-express-4.6.0" = { + "swagger-ui-express-4.6.2" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.6.0"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.0.tgz"; - sha512 = "ZxpQFp1JR2RF8Ar++CyJzEDdvufa08ujNUJgMVTMWPi86CuQeVdBtvaeO/ysrz6dJAYXf9kbVNhWD7JWocwqsA=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.2.tgz"; + sha512 = "MHIOaq9JrTTB3ygUJD+08PbjM5Tt/q7x80yz9VTFIatw8j5uIWKcr90S0h5NLMzFEDC6+eVprtoeA5MDZXCUKQ=="; }; }; "syslog-client-1.1.1" = { @@ -10291,15 +10741,6 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; - "tough-cookie-4.1.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"; - sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; - }; - }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -10453,6 +10894,15 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; + "typedi-0.10.0" = { + name = "typedi"; + packageName = "typedi"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typedi/-/typedi-0.10.0.tgz"; + sha512 = "v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w=="; + }; + }; "typeorm-0.3.12" = { name = "typeorm"; packageName = "typeorm"; @@ -10525,6 +10975,15 @@ let sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; + "underscore-1.13.6" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.6"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; "unescape-1.0.1" = { name = "unescape"; packageName = "unescape"; @@ -10570,15 +11029,6 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-0.2.0" = { - name = "universalify"; - packageName = "universalify"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"; - sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; - }; - }; "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; @@ -10669,6 +11119,15 @@ let sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; + "utf-8-validate-6.0.3" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz"; + sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA=="; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -11056,6 +11515,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-collection-1.0.1" = { + name = "which-collection"; + packageName = "which-collection"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; + sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; + }; + }; "which-typed-array-1.1.9" = { name = "which-typed-array"; packageName = "which-typed-array"; @@ -11182,13 +11650,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.12.0" = { + "ws-8.12.1" = { name = "ws"; packageName = "ws"; - version = "8.12.0"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz"; - sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; + url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; + sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; }; }; "xlsx-0.17.5" = { @@ -11200,6 +11668,24 @@ let sha512 = "lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g=="; }; }; + "xml-1.0.1" = { + name = "xml"; + packageName = "xml"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"; + sha512 = "huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw=="; + }; + }; + "xml-crypto-3.0.1" = { + name = "xml-crypto"; + packageName = "xml-crypto"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.0.1.tgz"; + sha512 = "7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw=="; + }; + }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -11236,6 +11722,15 @@ let sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; + "xpath-0.0.32" = { + name = "xpath"; + packageName = "xpath"; + version = "0.0.32"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; + sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; + }; + }; "xpath.js-1.1.0" = { name = "xpath.js"; packageName = "xpath.js"; @@ -11335,13 +11830,13 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.6.2" = { + "yargs-17.7.1" = { name = "yargs"; packageName = "yargs"; - version = "17.6.2"; + version = "17.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"; - sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"; + sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; }; }; "yargs-parser-20.2.9" = { @@ -11386,10 +11881,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.215.1"; + version = "0.218.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz"; - sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.218.0.tgz"; + sha512 = "U8BRKXk1rQxF8QwPJfZwNJ9K0uTdxPXzulN1EQokOwm12MzRCBIocTYzTzGu9I8pHvyQMhcev8T4zLmZd5bvhw=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11403,31 +11898,43 @@ in sources."js-yaml-4.1.0" ]; }) + sources."@authenio/xml-encryption-2.0.2" sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.4.0" - sources."@azure/core-client-1.7.1" - (sources."@azure/core-http-2.3.1" // { + (sources."@azure/core-client-1.7.2" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + ]; + }) + (sources."@azure/core-http-3.0.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tough-cookie-4.1.2" - sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" sources."@azure/core-lro-2.5.1" sources."@azure/core-paging-1.5.0" - sources."@azure/core-rest-pipeline-1.10.1" - sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.1.1" - (sources."@azure/identity-2.1.0" // { + (sources."@azure/core-rest-pipeline-1.10.2" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) + sources."@azure/core-tracing-1.0.0-preview.12" + sources."@azure/core-util-1.2.0" + (sources."@azure/identity-1.5.2" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" - sources."open-8.4.1" ]; }) - sources."@azure/keyvault-keys-4.6.0" - sources."@azure/logger-1.0.3" + (sources."@azure/keyvault-keys-4.6.0" // { + dependencies = [ + sources."@azure/core-tracing-1.0.1" + ]; + }) + sources."@azure/logger-1.0.4" sources."@azure/ms-rest-azure-env-2.0.0" (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ @@ -11441,27 +11948,28 @@ in sources."@azure/msal-common-10.0.0" ]; }) - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.15.0" // { + sources."@azure/msal-common-4.5.1" + (sources."@azure/msal-node-1.0.0-beta.6" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."jsonwebtoken-8.5.1" + sources."semver-5.7.1" ]; }) - (sources."@azure/storage-blob-12.12.0" // { + (sources."@azure/storage-blob-12.13.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - sources."@babel/parser-7.20.15" - sources."@babel/runtime-7.20.13" - sources."@codemirror/autocomplete-6.4.0" - sources."@codemirror/commands-6.2.0" + sources."@babel/parser-7.21.2" + sources."@babel/runtime-7.21.0" + sources."@codemirror/autocomplete-6.4.2" + sources."@codemirror/commands-6.2.1" sources."@codemirror/lang-css-6.0.2" - sources."@codemirror/lang-javascript-6.1.3" - sources."@codemirror/language-6.5.0" - sources."@codemirror/lint-6.1.0" + sources."@codemirror/lang-javascript-6.1.4" + sources."@codemirror/language-6.6.0" + sources."@codemirror/lint-6.2.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.8.1" + sources."@codemirror/view-6.9.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11482,24 +11990,14 @@ in }) sources."@fortawesome/vue-fontawesome-2.0.10" sources."@gar/promisify-1.1.3" - (sources."@google-cloud/common-3.10.0" // { - dependencies = [ - sources."duplexify-4.1.2" - sources."readable-stream-3.6.0" - ]; - }) + sources."@google-cloud/common-3.10.0" sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/spanner-5.18.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."through2-4.0.2" - ]; - }) + sources."@google-cloud/spanner-5.18.0" (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.4" + sources."@grpc/proto-loader-0.7.5" sources."long-5.2.1" sources."protobufjs-7.2.2" sources."yargs-16.2.0" @@ -11521,20 +12019,20 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@js-joda/core-5.5.2" + sources."@js-joda/core-3.2.0" sources."@jsdevtools/ono-7.1.3" - sources."@jsplumb/browser-ui-5.13.2" - sources."@jsplumb/common-5.13.2" - sources."@jsplumb/connector-bezier-5.13.2" - sources."@jsplumb/core-5.13.2" - sources."@jsplumb/util-5.13.2" + sources."@jsplumb/browser-ui-5.13.4" + sources."@jsplumb/common-5.13.4" + sources."@jsplumb/connector-bezier-5.13.4" + sources."@jsplumb/core-5.13.4" + sources."@jsplumb/util-5.13.4" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" - sources."@lezer/html-1.3.1" + sources."@lezer/html-1.3.3" sources."@lezer/javascript-1.4.1" sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" @@ -11555,7 +12053,7 @@ in }) sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.8" - (sources."@oclif/core-1.26.1" // { + (sources."@oclif/core-1.26.2" // { dependencies = [ sources."supports-color-8.1.1" sources."wrap-ansi-7.0.0" @@ -11588,53 +12086,59 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@redis/bloom-1.2.0" + (sources."@redis/client-1.5.6" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + sources."@redis/graph-1.1.0" + sources."@redis/json-1.0.4" + sources."@redis/search-1.1.2" + sources."@redis/time-series-1.0.4" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ sources."bull-3.29.3" sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.15.19" // { + (sources."@sap/hana-client-2.15.22" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - (sources."@selderee/plugin-htmlparser2-0.10.0" // { - dependencies = [ - sources."domhandler-5.0.3" - ]; - }) - (sources."@sentry/core-7.37.1" // { + sources."@selderee/plugin-htmlparser2-0.10.0" + (sources."@sentry/core-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.37.1" // { + (sources."@sentry/integrations-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.37.1" // { + (sources."@sentry/node-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.37.1" - (sources."@sentry/utils-7.37.1" // { + sources."@sentry/types-7.40.0" + (sources."@sentry/utils-7.40.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.35" - sources."@swc/wasm-1.3.35" + sources."@swc/core-1.3.37" + sources."@swc/wasm-1.3.37" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" - sources."@tootallnate/once-2.0.0" + sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -11654,7 +12158,7 @@ in sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.13.0" + sources."@types/node-18.14.6" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11663,14 +12167,14 @@ in sources."@types/pumpify-1.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/stack-trace-0.0.29" sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.0" - sources."@types/validator-13.7.12" + sources."@types/uuid-9.0.1" + sources."@types/validator-13.7.13" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11695,11 +12199,7 @@ in }) sources."adler-32-1.2.0" sources."agent-base-6.0.2" - (sources."agentkeepalive-4.2.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) + sources."agentkeepalive-4.3.0" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" @@ -11724,7 +12224,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."arg-4.1.3" @@ -11754,7 +12254,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1313.0" // { + (sources."aws-sdk-2.1328.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11788,19 +12288,20 @@ in sources."better-sqlite3-8.1.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" - sources."bignumber.js-2.4.0" + sources."bignumber.js-9.1.1" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" sources."bindings-1.5.0" sources."bintrees-1.0.2" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."buffer-5.7.1" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-2.11.0" sources."bn.js-4.12.0" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" sources."iconv-lite-0.4.24" @@ -11812,8 +12313,8 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-4.7.2" - sources."buffer-5.7.1" + sources."bson-1.1.6" + sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" @@ -11821,7 +12322,7 @@ in sources."bufferutil-4.0.7" (sources."bull-4.10.4" // { dependencies = [ - sources."cron-parser-4.7.1" + sources."cron-parser-4.8.0" ]; }) sources."busboy-1.6.0" @@ -11841,6 +12342,7 @@ in sources."callback-stream-1.1.0" sources."callsites-3.1.0" sources."camel-case-4.1.2" + sources."camelcase-6.3.0" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -11857,24 +12359,39 @@ in dependencies = [ sources."async-2.6.4" sources."split-array-stream-1.0.3" + sources."through2-2.0.5" + ]; + }) + (sources."cheerio-1.0.0-rc.6" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" + sources."htmlparser2-6.1.0" + sources."parse5-6.0.1" + ]; + }) + (sources."cheerio-select-1.6.0" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" ]; }) - sources."cheerio-1.0.0-rc.6" - sources."cheerio-select-1.6.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" + sources."class-transformer-0.5.1" sources."class-validator-0.14.0" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" sources."cli-cursor-3.1.0" (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."parse5-5.1.1" sources."yargs-16.2.0" ]; }) - sources."cli-progress-3.11.2" + sources."cli-progress-3.12.0" sources."cli-width-3.0.0" sources."client-oauth2-4.3.3" (sources."cliui-7.0.4" // { @@ -11928,7 +12445,7 @@ in }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.27.2" + sources."core-js-3.29.0" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."create-require-1.1.1" @@ -11943,7 +12460,13 @@ in sources."crypt-0.0.2" sources."crypto-js-4.1.1" sources."csrf-3.1.0" - sources."css-select-4.3.0" + (sources."css-select-4.3.0" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" + ]; + }) sources."css-what-6.1.0" sources."cssfilter-0.0.10" sources."csstype-3.1.1" @@ -11960,6 +12483,11 @@ in sources."debuglog-1.0.1" sources."decode-uri-component-0.2.2" sources."decompress-response-6.0.0" + (sources."deep-equal-2.2.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" @@ -11978,19 +12506,27 @@ in sources."digest-header-1.0.0" sources."dir-glob-3.0.1" sources."dom-iterator-1.0.0" - sources."dom-serializer-1.4.1" + (sources."dom-serializer-2.0.0" // { + dependencies = [ + sources."entities-4.4.0" + ]; + }) sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" - sources."duplexify-3.7.1" + (sources."duplexify-4.1.2" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."element-ui-2.15.12" + sources."element-ui-2.15.13" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" @@ -12004,6 +12540,11 @@ in sources."es-abstract-1.21.1" sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" + (sources."es-get-iterator-1.1.3" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" @@ -12027,9 +12568,12 @@ in sources."expand-tilde-2.0.2" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."cookie-0.5.0" sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ms-2.0.0" + sources."raw-body-2.5.1" ]; }) sources."express-async-errors-3.1.1" @@ -12125,7 +12669,6 @@ in sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ - sources."@tootallnate/once-1.1.2" sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -12158,12 +12701,7 @@ in sources."yallist-4.0.0" ]; }) - (sources."google-gax-2.30.5" // { - dependencies = [ - sources."duplexify-4.1.2" - sources."readable-stream-3.6.0" - ]; - }) + sources."google-gax-2.30.5" sources."google-p12-pem-3.1.4" sources."google-timezones-json-1.0.2" sources."gopd-1.0.1" @@ -12190,23 +12728,26 @@ in sources."he-1.2.0" sources."header-case-2.0.4" sources."heap-0.2.7" - sources."help-me-1.1.0" + (sources."help-me-1.1.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - (sources."html-to-text-9.0.3" // { + (sources."html-to-text-9.0.4" // { dependencies = [ sources."deepmerge-4.3.0" - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" + ]; + }) + (sources."htmlparser2-8.0.1" // { + dependencies = [ sources."entities-4.4.0" - sources."htmlparser2-8.0.1" ]; }) - sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http-proxy-agent-5.0.0" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-duration-3.28.0" @@ -12249,7 +12790,7 @@ in sources."is-3.3.0" sources."is-absolute-1.0.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -12265,6 +12806,7 @@ in sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-lambda-1.0.1" + sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -12276,6 +12818,7 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-stream-ended-0.1.4" @@ -12284,31 +12827,29 @@ in sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.6.5" + sources."isbot-3.6.6" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.11.4" + sources."jose-4.13.1" sources."jquery-3.6.3" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" - sources."jsbi-4.3.0" + sources."jsbi-3.2.5" sources."jsbn-0.1.1" sources."jsesc-3.0.2" - (sources."json-bigint-1.0.0" // { - dependencies = [ - sources."bignumber.js-9.1.1" - ]; - }) + sources."json-bigint-1.0.0" sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -12319,6 +12860,7 @@ in (sources."jsonpath-1.1.1" // { dependencies = [ sources."esprima-1.2.2" + sources."underscore-1.12.1" ]; }) sources."jsonschema-1.4.1" @@ -12329,7 +12871,7 @@ in sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" - (sources."ldapts-4.2.2" // { + (sources."ldapts-4.2.4" // { dependencies = [ sources."uuid-9.0.0" ]; @@ -12338,8 +12880,8 @@ in sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - sources."libmime-5.2.0" - sources."libphonenumber-js-1.10.19" + sources."libmime-5.2.1" + sources."libphonenumber-js-1.10.21" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12353,36 +12895,64 @@ in }) sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash.assign-4.2.0" + sources."lodash.assignwith-4.2.0" sources."lodash.camelcase-4.3.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" + sources."lodash.compact-3.0.1" + sources."lodash.concat-4.5.0" sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.every-4.6.0" + sources."lodash.find-4.6.0" + sources."lodash.first-3.0.0" sources."lodash.flatten-4.4.0" + sources."lodash.flow-3.5.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.intersection-4.4.0" sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-4.0.0" sources."lodash.isboolean-3.0.3" + sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" sources."lodash.isinteger-4.0.4" sources."lodash.isnumber-3.0.3" + sources."lodash.isobject-3.0.2" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.iteratee-4.7.0" + sources."lodash.last-3.0.0" + sources."lodash.lt-3.9.2" + sources."lodash.map-4.6.0" sources."lodash.merge-4.6.2" + sources."lodash.mergewith-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" + sources."lodash.partialright-4.2.1" sources."lodash.pick-4.4.0" + sources."lodash.pickby-4.6.0" + sources."lodash.reduce-4.6.0" sources."lodash.remove-4.7.0" sources."lodash.set-4.3.2" sources."lodash.snakecase-4.1.1" + sources."lodash.some-4.6.0" + sources."lodash.sortby-4.7.0" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" + sources."lodash.tonumber-4.0.3" + sources."lodash.tostring-4.1.4" + sources."lodash.trim-4.5.1" + sources."lodash.union-4.6.0" sources."lodash.unionby-4.8.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" + sources."lodash.upperfirst-4.3.1" + sources."lodash.zip-4.2.0" sources."lodash.zipobject-4.1.3" sources."logform-2.5.1" sources."long-4.0.0" @@ -12391,14 +12961,17 @@ in sources."lru-cache-4.0.2" sources."lru-memoizer-2.2.0" sources."lru_map-0.3.3" - sources."luxon-3.2.1" - (sources."mailparser-3.6.3" // { + sources."luxon-3.3.0" + (sources."mailparser-3.6.4" // { dependencies = [ sources."linkify-it-4.0.1" - sources."nodemailer-6.8.0" ]; }) - sources."mailsplit-5.4.0" + (sources."mailsplit-5.4.0" // { + dependencies = [ + sources."libmime-5.2.0" + ]; + }) (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -12408,11 +12981,8 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" sources."lru-cache-6.0.0" sources."minipass-3.3.6" - sources."socks-proxy-agent-6.2.1" sources."yallist-4.0.0" ]; }) @@ -12442,7 +13012,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-4.0.3" + sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12488,9 +13058,13 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.40" + sources."moment-timezone-0.5.41" sources."monaco-editor-0.33.0" - sources."mongodb-4.14.0" + (sources."mongodb-3.7.3" // { + dependencies = [ + sources."bl-2.2.1" + ]; + }) (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" @@ -12501,7 +13075,10 @@ in (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."pump-3.0.0" + sources."readable-stream-3.6.1" + sources."split2-3.2.2" + sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; }) @@ -12512,12 +13089,8 @@ in sources."tslib-1.14.1" ]; }) - sources."msgpackr-1.8.3" - (sources."mssql-8.1.4" // { - dependencies = [ - sources."commander-9.5.0" - ]; - }) + sources."msgpackr-1.8.4" + sources."mssql-7.3.5" sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { @@ -12528,33 +13101,61 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.154.1" // { + (sources."n8n-core-0.157.0" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) - (sources."n8n-design-system-0.53.0" // { + (sources."n8n-design-system-0.56.0" // { dependencies = [ sources."argparse-2.0.1" sources."markdown-it-12.3.2" sources."vue2-boring-avatars-0.3.8" ]; }) - sources."n8n-editor-ui-0.181.1" - (sources."n8n-nodes-base-0.213.1" // { + sources."n8n-editor-ui-0.184.0" + (sources."n8n-nodes-base-0.216.0" // { dependencies = [ + sources."@azure/core-tracing-1.0.1" + sources."@azure/identity-2.1.0" + sources."@azure/msal-common-7.6.0" + (sources."@azure/msal-node-1.15.0" // { + dependencies = [ + sources."@azure/msal-common-10.0.0" + ]; + }) + sources."@js-joda/core-5.5.2" + (sources."bl-5.1.0" // { + dependencies = [ + sources."buffer-6.0.3" + ]; + }) + sources."bson-4.7.2" + sources."buffer-5.7.1" sources."chokidar-3.5.2" + sources."commander-9.5.0" + sources."jsbi-4.3.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."mongodb-4.14.0" + sources."mssql-8.1.4" + sources."node-abort-controller-3.1.1" + sources."open-8.4.2" + sources."readable-stream-3.6.1" + sources."redis-3.1.2" + sources."sprintf-js-1.1.2" + sources."tedious-14.7.0" ]; }) - (sources."n8n-workflow-0.136.1" // { + (sources."n8n-workflow-0.139.0" // { dependencies = [ sources."ast-types-0.15.2" ]; }) (sources."named-placeholders-1.1.3" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.18.3" ]; }) sources."nan-2.17.0" @@ -12569,7 +13170,7 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-abi-3.33.0" - sources."node-abort-controller-3.1.1" + sources."node-abort-controller-2.0.0" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.9" @@ -12579,19 +13180,15 @@ in sources."are-we-there-yet-3.0.1" sources."gauge-4.0.4" sources."npmlog-6.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."which-2.0.2" ]; }) sources."node-gyp-build-4.6.0" sources."node-html-markdown-1.3.0" - (sources."node-html-parser-6.1.4" // { + (sources."node-html-parser-6.1.5" // { dependencies = [ sources."css-select-5.1.0" - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" - sources."entities-4.4.0" ]; }) sources."node-machine-id-1.1.12" @@ -12611,6 +13208,7 @@ in sources."object-assign-4.1.1" sources."object-hash-3.0.0" sources."object-inspect-1.12.3" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" @@ -12638,8 +13236,7 @@ in sources."p-timeout-3.2.0" (sources."pac-proxy-agent-5.0.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" + sources."socks-proxy-agent-5.0.1" ]; }) (sources."pac-resolver-5.0.1" // { @@ -12648,12 +13245,17 @@ in ]; }) sources."packet-reader-1.0.0" + sources."pako-1.0.11" sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" - sources."parse5-6.0.1" - sources."parse5-htmlparser2-tree-adapter-6.0.1" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseley-0.11.0" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" @@ -12706,14 +13308,10 @@ in sources."pg-protocol-1.6.0" sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" - (sources."pgpass-1.0.5" // { - dependencies = [ - sources."split2-4.1.0" - ]; - }) + sources."pgpass-1.0.5" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.30" + sources."pinia-2.0.32" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -12726,12 +13324,16 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.4.0" // { + (sources."posthog-node-2.5.4" // { dependencies = [ sources."axios-0.27.2" ]; }) - sources."prebuild-install-7.1.1" + (sources."prebuild-install-7.1.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) sources."prelude-ls-1.1.2" sources."prettier-2.8.4" sources."pretty-bytes-5.6.0" @@ -12752,19 +13354,18 @@ in sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."http-proxy-agent-4.0.1" sources."lru-cache-5.1.1" + sources."socks-proxy-agent-5.0.1" sources."yallist-3.1.1" ]; }) sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-2.0.1" (sources."pumpify-1.5.1" // { dependencies = [ - sources."pump-2.0.1" + sources."duplexify-3.7.1" ]; }) sources."punycode-2.3.0" @@ -12778,20 +13379,20 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { + (sources."raw-body-2.5.2" // { dependencies = [ sources."iconv-lite-0.4.24" ]; }) sources."rc-1.2.8" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."readdirp-3.6.0" @@ -12802,7 +13403,7 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-3.1.2" + sources."redis-4.6.5" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -12860,7 +13461,8 @@ in sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.7.3" // { + sources."samlify-2.8.10" + (sources."sanitize-html-2.9.0" // { dependencies = [ sources."deepmerge-4.3.0" ]; @@ -12906,15 +13508,16 @@ in sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.16.0" + sources."simple-git-3.17.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" - (sources."snowflake-sdk-1.6.18" // { + (sources."snowflake-sdk-1.6.19" // { dependencies = [ sources."axios-0.27.2" + sources."bignumber.js-2.4.0" sources."debug-3.2.7" sources."mkdirp-1.0.4" sources."tmp-0.2.1" @@ -12922,18 +13525,14 @@ in ]; }) sources."socks-2.7.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.2.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" sources."spex-3.2.0" sources."split-array-stream-2.0.0" sources."split-on-first-1.1.0" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."split2-4.1.0" sources."sprintf-js-1.0.3" sources."sql.js-1.8.0" sources."sqlite3-5.1.4" @@ -12944,7 +13543,7 @@ in (sources."ssh2-sftp-client-7.2.3" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."sshpk-1.17.0" @@ -12959,10 +13558,11 @@ in sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" + sources."stop-iteration-iterator-1.0.0" sources."stoppable-1.1.0" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-events-1.0.5" @@ -12988,8 +13588,8 @@ in sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.15.5" - sources."swagger-ui-express-4.6.0" + sources."swagger-ui-dist-4.17.0" + sources."swagger-ui-express-4.6.2" sources."syslog-client-1.1.1" (sources."tar-6.1.13" // { dependencies = [ @@ -13000,32 +13600,45 @@ in (sources."tar-fs-2.1.1" // { dependencies = [ sources."chownr-1.1.4" + sources."pump-3.0.0" ]; }) (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."tarn-3.0.2" sources."tdigest-0.1.2" - (sources."tedious-14.7.0" // { + (sources."tedious-11.8.0" // { dependencies = [ sources."bl-5.1.0" - sources."buffer-6.0.3" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."sprintf-js-1.1.2" ]; }) - sources."teeny-request-7.2.0" + (sources."teeny-request-7.2.0" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."throttle-debounce-1.1.0" sources."through-2.3.8" - sources."through2-2.0.5" - sources."through2-filter-3.0.0" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) + (sources."through2-filter-3.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) sources."throwback-4.1.0" sources."timeago.js-4.0.2" sources."tinycolor2-1.6.0" @@ -13048,7 +13661,7 @@ in dependencies = [ sources."cliui-8.0.1" sources."wrap-ansi-7.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; }) @@ -13065,53 +13678,19 @@ in sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" + sources."typedi-0.10.0" (sources."typeorm-0.3.12" // { dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.12" - (sources."@azure/identity-1.5.2" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@azure/msal-common-4.5.1" - (sources."@azure/msal-node-1.0.0-beta.6" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" - sources."bl-2.2.1" - sources."bson-1.1.6" - sources."buffer-6.0.3" sources."cliui-8.0.1" sources."dotenv-16.0.3" sources."glob-8.1.0" sources."js-yaml-4.1.0" - sources."jsbi-3.2.5" - (sources."jsonwebtoken-8.5.1" // { - dependencies = [ - sources."jws-3.2.2" - ]; - }) - sources."jwa-2.0.0" - sources."jws-4.0.0" sources."minimatch-5.1.6" - sources."mkdirp-2.1.3" - sources."mongodb-3.7.3" - sources."mssql-7.3.5" - sources."node-abort-controller-2.0.0" - sources."readable-stream-3.6.0" - sources."semver-5.7.1" - sources."sprintf-js-1.1.2" - (sources."tedious-11.8.0" // { - dependencies = [ - sources."bl-5.1.0" - ]; - }) + sources."mkdirp-2.1.5" sources."uuid-9.0.0" sources."wrap-ansi-7.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; }) @@ -13121,7 +13700,7 @@ in sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.12.1" + sources."underscore-1.13.6" sources."unescape-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -13144,10 +13723,11 @@ in sources."iconv-lite-0.4.24" sources."ip-1.1.8" sources."ms-2.0.0" + sources."pump-3.0.0" sources."statuses-1.5.0" ]; }) - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.3" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -13191,6 +13771,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."widest-line-3.1.0" @@ -13201,12 +13782,12 @@ in }) (sources."winston-3.8.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."wmf-1.0.2" @@ -13215,10 +13796,13 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."xlsx-0.17.5" + sources."xml-1.0.1" + sources."xml-crypto-3.0.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xpath-0.0.32" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" (sources."xss-1.0.14" // { diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index caba7159214..5f148711c82 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,12 @@ let pname = "pcloud"; - version = "1.10.1"; - code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV"; + version = "1.11.0"; + code = "XZspqgVZxM1CCER1we0esiDGuAxshjRSY77X"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI="; + hash = "sha256-EXJ+5LwVF5lTXc5zlppRQLCm0EZwqG3ndfK4LIjmWwc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 47687bb544c..14f8db6a7e8 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,25 +1,67 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, perl, flex, bison -, gettext, libpcap, libnl, c-ares, gnutls, libgcrypt, libgpg-error, geoip, openssl -, lua5, python3, libcap, glib, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook -, withQt ? true, qt5 ? null -, ApplicationServices, SystemConfiguration, gmp +{ lib +, stdenv +, buildPackages +, fetchFromGitLab +, pkg-config +, pcre2 +, perl +, flex +, bison +, gettext +, libpcap +, libnl +, c-ares +, gnutls +, libgcrypt +, libgpg-error +, libmaxminddb +, libopus +, bcg729 +, spandsp3 +, libkrb5 +, speexdsp +, libsmi +, lz4 +, snappy +, zstd +, minizip +, sbc +, openssl +, lua5 +, python3 +, libcap +, glib +, libssh +, nghttp2 +, zlib +, cmake +, ninja +, makeWrapper +, wrapGAppsHook +, withQt ? true +, qt5 ? null +, ApplicationServices +, SystemConfiguration +, gmp , asciidoctor }: -assert withQt -> qt5 != null; +assert withQt -> qt5 != null; let - version = "4.0.3"; + version = "4.0.4"; variant = if withQt then "qt" else "cli"; - -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "wireshark-${variant}"; inherit version; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; + src = fetchFromGitLab { + repo = "wireshark"; + owner = "wireshark"; + rev = "v${version}"; + hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw="; }; cmakeFlags = [ @@ -36,18 +78,41 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] + nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ - gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt - libgpg-error gnutls geoip c-ares glib zlib - ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ lib.optionals stdenv.isLinux [ libcap libnl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + gettext + pcre2 + libpcap + lua5 + libssh + nghttp2 + openssl + libgcrypt + libgpg-error + gnutls + libmaxminddb + libopus + bcg729 + spandsp3 + libkrb5 + speexdsp + libsmi + lz4 + snappy + zstd + minizip + c-ares + glib + zlib + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals (withQt && stdenv.isLinux) [ qt5.qtwayland ] + ++ lib.optionals stdenv.isLinux [ libcap libnl sbc ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -70,22 +135,23 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else lib.optionalString withQt '' - pwd - install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop - - install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg - mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} - - cp config.h $dev/include/wireshark/ - cp ../epan/*.h $dev/include/epan/ - cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ - cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ - cp ../include/ws_*.h $dev/include/ - cp ../wiretap/*.h $dev/include/wiretap/ - cp ../wsutil/*.h $dev/include/wsutil/ - cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ - ''); + '' else + lib.optionalString withQt '' + pwd + install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop + + install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg + mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} + + cp config.h $dev/include/wireshark/ + cp ../epan/*.h $dev/include/epan/ + cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ + cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../include/ws_*.h $dev/include/ + cp ../wiretap/*.h $dev/include/wiretap/ + cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ + ''); dontFixCmake = true; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 181c627f238..18257a34c32 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ledger"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; rev = "v${version}"; - hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic="; + hash = "sha256-CnMzsFKBNiXmatgY7aiK8UCqIL6qifA4KbV6BJaza40="; }; outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ]; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index a6bb64bbdf7..f6e8ac7e640 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; + sha256 = "sha256-DlwAMA/YEnB9Z6Ry1Hvu9R9TgTw737PLtZfAVEKLjPY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index b2554cea7a6..29e4f90a957 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let - version = "2022.10.117"; + version = "2023.4.117"; name = "p3x-onenote-${version}"; plat = { @@ -13,7 +13,7 @@ let sha256 = { aarch64-linux = "0plpwymm1bgzbzwk2689lw1fadxdwxzzn5dmayk1ayxz1k3pj9wi"; armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8"; - x86_64-linux = "12j2py8yb81ngahbkbi7269izpc5aydd432cbv0sw45ighhyqhmr"; + x86_64-linux = "sha256-hr/mPOrliP8Dej3DVE2+wYkb1J789WCkkY3xe9EcM44="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index f4535b59cf8..e2a977cb540 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -318,7 +318,7 @@ python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; - homepage = "https://paperless-ngx.readthedocs.io/"; + homepage = "https://docs.paperless-ngx.com/"; 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/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a18307c7754..545a116d348 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-02-25"; + version = "unstable-2023-03-05"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "e2acd675e6aeac609ae071aa169b2661c1fbd862"; - sha256 = "y7y9DQ6oy/1EuLl4FAkRJd0zzMRm/2OOvnfWtwpf8AU="; + rev = "0208ba3b43d0618f6d25e99bfb68dcd6f2e19868"; + sha256 = "bxiAbD9s+O49t2hV0cdbDnSNMkBZOm6Z1cs7sQwlaYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index e48355660cb..e7275b7a31f 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -6,13 +6,13 @@ let pname = "trilium-desktop"; - version = "0.58.8"; + version = "0.59.1"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; + linuxSource.sha256 = "04jmpz8riz71vzs13yy0prwfq3sji36n7mgap80q2xwx445bxrka"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; + darwinSource.sha256 = "014phlv5mkn5pzbr9gwgy87d57wnkxa6g0pi3k2d4d29fj9v1f44"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 78bae4f4655..3b326680d64 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; - version = "0.58.8"; + serverSource.sha256 = "073hxqszd6sh2fcczs8c1sgby0pg97d3h99rjdrj7y2j85hflp5a"; + version = "0.59.1"; in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index a6e1909a288..d2a49bd578f 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "zk"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-F56jbYVbKegy38MIaEZvmeqp++bz37wFnHswkXt45t0="; + sha256 = "sha256-Q1MU2NGeVjBNnwoAWuoO18xhtt+bdQ2ms37tHnW+R94="; }; - vendorSha256 = "sha256-11GzI3aEhKKTiULoWq9uIc66E3YCrW/HJQUYXRhCaek="; + vendorHash = "sha256-11GzI3aEhKKTiULoWq9uIc66E3YCrW/HJQUYXRhCaek="; doCheck = false; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6fa8462ec10..3eb5b9a679d 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "4.1.0.5"; + version = "4.4.0.0"; outputs = [ "out" "dev" ]; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { owner = "EttusResearch"; repo = "uhd"; rev = "v${version}"; - sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA="; + sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A="; + sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; }; cmakeFlags = [ @@ -116,7 +116,12 @@ stdenv.mkDerivation rec { preConfigure = "cd host"; # TODO: Check if this still needed, perhaps relevant: # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm - patches = if stdenv.isAarch32 then ./neon.patch else null; + patches = [ + # Disable tests that fail in the sandbox + ./no-adapter-tests.patch + ] ++ lib.optionals stdenv.isAarch32 [ + ./neon.patch + ]; postPhases = [ "installFirmware" "removeInstalledTests" ] ++ optionals (enableUtils) [ "moveUdevRules" ] diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/applications/radio/uhd/no-adapter-tests.patch new file mode 100644 index 00000000000..38865f41810 --- /dev/null +++ b/pkgs/applications/radio/uhd/no-adapter-tests.patch @@ -0,0 +1,17 @@ +diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt +index f40c252ad..b8a07d341 100644 +--- i/host/tests/CMakeLists.txt ++++ w/host/tests/CMakeLists.txt +@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST( + ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp + ) + +-UHD_ADD_NONAPI_TEST( +- TARGET "xport_adapter_ctrl_test.cpp" +- EXTRA_SOURCES +- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp +-) +- + ######################################################################## + # demo of a loadable module + ######################################################################## diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 241585b3579..2b34f61ab2c 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-gvPftUSH+Gnn8LQeORpv7jjHewUKSeo2FVNcoaE2GKU="; + sha256 = "sha256-Og1cxEMJ24cncNDD2dXwy58OZ/nJmGdqrMRr5Y6YmHo="; }; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index f6f2f3c43bb..8bd1af4b11d 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.27.5"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-Exyj4GJqPvEug5l5XnpJ+Cm7ToXXG0ib9PIx0hpsMZk="; + sha256 = "sha256-DV4oqzAfrTsCAw0BkjiIEpuoLF9yKsXMstQYq3asVJk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 67f70e7165d..c9382c5d0f1 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -14,13 +14,6 @@ stdenv.mkDerivation rec { hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; - # https://github.com/cubicle-model-checker/cubicle/issues/1 - postPatch = '' - substituteInPlace Makefile.in \ - --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \ - --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num" - ''; - strictDeps = true; nativeBuildInputs = [ @@ -36,6 +29,12 @@ stdenv.mkDerivation rec { num ]; + # https://github.com/cubicle-model-checker/cubicle/issues/1 + env = { + OCAMLC = "ocamlfind ocamlc -package num"; + OCAMLOPT = "ocamlfind ocamlopt -package num"; + }; + meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; homepage = "https://cubicle.lri.fr/"; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 92cad0c61e5..253c88705ae 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -28,14 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/vprover/vampire/pull/55.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) - # https://github.com/vprover/vampire/pull/56 - (fetchpatch { - name = "fenv.patch"; - url = "https://github.com/vprover/vampire/pull/56.patch"; - sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; - }) ]; + postPatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true + ''; + enableParallelBuilding = true; fixupPhase = '' @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://vprover.github.io/"; description = "The Vampire Theorem Prover"; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix new file mode 100644 index 00000000000..ddeba369366 --- /dev/null +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "eigenmath"; + version = "unstable-2023-03-05"; + + src = fetchFromGitHub { + owner = "georgeweigt"; + repo = pname; + rev = "633d5b0b2f2b87b6377bc4f715604f79b17aab66"; + hash = "sha256-5LOSyfeGavWesAR7jqd37Z845iyNstr/cJdQiWHlIPg="; + }; + + patches = [ + # treewide: use $(CC) instead of hardcoding gcc + # https://github.com/georgeweigt/eigenmath/pull/18 + (fetchpatch { + url = "https://github.com/georgeweigt/eigenmath/commit/70551b3624ea25911f6de608c9ee9833885ab0b8.patch"; + hash = "sha256-g2crXOlC5SM1vAq87Vg/2zWMvx9DPFWEPaTrrPbcDZ0="; + }) + ]; + + installPhase = '' + runHook preInstall + install -Dm555 eigenmath "$out/bin/eigenmath" + runHook postInstall + ''; + + meta = with lib;{ + description = "Computer algebra system written in C"; + homepage = "https://georgeweigt.github.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 808d89ef963..ec3bb4c795b 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ] ++ (with ocamlPackages; [ camlp4 lablgl - camlimages_4_2_4 + camlimages + num ]); postPatch = '' @@ -48,6 +49,9 @@ stdenv.mkDerivation rec { substituteInPlace "$f" --replace "+camlp4" \ "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4" done + + # Fatal error: exception Sys_error("Mutex.unlock: Operation not permitted") + sed -i "/gl_started/d" src/draw.ml* src/main.ml ''; installPhase = '' diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index dffc212176b..b42587596fa 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "maxima"; - version = "5.45.1"; + version = "5.46.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; + sha256 = "sha256-c5Dwa0jaZckDPosvYpuXi5AFZFSlQCLbfecOIiWqiwc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index c1a329c6088..240a1759397 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 205fe3ebed5..ee2f62317c0 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.12.0"; + version = "23.02.1"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; + sha256 = "sha256-Lrj/oJNmKlCkNbnCGY2TewCospwajKdWgmKkreHzEIU="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index cfda819a42c..a33af579510 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -261,6 +261,15 @@ stdenv.mkDerivation rec { ]}" ''; + # To use the debug information on the fly (without installation) + # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) + # and make sure that gdb from Nixpkgs can be found in PATH. + # + # Darwin currently fails to support it (#203380) + # we set it to true hoping to benefit from the future fix. + # Before that, please make sure if root.debug exists before using it. + separateDebugInfo = true; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index eb8d892dd62..e3917ce0e01 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-+B3h7ydN+ISElpOMMCcKORYnq1MaMhvr+4I2qHJ26As="; + sha256 = "sha256-ZTsb1xcJ7eeCEPebZW0anmG1SUPAzZakw4WzJql9VTQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 272b875cd7a..db5b58132f2 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -134,7 +134,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne mic92 ma27 ]; + maintainers = with maintainers; [ Br1ght0ne mic92 ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 885f6d1355e..455b7497aa9 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.15.2"; + version = "3.16.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-hIm3JDLXUTwjuVfAHvZBWFBJNOAVWyfl/X4A6B0OoXg="; + hash = "sha256-94qYCyWqVwMMptlJIe4o4/mEHnhcMubcupd+Qs2SYH0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 8bd9d315d00..2e3eeeb3d6f 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.31"; + version = "2.32"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ="; + sha256 = "sha256-WY77F4culQ1y8UDIhI117AHBL5mEk40s8HpP3+5muZI="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix new file mode 100644 index 00000000000..4189822d268 --- /dev/null +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +, testers +, git-stack +}: + +rustPlatform.buildRustPackage rec { + pname = "git-stack"; + version = "0.10.12"; + + src = fetchFromGitHub { + owner = "gitext-rs"; + repo = "git-stack"; + rev = "v${version}"; + hash = "sha256-ghH3wmXLPzJZ4lNXFwEGKD89r7xaRMXUe9kGHm7MC4s="; + }; + + cargoHash = "sha256-5FXcReXgq5LFysPGBuYawFdkYAgRHsW+p2Ytin4+ZxI="; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + # Many tests try to access the file system. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = git-stack; + }; + + meta = with lib; { + description = "Stacked branch management for Git"; + homepage = "https://github.com/gitext-rs/git-stack"; + changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ stehessel ]; + }; +} diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 63d22703d28..f068e7618d0 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.8.3", - "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", + "version": "15.8.4", + "repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=", "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.8.3-ee", + "rev": "v15.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.8.3", - "GITLAB_PAGES_VERSION": "15.8.3", + "GITALY_SERVER_VERSION": "15.8.4", + "GITLAB_PAGES_VERSION": "15.8.4", "GITLAB_SHELL_VERSION": "14.15.0", - "GITLAB_WORKHORSE_VERSION": "15.8.3" + "GITLAB_WORKHORSE_VERSION": "15.8.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index aab5bfbd6a6..53b290066be 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.8.3"; + version = "15.8.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; + sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc="; }; vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 252be4e5631..a01d8aa221f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.8.3"; + version = "15.8.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 467359d9c90..0ddabbb12d8 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-z+butd2JOrMsC3nBUxqsQgdz4PyDejXbPU2ScD30Wpg="; + sha256 = "sha256-E8l/9YnHYF6ApIjzNoUs4dU4xdQUPPszvmm9rd2RV70="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-pJNX0j/Rg3cQanveD7z2x5wixo/jLvHai8Ib2Akmmgk"; + sha256 = "sha256-ZQYNFEbvSwiJ/BSQ0ZxpjFrmyXkKjVJciwz45Br7Rl8="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1841e4ffe22..71adf480485 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -5,7 +5,6 @@ , libsodium , openssl , xxHash -, zstd , darwin , gitImportSupport ? true , libgit2 ? null @@ -13,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.2"; + version = "1.0.0-beta.4"; src = fetchCrate { inherit version pname; - sha256 = "sha256-78nzCOR+AZuiAA1OpKKW4kfdUnlN8+qVaO3dknMck58="; + sha256 = "sha256-Sx+ZbT1EONWiQmC/5f4thfE9mmTulhTmUWeqPkQgJh8="; }; - cargoSha256 = "sha256-IhjN0HjIIuP+P8yfZ3NmZpVZBAuetOr4OVZoI8Qfspo="; + cargoSha256 = "sha256-vc7rkLCy489W7MjJYiN8vg4DNS65/ZSIEAcw0vaQJtU="; doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libsodium xxHash zstd ] + buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index ff91d07e87b..c18683f5327 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -22,6 +22,15 @@ dependencies = [ ] [[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -91,6 +100,15 @@ name = "anyhow" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" [[package]] name = "arc-swap" @@ -155,12 +173,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", - "futures-lite", ] [[package]] @@ -175,9 +192,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "095183a3539c7c7649b2beb87c2d3f0591f3a7fed07761cc546d244e27e0238c" dependencies = [ "proc-macro2", "quote", @@ -185,6 +202,22 @@ dependencies = [ ] [[package]] +name = "atexit" +version = "0.1.0" +dependencies = [ + "once_cell", +] + +[[package]] +name = "atomic" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +dependencies = [ + "autocfg", +] + +[[package]] name = "atomicfile" version = "0.1.0" dependencies = [ @@ -261,6 +294,21 @@ dependencies = [ ] [[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -314,6 +362,7 @@ dependencies = [ "cpython", "cpython_ext", "paste", + "pyatexit", "pyauth", "pyblackbox", "pybytes", @@ -321,7 +370,9 @@ dependencies = [ "pycheckout", "pyclientinfo", "pycliparser", + "pyconchparser", "pyconfigloader", + "pycopytrace", "pydag", "pydiffhelpers", "pydirs", @@ -460,21 +511,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bstr" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "serde", @@ -482,9 +521,9 @@ dependencies = [ [[package]] name = "bufsize" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" +checksum = "51bbc61bc8800fb287f3394487c159af745cdf2e74743f12245d874ce20eb529" dependencies = [ "bytes 1.4.0", ] @@ -543,9 +582,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" dependencies = [ "serde", ] @@ -667,7 +706,6 @@ dependencies = [ "atty", "bitflags", "strsim 0.8.0", - "term_size", "textwrap 0.11.0", "unicode-width", "vec_map", @@ -688,7 +726,7 @@ dependencies = [ "regex", "strsim 0.10.0", "termcolor", - "terminal_size 0.2.3", + "terminal_size 0.2.5", "textwrap 0.16.0", "unicase", ] @@ -784,12 +822,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "quote", ] @@ -839,6 +877,7 @@ dependencies = [ "lazy_static", "log", "mime", + "parking_lot 0.11.2", "regex", "reqwest", "reqwest-eventsource", @@ -872,7 +911,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1008,6 +1047,16 @@ dependencies = [ ] [[package]] +name = "copytrace" +version = "0.1.0" +dependencies = [ + "anyhow", + "dag", + "git2", + "types", +] + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1141,11 +1190,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", - "crossbeam-channel 0.5.6", - "crossbeam-deque 0.8.2", - "crossbeam-epoch 0.9.13", + "crossbeam-channel 0.5.7", + "crossbeam-deque 0.8.3", + "crossbeam-epoch 0.9.14", "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1169,12 +1218,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1190,13 +1239,13 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.13", - "crossbeam-utils 0.8.14", + "crossbeam-epoch 0.9.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1216,14 +1265,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", - "memoffset 0.7.1", + "crossbeam-utils 0.8.15", + "memoffset 0.8.0", "scopeguard", ] @@ -1245,7 +1294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.14", + "crossbeam-utils 0.8.15", ] [[package]] @@ -1271,9 +1320,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] @@ -1289,7 +1338,7 @@ dependencies = [ "libc", "mio 0.7.14", "parking_lot 0.11.2", - "signal-hook 0.3.14", + "signal-hook 0.3.15", "signal-hook-mio", "winapi 0.3.9", ] @@ -1335,13 +1384,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" dependencies = [ - "bstr 0.2.17", "csv-core", - "itoa 0.4.8", + "itoa 1.0.6", "ryu", "serde", ] @@ -1366,6 +1414,16 @@ dependencies = [ ] [[package]] +name = "ctrlc" +version = "3.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +dependencies = [ + "nix 0.26.2", + "windows-sys 0.45.0", +] + +[[package]] name = "curl" version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1382,9 +1440,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.59+curl-7.86.0" +version = "0.4.60+curl-7.88.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" dependencies = [ "cc", "libc", @@ -1398,9 +1456,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -1410,9 +1468,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -1425,15 +1483,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -1527,7 +1585,8 @@ dependencies = [ [[package]] name = "deltae" version = "0.3.0" -source = "git+https://github.com/markbt/deltae?rev=1c6e9c7c9184751bd17795d78896d522e77a2ce4#1c6e9c7c9184751bd17795d78896d522e77a2ce4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412cd91a4ec62fcc739ea50c40babe21e3de60d69f36393cce377c7c04ead5a" [[package]] name = "dev-logger" @@ -1581,15 +1640,6 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" @@ -1944,9 +1994,9 @@ checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1954,7 +2004,7 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#d35b962b6f3dc787ed64c8d6b1b49a986e69f4d0" +source = "git+https://github.com/facebook/fb303.git?branch=main#5d78ac1eb00320cb53f4333c5c55fecf51177393" dependencies = [ "anyhow", "async-trait", @@ -1975,7 +2025,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "fbinit_macros", "quickcheck", @@ -1984,7 +2034,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "proc-macro2", "quote", @@ -1994,7 +2044,7 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5641439382254134d192ca8fe3c9af23f87b5fa" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#a8ffeb94383c4c6dbdff5997a49851e830a18984" dependencies = [ "anyhow", "async-trait", @@ -2015,7 +2065,7 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "byteorder", "bytes 1.4.0", @@ -2025,7 +2075,7 @@ dependencies = [ [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "bytes 1.4.0", @@ -2042,7 +2092,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "tokio", ] @@ -2060,14 +2110,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2092,7 +2142,7 @@ dependencies = [ "crc32fast", "futures 0.1.31", "libc", - "miniz_oxide", + "miniz_oxide 0.4.4", "tokio-io", ] @@ -2149,25 +2199,6 @@ dependencies = [ ] [[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - -[[package]] name = "fsinfo" version = "0.1.0" dependencies = [ @@ -2201,22 +2232,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] name = "futures" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2238,17 +2253,6 @@ dependencies = [ ] [[package]] -name = "futures-batch" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" -dependencies = [ - "futures 0.3.26", - "futures-timer", - "pin-utils", -] - -[[package]] name = "futures-channel" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2397,6 +2401,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] name = "git2" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2449,7 +2459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.2.0", + "bstr", "fnv", "log", "regex", @@ -2457,9 +2467,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes 1.4.0", "fnv", @@ -2470,7 +2480,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", ] @@ -2660,8 +2670,10 @@ name = "hgmain" version = "0.1.0" dependencies = [ "anyhow", + "atexit", "clidispatch", "configloader", + "ctrlc", "dirs 2.0.2", "encoding", "hgcommands", @@ -2693,7 +2705,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "lazy_static", ] @@ -2701,7 +2713,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2720,13 +2732,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes 1.4.0", "fnv", - "itoa 1.0.5", + "itoa 1.0.6", ] [[package]] @@ -2817,7 +2829,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa 1.0.6", "pin-project-lite", "socket2", "tokio", @@ -2936,7 +2948,7 @@ dependencies = [ "fs2", "hex", "libc", - "memmap", + "memmap2", "minibench", "minibytes", "once_cell", @@ -2955,6 +2967,7 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ + "arbitrary", "autocfg", "hashbrown 0.12.3", "rayon", @@ -2962,30 +2975,10 @@ dependencies = [ ] [[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] name = "insta" -version = "1.26.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" dependencies = [ "console", "lazy_static", @@ -3089,15 +3082,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -3134,12 +3127,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] name = "lazystr" version = "0.1.0" @@ -3328,9 +3315,7 @@ name = "manifest-tree" version = "0.1.0" dependencies = [ "anyhow", - "async-runtime", - "futures 0.3.26", - "futures-batch", + "crossbeam 0.8.2", "manifest", "minibench", "minibytes", @@ -3341,7 +3326,7 @@ dependencies = [ "quickcheck", "rand 0.8.5", "rand_chacha 0.3.1", - "sha-1", + "sha1", "storemodel", "thiserror", "tracing", @@ -3388,20 +3373,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -3432,9 +3407,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -3523,7 +3498,7 @@ name = "minibytes" version = "0.1.0" dependencies = [ "bytes 1.4.0", - "memmap", + "memmap2", "quickcheck", "serde", ] @@ -3545,22 +3520,12 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.6.23" +name = "miniz_oxide" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", + "adler", ] [[package]] @@ -3571,45 +3536,21 @@ checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", - "miow 0.3.7", + "miow", "ntapi", "winapi 0.3.9", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3628,9 +3569,11 @@ dependencies = [ "anyhow", "clap 3.2.23", "dirs 2.0.2", + "hex", "identity", "libc", "serde", + "sha2 0.10.6", "toml", ] @@ -3703,17 +3646,6 @@ dependencies = [ ] [[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] name = "network-doctor" version = "0.1.0" dependencies = [ @@ -3742,6 +3674,18 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "static_assertions", +] + +[[package]] name = "nodemap" version = "0.1.0" dependencies = [ @@ -3781,24 +3725,6 @@ dependencies = [ ] [[package]] -name = "notify" -version = "4.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio 0.6.23", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - -[[package]] name = "ntapi" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3878,10 +3804,19 @@ dependencies = [ ] [[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -4109,9 +4044,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -4119,9 +4054,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -4129,9 +4064,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", @@ -4142,9 +4077,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.4" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", @@ -4427,6 +4362,15 @@ dependencies = [ ] [[package]] +name = "pyatexit" +version = "0.1.0" +dependencies = [ + "atexit", + "cpython", + "cpython_ext", +] + +[[package]] name = "pyauth" version = "0.1.0" dependencies = [ @@ -4515,6 +4459,15 @@ dependencies = [ ] [[package]] +name = "pyconchparser" +version = "0.1.0" +dependencies = [ + "conch-parser", + "cpython", + "cpython_ext", +] + +[[package]] name = "pyconfigloader" version = "0.1.0" dependencies = [ @@ -4527,6 +4480,17 @@ dependencies = [ ] [[package]] +name = "pycopytrace" +version = "0.1.0" +dependencies = [ + "copytrace", + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "types", +] + +[[package]] name = "pydag" version = "0.1.0" dependencies = [ @@ -5015,7 +4979,7 @@ dependencies = [ "cpython", "cpython_ext", "crossbeam 0.7.3", - "memmap", + "memmap2", "minibytes", "pyrevisionstore", "quickcheck", @@ -5085,7 +5049,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "proc-macro2", "quickcheck", @@ -5225,9 +5189,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -5235,13 +5199,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ - "crossbeam-channel 0.5.6", - "crossbeam-deque 0.8.2", - "crossbeam-utils 0.8.14", + "crossbeam-channel 0.5.7", + "crossbeam-deque 0.8.3", + "crossbeam-utils 0.8.15", "num_cpus", ] @@ -5276,18 +5240,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "a9af2cf09ef80e610097515e80095b7f76660a92743c4185aff5406cd5ce3dd5" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "9c501201393982e275433bc55de7d6ae6f00e7699cd5572c5b57581cd69c881b" dependencies = [ "proc-macro2", "quote", @@ -5356,8 +5320,10 @@ dependencies = [ "async-runtime", "configloader", "configmodel", + "eagerepo", "edenapi", "fail", + "gitstore", "hgcommits", "identity", "manifest-tree", @@ -5434,7 +5400,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tower-service", "trust-dns-resolver", "url", @@ -5500,7 +5466,7 @@ dependencies = [ "lz4-pyframe", "manifest-tree", "maplit", - "memmap", + "memmap2", "mincode", "minibytes", "mockito", @@ -5517,7 +5483,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha-1", + "sha1", "sha2 0.10.6", "storemodel", "tempfile", @@ -5624,6 +5590,12 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5634,9 +5606,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ "bitflags", "errno", @@ -5681,9 +5653,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safemem" @@ -5733,9 +5705,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "5d5e082f6ea090deaf0e6dd04b68360fd5cddb152af6ce8927c9d25db299f98c" [[package]] name = "sct" @@ -5810,12 +5782,13 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" +source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90" dependencies = [ "anyhow", "byteorder", "bytes 1.4.0", "serde", + "serde_bytes", "thiserror", ] @@ -5851,11 +5824,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] @@ -5879,16 +5852,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa 1.0.6", "ryu", "serde", ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5896,15 +5869,6 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] name = "sha1_smol" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5970,9 +5934,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -5986,14 +5950,14 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio 0.7.14", - "signal-hook 0.3.14", + "signal-hook 0.3.15", ] [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -6033,9 +5997,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -6048,9 +6012,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -6059,7 +6023,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6141,21 +6105,14 @@ dependencies = [ [[package]] name = "streampager" version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43e4988f446d8d15c370527d38cdd35b470139775edeeca4c03921486c9b65a" dependencies = [ - "anyhow", "bit-set", - "clap 2.34.0", - "dirs 3.0.2", + "dirs 2.0.2", "enum_dispatch", "indexmap", "lazy_static", "lru", "memmap2", - "notify", - "pest", - "pest_derive", "regex", "scopeguard", "serde", @@ -6237,9 +6194,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" @@ -6249,9 +6206,9 @@ checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -6282,26 +6239,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi 0.3.9", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -6325,12 +6271,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" dependencies = [ "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6396,7 +6342,7 @@ dependencies = [ "libc", "log", "memmem", - "nix", + "nix 0.24.3", "num-derive", "num-traits", "ordered-float 3.4.0", @@ -6426,7 +6372,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "term_size", "unicode-width", ] @@ -6436,7 +6381,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size 0.2.3", + "terminal_size 0.2.5", "unicode-width", ] @@ -6462,10 +6407,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if 1.0.0", "once_cell", ] @@ -6509,7 +6455,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "anyhow", "clap 2.34.0", @@ -6529,11 +6475,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa 1.0.5", + "itoa 1.0.6", "libc", "num_threads", "serde", @@ -6549,9 +6495,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -6583,15 +6529,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes 1.4.0", "libc", "memchr", - "mio 0.8.5", + "mio 0.8.6", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", @@ -6599,7 +6545,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6626,9 +6572,9 @@ dependencies = [ [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -6647,14 +6593,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", ] [[package]] @@ -6677,7 +6623,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a" dependencies = [ "async-io", "futures 0.3.26", @@ -6704,9 +6650,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes 1.4.0", "futures-core", @@ -6889,7 +6835,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "time 0.3.17", + "time 0.3.20", "tracing", "tracing-core", "tracing-log", @@ -7018,7 +6964,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "sha-1", + "sha1", "thiserror", "util", "vlqencoding", @@ -7057,9 +7003,9 @@ checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "775c11906edafc97bc378816b94585fbd9a054eabaf86fdd0ced94af449efab7" [[package]] name = "unicode-normalization" @@ -7131,7 +7077,7 @@ dependencies = [ "hostname 0.3.1", "lazystr", "libc", - "memmap", + "memmap2", "once_cell", "rand 0.8.5", "shellexpand", @@ -7143,13 +7089,14 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ + "atomic", "getrandom 0.2.8", "serde", - "sha1", + "sha1_smol", ] [[package]] @@ -7345,7 +7292,7 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" +source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90" dependencies = [ "anyhow", "bytes 1.4.0", @@ -7631,16 +7578,6 @@ dependencies = [ ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] name = "xdiff" version = "0.1.0" dependencies = [ @@ -7697,9 +7634,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.6+zstd.1.5.2" +version = "2.0.7+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" dependencies = [ "cc", "libc", @@ -7729,7 +7666,7 @@ dependencies = [ "parking_lot 0.11.2", "quickcheck", "serde", - "sha-1", + "sha1", "tempfile", "tracing", "types", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 80cc6bf9e93..4028c41232f 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE"; + hash = "sha256-e+S5gyyJF3bu6Yo+KjG2lLfjToYzzFj10GTcrPfzxDE="; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM"; + sha256 = "sha256-bJpfa1i3G5Ym5CLVpCt+7q5FNv34CoJBefXaf4qlxNA="; }; # Builds the NodeJS server that runs with `sl web` @@ -101,12 +101,11 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I="; - "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; - "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0="; - "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU="; + "cloned-0.1.0" = "sha256-WHsvgnbAYrFx22p3rbMzlCIaZ8+BTsMswiTv4h+A/ZI="; + "fb303_core-0.0.0" = "sha256-bg4+4kdHfgaEbLzkCftdLH++QKherIAfM7IzlWeOWKI="; + "fbthrift-0.0.1+unstable" = "sha256-0qvab0a3PdvlOq2teXKjYrB9UbWLKzMbHgv/3LSsT+4="; "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; - "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8="; + "serde_bser-0.3.1" = "sha256-Sk3prRcLr2ExXvq7Px4+NRXbY8ZaRWOYexnaUAqQ4ao="; }; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index eeedd64b950..a40543fde87 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20230124-180750-hf8cd450a", - "versionHash": "5465836048527734544" + "version": "0.2.20230228-144002-h9440b05e", + "versionHash": "6463510610610398322" } diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix index b49969317ef..a1238ed01df 100644 --- a/pkgs/applications/version-management/scriv/default.nix +++ b/pkgs/applications/version-management/scriv/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "scriv"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - hash = "sha256-u2HDD+pzFYpNGMKLu1eCHDCCRWg++w2Je9ReSnhWtHI="; + hash = "sha256-le39dmQs965rXNQJdVRdivWPY5jKv+g/91Xo7tuN3U4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index c1e0488c014..88cc0b899a7 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hz6uIzlVuocSZRDYLnJ3/OZ4UDNlavJFky4CuyggANI="; + sha256 = "sha256-B9orjQojiLwC90LZ4ynY7niw6fhJIaUn/DUXAYVMjfg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index bce50b43a07..3befb853491 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "73.0.0"; + version = "74.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "HGoT3t/ooRMiyjUkHnvVGOB04IU5U8VEKDixhE57kR8="; + sha256 = "sha256-p8rIAHSqYCOlNbuxisQlIkMh2OArc+MOYn1kgC5kJsc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 28e0d1d469a..0fa8486e15b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -66,7 +66,7 @@ , sdl2Support ? true, SDL2 , sixelSupport ? false, libsixel , speexSupport ? true, speex -, swiftSupport ? false, swift +, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift , theoraSupport ? true, libtheora , vaapiSupport ? stdenv.isLinux, libva , vapoursynthSupport ? false, vapoursynth @@ -78,7 +78,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation (self: { pname = "mpv"; @@ -99,6 +99,11 @@ in stdenv.mkDerivation (self: { NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; + preConfigure = lib.optionalString swiftSupport '' + # Ensure we reference 'lib' (not 'out') of Swift. + export SWIFT_LIB_DYNAMIC=${lib.getLib swift.swift}/lib/swift/macosx + ''; + mesonFlags = [ (lib.mesonOption "default_library" "shared") (lib.mesonBool "libmpv" true) @@ -167,7 +172,8 @@ in stdenv.mkDerivation (self: { ++ lib.optionals zimgSupport [ zimg ] ++ lib.optionals stdenv.isLinux [ nv-codec-headers ] ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ] + ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; postBuild = lib.optionalString stdenv.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index 8a3af27c907..c92bdd9346c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -3,35 +3,28 @@ stdenv.mkDerivation rec { pname = "obs-hyperion"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hyperion-project"; repo = "hyperion-obs-plugin"; rev = version; - sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4="; + sha256 = "sha256-UAfjafoZhhhHRSo+eUBLhHaCmn2GYFcYyRb9wHIp/9I="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ obs-studio libGL qtbase ]; + nativeBuildInputs = [ cmake flatbuffers pkg-config ]; + buildInputs = [ obs-studio flatbuffers libGL qtbase ]; dontWrapQtApps = true; cmakeFlags = [ "-DOBS_SOURCE=${obs-studio.src}" "-DGLOBAL_INSTALLATION=ON" + "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" ]; preConfigure = '' - # https://github.com/hyperion-project/hyperion-obs-plugin/issues/7 rm -rf external/flatbuffers - cp -r ${flatbuffers.src} external/flatbuffers - chmod -R a+w external - ''; - - postInstall = '' - # Remove flatbuffers install - rm -rf $out/bin $out/lib/{libflatbuffers.a,cmake,pkgconfig} $out/include ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e49c2a65912..481d8408e86 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , buildGoModule , fetchFromGitHub , installShellFiles @@ -31,7 +32,8 @@ buildGoModule rec { ''; }; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ] + ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4="; @@ -42,8 +44,6 @@ buildGoModule rec { -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; - subPackages = [ "cmd/colima" ]; - postInstall = '' wrapProgram $out/bin/colima \ --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 29dd9b27232..189105ab545 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; + sha256 = "sha256-jmVgrrbxkvzDkUYpNivz3jOOEEkr90iS5W4aY3L7Cug="; }; - vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; + vendorHash = "sha256-8YmApeijOmWFfLu4UJTa1Ufn0RbaO4TKe7QHvjluMRg="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; @@ -63,6 +63,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/lima-vm/lima"; description = "Linux virtual machines (on macOS, in most cases)"; + changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ anhduy ]; }; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 4a1514cd97a..839022a8d55 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -6,15 +6,20 @@ stdenv.mkDerivation rec { pname = "lkl"; - version = "2022-05-18"; + + # NOTE: pinned to the last known version that doesn't have a hang in cptofs. + # Please verify `nix build -f nixos/release-combined.nix nixos.ova` works + # before attempting to update again. + # ref: https://github.com/NixOS/nixpkgs/pull/219434 + version = "2022-08-08"; outputs = [ "dev" "lib" "out" ]; src = fetchFromGitHub { owner = "lkl"; repo = "linux"; - rev = "10c7b5dee8c424cc2ab754e519ecb73350283ff9"; - sha256 = "sha256-D3HQdKzhB172L62a+8884bNhcv7vm/c941wzbYtbf4I="; + rev = "ffbb4aa67b3e0a64f6963f59385a200d08cb2d8b"; + sha256 = "sha256-24sNREdnhkF+P+3P0qEh2tF1jHKF7KcbFSn/rPK2zWs="; }; nativeBuildInputs = [ bc bison flex python3 ]; @@ -72,6 +77,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lkl/linux/"; platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin raitobezarius ]; }; } diff --git a/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables b/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables index 8f133938587..4491aef6a01 100644 --- a/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables +++ b/pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables @@ -1,71 +1,68 @@ +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_MATCH_AH=y +CONFIG_IP6_NF_MATCH_EUI64=y +CONFIG_IP6_NF_MATCH_FRAG=y +CONFIG_IP6_NF_MATCH_HL=y +CONFIG_IP6_NF_MATCH_IPV6HEADER=y +CONFIG_IP6_NF_MATCH_MH=y +CONFIG_IP6_NF_MATCH_OPTS=y +CONFIG_IP6_NF_MATCH_RPFILTER=y +CONFIG_IP6_NF_MATCH_RT=y +CONFIG_IP6_NF_MATCH_SRH=y +CONFIG_IP6_NF_NAT=y +CONFIG_IP6_NF_RAW=y +CONFIG_IP6_NF_SECURITY=y +CONFIG_IP6_NF_TARGET_HL=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +CONFIG_IP6_NF_TARGET_NPT=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_TARGET_SYNPROXY=y +CONFIG_IP_NF_ARPFILTER=y +CONFIG_IP_NF_ARP_MANGLE=y +CONFIG_IP_NF_ARPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_ECN=y +CONFIG_IP_NF_MATCH_RPFILTER=y +CONFIG_IP_NF_MATCH_TTL=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_RAW=y +CONFIG_IP_NF_SECURITY=y +CONFIG_IP_NF_TARGET_CLUSTERIP=y +CONFIG_IP_NF_TARGET_ECN=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_SYNPROXY=y +CONFIG_IP_NF_TARGET_TTL=y CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_LOG_NETDEV=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_AMANDA=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IRC=y -CONFIG_NF_CONNTRACK_NETBIOS_NS=y -CONFIG_NF_CONNTRACK_SNMP=y -CONFIG_NF_CONNTRACK_PPTP=y -CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y -CONFIG_NF_CONNTRACK_TFTP=y -CONFIG_NF_CT_NETLINK=y -CONFIG_NF_CT_NETLINK_TIMEOUT=y -CONFIG_NF_CT_NETLINK_HELPER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_CONNCOUNT=y +CONFIG_NETFILTER_EGRESS=y +CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK_ACCT=y CONFIG_NETFILTER_NETLINK_GLUE_CT=y -CONFIG_NF_TABLES=y -CONFIG_NF_TABLES_INET=y -CONFIG_NF_TABLES_NETDEV=y -CONFIG_NFT_NUMGEN=y -CONFIG_NFT_CT=y -CONFIG_NFT_COUNTER=y -CONFIG_NFT_CONNLIMIT=y -CONFIG_NFT_LOG=y -CONFIG_NFT_LIMIT=y -CONFIG_NFT_MASQ=y -CONFIG_NFT_REDIR=y -CONFIG_NFT_NAT=y -CONFIG_NFT_TUNNEL=y -CONFIG_NFT_OBJREF=y -CONFIG_NFT_QUEUE=y -CONFIG_NFT_QUOTA=y -CONFIG_NFT_REJECT=y -CONFIG_NFT_COMPAT=y -CONFIG_NFT_HASH=y -CONFIG_NFT_FIB_INET=y -CONFIG_NFT_SOCKET=y -CONFIG_NFT_OSF=y -CONFIG_NFT_TPROXY=y -CONFIG_NFT_SYNPROXY=y -CONFIG_NFT_DUP_NETDEV=y -CONFIG_NFT_FWD_NETDEV=y -CONFIG_NFT_FIB_NETDEV=y -CONFIG_NF_FLOW_TABLE_INET=y -CONFIG_NF_FLOW_TABLE=y -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_DSCP=y -CONFIG_NETFILTER_XT_TARGET_HMARK=y -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y -CONFIG_NETFILTER_XT_TARGET_LOG=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_TARGET_NOTRACK=y -CONFIG_NETFILTER_XT_TARGET_TEE=y -CONFIG_NETFILTER_XT_TARGET_TPROXY=y -CONFIG_NETFILTER_XT_TARGET_TRACE=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y +CONFIG_NETFILTER_NETLINK_HOOK=y +CONFIG_NETFILTER_NETLINK_LOG=y +CONFIG_NETFILTER_NETLINK_OSF=y +CONFIG_NETFILTER_NETLINK_QUEUE=y +CONFIG_NETFILTER_NETLINK=y +CONFIG_NETFILTER_SKIP_EGRESS=y +CONFIG_NETFILTER_SYNPROXY=y +CONFIG_NETFILTER_XTABLES_COMPAT=y +CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_CONNMARK=y +CONFIG_NETFILTER_XT_MARK=y CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y CONFIG_NETFILTER_XT_MATCH_BPF=y +CONFIG_NETFILTER_XT_MATCH_CGROUP=y CONFIG_NETFILTER_XT_MATCH_CLUSTER=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y @@ -77,11 +74,14 @@ CONFIG_NETFILTER_XT_MATCH_CPU=y CONFIG_NETFILTER_XT_MATCH_DCCP=y CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y CONFIG_NETFILTER_XT_MATCH_DSCP=y +CONFIG_NETFILTER_XT_MATCH_ECN=y CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_HL=y CONFIG_NETFILTER_XT_MATCH_IPCOMP=y CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_IPVS=y CONFIG_NETFILTER_XT_MATCH_L2TP=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y @@ -91,7 +91,9 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_NFACCT=y CONFIG_NETFILTER_XT_MATCH_OSF=y CONFIG_NETFILTER_XT_MATCH_OWNER=y +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_POLICY=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y CONFIG_NETFILTER_XT_MATCH_RATEEST=y CONFIG_NETFILTER_XT_MATCH_REALM=y @@ -104,52 +106,130 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y CONFIG_NETFILTER_XT_MATCH_TCPMSS=y CONFIG_NETFILTER_XT_MATCH_TIME=y CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NFT_DUP_IPV4=y -CONFIG_NFT_FIB_IPV4=y -CONFIG_NF_TABLES_ARP=y -CONFIG_NF_FLOW_TABLE_IPV4=y +CONFIG_NETFILTER_XT_NAT=y +CONFIG_NETFILTER_XT_SET=y +CONFIG_NETFILTER_XT_TARGET_AUDIT=y +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y +CONFIG_NETFILTER_XT_TARGET_DSCP=y +CONFIG_NETFILTER_XT_TARGET_HL=y +CONFIG_NETFILTER_XT_TARGET_HMARK=y +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y +CONFIG_NETFILTER_XT_TARGET_LED=y +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +CONFIG_NETFILTER_XT_TARGET_NETMAP=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y +CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_RATEEST=y +CONFIG_NETFILTER_XT_TARGET_REDIRECT=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y +CONFIG_NETFILTER_XT_TARGET_TEE=y +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TRACE=y +CONFIG_NF_CONNTRACK_AMANDA=y +CONFIG_NF_CONNTRACK_BRIDGE=y +CONFIG_NF_CONNTRACK_BROADCAST=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=y +CONFIG_NF_CONNTRACK_IRC=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_NETBIOS_NS=y +CONFIG_NF_CONNTRACK_PPTP=y +CONFIG_NF_CONNTRACK_SANE=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_SIP=y +CONFIG_NF_CONNTRACK_SNMP=y +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CT_NETLINK_HELPER=y +CONFIG_NF_CT_NETLINK_TIMEOUT=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_DEFRAG_IPV6=y +CONFIG_NF_DUP_IPV4=y +CONFIG_NF_DUP_IPV6=y +CONFIG_NF_DUP_NETDEV=y +CONFIG_NF_FLOW_TABLE_INET=y +CONFIG_NF_FLOW_TABLE=y CONFIG_NF_LOG_ARP=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_RPFILTER=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_SYNPROXY=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_CLUSTERIP=y -CONFIG_IP_NF_TARGET_ECN=y -CONFIG_IP_NF_TARGET_TTL=y -CONFIG_IP_NF_RAW=y -CONFIG_IP_NF_ARPTABLES=y -CONFIG_IP_NF_ARPFILTER=y -CONFIG_IP_NF_ARP_MANGLE=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_LOG_IPV6=y +CONFIG_NF_LOG_SYSLOG=y +CONFIG_NF_NAT_AMANDA=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_H323=y +CONFIG_NF_NAT_IRC=y +CONFIG_NF_NAT_MASQUERADE=y +CONFIG_NF_NAT_PPTP=y +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NF_NAT_SIP=y +CONFIG_NF_NAT_SNMP_BASIC=y +CONFIG_NF_NAT_TFTP=y +CONFIG_NF_NAT=y +CONFIG_NF_REJECT_IPV4=y +CONFIG_NF_REJECT_IPV6=y +CONFIG_NF_SOCKET_IPV4=y +CONFIG_NF_SOCKET_IPV6=y +CONFIG_NF_TABLES_ARP=y +CONFIG_NF_TABLES_BRIDGE=y +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_IPV4=y +CONFIG_NF_TABLES_IPV6=y +CONFIG_NF_TABLES_NETDEV=y +CONFIG_NF_TABLES=y +CONFIG_NFT_BRIDGE_META=y +CONFIG_NFT_BRIDGE_REJECT=y +CONFIG_NFT_COMPAT=y +CONFIG_NFT_CONNLIMIT=y +CONFIG_NFT_COUNTER=y +CONFIG_NFT_CT=y +CONFIG_NFT_DUP_IPV4=y CONFIG_NFT_DUP_IPV6=y +CONFIG_NFT_DUP_NETDEV=y +CONFIG_NFT_FIB_INET=y +CONFIG_NFT_FIB_IPV4=y CONFIG_NFT_FIB_IPV6=y -CONFIG_NF_FLOW_TABLE_IPV6=y -CONFIG_IP6_NF_IPTABLES=y -CONFIG_IP6_NF_MATCH_AH=y -CONFIG_IP6_NF_MATCH_EUI64=y -CONFIG_IP6_NF_MATCH_FRAG=y -CONFIG_IP6_NF_MATCH_OPTS=y -CONFIG_IP6_NF_MATCH_HL=y -CONFIG_IP6_NF_MATCH_IPV6HEADER=y -CONFIG_IP6_NF_MATCH_MH=y -CONFIG_IP6_NF_MATCH_RPFILTER=y -CONFIG_IP6_NF_MATCH_RT=y -CONFIG_IP6_NF_MATCH_SRH=y -CONFIG_IP6_NF_TARGET_HL=y -CONFIG_IP6_NF_FILTER=y -CONFIG_IP6_NF_TARGET_REJECT=y -CONFIG_IP6_NF_TARGET_SYNPROXY=y -CONFIG_IP6_NF_MANGLE=y -CONFIG_IP6_NF_RAW=y -CONFIG_IP6_NF_NAT=y -CONFIG_IP6_NF_TARGET_MASQUERADE=y -CONFIG_IP6_NF_TARGET_NPT=y -CONFIG_NF_CONNTRACK_BRIDGE=y +CONFIG_NFT_FIB_NETDEV=y +CONFIG_NFT_FIB=y +CONFIG_NFT_FLOW_OFFLOAD=y +CONFIG_NFT_FWD_NETDEV=y +CONFIG_NFT_HASH=y +CONFIG_NFT_LIMIT=y +CONFIG_NFT_LOG=y +CONFIG_NFT_MASQ=y +CONFIG_NFT_NAT=y +CONFIG_NFT_NUMGEN=y +CONFIG_NFT_OBJREF=y +CONFIG_NFT_OSF=y +CONFIG_NF_TPROXY_IPV4=y +CONFIG_NF_TPROXY_IPV6=y +CONFIG_NFT_QUEUE=y +CONFIG_NFT_QUOTA=y +CONFIG_NFT_REDIR=y +CONFIG_NFT_REJECT_INET=y +CONFIG_NFT_REJECT_IPV4=y +CONFIG_NFT_REJECT_IPV6=y +CONFIG_NFT_REJECT_NETDEV=y +CONFIG_NFT_REJECT=y +CONFIG_NFT_SOCKET=y +CONFIG_NFT_SYNPROXY=y +CONFIG_NFT_TPROXY=y +CONFIG_NFT_TUNNEL=y +CONFIG_NFT_XFRM=y diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 60db5708922..60808705e8d 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,7 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, makeDesktopItem, cmake, pkg-config -, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig, libffi, expat -, libxkbcommon, libGL, libXext, libXrandr, libXi, libXScrnSaver, libXinerama -, libXcursor, libXpresent, wayland, wayland-protocols +{ stdenv +, lib +, fetchFromGitHub +, makeDesktopItem +, pkg-config +, cmake +, freefont_ttf +, spice-protocol +, nettle +, libbfd +, fontconfig +, libffi +, expat +, libGL + +, libX11 +, libxkbcommon +, libXext +, libXrandr +, libXi +, libXScrnSaver +, libXinerama +, libXcursor +, libXpresent + +, wayland +, wayland-protocols + +, pipewire +, pulseaudio +, libsamplerate + +, xorgSupport ? true +, waylandSupport ? true +, pipewireSupport ? true +, pulseSupport ? true }: let @@ -16,40 +48,30 @@ let in stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B5.0.1"; + version = "B6"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "sha256-UzZQU5SzJ2mo9QBweQB0VJSnKfzgTG5QaKpIQN/6LCE="; + sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - libGL - freefont_ttf - spice-protocol - expat - libbfd - nettle - fontconfig - libffi - libxkbcommon - libXi - libXScrnSaver - libXinerama - libXcursor - libXpresent - libXext - libXrandr - wayland - wayland-protocols - ]; + buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] + ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ] + ++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ] + ++ lib.optionals pipewireSupport [ pipewire libsamplerate ] + ++ lib.optionals pulseSupport [ pulseaudio libsamplerate ]; + + cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ] + ++ lib.optional (!xorgSupport) "-DENABLE_X11=no" + ++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no" + ++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no" + ++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no"; - cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]; postUnpack = '' echo ${src.rev} > source/VERSION @@ -73,7 +95,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ alexbakker babbaj ]; + maintainers = with maintainers; [ alexbakker babbaj j-brn ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index c8072c903d2..695cd970b7b 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9ycluLfkrPDzjsMXtv7w9UHgMaGzTsJw4lT/KfRAu4="; + sha256 = "sha256-zxgNHzKXekZnk0OsHw30u4L9U2mIT/MryZuAQ2EBEYg="; }; - cargoHash = "sha256-wVQEa1qS+JF6PHKvRrRFbSvj2qp6j14ErOQPkxP0uuA="; + cargoHash = "sha256-tsGyrU/5yp5PJ2d5HUoaw/jhGgYyDt6qBK+DvC79kmY="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index b13908495a5..c5b8dbb1209 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-UhlhNmVPTOXVWpL4pxF5c6ZQj//pXrzZWlRUaKGSTSA="; + hash = "sha256-qw7ylukG7M31rUtoZqbcjWchcEB14uvb2k1cjIjy8qA="; }; vendorHash = null; @@ -24,7 +24,6 @@ buildGoModule rec { let skippedTests = [ "TestDialogs" - "TestNetdialogs" ]; in '' diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 64818365470..5e68eeb2c82 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V/4atbYG3jP0o1Bfn/dZBDXEk+Yi4cSJAY8HnTmpHRI="; + sha256 = "sha256-ZryzNlEj/2JTp5FJiDzXN9v1DvczfebqEOrJP+dKaRw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-gJZ3z6xDgWwOPjCLZg3LRMk3KoTXGaotXgO/xDUwAvk="; + sha256 = "sha256-OgvlRnii4T4HcFPiGkcLcagyHCg+lWXCXQ9XdXjHDbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d65f101b377..fc3303baf33 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,7 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib +, yasm, glslang # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin @@ -23,19 +24,19 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.40"; + version = "7.0.6"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "bc857555d3e836ad9350a8f7b03bb54d2fdc04dddb2043d09813f4634bca4814"; + sha256 = "f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff"; }; outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 ] + nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. @@ -94,7 +95,7 @@ in stdenv.mkDerivation { qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; }) ++ [ - ./qtx11extras.patch + ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch ]; @@ -130,14 +131,17 @@ in stdenv.mkDerivation { VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' + VBOX_WITH_VBOXSDL := 1 PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include - TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease + PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib + PATH_QT5_TOOLS_INC := ${getDev qttools}/include ''} ${optionalString enableWebService '' # fix gsoap missing zlib include and produce errors with --as-needed VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} + TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease LOCAL_CONFIG ./configure \ @@ -174,7 +178,7 @@ in stdenv.mkDerivation { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 7092ffb33de..7e27e79d5dd 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "29cf8410e2514ea4393f63f5e955b8311787873679fc23ae9a897fb70ef3f84a"; + let value = "292961aa8723b54f96f89f6d8abf7d8e29259d94b7de831dbffb9ae15d346434"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1ff7f0abeba..0601aa3e44a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "d456c559926f1a8fdd7259056e0a50f12339fd494122cf30db7736e2032970c6"; + sha256 = "21e0f407d2a4f5c286084a70718aa20235ea75969eca0cab6cfab43a3499a010"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qt-dependency-paths.patch index a3aa98b081d..ae5493a327d 100644 --- a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch +++ b/pkgs/applications/virtualization/virtualbox/qt-dependency-paths.patch @@ -7,10 +7,10 @@ index 71b96a3..73391f0 100644 endif else - $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) -+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) ++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter Help,$(module)),$(PATH_QT5_TOOLS_LIB),$(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB)))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) endif - $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) -+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) ++ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras $(PATH_QT5_TOOLS_INC)) endif $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 5ee2c8c35e4..508f13f985b 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "hikari"; - version = "2.3.2"; + version = "2.3.3"; src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-At4b6mkArKe6knNWouLdZ9v8XhfHaUW+aB+CHyEBg8o="; + sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI="; }; nativeBuildInputs = [ pkg-config bmake ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5b4480499d9..adb22269f04 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat zhaofengli ]; + maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; platforms = platforms.linux; }; } diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 514255f324a..311eb2b293e 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -168,6 +168,15 @@ stdenvNoCC.mkDerivation (args // { if runtimeId != null then [ runtimeId ] else map (system: dotnetCorePackages.systemToDotnetRid system) platforms; + defaultDepsFile = + # Wire in the nugetDeps file such that running the script with no args + # runs it agains the correct deps file by default. + # Note that toString is necessary here as it results in the path at + # eval time (i.e. to the file in your local Nixpkgs checkout) rather + # than the Nix store path of the path after it's been imported. + if lib.isPath nugetDeps && !lib.hasPrefix "/nix/store/" (toString nugetDeps) + then toString nugetDeps + else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; in writeShellScript "fetch-${pname}-deps" '' set -euo pipefail @@ -238,7 +247,8 @@ stdenvNoCC.mkDerivation (args // { export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 - depsFile=$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}") + depsFile=$(realpath "''${1:-${defaultDepsFile}}") + echo Will write lockfile to "$depsFile" mkdir -p "$tmp/nuget_pkgs" storeSrc="${srcOnly args}" diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 380642a5e68..991864719a0 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -5,4 +5,4 @@ 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" +XDG_CACHE_HOME="$TMPDIR" BRZ_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 01b93c194c3..5b4c127cdd8 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -1,4 +1,4 @@ -{ runCommand, nix, lib }: +{ runCommandLocal, nix, lib }: # Replace a single dependency in the requisites tree of drv, propagating # the change all the way up the tree, without a full rebuild. This can be @@ -23,7 +23,7 @@ with lib; let warn = if verbose then builtins.trace else (x: y: y); - references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' + references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' (echo { while read path do @@ -61,7 +61,7 @@ let drvName = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } '' + rewriteHashes = drv: hashes: runCommandLocal (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } '' $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ concatStringsSep " -e " (mapAttrsToList (name: value: "'s|${baseNameOf name}|${baseNameOf value}|g'" diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index b057d1681b0..5ba166bae1a 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -154,8 +154,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg strictDeps = true; - passthru = { inherit cargoDeps; } // (args.passthru or {}); - meta = { # default to Rust's platforms platforms = rustc.meta.platforms; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 0de1f38a0ff..21321d83af3 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.1.1"; + version = "6.2.0"; src = fetchzip { url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY="; + hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA="; }; installPhase = '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 3a1957ea96d..d7c0d619105 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "19.0.1"; + version = "20.0.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-nkW9sp7AdaClNTuyC97S0bS6vgVeJQBphfoVOaexnBs="; + hash = "sha256-JXlv9/P5tBAnRVNCBavG5AtM11Q6mikTN+Qu+u3pLP0="; }; - npmDepsHash = "sha256-LWFHlVGYvOJzdCT2Y86VSzsf/fLJ3B9cJAkBkZyUrMM="; + npmDepsHash = "sha256-fecGkN6MEdBP8UokBY/w0TnPOC93KsAISEg3VW0bvHU="; nativeBuildInputs = [ remarshal @@ -127,7 +127,8 @@ buildNpmPackage rec { meta = with lib; { homepage = "https://typeof.net/Iosevka/"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' + description = "Versatile typeface for code, from code."; + longDescription = '' Iosevka is an open-source, sans-serif + slab-serif, monospace + quasi‑proportional typeface family, designed for writing code, using in terminals, and preparing technical documents. diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 3ae29a8e2a4..2ca2473b364 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.006"; + version = "1.007"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-n7TTunWOHGWLxvs75r5My1il0KELOZbAgTGqtMpQ+mQ="; + hash = "sha256-ChYpRCw8DAo8bo6fJ+5LyF+FGmER+4nY2aEx1GIROdU="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 7c4db29467f..dbbb26971ba 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { rm -rfv $out/share/fonts/truetype/NerdFonts/*Windows\ Compatible.* ''} ''; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh index b4c4aaa7cf2..53d240feddd 100755 --- a/pkgs/data/fonts/nerdfonts/update.sh +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -5,9 +5,14 @@ latest_release=$(curl --silent https://api.github.com/repos/ryanoasis/nerd-fonts version=$(jq -r '.tag_name' <<<"$latest_release") dirname="$(dirname "$0")" -echo \""${version#v}"\" >"$dirname/version.nix" - -echo Using version "$version" +echo \""${version#v}"\" >"$dirname/version-new.nix" +if diff -q "$dirname/version-new.nix" "$dirname/version.nix"; then + echo No new version available, current: $version + exit 0 +else + echo Updated to version "$version" + mv "$dirname/version-new.nix" "$dirname/version.nix" +fi printf '{\n' > "$dirname/shas.nix" diff --git a/pkgs/data/fonts/roboto-serif/default.nix b/pkgs/data/fonts/roboto-serif/default.nix index d6cc1019ccd..99e8ea58b4e 100644 --- a/pkgs/data/fonts/roboto-serif/default.nix +++ b/pkgs/data/fonts/roboto-serif/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "roboto-serif"; - version = "1.007"; + version = "1.008"; src = fetchurl { url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip"; - hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo="; + hash = "sha256-Nm9DcxL0CgA51nGeZJPWSCipgqwnNPlhj0wHyGhLaYQ="; }; sourceRoot = "."; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 17c5b7fa36d..951cb96a183 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.02.25"; + version = "23.02.28"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-JQK4GjL3piztBVXRnIMNxdB+XTXNaNvWg0wLLui4tRE="; + sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index f3503a9f5f0..1e771d28901 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.02.16"; + version = "23.03.04"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-z9LHSfhCTeHsf4XtPJeOqOqfKHHz0B7n2hciIpCQ9H4="; + sha256 = "sha256-sxrgjlO4xKgk4QoJ6XvHBg9h5kaZd4l8ERp+7CLf6Cg="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d0af110dba2..b84b16b2433 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20230104"; + version = "20230301"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-BejsAlHnq2oxVQIFA4/ZOTFxz7vZmssrlJNqRZHBGuI="; + sha256 = "sha256-iIvynt8Qg9PmR2q7JsLtRlYxfHGaShMD8kbbPL89DzE="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/pkgs/data/misc/dtv-scan-tables/linuxtv.nix b/pkgs/data/misc/dtv-scan-tables/default.nix index dcbf20c38e8..fdd18cec8df 100644 --- a/pkgs/data/misc/dtv-scan-tables/linuxtv.nix +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -4,18 +4,12 @@ , v4l-utils }: -let - - version_ = "2022-04-30-57ed29822750"; - -in - stdenv.mkDerivation rec { pname = "dtv-scan-tables"; - version = "${version_}-linuxtv"; + version = "2022-04-30-57ed29822750"; src = fetchurl { - url = "https://linuxtv.org/downloads/${pname}/${pname}-${version_}.tar.bz2"; + url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4="; }; diff --git a/pkgs/data/misc/dtv-scan-tables/tvheadend.nix b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix deleted file mode 100644 index b2edc34e5ea..00000000000 --- a/pkgs/data/misc/dtv-scan-tables/tvheadend.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, v4l-utils -}: - -stdenv.mkDerivation rec { - pname = "dtv-scan-tables"; - version = "20221027-tvheadend"; - - src = fetchFromGitHub { - owner = "tvheadend"; - repo = "dtv-scan-tables"; - rev = "2a3dbfbab129c00d3f131c9c2f06b2be4c06fec6"; - hash = "sha256-bJ+naUs3TDFul4PmpnWYld3j1Se+1X6U9jnECe3sno0="; - }; - - nativeBuildInputs = [ - v4l-utils - ]; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - allowedReferences = [ ]; - - meta = with lib; { - description = "Digital TV (DVB) channel/transponder scan tables"; - homepage = "https://github.com/tvheadend/dtv-scan-tables"; - license = with licenses; [ gpl2Only lgpl21Only ]; - longDescription = '' - When scanning for dvb channels, - most applications require an initial set of - transponder coordinates (frequencies etc.). - These coordinates differ, depending of the - receiver's location or on the satellite. - The package delivers a collection of transponder - tables ready to be used by software like "dvbv5-scan". - The package at hand is maintained and used by tvheadend, - it is a fork of the original one hosted by linuxtv.org. - ''; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a6b3aa6ec30..ab972e0ce99 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202302230047"; + version = "202303020053"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "8ae031e49fecaa0ef8d3e2501741cf2cb12e3eac"; - sha256 = "sha256-5p3u9/v32bMEhAXgu/v5ooiis0Nt4peVPeCA9o0AKv8="; + rev = "c002daa9332a673ce2fabe61eb9c45dc6a54f3fa"; + sha256 = "sha256-Pfny59HitidyXgXaI/1V3UNdM18X0+vVCyKP4qkL1rY="; }; installPhase = '' diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 840072295aa..bb196b26fb5 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -6,29 +6,33 @@ , gtk-engine-murrine , sassc , border-radius ? null # Suggested: 2 < value < 16 -, tweaks ? [ ] # can be "solid" "compact" "black" "primary" +, tweaks ? [ ] # can be "solid" "compact" "black" "primary" "macos" "submenu" "nord|dracula" , withWallpapers ? false }: let - validTweaks = [ "solid" "compact" "black" "primary" ]; - unknownTweaks = lib.subtractLists validTweaks tweaks; + pname = "orchis-theme"; + + validTweaks = [ "solid" "compact" "black" "primary" "macos" "submenu" "nord" "dracula" ]; + + nordXorDracula = with builtins; lib.assertMsg (!(elem "nord" tweaks) || !(elem "dracula" tweaks)) '' + ${pname}: dracula and nord cannot be mixed. Tweaks ${toString tweaks} + ''; in -assert lib.assertMsg (unknownTweaks == [ ]) '' - You entered wrong tweaks: ${toString unknownTweaks} - Valid tweaks are: ${toString validTweaks} -''; + +assert nordXorDracula; +lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { - pname = "orchis-theme"; - version = "2022-10-19"; + inherit pname; + version = "2023-02-26"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-1lJUrWkb8IoUyCMn8J4Lwvs/pWsibrY0pSXrepuQcug="; + sha256 = "sha256-Qk5MK8S8rIcwO7Kmze6eAl5qcwnrGsiWbn0WNIPjRnA="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 58844ccad78..d5bb01cecb9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -17,15 +18,24 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.4"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-j6USKTpiktDKH7jBV1FFg8f3HeNwEkMp3HxG/MeL41g="; + sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I="; }; + patches = [ + # PopoverWidget: fix flowbox child focus + # https://github.com/elementary/wingpanel-indicator-network/pull/288 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch"; + sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index a7e0fae873f..8be2adad40f 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -6,25 +6,23 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook4 , glib -, granite -, gtk3 -, libhandy +, granite7 +, gtk4 , systemd -, vte , xorg }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "1.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-DPCBC3/MJxy9d77ZYzK68FwN8kbyo7guYrkZC+onRBw="; + sha256 = "sha256-Rfo9Z5rCJgk36Db3ce8dYBJswy8owjvRMrJVB/RfwyI="; }; nativeBuildInputs = [ @@ -32,16 +30,14 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 - libhandy + granite7 + gtk4 systemd - vte xorg.libX11 ]; diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index e986ae2dc14..fb3b50b9815 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -11,7 +11,6 @@ args@ , fetchurl , fontconfig , freetype -, gcc , gdk-pixbuf , glib , glibc @@ -22,13 +21,13 @@ args@ , perl , python3 , requireFile -, stdenv +, backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC , xorg , zlib }: -stdenv.mkDerivation rec { +backendStdenv.mkDerivation rec { pname = "cudatoolkit"; inherit version runPatches; @@ -146,14 +145,23 @@ stdenv.mkDerivation rec { # Fix builds with newer glibc version sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" - - # Ensure that cmake can find CUDA. + '' + + # Point NVCC at a compatible compiler + # FIXME: redist cuda_nvcc copy-pastes this code + # Refer to comments in the overrides for cuda_nvcc for explanation + # CUDA_TOOLKIT_ROOT_DIR is legacy, + # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + '' mkdir -p $out/nix-support - echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook - - # Set the host compiler to be used by nvcc for CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook + cat <<EOF >> $out/nix-support/setup-hook + cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' + cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin' + cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin' + if [ -z "\''${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX=${backendStdenv.cc}/bin; + fi + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin' + EOF # Move some libraries to the lib output so that programs that # depend on them don't pull in this entire monstrosity. @@ -167,10 +175,6 @@ stdenv.mkDerivation rec { mv $out/extras/CUPTI/lib64/libcupti* $out/lib ''} - # Set compiler for NVCC. - wrapProgram $out/bin/nvcc \ - --prefix PATH : ${gcc}/bin - # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set wrapProgram $out/bin/nvprof \ --prefix LD_LIBRARY_PATH : $out/lib @@ -191,7 +195,14 @@ stdenv.mkDerivation rec { preFixup = let rpath = lib.concatStringsSep ":" [ (lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ])) - "${stdenv.cc.cc.lib}/lib64" + + # The path to libstdc++ and such + # + # `backendStdenv` is the cuda-compatible toolchain that we pick in + # extension.nix; we hand it to NVCC to use as a back-end, and we link + # cudatoolkit's binaries against its libstdc++ + "${backendStdenv.cc.cc.lib}/lib64" + "$out/jre/lib/amd64/jli" "$out/lib64" "$out/nvvm/lib64" @@ -260,7 +271,7 @@ stdenv.mkDerivation rec { popd ''; passthru = { - cc = gcc; + inherit (backendStdenv) cc; majorMinorVersion = lib.versions.majorMinor version; majorVersion = lib.versions.majorMinor version; }; diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index c11f12b118a..dd6f7ff2abe 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -7,11 +7,29 @@ final: prev: let # Version info for the classic cudatoolkit packages that contain everything that is in redist. cudatoolkitVersions = final.lib.importTOML ./versions.toml; + finalVersion = cudatoolkitVersions.${final.cudaVersion}; + + # Exposed as cudaPackages.backendStdenv. + # We don't call it just "stdenv" to avoid confusion: e.g. this toolchain doesn't contain nvcc. + # Instead, it's the back-end toolchain for nvcc to use. + # We also use this to link a compatible libstdc++ (backendStdenv.cc.cc.lib) + # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context + backendStdenv = prev.pkgs."${finalVersion.gcc}Stdenv"; + ### Add classic cudatoolkit package - cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion}); + cudatoolkit = + let + attrs = builtins.removeAttrs finalVersion [ "gcc" ]; + attrs' = attrs // { inherit backendStdenv; }; + in + buildCudaToolkitPackage attrs'; cudaFlags = final.callPackage ./flags.nix {}; -in { - inherit cudatoolkit cudaFlags; +in +{ + inherit + backendStdenv + cudatoolkit + cudaFlags; } diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 8e1e54723b2..989fdb06c5d 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -1,6 +1,6 @@ { config , lib -, cudatoolkit +, cudaVersion }: # Type aliases @@ -13,14 +13,21 @@ let inherit (lib) attrsets lists strings trivial versions; - cudaVersion = cudatoolkit.version; # Flags are determined based on your CUDA toolkit by default. You may benefit # from improved performance, reduced file size, or greater hardware suppport by # passing a configuration based on your specific GPU environment. # - # config.cudaCapabilities: list of hardware generations to support (e.g., "8.0") - # config.cudaForwardCompat: bool for compatibility with future GPU generations + # config.cudaCapabilities :: List Capability + # List of hardware generations to build. + # E.g. [ "8.0" ] + # Currently, the last item is considered the optional forward-compatibility arch, + # but this may change in the future. + # + # config.cudaForwardCompat :: Bool + # Whether to include the forward compatibility gencode (+PTX) + # to support future GPU generations. + # E.g. true # # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 @@ -40,6 +47,9 @@ let # GPUs which are supported by the provided CUDA version. supportedGpus = builtins.filter isSupported gpus; + # supportedCapabilities :: List Capability + supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus; + # cudaArchNameToVersions :: AttrSet String (List String) # Maps the name of a GPU architecture to different versions of that architecture. # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. @@ -50,12 +60,6 @@ let (gpu: gpu.archName) supportedGpus; - # cudaArchNames :: List String - # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here; - # otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them - # from is already sorted, so we'll preserve that order here. - cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus); - # cudaComputeCapabilityToName :: AttrSet String String # Maps the version of a GPU architecture to the name of that architecture. # For example, "8.0" maps to "Ampere". @@ -68,23 +72,6 @@ let supportedGpus ); - # cudaComputeCapabilities :: List String - # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here; - # otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them - # from is already sorted, so we'll preserve that order here. - # Use the user-provided list of CUDA capabilities if it's provided. - cudaComputeCapabilities = config.cudaCapabilities - or (lists.map (gpu: gpu.computeCapability) supportedGpus); - - # cudaForwardComputeCapability :: String - cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX"; - - # cudaComputeCapabilitiesAndForward :: List String - # The list of supported CUDA architectures, including the forward compatibility architecture. - # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities. - cudaComputeCapabilitiesAndForward = cudaComputeCapabilities - ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability; - # dropDot :: String -> String dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; @@ -102,38 +89,68 @@ let "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" ); - # cudaRealArches :: List String - # The real architectures are physical architectures supported by the CUDA version. - # For example, "sm_80". - cudaRealArches = archMapper "sm" cudaComputeCapabilities; - - # cudaVirtualArches :: List String - # The virtual architectures are typically used for forward compatibility, when trying to support - # an architecture newer than the CUDA version allows. - # For example, "compute_80". - cudaVirtualArches = archMapper "compute" cudaComputeCapabilities; - - # cudaArches :: List String - # By default, build for all supported architectures and forward compatibility via a virtual - # architecture for the newest supported architecture. - cudaArches = cudaRealArches ++ - lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches); - - # cudaGencode :: List String - # A list of CUDA gencode arguments to pass to NVCC. - cudaGencode = - let - base = gencodeMapper "sm" cudaComputeCapabilities; - forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ]; - in - base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat; + formatCapabilities = { cudaCapabilities, enableForwardCompat ? true }: rec { + inherit cudaCapabilities enableForwardCompat; + + # archNames :: List String + # E.g. [ "Turing" "Ampere" ] + archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities); + + # realArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # E.g. [ "sm_75" "sm_86" ] + realArches = archMapper "sm" cudaCapabilities; + + # virtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # E.g. [ "compute_75" "compute_86" ] + virtualArches = archMapper "compute" cudaCapabilities; + + # arches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + # E.g. [ "sm_75" "sm_86" "compute_86" ] + arches = realArches ++ + lists.optional enableForwardCompat (lists.last virtualArches); + + # gencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + # E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ] + gencode = + let + base = gencodeMapper "sm" cudaCapabilities; + forward = gencodeMapper "compute" [ (lists.last cudaCapabilities) ]; + in + base ++ lib.optionals enableForwardCompat forward; + }; in +# When changing names or formats: pause, validate, and update the assert +assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { + cudaCapabilities = [ "7.5" "8.6" ]; + enableForwardCompat = true; + + archNames = [ "Turing" "Ampere" ]; + realArches = [ "sm_75" "sm_86" ]; + virtualArches = [ "compute_75" "compute_86" ]; + arches = [ "sm_75" "sm_86" "compute_86" ]; + + gencode = [ "-gencode=arch=compute_75,code=sm_75" "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_86,code=compute_86" ]; +}; { - inherit - cudaArchNames - cudaArchNameToVersions cudaComputeCapabilityToName - cudaRealArches cudaVirtualArches cudaArches - cudaGencode; - cudaCapabilities = cudaComputeCapabilitiesAndForward; + # formatCapabilities :: { cudaCapabilities: List Capability, cudaForwardCompat: Boolean } -> { ... } + inherit formatCapabilities; + + # cudaArchNameToVersions :: String => String + inherit cudaArchNameToVersions; + + # cudaComputeCapabilityToName :: String => String + inherit cudaComputeCapabilityToName; + + # dropDot :: String -> String + inherit dropDot; +} // formatCapabilities { + cudaCapabilities = config.cudaCapabilities or supportedCapabilities; + enableForwardCompat = config.cudaForwardCompat or true; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 9bbd7ea1da1..1b216ee625a 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, backendStdenv , fetchurl , autoPatchelfHook , autoAddOpenGLRunpathHook @@ -10,7 +10,8 @@ attrs: let arch = "linux-x86_64"; -in stdenv.mkDerivation { +in +backendStdenv.mkDerivation { inherit pname; inherit (attrs) version; @@ -29,7 +30,11 @@ in stdenv.mkDerivation { ]; buildInputs = [ - stdenv.cc.cc.lib + # autoPatchelfHook will search for a libstdc++ and we're giving it a + # "compatible" libstdc++ from the same toolchain that NVCC uses. + # + # NB: We don't actually know if this is the right thing to do + backendStdenv.cc.cc.lib ]; dontBuild = true; @@ -43,6 +48,8 @@ in stdenv.mkDerivation { runHook postInstall ''; + passthru.stdenv = backendStdenv; + meta = { description = attrs.name; license = lib.licenses.unfree; diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index bcf16db6e12..96b782d8c99 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -1,6 +1,8 @@ -final: prev: let +final: prev: +let inherit (prev) lib pkgs; -in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { +in +(lib.filterAttrs (attr: _: (prev ? "${attr}")) { ### Overrides to fix the components of cudatoolkit-redist # Attributes that don't exist in the previous set are removed. @@ -20,6 +22,38 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { prev.libcublas ]; + cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: + let + inherit (prev.backendStdenv) cc; + in + { + # Point NVCC at a compatible compiler + # FIXME: non-redist cudatoolkit copy-pastes this code + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + postInstall = (oldAttrs.postInstall or "") + '' + mkdir -p $out/nix-support + cat <<EOF >> $out/nix-support/setup-hook + cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' + cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' + if [ -z "\''${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX=${cc}/bin; + fi + export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin' + EOF + ''; + }); + cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ]; diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 7e9fcae3271..a201a4a263f 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -76,8 +76,4 @@ gcc = "gcc11" version = "12.0.1" url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run" sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=" -# CUDA 12 is compatible with gcc12, but nixpkgs default gcc is still on gcc11 as -# of 2023-01-08. See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements. -# This should be upgraded to gcc12 once nixpkgs default gcc is upgraded. Other -# CUDA versions should likely have their gcc versions upgraded as well. -gcc = "gcc11" +gcc = "gcc12" diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index e5ccffc7e76..1005bd27469 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,8 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskell.packages.ghc810.override { + # Haskell packages that require ghc 8.10 + hs810Pkgs = self: pkgs.haskell.packages.ghc810.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -31,20 +32,6 @@ let maintainers = with maintainers; [ domenkozar turbomack ]; }) (self.callPackage ./packages/elm.nix { }); - /* - The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: - `package/nix/build.sh` - */ - elm-format = justStaticExecutables (overrideCabal (drv: { - jailbreak = true; - doCheck = assert (drv.version == "0.8.5"); false; # golden tests fail with optparse-applicative 0.17 - - description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; - homepage = "https://github.com/avh4/elm-format"; - license = licenses.bsd3; - maintainers = with maintainers; [ avh4 turbomack ]; - }) (self.callPackage ./packages/elm-format.nix {})); - elmi-to-json = justStaticExecutables (overrideCabal (drv: { prePatch = '' substituteInPlace package.yaml --replace "- -Werror" "" @@ -84,23 +71,48 @@ let # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5 aeson = self.aeson_1_5_6_0; - # Needed for elm-format + # elm-instrument needs this indents = self.callPackage ./packages/indents.nix {}; - bimap = self.callPackage ./packages/bimap.nix {}; - avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); - elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); - # We need tasty-hspec < 1.1.7 and hspec-golden < 0.2 to build elm-format-lib - tasty-hspec = self.tasty-hspec_1_1_6; - hspec-golden = self.hspec-golden_0_1_0_3; - # We need hspec hspec_core, hspec_discover < 2.8 for tasty-hspec == 1.1.6 - hspec = self.hspec_2_7_10; - hspec-core = self.hspec-core_2_7_10; - hspec-discover = self.hspec-discover_2_7_10; - hspec-meta = self.hspec-meta_2_7_8; + # elm-instrument's tests depend on an old version of elm-format, but we set doCheck to false for other reasons above + elm-format = null; + }; + }; + + # Haskell packages that require ghc 9.2 + hs92Pkgs = self: pkgs.haskell.packages.ghc92.override { + overrides = self: super: with pkgs.haskell.lib.compose; with lib; + let elmPkgs = rec { + /* + The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: + `package/nix/build.sh` + */ + elm-format = justStaticExecutables (overrideCabal (drv: { + jailbreak = true; + + description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; + homepage = "https://github.com/avh4/elm-format"; + license = licenses.bsd3; + maintainers = with maintainers; [ avh4 turbomack ]; + }) (self.callPackage ./packages/elm-format.nix {})); + }; + in elmPkgs // { + inherit elmPkgs; + # Needed for elm-format + avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); + elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; + + # elm-format requires text >= 2.0 + text = self.text_2_0_1; + # elm-format-lib requires hspec-golden < 0.2 + hspec-golden = self.hspec-golden_0_1_0_3; + # unorderd-container's tests indirectly depend on text < 2.0 + unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; + # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0 + relude = overrideCabal (drv: { doCheck = false; }) super.relude; }; }; @@ -122,7 +134,7 @@ in lib.makeScope pkgs.newScope (self: with self; { `patchNpmElm` function also defined in `packages/lib.nix`. */ elmLib = let - hsElmPkgs = hsPkgs self; + hsElmPkgs = hs810Pkgs self; in import ./packages/lib.nix { inherit lib; inherit (pkgs) writeScriptBin stdenv; @@ -141,7 +153,7 @@ in lib.makeScope pkgs.newScope (self: with self; { maintainers = [ maintainers.turbomack ]; }; }; -} // (hsPkgs self).elmPkgs // (with elmLib; with (hsPkgs self).elmPkgs; { +} // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; { elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { meta = with lib; nodePkgs.elm-verify-examples.meta // { description = "Verify examples in your docs"; diff --git a/pkgs/development/compilers/elm/packages/avh4-lib.nix b/pkgs/development/compilers/elm/packages/avh4-lib.nix index cd3df7d67a9..96ee35af27c 100644 --- a/pkgs/development/compilers/elm/packages/avh4-lib.nix +++ b/pkgs/development/compilers/elm/packages/avh4-lib.nix @@ -1,26 +1,26 @@ { mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap , binary, bytestring, containers, directory, fetchgit, filepath -, lib, mtl, process, relude, tasty, tasty-discover, tasty-hspec -, tasty-hunit, text +, lib, mtl, pooled-io, process, relude, tasty, tasty-discover +, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "avh4-lib"; version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; - rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; + rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base bimap binary bytestring - containers directory filepath mtl process relude text + containers directory filepath mtl pooled-io process relude text ]; testHaskellDepends = [ ansi-terminal ansi-wl-pprint array base bimap binary bytestring - containers directory filepath mtl process relude tasty tasty-hspec - tasty-hunit text + containers directory filepath mtl pooled-io process relude tasty + tasty-hspec tasty-hunit text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; diff --git a/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-lib.nix index 7beb52e8006..255e43af691 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-lib.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-lib.nix @@ -1,30 +1,30 @@ -{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, avh4-lib -, base, bimap, binary, bytestring, containers, directory +{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, array +, avh4-lib, base, bimap, binary, bytestring, containers, directory , elm-format-markdown, elm-format-test-lib, fetchgit, filepath -, indents, json, lib, mtl, optparse-applicative, parsec, process -, relude, split, tasty, tasty-discover, tasty-hspec, tasty-hunit -, text +, ghc-prim, hspec, lib, mtl, optparse-applicative, process, relude +, split, tasty, tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "elm-format-lib"; version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; - rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; + rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary bytestring containers directory elm-format-markdown filepath - indents json mtl optparse-applicative parsec process relude text + ghc-prim mtl optparse-applicative process relude text ]; testHaskellDepends = [ - ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary bytestring containers directory elm-format-markdown - elm-format-test-lib filepath indents json mtl optparse-applicative - parsec process relude split tasty tasty-hspec tasty-hunit text + elm-format-test-lib filepath ghc-prim hspec mtl + optparse-applicative process relude split tasty tasty-hspec + tasty-hunit text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; diff --git a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix index ae3b40347db..f5cc03c9532 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix @@ -4,8 +4,8 @@ mkDerivation { version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; - rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; + rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix index 729c2d678fc..6dd8598be32 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix @@ -1,24 +1,24 @@ { mkDerivation, avh4-lib, base, containers, fetchgit, filepath -, hspec-core, hspec-golden, lib, mtl, split, tasty, tasty-discover -, tasty-hspec, tasty-hunit, text +, hspec, hspec-core, hspec-golden, lib, mtl, split, tasty +, tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "elm-format-test-lib"; version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; - rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; + rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ - avh4-lib base containers filepath hspec-core hspec-golden mtl split - tasty tasty-hspec tasty-hunit text + avh4-lib base containers filepath hspec hspec-core hspec-golden mtl + split tasty tasty-hspec tasty-hunit text ]; testHaskellDepends = [ - avh4-lib base containers filepath hspec-core hspec-golden mtl split - tasty tasty-hspec tasty-hunit text + avh4-lib base containers filepath hspec hspec-core hspec-golden mtl + split tasty tasty-hspec tasty-hunit text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 6b583a6edde..1f88650bd3f 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,33 +1,35 @@ -{ mkDerivation, ansi-wl-pprint, avh4-lib, base, bimap, cmark -, containers, elm-format-lib, elm-format-test-lib, fetchgit, json -, lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io -, relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text +{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bimap +, bytestring, containers, elm-format-lib, elm-format-test-lib +, fetchgit, hspec, lib, mtl, optparse-applicative, QuickCheck +, quickcheck-io, relude, tasty, tasty-hspec, tasty-hunit +, tasty-quickcheck, text }: mkDerivation rec { pname = "elm-format"; - version = "0.8.5"; + version = "0.8.6"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; - rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; + rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; fetchSubmodules = true; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-wl-pprint avh4-lib base containers elm-format-lib json - optparse-applicative relude text + aeson ansi-wl-pprint avh4-lib base bytestring containers + elm-format-lib optparse-applicative relude text ]; testHaskellDepends = [ - ansi-wl-pprint avh4-lib base bimap cmark containers elm-format-lib - elm-format-test-lib json mtl optparse-applicative parsec QuickCheck - quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck - text + aeson ansi-wl-pprint avh4-lib base bimap bytestring containers + elm-format-lib elm-format-test-lib hspec mtl optparse-applicative + QuickCheck quickcheck-io relude tasty tasty-hspec tasty-hunit + tasty-quickcheck text ]; doHaddock = false; homepage = "https://elm-lang.org"; description = "A source code formatter for Elm"; license = lib.licenses.bsd3; + mainProgram = "elm-format"; postPatch = '' mkdir -p ./generated cat <<EOHS > ./generated/Build_elm_format.hs diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 6870bdab1c8..fac7431d863 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.26.2"; + version = "0.27.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NLUAKNWbKPAf81ce1OWTy/pnDcF2LfF12825DfE8AWw="; + hash = "sha256-RkpHmrxKiMtXOPKd8qBREike2sJ3NZcrc7RIxG08eyI="; }; nativeBuildInputs = [ git pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-IOZEdoQ5cqXjhgqNzOg4h5t8i3JDxfjamLFdesEy9Z8="; + cargoSha256 = "sha256-QluOPKEkofRRE+UxNe60f+sA8Ov3um25kl2F/pt19js="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index a0d57b75faa..2bc6c059013 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -165,4 +165,76 @@ rec { version = "22.3.1"; src = fetchurl (source "wasm-installable-svm" javaVersion); }; + + ### Java 19 ### + + # Mostly available for build purposes, not to be exposed at the top level + graalvm19-ce-bare = buildGraalvm rec { + version = "22.3.1"; + javaVersion = "19"; + src = fetchurl (source "graalvm-ce" javaVersion); + meta.platforms = builtins.attrNames javaPlatform; + products = [ ]; + }; + + graalvm19-ce = graalvm19-ce-bare.override { + products = [ native-image-installable-svm-java19 ]; + }; + + # Mostly available for testing, not to be exposed at the top level + graalvm19-ce-full = graalvm19-ce-bare.override { + products = [ + js-installable-svm-java19 + llvm-installable-svm-java19 + native-image-installable-svm-java19 + nodejs-installable-svm-java19 + python-installable-svm-java19 + ruby-installable-svm-java19 + wasm-installable-svm-java19 + ]; + }; + + js-installable-svm-java19 = callPackage ./js-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + + llvm-installable-svm-java19 = callPackage ./llvm-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "llvm-installable-svm" javaVersion); + }; + + native-image-installable-svm-java19 = callPackage ./native-image-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "native-image-installable-svm" javaVersion); + }; + + nodejs-installable-svm-java19 = callPackage ./nodejs-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "nodejs-installable-svm" javaVersion); + graalvm-ce = graalvm19-ce-bare; + }; + + python-installable-svm-java19 = callPackage ./python-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + + ruby-installable-svm-java19 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java19; + }; + + wasm-installable-svm-java19 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "19"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix index eb2f455abbe..b8d157a2399 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -9,6 +9,10 @@ sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "13gg5hqg3pzn3qprl76i2wpmfagf5zw4w9hl18993ing21k5d0kq"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -17,6 +21,10 @@ sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "1b5jsazjxkqlswl0h5yx7nx16zjjlvw967i6kypp4js80zg79s8m"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -25,6 +33,10 @@ sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "0mdiiag4hkddfgjamqn8y63s7xrfhq1wjvc7rw2sldykg7x0813i"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -33,6 +45,10 @@ sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "0h5sf99ypwz0bafq4jm71ynszfgsrlnhmcjh0kl6sy5g1q8ij0jf"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "nodejs-installable-svm" = { "11-linux-aarch64" = { @@ -43,6 +59,10 @@ sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "12chjbfz530kyp46bya8wcwciwlhp873hc6mvsjcf5swa3g7cwcl"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -51,6 +71,10 @@ sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "1gdkn0srkh8bn7c81f8s7ykd12pnz5r75rif76zhzdllhx63nn5v"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -59,6 +83,10 @@ sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "11kpgd6vxc8dm9z5ihkwbjbbspk53m3k9b550zf0zs3as9yjbp22"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -67,6 +95,10 @@ sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "1yrh6iahai3aw7lpz89mrq782b1bysqqr9vkqdgcv00by1a7yd10"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "wasm-installable-svm" = { "11-linux-aarch64" = { @@ -77,6 +109,10 @@ sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "1vaqf3ilp3kg280adynww4l07sbcd5hih86akpd25rbxn45khz9s"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -85,6 +121,10 @@ sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "1k7jqsh5wg7c7a6mhqgxghn20qwx70bky49p2a6imcsygnilqgim"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -93,6 +133,10 @@ sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "14d3djmacj81rj5sqf30z060iywndn6kw1n58kg12jvmgipbm3iq"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "js-installable-svm" = { "11-linux-aarch64" = { @@ -103,6 +147,10 @@ sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "1mk8qzdfsbjhfx0ds8rk9jm2g6g2lv8bppmnwpgrkm232c8i0dgw"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -111,6 +159,10 @@ sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "0ghx41aldb30yjd0sdrfm89i7d6q0aca18bm7j1qyg9gnmkvxnmn"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -119,6 +171,10 @@ sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "03wxaim069rp69njh4gdchsm3b9s7crxihbk1arvz2cpgy9x1zvc"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -127,6 +183,10 @@ sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "13nx6kwcx100166ba4h7h97ravw4hyiqnvhszqbdffn54y0x5dwl"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "python-installable-svm" = { "11-linux-aarch64" = { @@ -137,6 +197,10 @@ sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "1d0a7didgzgn45q7zg4iidmy2gckhaf796mbraqz5hjlig4vscr7"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -145,6 +209,10 @@ sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "0nwa1nrclh3p12cacp98wbx9p3zhs44b8srbr27vqgc10z78c1wz"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -153,6 +221,10 @@ sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "0n7vx5lxbgpjvzv0y1fqsrk0j61vrzjm2ksh0lkdnz1zrr5mqgsh"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -161,6 +233,10 @@ sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "00agpvp1yw884lm6d88d2l8629qpbpdlik2g621yz4vf9y7qki83"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "native-image-installable-svm" = { "11-linux-aarch64" = { @@ -171,6 +247,10 @@ sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "13gg1zj7ivzrgwvyvsbwbrchryjqmi00km7jxajjjbr1k7jkdc5v"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -179,6 +259,10 @@ sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "1ayx0ag00i9868xz5xzc9fmwipkhz5qsldfmxk16cxp5vi71yhb1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -187,6 +271,10 @@ sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "0dfddqgkz9b5akpgfw7sj4sl9wwknmh7qzk3pq2dpvf6892168wb"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -195,6 +283,10 @@ sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "1829fnyz62gcnj0664hl9w3vjyb3xfc84gpnblhhdx77c9y8gf6b"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; "graalvm-ce" = { "11-linux-aarch64" = { @@ -205,6 +297,10 @@ sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz"; }; + "19-linux-aarch64" = { + sha256 = "03bakx00rl2c0hyvp5skfha57cijlpvmsnfgv2ancn3ypyqx1c4m"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-aarch64-22.3.1.tar.gz"; + }; "11-linux-amd64" = { sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz"; @@ -213,6 +309,10 @@ sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz"; }; + "19-linux-amd64" = { + sha256 = "0byxf2d4c3vwygjg5rbwwi22k1pv0yqjz03n8m67v2vsbs09vnbw"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-amd64-22.3.1.tar.gz"; + }; "11-darwin-aarch64" = { sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz"; @@ -221,6 +321,10 @@ sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz"; }; + "19-darwin-aarch64" = { + sha256 = "09n9qz58lfwl2ag8s3n6dm11p5nnbz6gfralfyfj72wwfghcsckc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-aarch64-22.3.1.tar.gz"; + }; "11-darwin-amd64" = { sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz"; @@ -229,6 +333,10 @@ sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4"; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; }; + "19-darwin-amd64" = { + sha256 = "1b3r43jpgip12if1fld41qiigqgn32zqs6992ji206dxq6xwli23"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-amd64-22.3.1.tar.gz"; + }; }; "ruby-installable-svm" = { "11-linux-aarch64" = { @@ -239,6 +347,10 @@ sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; }; + "19-linux-aarch64" = { + sha256 = "1c3xw9h85g3p5w12zrlvl036ay3218g5405hkh7qaah00affgx5l"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-aarch64-22.3.1.jar"; + }; "11-linux-amd64" = { sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; @@ -247,6 +359,10 @@ sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; }; + "19-linux-amd64" = { + sha256 = "1j42y6gwf84xgjnawwqymxv4702gsy0vriwdfd09nbp600sjzga5"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-amd64-22.3.1.jar"; + }; "11-darwin-aarch64" = { sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; @@ -255,6 +371,10 @@ sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; }; + "19-darwin-aarch64" = { + sha256 = "0xysf43q0zpin3lmffmb3n7y4rsm1zm19ndys1vrn8szz4jcxpsq"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-aarch64-22.3.1.jar"; + }; "11-darwin-amd64" = { sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; @@ -263,5 +383,9 @@ sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; + "19-darwin-amd64" = { + sha256 = "02nkjlv306wyms7swibn5rz0w8sx6pwvh1lilgvv4xnbj7wps2q7"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-amd64-22.3.1.jar"; + }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 6cafb0f0d11..ad523fbd6b3 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -54,12 +54,16 @@ declare -r -A products_urls=( readonly platforms=( "11-linux-aarch64" "17-linux-aarch64" + "19-linux-aarch64" "11-linux-amd64" "17-linux-amd64" + "19-linux-amd64" "11-darwin-aarch64" "17-darwin-aarch64" + "19-darwin-aarch64" "11-darwin-amd64" "17-darwin-amd64" + "19-darwin-amd64" ) info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..." diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 0570450b32b..b5a5f0671ab 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -19,8 +19,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.7.1"; - sha256 = "sha256-bpi4hLpov1CbFy4jr9Eytc5O4ismYw0J+KgXyZtQYks="; + rev = "v0.11.0"; + sha256 = "sha256-74JBW7qU8huSqwqgxNbvbGj1DlJJThgGhb3owBYmhvI="; }; llvmPkgs = llvmPackages_11 // { @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.12504.5"; + version = "1.0.12812.26"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "sha256-Ok+cXMTBABrHHM4Vc2yzlou48YHoQnaB3We8mGZhSwI="; + sha256 = "sha256-KpaDaDYVp40H7OscDGUpzEMgIOIk397ANi+8sDk4Wow="; }; nativeBuildInputs = [ cmake bison flex python3 ]; diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 6f20d23b32b..b1a3b09cb72 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -86,25 +86,7 @@ stdenv.mkDerivation { ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 ./armv7l.patch - ] - # The `compiler-rt` build inspects `ld` to figure out whether it needs to - # explicitly call `codesign`: - # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/Modules/AddCompilerRT.cmake#L409-L422 - # - # In our case, despite (currently) having an `ld` version than 609, we don't - # need an explicit codesigning step because `postLinkSignHook` handles this - # for us. - # - # Unfortunately there isn't an easy way to override - # `NEED_EXPLICIT_ADHOC_CODESIGN`. - # - # Adding `codesign` as a build input also doesn't currently work because, as - # of this writing, `codesign` in nixpkgs doesn't support the `--sign` alias - # which the `compiler-rt` build uses. See here for context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272116014 - # - # So, for now, we patch `compiler-rt` to skip the explicit codesigning step. - ++ lib.optional stdenv.hostPlatform.isDarwin ./skip-explicit-codesign.patch; + ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch b/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch deleted file mode 100644 index 894a74e74d4..00000000000 --- a/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type) - if (HAD_ERROR) - message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") - endif() -- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) -+ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us - if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") - string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) - if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 903fdb54fee..50c34f7c35b 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, menhirLib, yojson, ulex, pprint, fix, functory }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4, menhir +, menhirLib, yojson, ulex, pprint, fix, functory +}: if lib.versionAtLeast ocaml.version "4.06" then throw "mezzo is not available for OCaml ${ocaml.version}" @@ -24,8 +26,8 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 menhir ]; + buildInputs = [ yojson menhirLib ulex pprint fix functory ocamlbuild ]; # Sets warning 3 as non-fatal prePatch = lib.optionalString (check-ocaml-version "4.02") '' diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index b9a196b5dad..c02aff4be2c 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-KENOWWyDduIoK7sym9vHKAojRZAR5lYVOtz8I4Z65R0="; + sha256 = "sha256-sJY2w1+hv5KrRunf6Dfwc+eY6X9HYghVyAlWLlHvv+E="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 3e13b9247fb..f2eadee5793 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); + buildInputs = [ ocamlPackages.num ]; propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; @@ -19,6 +20,9 @@ stdenv.mkDerivation rec { patches = [ ./ignore-complex-float128.patch ]; + # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209 + env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'"; + preBuild = '' patchShebangs . ''; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 276767fa37a..d5ec912bfed 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 , openjdk11-bootstrap , withMedia ? true , withWebKit ? false @@ -24,7 +24,7 @@ let sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko="; }; - buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 5c1d057a218..febbff49537 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 -, pkg-config, perl, cmake, gperf, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg_4-headless, python3, ruby, icu68 , withMedia ? true , withWebKit ? false @@ -24,7 +24,7 @@ let sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; - buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix index e0c23e4734b..bb909a31624 100644 --- a/pkgs/development/compilers/openjdk/openjfx/19.nix +++ b/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless -, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk3, libXtst +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 , withMedia ? true , withWebKit ? false @@ -38,7 +38,7 @@ let }) ]; - buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 18443efae7a..9311c3112c8 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3, +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { @@ -36,6 +36,11 @@ stdenv.mkDerivation (rec { sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"; }; }) + (fetchpatch { + name = "remove-decnet-header.patch"; + url = "https://github.com/ponylang/ponyc/commit/e5b9b5daec5b19415d519b09954cbd3cf5f34220.patch"; + hash = "sha256-60cOhBBwQxWLwEx+svtFtJ7POQkHzJo2LDPRJ5L/bNk="; + }) ]; postUnpack = '' @@ -93,6 +98,6 @@ stdenv.mkDerivation (rec { homepage = "https://www.ponylang.org"; license = licenses.bsd2; maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; }) diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index e2245f800ad..f8ac0be26da 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-v3F+qncs3PFkRllrdWvrle/ofg9thX4BJlvILQz9B6A="; + sha256 = "sha256-feFOmpbC2lN3oH7NiCK9mCjBKTfjpI3JqLNad9MUk9A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index 966be329bef..860baf1d604 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { pname = "zig"; version = "0.10.1"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "ziglang"; @@ -52,7 +53,17 @@ stdenv.mkDerivation rec { "-DZIG_TARGET_MCPU=baseline" ]; + postBuild = '' + ./zig2 build-exe ../doc/docgen.zig + ./docgen ./zig2 ../doc/langref.html.in ./langref.html + ''; + doCheck = true; + + postInstall = '' + install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html + ''; + installCheckPhase = '' $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig ''; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 3e67675b5ef..e4f198695f3 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -6,9 +6,11 @@ coqPackages, coq, version ? null }@args: with builtins // lib; let - repo = "math-comp"; + repo = "analysis"; owner = "math-comp"; + release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; + release."0.6.0".sha256 = "sha256-0msICcIrK6jbOSiBu0gIVU3RHwoEEvB88CMQqW/06rg="; release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k="; release."0.5.2".sha256 = "0yx5p9zyl8jv1vg7rgkyq8dqzkdnkqv969mi62whmhkvxbavgzbw"; release."0.5.1".sha256 = "1hnzqb1gxf88wgj2n1b0f2xm6sxg9j0735zdsv6j12hlvx5lwk68"; @@ -22,7 +24,7 @@ let release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; } + { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index dfae27b3710..2a152ef3ee3 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1224"; + version = "1.11.1.1237"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI="; + sha256 = "sha256-1uucH0/kx7w991kvZnwjRTSbVbu62W0j0/7iaRTZ5I8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 58df443f96a..747c2a90cb7 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.8"; - sha256 = "sha256-NwnGqFEhVi96fEPLKoAqJgvWNZEsRGtE/3HP0eRthuA="; + version = "24.3.4.9"; + sha256 = "sha256-toM2AoPAle+eNKg0to3r/EYT2taJ9OwKvde4Jr++ZE0="; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 11b6fcbe8cf..0afdba9983e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -17,6 +17,7 @@ , libxcrypt , self , configd +, darwin , autoreconfHook , autoconf-archive , pkg-config @@ -41,6 +42,7 @@ , stripBytecode ? true , includeSiteCustomize ? true , static ? stdenv.hostPlatform.isStatic +, enableFramework ? false , enableOptimizations ? false # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility. # clang starts supporting `-fno-sematic-interposition` with version 10 @@ -65,6 +67,8 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; +assert enableFramework -> stdenv.isDarwin; + assert lib.assertMsg (reproducibleBuild -> stripBytecode) "Deterministic builds require stripping bytecode."; @@ -84,6 +88,8 @@ let buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; + inherit (darwin.apple_sdk.frameworks) Cocoa; + tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9"; passthru = let @@ -125,6 +131,8 @@ let ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) + + ++ optionals enableFramework [ Cocoa ] ++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -308,8 +316,10 @@ in with passthru; stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" - ] ++ optionals (!static) [ + ] ++ optionals (!static && !enableFramework) [ "--enable-shared" + ] ++ optionals enableFramework [ + "--enable-framework=${placeholder "out"}/Library/Frameworks" ] ++ optionals enableOptimizations [ "--enable-optimizations" ] ++ optionals enableLTO [ @@ -390,7 +400,11 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals tzdataSupport [ tzdata ]); - in '' + in lib.optionalString enableFramework '' + for dir in include lib share; do + ln -s $out/Library/Frameworks/Python.framework/Versions/Current/$dir $out/$dir + done + '' + '' # needed for some packages, especially packages that backport functionality # to 2.x from 3.x for item in $out/lib/${libPrefix}/test/*; do @@ -487,7 +501,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - lib.optionals (openssl' != null && !static) [ openssl'.dev ] + lib.optionals (openssl' != null && !static && !enableFramework) [ openssl'.dev ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. @@ -521,7 +535,7 @@ in with passthru; stdenv.mkDerivation { high level dynamic data types. ''; license = licenses.psfl; - platforms = with platforms; linux ++ darwin; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 3edbebd7cc0..db3c6f92a8e 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-ekryYPSuBhK+0BvzGxtQVkWDIsfpqbWLc/WXjhPcFYw="; + sha256 = "sha256-u/K1R0ILoDvHvHb0QzGB4YHlIf70jVeVEmrquv2U0S8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index c1a20a198f3..84637bed1d0 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "2.8.4"; + version = "2.8.6"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-/jB4jlYotvdU068+zj9Z+G0g75sI9dTmtgN874i0qAE="; + sha256 = "sha256-0sAPexGKriaJVhBDRsopRYD8xrJAaXZiscCcwfWdEgQ="; }; postPatch = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xxd ]; buildInputs = [ readline openssl libffi ]; - checkInputs = [ valgrind ]; + checkInputs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ valgrind ]; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix index d09f5083a94..ad68b6df4d5 100644 --- a/pkgs/development/libraries/blaze/default.nix +++ b/pkgs/development/libraries/blaze/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blaze"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromBitbucket { owner = "blaze-lib"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-fe6J0aquk4j+b11Sq+ihagWA/LMTYnAgIHbaDCZacP0="; + hash = "sha256-Jl9ZWFqBvLgQwCoMNX3g7z02yc7oYx+d6mbyLBzBJOs="; }; strictDeps = true; diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index b677bf69fe6..5702b4e8f09 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cgreen"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = version; - sha256 = "sha256-uyw5beBZ3MnDyaxBWIDGl/L/0yv0ROafXwgxhQ+A+n4="; + sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg="; }; postPatch = '' diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix index 3e109956c67..8dc4f7598ab 100644 --- a/pkgs/development/libraries/exprtk/default.nix +++ b/pkgs/development/libraries/exprtk/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "exprtk"; - version = "unstable-2021-12-31"; + version = "0.0.2"; src = fetchFromGitHub { owner = "ArashPartow"; - repo = "exprtk"; - rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1"; - hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM="; + repo = pname; + rev = version; + hash = "sha256-ZV5nS6wEbKfzXhfXEtVlkwaEtxpTOYQaGlaxKx3FIvE="; }; dontBuild = true; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f0c69249957..373dce60d94 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.02"; + version = "23.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; + sha256 = "sha256-sQbltmHmScSn5E1tE32uU16JQasjOnLW5N2m6+LC9CI="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 477f73ca2df..ab6f8a54e82 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "fb303"; - version = "2023.02.13.00"; + version = "2023.02.20.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fb303"; rev = "v${version}"; - sha256 = "sha256-Dgef8Y8mvObbnXOsfWxTzMoqCph0i9lbusnjqn/WfTQ="; + sha256 = "sha256-cGJz7ArifkB6c5ukU9hoTqngZDTLZfSpdQ2Vx1gWntw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 182f4fba56e..6ab107497fd 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.02.20.00"; + version = "2023.02.27.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "v${version}"; - hash = "sha256-qgp0E/xCbvMIndwUkqsvZuFY7333NviOkljqiMOhKtw="; + hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 6db1fc2e51a..4d98c163c6d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2023.02.13.00"; + version = "2023.02.27.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-YKS+UIlgDhMefovkkR/GlJcZtAjGLC9e8uhqfniH1eY="; + sha256 = "sha256-DfZiVxncpKSPn9BN25d8o0/tC27+HhSG/t53WgzAT/s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 7431ca1f82a..7fc9dc086f6 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"; description = "Collection of GSettings schemas for settings shared by various components of a desktop"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index a35a256b550..b2c872e06fd 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , cmake +, doxygen , fetchFromGitHub , glib , glib-networking @@ -14,6 +15,7 @@ , libuuid , libxcrypt , libxml2 +, paho-mqtt-c , pkg-config , zlib , freeradius @@ -21,17 +23,18 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.4"; + version = "22.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; + rev = "refs/tags/v${version}"; + hash = "sha256-qsEIjoaq+iBl6iTdSXrxf7LYin/qiGtJ/LaD4bONbI0="; }; nativeBuildInputs = [ cmake + doxygen pkg-config ]; @@ -49,6 +52,7 @@ stdenv.mkDerivation rec { libuuid libxcrypt libxml2 + paho-mqtt-c zlib ]; @@ -59,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Libraries module for the Greenbone Vulnerability Management Solution"; homepage = "https://github.com/greenbone/gvm-libs"; + changelog = "https://github.com/greenbone/gvm-libs/releases/tag/v${version}"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/hipblas/default.nix b/pkgs/development/libraries/hipblas/default.nix index e72c2eac1f8..e8402c0d05b 100644 --- a/pkgs/development/libraries/hipblas/default.nix +++ b/pkgs/development/libraries/hipblas/default.nix @@ -18,7 +18,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 1d5ec5abea6..675167aaf21 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-FUruHlnFMSl+8r1VZnUQd2feLNGz+k0mLuyca9cgcbw="; + sha256 = "sha256-8TkrRqQYnp9Ho8jT22EQCEBIjlRWYlOAZSNOnJ5zCM0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 0fa807ebe79..d4aeaa8f2a7 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.3"; + version = "22.3.4"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-ghCB9wrjixAX06KUYZUEL1Tq6fKSH7pqe3Ti1y/+a2U="; + sha256 = "sha256-V8mimy4yB7BO5YdbUh8byN9K6ylQ3lOLynQbXxiOUok="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 06825c5379d..799ca99a777 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - hash = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; + hash = "sha256-t9DJj2xmFPruspKhjy2DbAvDeNWaXXSB6BC7bGnsnd8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 89684080f9f..d30dcb44927 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.oneapi.io/"; description = "oneAPI Level Zero Specification Headers and Loader"; + homepage = "https://github.com/oneapi-src/level-zero"; license = licenses.mit; maintainers = [ maintainers.ziguana ]; }; diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix index aca25f73edd..8cddc9a9f37 100644 --- a/pkgs/development/libraries/libdatovka/default.nix +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-687d8ZD9zfMeo62YWCW5Kc0CXkKClxtbbwXR51pPwBE="; + sha256 = "sha256-aG7U8jP3pvOeFDetYVOx+cE78ys0uSkKNjSgB09ste8="; }; patches = [ diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 20c9a64c60b..730ebf27044 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.67"; + version = "1.0.68"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-SXyMmkyC1RZLIYhrG2TDcH/PDCHfrJOVZOX1PC3EDLg="; + sha256 = "sha256-FlBXSX6ZA6vDV1Kf1QU1XGxkyS3aWGSrwr2RtdVss10="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix index cafa99ed77d..a83268ca31a 100644 --- a/pkgs/development/libraries/libinsane/default.nix +++ b/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.9"; + version = "1.0.10"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1a1lszhq3j11i1jybc5kmn7hhhji44xhjqsxsldsy9l3344rkzv4"; + sha256 = "sha256-2BLg8zB0InPJqK9JypQIMVXIJndo9ZuNB4OeOAo/Hsc="; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 18376f4b7f4..8c052b5ce80 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "Library for reading and writing Jcat files"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 9ddebe5b6b0..bfcdb2d5287 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, openssl +, cmake }: + stdenv.mkDerivation rec { version = "2.9.0"; pname = "libre"; @@ -9,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; }; buildInputs = [ zlib openssl ]; + nativeBuildInputs = [ cmake ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 7b5a7d228d5..59836861e7c 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "sha256-aJLsUtik5aXfsdi+8QoDgbi4VUZ8gV3YPA6kIY6wzs4="; + sha256 = "sha256-VJlvFiOsIyiu0kBU8NkObtt9j2ElrSzJtvE8wtSlOus="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 14641ad6672..2e9a2f1fa31 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: +{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre +, cmake }: + stdenv.mkDerivation rec { version = "2.10.0"; pname = "librem"; @@ -8,10 +10,13 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl libre ]; + cmakeFlags = [ + "-DRE_INCLUDE_DIR=${libre}/include/re" + ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" - "LIBRE_INC=${libre}/include/re" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index bc8a2ced7cd..14e730d69e5 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; version = "1.0.18"; src = fetchurl { - url = "https://download.libsodium.org/libsodium/releases/${pname}-${version}.tar.gz"; + url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; }; @@ -26,11 +28,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A modern and easy-to-use crypto library"; homepage = "http://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; + pkgConfigModules = [ "libsodium" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b3e349beab1..c74f70892c5 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -112,13 +112,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8="; + sha256 = "sha256-V39p0kg+zGdoIY9mJjtMLk2xzlTjHG0SPR2GjvHK9FI="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 09dbcc3a0f5..2a1f0941f4d 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "A library to help create and query binary XML blobs"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480c2d8c858..c0252eb9233 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -51,9 +51,9 @@ "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 + ++ lib.optionals stdenv.hostPlatform.isx86 [ + "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build + "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) ] else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index d363f524f19..f288cfda545 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 5fa03b7083e..3a2e4b1fe7d 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "mpdecimal"; version = "2.5.1"; - outputs = [ "out" "doc" ]; + outputs = [ "out" "cxx" "doc" "dev" ]; src = fetchurl { url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + postInstall = '' + mkdir -p $cxx/lib + mv $out/lib/*c++* $cxx/lib + + mkdir -p $dev/nix-support + echo -n $cxx >> $dev/nix-support/propagated-build-inputs + ''; + meta = { description = "Library for arbitrary precision decimal floating point arithmetic"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e1a13c9fe57..75d8c712df1 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,8 +15,8 @@ , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && - stdenv.hostPlatform.isx86_64, cudatoolkit - + stdenv.hostPlatform.isx86_64 +, cudaPackages ? { } , enableUnfree ? false , enableIpp ? false , enablePython ? false, pythonPackages ? null @@ -40,6 +40,9 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let + inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages.cudaFlags) cudaCapabilities; + version = "3.4.18"; src = fetchFromGitHub { @@ -242,6 +245,8 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" + "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ac021c2b610..a9f7b0304e8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 -, cudatoolkit +, cudaPackages ? { } , nvidia-optical-flow-sdk , enableUnfree ? false @@ -79,6 +79,9 @@ }: let + inherit (cudaPackages) cudatoolkit; + inherit (cudaPackages.cudaFlags) cudaCapabilities; + version = "4.7.0"; src = fetchFromGitHub { @@ -342,6 +345,14 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + + # OpenCV respects at least three variables: + # -DCUDA_GENERATION takes a single arch name, e.g. Volta + # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6" + # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6" + "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" + "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" + "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index efa19a2ce19..30124d10e79 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -3,6 +3,7 @@ , withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false +, enableKTLS ? stdenv.isLinux , static ? stdenv.hostPlatform.isStatic # Used to avoid cross compiling perl, for example, in darwin bootstrap tools. # This will cause c_rehash to refer to perl via the environment, but otherwise @@ -134,7 +135,7 @@ let ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. - ++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls" + ++ lib.optional (lib.versionAtLeast version "3.0.0" && enableKTLS) "enable-ktls" ++ lib.optional (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index d3d821ba1db..bc426392807 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,54 +1,50 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , gfortran , blas +, cmake , lapack , which }: stdenv.mkDerivation rec { pname = "qrupdate"; - version = "1.1.2"; - src = fetchurl { - url = "mirror://sourceforge/qrupdate/${pname}-${version}.tar.gz"; - sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "mpimd-csc"; + repo = "qrupdate-ng"; + rev = "v${version}"; + hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg="; }; - preBuild = - # Check that blas and lapack are compatible - assert (blas.isILP64 == lapack.isILP64); - # We don't have structuredAttrs yet implemented, and we need to use space - # seprated values in makeFlags, so only this works. - '' - makeFlagsArray+=( - "LAPACK=-L${lapack}/lib -llapack" - "BLAS=-L${blas}/lib -lblas" - "PREFIX=${placeholder "out"}" - "FFLAGS=${toString ([ - "-std=legacy" - ] ++ lib.optionals blas.isILP64 [ - # If another application intends to use qrupdate compiled with blas with - # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): - # https://savannah.gnu.org/bugs/?50339 - "-fdefault-integer-8" - ])}" - ) - ''; + cmakeFlags = assert (blas.isILP64 == lapack.isILP64); [ + "-DCMAKE_Fortran_FLAGS=${toString ([ + "-std=legacy" + ] ++ lib.optionals blas.isILP64 [ + # If another application intends to use qrupdate compiled with blas with + # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): + # https://savannah.gnu.org/bugs/?50339 + "-fdefault-integer-8" + ])}" + ]; doCheck = true; - checkTarget = "test"; - - buildFlags = [ "lib" "solib" ]; - - installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - - nativeBuildInputs = [ which gfortran ]; + nativeBuildInputs = [ + cmake + which + gfortran + ]; + buildInputs = [ + blas + lapack + ]; meta = with lib; { description = "Library for fast updating of qr and cholesky decompositions"; - homepage = "https://sourceforge.net/projects/qrupdate/"; + homepage = "https://github.com/mpimd-csc/qrupdate-ng"; license = licenses.gpl3Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index d941cb19998..b3aaaff82f0 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 4b7bd0b9fd9..ffad392c621 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.9.2"; + version = "7.10.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; + sha256 = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix index 7dbde6e1633..e7e0c9fed65 100644 --- a/pkgs/development/libraries/rocprofiler/default.nix +++ b/pkgs/development/libraries/rocprofiler/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index a9a4c983667..45099cb9f4c 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-3OcJUL6T1HJz6TQb1//lumsTxqfwbWbQ4lGuZoKmqbY="; + hash = "sha256-JT2PX53N39H+EaThPHo2ol+BUjDQniSQlKMLiYD8NoM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index d4e1f641a95..b2844ae6b07 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,11 +1,11 @@ { - stdenv, + backendStdenv, lib, zlib, useCudatoolkitRunfile ? false, cudaVersion, cudaMajorVersion, - cudatoolkit, # if cuda>=11: only used for .cc + cudatoolkit, # For cuda < 11 libcublas ? null, # cuda <11 doesn't ship redist packages autoPatchelfHook, autoAddOpenGLRunpathHook, @@ -26,7 +26,7 @@ maxCudaVersion, }: assert useCudatoolkitRunfile || (libcublas != null); let - inherit (cudatoolkit) cc; + inherit (backendStdenv) cc; inherit (lib) lists strings trivial versions; # majorMinorPatch :: String -> String @@ -46,7 +46,7 @@ assert useCudatoolkitRunfile || (libcublas != null); let then cudatoolkit else libcublas; in - stdenv.mkDerivation { + backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; version = versionTriple; diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index cc5d3baf344..2ee2e831f6e 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.2"; pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libbraiding"; rev = version; - sha256 = "1n1j58y9jaiv0ya0y4fpfb3b05wv0h6k2babpnk2zifjw26xr366"; + sha256 = "sha256-cgg6rvlOvFqGjgbw6i7QXS+tqvfFd1MkPCEjnW/FyFs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index ab0a2125ec0..c997fcc0901 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -8,10 +8,16 @@ { blas , cmake , cudaPackages + # FIXME: cuda being unfree means ofborg won't eval "magma". + # respecting config.cudaSupport -> false by default + # -> ofborg eval -> throws "no GPU targets specified". + # Probably should delete everything but "magma-cuda" and "magma-hip" + # from all-packages.nix , cudaSupport ? true , fetchurl , gfortran -, gpuTargets ? [ ] +, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities +, gpuTargets ? [ ] # Non-CUDA targets, that is HIP , hip , hipblas , hipsparse @@ -36,14 +42,8 @@ let # of the first list *from* the second list. That means: # lists.subtractLists a b = b - a - # For CUDA - supportedCudaSmArches = lists.intersectLists cudaFlags.cudaRealArches supportedGpuTargets; - # Subtract the supported SM architectures from the real SM architectures to get the unsupported - # SM architectures. - unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.cudaRealArches; - # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.cudaRealArches. + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets; @@ -62,19 +62,32 @@ let ) supported; - # Create the gpuTargetString. gpuTargetString = strings.concatStringsSep "," ( if gpuTargets != [ ] then # If gpuTargets is specified, it always takes priority. gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets - else if cudaSupport then - gpuArchWarner supportedCudaSmArches unsupportedCudaSmArches else if rocmSupport then gpuArchWarner supportedRocmArches unsupportedRocmArches + else if cudaSupport then + [ ] # It's important we pass explicit -DGPU_TARGET to reset magma's defaults else throw "No GPU targets specified" ); + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities); + + cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures; + minArch = + let + minArch' = builtins.head (builtins.sort builtins.lessThan cudaArchitectures); + in + # If this fails some day, something must've changed and we should re-validate our assumptions + assert builtins.stringLength minArch' == 2; + # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 + "${minArch'}0"; + + cuda_joined = symlinkJoin { name = "cuda-redist-${cudaVersion}"; paths = with cudaPackages; [ @@ -87,6 +100,8 @@ let }; in +assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; + stdenv.mkDerivation { pname = "magma"; inherit version; @@ -116,7 +131,11 @@ stdenv.mkDerivation { openmp ]; - cmakeFlags = lists.optionals cudaSupport [ + cmakeFlags = [ + "-DGPU_TARGET=${gpuTargetString}" + ] ++ lists.optionals cudaSupport [ + "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" + "-DMIN_ARCH=${minArch}" # Disarms magma's asserts "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++" "-DMAGMA_ENABLE_CUDA=ON" @@ -126,14 +145,10 @@ stdenv.mkDerivation { "-DMAGMA_ENABLE_HIP=ON" ]; - # NOTE: We must set GPU_TARGET in preConfigure in this way because it may contain spaces. - preConfigure = '' - cmakeFlagsArray+=("-DGPU_TARGET=${gpuTargetString}") - '' # NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of # CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set # CUDAHOSTCXX. - + strings.optionalString cudaSupport '' + preConfigure = strings.optionalString cudaSupport '' export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++ ''; diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix index 3d08aa95d4d..029f418edce 100644 --- a/pkgs/development/libraries/science/math/magma/releases.nix +++ b/pkgs/development/libraries/science/math/magma/releases.nix @@ -1,27 +1,13 @@ # NOTE: Order matters! Put the oldest version first, and the newest version last. # NOTE: Make sure the supportedGpuTargets are in order of oldest to newest. # You can update the supportedGpuTargets by looking at the CMakeLists.txt file. -# CUDA starts here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-175 # HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386 +# CUDA works around magma's wrappers and uses FindCUDAToolkit directly [ { version = "2.6.2"; hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; supportedGpuTargets = [ - "sm_20" - "sm_30" - "sm_35" - "sm_37" - "sm_50" - "sm_52" - "sm_53" - "sm_60" - "sm_61" - "sm_62" - "sm_70" - "sm_71" - "sm_75" - "sm_80" "700" "701" "702" @@ -53,21 +39,6 @@ version = "2.7.1"; hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; supportedGpuTargets = [ - "sm_20" - "sm_30" - "sm_35" - "sm_37" - "sm_50" - "sm_52" - "sm_53" - "sm_60" - "sm_61" - "sm_62" - "sm_70" - "sm_71" - "sm_75" - "sm_80" - "sm_90" "700" "701" "702" diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 99aed3a6a30..155e863bf21 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }: +{ lib +, backendStdenv +, fetchFromGitHub +, which +, cudaPackages ? { } +, addOpenGLRunpath +}: + +with cudaPackages; let - inherit (cudaPackages) cudatoolkit; + # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" + gencode = lib.concatStringsSep " " cudaFlags.gencode; in - -stdenv.mkDerivation rec { - name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; +backendStdenv.mkDerivation rec { + name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}"; version = "2.16.5-1"; src = fetchFromGitHub { @@ -17,16 +25,29 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ which addOpenGLRunpath ]; + nativeBuildInputs = [ + which + addOpenGLRunpath + cuda_nvcc + ]; - buildInputs = [ cudatoolkit ]; + buildInputs = [ + cuda_cudart + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [ + cuda_cccl + ]; preConfigure = '' patchShebangs src/collectives/device/gen_rules.sh + makeFlagsArray+=( + "NVCC_GENCODE=${gencode}" + ) ''; makeFlags = [ - "CUDA_HOME=${cudatoolkit}" + "CUDA_HOME=${cuda_nvcc}" + "CUDA_LIB=${cuda_cudart}/lib64" + "CUDA_INC=${cuda_cudart}/include" "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0477f859eef..8bc2072286e 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -250,7 +250,7 @@ EOF description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = platforms.unix; + platforms = attrNames configs; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/science/math/tensorrt/generic.nix b/pkgs/development/libraries/science/math/tensorrt/generic.nix index 3447087051f..31090f715c2 100644 --- a/pkgs/development/libraries/science/math/tensorrt/generic.nix +++ b/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, backendStdenv , requireFile , autoPatchelfHook , autoAddOpenGLRunpathHook @@ -18,7 +18,7 @@ assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; -stdenv.mkDerivation rec { +backendStdenv.mkDerivation rec { pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; version = fullVersion; src = requireFile rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Used by autoPatchelfHook buildInputs = [ - cudatoolkit.cc.cc.lib # libstdc++ + backendStdenv.cc.cc.lib # libstdc++ cudatoolkit cudnn ]; @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" ''; + passthru.stdenv = backendStdenv; + meta = with lib; { # Check that the cudatoolkit version satisfies our min/max constraints (both # inclusive). We mark the package as broken if it fails to satisfies the diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 29730ddd806..a44dc213f6e 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Yc4P54cn7cvP+ythlmOMIkDz7PuutJXsgkGhNUcoxvc="; + sha256 = "sha256-VDwpCPyjhkXgehcMJs6srD3PFtlC2m4jurJum6wNeVY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index db963e5d862..843eb2f5b10 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.24"; + version = "1.0.26"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; + hash = "sha256-vbuzV4ZZnb0Vl+U9B8BorDD7mHQ7ILwkR35GaFs+aTI="; }; postPatch = '' diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 8ba9066de32..61f7242b5d8 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uid_wrapper"; - version = "1.2.9"; + version = "1.3.0"; src = fetchurl { url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; - sha256 = "sha256-fowCQHKCX+hrq0ZZHPS5CeOZz5j1SCL55SdC9CAEcIQ="; + sha256 = "sha256-9+fBveUzUwBRkxQUckRT4U4CrbthSCS2/ifLuYZUt2I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/volk/2.5.0.nix b/pkgs/development/libraries/volk/2.5.0.nix new file mode 100644 index 00000000000..76dbf133be9 --- /dev/null +++ b/pkgs/development/libraries/volk/2.5.0.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, python3 +, enableModTool ? true +, removeReferencesTo +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: + # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "gnuradio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + + cmakeFlags = lib.optionals (!enableModTool) [ + "-DENABLE_MODTOOL=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 + # volk_32f_log2_32f: fail on arch neon + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + ]; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + ''; + + nativeBuildInputs = [ + cmake + python3 + python3.pkgs.Mako + ]; + + doCheck = true; + + meta = with lib; { + homepage = "http://libvolk.org/"; + description = "The Vector Optimized Library of Kernels"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 50361592643..f5cec86e140 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -1,41 +1,34 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , python3 , enableModTool ? true , removeReferencesTo -, fetchpatch }: stdenv.mkDerivation rec { pname = "volk"; - # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: - # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = pname; rev = "v${version}"; - sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; + hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; fetchSubmodules = true; }; - patches = [ + # Remove a failing test (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; - extraPrefix = ""; + url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch"; + hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4="; }) ]; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 934369ac8e8..8b92e78d2bd 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -50,7 +50,7 @@ in { }; wt4 = generic { - version = "4.6.1"; - sha256 = "04pv4kb8d576bfnd9kjc3cfjls9cm3cgpaiabwb3iyq9z0w585gh"; + version = "4.9.1"; + sha256 = "sha256-Qm0qqYB/CLVHUgKE9N83MgAWQ2YFdumrB0i84qYNto8="; }; } diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index b610e903ba3..f09b5277d6a 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-n7m94QdQf0s5I9z8ScpCu+r2h7XOKO2F1OX44IjdBn4="; + hash = "sha256-LYQky0tIzZrxroa4korlE+RK2MJTVLgw3T2kGZOyY2s="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 189e896dfae..4ce37ca0c15 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -560,7 +560,30 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ fetchzip, lua, fifo, luaossl, lpeg_patterns, lpeg, basexx, buildLuarocksPackage, cqueues, bit32, binaryheap, luaOlder, compat53 }: +haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +buildLuarocksPackage { + pname = "haskell-tools.nvim"; + version = "1.9.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/haskell-tools.nvim-1.9.1-1.rockspec"; + sha256 = "1m7fasn5iz9hv9l1ycsjiaah14i1s5nssvqq9sypbwcpc9slj93b"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/1.9.1.zip"; + sha256 = "0m425ipfvbb1f1m2wmz8qg57b901vspvvpckxr380crbwl3dflpr"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = { + homepage = "https://github.com/mrcjkb/haskell-tools.nvim"; + description = "Supercharge your Haskell experience in neovim!"; + license.fullName = "GPL-2.0"; + }; +}) {}; + +http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -2853,7 +2876,61 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, buildLuarocksPackage, argparse, luafilesystem, fetchgit }: +telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "telescope-manix"; + version = "0.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; + sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; + sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua telescope-nvim ]; + + meta = { + homepage = "https://github.com/mrcjkb/telescope-manix"; + description = "A telescope.nvim extension for Manix - A fast documentation searcher for Nix"; + license.fullName = "GPL-2.0"; + }; +}) {}; + +telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +buildLuarocksPackage { + pname = "telescope.nvim"; + version = "scm-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/telescope.nvim-scm-1.rockspec"; + sha256 = "07mjkv1nv9b3ifxk2bbpbhvp0awblyklyz6aaqw418x4gm4q1g35"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/nvim-telescope/telescope.nvim", + "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", + "date": "2023-02-26T13:26:12+01:00", + "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", + "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = { + homepage = "https://github.com/nvim-telescope/telescope.nvim"; + description = "Find, Filter, Preview, Pick. All lua, all the time."; + license.fullName = "MIT"; + }; +}) {}; + +tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "tl"; version = "0.15.1-1"; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3dd4776a146..5a0f3138bbe 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.207"; + version = "0.6.208"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w="; + sha256 = "sha256-fgbHaY0trO7MiYxhdatq81PaOIVQpSIU3cUnrIvGI2M="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/mobile/androidenv/.gitignore b/pkgs/development/mobile/androidenv/.gitignore index c15750760a4..2a297b88cde 100644 --- a/pkgs/development/mobile/androidenv/.gitignore +++ b/pkgs/development/mobile/androidenv/.gitignore @@ -1,2 +1,3 @@ /xml local.properties +.android diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index d27c1bb1cdc..8c24b10093b 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -185,20 +185,38 @@ rec { system-images = lib.flatten (map (apiVersion: map (type: - map (abiVersion: - lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) ( - deployAndroidPackage { - inherit os; - package = system-images-packages.${apiVersion}.${type}.${abiVersion}; - # Patch 'google_apis' system images so they're recognized by the sdk. - # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead - # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. - patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) '' + # Deploy all system images with the same systemImageType in one derivation to avoid the `null` problem below + # with avdmanager when trying to create an avd! + # + # ``` + # $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64' + # Error: Package path is not valid. Valid system image paths are: + # null + # ``` + let + availablePackages = map (abiVersion: + system-images-packages.${apiVersion}.${type}.${abiVersion} + ) (builtins.filter (abiVersion: + lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages + ) abiVersions); + + instructions = builtins.listToAttrs (map (package: { + name = package.name; + value = lib.optionalString (lib.hasPrefix "google_apis" type) '' + # Patch 'google_apis' system images so they're recognized by the sdk. + # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead + # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. sed -i '/^Addon.Vendor/d' source.properties ''; - } - ) - ) abiVersions + }) availablePackages + ); + in + lib.optionals (availablePackages != []) + (deployAndroidPackages { + inherit os; + packages = availablePackages; + patchesInstructions = instructions; + }) ) systemImageTypes ) platformVersions); @@ -271,8 +289,8 @@ rec { ${lib.concatMapStrings (system-image: '' apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) - mkdir -p system-images/$apiVersion/$type - ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + mkdir -p system-images/$apiVersion + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type '') images} ''; @@ -294,7 +312,11 @@ rec { You must accept the following licenses: ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} - by setting nixpkgs config option 'android_sdk.accept_license = true;'. + a) + by setting nixpkgs config option 'android_sdk.accept_license = true;'. + b) + by an environment variable for a single invocation of the nix tools. + $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 '' else callPackage ./cmdline-tools.nix { inherit deployAndroidPackage os cmdLineToolsVersion; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 9bd9fb9a543..3de6bf6e478 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,5 +1,5 @@ { config, pkgs ? import <nixpkgs> {} -, licenseAccepted ? config.android_sdk.accept_license or false +, licenseAccepted ? config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1") }: rec { diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index ef803779ad6..e4a9615e4f7 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,20 +1,30 @@ { composeAndroidPackages, stdenv, lib, runtimeShell }: { name, app ? null -, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" -, enableGPU ? false, extraAVDFiles ? [] -, package ? null, activity ? null -, avdHomeDir ? null, sdkExtraArgs ? {} +, platformVersion ? "33" +, abiVersion ? "armeabi-v7a" +, systemImageType ? "default" +, enableGPU ? false +, extraAVDFiles ? [] +, package ? null +, activity ? null +, androidUserHome ? null +, avdHomeDir ? null # Support old variable with non-standard naming! +, androidAvdHome ? avdHomeDir +, sdkExtraArgs ? {} +, androidAvdFlags ? null +, androidEmulatorFlags ? null }: let sdkArgs = { - toolsVersion = "26.1.1"; - platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; + } // sdkExtraArgs // { + cmdLineToolsVersion = "8.0"; + platformVersions = [ platformVersion ]; systemImageTypes = [ systemImageType ]; abiVersions = [ abiVersion ]; - } // sdkExtraArgs; + }; sdk = (composeAndroidPackages sdkArgs).androidsdk; in @@ -33,24 +43,45 @@ stdenv.mkDerivation { export TMPDIR=/tmp fi - ${if avdHomeDir == null then '' + ${if androidUserHome == null then '' # Store the virtual devices somewhere else, instead of polluting a user's HOME directory - export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + export ANDROID_USER_HOME=$(mktemp -d $TMPDIR/nix-android-user-home-XXXX) + '' else '' + mkdir -p "${androidUserHome}" + export ANDROID_USER_HOME="${androidUserHome}" + ''} + + ${if androidAvdHome == null then '' + export ANDROID_AVD_HOME=$ANDROID_USER_HOME/avd '' else '' - mkdir -p "${avdHomeDir}" - export ANDROID_SDK_HOME="${avdHomeDir}" + mkdir -p "${androidAvdHome}" + export ANDROID_AVD_HOME="${androidAvdHome}" ''} # We need to specify the location of the Android SDK root folder export ANDROID_SDK_ROOT=${sdk}/libexec/android-sdk + ${lib.optionalString (androidAvdFlags != null) '' + # If NIX_ANDROID_AVD_FLAGS is empty + if [[ -z "$NIX_ANDROID_AVD_FLAGS" ]]; then + NIX_ANDROID_AVD_FLAGS="${androidAvdFlags}" + fi + ''} + + ${lib.optionalString (androidEmulatorFlags != null) '' + # If NIX_ANDROID_EMULATOR_FLAGS is empty + if [[ -z "$NIX_ANDROID_EMULATOR_FLAGS" ]]; then + NIX_ANDROID_EMULATOR_FLAGS="${androidEmulatorFlags}" + fi + ''} + # We have to look for a free TCP port echo "Looking for a free TCP port in range 5554-5584" >&2 for i in $(seq 5554 2 5584) do - if [ -z "$(${sdk}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ] + if [ -z "$(${sdk}/bin/adb devices | grep emulator-$i)" ] then port=$i break @@ -68,25 +99,26 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exist - ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target + ${sdk}/bin/avdmanager list target - if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] + if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${sdk}/libexec/android-sdk/tools/bin/avdmanager create avd -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/bin/avdmanager create avd --force -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME $NIX_ANDROID_AVD_FLAGS ${lib.optionalString enableGPU '' # Enable GPU acceleration - echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + echo "hw.gpu.enabled=yes" >> $ANDROID_AVD_HOME/device.avd/config.ini ''} ${lib.concatMapStrings (extraAVDFile: '' - ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd + ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/device.avd '') extraAVDFiles} fi # Launch the emulator - ${sdk}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + echo "\nLaunch the emulator" + $ANDROID_SDK_ROOT/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix new file mode 100644 index 00000000000..ebfe97b856a --- /dev/null +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -0,0 +1,151 @@ +{ + # To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix` + + # If you copy this example out of nixpkgs, use these lines instead of the next. + # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + /*nixpkgsSource ? (builtins.fetchTarball { + name = "nixpkgs-20.09"; + url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; + sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; + }), + pkgs ? import nixpkgsSource { + config.allowUnfree = true; + }, + */ + + # If you want to use the in-tree version of nixpkgs: + pkgs ? import ../../../../.. { + config.allowUnfree = true; + }, + + config ? pkgs.config +}: + +# Copy this file to your Android project. +let + # Declaration of versions for everything. This is useful since these + # versions may be used in multiple places in this Nix expression. + android = { + platforms = [ "33" ]; + systemImageTypes = [ "google_apis" ]; + abis = [ "arm64-v8a" "x86_64" ]; + }; + + # If you copy this example out of nixpkgs, something like this will work: + /*androidEnvNixpkgs = fetchTarball { + name = "androidenv"; + url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz"; + sha256 = "<fill me in with nix-prefetch-url --unpack>"; + }; + + androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" { + inherit config pkgs; + licenseAccepted = true; + };*/ + + # Otherwise, just use the in-tree androidenv: + androidEnv = pkgs.callPackage ./.. { + inherit config pkgs; + # You probably need to uncomment below line to express consent. + # licenseAccepted = true; + }; + + sdkArgs = { + platformVersions = android.platforms; + abiVersions = android.abis; + systemImageTypes = android.systemImageTypes; + + includeSystemImages = true; + includeEmulator = true; + + # Accepting more licenses declaratively: + extraLicenses = [ + # Already accepted for you with the global accept_license = true or + # licenseAccepted = true on androidenv. + # "android-sdk-license" + + # These aren't, but are useful for more uncommon setups. + "android-sdk-preview-license" + "android-googletv-license" + "android-sdk-arm-dbt-license" + "google-gdk-license" + "intel-android-extra-license" + "intel-android-sysimage-license" + "mips-android-sysimage-license" + ]; + }; + + androidComposition = androidEnv.composeAndroidPackages sdkArgs; + androidEmulator = androidEnv.emulateApp { + name = "android-sdk-emulator-demo"; + sdkExtraArgs = sdkArgs; + }; + androidSdk = androidComposition.androidsdk; + platformTools = androidComposition.platform-tools; + jdk = pkgs.jdk; +in +pkgs.mkShell rec { + name = "androidenv-demo"; + packages = [ androidSdk platformTools androidEmulator jdk pkgs.android-studio ]; + + LANG = "C.UTF-8"; + LC_ALL = "C.UTF-8"; + JAVA_HOME = jdk.home; + + # Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT. + ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + + shellHook = '' + # Write out local.properties for Android Studio. + cat <<EOF > local.properties + # This file was automatically generated by nix-shell. + sdk.dir=$ANDROID_SDK_ROOT + ndk.dir=$ANDROID_NDK_ROOT + EOF + ''; + + passthru.tests = { + + shell-with-emulator-sdkmanager-packages-test = pkgs.runCommand "shell-with-emulator-sdkmanager-packages-test" { + nativeBuildInputs = [ androidSdk jdk ]; + } '' + output="$(sdkmanager --list)" + installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + echo "installed_packages_section: ''${installed_packages_section}" + + packages=( + "build-tools;33.0.1" "cmdline-tools;8.0" \ + "emulator" "patcher;v4" "platform-tools" "platforms;android-33" \ + "system-images;android-33;google_apis;arm64-v8a" \ + "system-images;android-33;google_apis;x86_64" + ) + + for package in "''${packages[@]}"; do + if [[ ! $installed_packages_section =~ "$package" ]]; then + echo "$package package was not installed." + exit 1 + fi + done + + touch "$out" + ''; + + shell-with-emulator-avdmanager-create-avd-test = pkgs.runCommand "shell-with-emulator-avdmanager-create-avd-test" { + nativeBuildInputs = [ androidSdk androidEmulator jdk ]; + } '' + avdmanager delete avd -n testAVD || true + echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64' + result=$(avdmanager list avd) + + if [[ ! $result =~ "Name: testAVD" ]]; then + echo "avdmanager couldn't create the avd! The output is :''${result}" + exit 1 + fi + + avdmanager delete avd -n testAVD || true + touch "$out" + ''; + }; +} + diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 8c51ba09e53..775f69bce4c 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -56,7 +56,8 @@ let # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { inherit config pkgs; - licenseAccepted = true; + # You probably need to uncomment below line to express consent. + # licenseAccepted = true; }; androidComposition = androidEnv.composeAndroidPackages { @@ -146,8 +147,9 @@ pkgs.mkShell rec { ''; passthru.tests = { - sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" { - buildInputs = [ androidSdk jdk ]; + + shell-sdkmanager-licenses-test = pkgs.runCommand "shell-sdkmanager-licenses-test" { + nativeBuildInputs = [ androidSdk jdk ]; } '' if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then echo "At least one of SDK package licenses are not accepted." @@ -156,14 +158,14 @@ pkgs.mkShell rec { touch $out ''; - sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" { - buildInputs = [ androidSdk jdk ]; + shell-sdkmanager-packages-test = pkgs.runCommand "shell-sdkmanager-packages-test" { + nativeBuildInputs = [ androidSdk jdk ]; } '' output="$(sdkmanager --list)" installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') packages=( - "build-tools;30.0.3" "ndk-bundle" "platform-tools" \ + "build-tools;30.0.3" "platform-tools" \ "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ "platforms;android-31" "platforms;android-32" "platforms;android-33" \ diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix index d063b73ccb4..b5aeca43246 100644 --- a/pkgs/development/mobile/androidenv/test-suite.nix +++ b/pkgs/development/mobile/androidenv/test-suite.nix @@ -1,16 +1,19 @@ -{ stdenv, callPackage }: +{callPackage, lib, stdenv}: let examples-shell = callPackage ./examples/shell.nix {}; + examples-shell-with-emulator = callPackage ./examples/shell-with-emulator.nix {}; + all-tests = examples-shell.passthru.tests // + examples-shell-with-emulator.passthru.tests; in stdenv.mkDerivation { name = "androidenv-test-suite"; + buidInputs = lib.mapAttrsToList (name: value: value) all-tests; - src = ./.; + buildCommand = '' + touch $out + ''; - dontConfigure = true; - dontBuild = true; - - passthru.tests = { } // examples-shell.passthru.tests; + passthru.tests = all-tests; meta.timeout = 60; } diff --git a/pkgs/development/nim-packages/asciigraph/default.nix b/pkgs/development/nim-packages/asciigraph/default.nix new file mode 100644 index 00000000000..51cc4c89eca --- /dev/null +++ b/pkgs/development/nim-packages/asciigraph/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "asciigraph"; + version = "unstable-2021-03-02"; + + src = fetchFromGitHub { + owner = "Yardanico"; + repo = "asciigraph"; + rev = "9f51fc4e94d0960ab63fa6ea274518159720aa69"; + hash = "sha256-JMBAW8hkE2wuXkRt4aHqFPoz1HX1J4SslvcaQXfpDNk"; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Console ascii line graphs in pure Nim"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/nim-packages/illwill/default.nix b/pkgs/development/nim-packages/illwill/default.nix new file mode 100644 index 00000000000..a87588de0ed --- /dev/null +++ b/pkgs/development/nim-packages/illwill/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "illwill"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "johnnovak"; + repo = "illwill"; + rev = "v${version}"; + hash = "sha256-9YBkad5iUKRb375caAuoYkfp5G6KQDhX/yXQ7vLu/CA="; + }; + + meta = with lib; + src.meta // { + description = "A curses inspired simple cross-platform console library for Nim"; + license = [ licenses.wtfpl ]; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/nim-packages/parsetoml/default.nix b/pkgs/development/nim-packages/parsetoml/default.nix new file mode 100644 index 00000000000..0c2e31dd41f --- /dev/null +++ b/pkgs/development/nim-packages/parsetoml/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "parsetoml"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "NimParsers"; + repo = "parsetoml"; + rev = "v${version}"; + hash = "sha256-jtqn59x2ZRRgrPir6u/frsDHnl4kvTJWpbejxti8aHY="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "A Nim library to parse TOML files"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix index fe805c82a35..da5e4580e16 100644 --- a/pkgs/development/ocaml-modules/fiber/default.nix +++ b/pkgs/development/ocaml-modules/fiber/default.nix @@ -1,22 +1,23 @@ -{ lib, buildDunePackage, dune_3, stdune, dyn }: +{ lib, buildDunePackage, fetchFromGitHub, stdune, dyn }: buildDunePackage rec { pname = "fiber"; - inherit (dune_3) src version; + version = "unstable-2023-02-28"; - duneVersion = "3"; + src = fetchFromGitHub { + owner = "ocaml-dune"; + repo = "fiber"; + rev = "5563b588c1313f128eafa74d66f0626c9128d34d"; + hash = "sha256-18GfGXpu+uiIiCuLhIx5z5jRkem1nNWaQB6Ms0AE9sE="; + }; - dontAddPrefix = true; + duneVersion = "3"; buildInputs = [ stdune dyn ]; - preBuild = '' - rm -r vendor/csexp - ''; - meta = with lib; { description = "Structured concurrency library"; - inherit (dune_3.meta) homepage; + homepage = "https://github.com/ocaml-dune/fiber"; maintainers = with lib.maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index cfe1938bf55..27756fdcd26 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -6,13 +6,19 @@ , gen , ppxlib , uchar +, ppx_expect }: let param = - if lib.versionAtLeast ppxlib.version "0.26.0" then { - version = "3.0"; - sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; - } else { + if lib.versionAtLeast ppxlib.version "0.26.0" then + if lib.versionAtLeast ocaml.version "4.14" then { + version = "3.1"; + sha256 = "sha256-qG8Wxd/ATwoogeKJDyt5gkGhP5Wvc0j0mMqcoVDkeq4="; + } else { + version = "3.0"; + sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; + } + else { version = "2.5"; sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; } @@ -34,6 +40,7 @@ let url = "${baseUrl}/ucd/PropList.txt"; sha256 = "sha256-4FwKKBHRE9rkq9gyiEGZo+qNGH7huHLYJAp4ipZUC/0="; }; + atLeast31 = lib.versionAtLeast param.version "3.1"; in buildDunePackage rec { pname = "sedlex"; @@ -49,7 +56,10 @@ buildDunePackage rec { }; propagatedBuildInputs = [ - gen uchar ppxlib + gen + ppxlib + ] ++ lib.optionals (!atLeast31) [ + uchar ]; preBuild = '' @@ -59,6 +69,10 @@ buildDunePackage rec { ln -s ${PropList} src/generator/data/PropList.txt ''; + checkInputs = lib.optionals atLeast31 [ + ppx_expect + ]; + doCheck = true; dontStrip = true; diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index 79fc34cc0ec..7f6c2d10980 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.14"; + version = "2.5.16"; + format = "setuptools"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ashishb"; repo = pname; - rev = version; - sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs="; + rev = "refs/tags/${version}"; + hash = "sha256-+CMXKg3LLxEXGcFQ9zSqy/1HPZS9MsQ1fZxClJ0Vrnw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index 63a9987994c..95e953e1f5a 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -2,25 +2,32 @@ , aiowinreg , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , pycryptodomex , pythonOlder +, setuptools , tqdm , unicrypto }: buildPythonPackage rec { pname = "aesedb"; - version = "0.1.1"; - format = "setuptools"; + version = "0.1.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pnbzPVXr3qgBH7t5wNR+jbTdQGMdnLpV+xfgQjdc+7A="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TXGRXo3754dEgRotDO5vSl9vj119Xday/176yem3cqk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiowinreg colorama diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index b5b46190fee..044bbf7be6e 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-tIbLb4Jk3vR1hVcdUPuYJrse7BcfE4Z/dXShs/uBDBo="; + rev = "refs/tags/v${version}"; + hash = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; }; propagatedBuildInputs = [ @@ -35,8 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" \ - --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" + --replace '"pytest-runner>=5.2",' "" ''; nativeCheckInputs = [ @@ -56,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; homepage = "https://github.com/bdraco/aiodiscover"; + changelog = "https://github.com/bdraco/aiodiscover/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index f4248a27ddd..efd590e7e82 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI="; + hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 5f6612e409a..cf3b8847c62 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ="; + hash = "sha256-6bbhjmtgGEifYmtgXrnsCF36oU+jJDmHMPPEO5a7AKQ="; }; prePatch = '' diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 6026db49d58..b6f316bf9a8 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.10"; + version = "0.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-w9rD/8fb9CoN9esHY0UEjIs98i9OGp+suiz6I5Uj3ok="; + hash = "sha256-Mn7SQnnWVYh92Ogih6nRYHAf9DiVh1zCuGw5N4r6G8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 06c56116de4..5fb603a2278 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.50.0"; + version = "8.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tFI6iPvKWp69PKvkBrMQrkMZD03VHhLIIDy0VI5XLEA="; + hash = "sha256-ztuOTjWBlmTS9IvHqNW+mBi1AT0YW3RjwCZTwEcddpE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix index 297d347b9f0..cbfbe7c27ff 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-sts"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CpUMw2qdY+5a99WgFLp0p00kQVnuvf3yMOZqTztqnRA="; + hash = "sha256-1pCgIw2Glc5Fyp/eoJJXew80SJz7VDcg9vvUpeZpBYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index eb8c6706b5d..69b06e58784 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -2,16 +2,15 @@ , angr , buildPythonPackage , fetchFromGitHub -, fetchpatch , progressbar , pythonOlder -, pythonRelaxDepsHook +, setuptools , tqdm }: buildPythonPackage rec { pname = "angrop"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,20 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0="; }; - patches = [ - (fetchpatch { - name = "compatibility-with-newer-angr.patch"; - url = "https://github.com/angr/angrop/commit/23194ee4ecdcb7a7390ec04eb133786ec3f807b1.patch"; - hash = "sha256-n9/oPUblUHSk81qwU129rnNOjsNViaegp6454CaDo+8="; - }) - ]; - nativeBuildInputs = [ - pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ @@ -41,10 +32,6 @@ buildPythonPackage rec { tqdm ]; - pythonRelaxDeps = [ - "angr" - ]; - # Tests have additional requirements, e.g., angr binaries # cle is executing the tests with the angr binaries already and is a requirement of angr doCheck = false; diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 1b61ab6afc4..ebb30630eed 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.13.1"; + version = "6.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Q1wStP2I2oFa9oIfO/iwTrtlGBHaiaEcnRkLr/Ibrao="; + hash = "sha256-5VFXrBi7Pj3+9CQ4HAKZxnqsYz3lqhH3+A/gpQgEHXo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index d7fc0929ec4..f385c87d855 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.0.2"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; + hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 3fbd115edd4..60a6f2872fe 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.3.1"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-HZHHSY8a7xyJZAQLFeZ+5+CKixcquJcUkkjJTllFiyk="; + hash = "sha256-u5gI5agNm1RT0FzsdQaqivKwiY5k7G/mtlSWCNP4V10="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 187d5f005ba..6f9d5a5eac0 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h2RAUedcVTlX/DmaXewSQfw9gb0rE8NG9hdNe+exqqk="; + hash = "sha256-ygpmm0CF+L871CpHZEmzdJQvin1uYZMb7kkilrom1YU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index eb082f5b953..103574a2435 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "0.1.13"; + version = "0.1.14"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-black"; rev = version; - sha256 = "sha256-jhcPR+5+e8d9cbcXC//xuBwmZ14xtXNlYtmH5yNSU0E="; + hash = "sha256-4ooMskwPJJLJBfPikaHJ4xuwR1x478ecYWZdIE0UAK8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 5052cf2eb17..90931af2545 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "bpycv"; - version = "0.2.43"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6LXhKuNkX3yKeZARLXmOVNAUQhJghtzKhnszJ1G/a8U="; + sha256 = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock new file mode 100644 index 00000000000..7333bfe40f3 --- /dev/null +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -0,0 +1,311 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "breezy" +version = "3.3.2" +dependencies = [ + "pyo3", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rio-py" +version = "3.3.2" +dependencies = [ + "lazy_static", + "pyo3", + "regex", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index c8104f1b237..6d27908dd84 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -1,57 +1,122 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , configobj -, patiencediff +, cython +, dulwich , fastbencode , fastimport -, dulwich +, libiconv +, merge3 +, patiencediff +, pyyaml +, urllib3 +, breezy , launchpadlib , testtools , pythonOlder , installShellFiles +, rustPlatform +, setuptools-gettext +, setuptools-rust +, testers }: buildPythonPackage rec { pname = "breezy"; - version = "3.2.2"; + version = "3.3.2"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU="; + sha256 = "sha256-TqaUn8uwdrl4VFsJn6xoq6011voYmd7vT2uCo9uiV8E="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; }; - nativeBuildInputs = [ installShellFiles ]; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoHash = "sha256-xYZh/evNp036/wRlNWWUYeD2EkleM+OeY4qbYMCE00I="; + + nativeBuildInputs = [ + cython + installShellFiles + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + setuptools-gettext + setuptools-rust + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; propagatedBuildInputs = [ configobj + dulwich fastbencode + merge3 patiencediff - fastimport - dulwich - launchpadlib - ]; + pyyaml + urllib3 + ] ++ passthru.optional-dependencies.launchpad + ++ passthru.optional-dependencies.fastimport; - nativeCheckInputs = [ testtools ]; + nativeCheckInputs = [ + testtools + ]; - # There is a conflict with their `lazy_import` and plugin tests + # multiple failures on sandbox doCheck = false; - # symlink for bazaar compatibility + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR $out/bin/brz --no-plugins selftest + + runHook postCheck + ''; + postInstall = '' + wrapProgram $out/bin/brz --prefix PYTHONPATH : "$PYTHONPATH" + + # symlink for bazaar compatibility ln -s "$out/bin/brz" "$out/bin/bzr" installShellCompletion --cmd brz --bash contrib/bash/brz ''; - pythonImportsCheck = [ "breezy" ]; + pythonImportsCheck = [ + "breezy" + "breezy.bzr.rio" + ]; + + passthru = { + tests.version = testers.testVersion { + package = breezy; + command = "HOME=$TMPDIR brz --version"; + }; + optional-dependencies = { + launchpad = [ + launchpadlib + ]; + fastimport = [ + fastimport + ]; + }; + }; meta = with lib; { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; license = licenses.gpl2Only; maintainers = [ maintainers.marsam ]; + mainProgram = "brz"; }; } diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 55dc7fd2202..71e8f9d29dd 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "brother"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jMvbZ4/NOA3dnJUdDWk2KTRz1gBOC+oDE0ChGNdFl1o="; + hash = "sha256-bp4YerSTTsuWX3Yc+btlhwCNZO3eDxRgKNzLZFJbKV0="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; homepage = "https://github.com/bieniu/brother"; + changelog = "https://github.com/bieniu/brother/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index c3f6a9766da..fd4ea9a6fde 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wt/TA8bymjYgYSb63Viqf6ToUE1ffa2a3SEVFuTHh94="; + hash = "sha256-SdYS/S3wBmIl/f+0H67PcMRX7GiJqAkysvlENshB1yY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index a7dcab5cacd..0e1bf5b4c2f 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.11"; + version = "0.9.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE="; + hash = "sha256-uMq/3yWP9OwaVxixGAFCLMsDPoJhmIuG0I7hO7AnIOk="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 52cd1a8cf28..803cfb7b6fa 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.7.15"; + version = "1.7.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mpenning"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco="; + hash = "sha256-jWInSqvMuwYJTPqHnrYWhMH/HvaQc2dFRqQu4RGFr28="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cmd2-ext-test/default.nix b/pkgs/development/python-modules/cmd2-ext-test/default.nix new file mode 100644 index 00000000000..4cdf9ccf8dc --- /dev/null +++ b/pkgs/development/python-modules/cmd2-ext-test/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, cmd2 +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "cmd2-ext-test"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uTc+onurLilwQe0trESR3JGa5WFT1fCt3rRA7rhRpaY="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cmd2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cmd2_ext_test" + ]; + + meta = with lib; { + description = "Plugin supports testing of a cmd2 application"; + homepage = "https://github.com/python-cmd2/cmd2/tree/master/plugins/ext_test"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 5ba9a0f7695..4da552db399 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , urllib3 , geojson -, isPy3k +, pythonOlder , sqlalchemy , pytestCheckHook , pytz @@ -12,12 +12,14 @@ buildPythonPackage rec { pname = "crate"; - version = "0.29.0"; - disabled = !isPy3k; + version = "0.30.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SywW/b4DnVeSzzRiHbDaKTjcuwDnkwrK6vFfaQVIZhQ="; + hash = "sha256-8xraDCFZbpJZsh3sO5VlSHwnEfH4u4AJZkXA+L4TB60="; }; propagatedBuildInputs = [ @@ -32,8 +34,15 @@ buildPythonPackage rec { ]; disabledTests = [ - # network access + # the following tests require network access "test_layer_from_uri" + "test_additional_settings" + "test_basic" + "test_cluster" + "test_default_settings" + "test_dynamic_http_port" + "test_environment_variables" + "test_verbosity" ]; disabledTestPaths = [ @@ -44,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/crate/crate-python"; description = "A Python client library for CrateDB"; + changelog = "https://github.com/crate/crate-python/blob/${version}/CHANGES.txt"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix new file mode 100644 index 00000000000..6406440aa96 --- /dev/null +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, setuptools-scm +# install requirements +, fido2 +, keyring +, cryptography +# test requirements +, pytestCheckHook +}: + +let + fido2_0 = fido2.overridePythonAttrs (oldAttrs: rec { + version = "0.9.3"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw="; + }; + }); +in +buildPythonPackage rec { + pname = "ctap-keyring-device"; + version = "1.0.6"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; + }; + + # removing optional dependency needing pyobjc + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--flake8 --black --cov" "" + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + + pythonRemoveDeps = [ + # This is a darwin requirement missing pyobjc + "pyobjc-framework-LocalAuthentication" + ]; + + propagatedBuildInputs = [ + keyring + fido2_0 + cryptography + ]; + + pythonImportsCheck = [ "ctap_keyring_device" ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Disabled tests that needs pyobjc or windows + "touch_id_ctap_user_verifier" + "windows_hello_ctap_user_verifier" + ]; + + meta = with lib; { + description = "CTAP (client-to-authenticator-protocol) device backed by python's keyring library"; + homepage = "https://github.com/dany74q/ctap-keyring-device"; + license = licenses.mit; + maintainers = with maintainers; [ dennajort ]; + }; +} diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix new file mode 100644 index 00000000000..6dd42fcc3c0 --- /dev/null +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, awkward +, dask +, hatch-vcs +, hatchling +, pyarrow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dask-awkward"; + version = "2023.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dask-contrib"; + repo = pname; + rev = version; + hash = "sha256-q0mBd4yelnNL7rMWfilituo9h/xmLLLndSCBdY2egEQ="; + }; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + awkward + dask + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + pytestCheckHook + pyarrow + ]; + + pythonImportsCheck = [ + "dask_awkward" + ]; + + pytestFlagsArray = [ + # require internet + "--deselect=tests/test_parquet.py::test_remote_double" + "--deselect=tests/test_parquet.py::test_remote_single" + ]; + + meta = with lib; { + description = "Native Dask collection for awkward arrays, and the library to use it"; + homepage = "https://github.com/dask-contrib/dask-awkward"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 2fb9d7ce412..3e24fde00c9 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GEH7uk8M5pxYDKzfTRNMlnI5yrLr5K2PuD7CJV/wbu4="; + hash = "sha256-CLzEJchNKmwfN1ZRQfCFusXDSgvHilwnM0KkcX822MI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index c45d6621398..4035cc52328 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -13,6 +13,7 @@ , pytest-xdist , pytestCheckHook , requests +, llvmPackages }: buildPythonPackage rec { @@ -30,12 +31,6 @@ buildPythonPackage rec { }; patches = [ - # Hard code GDB path (used to attach to process) - (substituteAll { - src = ./hardcode-gdb.patch; - inherit gdb; - }) - # Use nixpkgs version instead of versioneer (substituteAll { src = ./hardcode-version.patch; @@ -51,6 +46,18 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + ] ++ lib.optionals stdenv.isLinux [ + # Hard code GDB path (used to attach to process) + (substituteAll { + src = ./hardcode-gdb.patch; + inherit gdb; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Hard code LLDB path (used to attach to process) + (substituteAll { + src = ./hardcode-lldb.patch; + inherit (llvmPackages) lldb; + }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch new file mode 100644 index 00000000000..43ededa083c --- /dev/null +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -0,0 +1,13 @@ +diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +index ed43e370..b28ab453 100644 +--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py ++++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d + is_debug = 0 + # Note that the space in the beginning of each line in the multi-line is important! + cmd = [ +- 'lldb', ++ '@lldb@/bin/lldb', + '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. + # '--attach-pid', + # str(pid), diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index e8bccf2928a..643674f4f0a 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; + hash = "sha256-Ua6XxFmvF2EDtCZTeVHGRfwNAMjX3p5s4Jo5ylutYqY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 311f272e4b5..8cfdcdce748 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; - version = "2022.11.1"; + version = "2023.3.1"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; rev = version; - sha256 = "sha256-ztUdV+Bhi3zx5UiwnpiQM/RglUH1n9J48Beuq2GPWdg="; + sha256 = "sha256-UTH6t/znN4nYnqDhtFFxXoBXX8Zo19pJE9iDsvw7bGE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 28eae55ef9a..a819c4ab40d 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -3,21 +3,25 @@ , fetchPypi , autoconf , cython +, setuptools }: buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.12"; + version = "0.1.14"; + + format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - sha256 = "909a8f52f1890ec9e92fd46ef609daa8875c2a1c262c0b61200e73c6c2dd5099"; + hash = "sha256-BLNfdKDKUvc+BJnhLqx7VzJg0opvrdaXhNLCigLH02k="; }; nativeBuildInputs = [ autoconf cython + setuptools ]; # no tests on PyPI, no tags on GitLab diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix new file mode 100644 index 00000000000..f2212d8c9c7 --- /dev/null +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pythonOlder +, rfc3987 +, ruamel-yaml +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dtschema"; + version = "2022.01"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "devicetree-org"; + repo = "dt-schema"; + rev = "refs/tags/v${version}"; + hash = "sha256-wwlXIM/eO3dII/qQpkAGLT3/15rBLi7ZiNtqYFf7Li4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jsonschema + rfc3987 + ruamel-yaml + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "dtschema" + ]; + + meta = with lib; { + description = "Tooling for devicetree validation using YAML and jsonschema"; + homepage = "https://github.com/devicetree-org/dt-schema/"; + changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}"; + license = with licenses; [ bsd2 /* or */ gpl2Only ]; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index ea812cb9d5e..9ab39eabf90 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-Vb2sXZjhBZpZdemtGZ8dajB9Ziu/obLv80R63IH/hJg="; + hash = "sha256-F1Y7NXkNnCbCxc43gBN7bt+z0D0EwnzCyBKFzbq9KcA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 2fbaa7f66ae..16b468ab621 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "3.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; - rev = "v${version}"; - sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix new file mode 100644 index 00000000000..1ada1243bf7 --- /dev/null +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pythonRelaxDepsHook +, pytestCheckHook +, datasets +, dill +, fsspec +, huggingface-hub +, importlib-metadata +, multiprocess +, numpy +, packaging +, pandas +, requests +, responses +, tqdm +, xxhash +}: + +buildPythonPackage rec { + pname = "evaluate"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-O3W2m12R94iY3F7xgkIiiIyqI6vqiZPXn4jAqEDjVCw="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "responses" ]; + + propagatedBuildInputs = [ + datasets + numpy + dill + pandas + requests + tqdm + xxhash + multiprocess + fsspec + huggingface-hub + packaging + responses + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # most tests require internet access. + doCheck = false; + + pythonImportsCheck = [ + "evaluate" + ]; + + meta = with lib; { + homepage = "https://huggingface.co/docs/evaluate/index"; + description = "Easily evaluate machine learning models and datasets"; + changelog = "https://github.com/huggingface/evaluate/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index b9e8313263e..d218b6cc06e 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.6"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -36,16 +36,11 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oarmdc2PuE4kQ/qUqQhuzdTpIrrMFCK72CrVmoSH1DI="; + hash = "sha256-4oRIL5s2qN1tB8uijLiPkQTR4cXg4KsxqyZebw/cVkE="; }; patches = [ (fetchpatch { - name = "tests-timezones.patch"; - url = "https://github.com/ecederstrand/exchangelib/commit/d5d386f54adec8ab02f871332b89e1176c214ba2.diff"; - hash = "sha256-E3Ys6IDJ/yMsvi+1GKbwckkhbNrc9JLM/+GrPtUz+mY="; - }) - (fetchpatch { name = "tests-timezones-2.patch"; url = "https://github.com/ecederstrand/exchangelib/commit/419eafcd9261bfd0617823ee437204d5556a8271.diff"; excludes = [ "tests/test_ewsdatetime.py" ]; @@ -87,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Microsoft Exchange Web Services (EWS)"; homepage = "https://github.com/ecederstrand/exchangelib"; + changelog = "https://github.com/ecederstrand/exchangelib/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/execnb/default.nix b/pkgs/development/python-modules/execnb/default.nix new file mode 100644 index 00000000000..22661c9ad07 --- /dev/null +++ b/pkgs/development/python-modules/execnb/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fastcore +, traitlets +, ipython +, pythonOlder +}: + +buildPythonPackage rec { + pname = "execnb"; + version = "0.1.4"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-y9gSvzJA8Fsh56HbA8SszlozsBBfTLfgWGDXm9uSBvA="; + }; + + propagatedBuildInputs = [ fastcore traitlets ipython ]; + + # no real tests + doCheck = false; + pythonImportsCheck = [ "execnb" ]; + + meta = with lib; { + homepage = "https://github.com/fastai/execnb"; + description = "Execute a jupyter notebook, fast, without needing jupyter"; + license = licenses.asl20; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix index 8c980c8d00f..0d51a9862ee 100644 --- a/pkgs/development/python-modules/exrex/default.nix +++ b/pkgs/development/python-modules/exrex/default.nix @@ -1,17 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch }: buildPythonPackage rec { pname = "exrex"; - version = "0.10.5"; + version = "unstable-2021-04-22"; - src = fetchPypi { - inherit pname version; - sha256 = "1wq8nyycdprxl9q9y1pfhkbca4rvysj45h1xn7waybl3v67v3f1z"; + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "exrex"; + rev = "9a66706e7582a9cf31c4121629c9035e329bbe21"; + sha256 = "sha256-g31tHY+LzGxwBmUpSa0DV7ruLfYwmuDg+XyBxMZRa9U="; }; + patches = [ + (fetchpatch { + # https://github.com/asciimoo/exrex/pull/65 + url = "https://github.com/asciimoo/exrex/commit/44712bfb1350a509581a5834d9fa8aebcd9434db.patch"; + hash = "sha256-thKotSvdVdVjXaG/AhsXmW51FHLOYUeYTYw8SA/k2t4="; + }) + ]; + # Projec thas no released tests doCheck = false; pythonImportsCheck = [ "exrex" ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index d600e50d395..f721742a15a 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.9.2"; + version = "2.10.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-YwUNjEM0Lmj14fTqQXy78LRzlfffy7KZOTulufkeRZA="; + hash = "sha256-H1SeNlX/NqdewNY+rs5HLTK0dRnB1H+EQfzf2g/y1ek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix new file mode 100644 index 00000000000..4a4d9a16d10 --- /dev/null +++ b/pkgs/development/python-modules/fastai/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fastprogress +, fastcore +, fastdownload +, torch +, torchvision +, matplotlib +, pillow +, scikit-learn +, scipy +, spacy +, pandas +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastai"; + version = "2.7.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xrOhdmrCWvsPtCFDsnUxiSd7ox+Pgpmte5LyNPCHRYU="; + }; + + propagatedBuildInputs = [ + fastprogress + fastcore + fastdownload + torchvision + matplotlib + pillow + scikit-learn + scipy + spacy + pandas + requests + ]; + + doCheck = false; + pythonImportsCheck = [ "fastai" ]; + + meta = with lib; { + homepage = "https://github.com/fastai/fastai"; + description = "The fastai deep learning library"; + changelog = "https://github.com/fastai/fastai/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix new file mode 100644 index 00000000000..4a60a704298 --- /dev/null +++ b/pkgs/development/python-modules/fastdownload/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fastprogress +, fastcore +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastdownload"; + version = "0.0.6"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1ayb0zx8rFKDgqlq/tVVLqDkh47T5jofHt53r8bWr30="; + }; + + propagatedBuildInputs = [ fastprogress fastcore ]; + + # no real tests + doCheck = false; + pythonImportsCheck = [ "fastdownload" ]; + + meta = with lib; { + homepage = "https://github.com/fastai/fastdownload"; + description = "Easily download, verify, and extract archives"; + license = licenses.asl20; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix new file mode 100644 index 00000000000..ca2cdc02162 --- /dev/null +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, pkgconfig +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faust-cchardet"; + version = "2.1.18"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "faust-streaming"; + repo = "cChardet"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + }; + + nativeBuildInputs = [ + cython + pkgconfig + setuptools + wheel + ]; + + pythonImportsCheck = [ + "cchardet" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst"; + description = "High-speed universal character encoding detector"; + homepage = "https://github.com/faust-streaming/cChardet"; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ dotlambda ivan ]; + }; +} diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 1af60bcc6ca..638199020a3 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; + hash = "sha256-CgtlPP0cXSUplL2HsfESQxzsLVys7fpJs24XQNohw30="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index c080b495041..a6547593471 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.7"; + version = "2.4.0"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-U/oP9nx7iTK6EYbUl90UD7fTOo5oDlh9ULPNjRibsXE="; + sha256 = "sha256-TGkVDZbxxvOOal+rLHeCNUoyOzvg9wQsAMan8LDn938="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index dddde1a3093..e6051ed93a3 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; + hash = "sha256-fc/87JW9FExvZPk+pHLuntLHfdj0kRi2e5ohRq5Ujpg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 2c5d0a9a547..dc51cb1988e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GcgJhFT3L5TlVZYXjQQ9eENRcv/V176hF86BSsN7K/A="; + hash = "sha256-AXBFNLF39+H/KLrWQ/rXQAAMC6hMsGXQ5XFTDs4Y3EY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 7aaa53d39cf..1842c9c5bec 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.18.1"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA="; + hash = "sha256-5bsOrT4IIrxOnPIpvR0T1MOPGeUNU6odcKs82aN8B8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 64cdac603e0..224f5fe757a 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.17.3"; + version = "2.17.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sYF6yV/VENn11V74vWU2p/pSkPAfYPtW2l1TdHTSR2g="; + hash = "sha256-MG5/znRnPN98NwNYYU9835+4RcXDjaQPatqICnRMWqI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 553b7a7dd14..ad4931e5608 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.13.2"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A="; + hash = "sha256-00SlS6iL65Z2N6tgNEaIcQ09WB8Jy8emOwlaZoKjNgA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index b9dfd63441b..3d7f5bdab75 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.8.2"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bwl1gWLux5LJMZIS/tJFMhHs1LcaDVCTgNrke6ASiBI="; + hash = "sha256-5URk8yZy5ld17p7UXf5y+kciM2bH8NmgEvJ1SqwYJ9o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index f3fdc38124a..2aab21e7e78 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.8.1"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rh23HbHv1FVmiZtyofv0bktv7tZWN3IS5jQawzbFfRk="; + hash = "sha256-mr14CDo+M01ZRfNLerFNeikExmIcV0j17zX/Xn8JT80="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 169e3496e77..71d99448085 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.15.1"; + version = "2.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M="; + hash = "sha256-O1K5qd82o+PnzWZ40GC+0PSgWzZvp5hl7ImFxRgx5Ww="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 28bf273bd56..31d3cf1fd3b 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.18.2"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O1jSSozVmeDRoTCtRhsBDlZ/o8g/8ccGkJCg6hp7ob8="; + hash = "sha256-97KZK9O/+Ul2hnXh1s2HeoQQd4CFcQjJ9HC6fP2ZEgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 2de8604ccfb..7116db6ca0c 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.17.3"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RgGL9SXlmI4mcuL8phcPOCiGo2xhzRZbnpRw72U1KzI="; + hash = "sha256-MCFfkPtTc7TdN+WF4tcnHq+Kun5vQDhdSSsW97/cDzA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index af99aa9bd74..96fde115308 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.3.1"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ="; + hash = "sha256-yywRVh0hL6kzpAkKRVIUBGGAAMvyHuNKWzCkUDRHO04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 076f08dc7a5..934ba627018 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-drzmlHfU2ut3o7JASvFbEcf6OVtWa8kAyzpeDV5iGlc="; + hash = "sha256-S2BEEGifHt4ZXOxCEtwXh7wr/n1fI+gwImnrEJmYjzI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 824cb8f1ae5..1b1639ef7d1 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -15,30 +15,39 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.5.0"; + version = "3.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw="; + hash = "sha256-LBjZgu5tsw211ZVXrdAySitJvzlAp1KUdRBjKitYo8E="; }; propagatedBuildInputs = [ rebulk babelfish python-dateutil - ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; - nativeCheckInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; + nativeCheckInputs = [ + py + pytestCheckHook + pytest-mock + pytest-benchmark + pyyaml + ]; pytestFlagsArray = [ "--benchmark-disable" ]; pythonImportsCheck = [ "guessit" ]; - meta = { - homepage = "https://doc.guessit.io/"; + meta = with lib; { description = "A Python library that extracts as much information as possible from a video filename"; + homepage = "https://guessit-io.github.io/guessit/"; changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md"; - license = lib.licenses.lgpl3Only; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index c8949968536..1b80c9a4986 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -1,13 +1,10 @@ { lib , buildPythonPackage , fetchPypi - -# build -, antlr4 +, pythonOlder # propagates -, antlr4-python3-runtime -, dataclasses-json +, importlib-resources , pyyaml # tests @@ -16,7 +13,7 @@ let pname = "hassil"; - version = "0.2.6"; + version = "1.0.6"; in buildPythonPackage { inherit pname version; @@ -24,23 +21,13 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; + hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k="; }; - nativeBuildInputs = [ - antlr4 - ]; - - postPatch = '' - sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt - rm hassil/grammar/*.{tokens,interp} - antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4 - ''; - propagatedBuildInputs = [ - antlr4-python3-runtime - dataclasses-json pyyaml + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index d49c2aedb46..8ce6f73c547 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , hatchling -, hatch , pytest-mock , pytestCheckHook , tomli @@ -26,7 +25,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hatch pytest-mock pytestCheckHook tomli diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 8807d0877bb..67393f6f113 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; + hash = "sha256-FsIE4dcZOP24/DX6TLnmoCHMYe4f9gWqmv2L25ujqu4="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index a3a8cf93b81..a16e5c78c65 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -33,11 +33,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-hNaGE2s/oFFAVCWu50IeeaFTlOSByJJAKvBgX1iDrVE="; + hash = "sha256-e3OIpTGPMj+YSx/pqzGi5paUAIpDhI94prhHL3DkM18="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; + hash = "sha256-15olERnpfe4PbDsDfw47vsYsqjFe8P8IDmSSGxGLtx8="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; platforms = [ "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index c929aa19764..2f384ab5c07 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.13"; + version = "1.0.14"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-bNVvQbwtef7Q0OBtR/8vsDDPkgGQgzdBC3QyoxLW3Wo="; + hash = "sha256-2tJoIknqcwEvX2mQsrSEEh45pEMpNfeefuXVKSJTwig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index f87e589eec1..86887c31463 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; - rev = version; - sha256 = "sha256-mLavlJHYU6gUqqc83uHMZfOglrKDIiRNN7Nf2i3fXzE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-vQJN2YXWGvYSVV9lemZyu61inc9iBFxf5nIlpIiRe+s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 2c13defe438..ad48af827ee 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -164,7 +164,7 @@ let build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" '' + '' CFG ''; diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 09a1ff66f26..b89d08b16da 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -11,7 +11,7 @@ , numpy , optax , scipy -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook cvxpy optax - scikitlearn + scikit-learn ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 4cbba4d11a4..dbf050bcf90 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.22.5"; + version = "1.23.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ktK/s9Tt1XNIiW/Ztn4znsPXIMrScB4KAS027YqxIVM="; + sha256 = "sha256-0ZKdySzRHHtDWvSrQ0qJTggu48TyCBVrtEZZkM8HqNQ="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index ac2a6c8125d..12c4e08c9ae 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.2"; + version = "0.14.0"; format = "flit"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wJWY0tBrlCkOFDfGZS4xWvv87sOlyrNl3fiGqgayqTs="; + sha256 = "sha256-BxrVrOsCqFRmx16l6YdkJplwdnU2XhRFMHd5DGy+dqE="; }; nativeBuildInputs = [ @@ -65,8 +65,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" - "myst-nb" - "sphinx" + "sphinx-book-theme" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 3bb8962e5a3..8a4a5a6a2d4 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,6 +5,7 @@ , cryptography , ed25519 , ecdsa +, gnupg , semver , mnemonic , unidecode @@ -30,6 +31,13 @@ buildPythonPackage rec { sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; }; + # hardcode the path to gpgconf in the libagent library + postPatch = '' + substituteInPlace libagent/gpg/keyring.py \ + --replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" \ + --replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" + ''; + propagatedBuildInputs = [ unidecode backports-shutil-which diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 36d45c5ac66..13916a74ea4 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU="; + sha256 = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix index e2dcd7bb9a7..b447ab18cba 100644 --- a/pkgs/development/python-modules/lsprotocol/default.nix +++ b/pkgs/development/python-modules/lsprotocol/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2022.0.0a9"; + version = "2022.0.0a10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6XecPKuBhwtkmZrGozzO+VEryI5wwy9hlvWE1oV6ajk="; + hash = "sha256-IAFNEWpBRVAGcJNIV1bog9K2nANRw/qJfCJ9+Wu/yJc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix new file mode 100644 index 00000000000..e16a73eee3d --- /dev/null +++ b/pkgs/development/python-modules/merge3/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "merge3"; + version = "0.0.13"; + + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54"; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "merge3" + ]; + + meta = with lib; { + description = "Python implementation of 3-way merge"; + homepage = "https://github.com/breezy-team/merge3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 3c582230ee2..a02a6dce390 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.12.4"; + version = "7.12.5"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-X8ATnycG7MvzDNaMClvhyy4Qy4hvoNhn0sQ+s/JnX64="; + hash = "sha256-Ij01EExSc4pU8eC+JPhSB8YKXkspusMRgdPhdgbUEKk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix new file mode 100644 index 00000000000..c47508918a8 --- /dev/null +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fastprogress +, fastcore +, asttokens +, astunparse +, watchdog +, execnb +, ghapi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nbdev"; + version = "2.3.11"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ITMCmuAb1lXONbP5MREpk8vfNSztoTEmT87W1o+fbIU="; + }; + + propagatedBuildInputs = [ fastprogress fastcore asttokens astunparse watchdog execnb ghapi ]; + # no real tests + doCheck = false; + pythonImportsCheck = [ "nbdev" ]; + + meta = with lib; { + homepage = "https://github.com/fastai/nbdev"; + description = "Create delightful software with Jupyter Notebooks"; + license = licenses.asl20; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 71cd3b9a260..58f65b6e3d4 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.6.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U="; + rev = "refs/tags/${version}"; + hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 825f89354e5..ee51cdd7cd5 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "1.6.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc="; + hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index a1c8909e5fa..ef9d5e904d3 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qZOEq8cAxAnp3vcUN2PhjfrTMv3/fjD64fbRows3J3I="; + sha256 = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nuheat/default.nix b/pkgs/development/python-modules/nuheat/default.nix new file mode 100644 index 00000000000..97607ceab3d --- /dev/null +++ b/pkgs/development/python-modules/nuheat/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, parameterized +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "nuheat"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "broox"; + repo = "python-nuheat"; + rev = "refs/tags/${version}"; + hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + mock + parameterized + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "nuheat" + ]; + + meta = with lib; { + description = "Library to interact with NuHeat Signature and Mapei Mapeheat radiant floor thermostats"; + homepage = "https://github.com/broox/python-nuheat"; + changelog = "https://github.com/broox/python-nuheat/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 4e52fc4dcd1..ff26bb6ad0f 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -10,15 +10,14 @@ }: buildPythonPackage rec { - version = "1.1.5"; + version = "1.4.8"; pname = "Nuitka"; - # Latest version is not yet on PyPi src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; rev = version; - sha256 = "0wgcl860acbxnq8q9hck147yhxz8pcbqhv9glracfnrsd2qkpgpp"; + hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU="; }; nativeCheckInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix new file mode 100644 index 00000000000..13c2be3a809 --- /dev/null +++ b/pkgs/development/python-modules/okta/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +# install requirements +, pycryptodome +, yarl +, flatdict +, python-jose +, aenum +, aiohttp +, pydash +, xmltodict +, pyyaml +# test requirements +, pytestCheckHook +, pytest-recording +, pytest-asyncio +, pytest-mock +, pyfakefs +}: + +buildPythonPackage rec { + pname = "okta"; + version = "2.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yIVJoKX9b9Y7Ydl28twHxgPbUa58LJ12Oz3tvpU7CAc="; + }; + + propagatedBuildInputs = [ + pycryptodome + yarl + flatdict + python-jose + aenum + aiohttp + pydash + xmltodict + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + pytest-recording + pyfakefs + ]; + + pytestFlagsArray = [ "tests/" ]; + + disabledTests = [ + "test_client_raise_exception" + ]; + + pythonImportsCheck = [ + "okta" + "okta.cache" + "okta.client" + "okta.exceptions" + "okta.http_client" + "okta.models" + "okta.request_executor" + ]; + + meta = with lib; { + description = "Python SDK for the Okta Management API"; + homepage = "https://github.com/okta/okta-sdk-python"; + license = licenses.asl20; + maintainers = with maintainers; [ dennajort ]; + }; +} diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index ede1a7a3d84..92f2e327eb3 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.26.5"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; - rev = "v${version}"; - hash = "sha256-eKU+WRFf7f1yH63vcoQ9dVeqhJXBqMJGpk/9AoEgR0M="; + rev = "refs/tags/v${version}"; + hash = "sha256-pXttGvnApYuwkWU7kCDNjw0rjHD5AyUvujfvpDVjgxM="; }; propagatedBuildInputs = [ @@ -91,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the OpenAI API"; homepage = "https://github.com/openai/openai-python"; + changelog = "https://github.com/openai/openai-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ malo ]; }; diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 496dceeaab4..987f5cf6b14 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.5"; + version = "0.16.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-xXSZ9qxjmeIyYIWQubJbJxkXUdOu/WSSBddIWsVaH8k="; + hash = "sha256-cpWEZ+gX4deTxMQ5BG+Qh863jcqUkOlNSY3KtOwOcBo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index 4525d455757..a9e6ba10d98 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; + rev = "refs/tags/v${version}"; + hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for vulnerability scanners which support OSP"; homepage = "https://github.com/greenbone/ospd"; + changelog = "https://github.com/greenbone/ospd/releases/tag/v${version}"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3333331e85f..be36f758f94 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.2.1"; + version = "12.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WOuKGVrNZzvY7F0Mvj3MjSdTu47c5Y11ySe1qorzlWE="; + hash = "sha256-IAqXp/d0f1khhNpkp4uQmxqJ4Xh8Nl87i+iMa3U9EDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 7c0f38b525d..81445ebdede 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.0"; + version = "5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bR/e5pZCrnMCUt9zEszI0aVlqezTzwR3DIdpXv/6qGM="; + hash = "sha256-fHWJWgy/Ven5m2Cf81rG/ZKmFFWiLJsIPVxFe+rr+ms="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index d2f5f66c0b3..18e497f00f4 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -1,34 +1,29 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fetchpatch -, setuptools-scm +, setuptools , pint , pandas , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "pint-pandas"; - version = "0.2"; + # Latest release contains bugs and failing tests. + version = "unstable-2022-11-24"; + format = "pyproject"; - src = fetchPypi { - pname = "Pint-Pandas"; - inherit version; - sha256 = "sha256-b2DS6ArBAuD5St25IG4PbMpe5C8Lf4kw2MeYAC5B+oc="; + src = fetchFromGitHub { + owner = "hgrecco"; + repo = "pint-pandas"; + rev = "c58a7fcf9123eb65f5e78845077b205e20279b9d"; + hash = "sha256-gMZNJSJxtSZvgU4o71ws5ZA6tgD2M5c5oOrn62DRyMI="; }; - patches = [ - # Fixes a failing test, see: https://github.com/hgrecco/pint-pandas/issues/107 - (fetchpatch{ - url = "https://github.com/hgrecco/pint-pandas/commit/4c31e25609af968665ee60d019b9b5366f328680.patch"; - sha256 = "vIT0LI4S73D4MBfGI8vtCZAM+Zb4PZ4E3xfpGKNyA4I="; - }) - ]; - nativeBuildInputs = [ - setuptools-scm + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index d6fed8f9ac5..deb91a2b1ef 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.2.12"; + version = "23.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4="; + hash = "sha256-Wd02dlRIRBBJ2cKNxIZxOoWjp1aPxqmc37tvUbc/pJk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix new file mode 100644 index 00000000000..91eafd150dd --- /dev/null +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pandoc +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "publicsuffixlist"; + version = "0.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-9iQZb9v8aV7hg6UqLfxWGByPWb8mn+14vktIvCRX4hg="; + }; + + passthru.optional-dependencies = { + update = [ + requests + ]; + readme = [ + pandoc + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "publicsuffixlist" + ]; + + pytestFlagsArray = [ + "publicsuffixlist/test.py" + ]; + + meta = with lib; { + description = "Public Suffix List parser implementation"; + homepage = "https://github.com/ko-zu/psl"; + license = licenses.mpl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix new file mode 100644 index 00000000000..6c70ad8861c --- /dev/null +++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -0,0 +1,49 @@ +{ lib +, bleak +, bleak-retry-connector +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "py-dormakaba-dkey"; + version = "1.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "emontnemery"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + cryptography + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "py_dormakaba_dkey" + ]; + + meta = with lib; { + description = "Library to interact with a Dormakaba dkey lock"; + homepage = "https://github.com/emontnemery/py-dormakaba-dkey"; + changelog = "https://github.com/emontnemery/py-dormakaba-dkey/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index a6d4bc48e84..8c49de1e528 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -1,27 +1,42 @@ { lib , buildPythonPackage +, fetchPypi +, nose , numpy +, pythonOlder , six -, nose -, fetchPypi }: buildPythonPackage rec { - pname = "py_stringmatching"; - version = "0.4.2"; + pname = "py-stringmatching"; + version = "0.4.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c"; + pname = "py_stringmatching"; + inherit version; + sha256 = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; }; - nativeCheckInputs = [ nose ]; + propagatedBuildInputs = [ + numpy + six + ]; + + nativeCheckInputs = [ + nose + ]; - propagatedBuildInputs = [ numpy six ]; + pythonImportsCheck = [ + "py_stringmatching" + ]; meta = with lib; { - description = "A Python string matching library including string tokenizers and string similarity measures"; - homepage = "https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching"; + description = "Python string matching library including string tokenizers and string similarity measures"; + homepage = "https://github.com/anhaidgroup/py_stringmatching"; + changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 04206796d4d..e398643aa51 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,7 +3,6 @@ , aioresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-aiohttp , poetry-core , pytest-asyncio @@ -13,24 +12,16 @@ buildPythonPackage rec { pname = "pyairnow"; - version = "1.1.0"; + version = "1.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "asymworks"; repo = pname; - rev = "v${version}"; - sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + rev = "refs/tags/v${version}"; + hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; - hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 3c290b84394..7c6a477c7c3 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -2,22 +2,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "pybalboa"; - version = "0.13"; - format = "setuptools"; + version = "1.0.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "garbled1"; repo = pname; - rev = version; - sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd"; + rev = "refs/tags/${version}"; + hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI="; }; + nativeBuildInputs = [ + poetry-core + ]; + # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index cb23c2a5732..3101066ff25 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -1,32 +1,60 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , numpy +, pytestCheckHook +, pythonOlder , zlib }: buildPythonPackage rec { - pname = "pyBigWig"; - version = "0.3.18"; + pname = "pybigwig"; + version = "0.3.20"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4c2a8c571b4100ad7c4c318c142eb48558646be52aaab28215a70426f5be31bc"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "deeptools"; + repo = "pyBigWig"; + rev = "refs/tags/${version}"; + hash = "sha256-uYKxM0HOG4fus5geBFjbfbv6G1kDvMaAwhk0w/e1YII="; }; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyBigWig" + ]; - nativeCheckInputs = [ numpy pytest ]; + pytestFlagsArray = [ + "pyBigWigTest/test*.py" + ]; + + disabledTests = [ + # Test file is donwloaded from GitHub + "testAll" + "testBigBed" + "testFoo" + "testNumpyValues" + ]; meta = with lib; { - homepage = "https://github.com/deeptools/pyBigWig"; description = "File access to bigBed files, and read and write access to bigWig files"; longDescription = '' - A python extension, written in C, for quick access to bigBed files + A Python extension, written in C, for quick access to bigBed files and access to and creation of bigWig files. This extension uses libBigWig for local and remote file access. ''; + homepage = "https://github.com/deeptools/pyBigWig"; + changelog = "https://github.com/deeptools/pyBigWig/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ scalavision ]; }; diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index 92fe3483685..07ecdb0bc7e 100644 --- a/pkgs/development/python-modules/pybravia/default.nix +++ b/pkgs/development/python-modules/pybravia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybravia"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Drafteed"; repo = pname; rev = "v${version}"; - hash = "sha256-aY+G4e2uq2yWUkJ9CXnOhc5S57kkMB36N/x+iQDCivo="; + hash = "sha256-4TeUPJlNlmZxf1Tw62m5KjoTNHGt6wCSjKixkJBeGyw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix new file mode 100644 index 00000000000..c59205aa3f1 --- /dev/null +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gitpython +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyexploitdb"; + version = "0.2.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pyExploitDb"; + inherit version; + hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE="; + }; + + propagatedBuildInputs = [ + gitpython + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pyExploitDb" + ]; + + meta = with lib; { + description = "Library to fetch the most recent exploit-database"; + homepage = "https://github.com/GoVanguard/pyExploitDb"; + changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/Changelog.txt"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 759fe47221b..2cb78380c8f 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2BDVCukm2y4rZyIWozRWJ+pY2bI2A7Vpitjd8jSJoWQ="; + hash = "sha256-vyp+O5Oj1/OYALGb+ioXeFdlDveR8j5M9Z40QTC+sj4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index b2baa514667..2cc602050c1 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -1,24 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , requests -, nose -, mock }: buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; - rev = version; - hash = "sha256-cRG+Dm3KG6no3/OQCZkvISW1yE5azdDVTa5oTV1sRpk="; + rev = "refs/tags/${version}"; + hash = "sha256-MIWRBwqVuS1iEuWxsE1yuGS2zHYVgnH2G4JJk7Yct6s="; }; propagatedBuildInputs = [ @@ -26,14 +25,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "pyfritzhome" ]; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 70f76c129f0..400791197b6 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -7,17 +7,16 @@ , pypubsub , pyserial , pyserial-asyncio -, pytest-asyncio -, pytest-timeout , pytestCheckHook , pythonOlder -, pyyaml +, setuptools +, voluptuous }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,29 +24,27 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; + hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp pypubsub pyserial pyserial-asyncio - pyyaml + voluptuous ]; nativeCheckInputs = [ async_generator - pytest-asyncio - pytest-timeout pytestCheckHook ]; - disabledTests = [ - "test_results" - ]; - pythonImportsCheck = [ "pyinsteon" ]; diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 0f6786c4c4c..363b078cad3 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "refs/tags/V${version}"; - hash = "sha256-/HfWPrpW4NowFmdmU2teIiex1O03bHemnUdhOoEDRgc="; + hash = "sha256-zRXUjekawf2/zTSlXqHVB02dDkb6HbU4NN6UBgl2rtg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix new file mode 100644 index 00000000000..c4642b90654 --- /dev/null +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, dawg-python +, docopt +, pytestCheckHook +, pymorphy3-dicts-ru +, pymorphy3-dicts-uk +}: + +buildPythonPackage rec { + pname = "pymorphy3"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "no-plagiarism"; + repo = pname; + rev = version; + hash = "sha256-5MXAYcjZPUrGf5G5e7Yml1SLukrZURA0TCv0GiP56rM="; + }; + + propagatedBuildInputs = [ + dawg-python + docopt + pymorphy3-dicts-ru + pymorphy3-dicts-uk + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pymorphy3" ]; + + meta = with lib; { + description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; + homepage = "https://github.com/no-plagiarism/pymorphy3"; + license = licenses.mit; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix b/pkgs/development/python-modules/pymorphy3/dicts-ru.nix new file mode 100644 index 00000000000..db32d092a30 --- /dev/null +++ b/pkgs/development/python-modules/pymorphy3/dicts-ru.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pymorphy3-dicts-ru"; + version = "2.4.417150.4580142"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Oas3nUypBbr+1Q9a/Do95vlkNgV3b7yrxNMIjU7TgrA="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "pymorphy3_dicts_ru" ]; + + meta = with lib; { + description = "Russian dictionaries for pymorphy3"; + homepage = "https://github.com/no-plagiarism/pymorphy3-dicts"; + license = licenses.mit; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix b/pkgs/development/python-modules/pymorphy3/dicts-uk.nix new file mode 100644 index 00000000000..036bf452b89 --- /dev/null +++ b/pkgs/development/python-modules/pymorphy3/dicts-uk.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pymorphy3-dicts-uk"; + version = "2.4.1.1.1663094765"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s5RaNBNuGTgGzeZXuicdiKYHYedRN8E9E4qNFCqNEqw="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "pymorphy3_dicts_uk" ]; + + meta = with lib; { + description = "Ukrainian dictionaries for pymorphy3"; + homepage = "https://github.com/no-plagiarism/pymorphy3-dicts"; + license = licenses.mit; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index fde1bc061ec..bf81a0c8d8d 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pynuki"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = pname; rev = version; - hash = "sha256-9WiPApesocE9wXyI/qH+TTfbsTgJTyifSW3tfNro7XI="; + hash = "sha256-iGP8Bs5Jg8Xu1gAhpbB5lfrZjsF7X+lIt4dJP3fdhD8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 963290da277..b454381c470 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.7.6"; + version = "1.7.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-nmXOmoPH8w4Soj8lhI7wl3uYVmKw3xSuIkmCF0XI7RI="; + hash = "sha256-QYvnSFt0pJL3clDxN2axJUMU8M/maj3iSeUfVRgQGFg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index da6cdd5dc10..59253178661 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.6.3"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rb4QCxntXJYA8sqkgAjS6e8WJK9ljhIKgM3dfpmbHSc="; + hash = "sha256-fPeEKTfRL142RIMSQxpByIAy09sXlmDjIATikc82Iuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index de1bba50740..605e1b5dfe1 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8LwxRiYUhKYZkrjDNcnOkssvfw/tZ6dj1GKZQ6UkqsQ="; + sha256 = "sha256-4u564tLk91duYv1IClHddur6t+Rbla/e9P0yWAxw2sw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 3ff7bee167c..ebada417bca 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.0.8"; + version = "0.0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "sha256-Qw2irvj94cBquYeVUhqOq8lw85oP5TqtA2XTT2z5/as="; + sha256 = "sha256-pUbRttH/ksYcE1qZJAQWhuKk4+40w5xsul0TTqq1g3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix new file mode 100644 index 00000000000..1f9664947d2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytablewriter +, pytest +, tcolorpy +, typepy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-md-report"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ra88WXG6+xHSjOcy6tdYjvpKpNlvu6lq+sZckLadAlU="; + }; + + propagatedBuildInputs = [ + pytablewriter + tcolorpy + typepy + ]; + + buildInputs = [ pytest ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_md_report" ]; + + meta = with lib; { + description = "A pytest plugin to make a test results report with Markdown table format"; + homepage = "https://github.com/thombashi/pytest-md-report"; + changelog = "https://github.com/thombashi/pytest-md-report/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ rrbutani ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix new file mode 100644 index 00000000000..7aab7a2804f --- /dev/null +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +# install dependencies +, pytest +, vcrpy +, attrs +# test dependencies +, pytestCheckHook +, pytest-httpbin +, pytest-mock +, requests +}: + +buildPythonPackage rec { + pname = "pytest-recording"; + version = "0.12.2"; + + src = fetchFromGitHub { + owner = "kiwicom"; + repo = "pytest-recording"; + rev = "v${version}"; + hash = "sha256-nivwxaW8AIrBtPkzPJYfxlPxWn2NuYcaMry/IrBnnl0="; + }; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + vcrpy + attrs + ]; + + checkInputs = [ + pytestCheckHook + pytest-httpbin + pytest-mock + requests + ]; + + disabledTests = [ + "test_block_network_with_allowed_hosts" + ] ++ lib.optionals stdenv.isDarwin [ + # Missing socket.AF_NETLINK + "test_other_socket" + ]; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ + "pytest_recording" + ]; + + meta = with lib; { + description = "A pytest plugin that allows you recording of network interactions via VCR.py"; + homepage = "https://github.com/kiwicom/pytest-recording"; + license = licenses.mit; + maintainers = with maintainers; [ dennajort ]; + }; +} diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix index 5907be3a22a..144aec0fa5c 100644 --- a/pkgs/development/python-modules/python-decouple/default.nix +++ b/pkgs/development/python-modules/python-decouple/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "python-decouple"; - version = "3.7"; + version = "3.8"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "HBNetwork"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ="; + hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index e59781180b3..0caf9f85e3e 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "2.1.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; + hash = "sha256-nNf0Q3J5nrYDinMnl+p3HC4FYMX+GubYmtchfuATWms="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index ade6acd85d4..0dfe1358143 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.14"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A="; + sha256 = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM="; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix new file mode 100644 index 00000000000..11f402cc7a9 --- /dev/null +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, voluptuous +}: + +buildPythonPackage rec { + pname = "python-otbr-api"; + version = "1.0.5"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-yI7TzVJGSWdi+NKZ0CCOi3BC4WIqFuS7YZgihfWDBSY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + cryptography + voluptuous + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "python_otbr_api" + ]; + + meta = with lib; { + description = "Library for the Open Thread Border Router"; + homepage = "https://github.com/home-assistant-libs/python-otbr-api"; + changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix index c83ff853f1d..c2357f2df32 100644 --- a/pkgs/development/python-modules/python-velbus/default.nix +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pyserial +, pythonOlder }: buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.4"; + version = "2.1.9"; + format = "setuptools"; - src = fetchFromGitHub { - owner = "thomasdelaet"; - repo = pname; - rev = version; - sha256 = "1z0a7fc9xfrcpwi9xiimxsgbzbp2iwyi1rij6vqd5z47mzi49fv9"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-SbuECT6851E+QNyyPaNTnKmH54fYovemSto8gvfMIKg="; }; propagatedBuildInputs = [ @@ -22,7 +24,9 @@ buildPythonPackage rec { # Project has not tests doCheck = false; - pythonImportsCheck = [ "velbus" ]; + pythonImportsCheck = [ + "velbus" + ]; meta = with lib; { description = "Python library to control the Velbus home automation system"; diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 807278d967d..4a11c8f30ba 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pyvizio"; - version = "0.1.59"; + version = "0.1.60"; src = fetchPypi { inherit pname version; - sha256 = "1j2zbziklx4az55m3997y7yp4xflk7i0gsbdfh7fp9k0qngb2053"; + sha256 = "sha256-RwwZDb4mQJZw8w1sTFJ0eM3az4pDQbVLGtA+anyKEJM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 7d4ec741431..f7d033b7ce8 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-GLBekTsJqwzwtSYiYaJSeTt7qNs0gx2nOhlsfECFvKg="; + hash = "sha256-pPWnK5Xui339D10vS2QA2Og+Qg3JM8c3CbvRxksl0NY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5ad8494634f..0d02b9b3d93 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.3.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gqYjCvyiLhgosmzYITrthMkjLA6WJcBbmjkTNXZKUxc="; + hash = "sha256-2b6ryqDqZPs5VniLhCwA1/c9+3CT+JJrr3VwP3G6tpY="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = "https://rpyc.readthedocs.org"; + changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index b212af78a26..eec3bbff831 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.1.0"; + version = "2023.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iy4oNyQj6T8mMSIIqScuIqli3dCnnWP5poaTtq9f8Yc="; + hash = "sha256-XBVN7Tjjw9jw66f+wnBvKbQeDDlfGfv+87qOcMaFsEk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 708979a4cb2..c129f4651e5 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.19.0.post1"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk="; + sha256 = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 3bc5e45bd3b..24529b63a5d 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.7.2"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0yQ0upLkx5oroEH9BvIOfM5bgmVJw8o83IeAao5ncVs="; + hash = "sha256-VZ2WZpty7PXxU0uqJ/dftUNBW3QEIXrLghKxsW9lsgE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index f8b5d45bbc7..882eb6d4599 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.1"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4="; + hash = "sha256-pTjYdezNBFeLCh6cbC+YtHxQB4zrZAFTCjjNQffbHhc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 379159180a0..5d87fb52b2a 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.4.3.20220106"; - format = "setuptools"; + version = "0.6.0.20230303"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JustAnotherArchivist"; repo = pname; - rev = "v${version}"; - hash = "sha256-gphNT1IYSiAw22sqHlV8Rm4WRP4EWUvP0UkITuepmMc="; + rev = "refs/tags/v${version}"; + hash = "sha256-FY8byS+0yAhNSRxWsrsQMR5kdZmnHutru5Z6SWVfpiE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py b/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py index d0be2d1c335..96854b6cae8 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py @@ -59,10 +59,11 @@ def test_verbs(doc_en_core_web_trf): assert [ token.lemma_ for token in doc_en_core_web_trf if token.pos_ == "VERB"] == [ 'start', + 'work', + 'drive', 'take', 'tell', 'shake', 'turn', - 'be', 'talk', 'say'] diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 068f8ede69d..5a9e86f4951 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.9"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2uU6y/rsvNSLpeXL6O9IOQ0RMN0AEMH+/IKH6uufusU="; + hash = "sha256-Up9ZlLlAM0CDXEYDI95KsLzA0TBz/uZFqEgZLmNIABA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index e44e2300763..8c6987d95d9 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -42,6 +42,12 @@ "license": "cc-by-sa-40" }, { + "pname": "da_core_news_trf", + "version": "3.5.0", + "sha256": "0b8mxr1ajyw8ccm0khmcp4n3jcxl4syfrmiy9kzf3cp4hcrnqnxy", + "license": "cc-by-sa-40" + }, + { "pname": "de_core_news_lg", "version": "3.5.0", "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", @@ -132,6 +138,24 @@ "license": "gpl3" }, { + "pname": "fi_core_news_lg", + "version": "3.5.0", + "sha256": "0j3r01a0yqgj8apfjv1wkblhqg86yp2nzxv51nf99pi2nmh81jzx", + "license": "cc-by-sa-40" + }, + { + "pname": "fi_core_news_md", + "version": "3.5.0", + "sha256": "09qfzwyw6wfdmw1bgd1kfg1gdbmzal5z1r240djivxygzn6f1ixs", + "license": "cc-by-sa-40" + }, + { + "pname": "fi_core_news_sm", + "version": "3.5.0", + "sha256": "1ly71cacy0gr62acvc3vl8dxh2czd6zkm7ijprisdblw17ik9yln", + "license": "cc-by-sa-40" + }, + { "pname": "fr_core_news_lg", "version": "3.5.0", "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", @@ -156,6 +180,24 @@ "license": "lgpllr" }, { + "pname": "hr_core_news_lg", + "version": "3.5.0", + "sha256": "1fvkzfi539fmp6jy3hjcrwvdxw5k6zc3h351s887xidlw3gs1kr3", + "license": "cc-by-sa-40" + }, + { + "pname": "hr_core_news_md", + "version": "3.5.0", + "sha256": "1mi6k9qjxbigrl2fa60blyyz8b54jda5hc1s96vn9rykg4rni8cr", + "license": "cc-by-sa-40" + }, + { + "pname": "hr_core_news_sm", + "version": "3.5.0", + "sha256": "1s22mx7y5h135ry5l49az30l7mw7fdrz53s4a9gaxfsp9rzs474g", + "license": "cc-by-sa-40" + }, + { "pname": "it_core_news_lg", "version": "3.5.0", "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", @@ -174,6 +216,24 @@ "license": "cc-by-nc-sa-30" }, { + "pname": "ko_core_news_lg", + "version": "3.5.0", + "sha256": "1q314wb114ynkf455cm8jd9jsx3yb6y0rrgf820ww31jlk5jzaa9", + "license": "cc-by-sa-40" + }, + { + "pname": "ko_core_news_md", + "version": "3.5.0", + "sha256": "0dy7kk4bvjl944vv2m4hcvppar7clwq28y2rk40i3022jbqh2nxq", + "license": "cc-by-sa-40" + }, + { + "pname": "ko_core_news_sm", + "version": "3.5.0", + "sha256": "1i5q8dpyfa2sy80hr81r6s9dqpawp36ni8slz035b0wd9sq3i73v", + "license": "cc-by-sa-40" + }, + { "pname": "lt_core_news_lg", "version": "3.5.0", "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", @@ -336,6 +396,30 @@ "license": "cc-by-sa-40" }, { + "pname": "uk_core_news_lg", + "version": "3.5.0", + "sha256": "0hl9xjnxslckc6wvfgkj30r3py8q95yj7mrxdb6m5gvknlq72kp2", + "license": "mit" + }, + { + "pname": "uk_core_news_md", + "version": "3.5.0", + "sha256": "05mg719ra5khm61yr7xhfcsh3apl29s3h2wkq0v87gkyqn13812p", + "license": "mit" + }, + { + "pname": "uk_core_news_sm", + "version": "3.5.0", + "sha256": "1dkbmjbyhf6vsr7c4m4njgi969sfhbdnp73skl3k206dign5qgnz", + "license": "mit" + }, + { + "pname": "uk_core_news_trf", + "version": "3.5.0", + "sha256": "02bhvcivalifrxd3vl118799wvg6hgykj31wwfdsgnq68lwc28fb", + "license": "mit" + }, + { "pname": "xx_ent_wiki_sm", "version": "3.5.0", "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 4110e157d62..287364dc873 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchurl -, jieba -, pymorphy2 +, protobuf +, pymorphy3 +, pymorphy3-dicts-uk , sentencepiece , spacy , spacy-pkuseg @@ -15,8 +16,10 @@ }: let buildModelPackage = { pname, version, sha256, license }: + let lang = builtins.substring 0 2 pname; + requires-protobuf = pname == "fr_dep_news_trf" || pname == "uk_core_news_trf"; in buildPythonPackage { inherit pname version; @@ -27,16 +30,21 @@ let }; propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] - ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (lang == "ru") [ pymorphy3 ] + ++ lib.optionals (lang == "uk") [ pymorphy3 pymorphy3-dicts-uk ] + ++ lib.optionals (lang == "zh") [ spacy-pkuseg ] ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; - postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' + postPatch = lib.optionalString requires-protobuf '' substituteInPlace meta.json \ - --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + --replace "protobuf<3.21.0" "protobuf" ''; + nativeBuildInputs = lib.optionals requires-protobuf [ + protobuf + ]; + pythonImportsCheck = [ pname ]; passthru.updateScript = writeScript "update-spacy-models" '' diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index a9ed433c2e5..047689b5c26 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aF3JlKp3DuGyPy1TkoGchCnyeVh3H43OssT7gCENWRU="; + hash = "sha256-X1gno39s1vZzClQfmUyVxgo64jKeAfS6Ic7VM5rqAJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 12a5878024b..cb7c3a593b1 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -4,13 +4,12 @@ , fetchPypi , sphinx , pydata-sphinx-theme -, pyyaml , jupyter-book }: buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.0.0rc2"; + version = "1.0.0"; format = "wheel"; @@ -21,13 +20,12 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "43977402f55b79706e117c6de6f50e67dac6dad698eb9b75be07dc2e6a689bde"; + sha256 = "sha256-9rq6eIjVpjMoohDplgp6bpUeljLXTttvzkjJ1djCh2g="; }; propagatedBuildInputs = [ - sphinx pydata-sphinx-theme - pyyaml + sphinx ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 3ad320751ac..8b22b098a8c 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pytest , colored -, pytestCheckHook +, invoke }: buildPythonPackage rec { pname = "syrupy"; - version = "3.0.6"; + version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.8.1"; + src = fetchFromGitHub { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE="; }; nativeBuildInputs = [ @@ -32,9 +35,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + invoke + pytest ]; + checkPhase = '' + runHook preCheck + # https://github.com/tophat/syrupy/blob/main/CONTRIBUTING.md#local-development + invoke test + runHook postCheck + ''; + meta = with lib; { changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; description = "Pytest Snapshot Test Utility"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f7d920c3722..adc7b1c1e0b 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -17,7 +17,9 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false, cudaPackages ? {} +, cudaSupport ? false +, cudaPackages ? { } +, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken @@ -30,7 +32,27 @@ }: let - inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; + originalStdenv = stdenv; +in +let + # Tensorflow looks at many toolchain-related variables which may diverge. + # + # Toolchain for cuda-enabled builds. + # We want to achieve two things: + # 1. NVCC should use a compatible back-end (e.g. gcc11 for cuda11) + # 2. Normal C++ files should be compiled with the same toolchain, + # to avoid potential weird dynamic linkage errors at runtime. + # This may not be necessary though + # + # Toolchain for Darwin: + # clang 7 fails to emit a symbol for + # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the + # translation units, so the build fails at link time + stdenv = + if cudaSupport then cudaPackages.backendStdenv + else if originalStdenv.isDarwin then llvmPackages_11.stdenv + else originalStdenv; + inherit (cudaPackages) cudatoolkit cudnn nccl; in assert cudaSupport -> cudatoolkit != null @@ -42,6 +64,7 @@ assert ! (stdenv.isDarwin && cudaSupport); let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; + # FIXME: migrate to redist cudaPackages cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; paths = [ @@ -54,10 +77,13 @@ let ]; }; + # Tensorflow expects bintools at hard-coded paths, e.g. /usr/bin/ar + # The only way to overcome that is to set GCC_HOST_COMPILER_PREFIX, + # but that path must contain cc as well, so we merge them cudatoolkit_cc_joined = symlinkJoin { - name = "${cudatoolkit.cc.name}-merged"; + name = "${stdenv.cc.name}-merged"; paths = [ - cudatoolkit.cc + stdenv.cc binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip ]; }; @@ -173,12 +199,7 @@ let ''; }) else _bazel-build; - _bazel-build = (buildBazelPackage.override (lib.optionalAttrs stdenv.isDarwin { - # clang 7 fails to emit a symbol for - # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the - # translation units, so the build fails at link time - stdenv = llvmPackages_11.stdenv; - })) { + _bazel-build = buildBazelPackage.override { inherit stdenv; } { name = "${pname}-${version}"; bazel = bazel_5; @@ -209,12 +230,13 @@ let flatbuffers-core giflib grpc - icu + # Necessary to fix the "`GLIBCXX_3.4.30' not found" error + (icu.override { inherit stdenv; }) jsoncpp libjpeg_turbo libpng lmdb-core - pybind11 + (pybind11.overridePythonAttrs (_: { inherit stdenv; })) snappy sqlite ] ++ lib.optionals cudaSupport [ @@ -299,9 +321,11 @@ let TF_NEED_CUDA = tfFeature cudaSupport; TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; + TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; + + # Needed even when we override stdenv: e.g. for ar GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; - GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc"; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 9e3e1560c20..f852e29c002 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -6,7 +6,7 @@ , cython , leptonica , pkg-config -, tesseract +, tesseract4 # propagates , pillow @@ -36,7 +36,7 @@ buildPythonPackage rec { buildInputs = [ leptonica - tesseract + tesseract4 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix new file mode 100644 index 00000000000..da3da57d35d --- /dev/null +++ b/pkgs/development/python-modules/textnets/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, cairocffi +, cython +, fetchFromGitHub +, igraph +, leidenalg +, pandas +, poetry-core +, pytestCheckHook +, pythonOlder +, scipy +, setuptools +, spacy +, en_core_web_sm +, toolz +, tqdm +, wasabi +}: + +buildPythonPackage rec { + pname = "textnets"; + version = "0.8.7"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jboynyc"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-BBndY+3leJBxiImuyRL7gMD5eocE4i96+97I9hDEwec="; + }; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + ]; + + propagatedBuildInputs = [ + cairocffi + igraph + leidenalg + pandas + scipy + spacy + toolz + tqdm + wasabi + ]; + + # Deselect test of experimental feature that fails due to having an + # additional dependency. + disabledTests = [ + "test_context" + ]; + + nativeCheckInputs = [ + pytestCheckHook + en_core_web_sm + ]; + + pythonImportsCheck = [ + "textnets" + ]; + + meta = with lib; { + description = "Text analysis with networks"; + homepage = "https://textnets.readthedocs.io"; + changelog = "https://github.com/jboynyc/textnets/blob/v${version}/HISTORY.rst"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 5decea07774..2b9a035c60d 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -59,6 +59,11 @@ buildPythonPackage rec { time-machine ]; + disabledTestPaths = [ + # snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + ]; + pythonImportsCheck = [ "textual" ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index e415bc17a7b..8deba357004 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.7"; + version = "8.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Dwj20fxQ4ovxiBTKKxyAfNTVmpMNcTRZpnXghsR3mvk="; + hash = "sha256-NcZXy+2wT8W8JHhl1mWSHOw9Ve81+/zj7hogSGtyBoM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index efb51c9b9e9..b22815bb502 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.11.2"; + version = "0.11.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-oeARQA7TtcplsvXvWVN4pcjj0BaMmHOJPZxGA55luI4="; + hash = "sha256-cyzAY5NKP+SgoZmwBBLsI0yQ1M4jdOB6/9+/k/+5mns="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index c51830b7fc7..570849a744c 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo="; + hash = "sha256-Fg1rhTS9aP7C1URDfoC3w1w1IduToxYUtwTLDM3916U="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the TP-Link Omada SDN Controller API"; homepage = "https://github.com/MarkGodwin/tplink-omada-api"; + changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix new file mode 100644 index 00000000000..d53281f5f06 --- /dev/null +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -0,0 +1,51 @@ +{ lib +, cython +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "ulid-transform"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-JuTIE8FAVZkfn+byJ1z9/ep9Oih1uXpz/QTB2OfM0WU="; + }; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ulid_transform --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ulid_transform" + ]; + + meta = with lib; { + description = "Library to create and transform ULIDs"; + homepage = "https://github.com/bdraco/ulid-transform"; + changelog = "https://github.com/bdraco/ulid-transform/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index aad23c6fdf9..eeddbd1d6b6 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -1,22 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, uncompyle6, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, uncompyle6 +, pythonOlder +}: buildPythonPackage rec { pname = "unrpa"; version = "2.3.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - propagatedBuildInputs = [ uncompyle6 ]; + passthru.optional-dependencies = { + ZiX = [ uncompyle6 ]; + }; pythonImportsCheck = [ "unrpa" ]; + # upstream has no unit tests + doCheck = false; + meta = with lib; { homepage = "https://github.com/Lattyware/unrpa"; + changelog = "https://github.com/Lattyware/unrpa/releases/tag/${version}"; description = "A program to extract files from the RPA archive format"; license = licenses.gpl3; maintainers = with maintainers; [ leo60228 ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 3c7b7ba0325..881c24d25b1 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.12.0"; + version = "2023.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc="; + hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index f70d4771ba6..62b528e71db 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for working with vivisect"; homepage = "https://github.com/williballenthin/viv-utils"; + changelog = "https://github.com/williballenthin/viv-utils/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 2cb55c69cec..f35ab607a07 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -8,25 +8,30 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.5.0"; + version = "2.6.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; - rev = version; - sha256 = "sha256-8rWMz8tBanxHdU/F4HhBxxz3ltqbdRoP4JED2dmZfTk="; + repo = "voluptuous-serialize"; + rev = "refs/tags/${version}"; + hash = "sha256-vvreXSQDkA3JkZpOKZqJgMRyObJX/cSR8r+A26h9fNE="; }; - propagatedBuildInputs = [ voluptuous ]; + propagatedBuildInputs = [ + voluptuous + ]; nativeCheckInputs = [ pytestCheckHook voluptuous ]; - pythonImportsCheck = [ "voluptuous_serialize" ]; + pythonImportsCheck = [ + "voluptuous_serialize" + ]; meta = with lib; { homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index bde97b8e124..a3e4c0c561a 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -3,7 +3,7 @@ , aiodns , aiohttp , buildPythonPackage -, cchardet +, faust-cchardet , fetchFromGitHub , pyopenssl , pythonOlder @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ="; + hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik="; }; propagatedBuildInputs = [ aenum aiodns aiohttp - cchardet + faust-cchardet pyopenssl pytz related diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 07acd1debd5..5803f20c07a 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.2"; + version = "0.42.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc="; + hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 33636fb9a99..385ea1ea453 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.54.1"; + version = "0.54.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-WNvEcx+Ut4CtL2L81u5fCfmZoi+5hi/CbB9mfrG8Hm4="; + hash = "sha256-Zjh4rWnpzzBZFQRZIoceeIn4DYn0/HqLLZFhc57yhLQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index af7f10e3fd8..bada705c78d 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.4.0"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw="; + hash = "sha256-ivqUego6a9ieSxgHKd3szVAE23zMI54nYqbZjHIgVVE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 11a1caf15b7..2de6d701399 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.12.2"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ in owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1q+lzNtm8qko9ZAxJjkmPOQjHD5GxB6YyEz0tr+QWGk="; + hash = "sha256-psoFdYETXztPJfOZyfES5ujcUDBp/X7sY/puP66E0Ok="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 6bac02af7f8..9fd5e993ec9 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -1,17 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "yattag"; - version = "1.15.0"; + version = "1.15.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; + hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; }; + pythonImportsCheck = [ + "yattag" + ]; + meta = with lib; { - description = "Generate HTML or XML in a pythonic way. Pure python alternative to web template engines. Can fill HTML forms with default values and error messages."; - license = [ licenses.lgpl21 ]; + description = "Library to generate HTML or XML"; homepage = "https://www.yattag.org/"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index e882a48c633..b3cda18f778 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -2,15 +2,17 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, paho-mqtt +, asyncio-mqtt , pydantic , pythonOlder +, setuptools +, tenacity }: buildPythonPackage rec { pname = "yolink-api"; - version = "0.1.5"; - format = "setuptools"; + version = "0.2.8"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,13 +20,18 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Ch17aKUT8jVUo+pYD5EvydEzP/TTjLtgkUQJnHYkKg="; + hash = "sha256-dcuP2VPAp3Na1o9DV3bPejCrtaIxvt+g/vRaQYqI67Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - paho-mqtt + asyncio-mqtt pydantic + tenacity ]; # Module has no tests diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index c5f5b7f1f3d..3fc465d9bad 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "1.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - hash = "sha256-yh4ZmMn5z6aTZrhj9ZmvpmsDOF4MeDcPtSgr4fimjGM="; + hash = "sha256-49/HmkGr87aDhr8GEtARpXvr2RcgmLdAqhvMLI5x+vQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 9c2b3945642..c5521f0f0d6 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.47.1"; + version = "0.47.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; + hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index f1b846e9482..e4d6ddad8de 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; + sha256 = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 3a759b15815..ca8b65b3413 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.44.0"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4="; + hash = "sha256-EeQ0gUSDsHIJnp1Oc2Imld4ZFa5maX8xj6GzchHlCoc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 25cb3b4d7eb..ccfc23913fe 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -39,7 +39,6 @@ let util-linux unzip socat - spice-gtk swtpm wget xdg-user-dirs @@ -75,8 +74,12 @@ stdenv.mkDerivation rec { install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey + # spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection + # is enabled, the wrapped spice-client-glib-usb-acl-helper is used for f in macrecovery quickget quickemu windowskey; do - wrapProgram $out/bin/$f --prefix PATH : "${lib.makeBinPath runtimePaths}" + wrapProgram $out/bin/$f \ + --prefix PATH : "${lib.makeBinPath runtimePaths}" \ + --suffix PATH : "${lib.makeBinPath [ spice-gtk ]}" done runHook postInstall diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 644641a4ffd..b6b1bb4b5d0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -407,6 +407,9 @@ in buildFlags = [ "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" + ] ++ lib.optionals stdenv.isDarwin [ + "--with-iconv-dir=${libiconv}" + "--with-opt-include=${libiconv}/include" ]; }; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index e826fd9d2cd..f8cbc806250 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak="; + hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; }; - cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc="; + cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 499a4242923..0cc65b004e8 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-9duL16AuwG3lBMq1hUAXbNrvoBF6SASCiakmT42LQ/E="; + sha256 = "sha256-JTkVNy2wqPIQ5mVcptI10a3Ghhdygnm9dmwUmiDqYjE="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoHash = "sha256-MXnE3Fq/jzWHvmO2i8cWixRKRuwVbUU/OmBj1SUkEiY="; + cargoHash = "sha256-t4L3HSOGk/lAL8mOaVl/pm3kE0CVVzsYpyu0V6zeIFQ="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; @@ -26,6 +26,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xd009642/tarpaulin"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ hugoreeves ]; - platforms = lib.platforms.x86_64; }; } diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 0f560d0b3a1..e80ac3b8e83 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.2"; + version = "2.12.3"; 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-n36x50rGA0fzvbwrUDpzWmF7XqwTTxnAfFtBL23gEOE="; + sha256 = "sha256-xBTL3atnLsw7HWhkWq32LdQmSBtsQ2ydK+8On8l+OcA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index fdc20a3eefb..f50fb16d8bc 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.53.0"; + version = "6.55.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-pHEGBIvC4XAuzWZpws7ldRGabfKhAqZnaahqVdNpUJE="; + hash = "sha256-Iaz5bUPLQNWRyszMHCCmb8eW6t32nqYYEllER7rHoR0="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 7508e77da96..c5561b9b666 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-fosvr8l/xql4j2/mGjbvbJQMUqBqBUturQJq+OQT/wM="; + hash = "sha256-63JWRyB586klWSQskBY/fDRTdXrQa15IygdZfmHpEqM="; }; - vendorHash = "sha256-ZYmYLZXEzWrTt6JJOWyTmbVq8p7D8lhz07bmQ2Z7gKc="; + vendorHash = "sha256-XRv8AnktIPR1emRdRMmDwOh7r3kNByy0REwZbg3NYPc="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index bee465fbfd8..1f8e04c0808 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-dXUjQmKk+UdgYqdMuNh9ALaots1t0xwg6hEWwAbGPJc="; + hash = "sha256-g2kA1FYt6OWb0zb3pSQ46dJMsSZpT6kLYkpIIN3XZbI="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-f+n/bjjdKar5aURkPNYKkHUll6lqNa/dlzq3dIFh+tc="; + hash = "sha256-088qK9meyqV93ezLlBIjdp1l/n+pv+9afaJGYlXEFQc="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 5689279b86a..9d1305f7767 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-D2Nqou4wUIsePKr+ReAyFO/22vQlwcs4Li+3+6btR6Y="; + sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 7542ba0f94f..3d1932f3eb0 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.43.1"; + version = "3.44.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-gTtWfqz1XVvDPULHY4hKdhJlwEWY84VYUPloAX/9afY="; + sha256 = "sha256-iN6Q+HXaZgUt8kXDGG5e1hY0/g/JYSHQ768YYRwZsuw="; }; - vendorHash = "sha256-srzTHUqXxyZY2hFCx3FhhuixclXHskYrQ586W1dB334="; + vendorHash = "sha256-I+tjSBfAvRyE0bjVRloAkb5Jftb6dxoq8lNSgWHAcVk="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 2a7111b352e..c1f08ce74d5 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.94.4"; + version = "0.95.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PnO9M3CQQnZotzCuE2rlGsoBzNO0PdsoMLlY3tNyEyk="; + sha256 = "sha256-s+mScSSVjzCZ+9lwFdcC/F5oCdT51JNxlqP7uKlx+Y8="; }; - vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss="; + vendorHash = "sha256-TZOBIivaoaO7EWBqV2zuL3Em5o4MButq4+TxvePu+qY="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 4524224cd69..d43fd51cc30 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-70qN5cZb0EjBPE5xpeKUv46JD+B8rYaDejAfaqC0Y4M="; + hash = "sha256-J+3wihsZx8ZnanWfahtd9J659dUaQXbD0lz2uMHLb3E="; }; - vendorHash = "sha256-9a5W8+tQ5rhtq4uul84AtxcKOc25lfe7bMpgbhRT9/Y="; + vendorHash = "sha256-r8XJrHU8ToqW7CqvpYoHcM0skqWOXZxFAyQQZ2yIBQ4="; proxyVendor = true; subPackages = [ diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix new file mode 100644 index 00000000000..cb5338e210b --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitea, buildGoModule }: + +buildGoModule rec { + pname = "gitea-actions-runner"; + version = "unstable-2023-02-08"; + + src = fetchFromGitea { + domain = "gitea.com"; + owner = "gitea"; + repo = "act_runner"; + rev = "990cf93c7136669408eb1832cd05df3ad4dd81b3"; + sha256 = "1ysp7g199dzh1zpxxhki88pn96qghln7a5g8zfjip9173q1rgiyb"; + }; + + vendorSha256 = "0a3q7rsk37dc6v3vnqaywkimaqvyjmkrwljhcjcnswsdfcgng62b"; + + meta = with lib; { + mainProgram = "act_runner"; + maintainers = with maintainers; [ techknowlogick ]; + license = licenses.mit; + homepage = "https://gitea.com/gitea/act_runner"; + description = "A runner for Gitea based on act"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b1ff6a76f54..e6b22a99bd1 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -1,49 +1,19 @@ { autoPatchelfHook , autoSignDarwinBinariesHook -, coreutils -, curl +, buildDotnetModule , dotnetCorePackages -, dotnetPackages , fetchFromGitHub -, fetchurl +, fetchpatch , git , glibc -, icu -, libkrb5 +, glibcLocales , lib -, linkFarmFromDrvs -, lttng-ust -, makeWrapper +, nixosTests , nodejs-16_x -, openssl , stdenv -, zlib -, writeShellApplication -, nuget-to-nix +, which }: -let - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}.${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - - nugetSource = linkFarmFromDrvs "nuget-packages" ( - import ./deps.nix { inherit fetchNuGet; } - ); - - dotnetSdk = dotnetCorePackages.sdk_6_0; - # Map Nix systems to .NET runtime ids - runtimeIds = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - }; - runtimeId = runtimeIds.${stdenv.system}; - fakeSha1 = "0000000000000000000000000000000000000000"; -in -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "github-runner"; version = "2.302.1"; @@ -51,92 +21,77 @@ stdenv.mkDerivation rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8="; + hash = "sha256-hPZzqTJGwcBxajLjU0TuIQ2KLnDl9E66seuutm9JWDo="; + # Required to obtain HEAD's Git commit hash + leaveDotGit = true; }; - nativeBuildInputs = [ - dotnetSdk - dotnetPackages.Nuget - makeWrapper - ] ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - autoSignDarwinBinariesHook - ]; - - buildInputs = [ - curl # libcurl.so.4 - libkrb5 # libgssapi_krb5.so.2 - stdenv.cc.cc.lib # libstdc++.so.6 - zlib # libz.so.1 - icu - ] ++ lib.optionals stdenv.isLinux [ - lttng-ust # liblttng-ust.so.0 - ]; patches = [ - # Don't run Git, no restore on build/test - ./patches/dir-proj.patch # Replace some paths that originally point to Nix's read-only store ./patches/host-context-dirs.patch # Use GetDirectory() to obtain "diag" dir ./patches/use-get-directory-for-diag.patch - # Don't try to install systemd service - ./patches/dont-install-systemd-service.patch + # Don't try to install service + ./patches/dont-install-service.patch + # Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set + ./patches/env-sh-use-runner-root.patch + # Fix FHS path: https://github.com/actions/runner/pull/2464 + (fetchpatch { + name = "ln-fhs.patch"; + url = "https://github.com/actions/runner/commit/5ff0ce1.patch"; + hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas="; + }) ]; postPatch = '' - # Relax the version requirement - substituteInPlace src/global.json \ - --replace '6.0.300' '${dotnetSdk.version}' - - # Disable specific tests - substituteInPlace src/dir.proj \ - --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'" - - # We don't use a Git checkout + # Ignore changes to src/Runner.Sdk/BuildConstants.cs substituteInPlace src/dir.proj \ --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ - 'echo Patched out.' - - # Fix FHS path - substituteInPlace src/Test/L0/Util/IOUtilL0.cs \ - --replace '/bin/ln' '${coreutils}/bin/ln' + 'true' ''; - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = stdenv.isDarwin; - - configurePhase = '' - runHook preConfigure + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales; + LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive"; - export HOME=$(mktemp -d) - - # Never use nuget.org - nuget sources Disable -Name "nuget.org" + postConfigure = '' + # Generate src/Runner.Sdk/BuildConstants.cs + dotnet msbuild \ + -t:GenerateConstant \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:PackageRuntime="${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" \ + -p:RunnerVersion="${version}" \ + src/dir.proj + ''; - # Restore the dependencies - dotnet restore src/ActionsRunner.sln \ - --runtime "${runtimeId}" \ - --source "${dotnetSdk.packages}" \ - --source "${nugetSource}" + nativeBuildInputs = [ + git + which + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ]; - runHook postConfigure - ''; + buildInputs = [ stdenv.cc.cc.lib ]; - buildPhase = '' - runHook preBuild + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; - dotnet msbuild \ - -t:Build \ - -p:PackageRuntime="${runtimeId}" \ - -p:BUILDCONFIG="Release" \ - -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${fakeSha1}" \ - src/dir.proj + dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]; - runHook postBuild - ''; + # As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41 + projectFile = [ + "src/Sdk/Sdk.csproj" + "src/Runner.Common/Runner.Common.csproj" + "src/Runner.Listener/Runner.Listener.csproj" + "src/Runner.Worker/Runner.Worker.csproj" + "src/Runner.PluginHost/Runner.PluginHost.csproj" + "src/Runner.Sdk/Runner.Sdk.csproj" + "src/Runner.Plugins/Runner.Plugins.csproj" + ]; + nugetDeps = ./deps.nix; doCheck = true; @@ -162,30 +117,18 @@ stdenv.mkDerivation rec { "CompositeActionWithActionfile_MaxLimit" "CompositeActionWithActionfile_Node" "DownloadActionFromGraph" - "DownloadActionFromGraph_Legacy" "NotPullOrBuildImagesMultipleTimes" - "NotPullOrBuildImagesMultipleTimes_Legacy" "RepositoryActionWithActionYamlFile_DockerHubImage" - "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" "RepositoryActionWithActionfileAndDockerfile" - "RepositoryActionWithActionfileAndDockerfile_Legacy" "RepositoryActionWithActionfile_DockerHubImage" - "RepositoryActionWithActionfile_DockerHubImage_Legacy" "RepositoryActionWithActionfile_Dockerfile" - "RepositoryActionWithActionfile_Dockerfile_Legacy" "RepositoryActionWithActionfile_DockerfileRelativePath" - "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" "RepositoryActionWithActionfile_Node" - "RepositoryActionWithActionfile_Node_Legacy" "RepositoryActionWithDockerfile" - "RepositoryActionWithDockerfile_Legacy" "RepositoryActionWithDockerfileInRelativePath" - "RepositoryActionWithDockerfileInRelativePath_Legacy" "RepositoryActionWithDockerfilePrepareActions_Repository" "RepositoryActionWithInvalidWrapperActionfile_Node" - "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" "RepositoryActionWithWrapperActionfile_PreSteps" - "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" ] ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" @@ -208,156 +151,118 @@ stdenv.mkDerivation rec { "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; - nativeCheckInputs = [ git ]; - checkPhase = '' - runHook preCheck + testProjectFile = [ "src/Test/Test.csproj" ]; + preCheck = '' mkdir -p _layout/externals ln -s ${nodejs-16_x} _layout/externals/node16 - - printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' - - # BUILDCONFIG needs to be "Debug" - dotnet msbuild \ - -t:test \ - -p:PackageRuntime="${runtimeId}" \ - -p:BUILDCONFIG="Debug" \ - -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${fakeSha1}" \ - src/dir.proj - - runHook postCheck ''; - installPhase = '' - runHook preInstall + postInstall = '' + mkdir -p $out/bin - # Copy the built binaries to lib/ instead of bin/ as they - # have to be wrapped in the fixup phase to work - mkdir -p $out/lib - cp -r _layout/bin/. $out/lib/ + install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner + install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/github-runner + install -m755 src/Misc/layoutroot/run.sh $out/lib/github-runner + install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/github-runner/run-helper.sh + install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner + install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner - # Delete debugging files - find "$out/lib" -type f -name '*.pdb' -delete + # env.sh is patched to not require any wrapping + ln -sr "$out/lib/github-runner/env.sh" "$out/bin/" - # Install the helper scripts to bin/ to resemble the upstream package - mkdir -p $out/bin - install -m755 src/Misc/layoutbin/runsvc.sh $out/bin/ - install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/ - install -m755 src/Misc/layoutroot/run.sh $out/lib/ - install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/run-helper.sh - install -m755 src/Misc/layoutroot/config.sh $out/lib/ - install -m755 src/Misc/layoutroot/env.sh $out/lib/ - - # Rewrite reference in helper scripts from bin/ to lib/ - substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' - substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ - --replace 'source ./env.sh' $out/bin/env.sh + substituteInPlace $out/lib/github-runner/config.sh \ + --replace './bin/Runner.Listener' "$out/bin/Runner.Listener" '' + lib.optionalString stdenv.isLinux '' - # Make binary paths absolute - substituteInPlace $out/lib/config.sh \ - --replace 'ldd' '${glibc.bin}/bin/ldd' \ + substituteInPlace $out/lib/github-runner/config.sh \ + --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \ + --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \ --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig' '' + '' # Remove uneeded copy for run-helper template - substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' - substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' + substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' + substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' # Make paths absolute - substituteInPlace $out/bin/runsvc.sh \ - --replace './externals' "$out/externals" \ - --replace './bin' "$out/lib" + substituteInPlace $out/lib/github-runner/runsvc.sh \ + --replace './externals' "$out/lib/externals" \ + --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js" - # The upstream package includes Node {12,16} and expects it at the path - # externals/node{12,16}. As opposed to the official releases, we don't + # The upstream package includes Node 16 and expects it at the path + # externals/node16. As opposed to the official releases, we don't # link the Alpine Node flavors. - mkdir -p $out/externals - ln -s ${nodejs-16_x} $out/externals/node16 + mkdir -p $out/lib/externals + ln -s ${nodejs-16_x} $out/lib/externals/node16 # Install Nodejs scripts called from workflows - install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js - mkdir -p $out/lib/checkScripts - install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/ + install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js + mkdir -p $out/lib/github-runner/checkScripts + install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/ + '' + lib.optionalString stdenv.isLinux '' + # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH + makeWrapperArgs=() - runHook postInstall + # We don't wrap with libicu + substituteInPlace $out/lib/github-runner/config.sh \ + --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu' + '' + '' + # XXX: Using the corresponding Nix argument does not work as expected: + # https://github.com/NixOS/nixpkgs/issues/218449 + # Common wrapper args for `executables` + makeWrapperArgs+=( + --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"' + --run 'mkdir -p "$RUNNER_ROOT"' + --chdir "$out" + ) ''; - # Stripping breaks the binaries - dontStrip = true; + # List of files to wrap + executables = [ + "config.sh" + "Runner.Listener" + "Runner.PluginHost" + "Runner.Worker" + "run.sh" + "runsvc.sh" + ]; - preFixup = lib.optionalString stdenv.isLinux '' - patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so - ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck - postFixup = '' - fix_rpath() { - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 - } - wrap() { - makeWrapper $out/lib/$1 $out/bin/$1 \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \ - "''${@:2}" - } - '' + lib.optionalString stdenv.isLinux '' - fix_rpath Runner.Listener - fix_rpath Runner.PluginHost - fix_rpath Runner.Worker - '' + '' - wrap Runner.Listener - wrap Runner.PluginHost - wrap Runner.Worker - wrap run.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' - wrap env.sh --run 'cd $RUNNER_ROOT' - - wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \ - --run 'mkdir -p $RUNNER_ROOT' \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ - --chdir $out + export RUNNER_ROOT="$TMPDIR" + + $out/bin/config.sh --help >/dev/null + $out/bin/Runner.Listener --help >/dev/null + + version=$($out/bin/Runner.Listener --version) + if [[ "$version" != "${version}" ]]; then + printf 'Unexpected version %s' "$version" + exit 1 + fi + + commit=$($out/bin/Runner.Listener --commit) + if [[ "$commit" != "$(git rev-parse HEAD)" ]]; then + printf 'Unexpected commit %s' "$commit" + exit 1 + fi + + runHook postInstallCheck ''; - # Script to create deps.nix file for dotnet dependencies. Run it with - # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file - # - # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument. - # - # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix - passthru.createDepsFile = writeShellApplication { - name = "create-deps-file"; - runtimeInputs = [ coreutils dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ]; - text = '' - # Disable telemetry data - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")" - - printf "\n* Setup workdir\n" - workdir="$(mktemp -d /tmp/${pname}.XXX)" - HOME="$workdir"/.fake-home - cp -rT "${src}" "$workdir" - chmod -R +w "$workdir" - trap 'rm -rf "$workdir"' EXIT - - pushd "$workdir" - - mkdir nuget_pkgs - - ${lib.concatMapStrings (rid: '' - printf "\n* Restore ${pname} (${rid}) dotnet project\n" - dotnet restore src/ActionsRunner.sln --packages nuget_pkgs --no-cache --force --runtime "${rid}" - '') (lib.attrValues runtimeIds)} - - printf "\n* Make %s file\n" "$(basename "$deps_file")" - nuget-to-nix "$workdir/nuget_pkgs" "${dotnetSdk.packages}" > "$deps_file" - printf "\n* Dependency file writen to %s" "$deps_file" - ''; + passthru = { + tests.smoke-test = nixosTests.github-runner; + updateScript = ./update.sh; }; meta = with lib; { + changelog = "https://github.com/actions/runner/releases/tag/v${version}"; description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; - platforms = attrNames runtimeIds; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 8a6fb8de943..caa00cad9af 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch deleted file mode 100644 index a2599afe447..00000000000 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5a850bb7946ce5c0620ac5f072d93a77cc064219 Mon Sep 17 00:00:00 2001 -From: Aaron Andersen <aaron@fosslib.net> -Date: Thu, 29 Sep 2022 10:12:28 -0400 -Subject: [PATCH] [PATCH] Patch dir.proj - -Don't execute Git for GitInfoCommitHash property -Don't restore for build target -Don't restore for test target ---- - src/dir.proj | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/dir.proj b/src/dir.proj -index 056a312..f029720 100644 ---- a/src/dir.proj -+++ b/src/dir.proj -@@ -2,9 +2,6 @@ - <Project ToolsVersion="14.0" DefaultTargets="Build" - xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="GenerateConstant"> -- <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true"> -- <Output TaskParameter="ConsoleOutput" PropertyName="GitInfoCommitHash" /> -- </Exec> - <Message Text="Building $(Product): $(GitInfoCommitHash) --- $(PackageRuntime)" Importance="high"/> - - <ItemGroup> -@@ -41,14 +38,13 @@ - </ItemGroup> - - <Target Name="Build" DependsOnTargets="GenerateConstant"> -- <MSBuild Targets="Restore" Projects="@(ProjectFiles)" StopOnFirstFailure="true" /> - <MSBuild Targets="Publish" Projects="@(ProjectFiles)" BuildInParallel="false" StopOnFirstFailure="true" Properties="Configuration=$(BUILDCONFIG);PackageRuntime=$(PackageRuntime);Version=$(RunnerVersion);RuntimeIdentifier=$(PackageRuntime);PublishDir=$(MSBuildProjectDirectory)/../_layout/bin" /> - <Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" /> - </Target> - - <Target Name="Test" DependsOnTargets="GenerateConstant"> -- <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" /> -- <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" /> -+ <Exec Command="dotnet build Test/Test.csproj --no-restore -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" /> -+ <Exec Command="dotnet test Test/Test.csproj --no-restore -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" /> - </Target> - - <Target Name="Layout" DependsOnTargets="Clean;Build"> --- -2.36.2 diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch index 6279a4ecb4b..5590fa3df02 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch @@ -1,11 +1,21 @@ +From 369b3d98b44abbf061080ab1b17b22f99706ef69 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert <mail@vincent-haupert.de> +Date: Sun, 26 Feb 2023 12:55:38 +0100 +Subject: [PATCH] Don't generate service config on Linux and OSX + +--- + src/Runner.Listener/Configuration/ConfigurationManager.cs | 5 ----- + 1 file changed, 5 deletions(-) + diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs -index 8d08b06..bdfa3a2 100644 +index 392eb0e..4c75324 100644 --- a/src/Runner.Listener/Configuration/ConfigurationManager.cs +++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs -@@ -320,10 +320,6 @@ namespace GitHub.Runner.Listener.Configuration +@@ -367,11 +367,6 @@ namespace GitHub.Runner.Listener.Configuration + var serviceControlManager = HostContext.GetService<IWindowsServiceControlManager>(); serviceControlManager.ConfigureService(runnerSettings, command); } - +- -#elif OS_LINUX || OS_OSX - // generate service config script for OSX and Linux, GenerateScripts() will no-opt on windows. - var serviceControlManager = HostContext.GetService<ILinuxServiceControlManager>(); @@ -13,3 +23,6 @@ index 8d08b06..bdfa3a2 100644 #endif } +-- +2.38.1 + diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch new file mode 100644 index 00000000000..d87e00d0f34 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch @@ -0,0 +1,76 @@ +From 84b2fcdf042771ae8adc0f59f1a3ecd9788a808d Mon Sep 17 00:00:00 2001 +From: Vincent Haupert <mail@vincent-haupert.de> +Date: Sun, 26 Feb 2023 11:37:01 +0100 +Subject: [PATCH] Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set + +--- + src/Misc/layoutbin/runsvc.sh | 4 ++-- + src/Misc/layoutroot/env.sh | 10 +++++----- + src/Runner.Listener/Program.cs | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/Misc/layoutbin/runsvc.sh b/src/Misc/layoutbin/runsvc.sh +index c135645..bb0fbf6 100755 +--- a/src/Misc/layoutbin/runsvc.sh ++++ b/src/Misc/layoutbin/runsvc.sh +@@ -4,9 +4,9 @@ + # for more info on how to propagate SIGTERM to a child process see: http://veithen.github.io/2014/11/16/sigterm-propagation.html + trap 'kill -INT $PID' TERM INT + +-if [ -f ".path" ]; then ++if [ -f "${RUNNER_ROOT:-"."}/.path" ]; then + # configure +- export PATH=`cat .path` ++ export PATH=`cat "${RUNNER_ROOT:-"."}/.path"` + echo ".path=${PATH}" + fi + +diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh +index 641d244..85379bf 100755 +--- a/src/Misc/layoutroot/env.sh ++++ b/src/Misc/layoutroot/env.sh +@@ -16,10 +16,10 @@ varCheckList=( + + envContents="" + +-if [ -f ".env" ]; then +- envContents=`cat .env` ++if [ -f "${RUNNER_ROOT:-"."}/.env" ]; then ++ envContents=`cat "${RUNNER_ROOT:-"."}/.env"` + else +- touch .env ++ touch "${RUNNER_ROOT:-"."}/.env" + fi + + function writeVar() +@@ -29,12 +29,12 @@ function writeVar() + if test "${envContents#*$checkDelim}" = "$envContents" + then + if [ ! -z "${!checkVar}" ]; then +- echo "${checkVar}=${!checkVar}">>.env ++ echo "${checkVar}=${!checkVar}">>"${RUNNER_ROOT:-"."}/.env" + fi + fi + } + +-echo $PATH>.path ++echo $PATH>"${RUNNER_ROOT:-"."}/.path" + + for var_name in ${varCheckList[@]} + do +diff --git a/src/Runner.Listener/Program.cs b/src/Runner.Listener/Program.cs +index d4d5e43..beacc9d 100644 +--- a/src/Runner.Listener/Program.cs ++++ b/src/Runner.Listener/Program.cs +@@ -148,7 +148,7 @@ namespace GitHub.Runner.Listener + private static void LoadAndSetEnv() + { + var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); +- var rootDir = new DirectoryInfo(binDir).Parent.FullName; ++ var rootDir = Environment.GetEnvironmentVariable("RUNNER_ROOT") ?? new DirectoryInfo(binDir).Parent.FullName; + string envFile = Path.Combine(rootDir, ".env"); + if (File.Exists(envFile)) + { +-- +2.38.1 + diff --git a/pkgs/development/tools/continuous-integration/github-runner/update.sh b/pkgs/development/tools/continuous-integration/github-runner/update.sh new file mode 100755 index 00000000000..3ebbfa9f507 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/update.sh @@ -0,0 +1,19 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p coreutils common-updater-scripts jq curl + +set -euo pipefail + +currentVersion="$(nix --extra-experimental-features nix-command eval -f . github-runner.version --raw)" +latestVersion="$(curl -s -H "Accept: application/vnd.github.v3+json" \ + ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + "https://api.github.com/repos/actions/runner/releases/latest" | jq -r ".tag_name")" +latestVersion="${latestVersion#?}" # v2.296.2 -> 2.296.2 + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "github-runner is already up to date: $currentVersion" + exit +fi + +update-source-version github-runner "$latestVersion" +$(nix-build -A github-runner.fetch-deps --no-out-link) "$(dirname "$BASH_SOURCE")/deps.nix" + diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 29d9412137a..9a101323fb3 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.8.2"; + version = "15.9.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-YHBp6Grm+atGne/5Ia/1H2xQRODmfWsMGCqHAIE9P4k="; + vendorHash = "sha256-3PtbUVIRCyBBqbfbntOUHBd9p+DWMQt4w+C8enqNiAA="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE="; + sha256 = "sha256-wdeH1/1FNG1vwmSmXo7KjhxfQTmQk9lNAxVNoUKlLi4="; }; patches = [ diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 2d34a706ee5..3374d4ee7fa 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.1.0-M7"; + version = "2.1.0-RC6"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-ZKltN/m4ZyOr98k5z4HfPh6jbRUM6MIew+NWo7UAz9o="; + sha256 = "0b52qp0jb2bhb649r6cca0yd1cj8wsyp0f1j3pnmir6rizjwkm5q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 81c53082b7e..0ddb6d13a4d 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { description = "Tool for easy ClickHouse backup and restore with cloud storages support"; homepage = "https://github.com/AlexAkulov/clickhouse-backup"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 211b20871ea..90e0613ac07 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "15.0.2"; + version = "16.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-NkJqJYmUf92QiPazxRWNsxZh0Pvc73l35hP1gmk4Fv0="; + hash = "sha256-Gvk608nM7Uiazuf9qzmd0uzBP4vPSQfkpAWvnSeWm84="; }; - vendorHash = "sha256-+yCznSxv0EWoKiQIgFEQ/iUxrlQ5A1HYNkoMiRDG3ik="; + vendorHash = "sha256-3GqEMoFYm0TZihoPINf8mwCl3Ky6Lt+LxueYLoFDj2g="; buildInputs = [ sqlite ]; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index bc0eb9332c0..83e9d2d9877 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.27"; + version = "1.8.33"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-52xAm0D8yzUPvox1byHcyUTg8mILakOnVh8q0a2yR1M="; + hash = "sha256-pyu8umkR8ncDVkSLJbxqnLFRlZQR29GnkCSxDNHQUGg="; }; vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 3bacd85ced6..d83e6048d99 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-p138Jg5jqflabroaBy3Dj9K9cif0tcM7r9dluf4tsH4="; + sha256 = "sha256-pY4rgval017KX2I7ZNbvEbqRAqluC7rS3VzYJos7C94="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index da630f0d1cf..2aa8a7c13a9 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.3.4"; + version = "0.4.2"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-Wm8IpXmxBm6Ifh7fV9viKAfIC8BdjN1prpUyeI9eNXE="; + hash = "sha256-9aGmX21TUINGDA3NB/OrGXi8W4i+b8fKS8ft8GtQxNM="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-5uh1G+puVVG0A1d+R4pZfbv63zyB86ihBjzoT63Xf1s="; + vendorHash = "sha256-62cJVlrGdrBSK+yzOA4WiHvplEMuKo09qp95+aX3WY0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/development/tools/dockfmt/default.nix index d637b8ca3e5..18dfed5f2fb 100644 --- a/pkgs/development/tools/dockfmt/default.nix +++ b/pkgs/development/tools/dockfmt/default.nix @@ -5,13 +5,14 @@ buildGoModule rec { pname = "dockfmt"; - version = "0.3.3"; + version = "unstable-2020-09-18"; + # The latest released version doesn't support reading from stdin. src = fetchFromGitHub { owner = "jessfraz"; repo = "dockfmt"; - rev = "v${version}"; - sha256 = "0m56ydmf7zbcsa5yym7j5fgr75v677h9s40zyzwrqccyq01myp06"; + rev = "1455059b8bb53ab4723ef41946c43160583a8333"; + hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg="; }; vendorSha256 = null; @@ -25,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Dockerfile format"; homepage = "https://github.com/jessfraz/dockfmt"; - license = [ licenses.mit ]; - maintainers = [ maintainers.cpcloud ]; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix deleted file mode 100644 index 20e1ed136e2..00000000000 --- a/pkgs/development/tools/dt-schema/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, git -, ruamel-yaml -, jsonschema -, rfc3987 -, setuptools -, setuptools-scm -}: - -buildPythonPackage rec { - pname = "dtschema"; - version = "2022.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-G5KzuaMbbkuLK+cNvzBld1UwvExS6ZGVW2e+GXQRFMU="; - }; - - nativeBuildInputs = [ setuptools-scm git ]; - propagatedBuildInputs = [ - setuptools - ruamel-yaml - jsonschema - rfc3987 - ]; - - meta = with lib; { - description = "Tooling for devicetree validation using YAML and jsonschema"; - homepage = "https://github.com/devicetree-org/dt-schema/"; - # all files have SPDX tags - license = with licenses; [ bsd2 gpl2 ]; - maintainers = with maintainers; [ sorki ]; - }; -} - diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 3845f18c351..fae82784e45 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.10"; + version = "0.17.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-qe7YCOIwp+MSa5VkwImdOea1aMcpWdor/13PIgGEkkw="; + hash = "sha256-k7bXEDAmxyn2u/cniqKtr9zbrWnzwbhTZkL35/igctM="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index 702c90d36a5..8e9ec550a21 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fnlfmt"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg="; + sha256 = "sha256-Q7nQjmEHwdu3qRdLK68aKg7es5okVz9FCoR7INzh/xk="; }; nativeBuildInputs = [ luaPackages.fennel ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 956f5dca4ff..67ff6886225 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -1,21 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }: buildGoModule rec { pname = "ginkgo"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-V10AFqCCe+SQeMQ+bBYqrKE/wSxyhpMQg+rNOH5P1e4="; + sha256 = "sha256-GzsdcL5XwnT+NnEZbr8jJNx0vZEaw0TPTCO4Rf1C/2A="; }; - vendorHash = "sha256-CNpmcQ623ZINYKwV0ZJi7KuEwzyGOM7t9OOCTx7JKDs="; + vendorHash = "sha256-Ei9U5S/jBOtQS/Y0GQX0ZknkHQGJFfc5U8eVvofxpOo="; # integration tests expect more file changes # types tests are missing CodeLocation excludedPackages = [ "integration" "types" ]; + __darwinAllowLocalNetworking = true; + + passthru.tests.version = testers.testVersion { + package = ginkgo; + command = "ginkgo version"; + }; + meta = with lib; { homepage = "https://onsi.github.io/ginkgo/"; changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 2c1a78fec0f..96de13ace3e 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RXKJJseRrwSTReMAkFjShKvCWGMowruYwsCovHwq4ZQ="; + sha256 = "sha256-bGLJSzSwcoKRMRwLSmGEWoQaC9NVwcKyFKpcEw+/Nag="; }; - vendorSha256 = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; + vendorHash = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index d0c85be4733..e3cc35ef90a 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -53,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-rc1"; + version = "4.0-stable"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "c4fb119f03477ad9a494ba6cdad211b35a8efcce"; - hash = "sha256-YJrm3or4QSzs+MDc06gY6TvUtWRgLST8RkdsomY8lZk="; + rev = version; + hash = "sha256-BaSIHTV7LFV5VqjW+q7u/t/DR6JS6vxfREab6EdKYPU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index e1690aea4d1..3fd6f7dacfe 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.11"; + version = "0.12.12"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - hash = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; + hash = "sha256-axiIHy6vNs0ySVP4UnYZ9J+GeAOz3LJ9vOP1xT4dcME="; }; - vendorHash = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; + vendorHash = "sha256-kHwCh/6yaPaFce5k3NgAQ1GsoVmvmfIJujVaMwqrLBM="; ldflags = [ "-s" "-w" ]; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Pure Go implementation of jq"; homepage = "https://github.com/itchyny/gojq"; + changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ aaronjheng ]; }; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index ada936ed540..0587a3e1d91 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gomplate"; - version = "3.11.3"; - owner = "hairyhenderson"; - rev = "v${version}"; + version = "3.11.4"; src = fetchFromGitHub { - inherit owner rev; + owner = "hairyhenderson"; repo = pname; - sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw="; + rev = "refs/tags/v${version}"; + hash = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4="; }; - vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc="; + vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg="; postPatch = '' # some tests require network access @@ -32,13 +34,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" + "-X github.com/${src.owner}/${pname}/v3/version.Version=${version}" ]; meta = with lib; { description = "A flexible commandline tool for template rendering"; homepage = "https://gomplate.ca/"; - maintainers = with maintainers; [ ris jlesquembre ]; + changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ris jlesquembre ]; }; } diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index 912670a432a..ff31689dcc5 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-o1a7AjaynFejq2ePF6ewJ6rWA7CWDBg6GPH+Mi5POOo="; + sha256 = "sha256-goGaLF9wZ3EuAjNmG4ZMHANPZlfWO45xi0pQ45qwKPY="; }; dontUnpack = true; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 50a496d9382..7f6b0440b94 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -13,13 +13,13 @@ crystal.buildCrystalPackage rec { pname = "icr"; - version = "unstable-2021-03-14"; + version = "0.9.0"; src = fetchFromGitHub { owner = "crystal-community"; repo = "icr"; - rev = "b6b335f40aff4c2c07d21250949935e8259f7d1b"; - sha256 = "sha256-Qoy37lCdHFnMAuuqyB9uT15/RLllksFyApYAGy+RmDs="; + rev = "v${version}"; + hash = "sha256-29B/i8oEjwNOYjnc78QcYTl6fC/M9VfAVCCBjLBKp0Q="; }; shardsFile = ./shards.nix; diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/development/tools/icr/shards.nix index 1dddd5a42c3..8f880fa9a6f 100644 --- a/pkgs/development/tools/icr/shards.nix +++ b/pkgs/development/tools/icr/shards.nix @@ -1,7 +1,6 @@ { readline = { - owner = "crystal-lang"; - repo = "crystal-readline"; + url = "https://github.com/crystal-lang/crystal-readline.git"; rev = "0fb7d186da8e1b157998d98d1c96e99699b791eb"; sha256 = "1rk27vw3ssldgnfgprwvz2gag02v4g6d6yg56b3sk9w3fn8jyyi8"; }; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 53d76983779..f76c120b87f 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.103.2"; + version = "0.104.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-lG2ABjhVGa+Cj7wkWq8u/uCNki+QgF4pX8+0ZdamB00="; + sha256 = "sha256-rqsmhCeVhlm/qnz3lDKCUenfkvnkI/Gsysh2hF02cIQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index b48de54dd22..c4c89177811 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -1,19 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, jid }: -buildGoPackage rec { +buildGoModule rec { pname = "jid"; version = "0.7.6"; - goPackagePath = "github.com/simeji/jid"; - src = fetchFromGitHub { owner = "simeji"; repo = "jid"; rev = "v${version}"; - sha256 = "15fgi7cpq5bg2lnpr7rip359xwj2kvlj6j2qzi837c26adnw973x"; + hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-Lq8ouTjPsGhqDwrCMpqkSU7FEGszYwAkwl92vAEZ68w="; + + patches = [ + # Run go mod tidy + ./go-mod.patch + ]; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = jid; + version = "v${version}"; + }; meta = { description = "A command-line tool to incrementally drill down JSON"; diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix deleted file mode 100644 index 6e2d5514a83..00000000000 --- a/pkgs/development/tools/jid/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "v0.5.0"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed"; - sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; - }; - } - { - goPackagePath = "github.com/nwidger/jsoncolor"; - fetch = { - type = "git"; - url = "https://github.com/nwidger/jsoncolor"; - rev = "75a6de4340e5"; - sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] diff --git a/pkgs/development/tools/jid/go-mod.patch b/pkgs/development/tools/jid/go-mod.patch new file mode 100644 index 00000000000..beca79fff86 --- /dev/null +++ b/pkgs/development/tools/jid/go-mod.patch @@ -0,0 +1,79 @@ +diff --git a/go.mod b/go.mod +index d26c293..3276f36 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,12 +1,24 @@ + module github.com/simeji/jid + ++go 1.19 ++ + require ( + github.com/bitly/go-simplejson v0.5.0 +- github.com/fatih/color v1.7.0 // indirect +- github.com/mattn/go-colorable v0.0.9 // indirect +- github.com/mattn/go-isatty v0.0.4 // indirect + github.com/mattn/go-runewidth v0.0.4 + github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 + github.com/pkg/errors v0.8.0 ++ github.com/stretchr/testify v1.8.2 ++) ++ ++require ( ++ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/fatih/color v1.7.0 // indirect ++ github.com/kr/pretty v0.3.1 // indirect ++ github.com/mattn/go-colorable v0.0.9 // indirect ++ github.com/mattn/go-isatty v0.0.4 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ golang.org/x/sys v0.5.0 // indirect ++ gopkg.in/yaml.v3 v3.0.1 // indirect + ) +diff --git a/go.sum b/go.sum +index 2fb379f..07d786d 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,7 +1,17 @@ + github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= + github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= ++github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= ++github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= + github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= ++github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= ++github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= ++github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= ++github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= + github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= + github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= + github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= +@@ -12,5 +22,24 @@ github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed h1:bAVGG6B+R5qpSylr + github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 h1:d+C3xJdxZT7wNlxqEwbXn3R355CwAhYBL9raVNfSnK0= + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5/go.mod h1:GYFm0zZgTNeoK1QxuIofRDasy2ibmaJZhZLzwsMXUF4= ++github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= + github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= ++github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= ++github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= ++github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= ++github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= ++github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= ++github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= ++golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= ++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= ++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= ++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 04b5fd6e1e0..23946af16f6 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.11"; + version = "3.6.13"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M="; + sha256 = "sha256-9TFTmTjj6FfPTfcgnQaHFYUtoM1VUMSpD7Yxk/Oeul0="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 66488a607fd..8c01c6ee20d 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.7"; + version = "0.8.1"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-1GoZbeXNG00oxBdPa2yk0aOCVguwIkK6fKrlHU6mZYc="; + hash = "sha256-yIOb6AeEpIbKarY4I0X4zq5Gtrv05QLrDlFaBD3x6rw="; }; - cargoHash = "sha256-arIFWJX8WQQWcJP1YpMwFy2XHU/0w+oPj1qE/IlYRF4="; + cargoHash = "sha256-DIRs+xhcdV74NFjsB1jJYgd8Cu/BmAUcBf58rGAp/yo="; postPatch = '' rm .cargo/config.toml @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A language server for Standard ML"; homepage = "https://github.com/azdavis/millet"; - changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; + changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/CHANGELOG.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; mainProgram = "millet-ls"; diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index ee26e81e889..866293aba8b 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-02-03"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ="; + hash = "sha256-HGd/TV8ZHVAVBx+ndrxAfS/Nz+VHOQjNWjtKkkgYkqA="; }; - cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k="; + cargoHash = "sha256-A6Go1OYAaoDvQtAcK5BL5Tz00iLPOft0VLH6usWtb9g="; CFG_RELEASE = version; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 3894dcd2c6e..563a2e7fd33 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.5"; + version = "3.8.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-u7Hwj/RYE8pZkIVulJrwdC1kxhTGl3P5DEug6v5lMvg="; + sha256 = "sha256-hnECB/tqyEN0g3WIIEHg2uAzEmspB+TQUTECyOtUNy4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 967f62d7c9c..10a0281b075 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -101,6 +101,9 @@ stdenv.mkDerivation (finalAttrs: { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) + # This patch fixes a bug in 2.40 on MinGW, which breaks DXVK when cross-building from Darwin. + # See https://sourceware.org/bugzilla/show_bug.cgi?id=30079 + ++ lib.optional stdenv.targetPlatform.isMinGW ./mingw-abort-fix.patch ; outputs = [ "out" "info" "man" "dev" ] diff --git a/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch b/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch new file mode 100644 index 00000000000..b322d6ad7cd --- /dev/null +++ b/pkgs/development/tools/misc/binutils/mingw-abort-fix.patch @@ -0,0 +1,30 @@ +From b7eab2a9d4f4e92692daf14b09fc95ca11b72e30 Mon Sep 17 00:00:00 2001 +From: Michael Matz <matz@suse.de> +Date: Thu, 9 Feb 2023 15:29:00 +0100 +Subject: [PATCH 1/1] Fix PR30079: abort on mingw + +the early-out in wild_sort is not enough, it might still be +that filenames are equal _and_ the wildcard list doesn't specify +a sort order either. Don't call compare_section then. + +Tested on all targets. +--- + ld/ldlang.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ld/ldlang.c b/ld/ldlang.c +index 84a2914fc26..b5e0d026ae4 100644 +--- a/ld/ldlang.c ++++ b/ld/ldlang.c +@@ -649,7 +649,8 @@ wild_sort (lang_wild_statement_type *wild, + looking at the sections for this file. */ + + /* Find the correct node to append this section. */ +- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0) ++ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none ++ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0) + tree = &((*tree)->left); + else + tree = &((*tree)->right); +-- +2.31.1 diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index ddc8f596c72..25177a7cddd 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2023.01.26-11.08.16"; + version = "2023.02.27-13.12.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-1dbeS9yF+qjmwDyfELQhlEyAI5B8092Lg0SwqvqXPgc="; + sha256 = "sha256-QyXmjszXBBUFOAZTNgUYIWWv2v7v/QbsAglRjF0Frfo="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "7fe2f384233d5101483803f72d995b75cf3587eae10dc954989018c2accf711b"; + sha256 = "828339a66ad23692c71ca62a720ac036e4acdef90769a2cce588e89ed8ea9c36"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/misc/patchelf/patches/380.patch b/pkgs/development/tools/misc/patchelf/patches/380.patch deleted file mode 100644 index 6811550bb03..00000000000 --- a/pkgs/development/tools/misc/patchelf/patches/380.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8db45c6a0c1a4dbbd492ac7fb59c1bca9460fe3e Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 21:45:22 -0700 -Subject: [PATCH 1/3] elf.h: resynchronize with glibc elf.h - -This commit adds two symbols (SHT_MIPS_XHASH and DT_MIPS_XHASH) found -in glibc, and updates the value of DT_MIPS_NUM. These changes were -made to glibc in 23c1c256ae7b0f010d0fcaff60682b620887b164 on -29-Aug-2019. ---- - src/elf.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/elf.h b/src/elf.h -index b3e567c3..702f2e60 100644 ---- a/src/elf.h -+++ b/src/elf.h -@@ -1400,6 +1400,7 @@ typedef struct - #define SHT_MIPS_EH_REGION 0x70000027 - #define SHT_MIPS_XLATE_OLD 0x70000028 - #define SHT_MIPS_PDR_EXCEPTION 0x70000029 -+#define SHT_MIPS_XHASH 0x7000002b - - /* Legal values for sh_flags field of Elf32_Shdr. */ - -@@ -1647,7 +1648,9 @@ typedef struct - in a PIE as it stores a relative offset from the address of the tag - rather than an absolute address. */ - #define DT_MIPS_RLD_MAP_REL 0x70000035 --#define DT_MIPS_NUM 0x36 -+/* GNU-style hash table with xlat. */ -+#define DT_MIPS_XHASH 0x70000036 -+#define DT_MIPS_NUM 0x37 - - /* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ - - -From 820da7be8d1e1a49c4831dcb3800ed3b9f11e8a6 Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 21:49:14 -0700 -Subject: [PATCH 2/3] patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash - -glibc changed their ABI in commit -23c1c256ae7b0f010d0fcaff60682b620887b164 on 2019-Aug-29, by changing -the structure of the .gnu.hash data on MIPS and moving it to a -different section. We need to adapt to this change by glibc. - -Closes #368 ---- - src/patchelf.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 6882b288..08585139 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -990,6 +990,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) - // some binaries might this section stripped - // in which case we just ignore the value. - if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr; -+ } else if (d_tag == DT_MIPS_XHASH) { -+ // the .MIPS.xhash section was added to the glibc-ABI -+ // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164 -+ dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr; - } else if (d_tag == DT_JMPREL) { - auto shdr = tryFindSectionHeader(".rel.plt"); - if (!shdr) shdr = tryFindSectionHeader(".rela.plt"); - -From 7b155fda3105ceca5643cacbdd4207c4c4c59cf5 Mon Sep 17 00:00:00 2001 -From: Adam Joseph <adam@westernsemico.com> -Date: Sat, 18 Jun 2022 22:44:04 -0700 -Subject: [PATCH 3/3] formatting: fix incorrect indentation in previous commit - ---- - src/patchelf.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 08585139..402b2bed 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -990,7 +990,7 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) - // some binaries might this section stripped - // in which case we just ignore the value. - if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr; -- } else if (d_tag == DT_MIPS_XHASH) { -+ } else if (d_tag == DT_MIPS_XHASH) { - // the .MIPS.xhash section was added to the glibc-ABI - // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164 - dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 3ea0e1f05a2..d27c0680761 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-7J9BEJ43mNbz6vjeN7Ygn/z+DOp8aGGZI9FhRALFOUk="; + sha256 = "sha256-+xgh/al6954I+DseSHk9k7Rbj0TzQxCtX4X3pbQmoG0="; }; - vendorSha256 = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y="; + vendorHash = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y="; doCheck = false; diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index e4af4f24e19..4d162946226 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.47"; + version = "0.1.55"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; + sha256 = "sha256-+0+d0XZhZeRTAXRvA3QcWvbuOqlhNbFo2gTnROevJtU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 7c305012c57..06d2323af7c 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, darwin }: +{ lib, stdenv, fetchurl, ocaml, findlib, darwin, ocaml-lsp }: if lib.versionOlder ocaml.version "4.08" then throw "dune 3 is not available for OCaml ${ocaml.version}" @@ -6,17 +6,17 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-ttSrhI77BKoqMl0AFdMu1EFO1xMOx6oS+YFY7/RFzzw="; + sha256 = "sha256-4tY3ydCAMY/t9ecdKin7NnYk+CrEom6D3ys6A1UFKLg="; }; nativeBuildInputs = [ ocaml findlib ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.CoreServices ]; strictDeps = true; @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + passthru.tests = { + inherit ocaml-lsp; + }; + meta = { homepage = "https://dune.build/"; description = "A composable build system"; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index d83d5ef6f11..0fc95065946 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.9.1"; + version = "14.9.2"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oWif17MawHKiFRts9wfLA7XcSLMuogaPLziYzgKihas="; + hash = "sha256-9ZIMAJVVrJk8ny3TgwXHSxrg713dSbPlgQnY/b0m2Ps="; }; vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index b9f549693df..f726e0ad695 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, okteto }: buildGoModule rec { pname = "okteto"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-5HAXcFD53VJ+OpmpStKIazoqztAyeqsdRfJy0ctocEk="; + hash = "sha256-0fgxDUCgjYzrWflsoCGe4WRy3C/NO7FmrSw/LJ/NiUE="; }; - vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; + vendorHash = "sha256-d5z6uuUOHUjARIiRTVJmdQ+9VBaercIcUrcgDsN1zCs="; postPatch = '' # Disable some tests that need file system & network access. @@ -40,6 +40,11 @@ buildGoModule rec { --zsh <($out/bin/okteto completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = okteto; + command = "HOME=$(mktemp -d) okteto version"; + }; + meta = with lib; { description = "Develop your applications directly in your Kubernetes Cluster"; homepage = "https://okteto.com/"; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 9704788141c..22e7116fb6c 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: +{ lib, stdenv, perlPackages, fetchFromGitHub, fetchpatch, shortenPerlShebang }: perlPackages.buildPerlPackage rec { pname = "pgformatter"; @@ -18,6 +18,14 @@ perlPackages.buildPerlPackage rec { # Avoid creating perllocal.pod, which contains a timestamp installTargets = [ "pure_install" ]; + patches = [ + # Fix an uninitialized variable error. Remove with the next release. + (fetchpatch { + url = "https://github.com/darold/pgFormatter/commit/c2622c47d48cee47effecbf58a588c3cd3a7bf1a.patch"; + sha256 = "sha256-WnQIOvfuzL2HrwtL0HaaYObrBxhXDu82jxGcqggQVhc="; + }) + ]; + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 42eec2fa4c9..e6798260f94 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.129.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-GdJyOZ0FqLBRGeQZ5+qLYXLL8JxqigYCVuDUUs1KbN4="; + sha256 = "sha256-rrrjIyIMoCshq348bUBGzMcwYhEZMt1OA/pOoE4PEY8="; }; - vendorHash = "sha256-iXT+xvmVDfFVV/bYq+hnmkz2ODUQ4fHR8z2lcaK93TE="; + vendorHash = "sha256-shs05gXqLjp+L3t5f7oh0BV8YRPtcoCzrTlmx1tOvP0="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 2e5400c1cdc..6b80dae38a5 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -19,15 +19,15 @@ }: let - buildNum = "2022-12-12-1037"; + buildNum = "2023-02-15-1051"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rgp"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-T13SOy+77lLxmlcczXEFZAnyx9Lm52G/WiCcC1Py4HA="; + hash = "sha256-1JxW6vXfOYDaCnHWEq8crjuu0QrUCwahm+ipOKVDQPA="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index f8468d1f175..cef70f62ab6 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "richgo"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-a8CxJKk9fKGYTDtY/mU/3gcdIeejg20sL8Tm4ozgDl4="; + sha256 = "sha256-pOB1exuwGwSxStodKhLLwh1xBvLjopUn0k+sEARdA9g="; }; - vendorSha256 = "sha256-j2RZOt5IRb2oEQ6sFu+nXpVkDsnppA6h9YT4F7AiCoY="; + vendorHash = "sha256-jIzBN5T5+eTFCYOdS5hj3yTGOfU8NTrFmnIu+dDjVeU="; meta = with lib; { description = "Enrich `go test` outputs with text decorations"; diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 5144ecb38e8..91852f75166 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -3,32 +3,46 @@ , fetchFromGitHub , perl , rustPlatform +, darwin +, stdenv }: rustPlatform.buildRustPackage rec { pname = "rover"; - version = "0.5.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wBHMND/xpm9o7pkWMUj9lEtEkzy3mX+E4Dt7qDn6auY="; + sha256 = "sha256-Ei6EeM0+b3EsMoRo38nHO79onT9Oq/cfbiCZhyDYQrc="; }; - cargoSha256 = "sha256-n0R2MdAYGsOsYt4x1N1KdGvBZYTALyhSzCGW29bnFU4="; + cargoSha256 = "sha256-+iDU8LPb7P4MNQ8MB5ldbWq4wWRcnbgOmSZ93Z//5O0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + ]; nativeBuildInputs = [ perl ]; - # The rover-client's build script (crates/rover-client/build.rs) will try to + # This test checks whether the plugins specified in the plugins json file are + # valid by making a network call to the repo that houses their binaries; but, the + # build env can't make network calls (impurity) + cargoTestFlags = [ + "-- --skip=latest_plugins_are_valid_versions" + ]; + + # The rover-client's build script (xtask/src/commands/prep/schema.rs) will try to # download the API's graphql schema at build time to our read-only filesystem. # To avoid this we pre-download it to a location the build script checks. preBuild = '' - mkdir crates/rover-client/.schema - cp ${./schema}/etag.id crates/rover-client/.schema/ - cp ${./schema}/schema.graphql crates/rover-client/.schema/ + cp ${./schema}/hash.id crates/rover-client/.schema/ + cp ${./schema}/etag.id crates/rover-client/.schema/ + cp ${./schema}/schema.graphql crates/rover-client/.schema/ ''; passthru.updateScript = ./update.sh; @@ -41,10 +55,9 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A CLI for managing and maintaining graphs with Apollo Studio"; + description = "A CLI for interacting with ApolloGraphQL's developer tooling, including managing self-hosted and GraphOS graphs."; homepage = "https://www.apollographql.com/docs/rover"; license = licenses.mit; - maintainers = [ maintainers.ivanbrennan ]; - platforms = ["x86_64-linux"]; + maintainers = [ maintainers.ivanbrennan maintainers.aaronarinder ]; }; } diff --git a/pkgs/development/tools/rover/schema/etag.id b/pkgs/development/tools/rover/schema/etag.id index a8b9f0cece3..59331ac0df6 100644 --- a/pkgs/development/tools/rover/schema/etag.id +++ b/pkgs/development/tools/rover/schema/etag.id @@ -1 +1 @@ -2694c7b893d44c9ad8f5d7161116deb9985a6bd05e8e0cdcd7379947430e6f89 +d35f8c48cb89329f33656944fa9e997de1e778b043b9ca4d78c8accdecfd9046 diff --git a/pkgs/development/tools/rover/schema/hash.id b/pkgs/development/tools/rover/schema/hash.id new file mode 100644 index 00000000000..d730728cfa7 --- /dev/null +++ b/pkgs/development/tools/rover/schema/hash.id @@ -0,0 +1 @@ +ff145f12604d11312e6a2f8a61a3d226fcdb2ca79f6b7fbc24c5a22aa23ab1af diff --git a/pkgs/development/tools/rover/schema/schema.graphql b/pkgs/development/tools/rover/schema/schema.graphql index b20b21a91e4..8cc527f4f82 100644 --- a/pkgs/development/tools/rover/schema/schema.graphql +++ b/pkgs/development/tools/rover/schema/schema.graphql @@ -1,20 +1,319 @@ -"""An organization. Can have multiple members and graphs.""" type Account{auditLogExports:[AuditLogExport!]"""These are the roles that the account is able to use""" availableRoles:[UserPermission!]!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request -with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the -browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the -filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to -MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the account's avatar. Note that CORS is not enabled for these URLs. The size -argument is used for bandwidth reduction, and should be the size of the image as displayed in the -application. Apollo's media server will downscale larger images to at least the requested size, -but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String billingInfo:BillingInfo companyUrl:String currentBillingMonth:BillingMonth currentPlan:BillingPlan!currentPlanV2:BillingPlanV2!currentSubscription:BillingSubscription currentSubscriptionV2:BillingSubscriptionV2 experimentalFeatures:AccountExperimentalFeatures!expiredTrialSubscription:BillingSubscription expiredTrialSubscriptionV2:BillingSubscriptionV2 graphIDAvailable(id:ID!):Boolean!hasBeenOnTrial:Boolean!hasBeenOnTrialV2:Boolean!"""Globally unique identifier, which isn't guaranteed stable (can be changed by administrators).""" id:ID!"""Internal immutable identifier for the account. Only visible to Apollo admins (because it really -shouldn't be used in normal client apps).""" internalID:ID!invitations(includeAccepted:Boolean!=false):[AccountInvitation!]invoices:[Invoice!]invoicesV2:[InvoiceV2!]!isOnExpiredTrial:Boolean!isOnTrial:Boolean!legacyIsOnTrial:Boolean!memberships:[AccountMembership!]"""Name of the organization, which can change over time and isn't unique.""" name:String!provisionedAt:Timestamp recurlyEmail:String """Returns a different registry related stats pertaining to this account.""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow requests(from:Timestamp!to:Timestamp!):Long requestsInCurrentBillingPeriod:Long roles:AccountRoles """How many seats would be included in your next bill, as best estimated today""" seatCountForNextBill:Int seats:Seats secondaryIDs:[ID!]!"""Graphs belonging to this organization.""" services(includeDeleted:Boolean):[Service!]!"""If non-null, this organization tracks its members through an upstream, eg PingOne; -invitations are not possible on SSO-synchronized account.""" sso:OrganizationSSO state:AccountState """A list of reusable invitations for the organization.""" staticInvitations:[OrganizationInviteLink!]stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):AccountStatsWindow!@deprecated(reason:"use Account.statsWindow instead")statsWindow(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):AccountStatsWindow subscriptions:[BillingSubscription!]subscriptionsV2:[BillingSubscriptionV2!]!"""Gets a ticket for this org, by id""" ticket(id:ID!):ZendeskTicket """List of Zendesk tickets submitted for this org""" tickets:[ZendeskTicket!]}"""Columns of AccountBillingUsageStats.""" enum AccountBillingUsageStatsColumn{OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountBillingUsageStatsDimensions{operationCountProvidedExplicitly:String schemaTag:String serviceId:ID}"""Filter for data in AccountBillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountBillingUsageStatsFilter{and:[AccountBillingUsageStatsFilter!]in:AccountBillingUsageStatsFilterIn not:AccountBillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[AccountBillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountBillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountBillingUsageStatsFilterIn{"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountBillingUsageStatsMetrics{operationCount:Long!}input AccountBillingUsageStatsOrderBySpec{column:AccountBillingUsageStatsColumn!direction:Ordering!}type AccountBillingUsageStatsRecord{"""Dimensions of AccountBillingUsageStats that can be grouped by.""" groupBy:AccountBillingUsageStatsDimensions!"""Metrics of AccountBillingUsageStats that can be aggregated over.""" metrics:AccountBillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountChecksStatsMetrics{totalFailedChecks:Long!totalSuccessfulChecks:Long!}type AccountChecksStatsRecord{id:ID!metrics:AccountChecksStatsMetrics!timestamp:Timestamp!}"""Columns of AccountEdgeServerInfos.""" enum AccountEdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID SERVICE_ID TIMESTAMP USER_VERSION}type AccountEdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID serviceId:ID userVersion:String}"""Filter for data in AccountEdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountEdgeServerInfosFilter{and:[AccountEdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:AccountEdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:AccountEdgeServerInfosFilter or:[AccountEdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in AccountEdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountEdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input AccountEdgeServerInfosOrderBySpec{column:AccountEdgeServerInfosColumn!direction:Ordering!}type AccountEdgeServerInfosRecord{"""Dimensions of AccountEdgeServerInfos that can be grouped by.""" groupBy:AccountEdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountErrorStats.""" enum AccountErrorStatsColumn{CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountErrorStatsDimensions{clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountErrorStatsFilter{and:[AccountErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:AccountErrorStatsFilterIn not:AccountErrorStatsFilter or:[AccountErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountErrorStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input AccountErrorStatsOrderBySpec{column:AccountErrorStatsColumn!direction:Ordering!}type AccountErrorStatsRecord{"""Dimensions of AccountErrorStats that can be grouped by.""" groupBy:AccountErrorStatsDimensions!"""Metrics of AccountErrorStats that can be aggregated over.""" metrics:AccountErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountExperimentalFeatures{auditLogs:Boolean!championDashboard:Boolean!federation2Preview:Boolean!preRequestPreview:Boolean!publicVariants:Boolean!variantHomepage:Boolean!webhooksPreview:Boolean!}"""Columns of AccountFieldExecutions.""" enum AccountFieldExecutionsColumn{ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldExecutionsDimensions{fieldName:String parentType:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldExecutions. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldExecutionsFilter{and:[AccountFieldExecutionsFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldExecutionsFilterIn not:AccountFieldExecutionsFilter or:[AccountFieldExecutionsFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldExecutions. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldExecutionsFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldExecutionsMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input AccountFieldExecutionsOrderBySpec{column:AccountFieldExecutionsColumn!direction:Ordering!}type AccountFieldExecutionsRecord{"""Dimensions of AccountFieldExecutions that can be grouped by.""" groupBy:AccountFieldExecutionsDimensions!"""Metrics of AccountFieldExecutions that can be aggregated over.""" metrics:AccountFieldExecutionsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountFieldLatencies.""" enum AccountFieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldLatenciesFilter{and:[AccountFieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldLatenciesFilterIn not:AccountFieldLatenciesFilter or:[AccountFieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input AccountFieldLatenciesOrderBySpec{column:AccountFieldLatenciesColumn!direction:Ordering!}type AccountFieldLatenciesRecord{"""Dimensions of AccountFieldLatencies that can be grouped by.""" groupBy:AccountFieldLatenciesDimensions!"""Metrics of AccountFieldLatencies that can be aggregated over.""" metrics:AccountFieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountFieldRequestsByClientVersion.""" enum AccountFieldRequestsByClientVersionColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldRequestsByClientVersionDimensions{clientName:String clientVersion:String fieldName:String parentType:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldRequestsByClientVersion. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldRequestsByClientVersionFilter{and:[AccountFieldRequestsByClientVersionFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldRequestsByClientVersionFilterIn not:AccountFieldRequestsByClientVersionFilter or:[AccountFieldRequestsByClientVersionFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldRequestsByClientVersion. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldRequestsByClientVersionFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldRequestsByClientVersionMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input AccountFieldRequestsByClientVersionOrderBySpec{column:AccountFieldRequestsByClientVersionColumn!direction:Ordering!}type AccountFieldRequestsByClientVersionRecord{"""Dimensions of AccountFieldRequestsByClientVersion that can be grouped by.""" groupBy:AccountFieldRequestsByClientVersionDimensions!"""Metrics of AccountFieldRequestsByClientVersion that can be aggregated over.""" metrics:AccountFieldRequestsByClientVersionMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountFieldUsage.""" enum AccountFieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldUsageFilter{and:[AccountFieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldUsageFilterIn not:AccountFieldUsageFilter or:[AccountFieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input AccountFieldUsageOrderBySpec{column:AccountFieldUsageColumn!direction:Ordering!}type AccountFieldUsageRecord{"""Dimensions of AccountFieldUsage that can be grouped by.""" groupBy:AccountFieldUsageDimensions!"""Metrics of AccountFieldUsage that can be aggregated over.""" metrics:AccountFieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountInvitation{"""An accepted invitation cannot be used anymore""" acceptedAt:Timestamp """Who accepted the invitation""" acceptedBy:User """Time the invitation was created""" createdAt:Timestamp!"""Who created the invitation""" createdBy:User email:String!id:ID!"""Last time we sent an email for the invitation""" lastSentAt:Timestamp """Access role for the invitee""" role:UserPermission!}type AccountMembership{account:Account!createdAt:Timestamp!"""If this membership is a free seat (based on role)""" free:Boolean permission:UserPermission!user:User!}type AccountMutation{auditExport(id:String!):AuditLogExportMutation """Cancel a pending change from an annual team subscription to a monthly team subscription when the current period expires.""" cancelConvertAnnualTeamSubscriptionToMonthlyAtNextPeriod:Account """Cancel account subscriptions, subscriptions will remain active until the end of the paid period""" cancelSubscriptions:Account """Changes an annual team subscription to a monthly team subscription when the current period expires.""" convertAnnualTeamSubscriptionToMonthlyAtNextPeriod:Account """Changes a monthly team subscription to an annual team subscription.""" convertMonthlyTeamSubscriptionToAnnual:Account createStaticInvitation(role:UserPermission!):OrganizationInviteLink """Delete the account's avatar. Requires Account.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Acknowledge that a trial has expired and return to community""" dismissExpiredTrial:Account """Apollo admins only: extend an ongoing trial""" extendTrial(to:Timestamp!):Account """Hard delete an account and all associated services""" hardDelete:Void """Send an invitation to join the account by E-mail""" invite(email:String!role:UserPermission):AccountInvitation """Reactivate a canceled current subscription""" reactivateCurrentSubscription:Account """Refresh billing information from third-party billing service""" refreshBilling:Void """Delete an invitation""" removeInvitation(id:ID):Void """Remove a member of the account""" removeMember(id:ID!):Account requestAuditExport(actors:[ActorInput!]from:Timestamp!graphIds:[String!]to:Timestamp!):Account """Send a new E-mail for an existing invitation""" resendInvitation(id:ID):AccountInvitation revokeStaticInvitation(token:String!):OrganizationInviteLink """Apollo admins only: set the billing plan to an arbitrary plan""" setPlan(id:ID!):Void """Start a new team subscription with the given billing period""" startTeamSubscription(billingPeriod:BillingPeriod!):Account """Start a team trial""" startTrial:Account """This is called by the form shown to users after they cancel their team subscription.""" submitTeamCancellationFeedback(feedback:String!):Void """Apollo admins only: terminate any ongoing subscriptions in the account, without refunds""" terminateSubscriptions:Account """Update the billing address for a Recurly token""" updateBillingAddress(billingAddress:BillingAddressInput!):Account """Update the billing information from a Recurly token""" updateBillingInfo(token:String!):Void updateCompanyUrl(companyUrl:String):Account """Set the E-mail address of the account, used notably for billing""" updateEmail(email:String!):Void """Update the account ID""" updateID(id:ID!):Account """Update the company name""" updateName(name:String!):Void """Apollo admins only: enable or disable an account for PingOne SSO login""" updatePingOneSSOIDPID(idpid:String):Account """Updates the role assigned to new SSO users.""" updateSSODefaultRole(role:UserPermission!):OrganizationSSO """A (currently) internal to Apollo mutation to update a user's role within an organization""" updateUserPermission(permission:UserPermission!userID:ID!):User}"""Columns of AccountOperationCheckStats.""" enum AccountOperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_REQUESTS_COUNT}type AccountOperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String serviceId:ID}"""Filter for data in AccountOperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountOperationCheckStatsFilter{and:[AccountOperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:AccountOperationCheckStatsFilterIn not:AccountOperationCheckStatsFilter or:[AccountOperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountOperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountOperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountOperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input AccountOperationCheckStatsOrderBySpec{column:AccountOperationCheckStatsColumn!direction:Ordering!}type AccountOperationCheckStatsRecord{"""Dimensions of AccountOperationCheckStats that can be grouped by.""" groupBy:AccountOperationCheckStatsDimensions!"""Metrics of AccountOperationCheckStats that can be aggregated over.""" metrics:AccountOperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountPublishesStatsMetrics{totalPublishes:Long!}type AccountPublishesStatsRecord{id:ID!metrics:AccountPublishesStatsMetrics!timestamp:Timestamp!}"""Columns of AccountQueryStats.""" enum AccountQueryStatsColumn{CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type AccountQueryStatsDimensions{clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountQueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountQueryStatsFilter{and:[AccountQueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:AccountQueryStatsFilterIn not:AccountQueryStatsFilter or:[AccountQueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountQueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountQueryStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountQueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input AccountQueryStatsOrderBySpec{column:AccountQueryStatsColumn!direction:Ordering!}type AccountQueryStatsRecord{"""Dimensions of AccountQueryStats that can be grouped by.""" groupBy:AccountQueryStatsDimensions!"""Metrics of AccountQueryStats that can be aggregated over.""" metrics:AccountQueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountRoles{canAudit:Boolean!canCreateDevGraph:Boolean!canCreateService:Boolean!canDelete:Boolean!canDownloadInvoice:Boolean!@deprecated(reason:"Use canQueryBillingInfo instead")canManageMembers:Boolean!canQuery:Boolean!canQueryAudit:Boolean!canQueryBillingInfo:Boolean!canQueryInvoices:Boolean!@deprecated(reason:"Use canQueryBillingInfo instead")canQueryMembers:Boolean!canQueryStats:Boolean!canReadTickets:Boolean!canRemoveMembers:Boolean!canSetConstrainedPlan:Boolean!canUpdateBillingInfo:Boolean!canUpdateMetadata:Boolean!}enum AccountState{ACTIVE CLOSED UNKNOWN UNPROVISIONED}"""A time window with a specified granularity over a given account.""" type AccountStatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:AccountBillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountBillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountBillingUsageStatsOrderBySpec!]):[AccountBillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:AccountEdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountEdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountEdgeServerInfosOrderBySpec!]):[AccountEdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:AccountErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountErrorStatsOrderBySpec!]):[AccountErrorStatsRecord!]!fieldExecutions("""Filter to select what rows to return.""" filter:AccountFieldExecutionsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldExecutions by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldExecutionsOrderBySpec!]):[AccountFieldExecutionsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:AccountFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldLatenciesOrderBySpec!]):[AccountFieldLatenciesRecord!]!fieldRequestsByClientVersion("""Filter to select what rows to return.""" filter:AccountFieldRequestsByClientVersionFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldRequestsByClientVersion by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldRequestsByClientVersionOrderBySpec!]):[AccountFieldRequestsByClientVersionRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:AccountFieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldUsageOrderBySpec!]):[AccountFieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:AccountOperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountOperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountOperationCheckStatsOrderBySpec!]):[AccountOperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:AccountQueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountQueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountQueryStatsOrderBySpec!]):[AccountQueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:AccountTracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountTracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountTracePathErrorsRefsOrderBySpec!]):[AccountTracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:AccountTraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountTraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountTraceRefsOrderBySpec!]):[AccountTraceRefsRecord!]!}"""Columns of AccountTracePathErrorsRefs.""" enum AccountTracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type AccountTracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in AccountTracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountTracePathErrorsRefsFilter{and:[AccountTracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:AccountTracePathErrorsRefsFilterIn not:AccountTracePathErrorsRefsFilter or:[AccountTracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in AccountTracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountTracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type AccountTracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input AccountTracePathErrorsRefsOrderBySpec{column:AccountTracePathErrorsRefsColumn!direction:Ordering!}type AccountTracePathErrorsRefsRecord{"""Dimensions of AccountTracePathErrorsRefs that can be grouped by.""" groupBy:AccountTracePathErrorsRefsDimensions!"""Metrics of AccountTracePathErrorsRefs that can be aggregated over.""" metrics:AccountTracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountTraceRefs.""" enum AccountTraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type AccountTraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID traceId:ID}"""Filter for data in AccountTraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountTraceRefsFilter{and:[AccountTraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:AccountTraceRefsFilterIn not:AccountTraceRefsFilter or:[AccountTraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in AccountTraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountTraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type AccountTraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input AccountTraceRefsOrderBySpec{column:AccountTraceRefsColumn!direction:Ordering!}type AccountTraceRefsRecord{"""Dimensions of AccountTraceRefs that can be grouped by.""" groupBy:AccountTraceRefsDimensions!"""Metrics of AccountTraceRefs that can be aggregated over.""" metrics:AccountTraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""An actor (view of Identity) that performed an action within Studio.""" type Actor{actorId:ID!type:ActorType!}input ActorInput{actorId:ID!type:ActorType!}enum ActorType{ANONYMOUS_USER BACKFILL CRON GRAPH INTERNAL_IDENTITY SYNCHRONIZATION SYSTEM USER}union AddOperationCollectionEntryResult=OperationCollectionEntry|PermissionError|ValidationError union AddOperationCollectionToVariantResult=GraphVariant|InvalidTarget|PermissionError|ValidationError type AffectedClient{"""ID, often the name, of the client set by the user and reported alongside metrics""" clientReferenceId:ID@deprecated(reason:"Unsupported.")"""version of the client set by the user and reported alongside metrics""" clientVersion:String@deprecated(reason:"Unsupported.")}type AffectedQuery{"""If the operation would be approved if the check ran again. Returns null if queried from SchemaDiff.changes.affectedQueries.alreadyApproved""" alreadyApproved:Boolean """If the operation would be ignored if the check ran again""" alreadyIgnored:Boolean """List of changes affecting this query. Returns null if queried from SchemaDiff.changes.affectedQueries.changes""" changes:[ChangeOnOperation!]"""Name to display to the user for the operation""" displayName:String id:ID!"""Determines if this query validates against the proposed schema""" isValid:Boolean """Whether this operation was ignored and its severity was downgraded for that reason""" markedAsIgnored:Boolean """Whether the changes were marked as safe and its severity was downgraded for that reason""" markedAsSafe:Boolean """Name provided for the operation, which can be empty string if it is an anonymous operation""" name:String """First 128 characters of query signature for display""" signature:String}interface ApiKey{id:ID!keyName:String token:String!}type ApiKeyProvision{apiKey:ApiKey!created:Boolean!}type AuditLogExport{actors:[Identity!]bigqueryTriggeredAt:Timestamp completedAt:Timestamp createdAt:Timestamp!exportedFiles:[String!]from:Timestamp!graphs:[Service!]id:ID!requester:User status:AuditStatus!to:Timestamp!}type AuditLogExportMutation{cancel:Account delete:Account}enum AuditStatus{CANCELLED COMPLETED EXPIRED FAILED IN_PROGRESS QUEUED}type AvatarDeleteError{clientMessage:String!code:AvatarDeleteErrorCode!serverMessage:String!}enum AvatarDeleteErrorCode{SSO_USERS_CANNOT_DELETE_SELF_AVATAR}type AvatarUploadError{clientMessage:String!code:AvatarUploadErrorCode!serverMessage:String!}enum AvatarUploadErrorCode{SSO_USERS_CANNOT_UPLOAD_SELF_AVATAR}union AvatarUploadResult=AvatarUploadError|MediaUploadInfo type BillingAddress{address1:String address2:String city:String country:String state:String zip:String}"""Billing address inpnut""" input BillingAddressInput{address1:String!address2:String city:String!country:String!state:String!zip:String!}type BillingInfo{address:BillingAddress!cardType:String firstName:String lastFour:Int lastName:String month:Int vatNumber:String year:Int}enum BillingModel{REQUEST_BASED SEAT_BASED}type BillingMonth{end:Timestamp!requests:Long!start:Timestamp!}enum BillingPeriod{MONTHLY QUARTERLY SEMI_ANNUALLY YEARLY}type BillingPlan{addons:[BillingPlanAddon!]!billingModel:BillingModel!billingPeriod:BillingPeriod capabilities:BillingPlanCapabilities!description:String id:ID!isTrial:Boolean!kind:BillingPlanKind!name:String!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of subscribing to this plan with a quantity of 1 (currently always the case)""" pricePerUnitInUsdCents:Int!"""Whether the plan is accessible by all users in QueryRoot.allPlans, QueryRoot.plan, or AccountMutation.setPlan""" public:Boolean!tier:BillingPlanTier!}type BillingPlanAddon{id:ID!pricePerUnitInUsdCents:Int!}type BillingPlanAddonV2{id:ID!pricePerUnitInUsdCents:Int!}type BillingPlanCapabilities{clients:Boolean!contracts:Boolean!datadog:Boolean!errors:Boolean!federation:Boolean!launches:Boolean!maxAuditInDays:Int!maxRangeInDays:Int maxRequestsPerMonth:Long metrics:Boolean!notifications:Boolean!operationRegistry:Boolean!ranges:[String!]!schemaValidation:Boolean!traces:Boolean!userRoles:Boolean!webhooks:Boolean!}enum BillingPlanKind{COMMUNITY ENTERPRISE_INTERNAL ENTERPRISE_PAID ENTERPRISE_PILOT TEAM_PAID TEAM_TRIAL}enum BillingPlanKindV2{COMMUNITY ENTERPRISE_INTERNAL ENTERPRISE_PAID ENTERPRISE_PILOT TEAM_PAID TEAM_TRIAL UNKNOWN}enum BillingPlanTier{COMMUNITY ENTERPRISE TEAM}enum BillingPlanTierV2{COMMUNITY ENTERPRISE TEAM UNKNOWN}type BillingPlanV2{addons:[BillingPlanAddonV2!]!billingModel:BillingModel!billingPeriod:BillingPeriod clients:Boolean!contracts:Boolean!datadog:Boolean!description:String errors:Boolean!federation:Boolean!id:ID!isTrial:Boolean!kind:BillingPlanKindV2!launches:Boolean!maxAuditInDays:Int!maxRangeInDays:Int maxRequestsPerMonth:Long metrics:Boolean!name:String!notifications:Boolean!operationRegistry:Boolean!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of subscribing to this plan with a quantity of 1 (currently always the case)""" pricePerUnitInUsdCents:Int!"""Whether the plan is accessible by all users in QueryRoot.allPlans, QueryRoot.plan, or AccountMutation.setPlan""" public:Boolean!ranges:[String!]!schemaValidation:Boolean!tier:BillingPlanTierV2!traces:Boolean!userRoles:Boolean!webhooks:Boolean!}type BillingSubscription{activatedAt:Timestamp!addons:[BillingSubscriptionAddon!]!autoRenew:Boolean!"""The price of the subscription when ignoring add-ons (such as seats), ie quantity * pricePerUnitInUsdCents""" basePriceInUsdCents:Long!canceledAt:Timestamp currentPeriodEndsAt:Timestamp!currentPeriodStartedAt:Timestamp!expiresAt:Timestamp plan:BillingPlan!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of every unit in the subscription (hence multiplied by quantity to get to the basePriceInUsdCents)""" pricePerUnitInUsdCents:Int!quantity:Int!"""Total price of the subscription when it next renews, including add-ons (such as seats)""" renewalTotalPriceInUsdCents:Long!state:SubscriptionState!"""Total price of the subscription, including add-ons (such as seats)""" totalPriceInUsdCents:Long!"""When this subscription's trial period expires (if it is a trial). Not the same as the -subscription's Recurly expiration).""" trialExpiresAt:Timestamp uuid:ID!}type BillingSubscriptionAddon{id:ID!pricePerUnitInUsdCents:Int!quantity:Int!}type BillingSubscriptionAddonV2{id:ID!pricePerUnitInUsdCents:Int!quantity:Int!}type BillingSubscriptionV2{"""The price of every unit in the subscription (hence multiplied by quantity to get to the basePriceInUsdCents)""" activatedAt:Timestamp!addons:[BillingSubscriptionAddonV2!]!autoRenew:Boolean!canceledAt:Timestamp currentPeriodEndsAt:Timestamp!currentPeriodStartedAt:Timestamp!expiresAt:Timestamp plan:BillingPlanV2!"""The price of every seat""" pricePerSeatInUsdCents:Int quantity:Int!state:SubscriptionStateV2!"""When this subscription's trial period expires (if it is a trial). Not the same as the -subscription's Recurly expiration).""" trialExpiresAt:Timestamp uuid:ID!}"""Columns of BillingUsageStats.""" enum BillingUsageStatsColumn{ACCOUNT_ID OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG SERVICE_ID TIMESTAMP}type BillingUsageStatsDimensions{accountId:ID operationCountProvidedExplicitly:String schemaTag:String serviceId:ID}"""Filter for data in BillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input BillingUsageStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[BillingUsageStatsFilter!]in:BillingUsageStatsFilterIn not:BillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[BillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in BillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input BillingUsageStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type BillingUsageStatsMetrics{operationCount:Long!}input BillingUsageStatsOrderBySpec{column:BillingUsageStatsColumn!direction:Ordering!}type BillingUsageStatsRecord{"""Dimensions of BillingUsageStats that can be grouped by.""" groupBy:BillingUsageStatsDimensions!"""Metrics of BillingUsageStats that can be aggregated over.""" metrics:BillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""A blob (base64'ed in JSON & GraphQL)""" scalar Blob type Build{input:BuildInput!result:BuildResult}type BuildError{code:String locations:[SourceLocation!]!message:String!}type BuildFailure{errorMessages:[BuildError!]!}union BuildInput=CompositionBuildInput|FilterBuildInput union BuildResult=BuildFailure|BuildSuccess type BuildSuccess{coreSchema:CoreSchema!}enum CacheScope{PRIVATE PUBLIC UNKNOWN UNRECOGNIZED}"""A specific change to a definition in your schema.""" type Change{affectedQueries:[AffectedQuery!]"""Target arg of change made.""" argNode:NamedIntrospectionArg """Indication of the category of the change (e.g. addition, removal, edit).""" category:ChangeCategory!"""Node related to the top level node that was changed, such as a field in an object, -a value in an enum or the object of an interface.""" childNode:NamedIntrospectionValue """Indication of the kind of target and action of the change, e.g. 'TYPE_REMOVED'.""" code:String!"""Human-readable description of the change.""" description:String!"""Top level node affected by the change.""" parentNode:NamedIntrospectionType """Severity of the change, either failure or warning.""" severity:ChangeSeverity!"""Indication of the success of the overall change, either failure, warning, or notice.""" type:ChangeType!@deprecated(reason:"use severity instead")}"""Defines a set of categories that a schema change -can be grouped by.""" enum ChangeCategory{ADDITION DEPRECATION EDIT REMOVAL}"""These schema change codes represent all of the possible changes that can -occur during the schema diff algorithm.""" enum ChangeCode{"""Type of the argument was changed.""" ARG_CHANGED_TYPE """Argument was changed from nullable to non-nullable.""" ARG_CHANGED_TYPE_OPTIONAL_TO_REQUIRED """Default value added or changed for the argument.""" ARG_DEFAULT_VALUE_CHANGE """Description was added, removed, or updated for argument.""" ARG_DESCRIPTION_CHANGE """Argument to a field was removed.""" ARG_REMOVED """Argument to the directive was removed.""" DIRECTIVE_ARG_REMOVED """Location of the directive was removed.""" DIRECTIVE_LOCATION_REMOVED """Directive was removed.""" DIRECTIVE_REMOVED """Repeatable flag was removed for directive.""" DIRECTIVE_REPEATABLE_REMOVED """Enum was deprecated.""" ENUM_DEPRECATED """Reason for enum deprecation changed.""" ENUM_DEPRECATED_REASON_CHANGE """Enum deprecation was removed.""" ENUM_DEPRECATION_REMOVED """Description was added, removed, or updated for enum value.""" ENUM_VALUE_DESCRIPTION_CHANGE """Field was added to the type.""" FIELD_ADDED """Return type for the field was changed.""" FIELD_CHANGED_TYPE """Field was deprecated.""" FIELD_DEPRECATED """Reason for field deprecation changed.""" FIELD_DEPRECATED_REASON_CHANGE """Field deprecation removed.""" FIELD_DEPRECATION_REMOVED """Description was added, removed, or updated for field.""" FIELD_DESCRIPTION_CHANGE """Type of the field in the input object was changed.""" FIELD_ON_INPUT_OBJECT_CHANGED_TYPE """Field was removed from the type.""" FIELD_REMOVED """Field was removed from the input object.""" FIELD_REMOVED_FROM_INPUT_OBJECT """Non-nullable field was added to the input object. (Deprecated.)""" NON_NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT """Nullable field was added to the input type. (Deprecated.)""" NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT """Nullable argument was added to the field.""" OPTIONAL_ARG_ADDED """Optional field was added to the input type.""" OPTIONAL_FIELD_ADDED_TO_INPUT_OBJECT """Non-nullable argument was added to the field.""" REQUIRED_ARG_ADDED """Non-nullable argument added to directive.""" REQUIRED_DIRECTIVE_ARG_ADDED """Required field was added to the input object.""" REQUIRED_FIELD_ADDED_TO_INPUT_OBJECT """Type was added to the schema.""" TYPE_ADDED """Type now implements the interface.""" TYPE_ADDED_TO_INTERFACE """A new value was added to the enum.""" TYPE_ADDED_TO_UNION """Type was changed from one kind to another. -Ex: scalar to object or enum to union.""" TYPE_CHANGED_KIND """Description was added, removed, or updated for type.""" TYPE_DESCRIPTION_CHANGE """Type (object or scalar) was removed from the schema.""" TYPE_REMOVED """Type no longer implements the interface.""" TYPE_REMOVED_FROM_INTERFACE """Type is no longer included in the union.""" TYPE_REMOVED_FROM_UNION """A new value was added to the enum.""" VALUE_ADDED_TO_ENUM """Value was removed from the enum.""" VALUE_REMOVED_FROM_ENUM}"""Represents the tuple of static information -about a particular kind of schema change.""" type ChangeDefinition{category:ChangeCategory!code:ChangeCode!defaultSeverity:ChangeSeverity!}"""Info about a change in the context of an operation it affects""" type ChangeOnOperation{"""Human-readable explanation of the impact of this change on the operation""" impact:String """The semantic info about this change, i.e. info about the change that doesn't depend on the operation""" semanticChange:SemanticChange!}enum ChangeSeverity{FAILURE NOTICE}"""Summary of the changes for a schema diff, computed by placing the changes into categories and then +schema { + query: Query + mutation: Mutation +} + +"""An organization in Apollo Studio. Can have multiple members and graphs.""" +type Organization { + auditLogExports: [AuditLogExport!] + """Graphs belonging to this organization.""" + graphs(includeDeleted: Boolean): [Graph!]! + """Globally unique identifier, which isn't guaranteed stable (can be changed by administrators).""" + id: ID! + """Name of the organization, which can change over time and isn't unique.""" + name: String! + """Graphs belonging to this organization.""" + services(includeDeleted: Boolean): [Graph!]! @deprecated(reason: "Use graphs field instead") +} + +type OrganizationMutation { + """Trigger a request for an audit export""" + requestAuditExport(actors: [ActorInput!], from: Timestamp!, graphIds: [String!], to: Timestamp!): Organization +} + +"""Represents an actor that performs actions in Apollo Studio. Most actors are either a `USER` or a `GRAPH` (based on a request's provided API key), and they have the corresponding `ActorType`.""" +type Actor { + actorId: ID! + type: ActorType! +} + +"""Input type to provide when specifying an `Actor` in operation arguments. See also the `Actor` object type.""" +input ActorInput { + actorId: ID! + type: ActorType! +} + +enum ActorType { + ANONYMOUS_USER + BACKFILL + CRON + GRAPH + INTERNAL_IDENTITY + SYNCHRONIZATION + SYSTEM + USER +} + +union AddOperationCollectionEntriesResult = AddOperationCollectionEntriesSuccess | PermissionError | ValidationError + +type AddOperationCollectionEntriesSuccess { + operationCollectionEntries: [OperationCollectionEntry!]! +} + +union AddOperationCollectionEntryResult = OperationCollectionEntry | PermissionError | ValidationError + +input AddOperationInput { + """The operation's fields.""" + document: OperationCollectionEntryStateInput! + """The operation's name.""" + name: String! +} + +type AffectedQuery { + id: ID! + """First 128 characters of query signature for display""" + signature: String + """Name to display to the user for the operation""" + displayName: String + """Name provided for the operation, which can be empty string if it is an anonymous operation""" + name: String + """Determines if this query validates against the proposed schema""" + isValid: Boolean + """List of changes affecting this query. Returns null if queried from SchemaDiff.changes.affectedQueries.changes""" + changes: [ChangeOnOperation!] + """Whether this operation was ignored and its severity was downgraded for that reason""" + markedAsIgnored: Boolean + """Whether the changes were marked as safe and its severity was downgraded for that reason""" + markedAsSafe: Boolean + """If the operation would be approved if the check ran again. Returns null if queried from SchemaDiff.changes.affectedQueries.alreadyApproved""" + alreadyApproved: Boolean + """If the operation would be ignored if the check ran again""" + alreadyIgnored: Boolean +} + +""" +Represents an API key that's used to authenticate a +particular Apollo user or graph. +""" +interface ApiKey { + """The API key's ID.""" + id: ID! + """The API key's name, for distinguishing it from other keys.""" + keyName: String + """The value of the API key. **This is a secret credential!**""" + token: String! +} + +type ApiKeyProvision { + apiKey: ApiKey! + created: Boolean! +} + +type AuditLogExport { + """The list of actors to filter the audit export""" + actors: [Identity!] + """The time when the audit export was completed""" + completedAt: Timestamp + """The time when the audit export was reqeusted""" + createdAt: Timestamp! + """List of URLs to download the audits for the requested range""" + downloadUrls: [String!] + """The starting point of audits to include in export""" + from: Timestamp! + """The list of graphs to filter the audit export""" + graphs: [Graph!] + """The id for the audit export""" + id: ID! + """The user that initiated the audit export""" + requester: User + """The status of the audit export""" + status: AuditStatus! + """The end point of audits to include in export""" + to: Timestamp! +} + +enum AuditStatus { + CANCELLED + COMPLETED + EXPIRED + FAILED + IN_PROGRESS + QUEUED +} + +"""The building of a Studio variant (including supergraph composition and any contract filtering) as part of a launch.""" +type Build { + """The inputs provided to the build, including subgraph and contract details.""" + input: BuildInput! + """The result of the build. This value is null until the build completes.""" + result: BuildResult +} + +"""A single error that occurred during the failed execution of a build.""" +type BuildError { + code: String + locations: [SourceLocation!]! + message: String! +} + +"""Contains the details of an executed build that failed.""" +type BuildFailure { + """A list of all errors that occurred during the failed build.""" + errorMessages: [BuildError!]! +} + +union BuildInput = CompositionBuildInput | FilterBuildInput + +union BuildResult = BuildFailure | BuildSuccess + +"""Contains the details of an executed build that succeeded.""" +type BuildSuccess { + """Contains the supergraph and API schemas created by composition.""" + coreSchema: CoreSchema! +} + +"""A single change that was made to a definition in a schema.""" +type Change { + """The severity of the change (e.g., `FAILURE` or `NOTICE`)""" + severity: ChangeSeverity! + """Indicates the type of change that was made, and to what (e.g., 'TYPE_REMOVED').""" + code: String! + """Indication of the category of the change (e.g. addition, removal, edit).""" + category: ChangeCategory! + """A human-readable description of the change.""" + description: String! + affectedQueries: [AffectedQuery!] + """Top level node affected by the change.""" + parentNode: NamedIntrospectionType + """ + Node related to the top level node that was changed, such as a field in an object, + a value in an enum or the object of an interface. + """ + childNode: NamedIntrospectionValue + """Target arg of change made.""" + argNode: NamedIntrospectionArg +} + +""" +Defines a set of categories that a schema change +can be grouped by. +""" +enum ChangeCategory { + ADDITION + EDIT + REMOVAL + DEPRECATION +} + +""" +These schema change codes represent all of the possible changes that can +occur during the schema diff algorithm. +""" +enum ChangeCode { + """Field was removed from the type.""" + FIELD_REMOVED + """Type (object or scalar) was removed from the schema.""" + TYPE_REMOVED + """Argument to a field was removed.""" + ARG_REMOVED + """Type is no longer included in the union.""" + TYPE_REMOVED_FROM_UNION + """Field was removed from the input object.""" + FIELD_REMOVED_FROM_INPUT_OBJECT + """Value was removed from the enum.""" + VALUE_REMOVED_FROM_ENUM + """Type no longer implements the interface.""" + TYPE_REMOVED_FROM_INTERFACE + """Non-nullable argument was added to the field.""" + REQUIRED_ARG_ADDED + """Non-nullable field was added to the input object. (Deprecated.)""" + NON_NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT + """Required field was added to the input object.""" + REQUIRED_FIELD_ADDED_TO_INPUT_OBJECT + """Return type for the field was changed.""" + FIELD_CHANGED_TYPE + """Type of the field in the input object was changed.""" + FIELD_ON_INPUT_OBJECT_CHANGED_TYPE + """ + Type was changed from one kind to another. + Ex: scalar to object or enum to union. + """ + TYPE_CHANGED_KIND + """Type of the argument was changed.""" + ARG_CHANGED_TYPE + """Argument was changed from nullable to non-nullable.""" + ARG_CHANGED_TYPE_OPTIONAL_TO_REQUIRED + """A new value was added to the enum.""" + VALUE_ADDED_TO_ENUM + """A new value was added to the enum.""" + TYPE_ADDED_TO_UNION + """Type now implements the interface.""" + TYPE_ADDED_TO_INTERFACE + """Default value added or changed for the argument.""" + ARG_DEFAULT_VALUE_CHANGE + """Nullable argument was added to the field.""" + OPTIONAL_ARG_ADDED + """Nullable field was added to the input type. (Deprecated.)""" + NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT + """Optional field was added to the input type.""" + OPTIONAL_FIELD_ADDED_TO_INPUT_OBJECT + """Field was added to the type.""" + FIELD_ADDED + """Type was added to the schema.""" + TYPE_ADDED + """Enum was deprecated.""" + ENUM_DEPRECATED + """Enum deprecation was removed.""" + ENUM_DEPRECATION_REMOVED + """Reason for enum deprecation changed.""" + ENUM_DEPRECATED_REASON_CHANGE + """Field was deprecated.""" + FIELD_DEPRECATED + """Field deprecation removed.""" + FIELD_DEPRECATION_REMOVED + """Reason for field deprecation changed.""" + FIELD_DEPRECATED_REASON_CHANGE + """Description was added, removed, or updated for type.""" + TYPE_DESCRIPTION_CHANGE + """Description was added, removed, or updated for field.""" + FIELD_DESCRIPTION_CHANGE + """Description was added, removed, or updated for enum value.""" + ENUM_VALUE_DESCRIPTION_CHANGE + """Description was added, removed, or updated for argument.""" + ARG_DESCRIPTION_CHANGE + """Directive was removed.""" + DIRECTIVE_REMOVED + """Argument to the directive was removed.""" + DIRECTIVE_ARG_REMOVED + """Location of the directive was removed.""" + DIRECTIVE_LOCATION_REMOVED + """Repeatable flag was removed for directive.""" + DIRECTIVE_REPEATABLE_REMOVED + """Non-nullable argument added to directive.""" + REQUIRED_DIRECTIVE_ARG_ADDED +} + +""" +Represents the tuple of static information +about a particular kind of schema change. +""" +type ChangeDefinition { + code: ChangeCode! + defaultSeverity: ChangeSeverity! + category: ChangeCategory! +} + +"""An addition made to a Studio variant's changelog after a launch.""" +type ChangelogLaunchResult { + createdAt: Timestamp! + schemaTagID: ID! +} + +"""Info about a change in the context of an operation it affects""" +type ChangeOnOperation { + """The semantic info about this change, i.e. info about the change that doesn't depend on the operation""" + semanticChange: SemanticChange! + """Human-readable explanation of the impact of this change on the operation""" + impact: String +} + +enum ChangeSeverity { + FAILURE + NOTICE +} + +""" +Summary of the changes for a schema diff, computed by placing the changes into categories and then counting the size of each category. This categorization can be done in different ways, and accordingly there are multiple fields here for each type of categorization. @@ -22,54 +321,1130 @@ Note that if an object or interface field is added/removed, there won't be any a changes generated for its arguments or @deprecated usages. If an enum type is added/removed, there will be addition/removal changes generated for its values, but not for those values' @deprecated usages. Description changes won't be generated for a schema element if that element (or an -ancestor) was added/removed.""" type ChangeSummary{"""Counts for changes to fields of objects, input objects, and interfaces.""" field:FieldChangeSummaryCounts!"""Counts for all changes.""" total:TotalChangeSummaryCounts!"""Counts for changes to non-field aspects of objects, input objects, and interfaces, -and all aspects of enums, unions, and scalars.""" type:TypeChangeSummaryCounts!}enum ChangeType{FAILURE NOTICE}type ChangelogLaunchResult{createdAt:Timestamp!schemaTagID:ID!}"""Destination for notifications""" interface Channel{id:ID!name:String!subscriptions:[ChannelSubscription!]!}interface ChannelSubscription{channels:[Channel!]!enabled:Boolean!id:ID!variant:String}type CheckConfiguration{"""Time when check configuration was created""" createdAt:Timestamp!"""Clients to ignore during validation""" excludedClients:[ClientFilter!]!"""Operation names to ignore during validation""" excludedOperationNames:[OperationNameFilter]"""Operations to ignore during validation""" excludedOperations:[ExcludedOperation!]!"""Graph that this check configuration belongs to""" graphID:ID!"""ID of the check configuration""" id:ID!"""Default configuration to include operations on the base variant.""" includeBaseVariant:Boolean!"""Variant overrides for validation""" includedVariants:[String!]!"""Minimum number of requests within the window for an operation to be considered.""" operationCountThreshold:Int!"""Number of requests within the window for an operation to be considered, relative to -total request count. Expected values are between 0 and 0.05 (minimum 5% of -total request volume)""" operationCountThresholdPercentage:Float!"""Only check operations from the last <timeRangeSeconds> seconds. -The default is 7 days (604,800 seconds).""" timeRangeSeconds:Long!"""Time when check configuration was last updated""" updatedAt:Timestamp!"""Identity of the last user to update the check configuration""" updatedBy:Identity}"""Filter options available when listing checks.""" input CheckFilterInput{authors:[String!]branches:[String!]status:CheckFilterInputStatusOption subgraphs:[String!]}"""Options for filtering CheckWorkflows by status""" enum CheckFilterInputStatusOption{FAILED PASSED PENDING}"""The result of performing a subgraph check, including all steps.""" type CheckPartialSchemaResult{"""Overall result of the check. This will be null if composition validation was unsuccessful.""" checkSchemaResult:CheckSchemaResult """Result of compostion run as part of the overall subgraph check.""" compositionValidationResult:CompositionValidationResult!"""Whether any modifications were detected in the composed core schema.""" coreSchemaModified:Boolean!"""Check workflow associated with the overall subgraph check.""" workflow:CheckWorkflow}type CheckSchemaResult{"""Schema diff and affected operations generated by the schema check""" diffToPrevious:SchemaDiff!"""ID of the operations check that was created""" operationsCheckID:ID!"""Generated url to view schema diff in Engine""" targetUrl:String """Workflow associated with this check result""" workflow:CheckWorkflow}type CheckWorkflow{"""The variant provided as a base to check against. Only the differences from the -base schema will be tested in operations checks.""" baseVariant:GraphVariant completedAt:Timestamp createdAt:Timestamp!"""Contextual parameters supplied by the runtime environment where the check was run.""" gitContext:GitContext id:ID!"""The name of the implementing service that was responsible for triggering the validation.""" implementingServiceName:String """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String """Only true if the check was triggered from Sandbox Checks page.""" isSandboxCheck:Boolean!"""If this check was created by rerunning, the original check that was rerun.""" rerunOf:CheckWorkflow """Checks created by re-running this check, most recent first.""" reruns(limit:Int!=20):[CheckWorkflow!]startedAt:Timestamp """Overall status of the workflow, based on the underlying task statuses.""" status:CheckWorkflowStatus!"""The set of check tasks associated with this workflow, e.g. OperationsCheck, GraphComposition, etc.""" tasks:[CheckWorkflowTask!]!"""Identity of the user who ran this check""" triggeredBy:Identity """Configuration of validation at the time the check was run.""" validationConfig:SchemaDiffValidationConfig}type CheckWorkflowMutation{"""Re-run a check workflow using the current configuration. A new workflow is created and returned.""" rerun:CheckWorkflowRerunResult}type CheckWorkflowRerunResult{"""Check workflow created by re-running.""" result:CheckWorkflow """Check workflow that was rerun.""" source:CheckWorkflow}enum CheckWorkflowStatus{FAILED PASSED PENDING}interface CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!status:CheckWorkflowTaskStatus!"""The workflow that this task belongs to.""" workflow:CheckWorkflow!}enum CheckWorkflowTaskStatus{BLOCKED FAILED PASSED PENDING}"""Client filter configuration for a graph.""" type ClientFilter{"""name of the client set by the user and reported alongside metrics""" name:String """version of the client set by the user and reported alongside metrics""" version:String}"""Options to filter by client reference ID, client name, and client version. -If passing client version, make sure to either provide a client reference ID or client name.""" input ClientFilterInput{"""name of the client set by the user and reported alongside metrics""" name:String """version of the client set by the user and reported alongside metrics""" version:String}"""Filter options to exclude by client reference ID, client name, and client version.""" input ClientInfoFilter{name:String """Ignored""" referenceID:ID version:String}"""Filter options to exclude clients. Used as an output type for SchemaDiffValidationConfig.""" type ClientInfoFilterOutput{name:String version:String}enum ComparisonOperator{EQUALS GREATER_THAN GREATER_THAN_OR_EQUAL_TO LESS_THAN LESS_THAN_OR_EQUAL_TO NOT_EQUALS UNRECOGNIZED}"""The result of composition run in the cloud, upon an attempted subgraph deletion.""" type CompositionAndRemoveResult{"""The produced composition config. Will be null if there are any errors""" compositionConfig:CompositionConfig """Whether the removed implementing service existed.""" didExist:Boolean!""" List of errors during composition. Errors mean that Apollo was unable to compose the - graph variant's subgraphs into a GraphQL schema. If present, gateways / routers -are not updated.""" errors:[SchemaCompositionError]!"""ID that points to the results of composition.""" graphCompositionID:String!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!}"""The result of composition run in the cloud, upon attempted publish of a subgraph.""" type CompositionAndUpsertResult{"""The produced composition config, or null if there are any errors.""" compositionConfig:CompositionConfig """List of errors during composition. Errors mean that Apollo was unable to compose the -graph variant's subgraphs into a supergraph schema. If present, gateways / routers -are not updated.""" errors:[SchemaCompositionError]!"""ID that points to the results of composition.""" graphCompositionID:String!"""Copy text for the launch result of a publish.""" launchCliCopy:String """Link to corresponding launches page on Studio if available.""" launchUrl:String """List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!"""Whether a subgraph was created as part of this mutation.""" wasCreated:Boolean!"""Whether an implementingService was updated as part of this mutation""" wasUpdated:Boolean!}type CompositionBuildInput{subgraphs:[Subgraph!]!version:String}type CompositionCheckTask implements CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!"""The result of the composition.""" result:CompositionResult status:CheckWorkflowTaskStatus!workflow:CheckWorkflow!}"""Composition configuration exposed to the gateway.""" type CompositionConfig{"""List of GCS links for implementing services that comprise a composed graph. Is empty if tag/inaccessible is enabled.""" implementingServiceLocations:[ImplementingServiceLocation!]!@deprecated(reason:"Soon we will stop writing to GCS locations")"""Hash of the API schema.""" schemaHash:String!}"""The result of composition run in the cloud.""" type CompositionPublishResult implements CompositionResult{"""The produced composition config. Will be null if there are any errors""" compositionConfig:CompositionConfig """Supergraph SDL generated by composition (this is not the CSDL, that is a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the -graph variant's subgraphs into a supergraph schema. If present, gateways / routers -are not updated.""" errors:[SchemaCompositionError!]!"""ID for a particular composition.""" graphCompositionID:ID!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph SDL generated by composition.""" supergraphSdl:GraphQLDocument """Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!webhookNotificationBody:String}"""Result of a composition, often as the result of a subgraph check or subgraph publish. -See implementations for more details.""" interface CompositionResult{"""Supergraph SDL generated by composition (this is not the cSDL, a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the -graph variant's subgraphs into a supergraph schema. If present, gateways / routers -are not updated.""" errors:[SchemaCompositionError!]!"""Globally unique identifier for the composition.""" graphCompositionID:ID!"""List of subgraphs included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph SDL generated by composition.""" supergraphSdl:GraphQLDocument}type CompositionStatusSubscription implements ChannelSubscription{channels:[Channel!]!createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!variant:String}"""The composition config exposed to the gateway""" type CompositionValidationDetails{"""List of implementing service partial schemas that comprised the graph composed during validation""" implementingServices:[FederatedImplementingServicePartialSchema!]!"""Hash of the composed schema""" schemaHash:String}"""Metadata about the result of compositions validation run in the cloud, during a subgraph check.""" type CompositionValidationResult implements CompositionResult{"""Describes whether composition succeeded.""" compositionSuccess:Boolean!"""Akin to a composition config, represents the subgraph schemas and corresponding subgraphs that were used -in running composition. Will be null if any errors are encountered. Also may contain a schema hash if -one could be computed, which can be used for schema validation.""" compositionValidationDetails:CompositionValidationDetails """Supergraph SDL generated by composition (this is not the CSDL, that is a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the -graph variant's subgraphs into a supergraph schema. If present, gateways / routers -are not updated.""" errors:[SchemaCompositionError!]!"""ID that points to the results of this composition.""" graphCompositionID:ID!"""The implementing service that was responsible for triggering the validation""" proposedImplementingService:FederatedImplementingServicePartialSchema!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph schema document generated by composition.""" supergraphSdl:GraphQLDocument """If created as part of a check workflow, the associated workflow task.""" workflowTask:CompositionCheckTask}type ContractPreview{result:ContractPreviewResult!upstreamLaunch:Launch!}type ContractPreviewErrors{errors:[String!]!failedAt:ContractVariantFailedStep!}union ContractPreviewResult=ContractPreviewErrors|ContractPreviewSuccess type ContractPreviewSuccess{apiDocument:String!coreDocument:String!fieldCount:Int!typeCount:Int!}enum ContractVariantFailedStep{ADD_DIRECTIVE_DEFINITIONS_IF_NOT_PRESENT DIRECTIVE_DEFINITION_LOCATION_AUGMENTING EMPTY_ENUM_MASKING EMPTY_INPUT_OBJECT_MASKING EMPTY_OBJECT_AND_INTERFACE_FIELD_MASKING EMPTY_OBJECT_AND_INTERFACE_MASKING EMPTY_UNION_MASKING INPUT_VALIDATION PARSING PARSING_TAG_DIRECTIVES PARTIAL_INTERFACE_MASKING SCHEMA_RETRIEVAL TAG_INHERITING TAG_MATCHING TO_API_SCHEMA TO_FILTER_SCHEMA UNKNOWN VERSION_CHECK}type ContractVariantPreviewErrors{errorMessages:[String!]!failedStep:ContractVariantFailedStep!}union ContractVariantPreviewResult=ContractVariantPreviewErrors|ContractVariantPreviewSuccess type ContractVariantPreviewSuccess{baseApiSchema:String!baseCoreSchema:String!contractApiSchema:String!contractCoreSchema:String!}type ContractVariantUpsertErrors{errorMessages:[String!]!}union ContractVariantUpsertResult=ContractVariantUpsertErrors|ContractVariantUpsertSuccess type ContractVariantUpsertSuccess{contractVariant:GraphVariant!}type CoreSchema{apiDocument:GraphQLDocument!coreDocument:GraphQLDocument!coreHash:String!fieldCount:Int!tags:[String!]!typeCount:Int!}union CreateOperationCollectionResult=OperationCollection|PermissionError|ValidationError type CronExecution{completedAt:Timestamp failure:String id:ID!job:CronJob!resolvedAt:Timestamp resolvedBy:Actor schedule:String!startedAt:Timestamp!}type CronJob{group:String!name:String!recentExecutions(n:Int):[CronExecution!]!}enum DatadogApiRegion{EU EU1 US US1 US1FED US3 US5}type DatadogMetricsConfig{apiKey:String!apiRegion:DatadogApiRegion!enabled:Boolean!legacyMetricNames:Boolean!}union DeleteOperationCollectionResult=DeleteOperationCollectionSuccess|PermissionError type DeleteOperationCollectionSuccess{sandboxOwner:User variants:[GraphVariant!]!}"""The result of attempting to delete a graph variant.""" type DeleteSchemaTagResult{"""WHether a variant was deleted or not.""" deleted:Boolean!}enum DeletionTargetType{ACCOUNT USER}"""Support for a single directive on a graph variant""" type DirectiveSupportStatus{"""whether the directive is supported on the current graph variant""" enabled:Boolean!"""name of the directive""" name:String!}union DuplicateOperationCollectionResult=OperationCollection|PermissionError|ValidationError type DurationHistogram{averageDurationMs:Float buckets:[DurationHistogramBucket!]!durationMs("""Percentile (between 0 and 1)""" percentile:Float!):Float """Counts per durationBucket, where sequences of zeroes are replaced with the negative of their size""" sparseBuckets:[Long!]!totalCount:Long!totalDurationMs:Float!}type DurationHistogramBucket{count:Long!index:Int!rangeBeginMs:Float!rangeEndMs:Float!}input EdgeServerInfo{"""A randomly generated UUID, immutable for the lifetime of the edge server runtime.""" bootId:String!"""A unique identifier for the executable GraphQL served by the edge server. length must be <= 64 characters.""" executableSchemaId:String!"""The graph variant, defaults to 'current'""" graphVariant:String!="current" """The version of the edge server reporting agent, e.g. apollo-server-2.8, graphql-java-3.1, etc. length must be <= 256 characters.""" libraryVersion:String """The infra environment in which this edge server is running, e.g. localhost, Kubernetes, AWS Lambda, Google CloudRun, AWS ECS, etc. length must be <= 256 characters.""" platform:String """The runtime in which the edge server is running, e.g. node 12.03, zulu8.46.0.19-ca-jdk8.0.252-macosx_x64, etc. length must be <= 256 characters.""" runtimeVersion:String """If available, an identifier for the edge server instance, such that when restarting this instance it will have the same serverId, with a different bootId. For example, in Kubernetes this might be the pod name. Length must be <= 256 characters.""" serverId:String """An identifier used to distinguish the version (from the user's perspective) of the edge server's code itself. For instance, the git sha of the server's repository or the docker sha of the associated image this server runs with. Length must be <= 256 characters.""" userVersion:String}"""Columns of EdgeServerInfos.""" enum EdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID SERVICE_ID TIMESTAMP USER_VERSION}type EdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID serviceId:ID userVersion:String}"""Filter for data in EdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input EdgeServerInfosFilter{and:[EdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:EdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:EdgeServerInfosFilter or:[EdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in EdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input EdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input EdgeServerInfosOrderBySpec{column:EdgeServerInfosColumn!direction:Ordering!}type EdgeServerInfosRecord{"""Dimensions of EdgeServerInfos that can be grouped by.""" groupBy:EdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}enum EmailCategory{EDUCATIONAL}type EmailPreferences{email:String!subscriptions:[EmailCategory!]!unsubscribedFromAll:Boolean!}interface Error{message:String!}"""Columns of ErrorStats.""" enum ErrorStatsColumn{ACCOUNT_ID CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type ErrorStatsDimensions{accountId:ID clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in ErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ErrorStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[ErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ErrorStatsFilterIn not:ErrorStatsFilter or:[ErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in ErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ErrorStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type ErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input ErrorStatsOrderBySpec{column:ErrorStatsColumn!direction:Ordering!}type ErrorStatsRecord{"""Dimensions of ErrorStats that can be grouped by.""" groupBy:ErrorStatsDimensions!"""Metrics of ErrorStats that can be aggregated over.""" metrics:ErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}""" Input parameters for run explorer operation event.""" enum EventEnum{CLICK_CHECK_LIST CLICK_GO_TO_GRAPH_SETTINGS RUN_EXPLORER_OPERATION}"""Excluded operation for a graph.""" type ExcludedOperation{"""Operation ID to exclude from schema check.""" ID:ID!}"""Option to filter by operation ID.""" input ExcludedOperationInput{"""Operation ID to exclude from schema check.""" ID:ID!}type FeatureIntros{devGraph:Boolean!federatedGraph:Boolean!freeConsumerSeats:Boolean!}"""Feature Intros Input Type""" input FeatureIntrosInput{devGraph:Boolean federatedGraph:Boolean freeConsumerSeats:Boolean}"""Subgraph. Federated graph variants that are managed by Apollo Studio are composed of subgraphs. -See https://www.apollographql.com/docs/federation/managed-federation/overview/ for more information.""" type FederatedImplementingService{"""The subgraph schema actively published, used for composition for the graph variant this subgraph belongs to.""" activePartialSchema:PartialSchema!"""Timestamp of when this subgraph was created.""" createdAt:Timestamp!"""The ID of the graph this subgraph belongs to.""" graphID:String!"""Which variant of a graph this subgraph belongs to.""" graphVariant:String!"""Name of the subgraph.""" name:String!"""The particular version/edition of a subgraph, entered by users. Typically a Git SHA or docker image ID.""" revision:String!"""Timestamp for when this subgraph was updated.""" updatedAt:Timestamp!"""URL of the subgraph's GraphQL endpoint.""" url:String}"""A minimal representation of a federated implementing service, using only a name and partial schema SDL""" type FederatedImplementingServicePartialSchema{"""The name of the implementing service""" name:String!"""The partial schema of the implementing service""" sdl:String!}"""Container for a list of subgraphs composing a graph.""" type FederatedImplementingServices{"""The list of underlying subgraphs.""" services:[FederatedImplementingService!]!}"""Counts of changes at the field level, including objects, interfaces, and input fields.""" type FieldChangeSummaryCounts{"""Number of changes that are additions of fields to object, interface, and input types.""" additions:Int!"""Number of changes that are field edits. This includes fields changing type and any field -deprecation and description changes, but also includes any argument changes and any input object -field changes.""" edits:Int!"""Number of changes that are removals of fields from object, interface, and input types.""" removals:Int!}"""Columns of FieldExecutions.""" enum FieldExecutionsColumn{ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldExecutionsDimensions{fieldName:String parentType:String schemaTag:String serviceId:ID}"""Filter for data in FieldExecutions. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldExecutionsFilter{and:[FieldExecutionsFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldExecutionsFilterIn not:FieldExecutionsFilter or:[FieldExecutionsFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldExecutions. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldExecutionsFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldExecutionsMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input FieldExecutionsOrderBySpec{column:FieldExecutionsColumn!direction:Ordering!}type FieldExecutionsRecord{"""Dimensions of FieldExecutions that can be grouped by.""" groupBy:FieldExecutionsDimensions!"""Metrics of FieldExecutions that can be aggregated over.""" metrics:FieldExecutionsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of FieldLatencies.""" enum FieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in FieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldLatenciesFilter{and:[FieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldLatenciesFilterIn not:FieldLatenciesFilter or:[FieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input FieldLatenciesOrderBySpec{column:FieldLatenciesColumn!direction:Ordering!}type FieldLatenciesRecord{"""Dimensions of FieldLatencies that can be grouped by.""" groupBy:FieldLatenciesDimensions!"""Metrics of FieldLatencies that can be aggregated over.""" metrics:FieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of FieldRequestsByClientVersion.""" enum FieldRequestsByClientVersionColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldRequestsByClientVersionDimensions{clientName:String clientVersion:String fieldName:String parentType:String schemaTag:String serviceId:ID}"""Filter for data in FieldRequestsByClientVersion. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldRequestsByClientVersionFilter{and:[FieldRequestsByClientVersionFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldRequestsByClientVersionFilterIn not:FieldRequestsByClientVersionFilter or:[FieldRequestsByClientVersionFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldRequestsByClientVersion. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldRequestsByClientVersionFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldRequestsByClientVersionMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input FieldRequestsByClientVersionOrderBySpec{column:FieldRequestsByClientVersionColumn!direction:Ordering!}type FieldRequestsByClientVersionRecord{"""Dimensions of FieldRequestsByClientVersion that can be grouped by.""" groupBy:FieldRequestsByClientVersionDimensions!"""Metrics of FieldRequestsByClientVersion that can be aggregated over.""" metrics:FieldRequestsByClientVersionMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of FieldUsage.""" enum FieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in FieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldUsageFilter{and:[FieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldUsageFilterIn not:FieldUsageFilter or:[FieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input FieldUsageOrderBySpec{column:FieldUsageColumn!direction:Ordering!}type FieldUsageRecord{"""Dimensions of FieldUsage that can be grouped by.""" groupBy:FieldUsageDimensions!"""Metrics of FieldUsage that can be aggregated over.""" metrics:FieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type FilterBuildInput{filterConfig:FilterConfig!schemaHash:String!}type FilterConfig{exclude:[String!]!include:[String!]!}input FilterConfigInput{exclude:[String!]!include:[String!]!}type GitContext{branch:String commit:ID commitUrl:String committer:String message:String remoteHost:GitRemoteHost remoteUrl:String}"""This is stored with a schema when it is uploaded""" input GitContextInput{branch:String commit:ID committer:String message:String remoteUrl:String}enum GitRemoteHost{BITBUCKET GITHUB GITLAB}type GlobalExperimentalFeatures{operationsCollections:Boolean!sandboxesFullRelease:Boolean!sandboxesPreview:Boolean!sandboxesSchemaChecksPage:Boolean!sandboxesSchemaDiffPage:Boolean!subgraphsInSandbox:Boolean!}type GraphApiKey implements ApiKey{createdAt:Timestamp!createdBy:Identity id:ID!keyName:String role:UserPermission!token:String!}"""A union of all combinations that can comprise the implementingServices for a Service""" union GraphImplementors=FederatedImplementingServices|NonFederatedImplementingService scalar GraphQLDocument """A variant of a graph, often corresponding to an environment where a graph runs (e.g. staging). -See https://www.apollographql.com/docs/studio/org/graphs/ for more details.""" type GraphVariant{"""As new schema tags keep getting published, activeSchemaPublish refers to the latest.""" activeSchemaPublish:SchemaTag """The version of composition currently in use, if applicable""" compositionVersion:String """Filter configuration used to create the contract schema""" contractFilterConfig:FilterConfig """Preview a Contract schema built from this source variant.""" contractPreview(filters:FilterConfigInput!):ContractPreview!defaultHeaders:String@deprecated(reason:"Use sharedHeaders instead")derivedVariantCount:Int!"""Graph the variant belongs to.""" graph:Service!"""Graph ID of the variant. Prefer using graph { id } when feasible.""" graphId:String!"""If the variant has managed subgraphs.""" hasManagedSubgraphs:Boolean """Global identifier for the graph variant, in the form `graph@variant`.""" id:ID!"""Represents whether this variant is a Contract.""" isContract:Boolean!"""Is this variant one of the current user's favorite variants?""" isFavoriteOfCurrentUser:Boolean!"""If the variant has managed subgraphs.""" isFederated:Boolean@deprecated(reason:"Replaced by hasManagedSubgraphs")"""If the variant is protected""" isProtected:Boolean!isPublic:Boolean!"""Represents whether this variant should be listed in the public variants directory. This can only be true if the variant is also public.""" isPubliclyListed:Boolean!"""Represents whether Apollo has verified the authenticity of this public variant. This can only be true if the variant is also public.""" isVerified:Boolean!"""Latest approved launch for the variant, and what is served through Uplink.""" latestApprovedLaunch:Launch """Latest launch for the variant, whether successful or not.""" latestLaunch:Launch """Latest publication for the variant.""" latestPublication:SchemaTag launch(id:ID!):Launch launchHistory(limit:Int!=100):[Launch!]!links:[LinkInfo!]"""Name of the variant, like `variant`.""" name:String!operationCollections:[OperationCollection!]!"""Which permissions the current user has for interacting with this variant""" permissions:GraphVariantPermissions!"""Generate a federated operation plan for a given operation""" plan(document:GraphQLDocument!operationName:String):QueryPlan """Explorer setting for preflight script to run before the actual GraphQL operations is run.""" preflightScript:String readme:Readme """Registry stats for this particular graph variant""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow """The total number of requests for this variant in the last 24 hours""" requestsInLastDay:Long """If the graphql endpoint is set up to accept cookies.""" sendCookies:Boolean """Explorer setting for shared headers for a graph""" sharedHeaders:String sourceVariant:GraphVariant """Subgraph of a given name, null if non-existent.""" subgraph(name:ID!):FederatedImplementingService """List of subgraphs that comprise a variant, null if not federated. -Set includeDeleted to see deleted subgraphs.""" subgraphs(includeDeleted:Boolean!=false):[FederatedImplementingService!]"""URL where subscription operations can be executed.""" subscriptionUrl:String """A list of supported directives""" supportedDirectives:[DirectiveSupportStatus!]"""URL where non-subscription operations can be executed.""" url:String """The last instant that usage information (e.g. operation stat, client stats) was reported for this variant""" usageLastReportedAt:Timestamp}"""Result of looking up a variant by ref""" union GraphVariantLookup=GraphVariant|InvalidRefFormat """Modifies a variant of a graph, also called a schema tag in parts of our product.""" type GraphVariantMutation{addLinkToVariant(title:String type:LinkInfoType!url:String!):GraphVariant!configureComposition(enableTagAndInaccessible:Boolean version:String):GraphVariant """Delete the variant.""" delete:DeleteSchemaTagResult!enableTagAndInaccessible(enabled:Boolean!):GraphVariant@deprecated(reason:"Use configureComposition instead")"""Graph ID of the variant""" graphId:String!"""Global identifier for the graph variant, in the form `graph@variant`.""" id:ID!"""Name of the variant, like `variant`.""" name:String!relaunch:RelaunchResult!removeLinkFromVariant(linkInfoId:ID!):GraphVariant!setIsFavoriteOfCurrentUser(favorite:Boolean!):GraphVariant!updateDefaultHeaders(defaultHeaders:String):GraphVariant@deprecated(reason:"Use updateSharedHeaders instead")updateIsProtected(isProtected:Boolean!):GraphVariant updatePreflightScript(preflightScript:String):GraphVariant updateSendCookies(sendCookies:Boolean!):GraphVariant updateSharedHeaders(sharedHeaders:String):GraphVariant updateSubscriptionURL(subscriptionUrl:String):GraphVariant updateURL(url:String):GraphVariant updateVariantIsPublic(isPublic:Boolean!):GraphVariant updateVariantIsPubliclyListed(isPubliclyListed:Boolean!):GraphVariant updateVariantIsVerified(isVerified:Boolean!):GraphVariant updateVariantReadme(readme:String!):GraphVariant}"""A map from permission String to boolean that the currently authenticated user is allowed for a particular graph variant.""" type GraphVariantPermissions{canCreateCollectionInVariant:Boolean!"""Whether the currently authenticated user is permitted to manage/update the build configuration (e.g. build pipeline version) for this variant.""" canManageBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to update variant-level settings for the Schema Explorer.""" canManageExplorerSettings:Boolean!"""Whether the currently authenticated user is permitted to publish schemas to this variant.""" canPushSchemas:Boolean!"""Whether the currently authenticated user is permitted to view details regarding the build configuration (e.g. build pipeline version) for this variant.""" canQueryBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to download schemas associated to this variant.""" canQuerySchemas:Boolean!canShareCollectionInVariant:Boolean!canUpdateVariantLinkInfo:Boolean!"""Whether the currently authenticated user is permitted to update the README for this variant.""" canUpdateVariantReadme:Boolean!variantId:ID!}enum HTTPMethod{CONNECT DELETE GET HEAD OPTIONS PATCH POST PUT TRACE UNKNOWN UNRECOGNIZED}input HistoricQueryParameters{"""A list of clients to filter out during validation.""" excludedClients:[ClientInfoFilter!]=null """A list of operation names to filter out during validation.""" excludedOperationNames:[OperationNameFilterInput!]=null from:Timestamp="-86400" """A list of operation IDs to filter out during validation.""" ignoredOperations:[ID!]=null """A list of variants to include in the validation. If no variants are provided -then this defaults to the "current" variant along with the base variant. The -base variant indicates the schema that generates diff and marks the metrics that -are checked for broken queries. We union this base variant with the untagged values('', -same as null inside of `in`, and 'current') in this metrics fetch. This strategy -supports users who have not tagged their metrics or schema.""" includedVariants:[String!]=null """Minimum number of requests within the window for a query to be considered.""" queryCountThreshold:Int=1 """Number of requests within the window for a query to be considered, relative to -total request count. Expected values are between 0 and 0.05 (minimum 5% of total -request volume)""" queryCountThresholdPercentage:Float=0 to:Timestamp="-0"}"""An identity (e.g. Anonymous, a specific User) within Apollo Studio. See implementations.""" interface Identity{"""A view of the identity as an Actor type.""" asActor:Actor!"""An identifier for a given identity, unique within the context of the identity type.""" id:ID!"""A human-readable name for the identity in question.""" name:String!}"""An actor's identity and info about the client they used to perform the action""" type IdentityAndClientInfo{"""Client name provided when the actor performed the action""" clientName:String """Client version provided when the actor performed the action""" clientVersion:String """Identity info about the actor""" identity:Identity}union IdentityMutation=ServiceMutation|UserMutation type IgnoreOperationsInChecksResult{graph:Service!}"""The location of the implementing service config file in storage""" type ImplementingServiceLocation{"""The name of the implementing service""" name:String!"""The path in storage to access the implementing service config file""" path:String!}type InternalAdminUser{role:InternalMdgAdminRole!userID:String!}type InternalIdentity implements Identity{accounts:[Account!]!asActor:Actor!email:String id:ID!name:String!}enum InternalMdgAdminRole{INTERNAL_MDG_READ_ONLY INTERNAL_MDG_SALES INTERNAL_MDG_SUPER_ADMIN INTERNAL_MDG_SUPPORT}type IntrospectionDirective{args:[IntrospectionInputValue!]!description:String locations:[IntrospectionDirectiveLocation!]!name:String!}input IntrospectionDirectiveInput{args:[IntrospectionInputValueInput!]!description:String isRepeatable:Boolean locations:[IntrospectionDirectiveLocation!]!name:String!}"""__DirectiveLocation introspection type""" enum IntrospectionDirectiveLocation{"""Location adjacent to an argument definition.""" ARGUMENT_DEFINITION """Location adjacent to an enum definition.""" ENUM """Location adjacent to an enum value definition.""" ENUM_VALUE """Location adjacent to a field.""" FIELD """Location adjacent to a field definition.""" FIELD_DEFINITION """Location adjacent to a fragment definition.""" FRAGMENT_DEFINITION """Location adjacent to a fragment spread.""" FRAGMENT_SPREAD """Location adjacent to an inline fragment.""" INLINE_FRAGMENT """Location adjacent to an input object field definition.""" INPUT_FIELD_DEFINITION """Location adjacent to an input object type definition.""" INPUT_OBJECT """Location adjacent to an interface definition.""" INTERFACE """Location adjacent to a mutation operation.""" MUTATION """Location adjacent to an object type definition.""" OBJECT """Location adjacent to a query operation.""" QUERY """Location adjacent to a scalar definition.""" SCALAR """Location adjacent to a schema definition.""" SCHEMA """Location adjacent to a subscription operation.""" SUBSCRIPTION """Location adjacent to a union definition.""" UNION """Location adjacent to a variable definition.""" VARIABLE_DEFINITION}"""Values associated with introspection result for an enum value""" type IntrospectionEnumValue{depreactionReason:String@deprecated(reason:"Use deprecationReason instead")deprecationReason:String description:String isDeprecated:Boolean!name:String!}"""__EnumValue introspection type""" input IntrospectionEnumValueInput{deprecationReason:String description:String isDeprecated:Boolean!name:String!}"""Values associated with introspection result for field""" type IntrospectionField{args:[IntrospectionInputValue!]!deprecationReason:String description:String isDeprecated:Boolean!name:String!type:IntrospectionType!}"""__Field introspection type""" input IntrospectionFieldInput{args:[IntrospectionInputValueInput!]!deprecationReason:String description:String isDeprecated:Boolean!name:String!type:IntrospectionTypeInput!}"""Values associated with introspection result for an input field""" type IntrospectionInputValue{defaultValue:String description:String name:String!type:IntrospectionType!}"""__Value introspection type""" input IntrospectionInputValueInput{defaultValue:String deprecationReason:String description:String isDeprecated:Boolean name:String!type:IntrospectionTypeInput!}type IntrospectionSchema{directives:[IntrospectionDirective!]!mutationType:IntrospectionType queryType:IntrospectionType!subscriptionType:IntrospectionType types(filter:TypeFilterConfig={includeAbstractTypes:true includeBuiltInTypes:true includeIntrospectionTypes:true}):[IntrospectionType!]!}"""__Schema introspection type""" input IntrospectionSchemaInput{description:String directives:[IntrospectionDirectiveInput!]!mutationType:IntrospectionTypeRefInput queryType:IntrospectionTypeRefInput!subscriptionType:IntrospectionTypeRefInput types:[IntrospectionTypeInput!]}"""Object containing all possible values for an introspectionType""" type IntrospectionType{"""the base kind of the type this references, ignoring lists and nullability""" baseKind:IntrospectionTypeKind description:String enumValues(includeDeprecated:Boolean=false):[IntrospectionEnumValue!]fields:[IntrospectionField!]inputFields:[IntrospectionInputValue!]interfaces:[IntrospectionType!]kind:IntrospectionTypeKind name:String ofType:IntrospectionType possibleTypes:[IntrospectionType!]"""printed representation of type, including nested nullability and list ofTypes""" printed:String!}"""__Type introspection type""" input IntrospectionTypeInput{description:String enumValues:[IntrospectionEnumValueInput!]fields:[IntrospectionFieldInput!]inputFields:[IntrospectionInputValueInput!]interfaces:[IntrospectionTypeInput!]kind:IntrospectionTypeKind!name:String ofType:IntrospectionTypeInput possibleTypes:[IntrospectionTypeInput!]specifiedByUrl:String}enum IntrospectionTypeKind{"""Indicates this type is an enum. 'enumValues' is a valid field.""" ENUM """Indicates this type is an input object. 'inputFields' is a valid field.""" INPUT_OBJECT """Indicates this type is an interface. 'fields' and 'possibleTypes' are valid -fields""" INTERFACE """Indicates this type is a list. 'ofType' is a valid field.""" LIST """Indicates this type is a non-null. 'ofType' is a valid field.""" NON_NULL """Indicates this type is an object. 'fields' and 'interfaces' are valid fields.""" OBJECT """Indicates this type is a scalar.""" SCALAR """Indicates this type is a union. 'possibleTypes' is a valid field.""" UNION}"""Shallow __Type introspection type""" input IntrospectionTypeRefInput{kind:String name:String!}type InvalidOperation{errors:[OperationValidationError!]signature:ID!}"""Type returned by reference lookup when the reference was invalid""" type InvalidRefFormat implements Error{message:String!}type InvalidTarget implements Error{message:String!}type Invoice{closedAt:Timestamp collectionMethod:String createdAt:Timestamp!invoiceNumber:Int!state:InvoiceState!totalInCents:Int!updatedAt:Timestamp!uuid:ID!}enum InvoiceState{COLLECTED FAILED OPEN PAST_DUE UNKNOWN}enum InvoiceStateV2{COLLECTED FAILED OPEN PAST_DUE UNKNOWN}type InvoiceV2{closedAt:Timestamp collectionMethod:String createdAt:Timestamp!invoiceNumber:Int!state:InvoiceStateV2!totalInCents:Int!updatedAt:Timestamp!uuid:ID!}"""A Launch represents the complete process of making a set of updates to your deployed graph.""" type Launch{"""The time at which this launch was approved.""" approvedAt:Timestamp """The build for the variant being launched. Is non-null once the build is initiated.""" build:Build """Set of items that will be passed to the build.""" buildInput:BuildInput!"""The time at which this launch completed.""" completedAt:Timestamp """The time at which this launch initiated.""" createdAt:Timestamp!"""Contract launches that were triggered by this launch.""" downstreamLaunches:[Launch!]!"""The ID of the graph that this launch was initiated for.""" graphId:String!"""The name of the variant that this launch was initiated for.""" graphVariant:String!"""Unique identifier for this launch.""" id:ID!isAvailable:Boolean """Whether the launch completed.""" isCompleted:Boolean """Whether the launch was published.""" isPublished:Boolean isTarget:Boolean """Returns the most recent launch sequence step.""" latestSequenceStep:LaunchSequenceStep """A specific publication of a graph variant pertaining to this launch.""" publication:SchemaTag """The outcome of the launch.""" results:[LaunchResult!]!schemaTag:SchemaTag """This represents a sequence in the Launch. Returns a list of sequence steps that represents points of time in the launch.""" sequence:[LaunchSequenceStep!]!"""A shortened version of Launch.id. Contains the first 8 characters of the ID.""" shortenedID:String!"""The status of the launch.""" status:LaunchStatus!"""Changes that were made to the subgraphs for this launch.""" subgraphChanges:[SubgraphChange!]"""The time at which this launch was superseded by another launch.""" supersededAt:Timestamp """Represents the launch that caused this launch to not continue/publish.""" supersededBy:Launch """Upstream launch represents the launch of the source variant.""" upstreamLaunch:Launch}"""more result types will be supported in the future""" union LaunchResult=ChangelogLaunchResult type LaunchSequenceBuildStep{completedAt:Timestamp startedAt:Timestamp}type LaunchSequenceCheckStep{completedAt:Timestamp startedAt:Timestamp}type LaunchSequenceCompletedStep{completedAt:Timestamp}type LaunchSequenceInitiatedStep{startedAt:Timestamp}type LaunchSequencePublishStep{completedAt:Timestamp startedAt:Timestamp}union LaunchSequenceStep=LaunchSequenceBuildStep|LaunchSequenceCheckStep|LaunchSequenceCompletedStep|LaunchSequenceInitiatedStep|LaunchSequencePublishStep|LaunchSequenceSupersededStep type LaunchSequenceSupersededStep{completedAt:Timestamp}enum LaunchStatus{LAUNCH_COMPLETED LAUNCH_FAILED LAUNCH_INITIATED}type LinkInfo{createdAt:Timestamp!id:ID!title:String type:LinkInfoType!url:String!}enum LinkInfoType{DEVELOPER_PORTAL OTHER REPOSITORY}"""Long type""" scalar Long type MarkChangesForOperationAsSafeResult{"""Nice to have for the frontend since the Apollo cache is already watching for AffectedQuery to update. -This might return null if no behavior changes were found for the affected operation ID. -This is a weird situation that should never happen.""" affectedOperation:AffectedQuery message:String!success:Boolean!}type MediaUploadInfo{csrfToken:String!maxContentLength:Int!url:String!}union MoveOperationCollectionEntryResult=InvalidTarget|MoveOperationCollectionEntrySuccess|PermissionError type MoveOperationCollectionEntrySuccess{operation:OperationCollectionEntry!originCollection:OperationCollection!targetCollection:OperationCollection!}type Mutation{account(id:ID!):AccountMutation """Creates an operation collection for the given variantRefs, or make a sandbox collection without variantRefs.""" createOperationCollection(description:String editRoles:[UserPermission!]isSandbox:Boolean!isShared:Boolean!name:String!variantRefs:[ID!]):CreateOperationCollectionResult!"""Finalize a password reset with a token included in the E-mail link, -returns the corresponding login email when successful""" finalizePasswordReset(newPassword:String!resetToken:String!):String """Mutation a graph.""" graph(id:ID!):ServiceMutation """Join an account with a token""" joinAccount(accountId:ID!joinToken:String!):Account me:IdentityMutation newAccount(companyUrl:String id:ID!):Account newService(accountId:ID!description:String hiddenFromUninvitedNonAdminAccountMembers:Boolean!=false id:ID!isDev:Boolean!=false name:String onboardingArchitecture:OnboardingArchitecture title:String):Service operationCollection(id:ID!):OperationCollectionMutation """Report a running GraphQL server's schema.""" reportSchema("""Only sent if previously requested i.e. received ReportSchemaResult with withCoreSchema = true. This is a GraphQL schema document as a string. Note that for a GraphQL server with a core schema, this should be the core schema, not the API schema.""" coreSchema:String """Information about server and its schema.""" report:SchemaReport!):ReportSchemaResult """Ask for a user's password to be reset by E-mail""" resetPassword(email:String!):Void resolveAllInternalCronExecutions(group:String name:String):Void resolveInternalCronExecution(id:ID!):CronExecution service(id:ID!):ServiceMutation """Set the subscriptions for a given email""" setSubscriptions(email:String!subscriptions:[EmailCategory!]!token:String!):EmailPreferences """Set the studio settings for the current user""" setUserSettings(newSettings:UserSettingsInput):UserSettings signUp(email:String!fullName:String!password:String!referrer:String trackingGoogleClientId:String trackingMarketoClientId:String userSegment:UserSegment utmCampaign:String utmMedium:String utmSource:String):User """This is called by the form shown to users after they delete their user or organization account.""" submitPostDeletionFeedback(feedback:String!targetIdentifier:ID!targetType:DeletionTargetType!):Void """Mutation for basic engagement tracking in studio""" track(event:EventEnum!graphID:String!graphVariant:String!="current"):Void """Rover session tracking. Reserved to https://rover.apollo.dev/telemetry (https://github.com/apollographql/orbiter).""" trackRoverSession(anonymousId:ID!arguments:[RoverArgumentInput!]!ci:String command:String!cwdHash:SHA256!os:String!remoteUrlHash:SHA256 sessionId:ID!version:String!):Void """Unsubscribe a given email from all emails""" unsubscribeFromAll(email:String!token:String!):EmailPreferences user(id:ID!):UserMutation}type NamedIntrospectionArg{description:String name:String}type NamedIntrospectionArgNoDescription{name:String}"""The shared fields for a named introspection type. Currently this is returned for the +ancestor) was added/removed. +""" +type ChangeSummary { + """ + Counts for changes to non-field aspects of objects, input objects, and interfaces, + and all aspects of enums, unions, and scalars. + """ + type: TypeChangeSummaryCounts! + """Counts for changes to fields of objects, input objects, and interfaces.""" + field: FieldChangeSummaryCounts! + """Counts for all changes.""" + total: TotalChangeSummaryCounts! +} + +enum ChangeType { + FAILURE + NOTICE +} + +"""Filter options available when listing checks.""" +input CheckFilterInput { + authors: [String!] + branches: [String!] + subgraphs: [String!] + status: CheckFilterInputStatusOption + variants: [String!] +} + +"""Options for filtering CheckWorkflows by status""" +enum CheckFilterInputStatusOption { + FAILED + PENDING + PASSED +} + +"""The result of performing a subgraph check, including all steps.""" +type CheckPartialSchemaResult { + """Result of compostion run as part of the overall subgraph check.""" + compositionValidationResult: CompositionCheckResult! + """Overall result of the check. This will be null if composition validation was unsuccessful.""" + checkSchemaResult: CheckSchemaResult + """Whether any modifications were detected in the composed core schema.""" + coreSchemaModified: Boolean! +} + +"""The possible results of a request to initiate schema checks (either a success object or one of multiple `Error` objects).""" +union CheckRequestResult = CheckRequestSuccess | InvalidInputError | PermissionError | PlanError + +"""Represents a successfully initiated execution of schema checks. This does not indicate the _result_ of the checks, only that they were initiated.""" +type CheckRequestSuccess { + """The URL of the Apollo Studio page for this check.""" + targetURL: String! + """The unique ID for this execution of schema checks.""" + workflowID: ID! +} + +"""Input type to provide when running schema checks asynchronously for a non-federated graph.""" +input CheckSchemaAsyncInput { + """Configuration options for the check execution.""" + config: HistoricQueryParametersInput! + """The GitHub context to associate with the check.""" + gitContext: GitContextInput! + graphRef: ID @deprecated(reason: "This field is not required to be sent anymore") + """The URL of the GraphQL endpoint that Apollo Sandbox introspected to obtain the proposed schema. Required if `isSandbox` is `true`.""" + introspectionEndpoint: String + """If `true`, the check was initiated by Apollo Sandbox.""" + isSandbox: Boolean! + proposedSchemaDocument: String +} + +"""The result of running schema checks on a graph variant.""" +type CheckSchemaResult { + """The schema diff and affected operations generated by the schema check.""" + diffToPrevious: SchemaDiff! + """The URL to view the schema diff in Studio.""" + targetUrl: String +} + +type CheckWorkflow { + """ + The variant provided as a base to check against. Only the differences from the + base schema will be tested in operations checks. + """ + baseVariant: GraphVariant + """The timestamp when the check workflow completed.""" + completedAt: Timestamp + id: ID! + """The name of the implementing service that was responsible for triggering the validation.""" + implementingServiceName: String + """The timestamp when the check workflow started.""" + startedAt: Timestamp + """Overall status of the workflow, based on the underlying task statuses.""" + status: CheckWorkflowStatus! + """The set of check tasks associated with this workflow, e.g. composition, operations, etc.""" + tasks: [CheckWorkflowTask!]! + """Contextual parameters supplied by the runtime environment where the check was run.""" + gitContext: GitContext + createdAt: Timestamp! +} + +enum CheckWorkflowStatus { + FAILED + PASSED + PENDING +} + +interface CheckWorkflowTask { + completedAt: Timestamp + createdAt: Timestamp! + id: ID! + """ + The status of this task. All tasks start with the PENDING status while initializing. If any + prerequisite task fails, then the task status becomes BLOCKED. Otherwise, if all prerequisite + tasks pass, then this task runs (still having the PENDING status). Once the task completes, the + task status will become either PASSED or FAILED. + """ + status: CheckWorkflowTaskStatus! + """A studio UI url to view the details of this check workflow task""" + targetURL: String + """The workflow that this task belongs to.""" + workflow: CheckWorkflow! +} + +enum CheckWorkflowTaskStatus { + BLOCKED + FAILED + PASSED + PENDING +} + +"""Filter options to exclude by client reference ID, client name, and client version.""" +input ClientInfoFilter { + name: String! + """Ignored""" + referenceID: ID + version: String +} + +"""The result of supergraph composition that Studio performed in response to an attempted deletion of a subgraph.""" +type SubgraphRemovalResult { + """A list of errors that occurred during composition. Errors mean that Apollo was unable to compose the graph variant's subgraphs into a supergraph schema. If any errors are present, gateways / routers are not updated.""" + errors: [SchemaCompositionError]! + """Whether this composition result resulted in a new supergraph schema passed to Uplink (`true`), or the build failed for any reason (`false`). For dry runs, this value is `true` if Uplink _would have_ been updated with the result.""" + updatedGateway: Boolean! +} + +"""The result of supergraph composition that Studio performed in response to an attempted publish of a subgraph.""" +type SubgraphPublicationResult { + """The generated composition config, or null if any errors occurred.""" + compositionConfig: CompositionConfig + """A list of errors that occurred during composition. Errors mean that Apollo was unable to compose the graph variant's subgraphs into a supergraph schema. If any errors are present, gateways / routers are not updated.""" + errors: [SchemaCompositionError]! + """Whether this composition result resulted in a new supergraph schema passed to Uplink (`true`), or the build failed for any reason (`false`). For dry runs, this value is `true` if Uplink _would have_ been updated with the result.""" + updatedGateway: Boolean! + """Whether a new subgraph was created as part of this publish.""" + wasCreated: Boolean! + """The URL of the Studio page for this update's associated launch, if available.""" + launchUrl: String + """Human-readable text describing the launch result of the subgraph publish.""" + launchCliCopy: String +} + +type CompositionBuildInput { + subgraphs: [Subgraph!]! + version: String +} + +type CompositionCheckTask implements CheckWorkflowTask { + completedAt: Timestamp + """ + Whether the build's output supergraph core schema differs from that of the active publish for + the workflow's variant at the time this field executed (NOT at the time the check workflow + started). + """ + coreSchemaModified: Boolean! + createdAt: Timestamp! + id: ID! + status: CheckWorkflowTaskStatus! + targetURL: String + workflow: CheckWorkflow! + """ + An old version of buildResult that returns a very old GraphQL type that generally should be + avoided. This field will soon be deprecated. + """ + result: CompositionResult +} + +"""Composition configuration exposed to the gateway.""" +type CompositionConfig { + """The resulting API schema's SHA256 hash, represented as a hexadecimal string.""" + schemaHash: String! +} + +"""The result of supergraph composition that Studio performed.""" +type CompositionPublishResult implements CompositionResult { + """The unique ID for this instance of composition.""" + graphCompositionID: ID! + """A list of errors that occurred during composition. Errors mean that Apollo was unable to compose the graph variant's subgraphs into a supergraph schema. If any errors are present, gateways / routers are not updated.""" + errors: [SchemaCompositionError!]! + """The supergraph SDL generated by composition.""" + supergraphSdl: GraphQLDocument +} + +"""The result of supergraph composition performed by Apollo Studio, often as the result of a subgraph check or subgraph publish. See individual implementations for more details.""" +interface CompositionResult { + """The unique ID for this instance of composition.""" + graphCompositionID: ID! + """A list of errors that occurred during composition. Errors mean that Apollo was unable to compose the graph variant's subgraphs into a supergraph schema. If any errors are present, gateways / routers are not updated.""" + errors: [SchemaCompositionError!]! + """Supergraph SDL generated by composition.""" + supergraphSdl: GraphQLDocument +} + +"""The result of composition validation run by Apollo Studio during a subgraph check.""" +type CompositionCheckResult implements CompositionResult { + """The unique ID for this instance of composition.""" + graphCompositionID: ID! + """A list of errors that occurred during composition. Errors mean that Apollo was unable to compose the graph variant's subgraphs into a supergraph schema. If any errors are present, gateways / routers are not updated.""" + errors: [SchemaCompositionError!]! + """The supergraph schema document generated by composition.""" + supergraphSdl: GraphQLDocument +} + +type ContractVariantUpsertErrors { + """A list of all errors that occurred when attempting to create or update a contract variant.""" + errorMessages: [String!]! +} + +union ContractVariantUpsertResult = ContractVariantUpsertErrors | ContractVariantUpsertSuccess + +type ContractVariantUpsertSuccess { + """The updated contract variant""" + contractVariant: GraphVariant! + """Human-readable text describing the launch result of the contract update.""" + launchCliCopy: String + """The URL of the Studio page for this update's associated launch, if available.""" + launchUrl: String +} + +"""Contains the supergraph and API schemas generated by composition.""" +type CoreSchema { + """The composed API schema document.""" + apiDocument: GraphQLDocument! + """The composed supergraph schema document.""" + coreDocument: GraphQLDocument! + """The supergraph schema document's SHA256 hash, represented as a hexadecimal string.""" + coreHash: String! +} + +union CreateOperationCollectionResult = OperationCollection | PermissionError | ValidationError + +""" +Implement the DateTime<Utc> scalar + +The input/output is a string in RFC3339 format. +""" +scalar DateTime @specifiedBy(url: "https://datatracker.ietf.org/doc/html/rfc3339") + +union DeleteOperationCollectionResult = PermissionError + +"""The result of attempting to delete a graph variant.""" +type GraphVariantDeletionResult { + """Whether the variant was deleted or not.""" + deleted: Boolean! +} + +"""The result of a schema checks workflow that was run on a downstream variant as part of checks for the corresponding source variant. Most commonly, these downstream checks are [contract checks](https://www.apollographql.com/docs/studio/contracts#contract-checks).""" +type DownstreamCheckResult { + """Whether the downstream check workflow blocks the upstream check workflow from completing.""" + blocking: Boolean! + """The ID of the graph that the downstream variant belongs to.""" + downstreamGraphID: String! + """The name of the downstream variant.""" + downstreamVariantName: String! + """ + The downstream checks workflow that this result corresponds to. This value is null + if the workflow hasn't been initialized yet, or if the downstream variant was deleted. + """ + downstreamWorkflow: CheckWorkflow + """ + Whether the downstream check workflow is causing the upstream check workflow to fail. This occurs + when the downstream check workflow is both blocking and failing. This may be null while the + downstream check workflow is pending. + """ + failsUpstreamWorkflow: Boolean + """The downstream checks task that this result corresponds to.""" + workflowTask: DownstreamCheckTask! +} + +type DownstreamCheckTask implements CheckWorkflowTask { + completedAt: Timestamp + createdAt: Timestamp! + id: ID! + """ + A list of results for all downstream checks triggered as part of the source variant's checks workflow. + This value is null if the task hasn't been initialized yet, or if the build task fails (the build task is a + prerequisite to this task). This value is _not_ null _while_ the task is running. The returned list is empty + if the source variant has no downstream variants. + """ + results: [DownstreamCheckResult!] + status: CheckWorkflowTaskStatus! + targetURL: String + workflow: CheckWorkflow! +} + +interface Error { + message: String! +} + +"""A single subgraph in a supergraph. Every supergraph managed by Apollo Studio includes at least one subgraph. See https://www.apollographql.com/docs/federation/managed-federation/overview/ for more information.""" +type GraphVariantSubgraph { + """The subgraph's name.""" + name: String! + """The URL of the subgraph's GraphQL endpoint.""" + url: String + """The current user-provided version/edition of the subgraph. Typically a Git SHA or docker image ID.""" + revision: String! + """The ID of the graph this subgraph belongs to.""" + graphID: String! + """The name of the graph variant this subgraph belongs to.""" + graphVariant: String! + """The subgraph's current active schema, used in supergraph composition for the the associated variant.""" + activePartialSchema: SubgraphSchema! + """The timestamp when the subgraph was created.""" + createdAt: Timestamp! + """The timestamp when the subgraph was most recently updated.""" + updatedAt: Timestamp! +} + +"""Container for a list of subgraphs composing a supergraph.""" +type GraphVariantSubgraphs { + """The list of underlying subgraphs.""" + services: [GraphVariantSubgraph!]! +} + +"""Counts of changes at the field level, including objects, interfaces, and input fields.""" +type FieldChangeSummaryCounts { + """Number of changes that are additions of fields to object, interface, and input types.""" + additions: Int! + """Number of changes that are removals of fields from object, interface, and input types.""" + removals: Int! + """ + Number of changes that are field edits. This includes fields changing type and any field + deprecation and description changes, but also includes any argument changes and any input object + field changes. + """ + edits: Int! +} + +"""Inputs provided to the build for a contract variant, which filters types and fields from a source variant's schema.""" +type FilterBuildInput { + """Schema filtering rules for the build, such as tags to include or exclude from the source variant schema.""" + filterConfig: FilterConfig! + """The source variant schema document's SHA256 hash, represented as a hexadecimal string.""" + schemaHash: String! +} + +type FilterCheckTask implements CheckWorkflowTask { + completedAt: Timestamp + createdAt: Timestamp! + id: ID! + status: CheckWorkflowTaskStatus! + targetURL: String + workflow: CheckWorkflow! +} + +"""The filter configuration used to build a contract schema. The configuration consists of lists of tags for schema elements to include or exclude in the resulting schema.""" +type FilterConfig { + """Tags of schema elements to exclude from the contract schema.""" + exclude: [String!]! + """Tags of schema elements to include in the contract schema.""" + include: [String!]! +} + +input FilterConfigInput { + """A list of tags for schema elements to exclude from the resulting contract schema.""" + exclude: [String!]! + """ + Whether to hide unreachable objects, interfaces, unions, inputs, enums and scalars from + the resulting contract schema. Defaults to `false`. + """ + hideUnreachableTypes: Boolean! = false + """A list of tags for schema elements to include in the resulting contract schema.""" + include: [String!]! +} + +type GitContext { + commit: ID +} + +"""Input type to provide when specifying the Git context for a run of schema checks.""" +input GitContextInput { + """The Git repository branch used in the check.""" + branch: String + """The ID of the Git commit used in the check.""" + commit: ID + """The username of the user who created the Git commit used in the check.""" + committer: String + """The commit message of the Git commit used in the check.""" + message: String + """The Git repository's remote URL.""" + remoteUrl: String +} + +""" +Represents a graph API key, which has permissions scoped to a +user role for a single Apollo graph. +""" +type GraphApiKey implements ApiKey { + """The timestamp when the API key was created.""" + createdAt: Timestamp! + """Details of the user or graph that created the API key.""" + createdBy: Identity + """The API key's ID.""" + id: ID! + """The API key's name, for distinguishing it from other keys.""" + keyName: String + """The permission level assigned to the API key upon creation.""" + role: UserPermission! + """The value of the API key. **This is a secret credential!**""" + token: String! +} + +"""A union of all containers that can comprise the components of a Studio graph""" +union GraphImplementors = GraphVariantSubgraphs + +"""A GraphQL document, such as the definition of an operation or schema.""" +scalar GraphQLDocument + +"""A graph variant""" +type GraphVariant { + """The variant's global identifier in the form `graphID@variant`.""" + id: ID! + router: Router + """The filter configuration used to build a contract schema. The configuration consists of lists of tags for schema elements to include or exclude in the resulting schema.""" + contractFilterConfig: FilterConfig + """ + A human-readable description of the filter configuration of this contract variant, or null if this isn't a contract + variant. + """ + contractFilterConfigDescription: String + """The graph that this variant belongs to.""" + graph: Graph! + """Latest approved launch for the variant, and what is served through Uplink.""" + latestApprovedLaunch: Launch + """Latest launch for the variant, whether successful or not.""" + latestLaunch: Launch + """The variant's name (e.g., `staging`).""" + name: String! + """Which permissions the current user has for interacting with this variant""" + permissions: GraphVariantPermissions! + readme: Readme! + """The variant this variant is derived from. This property currently only exists on contract variants.""" + sourceVariant: GraphVariant + """A list of the saved [operation collections](https://www.apollographql.com/docs/studio/explorer/operation-collections/) associated with this variant.""" + operationCollections: [OperationCollection!]! + """The URL of the variant's GraphQL endpoint for query and mutation operations. For subscription operations, use `subscriptionUrl`.""" + url: String + """The URL of the variant's GraphQL endpoint for subscription operations.""" + subscriptionUrl: String + """The details of the variant's most recent publication.""" + latestPublication: SchemaPublication + """A list of the subgraphs included in this variant. This value is null for non-federated variants. Set `includeDeleted` to `true` to include deleted subgraphs.""" + subgraphs(includeDeleted: Boolean! = false): [GraphVariantSubgraph!] + """Returns the details of the subgraph with the provided `name`, or null if this variant doesn't include a subgraph with that name.""" + subgraph(name: ID!): GraphVariantSubgraph +} + +"""Result of looking up a variant by ref""" +union GraphVariantLookup = GraphVariant | InvalidRefFormat + +"""Modifies a variant of a graph, also called a schema tag in parts of our product.""" +type GraphVariantMutation { + """ + _Asynchronously_ kicks off operation checks for a proposed non-federated + schema change against its associated graph. + + Returns a `CheckRequestSuccess` object with a workflow ID that you can use + to check status, or an error object if the checks workflow failed to start. + """ + submitCheckSchemaAsync(input: CheckSchemaAsyncInput!): CheckRequestResult! + """ + _Asynchronously_ kicks off composition and operation checks for a proposed subgraph schema change against its associated supergraph. + + Returns a `CheckRequestSuccess` object with a workflow ID that you can use + to check status, or an error object if the checks workflow failed to start. + """ + submitSubgraphCheckAsync(input: SubgraphCheckAsyncInput!): CheckRequestResult! + """Updates the [README](https://www.apollographql.com/docs/studio/org/graphs/#the-readme-page) of this variant.""" + updateVariantReadme( + """The full new text of the README, as a Markdown-formatted string.""" + readme: String! + ): GraphVariant + """Delete the variant.""" + delete: GraphVariantDeletionResult! +} + +"""Individual permissions for the current user when interacting with a particular Studio graph variant.""" +type GraphVariantPermissions { + """Whether the currently authenticated user is permitted to manage/update this variant's build configuration (e.g., build pipeline version).""" + canManageBuildConfig: Boolean! + """Whether the currently authenticated user is permitted to manage/update cloud routers""" + canManageCloudRouter: Boolean! + """Whether the currently authenticated user is permitted to update variant-level settings for the Apollo Studio Explorer.""" + canManageExplorerSettings: Boolean! + """Whether the currently authenticated user is permitted to publish schemas to this variant.""" + canPushSchemas: Boolean! + """Whether the currently authenticated user is permitted to view this variant's build configuration details (e.g., build pipeline version).""" + canQueryBuildConfig: Boolean! + """Whether the currently authenticated user is permitted to view details regarding cloud routers""" + canQueryCloudRouter: Boolean! + """Whether the currently authenticated user is permitted to view cloud router logs""" + canQueryCloudRouterLogs: Boolean! + """Whether the currently authenticated user is permitted to download schemas associated to this variant.""" + canQuerySchemas: Boolean! + """Whether the currently authenticated user is permitted to update the README for this variant.""" + canUpdateVariantReadme: Boolean! + canCreateCollectionInVariant: Boolean! + canShareCollectionInVariant: Boolean! +} + +input HistoricQueryParameters { + from: String = "-86400" + to: String = "0" + """Minimum number of requests within the window for a query to be considered.""" + queryCountThreshold: Int = 1 + """ + Number of requests within the window for a query to be considered, relative to + total request count. Expected values are between 0 and 0.05 (minimum 5% of total + request volume) + """ + queryCountThresholdPercentage: Float = 0 + """A list of operation IDs to filter out during validation.""" + ignoredOperations: [ID!] = null + """A list of clients to filter out during validation.""" + excludedClients: [ClientInfoFilter!] = null + """A list of operation names to filter out during validation.""" + excludedOperationNames: [OperationNameFilterInput!] = null + """ + A list of variants to include in the validation. If no variants are provided + then this defaults to the "current" variant along with the base variant. The + base variant indicates the schema that generates diff and marks the metrics that + are checked for broken queries. We union this base variant with the untagged values('', + same as null inside of `in`, and 'current') in this metrics fetch. This strategy + supports users who have not tagged their metrics or schema. + """ + includedVariants: [String!] = null +} + +"""Input type to provide when specifying configuration details for schema checks.""" +input HistoricQueryParametersInput { + """Clients to be excluded from check.""" + excludedClients: [ClientInfoFilter!] + """Operations to be ignored in this schema check, specified by operation name.""" + excludedOperationNames: [OperationNameFilterInput!] + """Start time for operations to be checked against. Specified as either a) an ISO formatted date/time string or b) a negative number of seconds relative to the time the check request was submitted.""" + from: String + """Operations to be ignored in this schema check, specified by ID.""" + ignoredOperations: [ID!] + """Graph variants to be included in check.""" + includedVariants: [String!] + """Maximum number of queries to be checked against the change.""" + queryCountThreshold: Int + """Only fail check if this percentage of operations would be negatively impacted.""" + queryCountThresholdPercentage: Float + """End time for operations to be checked against. Specified as either a) an ISO formatted date/time string or b) a negative number of seconds relative to the time the check request was submitted.""" + to: String +} + +"""An identity (such as a `User` or `Graph`) in Apollo Studio. See implementing types for details.""" +interface Identity { + """Returns a representation of the identity as an `Actor` type.""" + asActor: Actor! + """The identity's identifier, which is unique among objects of its type.""" + id: ID! + """The identity's human-readable name.""" + name: String! +} + +type InternalIdentity implements Identity { + accounts: [Organization!]! + asActor: Actor! + email: String + id: ID! + name: String! +} + +input IntrospectionDirectiveInput { + name: String! + description: String + locations: [IntrospectionDirectiveLocation!]! + args: [IntrospectionInputValueInput!]! + isRepeatable: Boolean +} + +"""__DirectiveLocation introspection type""" +enum IntrospectionDirectiveLocation { + """Location adjacent to a query operation.""" + QUERY + """Location adjacent to a mutation operation.""" + MUTATION + """Location adjacent to a subscription operation.""" + SUBSCRIPTION + """Location adjacent to a field.""" + FIELD + """Location adjacent to a fragment definition.""" + FRAGMENT_DEFINITION + """Location adjacent to a fragment spread.""" + FRAGMENT_SPREAD + """Location adjacent to an inline fragment.""" + INLINE_FRAGMENT + """Location adjacent to a variable definition.""" + VARIABLE_DEFINITION + """Location adjacent to a schema definition.""" + SCHEMA + """Location adjacent to a scalar definition.""" + SCALAR + """Location adjacent to an object type definition.""" + OBJECT + """Location adjacent to a field definition.""" + FIELD_DEFINITION + """Location adjacent to an argument definition.""" + ARGUMENT_DEFINITION + """Location adjacent to an interface definition.""" + INTERFACE + """Location adjacent to a union definition.""" + UNION + """Location adjacent to an enum definition.""" + ENUM + """Location adjacent to an enum value definition.""" + ENUM_VALUE + """Location adjacent to an input object type definition.""" + INPUT_OBJECT + """Location adjacent to an input object field definition.""" + INPUT_FIELD_DEFINITION +} + +"""__EnumValue introspection type""" +input IntrospectionEnumValueInput { + name: String! + description: String + isDeprecated: Boolean! + deprecationReason: String +} + +"""__Field introspection type""" +input IntrospectionFieldInput { + name: String! + description: String + args: [IntrospectionInputValueInput!]! + type: IntrospectionTypeInput! + isDeprecated: Boolean! + deprecationReason: String +} + +"""__Value introspection type""" +input IntrospectionInputValueInput { + name: String! + description: String + type: IntrospectionTypeInput! + defaultValue: String + isDeprecated: Boolean + deprecationReason: String +} + +"""__Schema introspection type""" +input IntrospectionSchemaInput { + types: [IntrospectionTypeInput!] + queryType: IntrospectionTypeRefInput! + mutationType: IntrospectionTypeRefInput + subscriptionType: IntrospectionTypeRefInput + directives: [IntrospectionDirectiveInput!]! + description: String +} + +"""__Type introspection type""" +input IntrospectionTypeInput { + kind: IntrospectionTypeKind! + name: String + description: String + specifiedByUrl: String + fields: [IntrospectionFieldInput!] + interfaces: [IntrospectionTypeInput!] + possibleTypes: [IntrospectionTypeInput!] + enumValues: [IntrospectionEnumValueInput!] + inputFields: [IntrospectionInputValueInput!] + ofType: IntrospectionTypeInput +} + +enum IntrospectionTypeKind { + """Indicates this type is a scalar.""" + SCALAR + """Indicates this type is an object. 'fields' and 'interfaces' are valid fields.""" + OBJECT + """ + Indicates this type is an interface. 'fields' and 'possibleTypes' are valid + fields + """ + INTERFACE + """Indicates this type is a union. 'possibleTypes' is a valid field.""" + UNION + """Indicates this type is an enum. 'enumValues' is a valid field.""" + ENUM + """Indicates this type is an input object. 'inputFields' is a valid field.""" + INPUT_OBJECT + """Indicates this type is a list. 'ofType' is a valid field.""" + LIST + """Indicates this type is a non-null. 'ofType' is a valid field.""" + NON_NULL +} + +"""Shallow __Type introspection type""" +input IntrospectionTypeRefInput { + name: String! + kind: String +} + +"""An error caused by providing invalid input for a task, such as schema checks.""" +type InvalidInputError { + """The error message.""" + message: String! +} + +"""This object is returned when a request to fetch a Studio graph variant provides an invalid graph ref.""" +type InvalidRefFormat implements Error { + message: String! +} + +"""Represents the complete process of making a set of updates to a deployed graph variant.""" +type Launch { + """The unique identifier for this launch.""" + id: ID! + """The ID of the launch's associated graph.""" + graphId: String! + """The name of the launch's associated variant.""" + graphVariant: String! + order: OrderOrError! + """The timestamp when the launch was approved.""" + approvedAt: Timestamp + """The associated build for this launch (a build includes schema composition and contract filtering). This value is null until the build is initiated.""" + build: Build + """The inputs provided to this launch's associated build, including subgraph schemas and contract filters.""" + buildInput: BuildInput! + """The timestamp when the launch completed. This value is null until the launch completes.""" + completedAt: Timestamp + """The timestamp when the launch was initiated.""" + createdAt: Timestamp! + """Contract launches that were triggered by this launch.""" + downstreamLaunches: [Launch!]! + """Whether the launch completed.""" + isCompleted: Boolean + """Whether the result of the launch has been published to the associated graph and variant. This is always false for a failed launch.""" + isPublished: Boolean + """The most recent launch sequence step that has started but not necessarily completed.""" + latestSequenceStep: LaunchSequenceStep + """A specific publication of a graph variant pertaining to this launch.""" + publication: SchemaPublication + """A list of results from the completed launch. The items included in this list vary depending on whether the launch succeeded, failed, or was superseded.""" + results: [LaunchResult!]! + """Cloud router configuration associated with this build event. It will be non-null for any cloud-router variant, and null for any not cloudy variant/graph.""" + routerConfig: String + """A list of all serial steps in the launch sequence. This list can change as the launch progresses. For example, a `LaunchCompletedStep` is appended after a launch completes.""" + sequence: [LaunchSequenceStep!]! + """A shortened version of `Launch.id` that includes only the first 8 characters.""" + shortenedID: String! + """The launch's status. If a launch is superseded, its status remains `LAUNCH_INITIATED`. To check for a superseded launch, use `supersededAt`.""" + status: LaunchStatus! + """A list of subgraph changes that are included in this launch.""" + subgraphChanges: [SubgraphChange!] + """The timestamp when this launch was superseded by another launch. If an active launch is superseded, it terminates.""" + supersededAt: Timestamp + """The launch that superseded this launch, if any. If an active launch is superseded, it terminates.""" + supersededBy: Launch + """The source variant launch that caused this launch to be initiated. This value is present only for contract variant launches. Otherwise, it's null.""" + upstreamLaunch: Launch +} + +"""Types of results that can be associated with a `Launch`""" +union LaunchResult = ChangelogLaunchResult + +"""The timing details for the build step of a launch.""" +type LaunchSequenceBuildStep { + """The timestamp when the step completed.""" + completedAt: Timestamp + """The timestamp when the step started.""" + startedAt: Timestamp +} + +"""The timing details for the checks step of a launch.""" +type LaunchSequenceCheckStep { + """The timestamp when the step completed.""" + completedAt: Timestamp + """The timestamp when the step started.""" + startedAt: Timestamp +} + +"""The timing details for the completion step of a launch.""" +type LaunchSequenceCompletedStep { + """The timestamp when the step (and therefore the launch) completed.""" + completedAt: Timestamp +} + +"""The timing details for the initiation step of a launch.""" +type LaunchSequenceInitiatedStep { + """The timestamp when the step (and therefore the launch) started.""" + startedAt: Timestamp +} + +"""The timing details for the publish step of a launch.""" +type LaunchSequencePublishStep { + """The timestamp when the step completed.""" + completedAt: Timestamp + """The timestamp when the step started.""" + startedAt: Timestamp +} + +"""Represents the various steps that occur in sequence during a single launch.""" +union LaunchSequenceStep = LaunchSequenceBuildStep | LaunchSequenceCheckStep | LaunchSequenceCompletedStep | LaunchSequenceInitiatedStep | LaunchSequencePublishStep | LaunchSequenceSupersededStep + +"""The timing details for the superseded step of a launch. This step occurs only if the launch is superseded by another launch.""" +type LaunchSequenceSupersededStep { + """The timestamp when the step completed, thereby ending the execution of this launch in favor of the superseding launch.""" + completedAt: Timestamp +} + +enum LaunchStatus { + LAUNCH_COMPLETED + LAUNCH_FAILED + LAUNCH_INITIATED +} + +enum LogLevel { + WARN + INFO + ERROR + DEBUG +} + +type LogMessage { + """Timestamp in UTC""" + timestamp: DateTime! + """Log message contents""" + message: String! + """Log level""" + level: LogLevel! +} + +type Mutation { + """Provides access to mutation fields for modifying a Studio graph with the provided ID.""" + graph(id: ID!): GraphMutation + """ + Provides access to mutation fields for modifying an Apollo user with the + provided ID. + """ + user(id: ID!): UserMutation + """Creates an [operation collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/) for a given variant, or creates a [sandbox collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/#sandbox-collections) without an associated variant.""" + createOperationCollection( + """The collection's description.""" + description: String + """Whether the collection is a [sandbox collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/#sandbox-collections).""" + isSandbox: Boolean! + """Whether the collection is shared across its associated organization.""" + isShared: Boolean! + """The minimum role a user needs to edit this collection. Valid values: null, CONSUMER, OBSERVER, DOCUMENTER, CONTRIBUTOR, GRAPH_ADMIN. This value is ignored if `isShared` is `false`. The default value is `GRAPH_ADMIN`.""" + minEditRole: UserPermission + """The collection's name.""" + name: String! + """The [graph ref](https://www.apollographql.com/docs/rover/conventions/#graph-refs) of the graph variants to associate the collection with.""" + variantRefs: [ID!] + ): CreateOperationCollectionResult! + operationCollection(id: ID!): OperationCollectionMutation +} + +""" +ISO 8601 combined date and time without timezone. + +# Examples + +* `2015-07-01T08:59:60.123`, +""" +scalar NaiveDateTime + +type NamedIntrospectionArg { + name: String + description: String +} + +""" +The shared fields for a named introspection type. Currently this is returned for the top level value affected by a change. In the future, we may update this type to be an interface, which is extended by the more specific types: scalar, object, input object, union, interface, and enum For an in-depth look at where these types come from, see: -https://github.com/DefinitelyTyped/DefinitelyTyped/blob/659eb50d3/types/graphql/utilities/introspectionQuery.d.ts#L31-L37""" type NamedIntrospectionType{description:String kind:IntrospectionTypeKind name:String}type NamedIntrospectionTypeNoDescription{name:String}"""Introspection values that can be children of other types for changes, such +https://github.com/DefinitelyTyped/DefinitelyTyped/blob/659eb50d3/types/graphql/utilities/introspectionQuery.d.ts#L31-L37 +""" +type NamedIntrospectionType { + kind: IntrospectionTypeKind + name: String + description: String +} + +""" +Introspection values that can be children of other types for changes, such as input fields, objects in interfaces, enum values. In the future, this value could become an interface to allow fields specific to the types -returned.""" type NamedIntrospectionValue{description:String name:String printedType:String}type NamedIntrospectionValueNoDescription{name:String printedType:String}"""A non-federated service for a monolithic graph.""" type NonFederatedImplementingService{"""Timestamp of when this implementing service was created.""" createdAt:Timestamp!"""Identifies which graph this non-implementing service belongs to. -Formerly known as "service_id".""" graphID:String!"""Specifies which variant of a graph this implementing service belongs to". -Formerly known as "tag".""" graphVariant:String!}type NotFoundError implements Error{message:String!}"""Arbitrary JSON object""" scalar Object type OdysseyAttempt{completedAt:Timestamp id:ID!responses:[OdysseyResponse!]!startedAt:Timestamp!testId:String!}type OdysseyCertification{certificationId:String!earnedAt:Timestamp!id:ID!owner:OdysseyCertificationOwner}type OdysseyCertificationOwner{fullName:String!id:ID!}type OdysseyCourse{completedAt:Timestamp enrolledAt:Timestamp id:ID!}input OdysseyCourseInput{completedAt:Timestamp courseId:String!}type OdysseyResponse{correct:Boolean!id:ID!questionId:String!values:[OdysseyValue!]!}input OdysseyResponseInput{attemptId:ID!correct:Boolean!questionId:String!values:[String!]!}type OdysseyTask{completedAt:Timestamp id:ID!value:String}input OdysseyTaskInput{completedAt:Timestamp taskId:String!value:String}type OdysseyValue{id:ID!value:String!}enum OnboardingArchitecture{MONOLITH SUPERGRAPH}type Operation{id:ID!name:String signature:String truncated:Boolean!}type OperationAcceptedChange{acceptedAt:Timestamp!acceptedBy:Identity!change:StoredApprovedChange!checkID:ID!graphID:ID!id:ID!operationID:String!}"""Columns of OperationCheckStats.""" enum OperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_REQUESTS_COUNT}type OperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String serviceId:ID}"""Filter for data in OperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input OperationCheckStatsFilter{and:[OperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:OperationCheckStatsFilterIn not:OperationCheckStatsFilter or:[OperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in OperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input OperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type OperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input OperationCheckStatsOrderBySpec{column:OperationCheckStatsColumn!direction:Ordering!}type OperationCheckStatsRecord{"""Dimensions of OperationCheckStats that can be grouped by.""" groupBy:OperationCheckStatsDimensions!"""Metrics of OperationCheckStats that can be aggregated over.""" metrics:OperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type OperationCollection{createdAt:Timestamp!createdBy:Identity description:String """If a user has any of these roles, they will be able to edit this -collection. This will be null if and only if \`isShared\` is false""" editRoles:[UserPermission!]@deprecated(reason:"deprecated in favour of minEditRole")id:ID!isFavorite:Boolean!isSandbox:Boolean!isShared:Boolean!lastUpdatedAt:Timestamp!lastUpdatedBy:Identity minEditRole:UserPermission name:String!operation(id:ID!):OperationCollectionEntryResult operations:[OperationCollectionEntry!]!""" Permissions the current user has for this collection""" permissions:OperationCollectionPermissions!variants:[GraphVariant!]!}type OperationCollectionEntry{collection:OperationCollection!createdAt:Timestamp!createdBy:Identity currentOperationRevision:OperationCollectionEntryState!id:ID!lastUpdatedAt:Timestamp!lastUpdatedBy:Identity name:String!orderingIndex:String!}type OperationCollectionEntryMutation{moveToCollection(collectionId:ID!lowerOrderingBound:String upperOrderingBound:String):MoveOperationCollectionEntryResult!reorderEntry(lowerOrderingBound:String upperOrderingBound:String):UpdateOperationCollectionResult updateName(name:String!):UpdateOperationCollectionEntryResult updateValues(operationInput:OperationCollectionEntryStateInput!):UpdateOperationCollectionEntryResult}union OperationCollectionEntryMutationResult=NotFoundError|OperationCollectionEntryMutation|PermissionError union OperationCollectionEntryResult=NotFoundError|OperationCollectionEntry type OperationCollectionEntryState{body:String!createdAt:Timestamp!createdBy:Identity headers:[OperationHeader!]variables:String}input OperationCollectionEntryStateInput{body:String!headers:[OperationHeaderInput!]""" I'm assuming this is non null""" variables:String}type OperationCollectionMutation{addOperation(name:String!operationInput:OperationCollectionEntryStateInput!):AddOperationCollectionEntryResult addToVariant(variantRef:ID!):AddOperationCollectionToVariantResult!@deprecated(reason:"Will throw NotImplemented")delete:DeleteOperationCollectionResult deleteOperation(id:ID!):RemoveOperationCollectionEntryResult duplicateCollection(description:String isSandbox:Boolean!isShared:Boolean!name:String!variantRef:ID):DuplicateOperationCollectionResult!operation(id:ID!):OperationCollectionEntryMutationResult removeFromVariant(variantRef:ID!):RemoveOperationCollectionFromVariantResult!@deprecated(reason:"Will throw NotImplemented")setMinEditRole(editRole:UserPermission):UpdateOperationCollectionResult updateDescription(description:String):UpdateOperationCollectionResult updateEditRoles(editRoles:[UserPermission!]!):UpdateOperationCollectionResult@deprecated(reason:"Deprecated in favour of setMinEditRole")updateIsFavorite(isFavorite:Boolean!):UpdateOperationCollectionResult updateIsShared(isShared:Boolean!):UpdateOperationCollectionResult updateName(name:String!):UpdateOperationCollectionResult}type OperationCollectionPermissions{canEditOperations:Boolean!canManage:Boolean!canReadOperations:Boolean!}union OperationCollectionResult=NotFoundError|OperationCollection|PermissionError type OperationDocument{"""Operation document body""" body:String!"""Operation name""" name:String}input OperationDocumentInput{"""Operation document body""" body:String!"""Operation name""" name:String}type OperationHeader{name:String!value:String!}input OperationHeaderInput{name:String!value:String!}"""Operation name filter configuration for a graph.""" type OperationNameFilter{"""name of the operation by the user and reported alongside metrics""" name:String!}"""Options to filter by operation name.""" input OperationNameFilterInput{"""name of the operation set by the user and reported alongside metrics""" name:String!}type OperationValidationError{message:String!}type OperationsCheckResult{"""Operations affected by all changes in diff""" affectedQueries:[AffectedQuery!]"""Summary/counts for all changes in diff""" changeSummary:ChangeSummary!"""List of schema changes with associated affected clients and operations""" changes:[Change!]!"""Indication of the success of the change, either failure, warning, or notice.""" checkSeverity:ChangeSeverity!"""The variant that was used as a base to check against""" checkedVariant:GraphVariant!createdAt:Timestamp!id:ID!"""Number of affected query operations that are neither marked as SAFE or IGNORED""" numberOfAffectedOperations:Int!"""Number of operations that were validated during schema diff""" numberOfCheckedOperations:Int!workflowTask:OperationsCheckTask!}type OperationsCheckTask implements CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!"""The result of the check.""" result:OperationsCheckResult status:CheckWorkflowTaskStatus!workflow:CheckWorkflow!}enum Ordering{ASCENDING DESCENDING}"""A reusable invite link for an organization.""" type OrganizationInviteLink{createdAt:Timestamp!"""A joinToken that can be passed to Mutation.joinAccount to join the organization.""" joinToken:String!"""The role that the user will receive if they join the organization with this link.""" role:UserPermission!}type OrganizationSSO{defaultRole:UserPermission!idpid:ID!provider:OrganizationSSOProvider!}enum OrganizationSSOProvider{PINGONE}"""PagerDuty notification channel""" type PagerDutyChannel implements Channel{id:ID!name:String!routingKey:String!subscriptions:[ChannelSubscription!]!}"""PagerDuty notification channel parameters""" input PagerDutyChannelInput{name:String routingKey:String!}"""Schema for a subgraph with associated metadata""" type PartialSchema{"""Timestamp for when the partial schema was created""" createdAt:Timestamp!"""If this sdl is currently actively composed in the gateway, this is true""" isLive:Boolean!"""The GraphQL document for a subgraph schema.""" sdl:String!"""The path of deep storage to find the raw enriched partial schema file""" sdlPath:String!}"""Input for registering a partial schema to an implementing service. +returned. +""" +type NamedIntrospectionValue { + name: String + description: String + printedType: String +} + +"""An error that occurs when a requested object is not found.""" +type NotFoundError implements Error { + """The error message.""" + message: String! +} + +"""A list of saved GraphQL operations.""" +type OperationCollection { + """The timestamp when the collection was created.""" + createdAt: Timestamp! + """The user or other entity that created the collection.""" + createdBy: Identity + """The collection's description. A `null` description was never set, and empty string description was set to be empty string by a user, or other entity.""" + description: String + id: ID! + """Whether the current user has marked the collection as a favorite.""" + isFavorite: Boolean! + """Whether the collection is a [sandbox collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/#sandbox-collections).""" + isSandbox: Boolean! + """Whether the collection is shared across its associated organization.""" + isShared: Boolean! + """The timestamp when the collection was most recently updated.""" + lastUpdatedAt: Timestamp! + """The user or other entity that most recently updated the collection.""" + lastUpdatedBy: Identity + """The minimum role a user needs to edit this collection. Valid values: null, CONSUMER, OBSERVER, DOCUMENTER, CONTRIBUTOR, GRAPH_ADMIN. This value is always `null` if `isShared` is `false`. If `null` when `isShared` is `true`, the minimum role is `GRAPH_ADMIN`.""" + minEditRole: UserPermission + """The collection's name.""" + name: String! + """Returns the operation in the collection with the specified ID, if any.""" + operation(id: ID!): OperationCollectionEntryResult + """A list of the GraphQL operations that belong to the collection.""" + operations: [OperationCollectionEntry!]! + """The permissions that the current user has for the collection.""" + permissions: OperationCollectionPermissions! +} + +"""A saved operation entry within an Operation Collection.""" +type OperationCollectionEntry { + """The timestamp when the entry was created.""" + createdAt: Timestamp! + """The user or other entity that created the entry.""" + createdBy: Identity + """Details of the entry's associated operation, such as its `body` and `variables`.""" + currentOperationRevision: OperationCollectionEntryState! + id: ID! + """The timestamp when the entry was most recently updated.""" + lastUpdatedAt: Timestamp! + """The user or other entity that most recently updated the entry.""" + lastUpdatedBy: Identity + """The entry's name.""" + name: String! + """The entry's lexicographical ordering index within its containing collection.""" + orderingIndex: String! +} + +"""Provides fields for modifying an operation in a collection.""" +type OperationCollectionEntryMutation { + """Updates the name of an operation.""" + updateName(name: String!): UpdateOperationCollectionEntryResult + """Updates the body, headers, and/or variables of an operation.""" + updateValues(operationInput: OperationCollectionEntryStateInput!): UpdateOperationCollectionEntryResult +} + +union OperationCollectionEntryMutationResult = NotFoundError | OperationCollectionEntryMutation | PermissionError + +"""Possible return values when querying for an entry in an operation collection (either the entry object or an `Error` object).""" +union OperationCollectionEntryResult = NotFoundError | OperationCollectionEntry + +"""The most recent body, variable and header values of a saved operation entry.""" +type OperationCollectionEntryState { + """The raw body of the entry's GraphQL operation.""" + body: String! + """Headers for the entry's GraphQL operation.""" + headers: [OperationHeader!] + """Variables for the entry's GraphQL operation, as a JSON string.""" + variables: String +} + +"""Fields for creating or modifying an operation collection entry.""" +input OperationCollectionEntryStateInput { + """The operation's query body.""" + body: String! + """The operation's headers.""" + headers: [OperationHeaderInput!] + """The operation's variables.""" + variables: String +} + +"""Provides fields for modifying an [operation collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/).""" +type OperationCollectionMutation { + """Adds an operation to this collection.""" + addOperation(name: String!, operationInput: OperationCollectionEntryStateInput!): AddOperationCollectionEntryResult + """Adds operations to this collection.""" + addOperations(operations: [AddOperationInput!]!): AddOperationCollectionEntriesResult + """Deletes this operation collection. This also deletes all of the collection's associated operations.""" + delete: DeleteOperationCollectionResult + """Deletes an operation from this collection.""" + deleteOperation(id: ID!): RemoveOperationCollectionEntryResult + operation(id: ID!): OperationCollectionEntryMutationResult + """Updates the minimum role a user needs to be able to modify this collection.""" + setMinEditRole(editRole: UserPermission): UpdateOperationCollectionResult + """Updates this collection's description.""" + updateDescription(description: String): UpdateOperationCollectionResult + """Updates whether the current user has marked this collection as a favorite.""" + updateIsFavorite(isFavorite: Boolean!): UpdateOperationCollectionResult + """Updates whether this collection is shared across its associated organization.""" + updateIsShared(isShared: Boolean!): UpdateOperationCollectionResult + """Updates this operation collection's name.""" + updateName(name: String!): UpdateOperationCollectionResult +} + +"""Whether the current user can perform various actions on the associated collection.""" +type OperationCollectionPermissions { + """Whether the current user can edit operations in the associated collection.""" + canEditOperations: Boolean! + """Whether the current user can delete or update the associated collection's metadata, such as its name and description.""" + canManage: Boolean! + """Whether the current user can read operations in the associated collection.""" + canReadOperations: Boolean! +} + +union OperationCollectionResult = NotFoundError | OperationCollection | PermissionError | ValidationError + +"""Saved headers on a saved operation.""" +type OperationHeader { + """The header's name.""" + name: String! + """The header's value.""" + value: String! +} + +input OperationHeaderInput { + """The header's name.""" + name: String! + """The header's value.""" + value: String! +} + +"""Options to filter by operation name.""" +input OperationNameFilterInput { + """name of the operation set by the user and reported alongside metrics""" + name: String! + version: String +} + +type OperationsCheckResult { + id: ID! + """Indication of the success of the change, either failure, warning, or notice.""" + checkSeverity: ChangeSeverity! + """Number of operations that were validated during schema diff""" + numberOfCheckedOperations: Int! + """List of schema changes with associated affected clients and operations""" + changes: [Change!]! + """Summary/counts for all changes in diff""" + changeSummary: ChangeSummary! + """Operations affected by all changes in diff""" + affectedQueries: [AffectedQuery!] + """Number of affected query operations that are neither marked as SAFE or IGNORED""" + numberOfAffectedOperations: Int! + createdAt: Timestamp! +} + +type OperationsCheckTask implements CheckWorkflowTask { + completedAt: Timestamp + createdAt: Timestamp! + id: ID! + status: CheckWorkflowTaskStatus! + targetURL: String + workflow: CheckWorkflow! + """ + The result of the operations check. This will be null when the task is initializing or running, + or when the build task fails (which is a prerequisite task to this one). + """ + result: OperationsCheckResult +} + +type Order { + id: ID! + orderType: OrderType! + status: OrderStatus! + reason: String + logs(first: Int, offset: Int): [LogMessage!]! + router: Router! +} + +union OrderOrError = Order + +enum OrderStatus { + PENDING + COMPLETED + ROLLING_BACK + ERRORED + SUPERSEDED +} + +enum OrderType { + CREATE_ROUTER + DESTROY_ROUTER + UPDATE_ROUTER +} + +"""The schema for a single published subgraph in Studio.""" +type SubgraphSchema { + """The subgraph schema document as SDL.""" + sdl: String! +} + +""" +Input for registering a partial schema to an implementing service. One of the fields must be specified (validated server-side). If a new partialSchemaSDL is passed in, this operation will store it before @@ -77,96 +1452,529 @@ creating the association. If both the sdl and hash are specified, an error will be thrown if the provided hash doesn't match our hash of the sdl contents. If the sdl field is specified, -the hash does not need to be and will be computed server-side.""" input PartialSchemaInput{"""Hash of the partial schema to associate; error is thrown if only the hash is -specified and the hash has not been seen before""" hash:String """Contents of the partial schema in SDL syntax, but may reference types -that aren't defined in this document""" sdl:String}type PermissionError implements Error{message:String!}type PromoteSchemaError{code:PromoteSchemaErrorCode!message:String!}enum PromoteSchemaErrorCode{CANNOT_PROMOTE_SCHEMA_FOR_FEDERATED_GRAPH}type PromoteSchemaResponse{code:PromoteSchemaResponseCode!tag:SchemaTag!}enum PromoteSchemaResponseCode{NO_CHANGES_DETECTED PROMOTION_SUCCESS}union PromoteSchemaResponseOrError=PromoteSchemaError|PromoteSchemaResponse type Protobuf{json:String!object:Object!raw:Blob!text:String!}type Query{"""Account by ID""" account(id:ID!):Account """Retrieve account by billing provider identifier""" accountByBillingCode(id:ID!):Account """Retrieve account by internal id""" accountByInternalID(id:ID!):Account """Whether an account ID is available for mutation{newAccount(id:)}""" accountIDAvailable(id:ID!):Boolean!"""All accounts""" allAccounts(search:String tier:BillingPlanTier):[Account!]"""All available plans""" allPlans:[BillingPlan!]!allPublicVariants:[GraphVariant!]"""All services""" allServices(search:String):[Service!]"""All timezones with their offsets from UTC""" allTimezoneOffsets:[TimezoneOffset!]!"""All users""" allUsers(search:String):[User!]"""Look up a plan by ID""" billingPlan(id:ID):BillingPlanV2 """All available plans""" billingPlans:[BillingPlanV2!]!"""If this is true, the user is an Apollo administrator who can ignore restrictions based purely on billing plan.""" canBypassPlanRestrictions:Boolean!diffSchemas(baseSchema:String!nextSchema:String!):[Change!]!"""Get the unsubscribe settings for a given email.""" emailPreferences(email:String!token:String!):EmailPreferences experimentalFeatures:GlobalExperimentalFeatures!"""Address of the Studio frontend.""" frontendUrlRoot:String!"""Access a graph by ID.""" graph(id:ID!):Service internalActiveCronJobs:[CronJob!]!internalAdminUsers:[InternalAdminUser!]internalUnresolvedCronExecutionFailures:[CronExecution!]!"""User or graph querying the API, null if not authenticated.""" me:Identity odysseyCertification(id:ID!):OdysseyCertification operationCollection(id:ID!):OperationCollectionResult!operationCollectionEntries(collectionEntryIds:[ID!]!):[OperationCollectionEntry!]!"""Access an organization by ID.""" organization(id:ID!):Account """Look up a plan by ID""" plan(id:ID):BillingPlan """A list of public variants that have been selected to be shown on our Graph Directory.""" publiclyListedVariants:[GraphVariant!]"""Service by ID""" service(id:ID!):Service """Query statistics across all services. For admins only; normal users must go through AccountsStatsWindow or ServiceStatsWindow.""" stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):StatsWindow!"""Get the studio settings for the current user""" studioSettings:UserSettings """The plan started by AccountMutation.startTeamSubscription""" teamBillingPlan(billingPeriod:BillingPeriod!):BillingPlanV2!"""The plan started by AccountMutation.startTeamSubscription""" teamPlan(billingPeriod:BillingPeriod!):BillingPlan!"""Schema transformation for the Apollo platform API. Renames types. Internal to Apollo.""" transformSchemaForPlatformApi(baseSchema:GraphQLDocument!):GraphQLDocument """The plan started by AccountMutation.startTrial""" trialBillingPlan:BillingPlanV2!"""The plan started by AccountMutation.startTrial""" trialPlan:BillingPlan!"""User by ID""" user(id:ID!):User """Access a variant by reference of the form `graphID@variantName`, or `graphID` for the default `current` variant. -Returns null when the graph or variant do not exist, or when the graph cannot be accessed. -Note that we can return more types implementing Error in the future.""" variant(ref:ID!):GraphVariantLookup}"""query documents to validate against""" input QueryDocumentInput{document:String}type QueryPlan{json:String!object:Object!text:String!}"""Columns of QueryStats.""" enum QueryStatsColumn{ACCOUNT_ID CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type QueryStatsDimensions{accountId:ID clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in QueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input QueryStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[QueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:QueryStatsFilterIn not:QueryStatsFilter or:[QueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in QueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input QueryStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type QueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input QueryStatsOrderBySpec{column:QueryStatsColumn!direction:Ordering!}type QueryStatsRecord{"""Dimensions of QueryStats that can be grouped by.""" groupBy:QueryStatsDimensions!"""Metrics of QueryStats that can be aggregated over.""" metrics:QueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Query Trigger""" type QueryTrigger implements ChannelSubscription{channels:[Channel!]!comparisonOperator:ComparisonOperator!enabled:Boolean!excludedOperationNames:[String!]!id:ID!metric:QueryTriggerMetric!operationNames:[String!]!percentile:Float scope:QueryTriggerScope!serviceId:String!state:QueryTriggerState!threshold:Float!variant:String window:QueryTriggerWindow!}"""Query trigger""" input QueryTriggerInput{channelIds:[String!]comparisonOperator:ComparisonOperator!enabled:Boolean excludedOperationNames:[String!]metric:QueryTriggerMetric!operationNames:[String!]percentile:Float scope:QueryTriggerScope threshold:Float!variant:String window:QueryTriggerWindow!}enum QueryTriggerMetric{"""Number of requests within the window that resulted in an error. Ignores `percentile`.""" ERROR_COUNT """Number of error requests divided by total number of requests. Ignores `percentile`.""" ERROR_PERCENTAGE """Number of requests within the window. Ignores `percentile`.""" REQUEST_COUNT """Request latency in ms. Requires `percentile`.""" REQUEST_SERVICE_TIME}enum QueryTriggerScope{ALL ANY UNRECOGNIZED}"""Query trigger state""" type QueryTriggerState{evaluatedAt:Timestamp!lastTriggeredAt:Timestamp operations:[QueryTriggerStateOperation!]!triggered:Boolean!}type QueryTriggerStateOperation{count:Long!operation:String!triggered:Boolean!value:Float!}enum QueryTriggerWindow{FIFTEEN_MINUTES FIVE_MINUTES ONE_MINUTE UNRECOGNIZED}"""The documentation for a graph variant, as display in Studio.""" type Readme{"""Content of the document.""" content:String!id:ID!"""Last time the document was updated.""" lastUpdatedAt:Timestamp!"""Identity of who updated the document last.""" lastUpdatedBy:Identity}type RegisterOperationsMutationResponse{invalidOperations:[InvalidOperation!]newOperations:[RegisteredOperation!]registrationSuccess:Boolean!}input RegisteredClientIdentityInput{identifier:String!name:String!version:String}type RegisteredOperation{signature:ID!}input RegisteredOperationInput{document:String metadata:RegisteredOperationMetadataInput signature:ID!}input RegisteredOperationMetadataInput{"""This will be used to link existing records in Engine to a new ID.""" engineSignature:String}type RegistryApiKey{keyName:String token:String!}type RegistryStatsWindow{schemaCheckStats:[AccountChecksStatsRecord!]!schemaPublishStats:[AccountPublishesStatsRecord!]!}type RegistrySubscription implements ChannelSubscription{channel:Channel channels:[Channel!]!@deprecated(reason:"Use channels list instead")createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!options:SubscriptionOptions!variant:String}type RelaunchComplete{latestLaunch:Launch!updated:Boolean!}type RelaunchError{message:String!}union RelaunchResult=RelaunchComplete|RelaunchError union RemoveOperationCollectionEntryResult=OperationCollection|PermissionError union RemoveOperationCollectionFromVariantResult=GraphVariant|NotFoundError|PermissionError|ValidationError union ReorderOperationCollectionResult=OperationCollection|PermissionError type ReportSchemaError implements ReportSchemaResult{code:ReportSchemaErrorCode!inSeconds:Int!message:String!withCoreSchema:Boolean!}enum ReportSchemaErrorCode{BOOT_ID_IS_NOT_VALID_UUID BOOT_ID_IS_REQUIRED CORE_SCHEMA_HASH_IS_NOT_SCHEMA_SHA256 CORE_SCHEMA_HASH_IS_REQUIRED CORE_SCHEMA_HASH_IS_TOO_LONG EXECUTABLE_SCHEMA_ID_IS_NOT_SCHEMA_SHA256 EXECUTABLE_SCHEMA_ID_IS_REQUIRED EXECUTABLE_SCHEMA_ID_IS_TOO_LONG GRAPH_REF_INVALID_FORMAT GRAPH_REF_IS_REQUIRED GRAPH_VARIANT_DOES_NOT_MATCH_REGEX GRAPH_VARIANT_IS_REQUIRED LIBRARY_VERSION_IS_TOO_LONG PLATFORM_IS_TOO_LONG RUNTIME_VERSION_IS_TOO_LONG SCHEMA_IS_NOT_PARSABLE SCHEMA_IS_NOT_VALID SERVER_ID_IS_TOO_LONG USER_VERSION_IS_TOO_LONG}type ReportSchemaResponse implements ReportSchemaResult{inSeconds:Int!withCoreSchema:Boolean!}interface ReportSchemaResult{inSeconds:Int!withCoreSchema:Boolean!}type ReportServerInfoError implements ReportServerInfoResult{code:ReportSchemaErrorCode!inSeconds:Int!message:String!withExecutableSchema:Boolean!}type ReportServerInfoResponse implements ReportServerInfoResult{inSeconds:Int!withExecutableSchema:Boolean!}interface ReportServerInfoResult{inSeconds:Int!withExecutableSchema:Boolean!}enum Resolution{R1D R1H R1M R5M R6H R15M}enum ResponseHints{NONE SAMPLE_RESPONSES SUBGRAPHS TIMINGS TRACE_TIMINGS}type RoleOverride{graph:Service!lastUpdatedAt:Timestamp!role:UserPermission!user:User!}input RoverArgumentInput{key:String!value:Object}"""SHA-256 hash, represented in lowercase hexadecimal""" scalar SHA256 type ScheduledSummary implements ChannelSubscription{channel:Channel@deprecated(reason:"Use channels list instead")channels:[Channel!]!enabled:Boolean!id:ID!timezone:String!variant:String!}"""A GraphQL schema document, which may optionally map back to context with which the schema was ingested.""" type Schema{createTemporaryURL(expiresInSeconds:Int!=86400):TemporaryURL """The timestamp of initial ingestion of a schema to a graph.""" createdAt:Timestamp!"""The raw GraphQL document for the schema in question""" document:GraphQLDocument!"""The number of fields; this includes user defined fields only, excluding built-in types and fields""" fieldCount:Int!gitContext:GitContext """The hex representation of the SHA256 of the GraphQL document.""" hash:ID!introspection:IntrospectionSchema!"""The number of types; this includes user defined types only, excluding built-in types""" typeCount:Int!}"""Represents an error from running schema composition on a list of subgraph definitions.""" type SchemaCompositionError{"""A machine-readable error code.""" code:String """Affected locations.""" locations:[SourceLocation]!"""A human-readable locations.""" message:String!}"""The difference between two schemas, as usually computed during a schema check.""" type SchemaDiff{"""Clients affected by all changes in the diff.""" affectedClients:[AffectedClient!]@deprecated(reason:"Unsupported.")"""Operations affected by all changes in the diff.""" affectedQueries:[AffectedQuery!]"""Numeric summary of all changes in the diff.""" changeSummary:ChangeSummary!"""List of schema changes with associated affected clients and operations.""" changes:[Change!]!"""Number of affected query operations that are neither marked as safe or ignored.""" numberOfAffectedOperations:Int!"""Number of operations that were validated during the check.""" numberOfCheckedOperations:Int """Indication of the success of the change; either failure, warning, or notice.""" severity:ChangeSeverity!"""The tag against which this diff was created""" tag:String type:ChangeType!@deprecated(reason:"use severity instead")"""Configuration of validation""" validationConfig:SchemaDiffValidationConfig}type SchemaDiffValidationConfig{"""Clients to ignore during validation.""" excludedClients:[ClientInfoFilterOutput!]"""Operation names to ignore during validation.""" excludedOperationNames:[OperationNameFilter]"""delta in seconds from current time that determines the start of the window -for reported metrics included in a schema diff. A day window from the present -day would have a `from` value of -86400. In rare cases, this could be an ISO -timestamp if the user passed one in on diff creation""" from:Timestamp """Operation IDs to ignore during validation.""" ignoredOperations:[ID!]"""Variants to include during validation.""" includedVariants:[String!]"""Minimum number of requests within the window for a query to be considered.""" queryCountThreshold:Int """Number of requests within the window for a query to be considered, relative to -total request count. Expected values are between 0 and 0.05 (minimum 5% of -total request volume)""" queryCountThresholdPercentage:Float """delta in seconds from current time that determines the end of the -window for reported metrics included in a schema diff. A day window -from the present day would have a `to` value of -0. In rare -cases, this could be an ISO timestamp if the user passed one in on diff -creation""" to:Timestamp}type SchemaPublishSubscription implements ChannelSubscription{channels:[Channel!]!createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!variant:String}input SchemaReport{"""A randomly generated UUID, immutable for the lifetime of the edge server runtime.""" bootId:String!"""The hex SHA256 hash of the schema being reported. Note that for a GraphQL server with a core schema, this should be the core schema, not the API schema.""" coreSchemaHash:String!"""The graph ref (eg, 'id@variant')""" graphRef:String!"""The version of the edge server reporting agent, e.g. apollo-server-2.8, graphql-java-3.1, etc. length must be <= 256 characters.""" libraryVersion:String """The infra environment in which this edge server is running, e.g. localhost, Kubernetes, AWS Lambda, Google CloudRun, AWS ECS, etc. length must be <= 256 characters.""" platform:String """The runtime in which the edge server is running, e.g. node 12.03, zulu8.46.0.19-ca-jdk8.0.252-macosx_x64, etc. length must be <= 256 characters.""" runtimeVersion:String """If available, an identifier for the edge server instance, such that when restarting this instance it will have the same serverId, with a different bootId. For example, in Kubernetes this might be the pod name. Length must be <= 256 characters.""" serverId:String """An identifier used to distinguish the version (from the user's perspective) of the edge server's code itself. For instance, the git sha of the server's repository or the docker sha of the associated image this server runs with. Length must be <= 256 characters.""" userVersion:String}"""A specific publication of a graph variant.""" type SchemaTag{"""The result of composition, including either a supergraph schema or errors, -executed during this publication. Only available with managed federation.""" compositionResult:CompositionResult createdAt:Timestamp!"""Differences with the schema from the previous successful publication.""" diffToPrevious:SchemaDiff gitContext:GitContext """List of previously uploaded SchemaTags under the same tag name, starting with -the selected published schema record. Sorted in reverse chronological order -by creation date (newest publish first). - -Note: This does not include the history of checked schemas""" history(includeUnchanged:Boolean!=true limit:Int!=3 offset:Int=0):[SchemaTag!]!"""Number of tagged schemas created under the same tag name. -Also represents the maximum size of the history's limit argument.""" historyLength:Int!"""Number of schemas tagged prior to this one under the same tag name, its position -in the tag history.""" historyOrder:Int!"""The identifier for this specific publication.""" id:ID!"""Time of publication.""" publishedAt:Timestamp!"""The Identity that published this schema and their client info, or null if this isn't -a publish. Sub-fields may be null if they weren't recorded.""" publishedBy:IdentityAndClientInfo """Indicates the schemaTag of the schema's original upload, null if this is the -first upload of the schema.""" reversionFrom:SchemaTag """The published schema.""" schema:Schema!slackNotificationBody(graphDisplayName:String!):String tag:String!@deprecated(reason:"Please use variant { name } instead")"""The graph variant this belongs to.""" variant:GraphVariant!webhookNotificationBody:String!}"""How many seats of the given types does an organization have (regardless of plan type)?""" type Seats{"""How many members that are free in this organization.""" free:Int!"""How many members that are not free in this organization.""" fullPrice:Int!}type SemanticChange{"""Target arg of change made.""" argNode:NamedIntrospectionArg """Node related to the top level node that was changed, such as a field in an object, -a value in an enum or the object of an interface""" childNode:NamedIntrospectionValue """Semantic metadata about the type of change""" definition:ChangeDefinition!"""Top level node affected by the change""" parentNode:NamedIntrospectionType}"""A graph in Apollo Studio represents a graph in your organization. +the hash does not need to be and will be computed server-side. +""" +input PartialSchemaInput { + """ + Contents of the partial schema in SDL syntax, but may reference types + that aren't defined in this document + """ + sdl: String + """ + Hash of the partial schema to associate; error is thrown if only the hash is + specified and the hash has not been seen before + """ + hash: String +} + +"""An error that occurs when the current user doesn't have sufficient permissions to perform an action.""" +type PermissionError implements Error { + """The error message.""" + message: String! +} + +"""An error related to an organization's Apollo Studio plan.""" +type PlanError { + """The error message.""" + message: String! +} + +type Query { + """Returns the root URL of the Apollo Studio frontend.""" + frontendUrlRoot: String! + """Returns details of the graph with the provided ID.""" + graph(id: ID!): Graph + """Returns details of the authenticated `User` or `Graph` executing this query. If this is an unauthenticated query (i.e., no API key is provided), this field returns null.""" + me: Identity + """Returns details of the Studio organization with the provided ID.""" + organization(id: ID!): Organization + """Returns details of the Apollo user with the provided ID.""" + user(id: ID!): User + """Returns details of a Studio graph variant with the provided graph ref. A graph ref has the format `graphID@variantName` (or just `graphID` for the default variant `current`). Returns null if the graph or variant doesn't exist, or if the graph isn't accessible by the current actor.""" + variant(ref: ID!): GraphVariantLookup + """Returns the [operation collection](https://www.apollographql.com/docs/studio/explorer/operation-collections/) for the provided ID.""" + operationCollection(id: ID!): OperationCollectionResult! +} + +"""The README documentation for a graph variant, which is displayed in Studio.""" +type Readme { + """The contents of the README in plaintext.""" + content: String! + """The README's unique ID. `a15177c0-b003-4837-952a-dbfe76062eb1` for the default README""" + id: ID! + """The actor that most recently updated the README (usually a `User`). `null` for the default README, or if the `User` was deleted.""" + lastUpdatedBy: Identity + """The timestamp when the README was most recently updated. `null` for the default README""" + lastUpdatedTime: Timestamp +} + +union RemoveOperationCollectionEntryResult = OperationCollection | PermissionError + +type Router { + """ + Last time when the Cloud Router was updated + + If the Cloud Router was never updated, this value will be null + """ + updatedAt: NaiveDateTime + """Current status of the Cloud Router""" + status: RouterStatus! + """Current version of the Cloud Router""" + routerVersion: RouterVersion! + """ + URL where the Cloud Router can be found + + This will be null if the Cloud Router is in a deleted status + """ + routerUrl: String + """Retrieves a specific Order related to this Cloud Router""" + order(orderId: ID!): Order + """Retrieves all Orders related to this Cloud Router""" + orders(first: Int, offset: Int): [Order!]! + """Return the list of secrets for this Cloud Router with their hash values""" + secrets: [Secret!]! +} + +enum RouterStatus { + CREATING + UPDATING + DELETING + ROLLING_BACK + RUNNING + DELETED +} + +type RouterVersion { + version: String! + core: String! + build: String! + status: Status! + configVersion: String! + configSchema: String! +} + +"""A GraphQL schema document and associated metadata.""" +type Schema { + """The GraphQL schema document's SHA256 hash, represented as a hexadecimal string.""" + hash: ID! + """The GraphQL schema document.""" + document: GraphQLDocument! +} + +"""An error that occurred while running schema composition on a set of subgraph schemas.""" +type SchemaCompositionError { + """A human-readable message describing the error.""" + message: String! + """Source locations related to the error.""" + locations: [SourceLocation]! + """A machine-readable error code.""" + code: String +} + +"""The result of computing the difference between two schemas, usually as part of schema checks.""" +type SchemaDiff { + """Indicates the overall safety of the changes included in the diff, based on operation history (e.g., `FAILURE` or `NOTICE`).""" + severity: ChangeSeverity! + """A list of all schema changes in the diff, including their severity.""" + changes: [Change!]! + """Numeric summaries for each type of change in the diff.""" + changeSummary: ChangeSummary! + """Operations affected by all changes in the diff.""" + affectedQueries: [AffectedQuery!] + """The number of GraphQL operations that were validated during the check.""" + numberOfCheckedOperations: Int + """The number of GraphQL operations affected by the diff's changes that are neither marked as safe nor ignored.""" + numberOfAffectedOperations: Int! +} + +"""Contains details for an individual publication of an individual graph variant.""" +type SchemaPublication { + """ + The variant that was published to." + """ + variant: GraphVariant! + """The schema that was published to the variant.""" + schema: Schema! + """The result of federated composition executed for this publication. This result includes either a supergraph schema or error details, depending on whether composition succeeded. This value is null when the publication is for a non-federated graph.""" + compositionResult: CompositionResult + """The timestamp when the variant was published to.""" + publishedAt: Timestamp! + """A schema diff comparing against the schema from the most recent previous successful publication.""" + diffToPrevious: SchemaDiff +} + +type Secret { + createdAt: DateTime! + name: String! + hash: String! +} + +type SemanticChange { + """Semantic metadata about the type of change""" + definition: ChangeDefinition! + """Top level node affected by the change""" + parentNode: NamedIntrospectionType + """ + Node related to the top level node that was changed, such as a field in an object, + a value in an enum or the object of an interface + """ + childNode: NamedIntrospectionValue + """Target arg of change made.""" + argNode: NamedIntrospectionArg +} + +""" +A graph in Apollo Studio represents a graph in your organization. Each graph has one or more variants, which correspond to the different environments where that graph runs (such as staging and production). -Each variant has its own GraphQL schema, which means schemas can differ between environments.""" type Service implements Identity{"""Organization that this graph belongs to.""" account:Account accountId:ID apiKeys:[GraphApiKey!]"""A view of the identity as an Actor type.""" asActor:Actor!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request -with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the -browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the -filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to -MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the service's avatar. Note that CORS is not enabled for these URLs. The size -argument is used for bandwidth reduction, and should be the size of the image as displayed in the -application. Apollo's media server will downscale larger images to at least the requested size, -but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String """Get available notification endpoints""" channels(channelIds:[ID!]):[Channel!]"""Get check configuration for this graph.""" checkConfiguration:CheckConfiguration """Get a check workflow for this graph by its ID""" checkWorkflow(id:ID!):CheckWorkflow """Get check workflows for this graph ordered by creation time, most recent first.""" checkWorkflows(filter:CheckFilterInput limit:Int!=100):[CheckWorkflow!]!"""List of options available for filtering checks for this graph by author. -If a filter is passed, constrains results to match the filter.""" checksAuthorOptions(filter:CheckFilterInput):[String!]!"""List of options available for filtering checks for this graph by branch. -If a filter is passed, constrains results to match the filter.""" checksBranchOptions(filter:CheckFilterInput):[String!]!"""List of options available for filtering checks for this graph by subgraph name. -If a filter is passed, constrains results to match the filter.""" checksSubgraphOptions(filter:CheckFilterInput):[String!]!"""Given a graphCompositionID, return the results of composition. This can represent either a validation or a publish.""" compositionResultById(id:ID!):CompositionResult createdAt:Timestamp!createdBy:Identity datadogMetricsConfig:DatadogMetricsConfig defaultBuildPipelineTrack:String deletedAt:Timestamp description:String devGraphOwner:User """Get a GraphQL document by hash""" document(hash:SHA256):GraphQLDocument """When this is true, this graph will be hidden from non-admin members of the org who haven't been explicitly assigned a -role on this graph.""" hiddenFromUninvitedNonAdminAccountMembers:Boolean!"""Globally unique identifier for this graph.""" id:ID!"""List of subgraphs that comprise a graph. A non-federated graph should have a single implementing service. -Set includeDeleted to see deleted subgraphs.""" implementingServices(graphVariant:String!includeDeleted:Boolean):GraphImplementors lastReportedAt(graphVariant:String):Timestamp """Current identity, null if not authenticated.""" me:Identity """The composition result that was most recently published to a graph variant.""" mostRecentCompositionPublish(graphVariant:String!):CompositionPublishResult """Permissions of the current user in this graph.""" myRole:UserPermission """Name of this graph. Note that this field is deprecated.""" name:String!@deprecated(reason:"Use Service.title")onboardingArchitecture:OnboardingArchitecture operation(id:ID!):Operation """Gets the operations and their approved changes for this graph, checkID, and operationID.""" operationsAcceptedChanges(checkID:ID!operationID:String!):[OperationAcceptedChange!]!"""Get an operations check result for a specific check ID""" operationsCheck(checkID:ID!):OperationsCheckResult """Get query triggers for a given variant. If variant is null all the triggers for this service will be gotten.""" queryTriggers(graphVariant:String operationNames:[String!]):[QueryTrigger!]readme:Readme """Registry specific stats for this graph.""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow """Whether registry subscriptions (with any options) are enabled. If variant is not passed, returns true if configuration is present for any variant""" registrySubscriptionsEnabled(graphVariant:String):Boolean!@deprecated(reason:"This field will be removed")reportingEnabled:Boolean!"""The list of members that can access this graph, accounting for graph role overrides""" roleOverrides:[RoleOverride!]"""Which permissions the current user has for interacting with this graph""" roles:ServiceRoles scheduledSummaries:[ScheduledSummary!]!"""Get a schema by hash or current tag""" schema(hash:ID tag:String):Schema """The current publish associated to a given variant (with 'tag' as the variant name).""" schemaTag(tag:String!):SchemaTag schemaTagById(id:ID!):SchemaTag """Get schema tags, with optional filtering to a set of tags. Always sorted by creation -date in reverse chronological order.""" schemaTags(tags:[String!]):[SchemaTag!]stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):ServiceStatsWindow!@deprecated(reason:"use Service.statsWindow instead")statsWindow(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):ServiceStatsWindow """Generate a test schema publish notification body""" testSchemaPublishBody(variant:String!):String!"""Name of this graph.""" title:String!trace(id:ID!):Trace traceStorageEnabled:Boolean!"""A particular variant often representing a live traffic environment (such as "dev", "staging", or "prod"). -Each variant can represent a specific URL or destination to query at, analytics, and its own schema history. -Pass in a name to get a specific variant. Use `Graph.variants` to get a list of variants.""" variant(name:String!):GraphVariant """The list of variants that exist for this graph""" variants:[GraphVariant!]!}"""Columns of ServiceBillingUsageStats.""" enum ServiceBillingUsageStatsColumn{OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG TIMESTAMP}type ServiceBillingUsageStatsDimensions{operationCountProvidedExplicitly:String schemaTag:String}"""Filter for data in ServiceBillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceBillingUsageStatsFilter{and:[ServiceBillingUsageStatsFilter!]in:ServiceBillingUsageStatsFilterIn not:ServiceBillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[ServiceBillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceBillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceBillingUsageStatsFilterIn{"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceBillingUsageStatsMetrics{operationCount:Long!}input ServiceBillingUsageStatsOrderBySpec{column:ServiceBillingUsageStatsColumn!direction:Ordering!}type ServiceBillingUsageStatsRecord{"""Dimensions of ServiceBillingUsageStats that can be grouped by.""" groupBy:ServiceBillingUsageStatsDimensions!"""Metrics of ServiceBillingUsageStats that can be aggregated over.""" metrics:ServiceBillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceEdgeServerInfos.""" enum ServiceEdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID TIMESTAMP USER_VERSION}type ServiceEdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID userVersion:String}"""Filter for data in ServiceEdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceEdgeServerInfosFilter{and:[ServiceEdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:ServiceEdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:ServiceEdgeServerInfosFilter or:[ServiceEdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in ServiceEdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceEdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input ServiceEdgeServerInfosOrderBySpec{column:ServiceEdgeServerInfosColumn!direction:Ordering!}type ServiceEdgeServerInfosRecord{"""Dimensions of ServiceEdgeServerInfos that can be grouped by.""" groupBy:ServiceEdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceErrorStats.""" enum ServiceErrorStatsColumn{CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceErrorStatsDimensions{clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String}"""Filter for data in ServiceErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceErrorStatsFilter{and:[ServiceErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ServiceErrorStatsFilterIn not:ServiceErrorStatsFilter or:[ServiceErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceErrorStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input ServiceErrorStatsOrderBySpec{column:ServiceErrorStatsColumn!direction:Ordering!}type ServiceErrorStatsRecord{"""Dimensions of ServiceErrorStats that can be grouped by.""" groupBy:ServiceErrorStatsDimensions!"""Metrics of ServiceErrorStats that can be aggregated over.""" metrics:ServiceErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldExecutions.""" enum ServiceFieldExecutionsColumn{ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG TIMESTAMP}type ServiceFieldExecutionsDimensions{fieldName:String parentType:String schemaTag:String}"""Filter for data in ServiceFieldExecutions. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldExecutionsFilter{and:[ServiceFieldExecutionsFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldExecutionsFilterIn not:ServiceFieldExecutionsFilter or:[ServiceFieldExecutionsFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldExecutions. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldExecutionsFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldExecutionsMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input ServiceFieldExecutionsOrderBySpec{column:ServiceFieldExecutionsColumn!direction:Ordering!}type ServiceFieldExecutionsRecord{"""Dimensions of ServiceFieldExecutions that can be grouped by.""" groupBy:ServiceFieldExecutionsDimensions!"""Metrics of ServiceFieldExecutions that can be aggregated over.""" metrics:ServiceFieldExecutionsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldLatencies.""" enum ServiceFieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceFieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String}"""Filter for data in ServiceFieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldLatenciesFilter{and:[ServiceFieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldLatenciesFilterIn not:ServiceFieldLatenciesFilter or:[ServiceFieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input ServiceFieldLatenciesOrderBySpec{column:ServiceFieldLatenciesColumn!direction:Ordering!}type ServiceFieldLatenciesRecord{"""Dimensions of ServiceFieldLatencies that can be grouped by.""" groupBy:ServiceFieldLatenciesDimensions!"""Metrics of ServiceFieldLatencies that can be aggregated over.""" metrics:ServiceFieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldRequestsByClientVersion.""" enum ServiceFieldRequestsByClientVersionColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT FIELD_NAME OBSERVED_EXECUTION_COUNT PARENT_TYPE REFERENCING_OPERATION_COUNT SCHEMA_TAG TIMESTAMP}type ServiceFieldRequestsByClientVersionDimensions{clientName:String clientVersion:String fieldName:String parentType:String schemaTag:String}"""Filter for data in ServiceFieldRequestsByClientVersion. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldRequestsByClientVersionFilter{and:[ServiceFieldRequestsByClientVersionFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldRequestsByClientVersionFilterIn not:ServiceFieldRequestsByClientVersionFilter or:[ServiceFieldRequestsByClientVersionFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldRequestsByClientVersion. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldRequestsByClientVersionFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldRequestsByClientVersionMetrics{estimatedExecutionCount:Long!observedExecutionCount:Long!referencingOperationCount:Long!}input ServiceFieldRequestsByClientVersionOrderBySpec{column:ServiceFieldRequestsByClientVersionColumn!direction:Ordering!}type ServiceFieldRequestsByClientVersionRecord{"""Dimensions of ServiceFieldRequestsByClientVersion that can be grouped by.""" groupBy:ServiceFieldRequestsByClientVersionDimensions!"""Metrics of ServiceFieldRequestsByClientVersion that can be aggregated over.""" metrics:ServiceFieldRequestsByClientVersionMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldUsage.""" enum ServiceFieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceFieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String}"""Filter for data in ServiceFieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldUsageFilter{and:[ServiceFieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldUsageFilterIn not:ServiceFieldUsageFilter or:[ServiceFieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input ServiceFieldUsageOrderBySpec{column:ServiceFieldUsageColumn!direction:Ordering!}type ServiceFieldUsageRecord{"""Dimensions of ServiceFieldUsage that can be grouped by.""" groupBy:ServiceFieldUsageDimensions!"""Metrics of ServiceFieldUsage that can be aggregated over.""" metrics:ServiceFieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Mutations to a graph.""" type ServiceMutation{"""Check a proposed subgraph schema change. -If the proposal composes successfully, perform a usage check for the resulting schema.""" checkPartialSchema("""Deprecated and ignored.""" frontend:String gitContext:GitContextInput """Specifies which variant of a graph this mutation operates on.""" graphVariant:String!historicParameters:HistoricQueryParameters """Name of the implementing service to validate the partial schema against""" implementingServiceName:String!"""If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String isSandboxCheck:Boolean!=false """The partial schema to validate against an implementing service""" partialSchema:PartialSchemaInput!"""Whether to use the maximum retention for historical validation. This only takes -effect if historicParameters is null.""" useMaximumRetention:Boolean):CheckPartialSchemaResult!"""Checks a proposed schema against the schema that has been published to -a particular variant, using metrics corresponding to `historicParameters`. -Callers can set `historicParameters` directly or rely on defaults set in the -graph's check configuration (7 days by default). -If they do not set `historicParameters` but set `useMaximumRetention`, -validation will use the maximum retention the graph has access to.""" checkSchema(baseSchemaTag:String="current" """Deprecated and ignored.""" frontend:String gitContext:GitContextInput historicParameters:HistoricQueryParameters """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String isSandboxCheck:Boolean!=false """Only one of proposedSchema, proposedSchemaDocument, and proposedSchemaHash -may be specified""" proposedSchema:IntrospectionSchemaInput proposedSchemaDocument:String proposedSchemaHash:String useMaximumRetention:Boolean):CheckSchemaResult!"""Make changes to a check workflow.""" checkWorkflow(id:ID!):CheckWorkflowMutation createCompositionStatusSubscription("""ID of Slack channel for registry notification.""" channelID:ID!"""Variant to notify on.""" variant:String!):SchemaPublishSubscription!createSchemaPublishSubscription("""ID of Slack channel for registry notification.""" channelID:ID!"""Variant to notify on.""" variant:String!):SchemaPublishSubscription!"""Soft delete a graph. Data associated with the graph is not permanently deleted; Apollo support can undo.""" delete:Void """Delete the service's avatar. Requires Service.roles.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Delete an existing channel""" deleteChannel(id:ID!):Boolean!"""Delete an existing query trigger""" deleteQueryTrigger(id:ID!):Boolean!"""Deletes this service's current subscriptions specific to the ID, returns true if it existed""" deleteRegistrySubscription(id:ID!):Boolean!"""Deletes this service's current registry subscription(s) specific to its graph variant, -returns a list of subscription IDs that were deleted.""" deleteRegistrySubscriptions(variant:String!):[ID!]!deleteScheduledSummary(id:ID!):Boolean!"""Delete a variant by name.""" deleteSchemaTag(tag:String!):DeleteSchemaTagResult!"""Given a UTC timestamp, delete all traces associated with this Service, on that corresponding day. If a timestamp to is provided, deletes all days inclusive.""" deleteTraces(from:Timestamp!to:Timestamp):Void disableDatadogForwardingLegacyMetricNames:Service """Hard delete a graph and all data associated with it. Its ID cannot be reused.""" hardDelete:Void id:ID!@deprecated(reason:"Use service.id")"""Ignore an operation in future checks; -changes affecting it will be tracked, -but won't affect the outcome of the check. -Returns true if the operation is newly ignored, -false if it already was.""" ignoreOperationsInChecks(ids:[ID!]!):IgnoreOperationsInChecksResult """Mark the changeset that affects an operation in a given check instance as safe. -Note that only operations marked as behavior changes are allowed to be marked as safe.""" markChangesForOperationAsSafe("""ID of the schema check.""" checkID:ID!"""ID of the operation to accept changes for.""" operationID:ID!):MarkChangesForOperationAsSafeResult!newKey(keyName:String role:UserPermission!=GRAPH_ADMIN):GraphApiKey!"""Adds an override to the given users permission for this graph""" overrideUserPermission(permission:UserPermission userID:ID!):Service """Promote the schema with the given SHA-256 hash to active for the given variant/tag.""" promoteSchema(graphVariant:String!historicParameters:HistoricQueryParameters overrideComposedSchema:Boolean!=false sha256:SHA256!):PromoteSchemaResponseOrError!"""Publish to a subgraph. If composition is successful, this will update running routers.""" publishSubgraph(activePartialSchema:PartialSchemaInput!gitContext:GitContextInput graphVariant:String!name:String!revision:String!url:String):CompositionAndUpsertResult registerOperationsWithResponse(clientIdentity:RegisteredClientIdentityInput gitContext:GitContextInput """Specifies which variant of a graph these operations belong to. -Formerly known as "tag" -Defaults to "current" -""" graphVariant:String!="current" manifestVersion:Int operations:[RegisteredOperationInput!]!):RegisterOperationsMutationResponse """Removes a subgraph. If composition is successful, this will update running routers.""" removeImplementingServiceAndTriggerComposition("""Do not remove the service, but recompose without it and report any errors.""" dryRun:Boolean!=false graphVariant:String!name:String!):CompositionAndRemoveResult!removeKey("""API key ID""" id:ID):Void renameKey(id:ID!newKeyName:String):GraphApiKey reportServerInfo("""Only sent if previously requested i.e. received ReportServerInfoResult with withExecutableSchema = true. An executable schema is a schema document that describes the full GraphQL schema that an external client could execute queries against. This must be a valid GraphQL schema document, as per the GraphQL specification: https://spec.graphql.org/""" executableSchema:String """Information about the edge server, see descriptions for individual fields.""" info:EdgeServerInfo!):ReportServerInfoResult@deprecated(reason:"use Mutation.reportSchema instead")service:Service!setDefaultBuildPipelineTrack(version:String!):String """Store a given schema document. This schema will be attached to the graph but -not be associated with any variant. On success, returns the schema hash.""" storeSchemaDocument(schemaDocument:String!):StoreSchemaResponseOrError!"""Test Slack notification channel""" testSlackChannel(id:ID!notification:SlackNotificationInput!):Void testSubscriptionForChannel(channelID:ID!subscriptionID:ID!):String!transfer(to:String!):Service triggerRepublish(graphVariant:String!):Void undelete:Service """Revert the effects of ignoreOperation. -Returns true if the operation is no longer ignored, -false if it wasn't.""" unignoreOperationsInChecks(ids:[ID!]!):UnignoreOperationsInChecksResult """Unmark changes for an operation as safe.""" unmarkChangesForOperationAsSafe("""ID of the schema check.""" checkID:ID!"""ID of the operation to unmark changes for.""" operationID:ID!):MarkChangesForOperationAsSafeResult!"""Update schema check configuration for a graph.""" updateCheckConfiguration("""Clients to ignore during validation.""" excludedClients:[ClientFilterInput!]"""Operation names to ignore during validation.""" excludedOperationNames:[OperationNameFilterInput!]"""Operations to ignore during validation.""" excludedOperations:[ExcludedOperationInput!]"""Default configuration to include operations on the base variant.""" includeBaseVariant:Boolean """Variant overrides for validation.""" includedVariants:[String!]"""Minimum number of requests within the window for a query to be considered.""" operationCountThreshold:Int """Number of requests within the window for a query to be considered, relative to -total request count. Expected values are between 0 and 0.05 (minimum 5% of -total request volume)""" operationCountThresholdPercentage:Float """Only check operations from the last <timeRangeSeconds> seconds. The default is 7 days (604,800 seconds).""" timeRangeSeconds:Long):CheckConfiguration!updateDatadogMetricsConfig(apiKey:String apiRegion:DatadogApiRegion enabled:Boolean):DatadogMetricsConfig updateDescription(description:String!):Service """Update hiddenFromUninvitedNonAdminAccountMembers""" updateHiddenFromUninvitedNonAdminAccountMembers(hiddenFromUninvitedNonAdminAccountMembers:Boolean!):Service updateReadme(readme:String!):Service updateTitle(title:String!):Service """Publish a schema to this variant, either via a document or an introspection query result.""" uploadSchema(errorOnBadRequest:Boolean!=true gitContext:GitContextInput historicParameters:HistoricQueryParameters overrideComposedSchema:Boolean!=false schema:IntrospectionSchemaInput schemaDocument:String tag:String!):UploadSchemaMutationResponse upsertChannel(id:ID pagerDutyChannel:PagerDutyChannelInput slackChannel:SlackChannelInput webhookChannel:WebhookChannelInput):Channel """Creates a contract schema from a source variant and a set of filter configurations""" upsertContractVariant(contractVariantName:String!filterConfig:FilterConfigInput!initiateLaunch:Boolean!=true sourceVariant:String!):ContractVariantUpsertResult!"""Publish to a subgraph. If composition is successful, this will update running routers.""" upsertImplementingServiceAndTriggerComposition(activePartialSchema:PartialSchemaInput!gitContext:GitContextInput graphVariant:String!name:String!revision:String!url:String):CompositionAndUpsertResult """Create/update PagerDuty notification channel""" upsertPagerDutyChannel(channel:PagerDutyChannelInput!id:ID):PagerDutyChannel upsertQueryTrigger(id:ID trigger:QueryTriggerInput!):QueryTrigger """Create or update a subscription for a service.""" upsertRegistrySubscription("""ID of Slack channel for registry notification.""" channelID:ID """ID of registry subscription""" id:ID """Set of options/customization for notification.""" options:SubscriptionOptionsInput """Variant to notify on.""" variant:String):RegistrySubscription!upsertScheduledSummary(channelID:ID enabled:Boolean id:ID """Deprecated, use the 'variant' argument instead""" tag:String timezone:String variant:String):ScheduledSummary """Create/update Slack notification channel""" upsertSlackChannel(channel:SlackChannelInput!id:ID):SlackChannel upsertWebhookChannel(id:ID name:String secretToken:String url:String!):WebhookChannel validateOperations(gitContext:GitContextInput operations:[OperationDocumentInput!]!tag:String="current"):ValidateOperationsResult!"""This mutation will not result in any changes to the implementing service -Run composition with the Implementing Service's partial schema replaced with the one provided -in the mutation's input. Store the composed schema, return the hash of the composed schema, -and any warnings and errors pertaining to composition. -This mutation will not run validation against operations.""" validatePartialSchemaOfImplementingServiceAgainstGraph(graphVariant:String!implementingServiceName:String!partialSchema:PartialSchemaInput!):CompositionValidationResult!"""Make changes to a graph variant.""" variant(name:String!):GraphVariantMutation}"""Columns of ServiceOperationCheckStats.""" enum ServiceOperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG TIMESTAMP UNCACHED_REQUESTS_COUNT}type ServiceOperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String}"""Filter for data in ServiceOperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceOperationCheckStatsFilter{and:[ServiceOperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ServiceOperationCheckStatsFilterIn not:ServiceOperationCheckStatsFilter or:[ServiceOperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceOperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceOperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceOperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input ServiceOperationCheckStatsOrderBySpec{column:ServiceOperationCheckStatsColumn!direction:Ordering!}type ServiceOperationCheckStatsRecord{"""Dimensions of ServiceOperationCheckStats that can be grouped by.""" groupBy:ServiceOperationCheckStatsDimensions!"""Metrics of ServiceOperationCheckStats that can be aggregated over.""" metrics:ServiceOperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceQueryStats.""" enum ServiceQueryStatsColumn{CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type ServiceQueryStatsDimensions{clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String}"""Filter for data in ServiceQueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceQueryStatsFilter{and:[ServiceQueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:ServiceQueryStatsFilterIn not:ServiceQueryStatsFilter or:[ServiceQueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceQueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceQueryStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceQueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input ServiceQueryStatsOrderBySpec{column:ServiceQueryStatsColumn!direction:Ordering!}type ServiceQueryStatsRecord{"""Dimensions of ServiceQueryStats that can be grouped by.""" groupBy:ServiceQueryStatsDimensions!"""Metrics of ServiceQueryStats that can be aggregated over.""" metrics:ServiceQueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""A map from role (permission) String to boolean that the current user is allowed for a particular graph.""" type ServiceRoles{"""Whether the currently authenticated user is permitted to perform schema checks (i.e. run `rover (sub)graph check`).""" canCheckSchemas:Boolean!"""Whether the currently authenticated user is permitted to create new graph variants.""" canCreateVariants:Boolean!"""Whether the currently authenticated user is permitted to delete the graph in question""" canDelete:Boolean!"""Whether the currently authenticated user is permitted to manage user access to the graph in question.""" canManageAccess:Boolean!"""Whether the currently authenticated user is permitted to manage the build configuration (e.g. build pipeline version).""" canManageBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to manage 3rd party integrations (e.g. Datadog forwarding).""" canManageIntegrations:Boolean!"""Whether the currently authenticated user is permitted to manage graph-level API keys.""" canManageKeys:Boolean!"""Whether the currently authenticated user is permitted to perform basic administration (e.g. set to public) over variants.""" canManageVariants:Boolean!"""Whether the currently authenticated user is permitted to view details about the build configuration (e.g. build pipeline version).""" canQueryBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to view details of the check configuration for this graph.""" canQueryCheckConfiguration:Boolean!canQueryDeletedImplementingServices:Boolean!"""Whether the currently authenticated user is permitted to view which subgraphs the graph is composed of.""" canQueryImplementingServices:Boolean!canQueryIntegrations:Boolean!canQueryPrivateInfo:Boolean!canQueryPublicInfo:Boolean!canQueryReadmeAuthor:Boolean!canQueryRoleOverrides:Boolean!"""Whether the currently authenticated user is permitted to download schemas owned by this graph.""" canQuerySchemas:Boolean!canQueryStats:Boolean!canQueryTokens:Boolean!canQueryTraces:Boolean!"""Whether the currently authenticated user is permitted to register operations (i.e. `apollo client:push`) for this graph.""" canRegisterOperations:Boolean!canStoreSchemasWithoutVariant:Boolean!canUndelete:Boolean!canUpdateAvatar:Boolean!canUpdateDescription:Boolean!canUpdateTitle:Boolean!canVisualizeStats:Boolean!@deprecated(reason:"Replaced with canQueryTraces and canQueryStats")"""Whether the currently authenticated user is permitted to make updates to the check configuration for this graph.""" canWriteCheckConfiguration:Boolean!canWriteTraces:Boolean!@deprecated(reason:"Never worked, not replaced")}"""A time window with a specified granularity over a given service.""" type ServiceStatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:ServiceBillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceBillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceBillingUsageStatsOrderBySpec!]):[ServiceBillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:ServiceEdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceEdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceEdgeServerInfosOrderBySpec!]):[ServiceEdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:ServiceErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceErrorStatsOrderBySpec!]):[ServiceErrorStatsRecord!]!fieldExecutions("""Filter to select what rows to return.""" filter:ServiceFieldExecutionsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldExecutions by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldExecutionsOrderBySpec!]):[ServiceFieldExecutionsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:ServiceFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldLatenciesOrderBySpec!]):[ServiceFieldLatenciesRecord!]!fieldRequestsByClientVersion("""Filter to select what rows to return.""" filter:ServiceFieldRequestsByClientVersionFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldRequestsByClientVersion by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldRequestsByClientVersionOrderBySpec!]):[ServiceFieldRequestsByClientVersionRecord!]!fieldStats("""Filter to select what rows to return.""" filter:ServiceFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldLatenciesOrderBySpec!]):[ServiceFieldLatenciesRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:ServiceFieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldUsageOrderBySpec!]):[ServiceFieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:ServiceOperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceOperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceOperationCheckStatsOrderBySpec!]):[ServiceOperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:ServiceQueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceQueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceQueryStatsOrderBySpec!]):[ServiceQueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:ServiceTracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceTracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceTracePathErrorsRefsOrderBySpec!]):[ServiceTracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:ServiceTraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceTraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceTraceRefsOrderBySpec!]):[ServiceTraceRefsRecord!]!}"""Columns of ServiceTracePathErrorsRefs.""" enum ServiceTracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type ServiceTracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in ServiceTracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceTracePathErrorsRefsFilter{and:[ServiceTracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:ServiceTracePathErrorsRefsFilterIn not:ServiceTracePathErrorsRefsFilter or:[ServiceTracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in ServiceTracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceTracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type ServiceTracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input ServiceTracePathErrorsRefsOrderBySpec{column:ServiceTracePathErrorsRefsColumn!direction:Ordering!}type ServiceTracePathErrorsRefsRecord{"""Dimensions of ServiceTracePathErrorsRefs that can be grouped by.""" groupBy:ServiceTracePathErrorsRefsDimensions!"""Metrics of ServiceTracePathErrorsRefs that can be aggregated over.""" metrics:ServiceTracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceTraceRefs.""" enum ServiceTraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type ServiceTraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String traceId:ID}"""Filter for data in ServiceTraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceTraceRefsFilter{and:[ServiceTraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:ServiceTraceRefsFilterIn not:ServiceTraceRefsFilter or:[ServiceTraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in ServiceTraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceTraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type ServiceTraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input ServiceTraceRefsOrderBySpec{column:ServiceTraceRefsColumn!direction:Ordering!}type ServiceTraceRefsRecord{"""Dimensions of ServiceTraceRefs that can be grouped by.""" groupBy:ServiceTraceRefsDimensions!"""Metrics of ServiceTraceRefs that can be aggregated over.""" metrics:ServiceTraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Slack notification channel""" type SlackChannel implements Channel{id:ID!name:String!subscriptions:[ChannelSubscription!]!url:String!}"""Slack notification channel parameters""" input SlackChannelInput{name:String url:String!}input SlackNotificationField{key:String!value:String!}"""Slack notification message""" input SlackNotificationInput{color:String fallback:String!fields:[SlackNotificationField!]iconUrl:String text:String timestamp:Timestamp title:String titleLink:String username:String}type SourceLocation{column:Int!line:Int!}"""A time window with a specified granularity.""" type StatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:BillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order BillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[BillingUsageStatsOrderBySpec!]):[BillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:EdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order EdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[EdgeServerInfosOrderBySpec!]):[EdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:ErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ErrorStatsOrderBySpec!]):[ErrorStatsRecord!]!fieldExecutions("""Filter to select what rows to return.""" filter:FieldExecutionsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldExecutions by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldExecutionsOrderBySpec!]):[FieldExecutionsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:FieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldLatenciesOrderBySpec!]):[FieldLatenciesRecord!]!fieldRequestsByClientVersion("""Filter to select what rows to return.""" filter:FieldRequestsByClientVersionFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldRequestsByClientVersion by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldRequestsByClientVersionOrderBySpec!]):[FieldRequestsByClientVersionRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:FieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldUsageOrderBySpec!]):[FieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:OperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order OperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[OperationCheckStatsOrderBySpec!]):[OperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:QueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order QueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[QueryStatsOrderBySpec!]):[QueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:TracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order TracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[TracePathErrorsRefsOrderBySpec!]):[TracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:TraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order TraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[TraceRefsOrderBySpec!]):[TraceRefsRecord!]!}type StoreSchemaError{code:StoreSchemaErrorCode!message:String!}enum StoreSchemaErrorCode{SCHEMA_IS_NOT_PARSABLE SCHEMA_IS_NOT_VALID}type StoreSchemaResponse{sha256:SHA256!}union StoreSchemaResponseOrError=StoreSchemaError|StoreSchemaResponse type StoredApprovedChange{argNode:NamedIntrospectionArgNoDescription childNode:NamedIntrospectionValueNoDescription code:ChangeCode!parentNode:NamedIntrospectionTypeNoDescription}scalar StringOrInt type StringToString{key:String!value:String!}input StringToStringInput{key:String!value:String!}type Subgraph{hash:String!name:String!routingURL:String!}type SubgraphChange{name:ID!type:SubgraphChangeType!}enum SubgraphChangeType{ADDITION DELETION MODIFICATION}type SubgraphConfig{id:ID!name:String!schemaHash:String!sdl:String!url:String!}type SubscriptionOptions{"""Enables notifications for schema updates""" schemaUpdates:Boolean!}input SubscriptionOptionsInput{"""Enables notifications for schema updates""" schemaUpdates:Boolean!}enum SubscriptionState{ACTIVE CANCELED EXPIRED FUTURE PAST_DUE PAUSED PENDING UNKNOWN}enum SubscriptionStateV2{ACTIVE CANCELED EXPIRED FUTURE PAST_DUE PAUSED PENDING UNKNOWN}type TemporaryURL{url:String!}enum ThemeName{DARK LIGHT}enum TicketPriority{P0 P1 P2 P3}enum TicketStatus{CLOSED HOLD NEW OPEN PENDING SOLVED}"""ISO 8601, extended format with nanoseconds, Zulu (or '[+-]seconds' for times relative to now)""" scalar Timestamp type TimezoneOffset{minutesOffsetFromUTC:Int!zoneID:String!}"""Counts of changes.""" type TotalChangeSummaryCounts{"""Number of changes that are additions. This includes adding types, adding fields to object, input -object, and interface types, adding values to enums, adding members to interfaces and unions, and -adding arguments.""" additions:Int!"""Number of changes that are new usages of the @deprecated directive.""" deprecations:Int!"""Number of changes that are edits. This includes types changing kind, fields and arguments -changing type, arguments changing default value, and any description changes. This also includes -edits to @deprecated reason strings.""" edits:Int!"""Number of changes that are removals. This includes removing types, removing fields from object, -input object, and interface types, removing values from enums, removing members from interfaces -and unions, and removing arguments. This also includes removing @deprecated usages.""" removals:Int!}type Trace{cacheMaxAgeMs:Float cacheScope:CacheScope clientName:String clientVersion:String durationMs:Float!endTime:Timestamp!http:TraceHTTP id:ID!operationName:String protobuf:Protobuf!root:TraceNode!signature:String!startTime:Timestamp!unexecutedOperationBody:String unexecutedOperationName:String variablesJSON:[StringToString!]!}type TraceError{json:String!locations:[TraceSourceLocation!]!message:String!timestamp:Timestamp}type TraceHTTP{host:String method:HTTPMethod!path:String protocol:String requestHeaders:[StringToString!]!responseHeaders:[StringToString!]!secure:Boolean!statusCode:Int!}type TraceNode{cacheMaxAgeMs:Float cacheScope:CacheScope children:[TraceNode!]!childrenIds:[ID!]!descendants:[TraceNode!]!descendantsIds:[ID!]!endTime:Timestamp!errors:[TraceError!]!id:ID!key:StringOrInt originalFieldName:String parent:ID!parentId:ID path:[String!]!startTime:Timestamp!type:String}"""Columns of TracePathErrorsRefs.""" enum TracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type TracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String """If metrics were collected from a federated service, this field will be prefixed with `service:<SERVICE_NAME>.`""" path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in TracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input TracePathErrorsRefsFilter{and:[TracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:TracePathErrorsRefsFilterIn not:TracePathErrorsRefsFilter or:[TracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in TracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input TracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type TracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input TracePathErrorsRefsOrderBySpec{column:TracePathErrorsRefsColumn!direction:Ordering!}type TracePathErrorsRefsRecord{"""Dimensions of TracePathErrorsRefs that can be grouped by.""" groupBy:TracePathErrorsRefsDimensions!"""Metrics of TracePathErrorsRefs that can be aggregated over.""" metrics:TracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of TraceRefs.""" enum TraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type TraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID traceId:ID}"""Filter for data in TraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input TraceRefsFilter{and:[TraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:TraceRefsFilterIn not:TraceRefsFilter or:[TraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in TraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input TraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type TraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input TraceRefsOrderBySpec{column:TraceRefsColumn!direction:Ordering!}type TraceRefsRecord{"""Dimensions of TraceRefs that can be grouped by.""" groupBy:TraceRefsDimensions!"""Metrics of TraceRefs that can be aggregated over.""" metrics:TraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type TraceSourceLocation{column:Int!line:Int!}"""Counts of changes at the type level, including interfaces, unions, enums, scalars, input objects, etc.""" type TypeChangeSummaryCounts{"""Number of changes that are additions of types.""" additions:Int!"""Number of changes that are edits. This includes types changing kind and any type description -changes, but also includes adding/removing values from enums, adding/removing members from -interfaces and unions, and any enum value deprecation and description changes.""" edits:Int!"""Number of changes that are removals of types.""" removals:Int!}"""the TypeFilterConfig is used to isolate -types, and subsequent fields, through -various configuration settings. - -It defaults to filter towards user defined -types only""" input TypeFilterConfig{"""include abstract types (interfaces and unions)""" includeAbstractTypes:Boolean=true """include built in scalars (i.e. Boolean, Int, etc)""" includeBuiltInTypes:Boolean=false """include reserved introspection types (i.e. __Type)""" includeIntrospectionTypes:Boolean=false}type URI{"""A GCS URI""" gcs:String!}type UnignoreOperationsInChecksResult{graph:Service!}union UpdateOperationCollectionEntryResult=OperationCollectionEntry|PermissionError|ValidationError union UpdateOperationCollectionResult=OperationCollection|PermissionError|ValidationError """The result of a schema publish to a graph variant.""" type UploadSchemaMutationResponse{"""A response code for processing via machines (e.g. UPLOAD_SUCCESS or NO_CHANGES)""" code:String!"""Human readable result of a schema publish.""" message:String!"""If successful, the corresponding publication.""" publication:SchemaTag """Whether the schema publish successfully completed or encountered errors.""" success:Boolean!"""If successful, the corresponding publication.""" tag:SchemaTag}"""A registered user.""" type User implements Identity{acceptedPrivacyPolicyAt:Timestamp accounts:[Account!]!@deprecated(reason:"Replaced with User.memberships.account")apiKeys(includeCookies:Boolean=false):[UserApiKey!]!"""Translation of this user identity to an 'Actor' type.""" asActor:Actor!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request -with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the -browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the -filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to -MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the user's avatar. Note that CORS is not enabled for these URLs. The size -argument is used for bandwidth reduction, and should be the size of the image as displayed in the -application. Apollo's media server will downscale larger images to at least the requested size, -but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String betaFeaturesOn:Boolean!canUpdateAvatar:Boolean!canUpdateEmail:Boolean!canUpdateFullName:Boolean!createdAt:Timestamp!email:String emailModifiedAt:Timestamp emailVerified:Boolean!experimentalFeatures:UserExperimentalFeatures!featureIntros:FeatureIntros fullName:String!"""The user's GitHub username, if they log in via GitHub. May be null even for GitHub users in some edge cases.""" githubUsername:String """The unique identifier for a user.""" id:ID!"""This role is reserved exclusively for internal MDG employees, and it controls what access they may have to other -organizations. Only admins are allowed to see this field.""" internalAdminRole:InternalMdgAdminRole """Last time any API token from this user was used against AGM services""" lastAuthenticatedAt:Timestamp logoutAfterIdleMs:Int """Which organizations a user belongs to.""" memberships:[UserMembership!]!"""The name (first and last) of a user.""" name:String!odysseyAttempt(id:ID!):OdysseyAttempt odysseyAttempts:[OdysseyAttempt!]!odysseyCertifications:[OdysseyCertification!]odysseyCourses:[OdysseyCourse!]odysseyHasEarlyAccess:Boolean!odysseyHasRequestedEarlyAccess:Boolean!odysseyTasks:[OdysseyTask!]sandboxOperationCollections:[OperationCollection!]!synchronized:Boolean!"""List of Zendesk tickets this user has submitted""" tickets:[ZendeskTicket!]type:UserType!}type UserApiKey implements ApiKey{id:ID!keyName:String token:String!}type UserExperimentalFeatures{exampleFeature:Boolean!}"""An organization a given user belongs to.""" type UserMembership{"""The organization a user is a member of.""" account:Account!"""When the user joined the organization.""" createdAt:Timestamp!"""What level of access a use has to an organization.""" permission:UserPermission!"""The user that is a member of an organization.""" user:User!}type UserMutation{acceptPrivacyPolicy:Void """Change the user's password""" changePassword(newPassword:String!previousPassword:String!):Void createOdysseyAttempt(testId:String!):OdysseyAttempt createOdysseyCertification(certificationId:String!):OdysseyCertification createOdysseyCourses(courses:[OdysseyCourseInput!]!):[OdysseyCourse!]createOdysseyTasks(tasks:[OdysseyTaskInput!]!):[OdysseyTask!]"""Delete the user's avatar. Requires User.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Hard deletes the associated user. Throws an error otherwise with reason included.""" hardDelete:Void """Create a new API key for this user. Must take in a name for this key.""" newKey(keyName:String!):UserApiKey!"""Create a new API key for this user if there are no current API keys. -If an API key already exists, this will return one at random and not create a new one.""" provisionKey(keyName:String!="add-a-name"):ApiKeyProvision """Refresh information about the user from its upstream service (eg list of organizations from GitHub)""" refresh:User """Removes the given key from this user. Can be used to remove either a web cookie or a user API key.""" removeKey(id:ID!):Void """Renames the given key to the new key name.""" renameKey(id:ID!newKeyName:String):UserApiKey resendVerificationEmail:Void setOdysseyCourse(course:OdysseyCourseInput!):OdysseyCourse setOdysseyResponse(response:OdysseyResponseInput!):OdysseyResponse setOdysseyTask(task:OdysseyTaskInput!):OdysseyTask """Submit a zendesk ticket for this user""" submitZendeskTicket(collaborators:[String!]email:String!ticket:ZendeskTicketInput!):ZendeskTicket """Update information about a user; all arguments are optional""" update(email:String fullName:String referrer:String trackingGoogleClientId:String trackingMarketoClientId:String userSegment:UserSegment utmCampaign:String utmMedium:String utmSource:String):User """Updates this users' preference concerning opting into beta features.""" updateBetaFeaturesOn(betaFeaturesOn:Boolean!):User """Update the status of a feature for this. For example, if you want to hide an introductory popup.""" updateFeatureIntros(newFeatureIntros:FeatureIntrosInput):User updateOdysseyAttempt(completedAt:Timestamp id:ID!):OdysseyAttempt """Update user to have the given internal mdg admin role. -It is necessary to be an MDG_INTERNAL_SUPER_ADMIN to perform update. -Additionally, upserting a null value explicitly revokes this user's -admin status.""" updateRole(newRole:InternalMdgAdminRole):User user:User!verifyEmail(token:String!):User}enum UserPermission{BILLING_MANAGER CONSUMER CONTRIBUTOR DOCUMENTER GRAPH_ADMIN LEGACY_GRAPH_KEY OBSERVER ORG_ADMIN}enum UserSegment{JOIN_MY_TEAM LOCAL_DEVELOPMENT NOT_SPECIFIED PRODUCTION_GRAPHS SANDBOX SANDBOX_OPERATION_COLLECTIONS TRY_TEAM}type UserSettings{appNavCollapsed:Boolean!autoManageVariables:Boolean!id:String!mockingResponses:Boolean!preflightScriptEnabled:Boolean!responseHints:ResponseHints!tableMode:Boolean!themeName:ThemeName!}"""Explorer user settings input""" input UserSettingsInput{appNavCollapsed:Boolean autoManageVariables:Boolean mockingResponses:Boolean preflightScriptEnabled:Boolean responseHints:ResponseHints tableMode:Boolean themeName:ThemeName}enum UserType{APOLLO GITHUB SSO}type ValidateOperationsResult{validationResults:[ValidationResult!]!}type ValidationError implements Error{message:String!}enum ValidationErrorCode{DEPRECATED_FIELD INVALID_OPERATION NON_PARSEABLE_DOCUMENT}enum ValidationErrorType{FAILURE INVALID WARNING}"""Represents a single validation error, with information relating to the error -and its respective operation""" type ValidationResult{"""The validation result's error code""" code:ValidationErrorCode!"""Description of the validation error""" description:String!"""The operation related to this validation result""" operation:OperationDocument!"""The type of validation error thrown - warning, failure, or invalid.""" type:ValidationErrorType!}"""Always null""" scalar Void """Webhook notification channel""" type WebhookChannel implements Channel{id:ID!name:String!secretToken:String subscriptions:[ChannelSubscription!]!url:String!}"""PagerDuty notification channel parameters""" input WebhookChannelInput{name:String secretToken:String url:String!}type ZendeskTicket{createdAt:Timestamp!description:String!graph:Service id:Int!organization:Account priority:TicketPriority!status:TicketStatus subject:String!user:User}"""Zendesk ticket input""" input ZendeskTicketInput{description:String!graphId:String organizationId:String priority:TicketPriority!subject:String!} +Each variant has its own GraphQL schema, which means schemas can differ between environments. +""" +type Graph implements Identity { + """The organization that this graph belongs to.""" + account: Organization + """A list of the graph API keys that are active for this graph.""" + apiKeys: [GraphApiKey!] + """Provides a view of the graph as an `Actor` type.""" + asActor: Actor! + """Get a check workflow for this graph by its ID""" + checkWorkflow(id: ID!): CheckWorkflow + """The graph's globally unique identifier.""" + id: ID! + """Permissions of the current user in this graph.""" + myRole: UserPermission + name: String! + """Describes the permissions that the active user has for this graph.""" + roles: GraphRoles + """The graph's name.""" + title: String! + """ + Provides details of the graph variant with the provided `name`, if a variant + with that name exists for this graph. Otherwise, returns null. + + For a list of _all_ variants associated with a graph, use `Graph.variants` instead. + """ + variant(name: String!): GraphVariant + """A list of the variants for this graph.""" + variants: [GraphVariant!]! + """Get a GraphQL document by hash""" + document(hash: SHA256): GraphQLDocument + """Get check workflows for this graph ordered by creation time, most recent first.""" + checkWorkflows(limit: Int! = 100, filter: CheckFilterInput): [CheckWorkflow!]! +} + +"""Provides access to mutation fields for managing Studio graphs and subgraphs.""" +type GraphMutation { + """Generates a new graph API key for this graph with the specified permission level.""" + newKey(keyName: String, role: UserPermission! = GRAPH_ADMIN): GraphApiKey! + """Deletes the existing graph API key with the provided ID, if any.""" + removeKey( + """API key ID""" + id: ID! + ): Void + """Sets a new name for the graph API key with the provided ID, if any. This does not invalidate the key or change its value.""" + renameKey(id: ID!, newKeyName: String): GraphApiKey + """Creates a contract schema from a source variant and a set of filter configurations""" + upsertContractVariant( + """The name of the contract variant, e.g. `public-api`. Once set, this value cannot be changed.""" + contractVariantName: String! + """The filter configuration used to build a contract schema. The configuration consists of lists of tags for schema elements to include or exclude in the resulting schema.""" + filterConfig: FilterConfigInput! + """Whether a launch and schema publish should be initiated after updating configuration. Defaults to `true`.""" + initiateLaunch: Boolean! = true + """The graphRef of the variant the contract will be derived from, e.g. `my-graph@production`. Once set, this value cannot be changed.""" + sourceVariant: String + ): ContractVariantUpsertResult! + """Make changes to a graph variant.""" + variant(name: String!): GraphVariantMutation + """Publish a schema to this variant, either via a document or an introspection query result.""" + uploadSchema(schema: IntrospectionSchemaInput, schemaDocument: String, tag: String!, historicParameters: HistoricQueryParameters, overrideComposedSchema: Boolean! = false, errorOnBadRequest: Boolean! = true, gitContext: GitContextInput): SchemaPublicationResult + """ + Checks a proposed schema against the schema that has been published to + a particular variant, using metrics corresponding to `historicParameters`. + Callers can set `historicParameters` directly or rely on defaults set in the + graph's check configuration (7 days by default). + If they do not set `historicParameters` but set `useMaximumRetention`, + validation will use the maximum retention the graph has access to. + """ + checkSchema( + """ + Only one of proposedSchema, proposedSchemaDocument, and proposedSchemaHash + may be specified + """ + proposedSchema: IntrospectionSchemaInput + proposedSchemaDocument: String + proposedSchemaHash: String + baseSchemaTag: String = "current" + gitContext: GitContextInput + historicParameters: HistoricQueryParameters + useMaximumRetention: Boolean + isSandboxCheck: Boolean! = false + """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" + introspectionEndpoint: String + """Deprecated and ignored.""" + frontend: String + ): CheckSchemaResult! + """Publish to a subgraph. If composition is successful, this will update running routers.""" + publishSubgraph(graphVariant: String!, name: String!, url: String, revision: String!, activePartialSchema: PartialSchemaInput!, gitContext: GitContextInput): SubgraphPublicationResult + """Removes a subgraph. If composition is successful, this will update running routers.""" + removeImplementingServiceAndTriggerComposition( + graphVariant: String! + name: String! + """Do not remove the service, but recompose without it and report any errors.""" + dryRun: Boolean! = false + ): SubgraphRemovalResult! + """ + Checks a proposed subgraph schema change against a published subgraph. + If the proposal composes successfully, perform a usage check for the resulting supergraph schema. + """ + checkPartialSchema( + """The name of the graph variant to run the check against.""" + graphVariant: String! + """Name of the implementing service to validate the partial schema against""" + implementingServiceName: String! + """The partial schema to validate against an implementing service""" + partialSchema: PartialSchemaInput! + gitContext: GitContextInput + historicParameters: HistoricQueryParameters + """Deprecated and ignored.""" + frontend: String + """ + Whether to use the maximum retention for historical validation. This only takes + effect if historicParameters is null. + """ + useMaximumRetention: Boolean + isSandboxCheck: Boolean! = false + """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" + introspectionEndpoint: String + ): CheckPartialSchemaResult! +} + +"""Individual permissions for the current user when interacting with a particular Studio graph.""" +type GraphRoles { + """Whether the currently authenticated user is permitted to perform schema checks (i.e., run `rover (sub)graph check`).""" + canCheckSchemas: Boolean! + """Whether the currently authenticated user is permitted to create new graph variants.""" + canCreateVariants: Boolean! + """Whether the currently authenticated user is permitted to delete the graph in question""" + canDelete: Boolean! + """Whether the currently authenticated user is permitted to manage user access to the graph in question.""" + canManageAccess: Boolean! + """Whether the currently authenticated user is permitted to manage the build configuration (e.g., build pipeline version).""" + canManageBuildConfig: Boolean! + """Whether the currently authenticated user is permitted to manage third-party integrations (e.g., Datadog forwarding).""" + canManageIntegrations: Boolean! + """Whether the currently authenticated user is permitted to manage graph-level API keys.""" + canManageKeys: Boolean! + """Whether the currently authenticated user is permitted to perform basic administration of variants (e.g., make a variant public).""" + canManageVariants: Boolean! + """Whether the currently authenticated user is permitted to view details about the build configuration (e.g. build pipeline version).""" + canQueryBuildConfig: Boolean! + """Whether the currently authenticated user is permitted to view details of the check configuration for this graph.""" + canQueryCheckConfiguration: Boolean! + """Whether the currently authenticated user is permitted to view which subgraphs the graph is composed of.""" + canQueryImplementingServices: Boolean! + """Whether the currently authenticated user is permitted to download schemas owned by this graph.""" + canQuerySchemas: Boolean! + """Whether the currently authenticated user is permitted to register operations (i.e. `apollo client:push`) for this graph.""" + canRegisterOperations: Boolean! + """Whether the currently authenticated user is permitted to make updates to the check configuration for this graph.""" + canWriteCheckConfiguration: Boolean! +} + +"""A SHA-256 hash, represented as a lowercase hexadecimal string.""" +scalar SHA256 + +"""A location in a source code file.""" +type SourceLocation { + """Column number.""" + column: Int! + """Line number.""" + line: Int! +} + +enum Status { + STABLE + NEXT + DEPRECATED +} + +"""A subgraph in a federated Studio supergraph.""" +type Subgraph { + """The subgraph schema document's SHA256 hash, represented as a hexadecimal string.""" + hash: String! + """The subgraph's registered name.""" + name: String! + """The number of fields in this subgraph""" + numberOfFields: Int + """The number of types in this subgraph""" + numberOfTypes: Int + """The subgraph's routing URL, provided to gateways that use managed federation.""" + routingURL: String! + """Timestamp of when the subgraph was published.""" + updatedAt: Timestamp +} + +"""A change made to a subgraph as part of a launch.""" +type SubgraphChange { + """The subgraph's name.""" + name: ID! + """The type of change that was made.""" + type: SubgraphChangeType! +} + +enum SubgraphChangeType { + ADDITION + DELETION + MODIFICATION +} + +"""Input type to provide when running schema checks asynchronously for a federated supergraph.""" +input SubgraphCheckAsyncInput { + """Configuration options for the check execution.""" + config: HistoricQueryParametersInput! + """The GitHub context to associate with the check.""" + gitContext: GitContextInput! + """The graph ref of the Studio graph and variant to run checks against (such as `my-graph@current`).""" + graphRef: ID + """The URL of the GraphQL endpoint that Apollo Sandbox introspected to obtain the proposed schema. Required if `isSandbox` is `true`.""" + introspectionEndpoint: String + """If `true`, the check was initiated by Apollo Sandbox.""" + isSandbox: Boolean! + """The proposed subgraph schema to perform checks with.""" + proposedSchema: GraphQLDocument! + """The name of the subgraph to check schema changes for.""" + subgraphName: String! +} + +"""ISO 8601, extended format with nanoseconds, Zulu (or "[+-]seconds" as a string or number relative to now)""" +scalar Timestamp + +"""Counts of changes.""" +type TotalChangeSummaryCounts { + """ + Number of changes that are additions. This includes adding types, adding fields to object, input + object, and interface types, adding values to enums, adding members to interfaces and unions, and + adding arguments. + """ + additions: Int! + """ + Number of changes that are removals. This includes removing types, removing fields from object, + input object, and interface types, removing values from enums, removing members from interfaces + and unions, and removing arguments. This also includes removing @deprecated usages. + """ + removals: Int! + """ + Number of changes that are edits. This includes types changing kind, fields and arguments + changing type, arguments changing default value, and any description changes. This also includes + edits to @deprecated reason strings. + """ + edits: Int! + """Number of changes that are new usages of the @deprecated directive.""" + deprecations: Int! +} + +"""Counts of changes at the type level, including interfaces, unions, enums, scalars, input objects, etc.""" +type TypeChangeSummaryCounts { + """Number of changes that are additions of types.""" + additions: Int! + """Number of changes that are removals of types.""" + removals: Int! + """ + Number of changes that are edits. This includes types changing kind and any type description + changes, but also includes adding/removing values from enums, adding/removing members from + interfaces and unions, and any enum value deprecation and description changes. + """ + edits: Int! +} + +union UpdateOperationCollectionEntryResult = OperationCollectionEntry | PermissionError | ValidationError + +union UpdateOperationCollectionResult = OperationCollection | PermissionError | ValidationError + +"""Describes the result of publishing a schema to a graph variant.""" +type SchemaPublicationResult { + """A machine-readable response code that indicates the type of result (e.g., `UPLOAD_SUCCESS` or `NO_CHANGES`)""" + code: String! + """Whether the schema publish operation succeeded (`true`) or encountered errors (`false`).""" + success: Boolean! + """A Human-readable message describing the type of result.""" + message: String! + """If the publish operation succeeded, this contains its details. Otherwise, this is null.""" + publication: SchemaPublication +} + +"""A registered Apollo Studio user.""" +type User implements Identity { + """Returns a list of all active user API keys for the user.""" + apiKeys(includeCookies: Boolean = false): [UserApiKey!]! + """Returns a representation of this user as an `Actor` type. Useful when determining which actor (usually a `User` or `Graph`) performed a particular action in Studio.""" + asActor: Actor! + """The user's unique ID.""" + id: ID! + """A list of the user's memberships in Apollo Studio organizations.""" + memberships: [UserMembership!]! + """The user's first and last name.""" + name: String! +} + +""" +Represents a user API key, which has permissions identical to +its associated Apollo user. +""" +type UserApiKey implements ApiKey { + """The API key's ID.""" + id: ID! + """The API key's name, for distinguishing it from other keys.""" + keyName: String + """The value of the API key. **This is a secret credential!**""" + token: String! +} + +"""A single user's membership in a single Apollo Studio organization.""" +type UserMembership { + """The organization that the user belongs to.""" + account: Organization! + """The timestamp when the user was added to the organization.""" + createdAt: Timestamp! + """The user's permission level within the organization.""" + permission: UserPermission! + """The user that belongs to the organization.""" + user: User! +} + +type UserMutation { + """Creates a new user API key for this user.""" + newKey(keyName: String!): UserApiKey! + """ + If this user has no active user API keys, this creates one for the user. + + If this user has at least one active user API key, this returns one of those keys at random and does _not_ create a new key. + """ + provisionKey(keyName: String! = "add-a-name"): ApiKeyProvision + """Deletes the user API key with the provided ID, if any.""" + removeKey( + """API key ID""" + id: ID! + ): Void + """Sets a new name for the user API key with the provided ID, if any. This does not invalidate the key or change its value.""" + renameKey(id: ID!, newKeyName: String): UserApiKey +} + +enum UserPermission { + BILLING_MANAGER + CONSUMER + CONTRIBUTOR + DOCUMENTER + GRAPH_ADMIN + LEGACY_GRAPH_KEY + OBSERVER + ORG_ADMIN +} + +"""An error that occurs when an operation contains invalid user input.""" +type ValidationError implements Error { + """The error's details.""" + message: String! +} + +"""Always null""" +scalar Void diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 580a31945b7..508580e3cb8 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -3,20 +3,22 @@ , fetchFromGitHub , pkg-config , bzip2 +, stdenv +, rustup }: rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-I++dffdEXDg55WR66+Zl5P2KBvt19sp3aZkXA1GBb4A="; + hash = "sha256-7JbWcG5FDJaXvtEQKlOgbsFpFQQ3n02MVFD+lCFXtt0="; }; - cargoHash = "sha256-fLHkW28V5MBQeQDd0VrtEjou5FYwArkNDtS/jXKo8G8="; + cargoHash = "sha256-TY1YRtre2rz0Hh+6ca22i+XCBMOEOS3QnSsf/rfY47g="; nativeBuildInputs = [ pkg-config @@ -26,6 +28,10 @@ rustPlatform.buildRustPackage rec { bzip2 ]; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ + rustup + ]; + meta = with lib; { description = "A tool for building final distributable artifacts and uploading them to an archive"; homepage = "https://github.com/axodotdev/cargo-dist"; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index b69c7968dce..8c1b6d4a651 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,23 +1,33 @@ -{ lib, rustPlatform, fetchFromGitHub, libiconv, stdenv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.26.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; - rev = version; - sha256 = "sha256-h0jRuY3GSqK85NCeFqdqjyVdNTMbdtD70zU5G3w1STc="; + rev = "refs/tags/${version}"; + hash = "sha256-GqM3b2evjACNkTOyfA6N6TInuGo9f/1retkXVTgbJ3A="; }; sourceRoot = "source/cargo-insta"; - cargoHash = "sha256-GC2ggTJJV3Aww3qPfsnuND0eII1l3OBoZfi5RtvhO8I="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + cargoHash = "sha256-ZIS3O19N7w+sL+2IdoCw4/Hx9Jtjx7MYE7JcEu+PFRA="; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; homepage = "https://github.com/mitsuhiko/insta"; + changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with lib.maintainers; [ oxalica ]; }; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index bcb23392cdd..686ed511919 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.5"; + version = "0.36.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-PQ59WTBRUwLM6/35ocnryp+hR8YKmgh3EkOSZ7OCYWs="; + sha256 = "sha256-ln6zySZ2fMzRPGdVikPYgtT89/J3Fw56fdrEkkOU/j8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-6M4KUvTKifEUEJLMyVU8F1Ler6IK5TEUNHfUNMkJ09s="; + cargoHash = "sha256-ntnd5vWiMxP5p/IBSWotLqNR8UseJHdSPiaxUHWpOlo="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 9653d4c556e..fc4fd46caa1 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.4"; + version = "0.24.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-6vl8aVZc1pLRXNWbwCWOg/W40TXe29CtXZy2uOLc5BQ="; + hash = "sha256-6+Ej5hpwnoeE8WlrYeaddDZP/j8a5cn+2qqMQmFjIBU="; }; - cargoHash = "sha256-xz6xjYHBltMo2abQxVTA9mAI4htqqxUc5s5ksKbmrno="; + cargoHash = "sha256-mYrnATxRHYqWr0EgU7U3t2WUm72Lj8roX4WvGEMqZx8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-wasi/default.nix b/pkgs/development/tools/rust/cargo-wasi/default.nix index e26474baa1e..cbc1e419459 100644 --- a/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/pkgs/development/tools/rust/cargo-wasi/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wasi"; - version = "0.1.26"; + version = "0.1.27"; src = fetchCrate { inherit version; pname = "cargo-wasi-src"; - sha256 = "sha256-/u5GKqGwJWS6Gzc1WZ7O5ZSHHGoqBVZ4jQDEIfAyciE="; + sha256 = "sha256-u6+Fn/j2cvpBqTIfyPC8jltcCKGimFcu4NiMFCAfmwg="; }; - cargoSha256 = "sha256-eF3HrulY7HrKseCYyZyC2EuWboFvmia2qLymBxvopKI="; + cargoHash = "sha256-Hi5Z5TmiHXp7YrqXfbwACKEximksQRhdoMGU1iLmXOk="; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: - # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.26/tests/tests/support.rs#L13-L18 + # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.27/tests/tests/support.rs#L13-L18 doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f5f970a6ad5..83626a6362f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -8,18 +8,19 @@ , libiconv , useMimalloc ? false , doCheck ? true +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-02-20"; - cargoSha256 = "sha256-/5TxlRh3xQrhWiq9Gcljfpn2G5MmCH99Oc022ZrKcVs="; + version = "2023-03-06"; + cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-8h0sV0fmMSB7KydJJD5Iz1kJxR3YzYa3iJ71VD2zePk="; + sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY="; }; auditable = true; # TODO: remove when this is the default @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { # Code format check requires more dependencies but don't really matter for packaging. # So just ignore it. - checkFlags = ["--skip=tidy::check_code_formatting"]; + checkFlags = [ "--skip=tidy::check_code_formatting" ]; nativeBuildInputs = lib.optional useMimalloc cmake; @@ -57,7 +58,7 @@ rustPlatform.buildRustPackage rec { ''; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { }; # FIXME: Pass overrided `rust-analyzer` once `buildRustPackage` also implements #119942 tests.neovim-lsp = callPackage ./test-neovim-lsp.nix { }; }; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh deleted file mode 100755 index 36c3fd3941b..00000000000 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch libarchive -# shellcheck shell=bash -set -euo pipefail -cd "$(dirname "$0")" -owner=rust-lang -repo=rust-analyzer -nixpkgs=../../../../.. - -# Update lsp - -ver=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -old_ver=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) -if grep -q 'cargoSha256 = ""' ./default.nix; then - old_ver='broken' -fi -if [[ "$ver" == "$old_ver" ]]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$ver") -# Clear cargoSha256 to avoid inconsistency. -sed -e "s#version = \".*\"#version = \"$ver\"#" \ - -e "/fetchFromGitHub/,/}/ s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ - -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \ - --in-place ./default.nix - -echo "Prebuilding for cargoSha256" -cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ - --in-place ./default.nix diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 6e96bf72bba..afcdedd9bf8 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -1,22 +1,37 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.0.1"; + version = "1.1.0"; - src = fetchCrate { - inherit version; - pname = "typeshare-cli"; - sha256 = "sha256-SbTI7170Oc1e09dv4TvUwByG3qkyAL5YXZ96NzI0FSI="; + src = fetchFromGitHub { + owner = "1password"; + repo = "typeshare"; + rev = "v${version}"; + hash = "sha256-FQ9KL8X7zz3ew+H1lhh4bkZ01Te1TD+QXAMxS8dXAaI="; }; - cargoSha256 = "sha256-5EhXw2WcRJqCbdMvOtich9EYQqi0uwCH1a1XXIo8aAo="; + cargoHash = "sha256-t6tGNHmPasmTRto2hobvJywrF/8tO79zkfWwa6lCPK8="; + + nativeBuildInputs = [ installShellFiles ]; buildFeatures = [ "go" ]; + postInstall = '' + installShellCompletion --cmd typeshare \ + --bash <($out/bin/typeshare completions bash) \ + --fish <($out/bin/typeshare completions fish) \ + --zsh <($out/bin/typeshare completions zsh) + ''; + meta = with lib; { description = "Command Line Tool for generating language files with typeshare"; homepage = "https://github.com/1password/typeshare"; + changelog = "https://github.com/1password/typeshare/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 9f1d0f592f4..7a9f76d19c4 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.13.0"; + version = "2.14.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-U6L2JQk/fYuxmZdt3CvPSaaEDRgZby0CiPT0nJGuVwA="; + sha256 = "sha256-l2/gwguNQAcnBGQxVGBUecIFbp8CHrrqDrjRFxaeVe4="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-gF3a8oCHmnNgatvbM1DeOQknXMMcHgerx2OcDdyqC8U="; + cargoHash = "sha256-h9rkTnGFMclTTyUy39rpKiorcy3953u2nbHiydOAmqI="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index e1354900979..f30b30a75b9 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.20.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mJp4lb4pzjdjodHk2zLAEePn+oIPI/vTtU0YOIbmWDY="; + sha256 = "sha256-KPH1IsvYQvyUsi4qxWKLpCQNrPCnulCqQLPK5iadm3I="; }; - vendorSha256 = "sha256-8kk+KCanbnsizGRjF3qcxCBxC7Sx0zfptQFTETZp89E="; + vendorHash = "sha256-AL4ghkeTIkXZXpGeBnWIx3hY6uO2bO7eVcH6DR/5jQc="; proxyVendor = true; @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/neilotoole/sq/cli/buildinfo.Version=${version}" + "-X=github.com/neilotoole/sq/cli/buildinfo.Version=v${version}" ]; postInstall = '' @@ -34,7 +34,10 @@ buildGoModule rec { ''; passthru.tests = { - version = testers.testVersion { package = sq; }; + version = testers.testVersion { + package = sq; + version = "v${version}"; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index dde6628bc69..812a02b2edd 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.0"; - vendorHash = "sha256-l8h2jHOwxvFEk9v/U8DU8g6La9TyPtpDvQTTSX4BW84="; + version = "5.5.1"; + vendorHash = "sha256-OMQaYvNt4VeLoNVL/syQlIlGsP4F0C2A679OLbXIXng="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-d/Ld/F1dvwO7/uKLtgQmYhfOoxvIyEbnE3ks6R2412I="; + sha256 = "sha256-sTgnDe3cjisdmJPtqNkjPF5XncC25Leud4ASai9peJE="; }; ldflags = [ diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/development/tools/tfplugindocs/default.nix index ecb0835e288..8d8e9faeda3 100644 --- a/pkgs/development/tools/tfplugindocs/default.nix +++ b/pkgs/development/tools/tfplugindocs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfplugindocs"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "v${version}"; - sha256 = "sha256-0FpzUJDFGKLe88QW+7UI6QPwFMUfqPindOHtGRpOLo8="; + sha256 = "sha256-adOaX8VxMytnALkuXBlmRKfRmk6x7bHTg/oEJQiJ1+U="; }; - vendorSha256 = "sha256-gKRgFfyUahWI+c97uYSCAGNoFy2RPgAw0uYGauEOLt8="; + vendorHash = "sha256-Qo8L0Rm7ZxcZ9YZTqfx51Tt8DRj4M+be6NdrsrwRt30="; meta = with lib; { description = "Generate and validate Terraform plugin/provider documentation"; diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix index 85ffeed3748..91205008311 100644 --- a/pkgs/development/tools/toast/default.nix +++ b/pkgs/development/tools/toast/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.46.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDT7ZpixE77imy/HVwLET+O0uCZ+wFhXGqcWq46Ud2w="; + sha256 = "sha256-3ng1nVl5eqpa3YWqT/RYZo9sBl6Zkyc8NabG1GpjapQ="; }; - cargoHash = "sha256-B5H8YkYlcF/Z6SlsW5lWwHZ9tYfOb54Pu1KNVY3eXP8="; + cargoHash = "sha256-22DtD0PeuDK1Gwy28ZD02LJYgOYuowf+pDQjHXiT6+A="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 68400de7662..2be0b533c6f 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.14"; + version = "1.13.16"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-9p5h58fXENaZCVpDX5b/FqK0i5bL/M3vP+8jKYLQDh0="; + hash = "sha256-3LJkWpksI9nep7QtEJdiEUZmwrWLyG/JKdu9YQh3KVk="; }; - cargoHash = "sha256-IJi8FfwBMTTJRdBA6ydpD4yQWrEVnavxgiWxRCDoAOI="; + cargoHash = "sha256-Wqikf248nZE2iQ6zU4bvz10PL/Z/WJ1srImi+bZ8s5w="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3920e4fcac0..46867742393 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -112,7 +112,7 @@ in buildRubyGem rec { description = "A tool for building complete development environments"; homepage = "https://www.vagrantup.com/"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 98deb602199..f4d643e5aad 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.30.8"; + version = "4.31.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-x0vdPi8/Iciy+22SPBpktgkQCMxd5PT674OsWaLi+Q0="; + hash = "sha256-Cf9Y7sdvpflQhhnOuRZUTyYQ3fpFTLo28dZtePsayfE="; }; - vendorHash = "sha256-VEVy8iVnUUpjTmCj7uIMcz0jaG9XGuxA3U02QfIwsYs="; + vendorHash = "sha256-nv1sJ5GGB2IbGF1ebGZmeKF6qHLXgFebdibcsB36juY="; nativeBuildInputs = [ installShellFiles ]; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Portable command-line YAML processor"; homepage = "https://mikefarah.gitbook.io/yq/"; + changelog = "https://github.com/mikefarah/yq/raw/v${version}/release_notes.txt"; mainProgram = "yq"; license = [ licenses.mit ]; maintainers = with maintainers; [ lewo SuperSandro2000 ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 13c4bb5efa3..94c716b7545 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.473"; + version = "0.0.475"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-bTOGrg+dM+FXNvbeJ3fx1aMlT/2sPVYwGOzZaZfHVm8="; + hash = "sha256-2yJoKwzg8J5GdWfjX9tqeKqhaUksJZUDcA/62XxVh+8="; }; - vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8="; + vendorHash = "sha256-lEg0ZcR5kbxwfiP80m7jCjNfLhPq3UOqheVa+qjwVe0="; subPackages = [ "." ]; diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index 614733e549a..a0a5a5accca 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "BeatSaberModManager"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "affederaffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XeyOWg4Wa4hiorLPnbnBrLSjnxheAGGMPTqBleulDGw="; + sha256 = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; fetchSubmodules = true; # It vendors BSIPA-Linux }; diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index e36521e1914..74e4c7e7709 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -2,76 +2,63 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview4"; sha256 = "0s2ijp8fbny04c62gy8acg4n769hzj1pl9jml35bqrzk4m29jxs2"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview4"; sha256 = "0dbbigfg5qqqgi16fglsqphg63ihl3hhpfw9f85ypvb5dfjimnq0"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview4"; sha256 = "10c1w7slmlkn1sjyk2y8awzlkd9rr35zpvwnvsv0i235zbqc3a07"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview4"; sha256 = "1ccnfi429hah9qsl6qimkhlz6j29zjjpm77di14wnlr8x3nh19z0"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview4"; sha256 = "1x8d46p9wxwrfhn4xcgx64x5y9dw08a7v54w8ms9ba58zr01bm74"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview4"; sha256 = "1ivrh736xxn3j1b64ni0wy7ydp22sbl2yv5kdircxknhb7bhpigd"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.0-preview4"; sha256 = "16p0va19f83ccq493vxa8rvdgy71jsgijymb078bagk5nsm2alzs"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview4"; sha256 = "0ia7zx7chgchh4piqp400cdpj14jndh313yh2z9nspqxq30xll46"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-preview4"; sha256 = "0qrv6ff3lgsqa57q5nrsmfzfp3w2x6d536xi3hq18616zjv7k1x4"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview4"; sha256 = "1g8j7ll3q9k7v0j54j42dy1mkzkgs9rlyia0gjg3b7z5ilk0rbiz"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview4"; sha256 = "011flxwy9rnjlvwb1nvn9qlj0nfsr3f4gmvlzkg7abhwh7hzv3vi"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview4"; sha256 = "07lkj6z4fy41i6fbnrzkb22z63czspcnfp5lz25qkvys37vkmhdm"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview4"; sha256 = "02cn71h91fxvw9knni2dxlhpf9ihdkq3r0mylvr8z7r493saiqkm"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview4"; sha256 = "1fqj7jv22ki9pim55hav8qfr01vhjkzdp5rdi1p22xxmgrxws5ws"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview4"; sha256 = "0lmw94qp4y05xzxx6flzgsv4cw6mckcn8ig6mm8hdqpqqsiihc1n"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0bcc3h5hxy8mfkgxn07vnnq2rn8whn2gx3d67lmlpm01r16rndyc"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia/11.0.999-cibuild0030643-beta/avalonia.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.999-cibuild0030643-beta"; sha256 = "06n0c8dyh1q4a97nm31vyr8b6jzcq8nvvligwzp4xaxdwhkphg2x"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.colorpicker/11.0.999-cibuild0030643-beta/avalonia.controls.colorpicker.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1vfkbjy9fl24i6skn02wgr047579x4a1liiw79qwbkx7mgvw9pvn"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.controls.datagrid/11.0.999-cibuild0030643-beta/avalonia.controls.datagrid.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0nh6hdw07hwq92n0m1sx7qxwp4ccqash5f8sivj3lflx786s9i5f"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.desktop/11.0.999-cibuild0030643-beta/avalonia.desktop.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0ddcq2w54cywpzcwb9av54zkblvpnp0g7xs4dsw6s39wrxyh8spw"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.diagnostics/11.0.999-cibuild0030643-beta/avalonia.diagnostics.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1wshqaikd1b2a91yixgsnvl8i1arhmlviavjywi67a2w1xv98das"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.freedesktop/11.0.999-cibuild0030643-beta/avalonia.freedesktop.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.999-cibuild0030643-beta"; sha256 = "10pp6lh5hlcfs3xrqg1rv7xkckkpnbvdvx0ndfqgpfqxyv99jdhd"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.native/11.0.999-cibuild0030643-beta/avalonia.native.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1pl35gkpc36hydd350ch6iilyfngbg8wxw3vkx5a971761lqrgbz"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.reactiveui/11.0.999-cibuild0030643-beta/avalonia.reactiveui.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.999-cibuild0030643-beta"; sha256 = "179l5w9j2hy683fhxi25q98sfgz03l48qj8mgg1asjjpqcbybgh2"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.remote.protocol/11.0.999-cibuild0030643-beta/avalonia.remote.protocol.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0fvc83phdjxhfg3pndr7j178i2km5wjbm1xiplh4bvg6pwa2xypz"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.skia/11.0.999-cibuild0030643-beta/avalonia.skia.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1ch7v19xpg4nkq2aqap82sd237735g5nrp06h1i0m83kks4xz6as"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.fluent/11.0.999-cibuild0030643-beta/avalonia.themes.fluent.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.999-cibuild0030643-beta"; sha256 = "0aify5nh31bf347k4s4d5c36mhh6yc6q4l6araq3fxb05v4pb5c0"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.themes.simple/11.0.999-cibuild0030643-beta/avalonia.themes.simple.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.999-cibuild0030643-beta"; sha256 = "1b86hlr25w8i3hdxxxb9qrbaf91d56vmiwm5ikywglk28c9x8zyq"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.win32/11.0.999-cibuild0030643-beta/avalonia.win32.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.999-cibuild0030643-beta"; sha256 = "15pcbv0hw099080s2ndi7cqm3gnyzcvva3jgp8z33g4h8qaiiyvn"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/5ebc1fbc-7d49-4641-8a57-d18c55ed6602/nuget/v3/flat2/avalonia.x11/11.0.999-cibuild0030643-beta/avalonia.x11.11.0.999-cibuild0030643-beta.nupkg"; }) + (fetchNuGet { pname = "Devlooped.SponsorLink"; version = "0.9.6"; sha256 = "0d6sdy4312fb9g7l3q9x78vmw4ngrzf2f961778h4zqga8nc23rm"; }) (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.1.46"; sha256 = "0w7b17xh88rqzjjsy66gg2kfaqmg7sdmx70sharkqb7qh3pih87m"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.1.46"; sha256 = "0lgx7776ivmz0gr0whyacxpnlp6w5b80mj012a28mm79r1qxpf60"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.53"; sha256 = "0y34dvc5z6ash2cpp69mclb3wr52fd8khsmm61sv7lkql0pg03ki"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.9.112"; sha256 = "1i10xr5zm9vapfzvimim9gn2pm9vgnsnb44sq3b0162r0k572rrp"; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.0.1"; sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.1-dev-00947"; sha256 = "153vi3xjy65ixfr8nfs59n0bmgj0jxfyydmhjs8h3apr9f29lbh4"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1"; sha256 = "0jpn0x1rfj3dzjfg972icml5swvzvr368nip269qq0a2z4xy0lhx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1"; sha256 = "19f8f0m3d6xds2dggazafdk4i3injaxpx7ahg73nq8zj03qbg7fp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1"; sha256 = "1img6chwxprz6bqjyi43walgb3xccnzgfxs29xwcvkkmc8w6pvdp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1"; sha256 = "0bvpwfdji8wb5f16hfzc62k265p21r172dqpibdx1gjd6w6phxrs"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1"; sha256 = "1x0ds2nnbqn44kfrfbvj055nihhmzlqm5fhdka3mgbj821fpy629"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) (fetchNuGet { pname = "StrongInject"; version = "1.4.5-ci-20220524-023137"; sha256 = "1ksiv5rs22j193sxwjvdc4vhblikka9z8hhs705f4mi1r4q0x1ha"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -82,17 +69,15 @@ (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) @@ -100,22 +85,23 @@ (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.0.10"; sha256 = "1hvq0c9d6zmn1q6lyvz4hcaiypf1d65akhx70mv2plysbgvrcm95"; }) - (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.0.10"; sha256 = "112grp0xxkzfkhyxb1hbh4qs2d9qrkasv42himdkqjk0i0fg1ag0"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) - (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) + (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.2.9"; sha256 = "1pilnin62fb2frmybl3n0xvxn1xpr8bymbzialspl6cbw2xvag97"; }) + (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.2.9"; sha256 = "0skk9sk8lc4dn9rmykz337n5apg76if9l327q7787fabisr9rbw7"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.13.0"; sha256 = "1r5lc8x3iq795l7vnyzs3shvpqz92fldkayvkqmrfjxnqmy0w3kg"; }) + (fetchNuGet { pname = "Tmds.DBus.SourceGenerator"; version = "0.0.2"; sha256 = "03q0fja30216npb3hd39iapr9psriz2k35lymaf4921195y40fiq"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; }) ] diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 4e39a64c400..41579b52710 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; makeFlags = [ - "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0" + "PREFIX=$(out)" "LANGUAGES=all" (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") ] ++ optionals (!debug) [ "RELEASE=1" diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 21a7c66dbba..c7090838b86 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -24,7 +24,7 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale - ./locale-path-git.patch + ./locale-path.patch ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cataclysm-dda/locale-path-stable.patch b/pkgs/games/cataclysm-dda/locale-path-stable.patch deleted file mode 100644 index db8592646f0..00000000000 --- a/pkgs/games/cataclysm-dda/locale-path-stable.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/translations.cpp b/src/translations.cpp -index fa0ee479b2..0e470098dc 100644 ---- a/src/translations.cpp -+++ b/src/translations.cpp -@@ -141,15 +141,11 @@ void select_language() - std::string locale_dir() - { - std::string loc_dir; --#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES)))) - if( !PATH_INFO::base_path().empty() ) { - loc_dir = PATH_INFO::base_path() + "share/locale"; - } else { - loc_dir = PATH_INFO::langdir(); - } --#else -- loc_dir = PATH_INFO::langdir(); --#endif - return loc_dir; - } - diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/games/cataclysm-dda/locale-path.patch index 03f103a548f..03f103a548f 100644 --- a/pkgs/games/cataclysm-dda/locale-path-git.patch +++ b/pkgs/games/cataclysm-dda/locale-path.patch diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 9d5c865ab48..e24432a25bb 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -18,25 +18,18 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.F-3"; + version = "0.G"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "sha256-2su1uQaWl9WG41207dRvOTdVKcQsEz/y0uTi9JX52uI="; + sha256 = "sha256-Hda0dVVHNeZ8MV5CaCbSpdOCG2iqQEEmXdh16vwIBXk="; }; patches = [ # Unconditionally look for translation files in $out/share/locale - ./locale-path-stable.patch - - # Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083 - # Remove with next version update. - (fetchpatch { - url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch"; - hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA="; - }) + ./locale-path.patch ]; makeFlags = common.makeFlags ++ [ @@ -52,6 +45,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; common.meta.maintainers ++ [ skeidel ]; + changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; }; }); in diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 1aaa752fbd6..57d69bebfa4 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -33,19 +33,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.7.2"; + version = "16.8"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; + hash = "sha256-QhRJJQ87WMsf2yTac2lDRj7B+mTaw2r+RProUr+3zoo="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + hash = "sha256-36Afg0Tsf1/dGhZhd5tbxjMX4dKHqGEhIXS4Lal/rXI="; }; nativeBuildInputs = [ @@ -82,15 +82,6 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - patches = [ - (fetchpatch { - # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' - # https://github.com/ddnet/ddnet/pull/5913 - url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch"; - hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs="; - }) - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index a8f30697710..629ecac0564 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "7.2.1"; + version = "7.8.3"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas="; + sha256 = "sha256-jNh3L6JDuJryFpHQaP8UesBmepmJopoHxb/XUfOwZz4="; }; nativeBuildInputs = [ diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4a92b8c1014..33392d6ca05 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,7 @@ -{ fetchurl +{ lib +, stdenv , python +, fetchurl , anki }: @@ -29,18 +31,16 @@ python.pkgs.buildPythonApplication rec { ]; prePatch = '' - substituteInPlace setup.py --replace /usr $out - find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", + substituteInPlace setup.py \ + --replace '("", ["/usr/local/bin/mplayer"])' "" ''; - # No tests/ directrory in tarball + # No tests/ directory in tarball doCheck = false; postInstall = '' mkdir -p $out/share/applications - mv $out/${python.sitePackages}/$out/share/locale $out/share mv mnemosyne.desktop $out/share/applications - rm -r $out/${python.sitePackages}/nix ''; dontWrapQtApps = true; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index d23517cfad3..f4daedd672b 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,42 +1,83 @@ -{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkg-config, libvorbis -, libpng, libGLU, libGL, makeWrapper, zlib, freetype }: +{ lib +, SDL2 +, SDL2_image +, enet +, fetchFromGitHub +, freetype +, glpk +, intltool +, libpng +, libunibreak +, libvorbis +, libwebp +, libxml2 +, luajit +, meson +, ninja +, openal +, openblas +, pcre2 +, physfs +, pkg-config +, python3 +, stdenv +, suitesparse +}: -let +stdenv.mkDerivation rec { pname = "naev"; - version = "0.5.0"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; + version = "0.10.4"; - srcData = fetchurl { - url = "mirror://sourceforge/naev/ndata-${version}"; - sha256 = "0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6"; + src = fetchFromGitHub { + owner = "naev"; + repo = "naev"; + rev = "v${version}"; + sha256 = "sha256-2cMRmKeoF6x5+95GoDgsoZG9QQo7qATrw/X+335l6FE="; + fetchSubmodules = true; }; - src = fetchurl { - url = "mirror://sourceforge/naev/${name}.tar.bz2"; - sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; - }; - - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; + buildInputs = [ + SDL2 + SDL2_image + enet + freetype + glpk + intltool + libpng + libunibreak + libvorbis + libwebp + libxml2 + luajit + openal + openblas + pcre2 + physfs + suitesparse + ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ pyyaml mutagen ])) + meson + ninja + pkg-config + ]; - env.NIX_CFLAGS_COMPILE = "-include ${zlib.dev}/include/zlib.h"; + mesonFlags = [ + "-Ddocs_c=disabled" + "-Ddocs_lua=disabled" + "-Dluajit=enabled" + ]; - postInstall = '' - mkdir -p $out/share/naev - cp -v $srcData $out/share/naev/ndata - wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata + postPatch = '' + patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py ''; meta = { description = "2D action/rpg space game"; homepage = "http://www.naev.org"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ ralismark ]; platforms = lib.platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 7a62db1003f..cf17332785f 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "osu-lazer-bin"; - version = "2023.207.0"; + version = "2023.301.0"; src = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-xJQcqNV/Pr3gEGStczc3gv8AYrEKFsAo2g4WtA59fwk="; + sha256 = "sha256-0c74bGOY9f2K52xE7CZy/i3OfyCC+a6XGI30c6hI7jM="; }; extraPkgs = pkgs: with pkgs; [ icu ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 3a56c35fe88..f3aea2a333a 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.207.0"; + version = "2023.301.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-s0gzSfj4+xk3joS7S68ZGjgatiJY2Y1FBCmrhptaWIk="; + sha256 = "sha256-SUVxe3PdUch8NYR7X4fatbmSpyYewI69usBDICcSq3s="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 908140259b1..753f1cd9af1 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -2,10 +2,10 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AutoMapper"; version = "11.0.1"; sha256 = "1z1x5c1dkwk6142km5q6jglhpq9x82alwjjy5a72c8qnq9ppdfg3"; }) + (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; sha256 = "0s0wjl4ck3sal8a50x786wxs9mbca7bxaqk3558yx5wpld4h4z3b"; }) (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.1.14"; sha256 = "18adkrddjlci5ajs17ck1c8cd8id3cgjylqvfggyqwrmsh7yr4j6"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) @@ -63,38 +63,37 @@ (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.10"; sha256 = "1wic0bghgwg2r8q676miv3kk7ph5g46kvkw1iljr4b8s58mqbwas"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.10"; sha256 = "1a8m44qgjwfhmqpfsyyb1hgak3sh99s62hnfmphxsflfvx611mbb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.10"; sha256 = "0vqc62xjiwlqwifx3nj0nwssjrdqka2avpqiiwylsbd48s1ahxdy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.10"; sha256 = "090ggwxv2j86hkmnzqxa728wpn5g30dfqd05widhd7n1m51igq71"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.10"; sha256 = "13i22fkai420fvr71c3pfnadspcv8jpf5bci9fn3yh580bfqw21a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.10"; sha256 = "0kmy2h310hqpr6bgd128r4q7ny4i7qjfvgrv1swhqv2j9n1yriby"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.10"; sha256 = "13q429kwbijyfgpb4dp04lr2c691ra5br5wf8g7s260pij10x1nz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.10"; sha256 = "068gw5q25yaf5k5c96kswmna1jixpw6s82r7gmgnw54rcc8gdz3f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.10"; sha256 = "1k7jvvvz8wwbd1bw1shcgrgz2gw3l877krhw39b9sj2vbwzc8bn7"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.4.59"; sha256 = "13igx5m5hkqqyhyw04z2nwfxn2jwlrpvvwx4c8qrayv9j4l31ajm"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.59"; sha256 = "1y8mg95x87jddk0hyf58cc1zy666mqbla7479njkm7kmpwz61s8c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.2"; sha256 = "1k5gjiwmcrbwfz54jafz6mmf4md7jgk3j8jdpp9ax72glwa7ia4a"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.2"; sha256 = "0rnra67gkg0qs7wys8bacm1raf9khb688ch2yr56m88kwdk5bhw4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.2"; sha256 = "19dviyc68m56mmy05lylhp2bxvww2gqx1y07kc0yqp61rcjb1d85"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.2"; sha256 = "0ms9syxlxk6f5pxjw23s2cz4ld60vk84v67l0bhnnb8v42rz97nn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.2"; sha256 = "15qs3pdji2sd629as4i8zd5bjbs165waim9jypxqjkb55bslz8d7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.2"; sha256 = "0c3ia03m1shc2xslqln5m986kpvc1dqb15j85vqxbzb0jj6fr52y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.2"; sha256 = "028r8sk5dlxkfxw6wz2ys62rm9dqa85s6rfhilrfy1phsl47rkal"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.2"; sha256 = "1zkznsq5r7gg2pnlj9y7swrbvzyywf6q5xf9ggcwbvccwp0g6jr4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.2"; sha256 = "1x5pymqc315nb8z2414dvqdpcfd5zy5slcfa9b3vjhrbbbngaly7"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.10"; sha256 = "1sdh5rw2pyg6c64z0haxf57bakd5kwaav624vlqif1m59iz26rag"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; sha256 = "0kl5ypidmzllyxb91gwy3z950dc416p1y8wikzbdbp0l7aaaxq2p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.10"; sha256 = "10avgg7c4iggq3i7gba0srd01fip637mmc903ymdpa2c92qgkqr8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.2"; sha256 = "18ipxpw73wi5gdj7vxhmqgk8rl3l95w6h5ajxbccdfyv5p75v66d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; sha256 = "0i7li76gmk6hml12aig4cvyvja9mgl16qr8pkwvx5vm6lc9a3nn4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -110,7 +109,7 @@ (fetchNuGet { pname = "NativeLibraryLoader"; version = "1.0.12"; sha256 = "1nkn5iylxj8i7355cljfvrn3ha7ylf30dh8f63zhybc2vb8hbpkk"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "NuGet.Common"; version = "5.11.0"; sha256 = "1amf6scr5mcjdvd1fflag6i4qjwmydq5qwp6g3f099n901zq0dr3"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.0"; sha256 = "1s9pbrh7xy9jz7npz0sahdsj1cw8gfx1fwf3knv0ms1n0c9bk53l"; }) @@ -130,15 +129,15 @@ (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.131.0"; sha256 = "1mbgcg0c8w6114c36jxypz7z1yps5zgw3f2lxw75fra0rylwqm23"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.228.0"; sha256 = "1acr957wlpgwng6mvyh6m1wv59ljvk9wh2aclds8ary8li00skdb"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.202.0"; sha256 = "13apknxly9fqqchmdvkdgfq2jbimln0ixg2d7yn6jcfd235279mj"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.228.0"; sha256 = "12i5z7pkm03zc34q162qjas20v4d9rd1qwbwz1l4iyv010riaa43"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.630-alpha"; sha256 = "0jrf70jrz976b49ac0ygfy9qph2w7fnbfrqv0g0x7hlpaip33ra8"; }) - (fetchNuGet { pname = "Realm"; version = "10.18.0"; sha256 = "0dzwpcqkp8x8zah1bpx8cf01w4j1vi4gvipmaxlxczrc8p0f9zws"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.18.0"; sha256 = "1d2y7kz1jp1b11kskgk0fpp6ci17aqkrhzdfq5vcr4y7a8hbi9j5"; }) - (fetchNuGet { pname = "Realm.SourceGenerator"; version = "10.18.0"; sha256 = "10bj3mgxdxgwsnpgbvlpnsj5ha582dvkvjnhb4qk7558g262dia8"; }) + (fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; }) + (fetchNuGet { pname = "Realm.SourceGenerator"; version = "10.20.0"; sha256 = "0y0bwqg87pmsld7cmawwwz2ps5lpkbyyzkb9cj0fbynsn4jdygg0"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -182,18 +181,18 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.23.1"; sha256 = "0cch803ixx5vqfm2zv5qdkkyksh1184669r1109snbkvvv5qy1g9"; }) + (fetchNuGet { pname = "Sentry"; version = "3.28.1"; sha256 = "09xl3bm5clqxnn8wyy36zwmj8ai8zci6ngw64d0r3rzgd95gbf61"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.10"; sha256 = "0yxq0b4m96z71afc7sywfrlwz2pgr5nilacmssjk803v70f0ydr1"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.10"; sha256 = "1qvpphja72x9r3yi96bnmwwy30b1n155v2yy2gzlxjil6qg3xjmb"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) (fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; sha256 = "0wbw20m7nyhxj32k153l668sxigamlwig0qpz8l8d0jqz35vizm0"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) @@ -209,7 +208,6 @@ (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) @@ -226,8 +224,8 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; sha256 = "112nq0k2jc4vh71rifqqmpjxkaanxfapk7g8947jkfgq3lmfmaac"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) + (fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; sha256 = "16fgj2ab5ci217shmfsi6c0rnmkh90h6vyb60503nhpmh7y8di13"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) @@ -235,6 +233,7 @@ (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) @@ -294,10 +293,12 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.1"; sha256 = "1lqh6nrrkx4sksvn5509y6j9z8zkhcls0yghd0n31zywmmy3pnf2"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 440b30664d1..e3dc9c94522 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "scummvm"; repo = "scummvm"; rev = "v${version}"; - hash = "sha256-fqMMdHBVcXLsBDWxXH9UKXwfvlyIVbRsIPmrYqPGQ+g="; + hash = "sha256-kyWgy5Nm8v/zbnhNMUyy/wUIq0I6nQyM9UqympYfwvg="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 96a1ebf3f64..e616033d685 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-bghFcLwfEonsBjB9Erhib45soR2UIOr4cYz5ROUOTFo="; + hash = "sha256-HhMccVlpIJoGW3LLqg1clw+dWcRUVHwCgtrmBcOXFSE="; }; dontUnpack = true; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 9055a86d506..c7971c7d387 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.12"; + version = "3.6.13"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-NSGadwVn1/nvHiJFENBPDsOUPwesunZMsvn+ms7u4Sw="; + sha256 = "sha256-5YswOh2jnOafctp7q8INtIqQwx1ugGm0QP9vDfal7t0="; }; buildInputs = [ diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 1432e37cfd2..e8db6a8eecc 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-+fXx/fVXOAjwo+TLP1pDTVge3VSvTLSGzTv7dSTeXxc="; + hash = "sha256-6M1vdwtw+qjKldW642JN2sanaKV3u9J1qWAoLRNupzE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 08fc063765e..91726891d23 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -90,6 +90,27 @@ in rec { }; }; + catppuccin = mkTmuxPlugin { + pluginName = "catppuccin"; + version = "unstable-2022-12-14"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "tmux"; + rev = "e2561decc2a4e77a0f8b7c05caf8d4f2af9714b3"; + sha256 = "sha256-6UmFGkUDoIe8k+FrzdzsKrDHHMNfkjAk0yyc+HV199M="; + }; + postInstall = '' + sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux + ''; + meta = with lib; { + homepage = "https://github.com/catppuccin/tmux"; + description = "Soothing pastel theme for Tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ jnsgruk ]; + }; + }; + continuum = mkTmuxPlugin { pluginName = "continuum"; version = "unstable-2022-01-25"; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 0cd7dd7e309..8ae4df6409d 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "1.20"; + version = "1.22"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-nBIpf9akK4cXnR5y5Fcl1g7/FxL8BU/CH/WHGhYuP74="; - aarch64-linux = "sha256-ERSYXNh/vmAKr4PNonOxTm5/FRLNDWwHSHM6fIeY4Nc="; - x86_64-darwin = "sha256-Kk9hNzyWngnyqlyQ9hILFM81WVw1ZYimMj4K3ENtifE="; - aarch64-darwin = "sha256-i3ixj04J/fcb396ncINLF8eYw1mpFCYeIM3f74K6tqY="; + x86_64-linux = "sha256-wYXFromLV1BCiSWlzphtCSBOWacQ3yC7i2kxxH4y88Y="; + aarch64-linux = "sha256-t3waCv2hwkchWPlfx1bsKKB6imp7F6scRnZUQSwS6fI="; + x86_64-darwin = "sha256-x5Gr6z5ma+0AF7DEXJpqG+yg3ym+w2ULTqfpdLjfHGo="; + aarch64-darwin = "sha256-vvGZoN+Yi6FZDblhxwDzRneVtWaFFaOjyRG7017BzZI="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; 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 145c98496b4..8c9e16a6ca9 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -56,28 +56,51 @@ let ''; }; + mkStdenv = stdenv: + let + cc = stdenv.cc.override { + bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; + libc = packages.Libsystem; + }; + in + if stdenv.isAarch64 then stdenv + else + (overrideCC stdenv cc).override { + targetPlatform = stdenv.targetPlatform // { + darwinMinVersion = "10.12"; + darwinSdkVersion = "11.0"; + }; + }; + + stdenvs = { + stdenv = mkStdenv stdenv; + } // builtins.listToAttrs (map + (v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; }) + [ "12" "13" "14" "15" ] + ); + callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); - packages = { - inherit (callPackage ./apple_sdk.nix {}) frameworks libs; + packages = stdenvs // { + inherit (callPackage ./apple_sdk.nix { }) frameworks libs; # 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 CLTools_Executables; - Libsystem = callPackage ./libSystem.nix {}; + Libsystem = callPackage ./libSystem.nix { }; LibsystemCross = pkgs.darwin.Libsystem; - libcharset = callPackage ./libcharset.nix {}; - libunwind = callPackage ./libunwind.nix {}; - libnetwork = callPackage ./libnetwork.nix {}; - libpm = callPackage ./libpm.nix {}; + libcharset = callPackage ./libcharset.nix { }; + libunwind = callPackage ./libunwind.nix { }; + libnetwork = callPackage ./libnetwork.nix { }; + libpm = callPackage ./libpm.nix { }; # Avoid introducing a new objc4 if stdenv already has one, to prevent # conflicting LLVM modules. - objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {}; + objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { }); # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; - IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; @@ -89,30 +112,23 @@ let inherit (pkgs) rustc cargo; }; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { - inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { + inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { - inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + inherit (prev.darwin.apple_sdk_11_0) + IOKit + Libsystem + LibsystemCross + Security + configd + libcharset + libunwind + objc4 + ; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); xcbuild = xcodebuild; - }); - - stdenv = - let - clang = stdenv.cc.override { - bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; - libc = packages.Libsystem; - }; - in - if stdenv.isAarch64 then stdenv - else - (overrideCC stdenv clang).override { - targetPlatform = stdenv.targetPlatform // { - darwinMinVersion = "10.12"; - darwinSdkVersion = "11.0"; - }; - }; + })); }; in packages diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index aa6cb53051d..5575ece3314 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20230104"; + version = "20230303"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70="; + sha256 = "sha256-ddalOVt0gLuTcwk322fNNn6WNZx1Ubsa4MgaG0Lmn2k="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index fba4f8adbab..2765b6647a7 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "eXjj7oD5HOW/AG2uxDa0tSleKmbouFd2fwlL2HHFiMA="; + sha256 = "sha256-j1UO8lkVoS56hwPQXH8aIr1UegM6PdtaBXKZn50GP60="; }; patches = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 8939aef06c5..331492b2d30 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -28,6 +28,7 @@ , ninja , gcab , gnutls +, pandoc , protobufc , python3 , wrapGAppsNoGuiHook @@ -79,12 +80,19 @@ let # Experimental haveFlashrom = isx86 && enableFlashrom; - runPythonCommand = name: buildCommandPython: runCommand name { - nativeBuildInputs = [ python3 ]; - inherit buildCommandPython; - } '' - exec python3 -c "$buildCommandPython" - ''; + runPythonCommand = + name: + buildCommandPython: + + runCommand + name + { + nativeBuildInputs = [ python3 ]; + inherit buildCommandPython; + } + '' + exec python3 -c "$buildCommandPython" + ''; test-firmware = let @@ -103,205 +111,219 @@ let }; }; in - src // { - meta = src.meta // { - # For update script - position = - let - pos = builtins.unsafeGetAttrPos "updateScript" test-firmware; - in - pos.file + ":" + toString pos.line; - }; + src // { + meta = src.meta // { + # For update script + position = + let + pos = builtins.unsafeGetAttrPos "updateScript" test-firmware; + in + pos.file + ":" + toString pos.line; }; - - - self = stdenv.mkDerivation rec { - pname = "fwupd"; - version = "1.8.10"; - - # libfwupd goes to lib - # daemon, plug-ins and libfwupdplugin go to out - # CLI programs go to out - outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; - - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "fwupd"; + version = "1.8.12"; + + # libfwupd goes to lib + # daemon, plug-ins and libfwupdplugin go to out + # CLI programs go to out + outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; + + src = fetchFromGitHub { + owner = "fwupd"; + repo = "fwupd"; + rev = finalAttrs.version; + hash = "sha256-a4F7skyukl4jW3apGi1ie/EcuGlkZoszyZdtLFuJewA="; + }; - patches = [ - # Since /etc is the domain of NixOS, not Nix, - # we cannot install files there. - # Let’s install the files to $prefix/etc - # while still reading them from /etc. - # NixOS module for fwupd will take take care of copying the files appropriately. - ./add-option-for-installation-sysconfdir.patch - - # Install plug-ins and libfwupdplugin to $out output, - # they are not really part of the library. - ./install-fwupdplugin-to-out.patch - - # Installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. - ./installed-tests-path.patch - - # EFI capsule is located in fwupd-efi now. - ./efi-app-path.patch - ]; - - nativeBuildInputs = [ - # required for firmware zipping - ensureNewerSourcesForZipFilesHook - meson - ninja - gi-docgen - pkg-config - gobject-introspection - gettext - shared-mime-info - valgrind - gcab - gnutls - protobufc # for protoc - python - wrapGAppsNoGuiHook - vala - ]; - - buildInputs = [ - polkit - libxmlb - gusb - sqlite - libarchive - curl - elfutils - libgudev - colord - libjcat - libuuid - json-glib - umockdev - bash-completion - pango - tpm2-tss - efivar - fwupd-efi - protobufc - modemmanager - libmbim - libcbor - libqmi - xz # for liblzma - ] ++ lib.optionals haveDell [ - libsmbios - ] ++ lib.optionals haveFlashrom [ - flashrom - ]; - - mesonFlags = [ - "-Ddocs=enabled" - "-Dplugin_dummy=true" - # We are building the official releases. - "-Dsupported_build=enabled" - # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd. - # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97 - "-Dsoup_session_compat=false" - "-Dudevdir=lib/udev" - "-Dsystemd_root_prefix=${placeholder "out"}" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "--localstatedir=/var" - "--sysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Defi_os_dir=nixos" - "-Dplugin_modem_manager=enabled" - - # We do not want to place the daemon into lib (cyclic reference) - "--libexecdir=${placeholder "out"}/libexec" - ] ++ lib.optionals (!haveDell) [ - "-Dplugin_dell=disabled" - "-Dplugin_synaptics_mst=disabled" - ] ++ lib.optionals (!haveRedfish) [ - "-Dplugin_redfish=disabled" - ] ++ lib.optionals (!haveFlashrom) [ - "-Dplugin_flashrom=disabled" - ] ++ lib.optionals (!haveMSR) [ - "-Dplugin_msr=disabled" - ]; - - # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF - dontWrapGApps = true; - - doCheck = true; - - # Environment variables - - # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = - let - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - in fontsConf; - - # error: “PolicyKit files are missing” - # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 - PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - - # Phase hooks - - postPatch = '' - patchShebangs \ - contrib/generate-version-script.py \ - po/test-deps - - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ - --replace "gdbus" ${glib.bin}/bin/gdbus - - # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found - sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build - sed -i 's/test(.*)//' plugins/mtd/meson.build - # fails on amd cpu - sed -i 's/test(.*)//' libfwupdplugin/meson.build - # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf - sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build - ''; + patches = [ + # Since /etc is the domain of NixOS, not Nix, + # we cannot install files there. + # Let’s install the files to $prefix/etc + # while still reading them from /etc. + # NixOS module for fwupd will take take care of copying the files appropriately. + ./add-option-for-installation-sysconfdir.patch + + # Install plug-ins and libfwupdplugin to $out output, + # they are not really part of the library. + ./install-fwupdplugin-to-out.patch + + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. + ./installed-tests-path.patch + + # EFI capsule is located in fwupd-efi now. + ./efi-app-path.patch + ]; + + nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook + meson + ninja + gi-docgen + pkg-config + gobject-introspection + gettext + shared-mime-info + valgrind + gcab + gnutls + pandoc + protobufc # for protoc + python + wrapGAppsNoGuiHook + vala + ]; + + buildInputs = [ + polkit + libxmlb + gusb + sqlite + libarchive + curl + elfutils + libgudev + colord + libjcat + libuuid + json-glib + umockdev + bash-completion + pango + tpm2-tss + efivar + fwupd-efi + protobufc + modemmanager + libmbim + libcbor + libqmi + xz # for liblzma + ] ++ lib.optionals haveDell [ + libsmbios + ] ++ lib.optionals haveFlashrom [ + flashrom + ]; + + mesonFlags = [ + "-Ddocs=enabled" + "-Dplugin_dummy=true" + # We are building the official releases. + "-Dsupported_build=enabled" + # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd. + # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97 + "-Dsoup_session_compat=false" + "-Dudevdir=lib/udev" + "-Dsystemd_root_prefix=${placeholder "out"}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "--localstatedir=/var" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Defi_os_dir=nixos" + "-Dplugin_modem_manager=enabled" + + # We do not want to place the daemon into lib (cyclic reference) + "--libexecdir=${placeholder "out"}/libexec" + ] ++ lib.optionals (!haveDell) [ + "-Dplugin_dell=disabled" + "-Dplugin_synaptics_mst=disabled" + ] ++ lib.optionals (!haveRedfish) [ + "-Dplugin_redfish=disabled" + ] ++ lib.optionals (!haveFlashrom) [ + "-Dplugin_flashrom=disabled" + ] ++ lib.optionals (!haveMSR) [ + "-Dplugin_msr=disabled" + ]; + + # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF + dontWrapGApps = true; + + doCheck = true; + + # Environment variables + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = + let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + in + fontsConf; + + # error: “PolicyKit files are missing” + # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 + PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; + + # Phase hooks + + postPatch = '' + patchShebangs \ + contrib/generate-version-script.py \ + po/test-deps + + substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ + --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build + + # Device tests use device emulation and need to download emulation data from + # the internet, which does not work on our test VMs. + # It's probably better to disable these tests for NixOS by setting + # the device-tests directory to /dev/null. + # For more info on device emulation, see: + # https://github.com/fwupd/fwupd/blob/eeeac4e9ba8a6513428b456a551bffd95d533e50/docs/device-emulation.md + substituteInPlace data/installed-tests/meson.build \ + --replace "join_paths(datadir, 'fwupd', 'device-tests')" "'/dev/null'" + ''; - preBuild = '' - # jcat-tool at buildtime requires a home directory - export HOME="$(mktemp -d)" - ''; + preBuild = '' + # jcat-tool at buildtime requires a home directory + export HOME="$(mktemp -d)" + ''; - preCheck = '' - addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + preCheck = '' + addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" - echo "12345678901234567890123456789012" > machine-id - export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ - LD_PRELOAD=${libredirect}/lib/libredirect.so - ''; + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; - preInstall = '' - # We have pkexec on PATH so Meson will try to use it when installation fails - # due to being unable to write to e.g. /etc. - # Let’s pretend we already ran pkexec – - # the pkexec on PATH would complain it lacks setuid bit, - # obscuring the underlying error. - # https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558 - export PKEXEC_UID=-1 - ''; + preInstall = '' + # We have pkexec on PATH so Meson will try to use it when installation fails + # due to being unable to write to e.g. /etc. + # Let’s pretend we already ran pkexec – + # the pkexec on PATH would complain it lacks setuid bit, + # obscuring the underlying error. + # https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558 + export PKEXEC_UID=-1 + ''; - postInstall = '' - # These files have weird licenses so they are shipped separately. - cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd" - ''; + postInstall = '' + # These files have weird licenses so they are shipped separately. + cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd" + ''; - preFixup = let + preFixup = + let binPath = [ efibootmgr bubblewrap tpm2-tools ]; - in '' + in + '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # See programs reached with fu_common_find_program_in_path in source @@ -309,60 +331,62 @@ let ) ''; - postFixup = '' - # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. - find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ - | while IFS= read -r -d ''' file; do - if [[ "$file" != *.efi ]]; then - echo "Wrapping program $file" - wrapGApp "$file" - fi - done - - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; + postFixup = '' + # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. + find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "$file" != *.efi ]]; then + echo "Wrapping program $file" + wrapGApp "$file" + fi + done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; - separateDebugInfo = true; - - passthru = { - filesInstalledToEtc = [ - "fwupd/bios-settings.d/README.md" - "fwupd/daemon.conf" - "fwupd/remotes.d/lvfs-testing.conf" - "fwupd/remotes.d/lvfs.conf" - "fwupd/remotes.d/vendor.conf" - "fwupd/remotes.d/vendor-directory.conf" - "fwupd/uefi_capsule.conf" - "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" - "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" - "pki/fwupd/LVFS-CA.pem" - "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" - "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" - "pki/fwupd-metadata/LVFS-CA.pem" - "grub.d/35_fwupd" - ] ++ lib.optionals haveDell [ - "fwupd/remotes.d/dell-esrt.conf" - ] ++ lib.optionals haveRedfish [ - "fwupd/redfish.conf" - ] ++ lib.optionals haveMSR [ - "fwupd/msr.conf" - ] ++ lib.optionals isx86 [ - "fwupd/thunderbolt.conf" - ]; + separateDebugInfo = true; + + passthru = { + filesInstalledToEtc = [ + "fwupd/bios-settings.d/README.md" + "fwupd/daemon.conf" + "fwupd/remotes.d/lvfs-testing.conf" + "fwupd/remotes.d/lvfs.conf" + "fwupd/remotes.d/vendor.conf" + "fwupd/remotes.d/vendor-directory.conf" + "fwupd/uefi_capsule.conf" + "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" + "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd/LVFS-CA.pem" + "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" + "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd-metadata/LVFS-CA.pem" + "grub.d/35_fwupd" + ] ++ lib.optionals haveDell [ + "fwupd/remotes.d/dell-esrt.conf" + ] ++ lib.optionals haveRedfish [ + "fwupd/redfish.conf" + ] ++ lib.optionals haveMSR [ + "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" + ]; - # DisabledPlugins key in fwupd/daemon.conf - defaultDisabledPlugins = [ - "test" - "test_ble" - ]; + # DisabledPlugins key in fwupd/daemon.conf + defaultDisabledPlugins = [ + "test" + "test_ble" + ]; - # For updating. - inherit test-firmware; + # For updating. + inherit test-firmware; - tests = let + tests = + let listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; - in { + in + { installedTests = nixosTests.installed-tests.fwupd; passthruMatches = runPythonCommand "fwupd-test-passthru-matches" '' @@ -371,29 +395,27 @@ let import os import pathlib - etc = '${self}/etc' + etc = '${finalAttrs.finalPackage}/etc' package_etc = set(itertools.chain.from_iterable([[os.path.relpath(os.path.join(prefix, file), etc) for file in files] for (prefix, dirs, files) in os.walk(etc)])) - passthru_etc = set(${listToPy passthru.filesInstalledToEtc}) + passthru_etc = set(${listToPy finalAttrs.passthru.filesInstalledToEtc}) assert len(package_etc - passthru_etc) == 0, f'fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {package_etc - passthru_etc}' assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}' config = configparser.RawConfigParser() - config.read('${self}/etc/fwupd/daemon.conf') + config.read('${finalAttrs.finalPackage}/etc/fwupd/daemon.conf') package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';') - passthru_disabled_plugins = ${listToPy passthru.defaultDisabledPlugins} + passthru_disabled_plugins = ${listToPy finalAttrs.passthru.defaultDisabledPlugins} assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}' pathlib.Path(os.getenv('out')).touch() ''; }; - }; - - meta = with lib; { - homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ jtojnar ]; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; }; -in self + meta = with lib; { + homepage = "https://fwupd.org/"; + maintainers = with maintainers; [ ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 24eb4dcdf61..c4be2982d57 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.43"; + version = "1.0.50"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-0NlM5ugpJzwzXgm8TqM6/aj3b+lDYbLeYOHNHM3g8aw="; + sha256 = "sha256-nLbDhs+FxIcoVK66bwUAxAubikic5NT8yOA/mH/irgQ="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-oyHnEWtQ0pl4SaJsnao+oTDBuu9PJdU3uqLTDowRWQw="; + cargoHash = "sha256-JQRbHIMfPw/vC2+DFQV86+hgHZJXtpB4JO6uLugHsNg="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index c5682c6942f..fabfd47bca1 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.09"; + version = "0.02.10"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-YyIk7x0B3JB/iMF9OP767fVEBgcV0duV7xIiHZxpL0w="; + hash = "sha256-bcb1kSpNZV7eTcEIcaoiqxB68kTc0TGFMIr1Aehy/Rc="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5ff7529d239..3380eeb8816 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24595.41"; + version = "22.49.25018.24"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; + sha256 = "sha256-/onHHIG5jWFObC8pSjpFMadjwaAN6vMNjAsj8/D3qNw="; }; patches = [ diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 9246ca679a6..2d1a4479081 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -12,6 +12,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/jool/plain/debian/patches/0001-Linux-6.2.patch?id=3708a5b6c492b7d8e9f78596e61ae8f74ec9640f"; + hash = "sha256-GkyDY6tcJp7Xd28mrDorEJHxsEowZBJP7BRAdPpsyF8="; + }) + ]; + prePatch = '' sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 279a07dfa85..d07a496046b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.274"; + version = "4.19.275"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4"; + sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7f973445632..53758bd5ec2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.170"; + version = "5.10.172"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2"; + sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 54105ba9188..da308282471 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.96"; + version = "5.15.97"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l"; + sha256 = "1cxk1w43apw2b6w6r8m1magz08qzlljzn8ihn42jgamyn7sddp9c"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 38b5639579c..cb006eddfa7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.233"; + version = "5.4.234"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js"; + sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 9dd5767997c..d890f5fdc71 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.14"; + version = "6.1.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52"; + sha256 = "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index b338b0f524d..e08f21c7bbc 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.1"; + version = "6.2.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0d154mps5967mgl8sxls6x5nw2ya1pmvxyahiwacx90fr7hhgk1g"; + sha256 = "1c5zxkpahg92as14h8j2yilc4302w6g98zkjawsfh68fpfi5a9y1"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 2fa2acf820a..834de5057ce 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.95-rt60"; # updated by ./update-rt.sh + version = "5.15.96-rt61"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "06s4aqkk26fph8hm15m7cssjrwa5y7cqy9y2znfnf0w8sbqd2wga"; + sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0plz9zcibhpqsrapykvvqqhz0i2sy7wrjd3jsypvia6j3vghrz4s"; + sha256 = "1s6h80q4sddnsxjx4ilc52j4kvxwbzj638rbh7wwxvknh21vkwvl"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index dc9af21a6b2..bd9bd6d95db 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -25,6 +25,7 @@ , libbfd_2_38 , libopcodes , libopcodes_2_38 +, libtraceevent , openssl , systemtap , numactl @@ -105,6 +106,7 @@ stdenv.mkDerivation { elfutils newt slang + libtraceevent libunwind zlib openssl diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 7dbf9c97291..9f172447f10 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.2.1"; #zen + version = "6.2.2"; #zen suffix = "zen1"; #zen - sha256 = "1ypgdc4bz35cqqwp8nka6rx7m9dqfl6wzfb8ad27gqgxwzil3sjg"; #zen + sha256 = "004aghwdclky7w341yg9nkr5r58qnp4hxnmvxrp2z06pzcbsq933"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.13"; #lqx - suffix = "lqx2"; #lqx - sha256 = "1264cfkb3kfrava8g7byr10avkjg0k281annqppcqqjkyjf63q4y"; #lqx + version = "6.1.14"; #lqx + suffix = "lqx1"; #lqx + sha256 = "026nnmbpipk4gg7llsvm4fgws3ka0hjdywl7h0a8bvq6n9by15i6"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 1a194421a6b..36128a081a2 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A="; + hash = "sha256-cfgWoNOr46uotGMZrlyhR+eno4QBs/XiYgJfTcCMR10="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 24fedbf59d7..6b5f31a1d35 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }: +{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }: stdenv.mkDerivation rec { pname = "kvmfr"; @@ -9,19 +9,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - patches = lib.optional (kernel.kernelAtLeast "5.16") (fetchpatch { - name = "kvmfr-5.16.patch"; - url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch"; - sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx"; - stripLen = 1; - }) - ++ lib.optional (kernel.kernelAtLeast "5.18") (fetchpatch { - name = "kvmfr-5.18.patch"; - url = "https://github.com/gnif/LookingGlass/commit/c7029f95042fe902843cb6acbfc75889e93dc210.patch"; - sha256 = "sha256-6DpL17XWj8BKpiBdKdCPC51MWKLIo6PixQ9UaygT2Zg="; - stripLen = 1; - }); - makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1c516707049..c862fd4e167 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = with maintainers; [ joachifm ma27 dotlambda ]; + maintainers = with maintainers; [ joachifm dotlambda ]; license = licenses.gpl2Plus; homepage = "https://github.com/alobbs/macchanger"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix index 16f3d836833..b9f682f5319 100644 --- a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix +++ b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, gcc11Stdenv , fetchFromGitHub , cmake , nasm @@ -8,7 +8,7 @@ , extraCmakeFlags ? [ ] }: -stdenv.mkDerivation rec { +gcc11Stdenv.mkDerivation rec { pname = "ipp-crypto"; version = "2021.3"; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 0b26b527fe0..4269df35d27 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.1.4"; + version = "1.2.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-eitChQTTkiNY/NbDM+u2ZlyuczzJ9nVjIS1sS05DO3Q="; + sha256 = "sha256-rlph8On/dc9Xyx8/KQzp4vX49wY4fr1oTtBEyfVhrsc="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 9934a4710d7..e7e904cb94c 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -4,15 +4,16 @@ , enablePython ? false, python3 , enableGSSAPI ? true, libkrb5 , buildPackages, nixosTests +, cmocka, tzdata }: stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.11"; + version = "9.18.12"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg="; + sha256 = "sha256-R3Zrt7BjqrutBUOGsZCqf2wUUkQnr9Qnww7EJlEgJ+c="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -59,8 +60,20 @@ stdenv.mkDerivation rec { EOF ''; - doCheck = false; # requires root and the net enableParallelBuilding = true; + # TODO: investigate the aarch64-linux failures; see this and linked discussions: + # https://github.com/NixOS/nixpkgs/pull/192962 + doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux); + checkTarget = "unit"; + checkInputs = [ + cmocka + ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ + tzdata + ]; + preCheck = lib.optionalString stdenv.hostPlatform.isMusl '' + # musl doesn't respect TZDIR, skip timezone-related tests + sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c + ''; passthru.tests = { inherit (nixosTests) bind; diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index 0491e0e75eb..6e60940b157 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20221012"; + version = "20230211"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-qgwOaqRyMiN3+vnwzwNet7jMQzgmFb09AVfYFwCAQJI="; + sha256 = "sha256-hG+WIp7JzlHVHjVUouPoocRLpwxWl6hpNorMvc4MsWM="; }; - vendorSha256 = "sha256-8W0yh+/FPIf6M5JipwbpLseKEdo4uVRmtsYYqfkwENU="; + vendorHash = "sha256-zhkQ3v8oN0hu3siu7yVxsFVTnNvJV59tHGpfXZzE+O4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 8f96952fde7..c782382574e 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.22.0"; + version = "2.22.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-68+IvbOCBjTdBg5dQb+ydp2ntt07fvWwm4ALc6m1aN4="; + sha256 = "sha256-usVqjXXjMCvbjEz6TKz7RM5A2oUVryjsjFBDUftQcRI="; }; sourceRoot = "."; diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index dbbf54fc43f..4ef0649df7a 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0rpjn10ia47nia0g5a8khxy0r8grlfvcf1s5kdyj9512hcy25aca" +"1kc4l95hrhi7lb9x8gy19xpwj12j4syg6w1kbllf3g3k83sr444f" diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index f0a40e30c91..7df5f3711e1 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -30,7 +30,7 @@ echo running nix-build for ui nix-build -A gotify-server.ui echo running nix-build for gotify itself in order to get vendorSha256 set +e -vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f2)" set -e printf '"%s"\n' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index 56048780467..d3eb9bb03b7 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.2.2" +"2.2.4" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dafb5b4976d..d5b6df28835 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.2.5"; + version = "2023.3.1"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -70,10 +70,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -200,10 +197,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -355,10 +349,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -378,9 +369,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -398,10 +386,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -420,10 +405,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -492,10 +474,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -811,6 +790,26 @@ ]; "dooya" = ps: with ps; [ ]; + "dormakaba_dkey" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + ifaddr + py-dormakaba-dkey + pyserial + pyudev + sqlalchemy + zeroconf + ]; "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ @@ -843,6 +842,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "easyenergy" = ps: with ps; [ + ]; # missing inputs: easyenergy "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ @@ -974,10 +975,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -997,10 +995,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1023,10 +1018,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1074,7 +1066,7 @@ ha-ffmpeg ]; "fibaro" = ps: with ps; [ - fiblary3-fork + pyfibaro ]; "fido" = ps: with ps; [ pyfido @@ -1127,10 +1119,7 @@ esphome-dashboard-api fjaraskupan fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1376,10 +1365,7 @@ esphome-dashboard-api fnvhash govee-ble - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1423,12 +1409,7 @@ ]; "hardkernel" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow psutil-home-assistant - sqlalchemy ]; "hardware" = ps: with ps; [ psutil-home-assistant @@ -1441,11 +1422,6 @@ ]; "hassio" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow - sqlalchemy ]; "havana_shade" = ps: with ps; [ ]; @@ -1514,15 +1490,12 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow pyserial-asyncio pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1534,8 +1507,6 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow psutil-home-assistant @@ -1543,7 +1514,6 @@ pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1555,8 +1525,6 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow psutil-home-assistant @@ -1564,7 +1532,6 @@ pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1598,11 +1565,10 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow + pyroute2 pyserial + python-otbr-api pyudev sqlalchemy zeroconf @@ -1683,11 +1649,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ibeacon-ble ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1744,11 +1707,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr inkbird-ble - janus - pillow pyserial pyudev sqlalchemy @@ -1877,11 +1837,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus kegtron-ble - pillow pyserial pyudev sqlalchemy @@ -1907,10 +1864,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1930,6 +1884,8 @@ pykmtronic ]; "knx" = ps: with ps; [ + aiohttp-cors + janus xknx ]; "kodi" = ps: with ps; [ @@ -1999,10 +1955,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -2021,11 +1974,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus led-ble - pillow pyserial pyudev sqlalchemy @@ -2233,10 +2183,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -2320,11 +2267,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus moat-ble - pillow pyserial pyudev sqlalchemy @@ -2378,15 +2322,13 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow + mopeka-iot-ble pyserial pyudev sqlalchemy zeroconf - ]; # missing inputs: mopeka_iot_ble + ]; "motion_blinds" = ps: with ps; [ aiohttp-cors fnvhash @@ -2593,7 +2535,8 @@ aio-geojson-nsw-rfs-incidents ]; "nuheat" = ps: with ps; [ - ]; # missing inputs: nuheat + nuheat + ]; "nuki" = ps: with ps; [ pynuki ]; @@ -2638,8 +2581,6 @@ "onboarding" = ps: with ps; [ aiohttp-cors fnvhash - home-assistant-frontend - janus pillow sqlalchemy ]; @@ -2725,11 +2666,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus oralb-ble - pillow pyserial pyudev sqlalchemy @@ -2745,11 +2683,12 @@ "otbr" = ps: with ps; [ aiohttp-cors fnvhash - home-assistant-frontend - janus - pillow + ifaddr + pyroute2 + python-otbr-api sqlalchemy - ]; # missing inputs: python-otbr-api + zeroconf + ]; "otp" = ps: with ps; [ pyotp ]; @@ -2940,10 +2879,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev qingping-ble @@ -3004,12 +2940,7 @@ ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow psutil-home-assistant - sqlalchemy ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client @@ -3139,9 +3070,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -3159,10 +3087,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev ruuvitag-ble @@ -3260,10 +3185,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3288,10 +3210,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sensorpro-ble @@ -3311,10 +3230,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sensorpush-ble @@ -3362,9 +3278,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -3490,10 +3403,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pysnooz pyudev @@ -3673,10 +3583,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3798,10 +3705,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3823,10 +3727,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3845,6 +3746,13 @@ "thomson" = ps: with ps; [ ]; "thread" = ps: with ps; [ + aiohttp-cors + fnvhash + ifaddr + pyroute2 + python-otbr-api + sqlalchemy + zeroconf ]; "threshold" = ps: with ps; [ ]; @@ -3871,10 +3779,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3924,6 +3829,9 @@ ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected + "tplink_omada" = ps: with ps; [ + tplink-omada-client + ]; "traccar" = ps: with ps; [ aiohttp-cors pytraccar @@ -4264,10 +4172,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -4303,10 +4208,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -4382,15 +4284,12 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow pyserial-asyncio pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -4555,6 +4454,7 @@ "dlna_dms" "dnsip" "doorbird" + "dormakaba_dkey" "dsmr" "dsmr_reader" "dte_energy_bridge" @@ -4804,6 +4704,7 @@ "modern_forms" "mold_indicator" "moon" + "mopeka" "motion_blinds" "motioneye" "mqtt" @@ -4839,6 +4740,7 @@ "notify_events" "notion" "nsw_rural_fire_service_feed" + "nuheat" "nuki" "number" "nut" @@ -4863,6 +4765,7 @@ "openweathermap" "opnsense" "oralb" + "otbr" "overkiz" "ovo_energy" "owntracks" @@ -5053,6 +4956,7 @@ "toon" "totalconnect" "tplink" + "tplink_omada" "traccar" "trace" "tractive" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b5e42fca6ae..89d6ead4906 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchFromGitHub +, fetchPypi , fetchpatch , python3 , substituteAll @@ -42,16 +43,6 @@ let }; }); - # https://github.com/postlund/pyatv/issues/1879 - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - pname = "aiohttp"; - version = "3.8.1"; - src = self.fetchPypi { - inherit pname version; - hash = "sha256-/FRx4aVN4V73HBvG6+gNTcaB6mAOaL/Ry85AQn8LdXg="; - }; - }); - aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -88,16 +79,6 @@ let }; }); - gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { - version = "4.0.0"; - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-gridnet"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; - }; - }); - # Pinned due to API changes in 10.0 mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { version = "9.3.0"; @@ -199,6 +180,22 @@ let doCheck = false; }); + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "2.0.4"; + src = super.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs="; + }; + nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ + pytest-xdist + ]); + disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -266,7 +263,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.2.5"; + hassVersion = "2023.3.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,18 +276,30 @@ in python.pkgs.buildPythonApplication rec { # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - # PyPI tarball is missing tests/ directory - src = fetchFromGitHub { + # Primary source is the pypi sdist, because it contains translations + src = fetchPypi { + inherit pname version; + hash = "sha256-FvdMNtiLJ6p9I6aEeICukx9mykGGMoONGNdM/I4u/eY="; + }; + + # Secondary source is git for tests + gitSrc = fetchFromGitHub { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys="; + hash = "sha256-2usXU1a/QKEIaeg8JFBf/4ID2nzZLoGsfK7KXreKEBE="; }; nativeBuildInputs = with python3.pkgs; [ setuptools ]; + # copy tests early, so patches apply as they would to the git repo + prePatch = '' + cp --no-preserve=mode --recursive ${gitSrc}/tests ./ + chmod u+x tests/auth/providers/test_command_line_cmd.sh + ''; + # leave this in, so users don't have to constantly update their downstream patch handling patches = [ (substituteAll { @@ -378,6 +387,7 @@ in python.pkgs.buildPythonApplication rec { requests-mock respx stdlib-list + syrupy tomli # required through tests/auth/mfa_modules/test_otp.py pyotp diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index a3b1e7df1a5..6c7329d2070 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230202.0"; + version = "20230302.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw="; + hash = "sha256-G+XexUc5yvADjbXBgg97FB03Al3zR9WTb4cuVBBrSuI="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 8c8470113c4..94fe8ef3ffb 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.1.31"; + version = "2023.2.28"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM="; + hash = "sha256-u9CLPikht+T9wdQpLELPH/t+pZNcaOfbtfWT6DBwZaw="; }; sourceRoot = "source/package"; diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index a72674ff7a5..a4177a35f48 100644 --- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -1,8 +1,8 @@ diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py -index 74c826f47d..91f359da2a 100644 +index a98766c78c..1c47bb1f80 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py -@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" +@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" CONF_EXTRA_ARGUMENTS = "extra_arguments" CONF_OUTPUT = "output" @@ -12,7 +12,7 @@ index 74c826f47d..91f359da2a 100644 CONFIG_SCHEMA = vol.Schema( { diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index e1730ffdab..e9cd7934fd 100644 +index 521ac732e5..ab8a56934f 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py @@ -87,7 +87,7 @@ class TestFFmpegSetup: diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 01723e561e1..4e31078381f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , poetry-core , home-assistant +, python }: buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.2.5"; + version = "2023.3.1"; format = "pyproject"; + disabled = python.version != home-assistant.python.version; + src = fetchFromGitHub { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-MQYk4DWvmqtPl00L1c00JclKkTZe9EYMrm/LucUHBE0="; + hash = "sha256-WMuQgoWwri4nfKkZ8cW5o6S6G3PbHqlUxC9wyJSZhxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 734823e9f47..182034818e3 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -19,8 +19,10 @@ let homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; + mopeka = [ pyswitchbot ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; + otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; raspberry_pi = [ rpi-bad-power ]; shelly = [ pyswitchbot ]; tilt_ble = [ govee-ble ibeacon-ble ]; @@ -55,6 +57,9 @@ let logbook = [ "--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind " ]; + modbus = [ + "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" @@ -83,7 +88,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( dontUsePytestXdist = true; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray - ++ [ "--numprocesses=4" ] + ++ [ "--numprocesses=2" ] ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 094c29c6e30..faadfff26e5 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGo120Module rec { pname = "evcc"; - version = "0.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; + hash = "sha256-YPqt1UfXP2LGSopQuM4PXQJG3MmXg+5VjDpBKpV5axI="; }; - vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; + vendorHash = "sha256-CNBwOVykQW7RUuf6oFTxO2DU6sd5IJVqN+6FPytQh+U="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 87506287a87..c8178fe87a9 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php81-unit = php81.override phpConfig; in stdenv.mkDerivation rec { - version = "1.29.0"; + version = "1.29.1"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-Na7whutGpd1yLePlcZyiZK9a/Y4YQnv7dkC5FjENqzs="; + sha256 = "sha256-Jk/rzPJq1FWWTe31Fa2Ah+MoWP5mh6XNSmiYIY42vvk="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index e1db293f649..5af5a44d168 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.161.0"; + version = "0.162.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-TZ/TxX9OgDGx8zD2mI8cTDPZSqBjkYN3Uy+W9MXbJOI="; + sha256 = "sha256-RcEAqMfpXH7PudLOROpSZw/5HrEeuBFBkllOjGdXZCU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix index 0f816164cbe..22c187059cb 100644 --- a/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -1,17 +1,27 @@ -{ isPy3k, buildPythonPackage, fetchPypi, service-identity, ldap3, twisted, ldaptor, mock }: +{ lib, buildPythonPackage, fetchPypi, ldap3, ldaptor, matrix-synapse, pytestCheckHook, service-identity, setuptools, twisted }: buildPythonPackage rec { pname = "matrix-synapse-ldap3"; - version = "0.1.5"; + version = "0.2.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "9fdf8df7c8ec756642aa0fea53b31c0b2f1924f70d7f049a2090b523125456fe"; + sha256 = "sha256-s4jZVpNIbu9pra79D9noRGPVL+F7AhSgDvyqZptzy3Q="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ service-identity ldap3 twisted ]; - # ldaptor is not ready for py3 yet - doCheck = !isPy3k; - nativeCheckInputs = [ ldaptor mock ]; + nativeCheckInputs = [ ldaptor matrix-synapse pytestCheckHook ]; + + pythonImportsCheck = [ "ldap_auth_provider" ]; + + meta = with lib; { + description = "LDAP3 auth provider for Synapse"; + homepage = "https://github.com/matrix-org/matrix-synapse-ldap3"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index e6eab7da86a..7439396969f 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,21 +7,21 @@ buildGoModule rec { pname = "mattermost"; - version = "7.7.1"; + version = "7.8.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-py1Ck/BGNGIlyVZXJPb9bYHLU8FTrBEIQwVkHvgHRLY"; + sha256 = "sha256-6aJkJCJmQHvSn5SHIPXj0nNLBuEez9BCYYMMlv3iZqQ="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-4FrvKQdGKfwJM7Oc43kg1Iq4o/OT2/kl89bTKBO4EdQ"; + sha256 = "sha256-KmzjhAkv1TpOlHtZnN/ifkQnzDqk1rN+fl4JStZRbXQ="; }; - vendorSha256 = "sha256-qJSddirC0VVFgKsttmNFZ1AzGR7jo07jXzrt7+DswXs="; + vendorSha256 = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk="; subPackages = [ "cmd/mattermost" ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b655652b7e1..ff506344129 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-02-22T18-23-45Z"; + version = "2023-02-27T18-10-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Y11jqZiQUu0/YcrIGFJ2nOkPRG97sflluO3J0BJZ6kQ="; + sha256 = "sha256-0Qz64uNe5rkHOUepzCYUdeyP1ZXzY3Bi1LUvQw2quPA="; }; - vendorHash = "sha256-9QYRUCD2iR2jx8G1FbkQqqPqIuXKxAKDy9whMRhOVP4="; + vendorHash = "sha256-b/2/VTIVJyWNm6j+GyhbOKsIl9B0Nqw2fbpBw20Wicw="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 68edff754a8..d20a60e5208 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; + hash = "sha256-keev3DZ3xN5UARuYKfSdox0KKBjrM5RoMD273Aw0AGY="; }; - vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; + vendorHash = "sha256-5lRW9gWQZRRqZoVB16kI1VEnr0XsiPtLUuioK/0f8w0="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 6aefa4f4534..b14efeaabec 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM="; + sha256 = "sha256-Ob+0Ak0ELyHrZfeCiACX2IHsp+6jE//iqPoW6je6GfQ="; }; sourceRoot = "source/src"; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index fdaf7bdcb21..7b06eed72ce 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-qE+cKwn/rqxL5/LUSirflmnFCow6IxjCcGvu2bbBmsk="; + sha256 = "sha256-Rl7o2QPa/IU1snlx/LiJxQok9pnkw9XANnJsu41vNlY="; }; - vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; + vendorHash = "sha256-KX+TR0n14+95lldF+0KUo5DbqOKpUDaZNuKMBf0KHFQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 71377d55b7a..24813af5a29 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.3.6"; + version = "9.4.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw="; + sha256 = "sha256-LYUbypPXoWwWA4u2JxhUS/lozQNo2DCFGDPCmNP3GoE="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM="; + sha256 = "sha256-aq6/sMfYVebxh46+zxphfWttFN4vBpUgCLXobLWVozk="; }; - vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4="; + vendorSha256 = "sha256-atnlEdGDiUqQkslvRlPSi6VC5rEvRVV6R2Wxur3geew="; nativeBuildInputs = [ wire ]; @@ -28,8 +28,14 @@ buildGoModule rec { wire gen -tags oss ./pkg/server wire gen -tags oss ./pkg/cmd/grafana-cli/runner - GOARCH= CGO_ENABLED=0 go generate ./pkg/framework/coremodel - GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins + GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef + GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go + GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go + GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go + + # Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`. + # Apparently these files confuse the dependency resolution for the go builder implemented here. + rm pkg/util/xorm/go.{mod,sum} # The testcase makes an API call against grafana.com: # diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index c5189720660..aa8520e69b8 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "doitintl-bigquery-datasource"; - version = "2.0.2"; - zipHash = "sha256-GE6DNuQ5WtS/2VmXbQBeRdVKDbLlLirWXW51i0RF6Cc="; + version = "2.0.3"; + zipHash = "sha256-QxUNRsO1ony+6tVdpwx3P/63XNIdAVIren6hUwChf9E="; meta = with lib; { description = "BigQuery DataSource for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix index 9f1d501d23f..a5ed12fbfa4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafadruid-druid-datasource"; - version = "1.2.0"; - zipHash = "sha256-DPeyV2jZquSQcSE+HzvxArWEefs9bFNPjZwDFp+dIjg="; + version = "1.4.1"; + zipHash = "sha256-7atxqRqKqop6ABQ+ead6wR/YRpJaV8j/Ri4VB9FXMu8="; meta = with lib; { description = "Connects Grafana to Druid"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 365c188541b..76493726c3a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-clock-panel"; - version = "1.1.3"; - zipHash = "sha256-80JaMhY/EduSWvFrScfua99DGhT/FJUqY/kl0CafKCs="; + version = "2.1.2"; + zipHash = "sha256-LRlyK0mv5gFNknjc9mDr84NDTIXDzlKV9spQVhZSv+I="; meta = with lib; { description = "Clock panel for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix index 3787c6cc5e1..168295c64cd 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-piechart-panel"; - version = "1.6.2"; - zipHash = "sha256-xKyVT092Ffgzl0BewQw5iZ14I/q6CviUR5t9BVM0bf0="; + version = "1.6.4"; + zipHash = "sha256-bdAl3OmZgSNB+IxxlCb81abR+4dykKkRY3MpQUQyLks="; meta = with lib; { description = "Pie chart panel for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 0ef21497597..0a886441eaf 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.6"; - zipHash = "sha256-gbMD2o8A2YYZzkpYiXNkv8Oj958RP47fL6DXj1SBYF0="; + version = "2.0.4"; + zipHash = "sha256-wkf/LK+kcjTbMJzlAg6zRWgEO5LjdDR/oy7/SrNuCXM="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix index 4060a1c8dd8..8d005514986 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-worldmap-panel"; - version = "0.3.3"; - zipHash = "sha256-3n1p3SvcBQMmnbnHimLBP7hauVV1IS3SMwttUWTNvb8="; + version = "1.0.3"; + zipHash = "sha256-xpcQTymxA4d8jRnHm4cHAFOzPT1BseOaX0Qeq5vDvac="; meta = with lib; { description = "World Map panel for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index 4fbd45ff587..f5ed4254324 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pihole-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "eko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LtiJpXucD9Ok1tFFCQ5/V6FhYxbgBWDPF6S49FzWPes="; + sha256 = "sha256-ZHeAp2++faqoxt+2uvtea2+xPST2sonuBJAhI6GZg1Y="; }; - vendorSha256 = "sha256-GCHCWnP3YPC1Dg8Tu0GF5ITDMVRoBv28QVpk6JGN5nQ="; + vendorHash = "sha256-Wn4W7e8v/njvODA0znqtZsMRfcH6L6r5biAOwfyKUAU="; meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a4590277acc..a457a2ee39c 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-pSLFfArmG4DIgYUD8qz71P+7RYIQuUycnYzNFXNhZ8A="; + sha256 = "sha256-hBkekoVwNuRDGhpvbW57eR+UUMkntdEcHJAVQbwk7NE="; }; vendorHash = "sha256-Owfxy7WkucQ6BM8yjnZg9/8CgopGTtbQTTUuxoT3RRE="; @@ -28,7 +28,7 @@ buildGoModule rec { description = "Prometheus exporter for Redis metrics"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ eskytthe srhb ]; + maintainers = with maintainers; [ eskytthe srhb ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 76cbb2730cb..4e3c5c14655 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.14"; + version = "2.9.15"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI="; + hash = "sha256-j++DjPMyBVBMOKcZQkkPwTYC0f1PD5vQVtx0yJL75Vw="; }; - vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo="; + vendorHash = "sha256-bBJZiETZCwtcsH9w43aFwUU8lmttrCKwie4So9kiZc4="; doCheck = false; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 560853b5d95..d576f1f46d5 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-MafP6kl3SmtT2/vLPDwy8U7+tE6hUBr/lWmiAcjsQNU="; + sha256 = "sha256-MEPy2TXVTegwCpuaIrMol7ag8anxxdcj11z5eYNkDqQ="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix index 3fc63a91cd3..ea9654a878d 100644 --- a/pkgs/servers/nosql/janusgraph/default.nix +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "janusgraph"; - version = "0.6.2"; + version = "0.6.3"; src = fetchzip { url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; - sha256 = "sha256-8TMYk8gGyL71zcFk0Lgo7Isvm4k3eh/H6PjfVePpkI4="; + sha256 = "sha256-KpGvDfQExU6pHheqmcOFoAhHdF4P+GBQu779h+/L5mE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0f788dd9d38..85e9fe5022e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - hash = "sha256-BqM55JEwZ4Pc9VuX8VpdvL3AHMvebcIwJ8R1yrc16RQ="; + hash = "sha256-93E1wqR8kVHUAov+o7NEcKtNMk0UhPeahMbzKjz7n2U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index e5531dc2665..945549a5988 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-7l9NT0brk6c7H3oqe9IjTY+5Ji2c5a4vB4vomqmv7x8="; - arm64-linux_hash = "sha256-UKVCpFS4m2DMkgG62V7uSQyLG/Zt6z3GSogd30A/4nY="; - x64-osx_hash = "sha256-xUu4nsAzBDCKUJWmim3UXVgFzwa6fg9mj/eD3OW1ILY="; + x64-linux_hash = "sha256-ospnFR3syNLxy6USCrfFea2zePMa9P7opRk3hbPtpOM="; + arm64-linux_hash = "sha256-weOfb1NcVGHF1bkll0tkLxVn3TQnIq2VsRegVWk8aDc="; + x64-osx_hash = "sha256-dhQbmwDkezPZFHnGg0+bLKBWPDbRUX82imrGx5cX+ks="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.22.5"; + version = "4.35.10"; sourceRoot = "."; diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 12dba25d1e6..641cffbd161 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.11"; + version = "0.3.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-7KbDZKKJPk3QTp4siIbdB6xKbslw73Lhc7NoeOuA0Og="; + sha256 = "sha256-iw+sXLKK4zvJNgJjDgZcckUqXdexvZYtsafo5cq7j6o="; fetchSubmodules = true; }; - cargoSha256 = "sha256-Yqn6hwejg6LzcqW0MiUN3tqrOql6cpu/5plaOz+2/ns="; + cargoHash = "sha256-FUn5hsfQCCfKhJl2yayLZtsi1n1p4ayfGt8gvjS+mCg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index ff9c8ad710c..f29cf359d4e 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s7tfGt1P/GmvjkIcy8DEwz+ObPxoMsIL7meAc5vMkKo="; + sha256 = "sha256-cWBNO9V9DMbEhkjG8g/iswV04DeYh3tXv0+1hB/pf64="; }; - cargoSha256 = "sha256-gqKEFqf49sKZy+L0X4MxUfx2+iYoNIU415xHqOy8MZA="; + cargoSha256 = "sha256-jZio6y2m14tVi3nTQqh+8W3hxft5PfAIWm2XpuyCKDU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 5503a6a78f3..aac66d1e425 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -8,14 +8,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U="; + sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4="; }; stripDebug = false; @@ -97,24 +97,6 @@ beamPackages.mixRelease rec { majic = prev.majic.override { buildInputs = [ file ]; }; - crypt = beamPackages.buildRebar3 rec { - name = "crypt"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "msantos"; - repo = "crypt"; - rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; - sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; - }; - - postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so"; - - beamDeps = with final; [ elixir_make ]; - - buildInputs = [ libxcrypt ]; - }; - # Some additional build inputs and build fixes http_signatures = prev.http_signatures.override { patchPhase = '' @@ -179,6 +161,13 @@ beamPackages.mixRelease rec { cp ${cfgFile} config/config.exs ''; }; + + crypt = let + version = prev.crypt.version; + in prev.crypt.override { + buildInputs = [ libxcrypt ]; + postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{hex-source-crypt-${version},crypt}.so"; + }; }); }; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 9bd4619bd79..d3a07fe2669 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -281,6 +281,19 @@ let beamDeps = [ ecto ]; }; + crypt = buildRebar3 rec { + name = "crypt"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10ir7nsa0dkn5jr0w9x2m38jc73aym7llz2pnkwxk9f747izz3cn"; + }; + + beamDeps = []; + }; + custom_base = buildMix rec { name = "custom_base"; version = "0.2.1"; @@ -335,12 +348,12 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.18"; + version = "1.4.22"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0q15ypgdr94z425dxb3blp6wqzrphsg1b6wscsfd13lmldnkpb2p"; + sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw"; }; beamDeps = [ earmark_parser ]; @@ -348,12 +361,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.17"; + version = "1.4.29"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "08r06hp1wwfbfpalqqxwpq9lsd42pwvmhjr6bcb1r9pckyfchfpr"; + sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; }; beamDeps = []; @@ -816,12 +829,12 @@ let linkify = buildMix rec { name = "linkify"; - version = "0.5.2"; + version = "0.5.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "11mbbqm7yi6rhza5d2hd4fxkhdy3ik5n7sybj0n9bn0q09lsqwcd"; + sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; }; beamDeps = []; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index abc89d8e812..5a0368d36f7 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.31.0.6654-02189b09f"; + version = "1.31.1.6733-bc0674160"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-ttkvYD+ALxfZpQutI1VyTbmQi/7hmvZ+YMUv3lskeWU="; + sha256 = "0nj9n250lhin58xlqvn2l0pjxdbajj0bla2wrgan8gs2m45nk3q9"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-TTEcyIBFiuJTNHeJ9wu+4o2ol72oCvM9FdDPC83J3Mc="; + sha256 = "0a5h151gh1ja3frqzaqw3pj1kyh5p0wgnfmmxiz0q3zx1drjs611"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 067f9b48d58..2f60d525dc0 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1202"; + version = "2.0-1223"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-YeBzXnw/BpJDUJ7fUf7TH0zQcpCjUm9peB7zPO2ZsYI="; + hash = "sha256-1jHNHj1tB80/CdE7GPCgRsI0+2Gfx4kiE6a0EOI/K5U="; }; dontConfigure = true; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index e8a9a6fc09c..1d9be6c5955 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q="; + hash = "sha256-AIH0BKk3y7F885IlC9pEyAubIgNSElpjU8nL6gl98FU="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 66b8b10e878..ec654c4a09f 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "temporal_tables"; - version = "1.2.0"; + version = "unstable-2021-02-20"; buildInputs = [ postgresql ]; src = fetchFromGitHub { - owner = "mlt"; + owner = "arkhipov"; repo = pname; - rev = "6cc86eb03d618d6b9fc09ae523f1a1e5228d22b5"; - sha256 = "0ykv37rm511n5955mbh9dcp7pgg88z1nwgszav7z6pziaj3nba8x"; + rev = "3ce22da51f2549e8f8b8fbf2850c63eb3a2f1fbb"; + sha256 = "sha256-kmcl6vVHRZj2G5GijEyaZgDpZBDcdIUKzXv0rYYqUu4="; }; installPhase = '' @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Temporal Tables PostgreSQL Extension "; homepage = "https://github.com/mlt/temporal_tables"; maintainers = with maintainers; [ ggpeti ]; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 4b7ce81b459..26fe887cb77 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - hash = "sha256-awdTqrpMnE79Mz5nEkyuz3rWzC04WB8Z0vAyH1t+zYE="; + hash = "sha256-fpafjI31acuGRtZ+5Z/b8mJ76toSlUwwHnwanBwRc08="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/servers/stayrtr/default.nix index 0193f3ede56..a372f8ff7bb 100644 --- a/pkgs/servers/stayrtr/default.nix +++ b/pkgs/servers/stayrtr/default.nix @@ -7,15 +7,19 @@ buildGoModule rec { pname = "stayrtr"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "bgp"; repo = "stayrtr"; rev = "v${version}"; - sha256 = "sha256-oRFBvue5Tcgty1GgsZGb/CMHmKM0mIc5vWOMsL/0IfI="; + hash = "sha256-/KwL/SEnHquFhPcYXpvQs71W4K1BrbqTPakatTNF47Q="; }; - vendorHash = "sha256-VomrmyNa5I6AVSpw5sg0e4b7w/JlFQINBYm+eh1FoNw="; + vendorHash = "sha256-ndMME9m3kbv/c1iKlU2Pn/YoiRQy7jfVQri3M+qhujk="; + + patches = [ + ./go.mod.patch + ]; ldflags = [ "-s" diff --git a/pkgs/servers/stayrtr/go.mod.patch b/pkgs/servers/stayrtr/go.mod.patch new file mode 100644 index 00000000000..54c80cbb6b5 --- /dev/null +++ b/pkgs/servers/stayrtr/go.mod.patch @@ -0,0 +1,30 @@ +diff --git a/go.mod b/go.mod +index 0116218..3e31f0e 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/bgp/stayrtr + +-go 1.16 ++go 1.17 + + require ( + github.com/google/go-cmp v0.5.6 +@@ -10,3 +10,17 @@ require ( + golang.org/x/crypto v0.6.0 + golang.org/x/sys v0.5.0 + ) ++ ++require ( ++ github.com/beorn7/perks v1.0.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.1 // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/golang/protobuf v1.4.3 // indirect ++ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ github.com/prometheus/client_model v0.2.0 // indirect ++ github.com/prometheus/common v0.26.0 // indirect ++ github.com/prometheus/procfs v0.6.0 // indirect ++ google.golang.org/protobuf v1.26.0-rc.1 // indirect ++ gopkg.in/yaml.v2 v2.3.0 // indirect ++) diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 65189094d0c..e71d71dc78c 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.13.2"; + version = "0.13.5"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; - rev = version; - hash = "sha256-zxpqQpzmPPU6V5QITK9SgAAI7l3/7+h0u3/bZgiU7y4="; + rev = "refs/tags/${version}"; + hash = "sha256-eFrrZ/+8OsmIfCEoXPAKqVkZlgN8sfXueJQvQN8VCB0="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoHash = "sha256-U0xHqOh0ii4PE9UYKo+diqSoZ1ZjzBmHILvAhHSZD0A="; + cargoHash = "sha256-SgOxXzI6IZcP5Q06Aj5Pv6Rrvb7xVShUcGaViLuESOw="; buildFeatures = [ "grpcio/openssl" ]; @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Mozilla Sync Storage built with Rust"; homepage = "https://github.com/mozilla-services/syncstorage-rs"; + changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ pennae ]; platforms = lib.platforms.linux; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 8c5a64f2295..fdcadc4bb28 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -1,31 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc -, jansson, jose, http-parser, systemd +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, asciidoc +, jansson +, jose +, http-parser +, systemd +, meson +, ninja }: stdenv.mkDerivation rec { pname = "tang"; - version = "7"; + version = "12"; src = fetchFromGitHub { owner = "latchset"; - repo = pname; - rev = "v${version}"; - sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7"; + repo = "tang"; + rev = "refs/tags/v${version}"; + hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE="; }; - configureFlags = [ - "--localstatedir=/var" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + nativeBuildInputs = [ + asciidoc + meson + ninja + pkg-config ]; - nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; - buildInputs = [ jansson jose http-parser systemd ]; + buildInputs = [ + jansson + jose + http-parser + systemd + ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; meta = { description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang"; + changelog = "https://github.com/latchset/tang/releases/tag/v${version}"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/servers/teleport/11.nix b/pkgs/servers/teleport/11.nix new file mode 100644 index 00000000000..ee6758053cc --- /dev/null +++ b/pkgs/servers/teleport/11.nix @@ -0,0 +1,8 @@ +{ callPackage, ... }@args: +callPackage ./generic.nix ({ + version = "11.3.5"; + hash = "sha256-/InWly0jCiPBlgM/qgS6ErMv7Hhg5PW9sldda1oaUIg="; + vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA="; + cargoHash = "sha256-02qo6i6GuRAYKDKA7k2hDq2O6ayEQbeGhFS2g3b9Wuo="; + yarnHash = "sha256-kvnVmDZ/jISaaS97KM0WbPJU7Y8XWOeHrDLT0iXRyfc="; +} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/12.nix b/pkgs/servers/teleport/12.nix new file mode 100644 index 00000000000..1182df97148 --- /dev/null +++ b/pkgs/servers/teleport/12.nix @@ -0,0 +1,8 @@ +{ callPackage, ... }@args: +callPackage ./generic.nix ({ + version = "12.0.2"; + hash = "sha256-9RD4ETQEXnj3d5YID3f3BghwitdqfcDgNhsk8ixWTW4="; + vendorHash = "sha256-2sOELuMyg7w/rhnWvnwDiUOsjUfb56JdAbrTGKvGnjs="; + cargoHash = "sha256-1ScU5ywq8vz1sWHW2idBsWcB1Xs+aylukBm96dKrwL4="; + yarnHash = "sha256-ItRi5EkYrwNB1MIf9l3yyK1BX6vNpL2+H1BlN3Evibg="; +} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/generic.nix index 52c21cb6367..a811204e09a 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/generic.nix @@ -20,6 +20,12 @@ , nixosTests , withRdpClient ? true + +, version +, hash +, vendorHash +, cargoHash +, yarnHash }: let # This repo has a private submodule "e" which fetchgit cannot handle without failing. @@ -27,13 +33,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-jJfOgcwKkNFO/5XHxMoapZxM8Tb0kEgKVA7SrMU7uW4="; + inherit hash; }; - version = "11.3.4"; + inherit version; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-TSIwLCY01ygCWT73LR/Ch7NwPQA3a3r0PyL3hUzBNr4="; + inherit cargoHash; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -56,7 +62,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-MAGeWzA366yzpjdCY0+X6RV5MKcsHa/xD5CJu6ce1FU="; + hash = yarnHash; }; webassets = stdenv.mkDerivation { @@ -95,7 +101,7 @@ buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA="; + inherit vendorHash; proxyVendor = true; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; diff --git a/pkgs/servers/web-apps/5etools/default.nix b/pkgs/servers/web-apps/5etools/default.nix index 03335be5ae8..856384aa173 100644 --- a/pkgs/servers/web-apps/5etools/default.nix +++ b/pkgs/servers/web-apps/5etools/default.nix @@ -15,5 +15,6 @@ fetchFromGitHub rec { changelog = "https://github.com/5etools-mirror-1/5etools-mirror-1.github.io/releases/tag/v${version}"; license = [ licenses.mit ]; maintainers = with maintainers; [ urandom ]; + hydraPlatforms = []; # src tarball is 4.7G, unpackeed 4.8G, exceeds hydras output limit }; } diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index 7176161d2de..c2e0bfd238e 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "16.0.3"; + version = "16.0.4"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-Zkjmm2DAaAGQc1IigMYDpE5b+YaYU8oFMHZSqBEBsRw="; + sha256 = "sha256-H0f12pEsRxq6cYrcCjjQF1b5PFQEPBfYhZ5YnBfIbHk="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 480250900b3..e43b7766a6e 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE="; + hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI="; }; passthru.tests = { diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index e9b8c01614e..7994d81f97a 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, writeText }: +{ lib, stdenv, fetchurl, writeText, nixosTests }: stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.39.1"; + version = "1.39.2"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - sha256 = "sha256-3ew/kOHnsaxmgZF4yoEDfT+AhNxXfUq3cypLj5gNhfk="; + sha256 = "sha256-3bUdIooZymjNiHHYUBdfa+9Gh0R27RRm8BXPmEbZx6U="; }; postPatch = '' @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.mediawiki = nixosTests.mediawiki; + meta = with lib; { description = "The collaborative editing software that runs Wikipedia"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index b3abd130d93..c93f01fa8f5 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -68,7 +68,7 @@ beamPackages.mixRelease { license = licenses.agpl3Plus; homepage = "https://plausible.io/"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics."; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6effd2c26c3..afa864fdbf6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2220,11 +2220,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-amdgpu"; - version = "21.0.0"; + version = "23.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2"; - sha256 = "125dq85n46yqmnmr2hknxwcqicwlvz2b2phf0m963fpg9l1j6y30"; + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz"; + sha256 = "0qf0kjh6pww5abxmqa4c9sfa2qq1hq4p8qcgqpfd1kpkcvmg012g"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index dcd6071fa33..c1a57a01a2f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -755,7 +755,7 @@ self: super: in attrs // (let version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; + commonBuildInputs = attrs.buildInputs ++ [ xtrans libxcvt ]; commonPropagatedBuildInputs = [ dbus libGL libGLU libXext libXfont libXfont2 libepoxy libunwind libxshmfence pixman xorgproto zlib @@ -791,7 +791,7 @@ self: super: # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch ]; - buildInputs = commonBuildInputs ++ [ libdrm libxcvt mesa ]; + buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; @@ -972,6 +972,7 @@ self: super: buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; + patches = [ ./use_crocus_and_iris.patch ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 62509a1c92c..f2f7d14ddfa 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -86,7 +86,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/use_crocus_and_iris.patch b/pkgs/servers/x11/xorg/use_crocus_and_iris.patch new file mode 100644 index 00000000000..54744f463bd --- /dev/null +++ b/pkgs/servers/x11/xorg/use_crocus_and_iris.patch @@ -0,0 +1,28 @@ +--- a/src/uxa/intel_dri.c ++++ b/src/uxa/intel_dri.c +@@ -1540,8 +1540,10 @@ + return has_i830_dri() ? "i830" : "i915"; + else if (INTEL_INFO(intel)->gen < 040) + return "i915"; ++ else if (INTEL_INFO(intel)->gen < 0100) ++ return "crocus"; + else +- return "i965"; ++ return "iris"; + } + + return s; +--- a/src/sna/sna_dri2.c ++++ b/src/sna/sna_dri2.c +@@ -3707,8 +3707,10 @@ + return has_i830_dri() ? "i830" : "i915"; + else if (sna->kgem.gen < 040) + return "i915"; ++ else if (sna->kgem.gen < 0100) ++ return "crocus"; + else +- return "i965"; ++ return "iris"; + } + + return s; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index e24397773d5..39b237c542e 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-e/pV2W9POUxKhuX5RT9INEqneC65V4dg66ywTR9YUyI="; + hash = "sha256-6xSFnaKUE2YtyeeaKenRbD479N1Pv/tBu4YO8mFwJxU="; }; - npmDepsHash = "sha256-sHXTwT5gXi5CkfMU/eZDMgsX2qymMhvUEtfUo6MV3hA="; + npmDepsHash = "sha256-h577FK84UhfZ2HVbwf1XOMyMBS7qfsRJFte05zUZ0bk="; nativeBuildInputs = [ python3 diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 32185663e13..2db3697f1a2 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-vpYBgDX0CxTNphmdwrI56AtlPlf2DGf3BZ+jWwdanpw="; + sha256 = "sha256-G6tpPkB31nHdMzmHNp2w85rp0O08/ynrirWJTqVSmjE="; }; - vendorHash = "sha256-Qi2fkAdO0clpKowSdoxyanIB65oagqEnw5gCqVHPJb0="; + vendorHash = "sha256-mz03GysUI64RiAChgIjyKORcW+WRbYIxbdICDBQGoBk="; subPackages = [ "./cmd/carapace" ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a5f9ae2f94e..e1355062ddc 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -16,43 +16,45 @@ , Security , nghttp2 , libgit2 -, withExtraFeatures ? true +, doCheck ? true +, withDefaultFeatures ? true +, additionalFeatures ? (p: p) , testers , nushell , nix-update-script }: -rustPlatform.buildRustPackage rec { - pname = "nushell"; - version = "0.75.0"; +rustPlatform.buildRustPackage ( + let + version = "0.76.0"; + pname = "nushell"; + in { + inherit version pname; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI="; + sha256 = "sha256-dGsnbKsg0nQFFXZDRDei2uGhGWEQSeSHGpXJp+8QUC8="; }; - cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw="; - - # enable pkg-config feature of zstd - cargoPatches = [ ./zstd-pkg-config.patch ]; + cargoSha256 = "sha256-9oXMojQA4tSoIxY1lwMPGhQz3WHcxEKtwl+4LsAYbDo="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ] + ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ] - ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - buildFeatures = lib.optional withExtraFeatures "extra"; + buildFeatures = additionalFeatures [ (lib.optional withDefaultFeatures "default") ]; # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths # outside of TMPDIR - doCheck = ! stdenv.isDarwin; + doCheck = doCheck && !stdenv.isDarwin; checkPhase = '' runHook preCheck @@ -76,4 +78,4 @@ rustPlatform.buildRustPackage rec { }; updateScript = nix-update-script { }; }; -} +}) diff --git a/pkgs/shells/nushell/zstd-pkg-config.patch b/pkgs/shells/nushell/zstd-pkg-config.patch deleted file mode 100644 index 280db6c2e6b..00000000000 --- a/pkgs/shells/nushell/zstd-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 7376ffe6a..a7d3335cc 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2751,6 +2751,7 @@ dependencies = [ - "which", - "windows", - "winreg", -+ "zstd", - ] - - [[package]] -@@ -5881,4 +5882,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] -diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml -index d293f3e39..a462d67dc 100644 ---- a/crates/nu-command/Cargo.toml -+++ b/crates/nu-command/Cargo.toml -@@ -93,6 +93,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] } - rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } - sqlparser = { version = "0.23.0", features = ["serde"], optional = true } - -+zstd = { version = "*", features = [ "pkg-config" ] } -+ - [target.'cfg(windows)'.dependencies] - winreg = "0.10.1" - diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 879d8942835..59363870ab2 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-02-23"; + version = "2023-03-04"; pname = "oh-my-zsh"; - rev = "8a008e1f51d451db21232edd6f1709e6c5ea334e"; + rev = "6f3304f442afde6e1cf3e7e8641a405d29d2e73d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "GXrDcM3MMDLHJ64xyyiORK6UPepFPaNbaZ5rNmV4zlk="; + sha256 = "z6qISMvMqAjnKNH55zH5J7uQksUmm1eibSj0nkbcu9k="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 8956b54932a..06719648847 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.13.1"; + version = "4.13.2"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NGm5uM85ThVBSnwMF//drr4GBiYv5JXZU6ZmbjQ2fLU="; + sha256 = "sha256-mCztJ35HTsbN7Uv6ivnAC6+CAPBt8lujNci2HD1oax4="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index 249cb1b5154..3714f0ee364 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-FgTCdSSDp8pvscRUD4vVk/peoCI4e9FPoCuHP25wxXA="; + sha256 = "sha256-q3OSypjqAc+ul0kF6f3u+wnFyNEm4AKwyPBwQzlVzYU="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 0bfbd9cd4b7..d9417a4b8e8 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "23.02.0"; + version = "23.03.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "sha256-PGFYw7JbuYHOVycPlYcRItElcyuKEg2cGv4wn6In5Mo="; + sha256 = "sha256-merUZ0IQ/qmDkquGFjKvc4vJBj4Ff62JpWYOB67lAVY="; }; strictDeps = true; diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index e01664bab31..e9a481c94a7 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, backendStdenv, fetchFromGitHub , cmake, addOpenGLRunpath , cudatoolkit , cutensor @@ -35,13 +35,13 @@ let in { - cublas = stdenv.mkDerivation (commonAttrs // { + cublas = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cublas"; src = "${src}/cuBLASLt"; }); - cusolver = stdenv.mkDerivation (commonAttrs // { + cusolver = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cusolver"; src = "${src}/cuSOLVER"; @@ -49,7 +49,7 @@ in sourceRoot = "cuSOLVER/gesv"; }); - cutensor = stdenv.mkDerivation (commonAttrs // { + cutensor = backendStdenv.mkDerivation (commonAttrs // { pname = "cuda-library-samples-cutensor"; src = "${src}/cuTENSOR"; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 8f547a9501b..e9bd772a94d 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.212"; + version = "1.217"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-ePWWBbMLXWZABztKeVV0nIfLfyO+9oBiSRNShbmOObw="; + sha256 = "sha256-oiHY0ZylhPKrC3dZS760J6LSjzP6y7UiXGAmUp9idMI="; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/tools/X11/xborders/default.nix new file mode 100644 index 00000000000..f9e78034c3c --- /dev/null +++ b/pkgs/tools/X11/xborders/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3Packages +, fetchFromGitHub +, libwnck +, gtk3 +, libnotify +, wrapGAppsHook +, gobject-introspection +, substituteAll +}: + +python3Packages.buildPythonPackage rec { + pname = "xborders"; + version = "3.4"; # in version.txt + + src = fetchFromGitHub { + owner = "deter0"; + repo = "xborder"; + rev = "e74ae532b9555c59d195537934fa355b3fea73c5"; + hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4="; + }; + + buildInputs = [ + libwnck + gtk3 + libnotify + ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + requests + pygobject3 + ]; + + postPatch = let + setup = substituteAll { + src = ./setup.py; + desc = meta.description; # "description" is reserved + inherit pname version; + }; + in '' + ln -s ${setup} setup.py + ''; + + meta = with lib; { + description = "Active window border replacement for window managers"; + homepage = "https://github.com/deter0/xborder"; + license = licenses.unlicense; + maintainers = with maintainers; [ elnudev ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xborders/setup.py b/pkgs/tools/X11/xborders/setup.py new file mode 100644 index 00000000000..a002625fa06 --- /dev/null +++ b/pkgs/tools/X11/xborders/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup + +setup( + name='@pname@', + version='@version@', + author='deter0', + description='@desc@', + install_requires=['pycairo', 'requests', 'PyGObject'], + scripts=[ + 'xborders', + ], +) diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/tools/X11/xnotify/default.nix index dd153adfa73..e5c6c31e7db 100644 --- a/pkgs/tools/X11/xnotify/default.nix +++ b/pkgs/tools/X11/xnotify/default.nix @@ -8,7 +8,6 @@ , libXft , libXinerama , conf ? null -, nix-update-script }: stdenv.mkDerivation rec { @@ -18,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "phillbush"; repo = "xnotify"; - rev = "58c7d5763c3fb1c32a76560c85d20a25f59d4687"; - sha256 = "sha256-BSZesuBGAWYp3IMiiZi6CAyZEiz3sBJLQe6/JnxviLs="; + rev = "v${version}"; + hash = "sha256-RfnmiAEFTPqQZursyVPDIZ6J3KBouvaaxyhTc1liqBc="; }; buildInputs = [ @@ -40,8 +39,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - passthru.updateScript = nix-update-script { }; - meta = with lib; { description = "A tool to read notifications from stdin and pop them up on the screen"; longDescription = '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 72cb79388cf..e51d5f386b1 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -20,6 +20,7 @@ , librsvg , libvpx , libwebp +, lz4 , nv-codec-headers-10 , nvidia_x11 ? null , pam @@ -68,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.3"; + version = "4.4.3"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A="; + hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8="; }; patches = [ @@ -122,6 +123,7 @@ in buildPythonApplication rec { librsvg libvpx libwebp + lz4 pam pango x264 diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch index fecc7e8130d..510b40422a2 100644 --- a/pkgs/tools/X11/xpra/fix-122159.patch +++ b/pkgs/tools/X11/xpra/fix-122159.patch @@ -1,16 +1,16 @@ diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 6def9e0ad..031f8aba9 100755 +index 031a41f9e..6232ba830 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): - "shadow", - ) and not display_is_remote: - if use_systemd_run(options.systemd_run): -- #make sure we run via the same interpreter, -- #inject it into the command line if we have to: - argv = list(cmdline) -- if argv[0].find("python")<0: -- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) - return systemd_run_wrap(mode, argv, options.systemd_run_args) +@@ -377,11 +377,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): + "seamless", "desktop", "shadow", "expand", + "upgrade", "upgrade-seamless", "upgrade-desktop", + ) and not display_is_remote and use_systemd_run(options.systemd_run): +- #make sure we run via the same interpreter, +- #inject it into the command line if we have to: + argv = list(cmdline) +- if argv[0].find("python")<0: +- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) + return systemd_run_wrap(mode, argv, options.systemd_run_args) configure_env(options.env) configure_logging(options, mode) diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index aee47a6ad53..be9438f2616 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -1,26 +1,3 @@ -diff --git a/setup.py b/setup.py -index fc67abb50a..c29db3a6d2 100755 ---- a/setup.py -+++ b/setup.py -@@ -2348,17 +2348,7 @@ if v4l2_ENABLED: - break - constants_pxi = "xpra/codecs/v4l2/constants.pxi" - if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi): -- ENABLE_DEVICE_CAPS = 0 -- if os.path.exists(videodev2_h): -- try: -- with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h, -- shell=True) as proc: -- ENABLE_DEVICE_CAPS = proc.wait()==0 -- except OSError: -- with open(videodev2_h) as f: -- hdata = f.read() -- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0) -- print("failed to detect device caps, assuming off") -+ ENABLE_DEVICE_CAPS = 1 - with open(constants_pxi, "wb") as f: - f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS) - add_cython_ext("xpra.codecs.v4l2.pusher", diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py index d5c1c8bb10..88c77e8142 100755 --- a/xpra/x11/fakeXinerama.py diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 909b793cc62..d998abed7fc 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.150"; + version = "3.0.152"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-NzdE3s3DKeh7/EG6Pvf6I2nU2ZfhUtRZIlW1+6cI2jc="; + sha256 = "sha256-n6S9ul9yD63l8Ge9Cs6QonRvvNxdke3u3P8TQOx5Z98="; }; - vendorHash = "sha256-GVx0mgpbftyy9Eni3IYFmvWcaGnm5Nuqh4KvGeqhVu4="; + vendorHash = "sha256-Z8MDLUMgehoDEEBB2A5QWHGPqX5xt/16afa9T4v6kkQ="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/aws-assume-role/default.nix b/pkgs/tools/admin/aws-assume-role/default.nix new file mode 100644 index 00000000000..7a09c8d2571 --- /dev/null +++ b/pkgs/tools/admin/aws-assume-role/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildGoPackage +}: + +buildGoPackage rec { + pname = "aws-assume-role"; + version = "0.3.2"; + + outputs = [ "out" "doc" ]; + + goPackagePath = "github.com/remind101/assume-role"; + + src = fetchFromGitHub { + owner = "remind101"; + repo = "assume-role"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7+9qi9lYzv1YCFhUyla+5Gqs5nBUiiazhFwiqHzMFd4="; + }; + + postInstall = '' + install -Dm444 -t $out/share/doc/$name ./go/src/${goPackagePath}/README.md + ''; + + meta = with lib; { + description = "Easily assume AWS roles in your terminal."; + homepage = "https://github.com/remind101/assume-role"; + license = licenses.bsd2; + mainProgram = "assume-role"; + maintainers = with lib.maintainers; [ williamvds ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 35221b3fb5b..5d228e93f11 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "aws-rotate-key"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Fullscreen"; repo = "aws-rotate-key"; rev = "v${version}"; - sha256 = "sha256-5kV87uQDSc/qpm79Pd2nXo/EcbMlhZqFYaw+gJQa2uo="; + sha256 = "sha256-PZ7+GC4P4bkT+DWOhW70KkhUCUjn4gIG+OKoOBSc/8c="; }; - vendorSha256 = "sha256-h7tmJx/Um1Cy/ojiFjoKCH/LcOwhGU8ADb5WwmrkkJM="; + vendorHash = "sha256-Asfbv7avT+L8/WNQ6NS7gFcjA9MiTCu5PzsuA/PT6/k="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 420149b51f9..01bd791d878 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.10.3"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.10.4"; # 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-ogwJTsd2xrWp54utcyG1QO7hGxBC6S4hVlmmGESyPBQ="; + hash = "sha256-NXsXAyxlhW63vWP7oBh2hh0G+KjmGAZVRSdRUac+lgk="; }; postPatch = '' diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4192811b7d5..0e890270a52 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-ddxEtBw6JcSsZCN5uKyuBMVkWwSoThfxrcvHZGZzFr4="; + hash = "sha256-UiZfp1bX/Eul5x31oBln5P9KMT2oFwawQqDs9udZUxY="; }; postPatch = '' @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/containers/bubblewrap/releases/tag/${src.rev}"; description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix new file mode 100644 index 00000000000..115800fcf2c --- /dev/null +++ b/pkgs/tools/admin/cdist/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonApplication +, fetchFromGitea +, pythonImportsCheckHook +, sphinxHook +, sphinx-rtd-theme +}: + +buildPythonApplication rec { + pname = "cdist"; + version = "7.0.0"; + outputs = [ "out" "man" "doc" ]; + + src = fetchFromGitea { + domain = "code.ungleich.ch"; + owner = "ungleich-public"; + repo = "cdist"; + rev = version; + hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinx-rtd-theme + ]; + + sphinxRoot = "docs/src"; + + # "make man" creates symlinks in docs/src needed by sphinxHook. + postPatch = '' + echo "VERSION = '$version'" > cdist/version.py + + make man + ''; + + preConfigure = '' + export HOME=/tmp + ''; + + # Test suite requires either non-chrooted environment or root. + # + # When "machine_type" explorer figures out that it is running inside + # chroot, it assumes that it has enough privileges to escape it. + doCheck = false; + + pythonImportsCheck = [ "cdist" ]; + + postInstall = '' + mkdir -p $out/share + mv docs/dist/man $out/share + ''; + + meta = with lib; { + description = "Minimalistic configuration management system"; + homepage = "https://www.sdi.st"; + changelog = "https://code.ungleich.ch/ungleich-public/cdist/src/tag/${version}/docs/changelog"; + + # Mostly. There are still couple types that are gpl3-only. + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kaction ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index c1cbadeaa5f..62e93061fb1 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0SiHJ86fW4QahIBfcFD7FJONbN4ImYyF7yqw3URmcd8="; + sha256 = "sha256-asNzvHpDqKuLPy+TgjaiCZ96A/dy6em5EGmVRvyd1YU="; }; CGO_ENABLED = 0; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 230ce913b59..2cab2ad4b74 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cli53"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "barnybug"; repo = "cli53"; rev = version; - sha256 = "sha256-N7FZfc3kxbMY2ooj+ztlj6xILF3gzT60Yb/puWg58V4="; + sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8="; }; vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s="; diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index 3717550846c..6ff4f443982 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "coldsnap"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-+JQjJ4F++S3eLnrqV1v4leepOvZBf8Vp575rnlDx2Cg="; + hash = "sha256-kL9u+IBlC9Pxm5yaJagY9dy0Pm0xlKfVxFVBmwDMSak="; }; - cargoHash = "sha256-mAnoe9rK4+OpCzD7tzV+FQz+fFr8NapzsXtON3lS/tk"; + cargoHash = "sha256-eYBmke0FQ9CK3cCaM7ecmp1vkNlZO3SHRnxFzmelYhU="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index dee610f3b6f..7460139a4bc 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lhg3ZOCv5FlMh2FI92s8OR1XugkX0occv0ku7MKhL+8="; + sha256 = "sha256-pmP1PqkLq5rkod896oRsSY3UX6q7F4kVREw8R+mLf2Y="; }; - vendorHash = "sha256-rxnVNAgLOVBshm6tKOfqspOy+rQP7M22+Q3HnWBVjr8="; + vendorHash = "sha256-jvK4xI0Pvv0ed6uSmfXltUkVmG4RqId4zEI9JFDzoBQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index f694cb935b4..f75baff338f 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "drawterm"; - version = "unstable-2021-10-02"; + version = "unstable-2023-03-05"; src = fetchgit { url = "git://git.9front.org/plan9front/drawterm"; - rev = "c6f547e1a46ebbf7a290427fe3a0b66932d671a0"; - sha256 = "09v2vk5s23q0islfz273pqy696zhzh3gqi25hadr54lif0511wsl"; + rev = "ed9cff5a4c39322744c4708699c9ae6651b7c9ab"; + sha256 = "LM6UnggoxKC3e6xOlHYk9VFF99Abbdmp37nuUML8RgI="; }; buildInputs = [ diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index e7ac6d7426d..fae0ce1f7b9 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: buildGoModule rec { pname = "ejson2env"; @@ -14,9 +14,15 @@ buildGoModule rec { vendorSha256 = "sha256-agWcD8vFNde1SCdkRovMNPf+1KODxV8wW1mXvE0w/CI="; ldflags = [ + "-s" + "-w" "-X main.version=${version}" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; homepage = "https://github.com/Shopify/ejson2env"; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6c090a11b34..b00d8327b41 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.130.0"; + version = "0.132.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-SJI9EB0k45SJmWQ/pivlZMQdiE237vpLwNB2Y33ntrw="; + sha256 = "sha256-wKTESd+YKJd94yUuqm1v4biyGCABbhwTlKLzbiOg6H0="; }; - vendorHash = "sha256-wrt8Mtek74ljCgp1Sxi/jKxCv61H7HqCLHXKrwS7ex4="; + vendorHash = "sha256-A06vwsadznqe1xraMZnseRAJkrpCdciKBxPUBus39ws="; doCheck = false; diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix new file mode 100644 index 00000000000..deec03e582c --- /dev/null +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -0,0 +1,106 @@ +{ lib +, python3 +, fetchFromGitHub +, nix-update-script +, testers +, gimme-aws-creds +}: + +let + python = python3.override { + packageOverrides = self: super: { + fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec { + version = "0.9.3"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw="; + }; + }); + + okta = super.okta.overridePythonAttrs (oldAttrs: rec { + version = "0.0.4"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-U+eSxo02hP9BQLTLHAKvOCEJA2j4EQ/eVMC9tjhEkzI="; + }; + propagatedBuildInputs = [ + self.six + self.python-dateutil + self.requests + ]; + pythonImportsCheck = [ "okta" ]; + doCheck = false; # no tests were included with this version + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "gimme-aws-creds"; + version = "2.5.0"; # N.B: if you change this, check if overrides are still up-to-date + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Nike-Inc"; + repo = "gimme-aws-creds"; + rev = "v${version}"; + hash = "sha256-rU4guBXRRJOG3/JilvEF9DwXM5z2IUV80qj3YcV8Z/I="; + }; + + nativeBuildInputs = with python.pkgs; [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "configparser" + ]; + + propagatedBuildInputs = with python.pkgs; [ + boto3 + fido2 + beautifulsoup4 + ctap-keyring-device + requests + okta + ]; + + checkInputs = with python.pkgs; [ + pytestCheckHook + nose + responses + ]; + + disabledTests = [ + "test_build_factor_name_webauthn_registered" + ]; + + pythonImportsCheck = [ + "gimme_aws_creds" + ]; + + postInstall = '' + rm $out/bin/gimme-aws-creds.cmd + chmod +x $out/bin/gimme-aws-creds + ''; + + passthru = { + inherit python; + updateScript = nix-update-script { + attrPath = pname; + }; + tests.version = testers.testVersion { + package = gimme-aws-creds; + command = ''touch tmp.conf && OKTA_CONFIG="tmp.conf" gimme-aws-creds --version''; + version = "gimme-aws-creds ${version}"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/Nike-Inc/gimme-aws-creds"; + changelog = "https://github.com/Nike-Inc/gimme-aws-creds/releases"; + description = "A CLI that utilizes Okta IdP via SAML to acquire temporary AWS credentials"; + license = licenses.asl20; + maintainers = with maintainers; [ dennajort ]; + }; +} diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index d1010fcec62..a0ff00aafc9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -162,9 +162,10 @@ let cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json ''; nativeBuildInputs = [ - autoPatchelfHook python3 stdenv.cc.cc + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; passthru = { dependencies = filterForSystem dependencies; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index aab033b0ee2..8a13936f10e 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.10.0"; + version = "4.10.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FT1cXnMyMrEpZpTMp+kE8ueHReAYf2XQZ/9Nw53TYbg="; + sha256 = "sha256-+bMxZ/ga3LLlZmjfysP/FXiLFokAyagkmds/js3HCzs="; }; - vendorSha256 = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; + vendorHash = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; doCheck = false; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index a83d96779de..2025b4290dc 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,11 +14,11 @@ let pname = "pgadmin"; - version = "6.19"; + version = "6.20"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI="; + sha256 = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU="; }; yarnDeps = mkYarnModules { diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index 462d82e2134..f43473b081c 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -150,6 +150,7 @@ "react-draggable": "^4.4.4", "react-dropzone": "^14.2.1", "react-leaflet": "^3.2.2", + "react-resize-detector": "^8.0.3", "react-rnd": "^10.3.5", "react-router-dom": "^6.2.2", "react-select": "^4.2.1", @@ -164,6 +165,8 @@ "styled-components": "^5.2.1", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", + "uplot": "^1.6.24", + "uplot-react": "^1.1.4", "valid-filename": "^2.0.1", "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", "wkx": "^0.5.0", @@ -188,7 +191,7 @@ "pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web", "auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html", "auditjs": "yarn audit --groups dependencies", - "auditpy": "safety check --full-report -i 40493 -i 51668", + "auditpy": "safety check --full-report -i 51668 -i 52495", "audit": "yarn run auditjs && yarn run auditpy" } } diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index df20a984a8f..f506196c204 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -8609,6 +8609,13 @@ react-property@2.0.0: resolved "https://registry.yarnpkg.com/react-property/-/react-property-2.0.0.tgz#2156ba9d85fa4741faf1918b38efc1eae3c6a136" integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== +react-resize-detector@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz#dab4470aae23bb07deb857230ccf945d000ef99b" + integrity sha512-c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA== + dependencies: + lodash "^4.17.21" + react-rnd@^10.3.5: version "10.3.7" resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.7.tgz#037ce277e6c5e682989b51278e44a6ba299990af" @@ -10084,9 +10091,9 @@ typescript@^3.2.2: integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== + version "0.7.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" + integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== uglify-js@^3.1.4: version "3.17.4" @@ -10192,6 +10199,16 @@ update-browserslist-db@^1.0.9: escalade "^3.1.1" picocolors "^1.0.0" +uplot-react@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz#02b9918a199da9983fc0d375fb44e443749e2ac0" + integrity sha512-qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ== + +uplot@^1.6.24: + version "1.6.24" + resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz#dfa213fa7da92763261920ea972ed1a5f9f6af12" + integrity sha512-WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index d4c5e2c7b1c..0dc8367c7ca 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -9224,6 +9224,14 @@ }; } { + name = "react_resize_detector___react_resize_detector_8.0.3.tgz"; + path = fetchurl { + name = "react_resize_detector___react_resize_detector_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz"; + sha512 = "c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA=="; + }; + } + { name = "react_rnd___react_rnd_10.3.7.tgz"; path = fetchurl { name = "react_rnd___react_rnd_10.3.7.tgz"; @@ -10912,11 +10920,11 @@ }; } { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.33.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; + name = "ua_parser_js___ua_parser_js_0.7.33.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; + sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; }; } { @@ -11048,6 +11056,22 @@ }; } { + name = "uplot_react___uplot_react_1.1.4.tgz"; + path = fetchurl { + name = "uplot_react___uplot_react_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz"; + sha512 = "qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ=="; + }; + } + { + name = "uplot___uplot_1.6.24.tgz"; + path = fetchurl { + name = "uplot___uplot_1.6.24.tgz"; + url = "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz"; + sha512 = "WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg=="; + }; + } + { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 3b35207e849..fa31ac964ff 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.49.0"; + version = "0.50.3"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0="; + hash = "sha256-kvIY6BBkyV5TmpT8bhrn+OIP3/rbCy0EKxsFLIIFp8U="; }; - vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA="; + vendorHash = "sha256-595Z6/jt+d81QMIKcbg7Y5UMtF8hnZipiBkt1LQt2AI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 079cff0dc32..8cd06a6fc1c 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.37.3"; + version = "0.38.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fndA2rApDXwKeQEQ9Vy/9iJBJPcRWt+yJfvRdNDOwZU="; + sha256 = "sha256-b5HKYZOitn8opqlrgULEYU6fsmQjWKEHRyM0GwLH9jk="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorHash = "sha256-91UPIz5HM82d6s8kHEb9w/vLQgXmoV8fIcbRyXDMNL8="; + vendorHash = "sha256-HBmQOd6uihGJULnHYU+biXRUYJkpL2Dw7S9EswqsbNs="; excludedPackages = "misc"; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index c0c60aa1cde..6268a7826e5 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cabextract"; - version = "1.9.1"; + version = "1.11"; src = fetchurl { url = "https://www.cabextract.org.uk/cabextract-${version}.tar.gz"; - sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; + sha256 = "sha256-tVRtsRVeTHGP89SyeFc2BPMN1kw8W/1GV80Im4I6OsY="; }; # Let's assume that fnmatch works for cross-compilation, otherwise it gives an error: diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix index f3a94006873..c759a7ac07f 100644 --- a/pkgs/tools/archivers/snzip/default.nix +++ b/pkgs/tools/archivers/snzip/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snzip"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "kubo"; repo = "snzip"; - rev = version; - sha256 = "1v8li1zv9f2g31iyi9y9zx42rjvwkaw221g60pmkbv53y667i325"; + rev = "v${version}"; + hash = "sha256-trxCGVNw2MugE7kmth62Qrp7JZcHeP1gdTZk32c3hFg="; }; buildInputs = [ snappy ]; diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/tools/audio/pw-volume/default.nix index ddd9f4aa1a2..1a7b6c21a50 100644 --- a/pkgs/tools/audio/pw-volume/default.nix +++ b/pkgs/tools/audio/pw-volume/default.nix @@ -1,35 +1,27 @@ { lib -, fetchFromGitHub -, fetchurl , rustPlatform +, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "pw-volume"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "smasher164"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u7Ct9Kfwld/h3b6hUZdfHNuDGE4NA3MwrmgUj4g64lw="; + sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0="; }; - cargoPatches = [ - (fetchurl { - # update Cargo.lock - url = "https://github.com/smasher164/pw-volume/commit/be104eaaeb84def26b392cc44bb1e7b880bef0fc.patch"; - sha256 = "sha256-gssRcKpqxSAvW+2kJzIAR/soIQ3xg6LDZ7OeXds4ulY="; - }) - ]; - - cargoSha256 = "sha256-Vzd5ZbbzJh2QqiOrBOszsNqLwxM+mm2lbGd5JtKZzEM="; + cargoSha256 = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew="; meta = with lib; { description = "Basic interface to PipeWire volume controls"; homepage = "https://github.com/smasher164/pw-volume"; + changelog = "https://github.com/smasher164/pw-volume/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro figsoda ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 7bc9805117b..16317214541 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gf2sqMI8dG7+sVSqe2f5oG7vqQ9UDKAqPUS+MPVB7SI="; + sha256 = "sha256-jlCCARbZSAHK0ojlTdtUl7fo+MAtuQYo64lZeKyQ9ho="; }; - vendorHash = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; + vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index c5621ed7599..439d40022a0 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-1jhI1pWsFcHM/BF4knUzFLy5IyqFLEDjLMqIwOkYl4o="; + sha256 = "sha256-bgi8vmpKsHDhfp6cTpvE6UTS5b03ZSHKNCxv6WogaH0="; }; # libtool.m4 only matches macOS 10.* diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index dcc4caaa636..18b0f750796 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.7.6"; + version = "1.7.8"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-TNh0laNAyHkIZLC51hzchSIDvsHst2aPxoRdI6Mdr84="; + sha256 = "sha256-+lYyCPKgaWZPUkIGjgmBES6vg1ZbgZ5b6WKmpqAcyhM="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; @@ -34,11 +34,13 @@ python3Packages.buildPythonApplication rec { mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ + # there is another "sleep", so choose the one with the space after it + # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544 substitute sample/systemd/borgmatic.service \ $out/lib/systemd/system/borgmatic.service \ --replace /root/.local/bin/borgmatic $out/bin/borgmatic \ --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \ - --replace sleep ${coreutils}/bin/sleep + --replace "sleep " "${coreutils}/bin/sleep " ''; passthru.tests.version = testers.testVersion { package = borgmatic; }; diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 29793f1a63d..559fcf2a0ff 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic-rs"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "v${version}"; - hash = "sha256-xNevH/a1i5nrwv3bQVbr5JCuOKPu/hmQ8UZMZXBAiFw="; + hash = "sha256-irN5enJ0nyyzrLvnLXm7YhyEJ3nz9PQukzAfUrKmOzY="; }; - cargoHash = "sha256-DaMtLtsGm3Vy3l7GtfcWclTiuSezQp6Lw8GbZt7Vdto="; + cargoHash = "sha256-wJuWeoS45ikP12S2o6aB2Iogw5HomXzCIjkFbp3rSR4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 159be4e14b6..d56cfdf86c8 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }: +{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract3 }: stdenv.mkDerivation rec { pname = "vobsub2srt"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ]; - propagatedBuildInputs = [ tesseract ]; + propagatedBuildInputs = [ tesseract3 ]; meta = { homepage = "https://github.com/ruediger/VobSub2SRT"; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index fd98747d2fd..112b9f58064 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.17.1"; + version = "1.17.2"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-7bSYkUTSj3Wv/E9bGAdPuXpY1u41rWkZrHXraky/41I="; + sha256 = "sha256-XyxQpwuNWMAluB+/Nk+tQy0VSTZjDOACPMiLqo1codA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index e1edac0c610..81aa2630506 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.21.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8="; + hash = "sha256-lNB7fZwIOXA4bryftHFZlAa6kJldouxCf00h7J7qQM0="; }; - cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM="; + cargoHash = "sha256-NQqipHJXvbDMO8kUMKnzEdz7atPYcjj7/uf3PSXZy0A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 176cdc76ee0..fe2c8bdf560 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -4,6 +4,7 @@ , cmake , qtbase , qttools +, qtwayland , wrapQtAppsHook , gitUpdater }: @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ qtbase qttools ] + ++ lib.optionals stdenv.isLinux [ qtwayland ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index f9766650ec4..3d1a9aa6607 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,7 +1,8 @@ { lib , mkDerivation , variant ? "standalone" -, fetchFromGitHub +, fetchzip +, fetchpatch , cmake , pkg-config , ninja @@ -16,7 +17,6 @@ , curl , gimp ? null , gmic -, cimg , qtbase , qttools , writeShellScript @@ -54,13 +54,21 @@ mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; version = "3.2.1"; - src = fetchFromGitHub { - owner = "c-koi"; - repo = "gmic-qt"; - rev = "v.${version}"; - sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w="; + src = fetchzip { + url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; + hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4="; }; + patches = [ + (fetchpatch { + name = "gmic-qt-3.2.1-fix-system-gmic.patch"; + url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch"; + hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo="; + }) + ]; + + sourceRoot = "source/gmic-qt"; + nativeBuildInputs = [ cmake pkg-config @@ -69,7 +77,6 @@ mkDerivation rec { buildInputs = [ gmic - cimg qtbase qttools fftw @@ -85,7 +92,8 @@ mkDerivation rec { cmakeFlags = [ "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" - "-DENABLE_SYSTEM_GMIC:BOOL=ON" + "-DENABLE_SYSTEM_GMIC=ON" + "-DENABLE_DYNAMIC_LINKING=ON" ]; postPatch = '' @@ -108,8 +116,6 @@ mkDerivation rec { }; meta = with lib; { - # Broken since 3.2.0 update, cannot handle system gmic and cimg. - broken = true; description = variants.${variant}.description; homepage = "http://gmic.eu/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 52499196bba..68d07ed734b 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , fetchurl , cmake , ninja @@ -37,6 +38,14 @@ stdenv.mkDerivation rec { hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI="; }; + patches = [ + (fetchpatch { + name = "gmic-3.2.1-fix-system-gmic.patch"; + url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch"; + hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo="; + }) + ]; + # TODO: build this from source # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729 gmic_stdlib = fetchurl { diff --git a/pkgs/tools/misc/as-tree/cargo-lock.patch b/pkgs/tools/misc/as-tree/cargo-lock.patch deleted file mode 100644 index f7a06c050d2..00000000000 --- a/pkgs/tools/misc/as-tree/cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 991ecd8..9e94574 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -11,7 +11,7 @@ dependencies = [ - - [[package]] - name = "as-tree" --version = "0.11.1" -+version = "0.12.0" - dependencies = [ - "ansi_term", - "atty", diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix index 4b2ce65d3db..3b0c7c270db 100644 --- a/pkgs/tools/misc/as-tree/default.nix +++ b/pkgs/tools/misc/as-tree/default.nix @@ -1,27 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "as-tree"; - version = "0.12.0"; + version = "unstable-2021-03-09"; src = fetchFromGitHub { owner = "jez"; repo = pname; - rev = version; - sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5"; + rev = "0036c20f66795774eb9cda3ccbae6ca1e1c19444"; + sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk="; }; - cargoSha256 = "1m334shcja7kg134b7lnq1ksy67j5b5vblkzamrw06f6r1hkn1rc"; - # the upstream 0.12.0 release didn't update the Cargo.lock file properly - # they have updated their release script, so this patch can be removed - # when the next version is released. - cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM="; meta = with lib; { description = "Print a list of paths as a tree of paths"; homepage = "https://github.com/jez/as-tree"; license = with licenses; [ blueOak100 ]; maintainers = with maintainers; [ jshholland ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 9d3de4aaa5f..a1f7df1d459 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -6,21 +6,22 @@ , libiconv , Security , SystemConfiguration +, xvfb-run , nixosTests }: rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "12.0.0"; + version = "13.0.1"; src = fetchFromGitHub { owner = "ellie"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kt0Xu95E3MayUybSh1mU5frJoU7BF41Hnjqqrz/cVHE="; + hash = "sha256-yNn67lceg1XA72LDRRjCgSsKfEN/P5VUAnKO//ru0nc="; }; - cargoSha256 = "sha256-WAAelEFtHlFGDk0AI381OS5bxN58Z46kyMAuL+XX/Ac="; + cargoHash = "sha256-oIK2upvAapYU6WkoWjiwcmq57TDbDBTc+2OjsMdv23E="; nativeBuildInputs = [ installShellFiles ]; @@ -33,6 +34,16 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/atuin gen-completions -s zsh) ''; + nativeCheckInputs = lib.optionals xvfb-run.meta.available [ + xvfb-run + ]; + + checkPhase = lib.optionalString xvfb-run.meta.available '' + runHook preCheck + xvfb-run cargo test + runHook postCheck + ''; + passthru.tests = { inherit (nixosTests) atuin; }; @@ -41,6 +52,6 @@ rustPlatform.buildRustPackage rec { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/ellie/atuin"; license = licenses.mit; - maintainers = with maintainers; [ onsails SuperSandro2000 sciencentistguy ]; + maintainers = with maintainers; [ SuperSandro2000 sciencentistguy _0x4A6F ]; }; } diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index 90e34286d38..5857bea6251 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P3fDfv7SexrNMynZBbgwwZcH2H/t4bwFM4HULlLaiM4="; + sha256 = "sha256-c1C+uBo5PSH07VjulCxkmvfj7UYm6emdDAaN00uvAcg="; }; installPhase = '' diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index e82b13d12c6..e69161541ff 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, cmake, recode, perl, withOffensive ? false }: +{ lib, stdenv, fetchurl, cmake, recode, perl, rinutils, withOffensive ? false }: stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.14.1"; + version = "3.16.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-NnAj9dsB1ZUuTm2W8mPdK2h15Dtro8ve6c+tPoKUsXs="; + sha256 = "sha256-dkpkTBulXaN52BHaV4MWEIoQFkmWaG66O9Ppes/GLPo="; }; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake perl rinutils ]; buildInputs = [ recode ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 32e45bee903..084afb857c0 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.7.1"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5lN+57HMxPfCop2sTSldhv1TBEIaowavXvniwqnesOQ="; + sha256 = "sha256-RJQyR6nTvDvR+outbVDYKFC1Tl99O0SZW94e/SbqAO0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/grass-sass/default.nix b/pkgs/tools/misc/grass-sass/default.nix new file mode 100644 index 00000000000..c01d0270ca0 --- /dev/null +++ b/pkgs/tools/misc/grass-sass/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "grass"; + version = "0.12.3"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-qx63icK4g/5LqKUsJpXs2Jpv30RuvIeLF6JNrTTkcLs="; + }; + + cargoHash = "sha256-v2ikP+zujj6GWN1ZwPIKK0jtF8Na5PaR1ZNelGdLzMM="; + + # tests require rust nightly + doCheck = false; + + meta = with lib; { + description = "A Sass compiler written purely in Rust"; + homepage = "https://github.com/connorskees/grass"; + changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${replaceStrings [ "." ] [ "" ] version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/kb/default.nix b/pkgs/tools/misc/kb/default.nix new file mode 100644 index 00000000000..76db4d7deca --- /dev/null +++ b/pkgs/tools/misc/kb/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "kb"; + version = "0.1.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gnebbia"; + repo = pname; + rev = "v${version}"; + hash = "sha256-K8EAqZbl2e0h03fFwaKIclZTZARDQp1tRo44znxwW0I="; + }; + + postPatch = '' + # `attr` module is not available. And `attrs` defines another `attr` package + # that shadows it. + substituteInPlace setup.py \ + --replace \ + "install_requires=[\"colored\",\"toml\",\"attr\",\"attrs\",\"gitpython\"]," \ + "install_requires=[\"colored\",\"toml\",\"attrs\",\"gitpython\"]," + + # pytest coverage reporting isn't necessary + substituteInPlace setup.cfg \ + --replace \ + "addopts = --cov=kb --cov-report term-missing" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + colored + toml + attrs + gitpython + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A minimalist command line knowledge base manager"; + longDescription = '' + kb is a text-oriented minimalist command line knowledge base manager. kb + can be considered a quick note collection and access tool oriented toward + software developers, penetration testers, hackers, students or whoever has + to collect and organize notes in a clean way. Although kb is mainly + targeted on text-based note collection, it supports non-text files as well + (e.g., images, pdf, videos and others). + ''; + homepage = "https://github.com/gnebbia/kb"; + changelog = "https://github.com/gnebbia/kb/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wesleyjrz ]; + }; +} diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index acdbd6f0419..c1080457638 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - maintainers = with maintainers; [ dochang ma27 ]; + maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index ee76230dc55..e29afc59f66 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-xtQO9E5qt2g3JMXmqePnfEsvvOIlgZqAup9DkJJ0ClI="; + sha256 = "sha256-pBwlFkkXDgPhGfn2bhwuJTGQz+O0ADhPUU2Fogl98zA="; }; - vendorSha256 = "sha256-kfXan6LAVJ4ka34nP7ObAB2uISyQT9QrymOFFderdlQ="; + vendorSha256 = "sha256-XePJaXD83731r5CJG1PHnpU6s+443yq8mrqx7ZPU8Gs="; doCheck = false; diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix index 588e68c1b6e..266de2e8de3 100644 --- a/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix @@ -1642,67 +1642,67 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@mui/base-5.0.0-alpha.118" = { + "@mui/base-5.0.0-alpha.119" = { name = "_at_mui_slash_base"; packageName = "@mui/base"; - version = "5.0.0-alpha.118"; + version = "5.0.0-alpha.119"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.118.tgz"; - sha512 = "GAEpqhnuHjRaAZLdxFNuOf2GDTp9sUawM46oHZV4VnYPFjXJDkIYFWfIQLONb0nga92OiqS5DD/scGzVKCL0Mw=="; + url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz"; + sha512 = "XA5zhlYfXi67u613eIF0xRmktkatx6ERy3h+PwrMN5IcWFbgiL1guz8VpdXON+GWb8+G7B8t5oqTFIaCqaSAeA=="; }; }; - "@mui/core-downloads-tracker-5.11.9" = { + "@mui/core-downloads-tracker-5.11.11" = { name = "_at_mui_slash_core-downloads-tracker"; packageName = "@mui/core-downloads-tracker"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.9.tgz"; - sha512 = "YGEtucQ/Nl91VZkzYaLad47Cdui51n/hW+OQm4210g4N3/nZzBxmGeKfubEalf+ShKH4aYDS86XTO6q/TpZnjQ=="; + url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.11.tgz"; + sha512 = "0YK0K9GfW1ysw9z4ztWAjLW+bktf+nExMyn2+EQe1Ijb0kF2kz1kIOmb4+di0/PsXG70uCuw4DhEIdNd+JQkRA=="; }; }; - "@mui/icons-material-5.11.9" = { + "@mui/icons-material-5.11.11" = { name = "_at_mui_slash_icons-material"; packageName = "@mui/icons-material"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.9.tgz"; - sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw=="; + url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.11.tgz"; + sha512 = "Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw=="; }; }; - "@mui/material-5.11.10" = { + "@mui/material-5.11.11" = { name = "_at_mui_slash_material"; packageName = "@mui/material"; - version = "5.11.10"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.11.10.tgz"; - sha512 = "hs1WErbiedqlJIZsljgoil908x4NMp8Lfk8di+5c7o809roqKcFTg2+k3z5ucKvs29AXcsdXrDB/kn2K6dGYIw=="; + url = "https://registry.npmjs.org/@mui/material/-/material-5.11.11.tgz"; + sha512 = "sSe0dmKjB1IGOYt32Pcha+cXV3IIrX5L5mFAF9LDRssp/x53bluhgLLbkc8eTiJvueVvo6HAyze6EkFEYLQRXQ=="; }; }; - "@mui/private-theming-5.11.9" = { + "@mui/private-theming-5.11.11" = { name = "_at_mui_slash_private-theming"; packageName = "@mui/private-theming"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.9.tgz"; - sha512 = "XMyVIFGomVCmCm92EvYlgq3zrC9K+J6r7IKl/rBJT2/xVYoRY6uM7jeB+Wxh7kXxnW9Dbqsr2yL3cx6wSD1sAg=="; + url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.11.tgz"; + sha512 = "yLgTkjNC1mpye2SOUkc+zQQczUpg8NvQAETvxwXTMzNgJK1pv4htL7IvBM5vmCKG7IHAB3hX26W2u6i7bxwF3A=="; }; }; - "@mui/styled-engine-5.11.9" = { + "@mui/styled-engine-5.11.11" = { name = "_at_mui_slash_styled-engine"; packageName = "@mui/styled-engine"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.9.tgz"; - sha512 = "bkh2CjHKOMy98HyOc8wQXEZvhOmDa/bhxMUekFX5IG0/w4f5HJ8R6+K6nakUUYNEgjOWPYzNPrvGB8EcGbhahQ=="; + url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.11.tgz"; + sha512 = "wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg=="; }; }; - "@mui/system-5.11.9" = { + "@mui/system-5.11.11" = { name = "_at_mui_slash_system"; packageName = "@mui/system"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/system/-/system-5.11.9.tgz"; - sha512 = "h6uarf+l3FO6l75Nf7yO+qDGrIoa1DM9nAMCUFZQsNCDKOInRzcptnm8M1w/Z3gVetfeeGoIGAYuYKbft6KZZA=="; + url = "https://registry.npmjs.org/@mui/system/-/system-5.11.11.tgz"; + sha512 = "a9gaOAJBjpzypDfhbGZQ8HzdcxdxsKkFvbp1aAWZhFHBPdehEkARNh7mj851VfEhD/GdffYt85PFKFKdUta5Eg=="; }; }; "@mui/types-7.2.3" = { @@ -1714,13 +1714,13 @@ let sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw=="; }; }; - "@mui/utils-5.11.9" = { + "@mui/utils-5.11.11" = { name = "_at_mui_slash_utils"; packageName = "@mui/utils"; - version = "5.11.9"; + version = "5.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.9.tgz"; - sha512 = "eOJaqzcEs4qEwolcvFAmXGpln+uvouvOS9FUX6Wkrte+4I8rZbjODOBDVNlK+V6/ziTfD4iNKC0G+KfOTApbqg=="; + url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.11.tgz"; + sha512 = "neMM5rrEXYQrOrlxUfns/TGgX4viS8K2zb9pbQh11/oUUYFlGI32Tn+PHePQx7n6Fy/0zq6WxdBFC9VpnJ5JrQ=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1777,13 +1777,13 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@remix-run/router-1.3.2" = { + "@remix-run/router-1.3.3" = { name = "_at_remix-run_slash_router"; packageName = "@remix-run/router"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz"; - sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="; + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.3.tgz"; + sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w=="; }; }; "@rollup/plugin-babel-5.3.1" = { @@ -2227,13 +2227,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-18.14.2" = { + "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.2"; + version = "18.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; - sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; + sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; }; }; "@types/parse-json-4.0.0" = { @@ -2434,85 +2434,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.53.0" = { + "@typescript-eslint/eslint-plugin-5.54.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz"; - sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"; + sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw=="; }; }; - "@typescript-eslint/experimental-utils-5.53.0" = { + "@typescript-eslint/experimental-utils-5.54.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz"; - sha512 = "4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.54.0.tgz"; + sha512 = "rRYECOTh5V3iWsrOzXi7h1jp3Bi9OkJHrb3wECi3DVqMGTilo9wAYmCbT+6cGdrzUY3MWcAa2mESM6FMik6tVw=="; }; }; - "@typescript-eslint/parser-5.53.0" = { + "@typescript-eslint/parser-5.54.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz"; - sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"; + sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ=="; }; }; - "@typescript-eslint/scope-manager-5.53.0" = { + "@typescript-eslint/scope-manager-5.54.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz"; - sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"; + sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg=="; }; }; - "@typescript-eslint/type-utils-5.53.0" = { + "@typescript-eslint/type-utils-5.54.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz"; - sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"; + sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ=="; }; }; - "@typescript-eslint/types-5.53.0" = { + "@typescript-eslint/types-5.54.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz"; - sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"; + sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ=="; }; }; - "@typescript-eslint/typescript-estree-5.53.0" = { + "@typescript-eslint/typescript-estree-5.54.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz"; - sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"; + sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ=="; }; }; - "@typescript-eslint/utils-5.53.0" = { + "@typescript-eslint/utils-5.54.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.53.0.tgz"; - sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"; + sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw=="; }; }; - "@typescript-eslint/visitor-keys-5.53.0" = { + "@typescript-eslint/visitor-keys-5.54.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz"; - sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz"; + sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -3433,13 +3433,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001458" = { + "caniuse-lite-1.0.30001460" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001458"; + version = "1.0.30001460"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; - sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz"; + sha512 = "Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.4.0" = { @@ -4513,13 +4513,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-to-chromium-1.4.311" = { + "electron-to-chromium-1.4.320" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.311"; + version = "1.4.320"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz"; - sha512 = "RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz"; + sha512 = "h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q=="; }; }; "emittery-0.10.2" = { @@ -4900,13 +4900,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.4.2" = { + "esquery-1.5.0" = { name = "esquery"; packageName = "esquery"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"; - sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"; + sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="; }; }; "esrecurse-4.3.0" = { @@ -5989,13 +5989,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.1" = { + "is-array-buffer-3.0.2" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; + sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; }; }; "is-arrayish-0.2.1" = { @@ -6952,13 +6952,13 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "lilconfig-2.0.6" = { + "lilconfig-2.1.0" = { name = "lilconfig"; packageName = "lilconfig"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"; + sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; }; }; "lines-and-columns-1.2.4" = { @@ -8869,22 +8869,22 @@ let sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; }; }; - "react-router-6.8.1" = { + "react-router-6.8.2" = { name = "react-router"; packageName = "react-router"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz"; - sha512 = "Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg=="; + url = "https://registry.npmjs.org/react-router/-/react-router-6.8.2.tgz"; + sha512 = "lF7S0UmXI5Pd8bmHvMdPKI4u4S5McxmHnzJhrYi9ZQ6wE+DA8JN5BzVC5EEBuduWWDaiJ8u6YhVOCmThBli+rw=="; }; }; - "react-router-dom-6.8.1" = { + "react-router-dom-6.8.2" = { name = "react-router-dom"; packageName = "react-router-dom"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz"; - sha512 = "67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ=="; + url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.2.tgz"; + sha512 = "N/oAF1Shd7g4tWy+75IIufCGsHBqT74tnzHQhbiUTYILYF0Blk65cg+HPZqwC+6SqEyx033nKqU7by38v3lBZg=="; }; }; "react-scripts-5.0.1" = { @@ -11295,23 +11295,23 @@ let sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@leichtgewicht/ip-codec-2.0.4" - (sources."@mui/base-5.0.0-alpha.118" // { + (sources."@mui/base-5.0.0-alpha.119" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/core-downloads-tracker-5.11.9" - sources."@mui/icons-material-5.11.9" - (sources."@mui/material-5.11.10" // { + sources."@mui/core-downloads-tracker-5.11.11" + sources."@mui/icons-material-5.11.11" + (sources."@mui/material-5.11.11" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/private-theming-5.11.9" - sources."@mui/styled-engine-5.11.9" - sources."@mui/system-5.11.9" + sources."@mui/private-theming-5.11.11" + sources."@mui/styled-engine-5.11.11" + sources."@mui/system-5.11.11" sources."@mui/types-7.2.3" - (sources."@mui/utils-5.11.9" // { + (sources."@mui/utils-5.11.11" // { dependencies = [ sources."react-is-18.2.0" ]; @@ -11331,7 +11331,7 @@ let ]; }) sources."@popperjs/core-2.11.6" - sources."@remix-run/router-1.3.2" + sources."@remix-run/router-1.3.3" sources."@rollup/plugin-babel-5.3.1" sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/plugin-replace-2.4.2" @@ -11383,7 +11383,7 @@ let sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" - sources."@types/node-18.14.2" + sources."@types/node-18.14.6" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.2" sources."@types/prop-types-15.7.5" @@ -11405,20 +11405,20 @@ let sources."@types/ws-8.5.4" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.53.0" - sources."@typescript-eslint/experimental-utils-5.53.0" - sources."@typescript-eslint/parser-5.53.0" - sources."@typescript-eslint/scope-manager-5.53.0" - sources."@typescript-eslint/type-utils-5.53.0" - sources."@typescript-eslint/types-5.53.0" - sources."@typescript-eslint/typescript-estree-5.53.0" - (sources."@typescript-eslint/utils-5.53.0" // { + sources."@typescript-eslint/eslint-plugin-5.54.0" + sources."@typescript-eslint/experimental-utils-5.54.0" + sources."@typescript-eslint/parser-5.54.0" + sources."@typescript-eslint/scope-manager-5.54.0" + sources."@typescript-eslint/type-utils-5.54.0" + sources."@typescript-eslint/types-5.54.0" + sources."@typescript-eslint/typescript-estree-5.54.0" + (sources."@typescript-eslint/utils-5.54.0" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.53.0" + sources."@typescript-eslint/visitor-keys-5.54.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -11554,7 +11554,7 @@ let sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001458" + sources."caniuse-lite-1.0.30001460" sources."case-sensitive-paths-webpack-plugin-2.4.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -11723,7 +11723,7 @@ let sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.311" + sources."electron-to-chromium-1.4.320" sources."emittery-0.8.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" @@ -11818,7 +11818,7 @@ let }) sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.2" + sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."estree-walker-1.0.1" @@ -11981,7 +11981,7 @@ let sources."internal-slot-1.0.5" sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" + sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -12287,7 +12287,7 @@ let sources."language-tags-1.0.5" sources."leven-3.1.0" sources."levn-0.4.1" - sources."lilconfig-2.0.6" + sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."loader-runner-4.3.0" sources."loader-utils-2.0.4" @@ -12558,8 +12558,8 @@ let sources."react-infinite-scroll-component-6.1.0" sources."react-is-16.13.1" sources."react-refresh-0.11.0" - sources."react-router-6.8.1" - sources."react-router-dom-6.8.1" + sources."react-router-6.8.2" + sources."react-router-dom-6.8.2" sources."react-scripts-5.0.1" sources."react-transition-group-4.4.5" sources."read-cache-1.0.0" diff --git a/pkgs/tools/misc/octosql/default.nix b/pkgs/tools/misc/octosql/default.nix index dde2f272613..ce7f536f43c 100644 --- a/pkgs/tools/misc/octosql/default.nix +++ b/pkgs/tools/misc/octosql/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "octosql"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "cube2222"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UXHNA53ipGybYYAu+Ml8tI+9YZPW18BLsVjkW/UNQag="; + sha256 = "sha256-ysp9DLpAvaZVZBWZAzwUuULtnO++M1/DAiYHR+4/7vA="; }; - vendorSha256 = "sha256-as8vJmUH0mDPQ8K6D5yRybPV5ibvHEtyQjArXjimGpo="; + vendorHash = "sha256-JeVQz6NpekB4boRIxq2JJ3qYHTGj3K3+d5mxSblfvKs="; ldflags = [ "-s" "-w" "-X github.com/cube2222/octosql/cmd.VERSION=${version}" ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 18c48f2b15c..d4bdeffc4fb 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.6"; + version = "2.7.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-MX4na74T8+6As8e+izWz1O+xhNGfS2EKUT6goqy+sms="; + sha256 = "sha256-1ocLvpesL0Cu6f1PYaOBzKj5set1Sqm/n5MPgawOOfk="; }; - vendorHash = "sha256-Sfjp8EQeTlXayYSBO72KWLj+CScNUM5O49AP1qEfQTw="; + vendorHash = "sha256-CMJjeVTydxyLNW/937sojrjbENR00/HMEbY/gOYMNFs="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index a016fb08e3e..04556ec3723 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.1"; + version = "1.2023.2"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-ObNiuD0le5FOEGvaIr3jl+Lix74Xvpso/YIqyHGGHAs="; + sha256 = "sha256-E3ipqlf5VWNkYioEC5g/33rmMS1ahV960Tx9HiGH++U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index ab4933f52d8..e875d5a5955 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D2FNg8SEUDQA466jfxBFhK0t8/5WJHx1fBTaCH0N+UQ="; + sha256 = "sha256-ahETmUhlPZ3jpxmzDK5pS6yLc6UxCJFOtWolAtSrDVQ="; }; nativeBuildInputs = [ cmake util-linux ]; diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index b881d94438c..7d2125a1e1e 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - hash = "sha256-w984vvjjieSv4eM3jT8zJIIR7/7pmADhR3Esj+2dCTs="; + hash = "sha256-x3dx4PdYSYd7wA/GGj9QYC8rK33FWATs2SnaOagGE80="; }; - cargoHash = "sha256-L/QdFjSYm3PekKS3tdsUl8XBVyIBE044EHOIB+aEltI="; + cargoHash = "sha256-7YvzVG3c10EJET+659F1fwgZ0SmBKMdAWD6LeWnGrNI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index 741f7bcf2c1..6e43219cf28 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tailspin"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = pname; rev = version; - sha256 = "sha256-ReWgbAmEGpNOv6QArNT+eWaty88tChhH1nhH0vZe2/E="; + sha256 = "sha256-f9VfOcLOWJ4yr/CS0lqaqiaTfzOgdoI9CaS70AMNdsc="; }; - vendorSha256 = "sha256-rZJO/TSGrYwrtIKQpKhZZqnXY6IHNyjS26vBDv/iQ34="; + vendorHash = "sha256-gn7/pFw7JEhkkd/PBP4jLUKb5NBaRE/rb049Ic/Bu7A="; CGO_ENABLED = 0; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 359b6b434b3..6d4389683e2 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -33,7 +33,7 @@ let pname = "vector"; - version = "0.27.0"; + version = "0.28.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+jap7cexevEky3H+Ct9LXXUwHR5tnbzdN+b13pv3f70="; + sha256 = "sha256-1HNOfIB1HmGthNkJca4tfxcq7nDTjN+tsbsP3rLlXi4="; }; - cargoSha256 = "sha256-KehBEwoz5N0zQLDk+9vwFSrn1TrVwljFj+asr7q7hmw="; + cargoSha256 = "sha256-m4+9vET4VVgeVVN+nuFGi54OvdiubLO5gZE2mj5c+hc="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index db52bae523f..ed0a8cba8d2 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,28 +1,49 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }: buildGoModule rec { pname = "wakatime"; - version = "1.61.0"; + version = "1.68.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI="; + hash = "sha256-Q9LmQEcw3oehGE4DXIzQERNEZgwRzb1o8/qGOC1JGZc="; }; - vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4="; + vendorHash = "sha256-KY4niegPSLOILZgC7H7TFK6r5v3mjN9sUA5c8AuaOys="; + + ldflags = [ + "-s" + "-w" + "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" + ]; + + preCheck = + let + skippedTests = [ + "TestFileExperts" + "TestSendHeartbeats" + "TestSendHeartbeats_ExtraHeartbeats" + "TestSendHeartbeats_IsUnsavedEntity" + "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" + ]; + in + '' + # Disable tests requiring network + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + + passthru.tests.version = testers.testVersion { + package = wakatime; + command = "HOME=$(mktemp -d) wakatime-cli --version"; + }; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; - longDescription = '' - Command line interface to WakaTime used by all WakaTime text editor - plugins. You shouldn't need to directly use this package unless you - are building your own plugin or your text editor's plugin asks you - to install the wakatime CLI interface manually. - ''; license = licenses.bsd3; + maintainers = with maintainers; [ aaronjheng ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index d9331a8c28a..77e5e9c3ed2 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.2.17"; + version = "2023.3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mvkt5e/8GTvbUSFtnr8oh02WGA0gL651Kw2fKmM4Dzo="; + sha256 = "sha256-Jl1dqXp2wV19mkCIpnt4rNXc9vjP2CV8UvWB/5lv9RU="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index cf3133b9b03..74711a0dac0 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-AouOckRrPdIzwfn6s7GXu3U9PrihcyPpt6Xb41dq1zg="; + hash = "sha256-2GpCO8U1QZQy+0DQzzqc1Ba+PRj1Ns0lNHupzKYCkVY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index b132125d928..aeb0f761092 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b18"; + version = "2.0.0b20"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-BuubfySQfw4ljWTc1yyW4Zqle0VTimFLQ6enZA3joeQ="; + hash = "sha256-9tYc8MlKZ1pzuGMipy827RoUJkU+C6UQz/Cex48UhLQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/ali/default.nix b/pkgs/tools/networking/ali/default.nix new file mode 100644 index 00000000000..53403b63678 --- /dev/null +++ b/pkgs/tools/networking/ali/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ali"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "nakabonne"; + repo = "ali"; + rev = "refs/tags/v${version}"; + hash = "sha256-/pdHlI20IzSTX2pnsbxPiJiWmOCbp13eJWLi0Tcsueg="; + }; + + vendorHash = "sha256-YWx9K04kTMaI0FXebwRQVCt0nxIwZ6xlbtI2lk3qp0M="; + + meta = with lib; { + description = "Generate HTTP load and plot the results in real-time"; + homepage = "https://github.com/nakabonne/ali"; + changelog = "https://github.com/nakabonne/ali/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ farcaller ]; + }; +} diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 0ec15e9c35c..aa7d9727fb8 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o="; + sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 0daf963bf3e..98c7d5bca2d 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -1,28 +1,37 @@ -{ buildGoModule, fetchFromGitHub, lib, nix-update-script }: +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: buildGoModule rec { pname = "godns"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; - rev = "v${version}"; - sha256 = "sha256-b83cJUTUbJ9Rwvj7HUIGNNq9RJQLkH1CaaS+4dQ2I2o="; + rev = "refs/tags/v${version}"; + hash = "sha256-7AIr35vsjI5jamvdA1EwTwkr8MiEOjTntFeeg4b7RCw="; }; - vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; + vendorHash = "sha256-+wnaTrY7Mt6bCNTRZbJDFD75RCHyz5gtFi4DN0ng0/M="; # Some tests require internet access, broken in sandbox doCheck = false; - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc"; homepage = "https://github.com/TimothyYe/godns"; + changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ yinfeng ]; }; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index ab3249e57a8..47838f75663 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.9"; + version = "4.10"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-9kLctjXpCVZMqP2Z6kSrQ/YHI7TXbBWO2BKXjEWzmLk="; + sha256 = "sha256-WpQAwlqO26B0IEJvtV3Lqv2qNwLlsPLBkgWmxWckins="; }; strictDeps = true; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 5eb8ffa3e83..adb8a0719ae 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-02-16T19-20-11Z"; + version = "2023-02-28T00-12-59Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-UL49sZ8dBiXexmWt8rAUn2b2d58KJ8/5FyoojO7Y/68="; + sha256 = "sha256-tQ6cKP/AYNk1vzODE2qIRaf9PLT+/9iSG3c0Vg9GhgQ="; }; - vendorHash = "sha256-CdMpzYmJxOu4HvsQMJDZxRr7MWB4xN6ivEWldIptVnU="; + vendorHash = "sha256-ovOkFG8tRdQ0F+baXksDQuY4oL52wtokxasztrz2PcI="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 0ad02a53ee6..d889414bc11 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -9,10 +9,18 @@ let url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc="; }; + i686-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-i386.tgz"; + sha256 = "sha256-n/fhjbrn7g4DxmEIRFovts7qbIb2ZILhOS9ViBt3L+g="; + }; aarch64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz"; sha256 = "sha256-OVPSMdo3g+K/iQS23XJ2fFxuUz4WPTdC/QQ3r/pDG9M="; }; + armv7l-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-armhf.tgz"; + sha256 = "sha256-5F/N672KGFVTU1Uz3QMtaxC8jGTu5BObEUe5wJg10I0="; + }; x86_64-darwin = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz"; sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8="; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 87b7ae1970c..c63ae2968f5 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HwKkgRS3Hccym78T+suFkIP5nmQDWRAwm0l/PaS1p7o="; + sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index c1b2199d0f9..28bcba68a15 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; + strictDeps = true; nativeBuildInputs = [ pkg-config ] # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: @@ -96,7 +97,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelChecking = false; - nativeCheckInputs = lib.optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index c55a0dae34c..8caf4568c99 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pacparser"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "manugarg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XtYXUqmBnsqI+0b7Dnynni544d49z1eGH8ihAAqQe7Q="; + sha256 = "sha256-tEbkMRHCdiKXpz9Ksg2LEzfOVhF8xbUHWMeExPMlGVM="; }; makeFlags = [ "NO_INTERNET=1" ]; diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index ae6c495b6c8..1642bb2944d 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; - version = "1.3.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk="; + sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; }; - vendorSha256 = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8="; + vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 4704339aed6..a3948aed08f 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sshpass"; - version = "1.09"; + version = "1.10"; src = fetchurl { url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; - sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c="; + sha256 = "sha256-rREGwgPLtWGFyjutjGzK/KO0BkaWGU2oefgcjXvf7to="; }; meta = with lib; { diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index 09f7366ff36..896366eb54c 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.4"; + version = "0.10.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-a9u8Ywxrdo4FFggotL8L5o5eDDu+MtcMVBG+jInXDVs="; + hash = "sha256-iA445u0Xht7kg3jScb6OvYwji3PmE+WpeKCN+Mk7Dzo="; }; - cargoHash = "sha256-oT74oj/6rKB1cuRiHnbc9QVUZQcDvvb4KZf09XuctNM="; + cargoHash = "sha256-Y2sw2avmxUY1lHaYt/UX/Nz2BaCFQQ8dmetsVK4eCYc="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index e05768eeeb6..f8004cfd465 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.15"; + version = "5.5.16"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-kx9Rl4w44zNDSfCMn5PEmQ1jP0Zxa/fYPlZPQnAp4xI="; + sha256 = "sha256-5SmybO8aZgimjCps8huSU6h1sKskSSENK2VCWt3ltgA="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index ab9de57c0ba..0812726ab0e 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,11 +2,11 @@ buildGoModule rec { pname = "wireguard-go"; - version = "0.0.20220316"; + version = "0.0.20230223"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "sha256-OQiG92idGwOXWX4H4HNmk2dmRM2+GtssJFzavhj1HxM="; + sha256 = "sha256-ZVWbZwSpxQvxwySS3cfzdRReFtHWk6LT2AuIe10hyz0="; }; postPatch = '' @@ -14,7 +14,7 @@ buildGoModule rec { rm -f format_test.go ''; - vendorSha256 = "sha256-MrHkOj0YfvAm8zOowXzl23F1NPTCO0F8vMMGT/Y+nQ0="; + vendorHash = "sha256-i6ncA71R0hi1SzqCLphhtF3yRAHDmOdYJQ6pf3UDBg8="; subPackages = [ "." ]; diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py index 637185227e8..7fc14c1631e 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py @@ -1,13 +1,11 @@ -from collections.abc import Mapping, MutableMapping, Sequence +from collections.abc import Mapping, Sequence from dataclasses import dataclass from typing import Any, cast, Optional from urllib.parse import quote from .md import Renderer -import markdown_it from markdown_it.token import Token -from markdown_it.utils import OptionsDict _asciidoc_escapes = { # escape all dots, just in case one is pasted at SOL @@ -59,8 +57,8 @@ class AsciiDocRenderer(Renderer): _list_stack: list[List] _attrspans: list[str] - def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): - super().__init__(manpage_urls, parser) + def __init__(self, manpage_urls: Mapping[str, str]): + super().__init__(manpage_urls) self._parstack = [ Par("\n\n", "====") ] self._list_stack = [] self._attrspans = [] @@ -96,142 +94,103 @@ class AsciiDocRenderer(Renderer): self._list_stack.pop() return "" - def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def text(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return asciidoc_escape(token.content) - def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._break() - def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return " +\n" - def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f" " - def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return f"``{asciidoc_escape(token.content)}``" - def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: - return self.fence(token, tokens, i, options, env) - def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self.fence(token, tokens, i) + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return f"link:{quote(cast(str, token.attrs['href']), safe='/:')}[" - def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "]" - def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._enter_block(True) # allow the next token to be a block or an inline. return f'\n{self._list_stack[-1].head} {{empty}}' - def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return "\n" - def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._list_open(token, '*') - def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._list_close() - def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "__" - def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "__" - def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "**" - def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "**" - def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: attrs = f"[source,{token.info}]\n" if token.info else "" code = token.content if code.endswith('\n'): code = code[:-1] return f"{self._break(True)}{attrs}----\n{code}\n----" - def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: pbreak = self._break(True) self._enter_block(False) return f"{pbreak}[quote]\n{self._parstack[-2].block_delim}\n" - def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return f"\n{self._parstack[-1].block_delim}" - def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("NOTE") - def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("CAUTION") - def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("IMPORTANT") - def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("TIP") - def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("WARNING") - def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"{self._break()}[]" - def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._break() - def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._enter_block(True) return ":: {empty}" - def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return "\n" - def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True content = asciidoc_escape(token.content) if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): return f"link:{quote(url, safe='/:')}[{content}]" return f"[.{token.meta['name']}]``{asciidoc_escape(token.content)}``" - def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return f"[[{token.attrs['id']}]]" - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True (id_part, class_part) = ("", "") if id := token.attrs.get('id'): @@ -241,22 +200,17 @@ class AsciiDocRenderer(Renderer): class_part = "kbd:[" self._attrspans.append("]") else: - return super().attr_span_begin(token, tokens, i, options, env) + return super().attr_span_begin(token, tokens, i) else: self._attrspans.append("") return id_part + class_part - def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._attrspans.pop() - def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return token.markup.replace("#", "=") + " " - def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "\n" - def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._list_open(token, '.') - def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._list_close() diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py index 4a708b1f92c..9649eb653d4 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py @@ -1,12 +1,10 @@ -from collections.abc import Mapping, MutableMapping, Sequence +from collections.abc import Mapping, Sequence from dataclasses import dataclass from typing import Any, cast, Optional from .md import md_escape, md_make_code, Renderer -import markdown_it from markdown_it.token import Token -from markdown_it.utils import OptionsDict @dataclass(kw_only=True) class List: @@ -26,8 +24,8 @@ class CommonMarkRenderer(Renderer): _link_stack: list[str] _list_stack: list[List] - def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): - super().__init__(manpage_urls, parser) + def __init__(self, manpage_urls: Mapping[str, str]): + super().__init__(manpage_urls) self._parstack = [ Par("") ] self._link_stack = [] self._list_stack = [] @@ -58,39 +56,29 @@ class CommonMarkRenderer(Renderer): return s return f"\n{self._parstack[-1].indent}".join(s.splitlines()) - def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def text(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return self._indent_raw(md_escape(token.content)) - def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._maybe_parbreak() - def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f" {self._break()}" - def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._break() - def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return md_make_code(token.content) - def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: - return self.fence(token, tokens, i, options, env) - def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self.fence(token, tokens, i) + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True self._link_stack.append(cast(str, token.attrs['href'])) return "[" - def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"]({md_escape(self._link_stack.pop())})" - def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: lst = self._list_stack[-1] lbreak = "" if not lst.first_item_seen else self._break() * (1 if lst.compact else 2) lst.first_item_seen = True @@ -100,132 +88,99 @@ class CommonMarkRenderer(Renderer): lst.next_idx += 1 self._enter_block(" " * (len(head) + 1)) return f'{lbreak}{head} ' - def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return "" - def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.append(List(compact=bool(token.meta['compact']))) return self._maybe_parbreak() - def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.pop() return "" - def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "*" - def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "*" - def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "**" - def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "**" - def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: code = token.content if code.endswith('\n'): code = code[:-1] pbreak = self._maybe_parbreak() return pbreak + self._indent_raw(md_make_code(code, info=token.info, multiline=True)) - def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: pbreak = self._maybe_parbreak() self._enter_block("> ") return pbreak + "> " - def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return "" - def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Note") - def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Caution") - def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Important") - def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Tip") - def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Warning") - def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.append(List(compact=False)) return "" - def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.pop() return "" - def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: pbreak = self._maybe_parbreak() self._enter_block(" ") # add an opening zero-width non-joiner to separate *our* emphasis from possible # emphasis in the provided term return f'{pbreak} - *{chr(0x200C)}' - def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"{chr(0x200C)}*" - def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True return "" - def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return "" - def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._parstack[-1].continuing = True content = md_make_code(token.content) if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): return f"[{content}]({url})" return content # no roles in regular commonmark - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: # there's no way we can emit attrspans correctly in all cases. we could use inline # html for ids, but that would not round-trip. same holds for classes. since this # renderer is only used for approximate options export and all of these things are # not allowed in options we can ignore them for now. return "" - def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return token.markup + " " - def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "\n" - def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.append( List(next_idx = cast(int, token.attrs.get('start', 1)), compact = bool(token.meta['compact']))) return self._maybe_parbreak() - def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.pop() return "" 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 index e6a761dcf13..4c90606ff45 100644 --- 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 @@ -1,9 +1,8 @@ -from collections.abc import Mapping, MutableMapping, Sequence +from collections.abc import Mapping, Sequence 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 @@ -32,26 +31,23 @@ class Heading(NamedTuple): partintro_closed: bool = False class DocBookRenderer(Renderer): - __output__ = "docbook" _link_tags: list[str] _deflists: list[Deflist] _headings: list[Heading] _attrspans: list[str] - def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): - super().__init__(manpage_urls, parser) + def __init__(self, manpage_urls: Mapping[str, str]): + super().__init__(manpage_urls) self._link_tags = [] self._deflists = [] self._headings = [] self._attrspans = [] - 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) + def render(self, tokens: Sequence[Token]) -> str: + result = super().render(tokens) + result += self._close_headings(None) return result - def renderInline(self, tokens: Sequence[Token], options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def renderInline(self, tokens: Sequence[Token]) -> 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): @@ -65,135 +61,98 @@ class DocBookRenderer(Renderer): if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: tokens[i + 1].content = '' - return super().renderInline(tokens, options, env) + return super().renderInline(tokens) - def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def text(self, token: Token, tokens: Sequence[Token], i: int) -> str: return escape(token.content) - def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para>" - def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</para>" - def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<literallayout>\n</literallayout>" - def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"<literal>{escape(token.content)}</literal>" - def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"<programlisting>{escape(token.content)}</programlisting>" - def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"</{self._link_tags.pop()}>" - def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<listitem>" - def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</listitem>\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: + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' return f"<para><itemizedlist{spacing}>\n" - def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "\n</itemizedlist></para>" - def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<emphasis>" - def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</emphasis>" - def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<emphasis role=\"strong\">" - def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</emphasis>" - def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: info = f" language={quoteattr(token.info)}" if token.info != "" else "" return f"<programlisting{info}>{escape(token.content)}</programlisting>" - def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><blockquote>" - def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</blockquote></para>" - def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><note>" - def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</note></para>" - def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><caution>" - def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</caution></para>" - def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><important>" - def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</important></para>" - def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><tip>" - def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</tip></para>" - def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "<para><warning>" - def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</warning></para>" # markdown-it emits tokens based on the html syntax tree, but docbook is # slightly different. html has <dl>{<dt/>{<dd/>}}</dl>, # docbook has <variablelist>{<varlistentry><term/><listitem/></varlistentry>}<variablelist> # 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: + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._deflists.append(Deflist()) return "<para><variablelist>" - def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._deflists.pop() return "</variablelist></para>" - def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._deflists[-1].has_dd = False return "<varlistentry><term>" - def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</term>" - def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if self._deflists[-1].has_dd: raise Exception("multiple definitions per term not supported") self._deflists[-1].has_dd = True return "<listitem>" - def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "</listitem></varlistentry>" - def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: if token.meta['name'] == 'command': return f"<command>{escape(token.content)}</command>" if token.meta['name'] == 'file': @@ -216,8 +175,7 @@ class DocBookRenderer(Renderer): else: return ref raise NotImplementedError("md node not supported yet", token) - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: # we currently support *only* inline anchors and the special .keycap class to produce # <keycap> docbook elements. (id_part, class_part) = ("", "") @@ -228,31 +186,26 @@ class DocBookRenderer(Renderer): class_part = "<keycap>" self._attrspans.append("</keycap>") else: - return super().attr_span_begin(token, tokens, i, options, env) + return super().attr_span_begin(token, tokens, i) else: self._attrspans.append("") return id_part + class_part - def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._attrspans.pop() - def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: start = f' startingnumber="{token.attrs["start"]}"' if 'start' in token.attrs else "" spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' return f"<orderedlist{start}{spacing}>" - def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return f"</orderedlist>" - def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: hlevel = int(token.tag[1:]) - result = self._close_headings(hlevel, env) - (tag, attrs) = self._heading_tag(token, tokens, i, options, env) + result = self._close_headings(hlevel) + (tag, attrs) = self._heading_tag(token, tokens, i) 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<title>' - def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: heading = self._headings[-1] result = '</title>' if heading.container_tag == 'part': @@ -264,16 +217,14 @@ class DocBookRenderer(Renderer): maybe_id = " xml:id=" + quoteattr(id + "-intro") result += f"<partintro{maybe_id}>" return result - def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if id := token.attrs.get('id'): return f"<anchor xml:id={quoteattr(cast(str, id))} />" return "" - def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def _close_headings(self, level: Optional[int], env: MutableMapping[str, Any]) -> str: + def _close_headings(self, level: Optional[int]) -> str: # we rely on markdown-it producing h{1..6} tags in token.tag for this to work result = [] while len(self._headings): @@ -286,8 +237,7 @@ class DocBookRenderer(Renderer): 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]]: + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> tuple[str, dict[str, str]]: attrs = {} if id := token.attrs.get('id'): attrs['xml:id'] = cast(str, id) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py new file mode 100644 index 00000000000..39d2da6adf8 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py @@ -0,0 +1,245 @@ +from collections.abc import Mapping, Sequence +from typing import cast, Optional, NamedTuple + +from html import escape +from markdown_it.token import Token + +from .manual_structure import XrefTarget +from .md import Renderer + +class UnresolvedXrefError(Exception): + pass + +class Heading(NamedTuple): + container_tag: str + level: int + html_tag: str + # special handling for part content: whether partinfo div was already closed from + # elsewhere or still needs closing. + partintro_closed: bool + # tocs are generated when the heading opens, but have to be emitted into the file + # after the heading titlepage (and maybe partinfo) has been closed. + toc_fragment: str + +_bullet_list_styles = [ 'disc', 'circle', 'square' ] +_ordered_list_styles = [ '1', 'a', 'i', 'A', 'I' ] + +class HTMLRenderer(Renderer): + _xref_targets: Mapping[str, XrefTarget] + + _headings: list[Heading] + _attrspans: list[str] + _hlevel_offset: int = 0 + _bullet_list_nesting: int = 0 + _ordered_list_nesting: int = 0 + + def __init__(self, manpage_urls: Mapping[str, str], xref_targets: Mapping[str, XrefTarget]): + super().__init__(manpage_urls) + self._headings = [] + self._attrspans = [] + self._xref_targets = xref_targets + + def render(self, tokens: Sequence[Token]) -> str: + result = super().render(tokens) + result += self._close_headings(None) + return result + + def text(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "<p>" + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</p>" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "<br />" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "\n" + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return f'<code class="literal">{escape(token.content)}</code>' + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self.fence(token, tokens, i) + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + href = escape(cast(str, token.attrs['href']), True) + tag, title, target, text = "link", "", 'target="_top"', "" + if href.startswith('#'): + if not (xref := self._xref_targets.get(href[1:])): + raise UnresolvedXrefError(f"bad local reference, id {href} not known") + if tokens[i + 1].type == 'link_close': + tag, text = "xref", xref.title_html + if xref.title: + title = f'title="{escape(xref.title, True)}"' + target, href = "", xref.href() + return f'<a class="{tag}" href="{href}" {title} {target}>{text}' + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</a>" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<li class="listitem">' + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</li>" + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + extra = 'compact' if token.meta.get('compact', False) else '' + style = _bullet_list_styles[self._bullet_list_nesting % len(_bullet_list_styles)] + self._bullet_list_nesting += 1 + return f'<div class="itemizedlist"><ul class="itemizedlist {extra}" style="list-style-type: {style};">' + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + self._bullet_list_nesting -= 1 + return "</ul></div>" + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<span class="emphasis"><em>' + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</em></span>" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<span class="strong"><strong>' + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</strong></span>" + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # TODO use token.info. docbook doesn't so we can't yet. + return f'<pre class="programlisting">\n{escape(token.content)}</pre>' + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="blockquote"><blockquote class="blockquote">' + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</blockquote></div>" + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="note"><h3 class="title">Note</h3>' + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</div>" + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="caution"><h3 class="title">Caution</h3>' + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</div>" + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="important"><h3 class="title">Important</h3>' + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</div>" + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="tip"><h3 class="title">Tip</h3>' + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</div>" + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="warning"><h3 class="title">Warning</h3>' + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</div>" + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<div class="variablelist"><dl class="variablelist">' + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</dl></div>" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return '<dt><span class="term">' + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</span></dt>" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "<dd>" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "</dd>" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: + if token.meta['name'] == 'command': + return f'<span class="command"><strong>{escape(token.content)}</strong></span>' + if token.meta['name'] == 'file': + return f'<code class="filename">{escape(token.content)}</code>' + if token.meta['name'] == 'var': + return f'<code class="varname">{escape(token.content)}</code>' + if token.meta['name'] == 'env': + return f'<code class="envar">{escape(token.content)}</code>' + if token.meta['name'] == 'option': + return f'<code class="option">{escape(token.content)}</code>' + 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'<span class="refentrytitle">{escape(page)}</span>' + vol = f"({escape(section)})" + ref = f'<span class="citerefentry">{title}{vol}</span>' + if man in self._manpage_urls: + return f'<a class="link" href="{escape(self._manpage_urls[man], True)}" target="_top">{ref}</a>' + else: + return ref + return super().myst_role(token, tokens, i) + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # we currently support *only* inline anchors and the special .keycap class to produce + # keycap-styled spans. + (id_part, class_part) = ("", "") + if s := token.attrs.get('id'): + id_part = f'<a id="{escape(cast(str, s), True)}" />' + if s := token.attrs.get('class'): + if s == 'keycap': + class_part = '<span class="keycap"><strong>' + self._attrspans.append("</strong></span>") + else: + return super().attr_span_begin(token, tokens, i) + else: + self._attrspans.append("") + return id_part + class_part + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self._attrspans.pop() + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + hlevel = int(token.tag[1:]) + htag, hstyle = self._make_hN(hlevel) + if hstyle: + hstyle = f'style="{escape(hstyle, True)}"' + if anchor := cast(str, token.attrs.get('id', '')): + anchor = f'<a id="{escape(anchor, True)}"></a>' + result = self._close_headings(hlevel) + tag = self._heading_tag(token, tokens, i) + toc_fragment = self._build_toc(tokens, i) + self._headings.append(Heading(tag, hlevel, htag, tag != 'part', toc_fragment)) + return ( + f'{result}' + f'<div class="{tag}">' + f' <div class="titlepage">' + f' <div>' + f' <div>' + f' <{htag} class="title" {hstyle}>' + f' {anchor}' + ) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + heading = self._headings[-1] + result = ( + f' </{heading.html_tag}>' + f' </div>' + f' </div>' + f'</div>' + ) + if heading.container_tag == 'part': + result += '<div class="partintro">' + else: + result += heading.toc_fragment + return result + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + extra = 'compact' if token.meta.get('compact', False) else '' + start = f'start="{token.attrs["start"]}"' if 'start' in token.attrs else "" + style = _ordered_list_styles[self._ordered_list_nesting % len(_ordered_list_styles)] + self._ordered_list_nesting += 1 + return f'<div class="orderedlist"><ol class="orderedlist {extra}" {start} type="{style}">' + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + self._ordered_list_nesting -= 1; + return "</ol></div>" + def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + if id := token.attrs.get('id'): + return f'<a id="{escape(cast(str, id), True)}" />' + return "" + def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "" + + def _make_hN(self, level: int) -> tuple[str, str]: + return f"h{min(6, max(1, level + self._hlevel_offset))}", "" + + def _maybe_close_partintro(self) -> str: + if self._headings: + heading = self._headings[-1] + if heading.container_tag == 'part' and not heading.partintro_closed: + self._headings[-1] = heading._replace(partintro_closed=True) + return heading.toc_fragment + "</div>" + return "" + + def _close_headings(self, level: Optional[int]) -> str: + result = [] + while len(self._headings) and (level is None or self._headings[-1].level >= level): + result.append(self._maybe_close_partintro()) + result.append("</div>") + self._headings.pop() + return "\n".join(result) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "section" + def _build_toc(self, tokens: Sequence[Token], i: int) -> str: + return "" diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py index 1b796d9f048..a01aa1b4634 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py @@ -1,4 +1,4 @@ -from collections.abc import Mapping, MutableMapping, Sequence +from collections.abc import Mapping, Sequence from dataclasses import dataclass from typing import Any, cast, Iterable, Optional @@ -6,7 +6,6 @@ import re import markdown_it from markdown_it.token import Token -from markdown_it.utils import OptionsDict from .md import Renderer @@ -75,8 +74,6 @@ class List: # horizontal motion in a line) we do attempt to copy the style of mdoc(7) semantic requests # as appropriate for each markup element. class ManpageRenderer(Renderer): - __output__ = "man" - # whether to emit mdoc .Ql equivalents for inline code or just the contents. this is # mainly used by the options manpage converter to not emit extra quotes in defaults # and examples where it's already clear from context that the following text is code. @@ -90,9 +87,8 @@ class ManpageRenderer(Renderer): _list_stack: list[List] _font_stack: list[str] - def __init__(self, manpage_urls: Mapping[str, str], href_targets: dict[str, str], - parser: Optional[markdown_it.MarkdownIt] = None): - super().__init__(manpage_urls, parser) + def __init__(self, manpage_urls: Mapping[str, str], href_targets: dict[str, str]): + super().__init__(manpage_urls) self._href_targets = href_targets self._link_stack = [] self._do_parbreak_stack = [] @@ -126,36 +122,27 @@ class ManpageRenderer(Renderer): self._leave_block() return ".RE" - def render(self, tokens: Sequence[Token], options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def render(self, tokens: Sequence[Token]) -> str: self._do_parbreak_stack = [ False ] self._font_stack = [ "\\fR" ] - return super().render(tokens, options, env) + return super().render(tokens) - def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def text(self, token: Token, tokens: Sequence[Token], i: int) -> str: return man_escape(token.content) - def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._maybe_parbreak() - def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ".br" - def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> str: return " " - def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> str: s = _protect_spaces(man_escape(token.content)) return f"\\fR\\(oq{s}\\(cq\\fP" if self.inline_code_is_quoted else s - def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: - return self.fence(token, tokens, i, options, env) - def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self.fence(token, tokens, i) + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: href = cast(str, token.attrs['href']) self._link_stack.append(href) text = "" @@ -164,8 +151,7 @@ class ManpageRenderer(Renderer): text = self._href_targets[href] self._font_stack.append("\\fB") return f"\\fB{text}\0 <" - def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: href = self._link_stack.pop() text = "" if self.link_footnotes is not None: @@ -177,8 +163,7 @@ class ManpageRenderer(Renderer): text = "\\fR" + man_escape(f"[{idx}]") self._font_stack.pop() return f">\0 {text}{self._font_stack[-1]}" - def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._enter_block() lst = self._list_stack[-1] maybe_space = '' if lst.compact or not lst.first_item_seen else '.sp\n' @@ -192,36 +177,28 @@ class ManpageRenderer(Renderer): f'.RS {lst.width}\n' f"\\h'-{len(head) + 1}'\\fB{man_escape(head)}\\fP\\h'1'\\c" ) - def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return ".RE" - def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.append(List(width=4, compact=bool(token.meta['compact']))) return self._maybe_parbreak() - def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.pop() return "" - def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._font_stack.append("\\fI") return "\\fI" - def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._font_stack.pop() return self._font_stack[-1] - def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._font_stack.append("\\fB") return "\\fB" - def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._font_stack.pop() return self._font_stack[-1] - def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: s = man_escape(token.content).rstrip('\n') return ( '.sp\n' @@ -231,8 +208,7 @@ class ManpageRenderer(Renderer): '.fi\n' '.RE' ) - def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: maybe_par = self._maybe_parbreak("\n") self._enter_block() return ( @@ -240,62 +216,44 @@ class ManpageRenderer(Renderer): ".RS 4\n" f"\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c" ) - def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return ".RE" - def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open("Note") - def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open( "Caution") - def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open( "Important") - def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open( "Tip") - def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_open( "Warning") - def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return self._admonition_close() - def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ".RS 4" - def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ".RE" - def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ".PP" - def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._enter_block() return ".RS 4" - def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._leave_block() return ".RE" - def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: if token.meta['name'] in [ 'command', 'env', 'option' ]: return f'\\fB{man_escape(token.content)}\\fP' elif token.meta['name'] in [ 'file', 'var' ]: @@ -306,23 +264,18 @@ class ManpageRenderer(Renderer): return f'\\fB{man_escape(page)}\\fP\\fR({man_escape(section)})\\fP' else: raise NotImplementedError("md node not supported yet", token) - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: # mdoc knows no anchors so we can drop those, but classes must be rejected. if 'class' in token.attrs: - return super().attr_span_begin(token, tokens, i, options, env) + return super().attr_span_begin(token, tokens, i) return "" - def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" - def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported in manpages", token) - def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported in manpages", token) - def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: # max item head width for a number, a dot, and one leading space and one trailing space width = 3 + len(str(cast(int, token.meta['end']))) self._list_stack.append( @@ -330,7 +283,6 @@ class ManpageRenderer(Renderer): next_idx = cast(int, token.attrs.get('start', 1)), compact = bool(token.meta['compact']))) return self._maybe_parbreak() - def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: self._list_stack.pop() return "" 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 index efc8b02e8d6..40dea3c7d1d 100644 --- 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 @@ -1,160 +1,85 @@ import argparse +import html import json +import re +import xml.sax.saxutils as xml from abc import abstractmethod -from collections.abc import Mapping, MutableMapping, Sequence +from collections.abc import Mapping, Sequence from pathlib import Path -from typing import Any, cast, NamedTuple, Optional, Union -from xml.sax.saxutils import escape, quoteattr +from typing import Any, cast, ClassVar, Generic, get_args, NamedTuple, Optional, Union import markdown_it from markdown_it.token import Token -from markdown_it.utils import OptionsDict -from . import options -from .docbook import DocBookRenderer, Heading -from .md import Converter +from . import md, options +from .docbook import DocBookRenderer, Heading, make_xml_id +from .html import HTMLRenderer, UnresolvedXrefError +from .manual_structure import check_structure, FragmentType, is_include, TocEntry, TocEntryType, XrefTarget +from .md import Converter, Renderer +from .utils import Freezeable -class ManualDocBookRenderer(DocBookRenderer): - _toplevel_tag: str - - def __init__(self, toplevel_tag: str, manpage_urls: Mapping[str, str], - parser: Optional[markdown_it.MarkdownIt] = None): - super().__init__(manpage_urls, parser) - self._toplevel_tag = toplevel_tag - self.rules |= { - 'included_sections': lambda *args: self._included_thing("section", *args), - 'included_chapters': lambda *args: self._included_thing("chapter", *args), - 'included_preface': lambda *args: self._included_thing("preface", *args), - 'included_parts': lambda *args: self._included_thing("part", *args), - 'included_appendix': lambda *args: self._included_thing("appendix", *args), - 'included_options': self.included_options, - } - - def render(self, tokens: Sequence[Token], options: OptionsDict, - env: MutableMapping[str, Any]) -> str: - wanted = { 'h1': 'title' } - wanted |= { 'h2': 'subtitle' } if self._toplevel_tag == 'book' else {} - for (i, (tag, kind)) in enumerate(wanted.items()): - if len(tokens) < 3 * (i + 1): - raise RuntimeError(f"missing {kind} ({tag}) heading") - token = tokens[3 * i] - if token.type != 'heading_open' or token.tag != tag: - assert token.map - raise RuntimeError(f"expected {kind} ({tag}) heading in line {token.map[0] + 1}", token) - for t in tokens[3 * len(wanted):]: - if t.type != 'heading_open' or (info := wanted.get(t.tag)) is None: - continue - assert t.map - raise RuntimeError( - f"only one {info[0]} heading ({t.markup} [text...]) allowed per " - f"{self._toplevel_tag}, but found a second in lines [{t.map[0] + 1}..{t.map[1]}]. " - "please remove all such headings except the first or demote the subsequent headings.", - t) - - # books get special handling because they have *two* title tags. doing this with - # generic code is more complicated than it's worth. the checks above have verified - # that both titles actually exist. - if self._toplevel_tag == 'book': - assert tokens[1].children - assert tokens[4].children - if (maybe_id := cast(str, tokens[0].attrs.get('id', ""))): - maybe_id = "xml:id=" + quoteattr(maybe_id) - return (f'<book xmlns="http://docbook.org/ns/docbook"' - f' xmlns:xlink="http://www.w3.org/1999/xlink"' - f' {maybe_id} version="5.0">' - f' <title>{self.renderInline(tokens[1].children, options, env)}</title>' - f' <subtitle>{self.renderInline(tokens[4].children, options, env)}</subtitle>' - f' {super().render(tokens[6:], options, env)}' - f'</book>') - - return super().render(tokens, options, env) - - 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) - # render() has already verified that we don't have supernumerary headings and since the - # book tag is handled specially we can leave the check this simple - if token.tag != 'h1': - return (tag, attrs) - return (self._toplevel_tag, attrs | { - 'xmlns': "http://docbook.org/ns/docbook", - 'xmlns:xlink': "http://www.w3.org/1999/xlink", - }) - - def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int, - options: OptionsDict, env: MutableMapping[str, Any]) -> str: - result = [] - # close existing partintro. the generic render doesn't really need this because - # it doesn't have a concept of structure in the way the manual does. - if self._headings and self._headings[-1] == Heading('part', 1): - result.append("</partintro>") - self._headings[-1] = self._headings[-1]._replace(partintro_closed=True) - # must nest properly for structural includes. this requires saving at least - # the headings stack, but creating new renderers is cheap and much easier. - r = ManualDocBookRenderer(tag, self._manpage_urls, None) - for (included, path) in token.meta['included']: - try: - result.append(r.render(included, options, env)) - except Exception as e: - raise RuntimeError(f"rendering {path}") from e - return "".join(result) - def included_options(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: - return cast(str, token.meta['rendered-options']) - - # 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"<programlisting>\n{escape(token.content)}</programlisting>" - 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"<programlisting{info}>\n{escape(token.content)}</programlisting>" - -class DocBookConverter(Converter): - def __renderer__(self, manpage_urls: Mapping[str, str], - parser: Optional[markdown_it.MarkdownIt]) -> ManualDocBookRenderer: - return ManualDocBookRenderer('book', manpage_urls, parser) +class BaseConverter(Converter[md.TR], Generic[md.TR]): + # per-converter configuration for ns:arg=value arguments to include blocks, following + # the include type. html converters need something like this to support chunking, or + # another external method like the chunktocs docbook uses (but block options seem like + # a much nicer of doing this). + INCLUDE_ARGS_NS: ClassVar[str] + INCLUDE_FRAGMENT_ALLOWED_ARGS: ClassVar[set[str]] = set() + INCLUDE_OPTIONS_ALLOWED_ARGS: ClassVar[set[str]] = set() _base_paths: list[Path] - _revision: str - - def __init__(self, manpage_urls: Mapping[str, str], revision: str): - super().__init__(manpage_urls) - self._revision = revision + _current_type: list[TocEntryType] - def convert(self, file: Path) -> str: - self._base_paths = [ file ] + def convert(self, infile: Path, outfile: Path) -> None: + self._base_paths = [ infile ] + self._current_type = ['book'] try: - with open(file, 'r') as f: - return self._render(f.read()) + tokens = self._parse(infile.read_text()) + self._postprocess(infile, outfile, tokens) + converted = self._renderer.render(tokens) + outfile.write_text(converted) except Exception as e: - raise RuntimeError(f"failed to render manual {file}") from e + raise RuntimeError(f"failed to render manual {infile}") from e + + def _postprocess(self, infile: Path, outfile: Path, tokens: Sequence[Token]) -> None: + pass - def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: - tokens = super()._parse(src, env) + def _parse(self, src: str) -> list[Token]: + tokens = super()._parse(src) + check_structure(self._current_type[-1], tokens) for token in tokens: - if token.type != "fence" or not token.info.startswith("{=include=} "): + if not is_include(token): + continue + directive = token.info[12:].split() + if not directive: continue - typ = token.info[12:].strip() + args = { k: v for k, _sep, v in map(lambda s: s.partition('='), directive[1:]) } + typ = directive[0] if typ == 'options': token.type = 'included_options' - self._parse_options(token) - elif typ in [ 'sections', 'chapters', 'preface', 'parts', 'appendix' ]: - token.type = 'included_' + typ - self._parse_included_blocks(token, env) + self._process_include_args(token, args, self.INCLUDE_OPTIONS_ALLOWED_ARGS) + self._parse_options(token, args) else: - raise RuntimeError(f"unsupported structural include type '{typ}'") + fragment_type = typ.removesuffix('s') + if fragment_type not in get_args(FragmentType): + raise RuntimeError(f"unsupported structural include type '{typ}'") + self._current_type.append(cast(FragmentType, fragment_type)) + token.type = 'included_' + typ + self._process_include_args(token, args, self.INCLUDE_FRAGMENT_ALLOWED_ARGS) + self._parse_included_blocks(token, args) + self._current_type.pop() return tokens - def _parse_included_blocks(self, token: Token, env: Optional[MutableMapping[str, Any]]) -> None: + def _process_include_args(self, token: Token, args: dict[str, str], allowed: set[str]) -> None: + ns = self.INCLUDE_ARGS_NS + ":" + args = { k[len(ns):]: v for k, v in args.items() if k.startswith(ns) } + if unknown := set(args.keys()) - allowed: + assert token.map + raise RuntimeError(f"unrecognized include argument in line {token.map[0] + 1}", unknown) + token.meta['include-args'] = args + + def _parse_included_blocks(self, token: Token, block_args: dict[str, str]) -> None: assert token.map included = token.meta['included'] = [] for (lnum, line) in enumerate(token.content.splitlines(), token.map[0] + 2): @@ -165,13 +90,13 @@ class DocBookConverter(Converter): try: self._base_paths.append(path) with open(path, 'r') as f: - tokens = self._parse(f.read(), env) + tokens = self._parse(f.read()) included.append((tokens, path)) self._base_paths.pop() except Exception as e: raise RuntimeError(f"processing included file {path} from line {lnum}") from e - def _parse_options(self, token: Token) -> None: + def _parse_options(self, token: Token, block_args: dict[str, str]) -> None: assert token.map items = {} @@ -194,14 +119,479 @@ class DocBookConverter(Converter): " ".join(items.keys())) try: - conv = options.DocBookConverter( - self._manpage_urls, self._revision, False, 'fragment', varlist_id, id_prefix) with open(self._base_paths[-1].parent / source, 'r') as f: - conv.add_options(json.load(f)) - token.meta['rendered-options'] = conv.finalize(fragment=True) + token.meta['id-prefix'] = id_prefix + token.meta['list-id'] = varlist_id + token.meta['source'] = json.load(f) except Exception as e: raise RuntimeError(f"processing options block in line {token.map[0] + 1}") from e +class RendererMixin(Renderer): + _toplevel_tag: str + _revision: str + + def __init__(self, toplevel_tag: str, revision: str, *args: Any, **kwargs: Any): + super().__init__(*args, **kwargs) + self._toplevel_tag = toplevel_tag + self._revision = revision + self.rules |= { + 'included_sections': lambda *args: self._included_thing("section", *args), + 'included_chapters': lambda *args: self._included_thing("chapter", *args), + 'included_preface': lambda *args: self._included_thing("preface", *args), + 'included_parts': lambda *args: self._included_thing("part", *args), + 'included_appendix': lambda *args: self._included_thing("appendix", *args), + 'included_options': self.included_options, + } + + def render(self, tokens: Sequence[Token]) -> str: + # books get special handling because they have *two* title tags. doing this with + # generic code is more complicated than it's worth. the checks above have verified + # that both titles actually exist. + if self._toplevel_tag == 'book': + return self._render_book(tokens) + + return super().render(tokens) + + @abstractmethod + def _render_book(self, tokens: Sequence[Token]) -> str: + raise NotImplementedError() + + @abstractmethod + def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int) -> str: + raise NotImplementedError() + + @abstractmethod + def included_options(self, token: Token, tokens: Sequence[Token], i: int) -> str: + raise NotImplementedError() + +class ManualDocBookRenderer(RendererMixin, DocBookRenderer): + def __init__(self, toplevel_tag: str, revision: str, manpage_urls: Mapping[str, str]): + super().__init__(toplevel_tag, revision, manpage_urls) + + def _render_book(self, tokens: Sequence[Token]) -> str: + assert tokens[1].children + assert tokens[4].children + if (maybe_id := cast(str, tokens[0].attrs.get('id', ""))): + maybe_id = "xml:id=" + xml.quoteattr(maybe_id) + return (f'<book xmlns="http://docbook.org/ns/docbook"' + f' xmlns:xlink="http://www.w3.org/1999/xlink"' + f' {maybe_id} version="5.0">' + f' <title>{self.renderInline(tokens[1].children)}</title>' + f' <subtitle>{self.renderInline(tokens[4].children)}</subtitle>' + f' {super(DocBookRenderer, self).render(tokens[6:])}' + f'</book>') + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> tuple[str, dict[str, str]]: + (tag, attrs) = super()._heading_tag(token, tokens, i) + # render() has already verified that we don't have supernumerary headings and since the + # book tag is handled specially we can leave the check this simple + if token.tag != 'h1': + return (tag, attrs) + return (self._toplevel_tag, attrs | { + 'xmlns': "http://docbook.org/ns/docbook", + 'xmlns:xlink': "http://www.w3.org/1999/xlink", + }) + + def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int) -> str: + result = [] + # close existing partintro. the generic render doesn't really need this because + # it doesn't have a concept of structure in the way the manual does. + if self._headings and self._headings[-1] == Heading('part', 1): + result.append("</partintro>") + self._headings[-1] = self._headings[-1]._replace(partintro_closed=True) + # must nest properly for structural includes. this requires saving at least + # the headings stack, but creating new renderers is cheap and much easier. + r = ManualDocBookRenderer(tag, self._revision, self._manpage_urls) + for (included, path) in token.meta['included']: + try: + result.append(r.render(included)) + except Exception as e: + raise RuntimeError(f"rendering {path}") from e + return "".join(result) + def included_options(self, token: Token, tokens: Sequence[Token], i: int) -> str: + conv = options.DocBookConverter(self._manpage_urls, self._revision, False, 'fragment', + token.meta['list-id'], token.meta['id-prefix']) + conv.add_options(token.meta['source']) + return conv.finalize(fragment=True) + + # TODO minimize docbook diffs with existing conversions. remove soon. + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return super().paragraph_open(token, tokens, i) + "\n " + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return "\n" + super().paragraph_close(token, tokens, i) + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return f"<programlisting>\n{xml.escape(token.content)}</programlisting>" + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: + info = f" language={xml.quoteattr(token.info)}" if token.info != "" else "" + return f"<programlisting{info}>\n{xml.escape(token.content)}</programlisting>" + +class DocBookConverter(BaseConverter[ManualDocBookRenderer]): + INCLUDE_ARGS_NS = "docbook" + + def __init__(self, manpage_urls: Mapping[str, str], revision: str): + super().__init__() + self._renderer = ManualDocBookRenderer('book', revision, manpage_urls) + + +class HTMLParameters(NamedTuple): + generator: str + stylesheets: Sequence[str] + scripts: Sequence[str] + toc_depth: int + chunk_toc_depth: int + +class ManualHTMLRenderer(RendererMixin, HTMLRenderer): + _base_path: Path + _html_params: HTMLParameters + + def __init__(self, toplevel_tag: str, revision: str, html_params: HTMLParameters, + manpage_urls: Mapping[str, str], xref_targets: dict[str, XrefTarget], + base_path: Path): + super().__init__(toplevel_tag, revision, manpage_urls, xref_targets) + self._base_path, self._html_params = base_path, html_params + + def _push(self, tag: str, hlevel_offset: int) -> Any: + result = (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset) + self._hlevel_offset += hlevel_offset + self._toplevel_tag, self._headings, self._attrspans = tag, [], [] + return result + + def _pop(self, state: Any) -> None: + (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset) = state + + def _render_book(self, tokens: Sequence[Token]) -> str: + assert tokens[4].children + title_id = cast(str, tokens[0].attrs.get('id', "")) + title = self._xref_targets[title_id].title + # subtitles don't have IDs, so we can't use xrefs to get them + subtitle = self.renderInline(tokens[4].children) + + toc = TocEntry.of(tokens[0]) + return "\n".join([ + self._file_header(toc), + ' <div class="book">', + ' <div class="titlepage">', + ' <div>', + f' <div><h1 class="title"><a id="{html.escape(title_id, True)}"></a>{title}</h1></div>', + f' <div><h2 class="subtitle">{subtitle}</h2></div>', + ' </div>', + " <hr />", + ' </div>', + self._build_toc(tokens, 0), + super(HTMLRenderer, self).render(tokens[6:]), + ' </div>', + self._file_footer(toc), + ]) + + def _file_header(self, toc: TocEntry) -> str: + prev_link, up_link, next_link = "", "", "" + prev_a, next_a, parent_title = "", "", " " + home = toc.root + if toc.prev: + prev_link = f'<link rel="prev" href="{toc.prev.target.href()}" title="{toc.prev.target.title}" />' + prev_a = f'<a accesskey="p" href="{toc.prev.target.href()}">Prev</a>' + if toc.parent: + up_link = ( + f'<link rel="up" href="{toc.parent.target.href()}" ' + f'title="{toc.parent.target.title}" />' + ) + if (part := toc.parent) and part.kind != 'book': + assert part.target.title + parent_title = part.target.title + if toc.next: + next_link = f'<link rel="next" href="{toc.next.target.href()}" title="{toc.next.target.title}" />' + next_a = f'<a accesskey="n" href="{toc.next.target.href()}">Next</a>' + return "\n".join([ + '<?xml version="1.0" encoding="utf-8" standalone="no"?>', + '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"', + ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', + '<html xmlns="http://www.w3.org/1999/xhtml">', + ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />', + f' <title>{toc.target.title}</title>', + "".join((f'<link rel="stylesheet" type="text/css" href="{html.escape(style, True)}" />' + for style in self._html_params.stylesheets)), + "".join((f'<script src="{html.escape(script, True)}" type="text/javascript"></script>' + for script in self._html_params.scripts)), + f' <meta name="generator" content="{html.escape(self._html_params.generator, True)}" />', + f' <link rel="home" href="{home.target.href()}" title="{home.target.title}" />', + f' {up_link}{prev_link}{next_link}', + ' </head>', + ' <body>', + ' <div class="navheader">', + ' <table width="100%" summary="Navigation header">', + ' <tr>', + f' <th colspan="3" align="center">{toc.target.title}</th>', + ' </tr>', + ' <tr>', + f' <td width="20%" align="left">{prev_a} </td>', + f' <th width="60%" align="center">{parent_title}</th>', + f' <td width="20%" align="right"> {next_a}</td>', + ' </tr>', + ' </table>', + ' <hr />', + ' </div>', + ]) + + def _file_footer(self, toc: TocEntry) -> str: + # prev, next = self._get_prev_and_next() + prev_a, up_a, home_a, next_a = "", " ", " ", "" + prev_text, up_text, next_text = "", "", "" + home = toc.root + if toc.prev: + prev_a = f'<a accesskey="p" href="{toc.prev.target.href()}">Prev</a>' + assert toc.prev.target.title + prev_text = toc.prev.target.title + if toc.parent: + home_a = f'<a accesskey="h" href="{home.target.href()}">Home</a>' + if toc.parent != home: + up_a = f'<a accesskey="u" href="{toc.parent.target.href()}">Up</a>' + if toc.next: + next_a = f'<a accesskey="n" href="{toc.next.target.href()}">Next</a>' + assert toc.next.target.title + next_text = toc.next.target.title + return "\n".join([ + ' <div class="navfooter">', + ' <hr />', + ' <table width="100%" summary="Navigation footer">', + ' <tr>', + f' <td width="40%" align="left">{prev_a} </td>', + f' <td width="20%" align="center">{up_a}</td>', + f' <td width="40%" align="right"> {next_a}</td>', + ' </tr>', + ' <tr>', + f' <td width="40%" align="left" valign="top">{prev_text} </td>', + f' <td width="20%" align="center">{home_a}</td>', + f' <td width="40%" align="right" valign="top"> {next_text}</td>', + ' </tr>', + ' </table>', + ' </div>', + ' </body>', + '</html>', + ]) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> str: + if token.tag == 'h1': + return self._toplevel_tag + return super()._heading_tag(token, tokens, i) + def _build_toc(self, tokens: Sequence[Token], i: int) -> str: + toc = TocEntry.of(tokens[i]) + if toc.kind == 'section': + return "" + def walk_and_emit(toc: TocEntry, depth: int) -> list[str]: + if depth <= 0: + return [] + result = [] + for child in toc.children: + result.append( + f'<dt>' + f' <span class="{html.escape(child.kind, True)}">' + f' <a href="{child.target.href()}">{child.target.toc_html}</a>' + f' </span>' + f'</dt>' + ) + # we want to look straight through parts because docbook-xsl does too, but it + # also makes for more uesful top-level tocs. + next_level = walk_and_emit(child, depth - (0 if child.kind == 'part' else 1)) + if next_level: + result.append(f'<dd><dl>{"".join(next_level)}</dl></dd>') + return result + toc_depth = ( + self._html_params.chunk_toc_depth + if toc.starts_new_chunk and toc.kind != 'book' + else self._html_params.toc_depth + ) + if not (items := walk_and_emit(toc, toc_depth)): + return "" + return ( + f'<div class="toc">' + f' <p><strong>Table of Contents</strong></p>' + f' <dl class="toc">' + f' {"".join(items)}' + f' </dl>' + f'</div>' + ) + + def _make_hN(self, level: int) -> tuple[str, str]: + # for some reason chapters don't increase the hN nesting count in docbook xslts. duplicate + # this for consistency. + if self._toplevel_tag == 'chapter': + level -= 1 + # TODO docbook compat. these are never useful for us, but not having them breaks manual + # compare workflows while docbook is still allowed. + style = "" + if level + self._hlevel_offset < 3 \ + and (self._toplevel_tag == 'section' or (self._toplevel_tag == 'chapter' and level > 0)): + style = "clear: both" + tag, hstyle = super()._make_hN(max(1, level)) + return tag, style + + def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int) -> str: + outer, inner = [], [] + # since books have no non-include content the toplevel book wrapper will not count + # towards nesting depth. other types will have at least a title+id heading which + # *does* count towards the nesting depth. chapters give a -1 to included sections + # mirroring the special handing in _make_hN. sigh. + hoffset = ( + 0 if not self._headings + else self._headings[-1].level - 1 if self._toplevel_tag == 'chapter' + else self._headings[-1].level + ) + outer.append(self._maybe_close_partintro()) + into = token.meta['include-args'].get('into-file') + fragments = token.meta['included'] + state = self._push(tag, hoffset) + if into: + toc = TocEntry.of(fragments[0][0][0]) + inner.append(self._file_header(toc)) + # we do not set _hlevel_offset=0 because docbook doesn't either. + else: + inner = outer + for included, path in fragments: + try: + inner.append(self.render(included)) + except Exception as e: + raise RuntimeError(f"rendering {path}") from e + if into: + inner.append(self._file_footer(toc)) + (self._base_path / into).write_text("".join(inner)) + self._pop(state) + return "".join(outer) + + def included_options(self, token: Token, tokens: Sequence[Token], i: int) -> str: + conv = options.HTMLConverter(self._manpage_urls, self._revision, False, + token.meta['list-id'], token.meta['id-prefix'], + self._xref_targets) + conv.add_options(token.meta['source']) + return conv.finalize() + +def _to_base26(n: int) -> str: + return (_to_base26(n // 26) if n > 26 else "") + chr(ord("A") + n % 26) + +class HTMLConverter(BaseConverter[ManualHTMLRenderer]): + INCLUDE_ARGS_NS = "html" + INCLUDE_FRAGMENT_ALLOWED_ARGS = { 'into-file' } + + _revision: str + _html_params: HTMLParameters + _manpage_urls: Mapping[str, str] + _xref_targets: dict[str, XrefTarget] + _redirection_targets: set[str] + _appendix_count: int = 0 + + def _next_appendix_id(self) -> str: + self._appendix_count += 1 + return _to_base26(self._appendix_count - 1) + + def __init__(self, revision: str, html_params: HTMLParameters, manpage_urls: Mapping[str, str]): + super().__init__() + self._revision, self._html_params, self._manpage_urls = revision, html_params, manpage_urls + self._xref_targets = {} + self._redirection_targets = set() + # renderer not set on purpose since it has a dependency on the output path! + + def convert(self, infile: Path, outfile: Path) -> None: + self._renderer = ManualHTMLRenderer('book', self._revision, self._html_params, + self._manpage_urls, self._xref_targets, outfile.parent) + super().convert(infile, outfile) + + def _parse(self, src: str) -> list[Token]: + tokens = super()._parse(src) + for token in tokens: + if not token.type.startswith('included_') \ + or not (into := token.meta['include-args'].get('into-file')): + continue + assert token.map + if len(token.meta['included']) == 0: + raise RuntimeError(f"redirection target {into} in line {token.map[0] + 1} is empty!") + # we use blender-style //path to denote paths relative to the origin file + # (usually index.html). this makes everything a lot easier and clearer. + if not into.startswith("//") or '/' in into[2:]: + raise RuntimeError(f"html:into-file must be a relative-to-origin //filename", into) + into = token.meta['include-args']['into-file'] = into[2:] + if into in self._redirection_targets: + raise RuntimeError(f"redirection target {into} in line {token.map[0] + 1} is already in use") + self._redirection_targets.add(into) + return tokens + + # xref | (id, type, heading inlines, file, starts new file) + def _collect_ids(self, tokens: Sequence[Token], target_file: str, typ: str, file_changed: bool + ) -> list[XrefTarget | tuple[str, str, Token, str, bool]]: + result: list[XrefTarget | tuple[str, str, Token, str, bool]] = [] + # collect all IDs and their xref substitutions. headings are deferred until everything + # has been parsed so we can resolve links in headings. if that's even used anywhere. + for (i, bt) in enumerate(tokens): + if bt.type == 'heading_open' and (id := cast(str, bt.attrs.get('id', ''))): + result.append((id, typ if bt.tag == 'h1' else 'section', tokens[i + 1], target_file, + i == 0 and file_changed)) + elif bt.type == 'included_options': + id_prefix = bt.meta['id-prefix'] + for opt in bt.meta['source'].keys(): + id = make_xml_id(f"{id_prefix}{opt}") + name = html.escape(opt) + result.append(XrefTarget(id, f'<code class="option">{name}</code>', name, None, target_file)) + elif bt.type.startswith('included_'): + sub_file = bt.meta['include-args'].get('into-file', target_file) + subtyp = bt.type.removeprefix('included_').removesuffix('s') + for si, (sub, _path) in enumerate(bt.meta['included']): + result += self._collect_ids(sub, sub_file, subtyp, si == 0 and sub_file != target_file) + elif bt.type == 'inline': + assert bt.children + result += self._collect_ids(bt.children, target_file, typ, False) + elif id := cast(str, bt.attrs.get('id', '')): + # anchors and examples have no titles we could use, but we'll have to put + # *something* here to communicate that there's no title. + result.append(XrefTarget(id, "???", None, None, target_file)) + return result + + def _render_xref(self, id: str, typ: str, inlines: Token, path: str, drop_fragment: bool) -> XrefTarget: + assert inlines.children + title_html = self._renderer.renderInline(inlines.children) + if typ == 'appendix': + # NOTE the docbook compat is strong here + n = self._next_appendix_id() + prefix = f"Appendix\u00A0{n}.\u00A0" + # HACK for docbook compat: prefix the title inlines with appendix id if + # necessary. the alternative is to mess with titlepage rendering in headings, + # which seems just a lot worse than this + prefix_tokens = [Token(type='text', tag='', nesting=0, content=prefix)] + inlines.children = prefix_tokens + list(inlines.children) + title = prefix + title_html + toc_html = f"{n}. {title_html}" + title_html = f"Appendix {n}" + else: + toc_html, title = title_html, title_html + title_html = ( + f"<em>{title_html}</em>" + if typ == 'chapter' + else title_html if typ in [ 'book', 'part' ] + else f'the section called “{title_html}”' + ) + return XrefTarget(id, title_html, toc_html, re.sub('<.*?>', '', title), path, drop_fragment) + + def _postprocess(self, infile: Path, outfile: Path, tokens: Sequence[Token]) -> None: + xref_queue = self._collect_ids(tokens, outfile.name, 'book', True) + + failed = False + deferred = [] + while xref_queue: + for item in xref_queue: + try: + target = item if isinstance(item, XrefTarget) else self._render_xref(*item) + except UnresolvedXrefError as e: + if failed: + raise + deferred.append(item) + continue + + if target.id in self._xref_targets: + raise RuntimeError(f"found duplicate id #{target.id}") + self._xref_targets[target.id] = target + if len(deferred) == len(xref_queue): + failed = True # do another round and report the first error + xref_queue = deferred + + TocEntry.collect_and_link(self._xref_targets, tokens) + def _build_cli_db(p: argparse.ArgumentParser) -> None: @@ -210,18 +600,40 @@ def _build_cli_db(p: argparse.ArgumentParser) -> None: p.add_argument('infile', type=Path) p.add_argument('outfile', type=Path) +def _build_cli_html(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--generator', default='nixos-render-docs') + p.add_argument('--stylesheet', default=[], action='append') + p.add_argument('--script', default=[], action='append') + p.add_argument('--toc-depth', default=1, type=int) + p.add_argument('--chunk-toc-depth', default=1, type=int) + p.add_argument('infile', type=Path) + p.add_argument('outfile', type=Path) + def _run_cli_db(args: argparse.Namespace) -> None: with open(args.manpage_urls, 'r') as manpage_urls: md = DocBookConverter(json.load(manpage_urls), args.revision) - converted = md.convert(args.infile) - args.outfile.write_text(converted) + md.convert(args.infile, args.outfile) + +def _run_cli_html(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = HTMLConverter( + args.revision, + HTMLParameters(args.generator, args.stylesheet, args.script, args.toc_depth, + args.chunk_toc_depth), + json.load(manpage_urls)) + md.convert(args.infile, args.outfile) def build_cli(p: argparse.ArgumentParser) -> None: formats = p.add_subparsers(dest='format', required=True) _build_cli_db(formats.add_parser('docbook')) + _build_cli_html(formats.add_parser('html')) def run_cli(args: argparse.Namespace) -> None: if args.format == 'docbook': _run_cli_db(args) + elif args.format == 'html': + _run_cli_html(args) else: raise RuntimeError('format not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py new file mode 100644 index 00000000000..c271ca3c5aa --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py @@ -0,0 +1,186 @@ +from __future__ import annotations + +import dataclasses as dc +import html +import itertools + +from typing import cast, get_args, Iterable, Literal, Sequence + +from markdown_it.token import Token + +from .utils import Freezeable + +# FragmentType is used to restrict structural include blocks. +FragmentType = Literal['preface', 'part', 'chapter', 'section', 'appendix'] + +# in the TOC all fragments are allowed, plus the all-encompassing book. +TocEntryType = Literal['book', 'preface', 'part', 'chapter', 'section', 'appendix'] + +def is_include(token: Token) -> bool: + return token.type == "fence" and token.info.startswith("{=include=} ") + +# toplevel file must contain only the title headings and includes, anything else +# would cause strange rendering. +def _check_book_structure(tokens: Sequence[Token]) -> None: + for token in tokens[6:]: + if not is_include(token): + assert token.map + raise RuntimeError(f"unexpected content in line {token.map[0] + 1}, " + "expected structural include") + +# much like books, parts may not contain headings other than their title heading. +# this is a limitation of the current renderers and TOC generators that do not handle +# this case well even though it is supported in docbook (and probably supportable +# anywhere else). +def _check_part_structure(tokens: Sequence[Token]) -> None: + _check_fragment_structure(tokens) + for token in tokens[3:]: + if token.type == 'heading_open': + assert token.map + raise RuntimeError(f"unexpected heading in line {token.map[0] + 1}") + +# two include blocks must either be adjacent or separated by a heading, otherwise +# we cannot generate a correct TOC (since there'd be nothing to link to between +# the two includes). +def _check_fragment_structure(tokens: Sequence[Token]) -> None: + for i, token in enumerate(tokens): + if is_include(token) \ + and i + 1 < len(tokens) \ + and not (is_include(tokens[i + 1]) or tokens[i + 1].type == 'heading_open'): + assert token.map + raise RuntimeError(f"unexpected content in line {token.map[0] + 1}, " + "expected heading or structural include") + +def check_structure(kind: TocEntryType, tokens: Sequence[Token]) -> None: + wanted = { 'h1': 'title' } + wanted |= { 'h2': 'subtitle' } if kind == 'book' else {} + for (i, (tag, role)) in enumerate(wanted.items()): + if len(tokens) < 3 * (i + 1): + raise RuntimeError(f"missing {role} ({tag}) heading") + token = tokens[3 * i] + if token.type != 'heading_open' or token.tag != tag: + assert token.map + raise RuntimeError(f"expected {role} ({tag}) heading in line {token.map[0] + 1}", token) + for t in tokens[3 * len(wanted):]: + if t.type != 'heading_open' or not (role := wanted.get(t.tag, '')): + continue + assert t.map + raise RuntimeError( + f"only one {role} heading ({t.markup} [text...]) allowed per " + f"{kind}, but found a second in line {t.map[0] + 1}. " + "please remove all such headings except the first or demote the subsequent headings.", + t) + + last_heading_level = 0 + for token in tokens: + if token.type != 'heading_open': + continue + + # book subtitle headings do not need an id, only book title headings do. + # every other headings needs one too. we need this to build a TOC and to + # provide stable links if the manual changes shape. + if 'id' not in token.attrs and (kind != 'book' or token.tag != 'h2'): + assert token.map + raise RuntimeError(f"heading in line {token.map[0] + 1} does not have an id") + + level = int(token.tag[1:]) # because tag = h1..h6 + if level > last_heading_level + 1: + assert token.map + raise RuntimeError(f"heading in line {token.map[0] + 1} skips one or more heading levels, " + "which is currently not allowed") + last_heading_level = level + + if kind == 'book': + _check_book_structure(tokens) + elif kind == 'part': + _check_part_structure(tokens) + else: + _check_fragment_structure(tokens) + +@dc.dataclass(frozen=True) +class XrefTarget: + id: str + """link label for `[](#local-references)`""" + title_html: str + """toc label""" + toc_html: str | None + """text for `<title>` tags and `title="..."` attributes""" + title: str | None + """path to file that contains the anchor""" + path: str + """whether to drop the `#anchor` from links when expanding xrefs""" + drop_fragment: bool = False + + def href(self) -> str: + path = html.escape(self.path, True) + return path if self.drop_fragment else f"{path}#{html.escape(self.id, True)}" + +@dc.dataclass +class TocEntry(Freezeable): + kind: TocEntryType + target: XrefTarget + parent: TocEntry | None = None + prev: TocEntry | None = None + next: TocEntry | None = None + children: list[TocEntry] = dc.field(default_factory=list) + starts_new_chunk: bool = False + + @property + def root(self) -> TocEntry: + return self.parent.root if self.parent else self + + @classmethod + def of(cls, token: Token) -> TocEntry: + entry = token.meta.get('TocEntry') + if not isinstance(entry, TocEntry): + raise RuntimeError('requested toc entry, none found', token) + return entry + + @classmethod + def collect_and_link(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token]) -> TocEntry: + result = cls._collect_entries(xrefs, tokens, 'book') + + def flatten_with_parent(this: TocEntry, parent: TocEntry | None) -> Iterable[TocEntry]: + this.parent = parent + return itertools.chain([this], *[ flatten_with_parent(c, this) for c in this.children ]) + + flat = list(flatten_with_parent(result, None)) + prev = flat[0] + prev.starts_new_chunk = True + paths_seen = set([prev.target.path]) + for c in flat[1:]: + if prev.target.path != c.target.path and c.target.path not in paths_seen: + c.starts_new_chunk = True + c.prev, prev.next = prev, c + prev = c + paths_seen.add(c.target.path) + + for c in flat: + c.freeze() + + return result + + @classmethod + def _collect_entries(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token], + kind: TocEntryType) -> TocEntry: + # we assume that check_structure has been run recursively over the entire input. + # list contains (tag, entry) pairs that will collapse to a single entry for + # the full sequence. + entries: list[tuple[str, TocEntry]] = [] + for token in tokens: + if token.type.startswith('included_') and (included := token.meta.get('included')): + fragment_type_str = token.type[9:].removesuffix('s') + assert fragment_type_str in get_args(TocEntryType) + fragment_type = cast(TocEntryType, fragment_type_str) + for fragment, _path in included: + entries[-1][1].children.append(cls._collect_entries(xrefs, fragment, fragment_type)) + elif token.type == 'heading_open' and (id := cast(str, token.attrs.get('id', ''))): + while len(entries) > 1 and entries[-1][0] >= token.tag: + entries[-2][1].children.append(entries.pop()[1]) + entries.append((token.tag, + TocEntry(kind if token.tag == 'h1' else 'section', xrefs[id]))) + token.meta['TocEntry'] = entries[-1][1] + + while len(entries) > 1: + entries[-2][1].children.append(entries.pop()[1]) + return entries[0][1] 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 index 96cc8af69bc..e8fee1b7132 100644 --- 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 @@ -1,6 +1,6 @@ from abc import ABC from collections.abc import Mapping, MutableMapping, Sequence -from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional +from typing import Any, Callable, cast, Generic, get_args, Iterable, Literal, NoReturn, Optional, TypeVar import dataclasses import re @@ -44,11 +44,11 @@ AttrBlockKind = Literal['admonition', 'example'] AdmonitionKind = Literal["note", "caution", "tip", "important", "warning"] -class Renderer(markdown_it.renderer.RendererProtocol): +class Renderer: _admonitions: dict[AdmonitionKind, tuple[RenderFn, RenderFn]] _admonition_stack: list[AdmonitionKind] - def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + def __init__(self, manpage_urls: Mapping[str, str]): self._manpage_urls = manpage_urls self.rules = { 'text': self.text, @@ -104,169 +104,120 @@ class Renderer(markdown_it.renderer.RendererProtocol): def _join_inline(self, ls: Iterable[str]) -> str: return "".join(ls) - def admonition_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def admonition_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: tag = token.meta['kind'] 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) + return self._admonitions[tag][0](token, tokens, i) + def admonition_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: + return self._admonitions[self._admonition_stack.pop()][1](token, tokens, i) - def render(self, tokens: Sequence[Token], options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def render(self, tokens: Sequence[Token]) -> 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) + return self.renderInline(token.children) elif token.type in self.rules: - return self.rules[token.type](tokens[i], tokens, i, options, env) + return self.rules[token.type](tokens[i], tokens, i) else: raise NotImplementedError("md token not supported yet", token) return self._join_block(map(lambda arg: do_one(*arg), enumerate(tokens))) - def renderInline(self, tokens: Sequence[Token], options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def renderInline(self, tokens: Sequence[Token]) -> 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) + return self.rules[token.type](tokens[i], tokens, i) else: raise NotImplementedError("md token not supported yet", token) return self._join_inline(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: + def text(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def softbreak(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def code_inline(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def code_block(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def link_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def link_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def em_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def em_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def strong_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def note_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def note_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def caution_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def caution_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def important_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def important_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def tip_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def tip_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def warning_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def warning_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dl_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dl_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dt_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dt_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dd_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def dd_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def myst_role(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) - def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) - def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) - def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported", token) def _is_escaped(src: str, pos: int) -> bool: @@ -466,12 +417,26 @@ def _block_attr(md: markdown_it.MarkdownIt) -> None: md.core.ruler.push("block_attr", block_attr) -class Converter(ABC): - __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] +TR = TypeVar('TR', bound='Renderer') - def __init__(self, manpage_urls: Mapping[str, str]): - self._manpage_urls = manpage_urls +class Converter(ABC, Generic[TR]): + # we explicitly disable markdown-it rendering support and use our own entirely. + # rendering is well separated from parsing and our renderers carry much more state than + # markdown-it easily acknowledges as 'good' (unless we used the untyped env args to + # shuttle that state around, which is very fragile) + class ForbiddenRenderer(markdown_it.renderer.RendererProtocol): + __output__ = "none" + + def __init__(self, parser: Optional[markdown_it.MarkdownIt]): + pass + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise NotImplementedError("do not use Converter._md.renderer. 'tis a silly place") + + _renderer: TR + def __init__(self) -> None: self._md = markdown_it.MarkdownIt( "commonmark", { @@ -479,7 +444,7 @@ class Converter(ABC): 'html': False, # not useful since we target many formats 'typographer': True, # required for smartquotes }, - renderer_cls=lambda parser: self.__renderer__(self._manpage_urls, parser) + renderer_cls=self.ForbiddenRenderer ) self._md.use( container_plugin, @@ -496,10 +461,9 @@ class Converter(ABC): self._md.use(_block_attr) self._md.enable(["smartquotes", "replacements"]) - def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: - return self._md.parse(src, env if env is not None else {}) + def _parse(self, src: str) -> list[Token]: + return self._md.parse(src, {}) - def _render(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> str: - env = {} if env is None else env - tokens = self._parse(src, env) - return self._md.renderer.render(tokens, self._md.options, env) # type: ignore[no-any-return] + def _render(self, src: str) -> str: + tokens = self._parse(src) + return self._renderer.render(tokens) 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 index f29d8fdb896..06e5f971121 100644 --- 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 @@ -1,23 +1,26 @@ from __future__ import annotations import argparse +import html import json +import xml.sax.saxutils as xml from abc import abstractmethod -from collections.abc import Mapping, MutableMapping, Sequence -from markdown_it.utils import OptionsDict +from collections.abc import Mapping, Sequence from markdown_it.token import Token -from typing import Any, Optional +from typing import Any, Generic, Optional from urllib.parse import quote -from xml.sax.saxutils import escape, quoteattr import markdown_it +from . import md from . import parallel from .asciidoc import AsciiDocRenderer, asciidoc_escape from .commonmark import CommonMarkRenderer from .docbook import DocBookRenderer, make_xml_id +from .html import HTMLRenderer from .manpage import ManpageRenderer, man_escape +from .manual_structure import XrefTarget from .md import Converter, md_escape, md_make_code from .types import OptionLoc, Option, RenderedOption @@ -30,15 +33,13 @@ def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]: return None return option[key] # type: ignore[return-value] -class BaseConverter(Converter): +class BaseConverter(Converter[md.TR], Generic[md.TR]): __option_block_separator__: str _options: dict[str, RenderedOption] - def __init__(self, manpage_urls: Mapping[str, str], - revision: str, - markdown_by_default: bool): - super().__init__(manpage_urls) + def __init__(self, revision: str, markdown_by_default: bool): + super().__init__() self._options = {} self._revision = revision self._markdown_by_default = markdown_by_default @@ -153,7 +154,7 @@ class BaseConverter(Converter): # since it's good enough so far. @classmethod @abstractmethod - def _parallel_render_init_worker(cls, a: Any) -> BaseConverter: raise NotImplementedError() + def _parallel_render_init_worker(cls, a: Any) -> BaseConverter[md.TR]: raise NotImplementedError() def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: try: @@ -162,7 +163,7 @@ class BaseConverter(Converter): raise Exception(f"Failed to render option {name}") from e @classmethod - def _parallel_render_step(cls, s: BaseConverter, a: Any) -> RenderedOption: + def _parallel_render_step(cls, s: BaseConverter[md.TR], a: Any) -> RenderedOption: return s._render_option(*a) def add_options(self, options: dict[str, Any]) -> None: @@ -175,32 +176,25 @@ class BaseConverter(Converter): def finalize(self) -> str: raise NotImplementedError() class OptionDocsRestrictions: - def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int) -> 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: + def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported in options doc", token) - def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported in options doc", token) - def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, - env: MutableMapping[str, Any]) -> str: + def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: raise RuntimeError("md token not supported in options doc", token) class OptionsDocBookRenderer(OptionDocsRestrictions, DocBookRenderer): # 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: + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: token.meta['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: + return super().ordered_list_open(token, tokens, i) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: token.meta['compact'] = False - return super().bullet_list_open(token, tokens, i, options, env) + return super().bullet_list_open(token, tokens, i) -class DocBookConverter(BaseConverter): - __renderer__ = OptionsDocBookRenderer +class DocBookConverter(BaseConverter[OptionsDocBookRenderer]): __option_block_separator__ = "" def __init__(self, manpage_urls: Mapping[str, str], @@ -209,13 +203,14 @@ class DocBookConverter(BaseConverter): document_type: str, varlist_id: str, id_prefix: str): - super().__init__(manpage_urls, revision, markdown_by_default) + super().__init__(revision, markdown_by_default) + self._renderer = OptionsDocBookRenderer(manpage_urls) self._document_type = document_type self._varlist_id = varlist_id self._id_prefix = id_prefix def _parallel_render_prepare(self) -> Any: - return (self._manpage_urls, self._revision, self._markdown_by_default, self._document_type, + return (self._renderer._manpage_urls, self._revision, self._markdown_by_default, self._document_type, self._varlist_id, self._id_prefix) @classmethod def _parallel_render_init_worker(cls, a: Any) -> DocBookConverter: @@ -248,10 +243,10 @@ class DocBookConverter(BaseConverter): def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: if href is not None: - href = " xlink:href=" + quoteattr(href) + href = " xlink:href=" + xml.quoteattr(href) return [ f"<member><filename{href}>", - escape(name), + xml.escape(name), "</filename></member>" ] @@ -281,8 +276,8 @@ class DocBookConverter(BaseConverter): result += [ "<varlistentry>", # NOTE adding extra spaces here introduces spaces into xref link expansions - (f"<term xlink:href={quoteattr('#' + id)} xml:id={quoteattr(id)}>" + - f"<option>{escape(name)}</option></term>"), + (f"<term xlink:href={xml.quoteattr('#' + id)} xml:id={xml.quoteattr(id)}>" + + f"<option>{xml.escape(name)}</option></term>"), "<listitem>" ] result += opt.lines @@ -300,11 +295,7 @@ class DocBookConverter(BaseConverter): class OptionsManpageRenderer(OptionDocsRestrictions, ManpageRenderer): pass -class ManpageConverter(BaseConverter): - def __renderer__(self, manpage_urls: Mapping[str, str], - parser: Optional[markdown_it.MarkdownIt] = None) -> OptionsManpageRenderer: - return OptionsManpageRenderer(manpage_urls, self._options_by_id, parser) - +class ManpageConverter(BaseConverter[OptionsManpageRenderer]): __option_block_separator__ = ".sp" _options_by_id: dict[str, str] @@ -314,8 +305,9 @@ class ManpageConverter(BaseConverter): *, # only for parallel rendering _options_by_id: Optional[dict[str, str]] = None): + super().__init__(revision, markdown_by_default) self._options_by_id = _options_by_id or {} - super().__init__({}, revision, markdown_by_default) + self._renderer = OptionsManpageRenderer({}, self._options_by_id) def _parallel_render_prepare(self) -> Any: return ((self._revision, self._markdown_by_default), { '_options_by_id': self._options_by_id }) @@ -324,10 +316,9 @@ class ManpageConverter(BaseConverter): return cls(*a[0], **a[1]) def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: - assert isinstance(self._md.renderer, OptionsManpageRenderer) - links = self._md.renderer.link_footnotes = [] + links = self._renderer.link_footnotes = [] result = super()._render_option(name, option) - self._md.renderer.link_footnotes = None + self._renderer.link_footnotes = None return result._replace(links=links) def add_options(self, options: dict[str, Any]) -> None: @@ -339,12 +330,11 @@ class ManpageConverter(BaseConverter): if lit := option_is(option, key, 'literalDocBook'): raise RuntimeError("can't render manpages in the presence of docbook") else: - assert isinstance(self._md.renderer, OptionsManpageRenderer) try: - self._md.renderer.inline_code_is_quoted = False + self._renderer.inline_code_is_quoted = False return super()._render_code(option, key) finally: - self._md.renderer.inline_code_is_quoted = True + self._renderer.inline_code_is_quoted = True def _render_description(self, desc: str | dict[str, Any]) -> list[str]: if isinstance(desc, str) and not self._markdown_by_default: @@ -428,12 +418,15 @@ class ManpageConverter(BaseConverter): class OptionsCommonMarkRenderer(OptionDocsRestrictions, CommonMarkRenderer): pass -class CommonMarkConverter(BaseConverter): - __renderer__ = OptionsCommonMarkRenderer +class CommonMarkConverter(BaseConverter[OptionsCommonMarkRenderer]): __option_block_separator__ = "" + def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool): + super().__init__(revision, markdown_by_default) + self._renderer = OptionsCommonMarkRenderer(manpage_urls) + def _parallel_render_prepare(self) -> Any: - return (self._manpage_urls, self._revision, self._markdown_by_default) + return (self._renderer._manpage_urls, self._revision, self._markdown_by_default) @classmethod def _parallel_render_init_worker(cls, a: Any) -> CommonMarkConverter: return cls(*a) @@ -481,12 +474,15 @@ class CommonMarkConverter(BaseConverter): class OptionsAsciiDocRenderer(OptionDocsRestrictions, AsciiDocRenderer): pass -class AsciiDocConverter(BaseConverter): - __renderer__ = AsciiDocRenderer +class AsciiDocConverter(BaseConverter[OptionsAsciiDocRenderer]): __option_block_separator__ = "" + def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool): + super().__init__(revision, markdown_by_default) + self._renderer = OptionsAsciiDocRenderer(manpage_urls) + def _parallel_render_prepare(self) -> Any: - return (self._manpage_urls, self._revision, self._markdown_by_default) + return (self._renderer._manpage_urls, self._revision, self._markdown_by_default) @classmethod def _parallel_render_init_worker(cls, a: Any) -> AsciiDocConverter: return cls(*a) @@ -531,6 +527,109 @@ class AsciiDocConverter(BaseConverter): return "\n".join(result) +class OptionsHTMLRenderer(OptionDocsRestrictions, HTMLRenderer): + # TODO docbook compat. must be removed together with the matching docbook handlers. + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + token.meta['compact'] = False + return super().ordered_list_open(token, tokens, i) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: + token.meta['compact'] = False + return super().bullet_list_open(token, tokens, i) + def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: + # TODO use token.info. docbook doesn't so we can't yet. + return f'<pre class="programlisting">{html.escape(token.content)}</pre>' + +class HTMLConverter(BaseConverter[OptionsHTMLRenderer]): + __option_block_separator__ = "" + + def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool, + varlist_id: str, id_prefix: str, xref_targets: Mapping[str, XrefTarget]): + super().__init__(revision, markdown_by_default) + self._xref_targets = xref_targets + self._varlist_id = varlist_id + self._id_prefix = id_prefix + self._renderer = OptionsHTMLRenderer(manpage_urls, self._xref_targets) + + def _parallel_render_prepare(self) -> Any: + return (self._renderer._manpage_urls, self._revision, self._markdown_by_default, + self._varlist_id, self._id_prefix, self._xref_targets) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> HTMLConverter: + return cls(*a) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + raise RuntimeError("can't render html in the presence of docbook") + 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: + raise RuntimeError("can't render html in the presence of docbook") + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + '<p><span class="emphasis"><em>Related packages:</em></span></p>', + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f'<p><span class="emphasis"><em>{header}:</em></span></p>', + '<table border="0" summary="Simple list" class="simplelist">' + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + href = f' href="{html.escape(href, True)}"' + return [ + "<tr><td>", + f'<code class="filename"><a class="filename" {href} target="_top">', + f'{html.escape(name)}', + '</a></code>', + "</td></tr>" + ] + + def _decl_def_footer(self) -> list[str]: + return [ "</table>" ] + + def finalize(self) -> str: + result = [] + + result += [ + '<div class="variablelist">', + f'<a id="{html.escape(self._varlist_id, True)}"></a>', + ' <dl class="variablelist">', + ] + + for (name, opt) in self._sorted_options(): + id = make_xml_id(self._id_prefix + name) + target = self._xref_targets[id] + result += [ + '<dt>', + ' <span class="term">', + # docbook compat, these could be one tag + f' <a id="{html.escape(id, True)}"></a><a class="term" href="{target.href()}">' + # no spaces here (and string merging) for docbook output compat + f'<code class="option">{html.escape(name)}</code>', + ' </a>', + ' </span>', + '</dt>', + '<dd>', + ] + result += opt.lines + result += [ + "</dd>", + ] + + result += [ + " </dl>", + "</div>" + ] + + 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) 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 index d20e056aacd..c6146429ea0 100644 --- 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 @@ -1,8 +1,7 @@ -from collections.abc import Sequence, MutableMapping +from collections.abc import Sequence 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]] @@ -12,4 +11,4 @@ class RenderedOption(NamedTuple): lines: list[str] links: Optional[list[str]] = None -RenderFn = Callable[[Token, Sequence[Token], int, OptionsDict, MutableMapping[str, Any]], str] +RenderFn = Callable[[Token, Sequence[Token], int], str] diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py new file mode 100644 index 00000000000..3377d1fa4fe --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py @@ -0,0 +1,21 @@ +from typing import Any + +_frozen_classes: dict[type, type] = {} + +# make a derived class freezable (ie, disallow modifications). +# we do this by changing the class of an instance at runtime when freeze() +# is called, providing a derived class that is exactly the same except +# for a __setattr__ that raises an error when called. this beats having +# a field for frozenness and an unconditional __setattr__ that checks this +# field because it does not insert anything into the class dict. +class Freezeable: + def freeze(self) -> None: + cls = type(self) + if not (frozen := _frozen_classes.get(cls)): + def __setattr__(instance: Any, n: str, v: Any) -> None: + raise TypeError(f'{cls.__name__} is frozen') + frozen = type(cls.__name__, (cls,), { + '__setattr__': __setattr__, + }) + _frozen_classes[cls] = frozen + self.__class__ = frozen diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py index 48750646995..3cf5b208f39 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py @@ -1,9 +1,11 @@ -import nixos_render_docs +import nixos_render_docs as nrd from sample_md import sample1 -class Converter(nixos_render_docs.md.Converter): - __renderer__ = nixos_render_docs.asciidoc.AsciiDocRenderer +class Converter(nrd.md.Converter[nrd.asciidoc.AsciiDocRenderer]): + def __init__(self, manpage_urls: dict[str, str]): + super().__init__() + self._renderer = nrd.asciidoc.AsciiDocRenderer(manpage_urls) def test_lists() -> None: c = Converter({}) diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py index 5e0d63eb672..72700d3dbab 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py @@ -1,4 +1,4 @@ -import nixos_render_docs +import nixos_render_docs as nrd from sample_md import sample1 @@ -6,8 +6,10 @@ from typing import Mapping, Optional import markdown_it -class Converter(nixos_render_docs.md.Converter): - __renderer__ = nixos_render_docs.commonmark.CommonMarkRenderer +class Converter(nrd.md.Converter[nrd.commonmark.CommonMarkRenderer]): + def __init__(self, manpage_urls: Mapping[str, str]): + super().__init__() + self._renderer = nrd.commonmark.CommonMarkRenderer(manpage_urls) # NOTE: in these tests we represent trailing spaces by ` ` and replace them with real space later, # since a number of editors will strip trailing whitespace on save and that would break the tests. 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 index 0b73cdc8e7c..8cbf3dabcea 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py @@ -1,10 +1,12 @@ -import nixos_render_docs +import nixos_render_docs as nrd from markdown_it.token import Token -class Converter(nixos_render_docs.md.Converter): +class Converter(nrd.md.Converter[nrd.docbook.DocBookRenderer]): # actual renderer doesn't matter, we're just parsing. - __renderer__ = nixos_render_docs.docbook.DocBookRenderer + def __init__(self, manpage_urls: dict[str, str]) -> None: + super().__init__() + self._renderer = nrd.docbook.DocBookRenderer(manpage_urls) def test_heading_id_absent() -> None: c = Converter({}) diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py new file mode 100644 index 00000000000..df366a8babd --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py @@ -0,0 +1,179 @@ +import nixos_render_docs as nrd +import pytest + +from sample_md import sample1 + +class Converter(nrd.md.Converter[nrd.html.HTMLRenderer]): + def __init__(self, manpage_urls: dict[str, str], xrefs: dict[str, nrd.manual_structure.XrefTarget]): + super().__init__() + self._renderer = nrd.html.HTMLRenderer(manpage_urls, xrefs) + +def unpretty(s: str) -> str: + return "".join(map(str.strip, s.splitlines())).replace('␣', ' ').replace('↵', '\n') + +def test_lists_styles() -> None: + # nested lists rotate through a number of list style + c = Converter({}, {}) + assert c._render("- - - - foo") == unpretty(""" + <div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: disc;"> + <li class="listitem"> + <div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: circle;"> + <li class="listitem"> + <div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: square;"> + <li class="listitem"> + <div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: disc;"> + <li class="listitem"><p>foo</p></li> + </ul></div> + </li> + </ul></div> + </li> + </ul></div> + </li> + </ul></div> + """) + assert c._render("1. 1. 1. 1. 1. 1. foo") == unpretty(""" + <div class="orderedlist"><ol class="orderedlist compact" type="1"> + <li class="listitem"> + <div class="orderedlist"><ol class="orderedlist compact" type="a"> + <li class="listitem"> + <div class="orderedlist"><ol class="orderedlist compact" type="i"> + <li class="listitem"> + <div class="orderedlist"><ol class="orderedlist compact" type="A"> + <li class="listitem"> + <div class="orderedlist"><ol class="orderedlist compact" type="I"> + <li class="listitem"> + <div class="orderedlist"><ol class="orderedlist compact" type="1"> + <li class="listitem"><p>foo</p></li> + </ol></div> + </li> + </ol></div> + </li> + </ol></div> + </li> + </ol></div> + </li> + </ol></div> + </li> + </ol></div> + """) + +def test_xrefs() -> None: + # nested lists rotate through a number of list style + c = Converter({}, { + 'foo': nrd.manual_structure.XrefTarget('foo', '<hr/>', 'toc1', 'title1', 'index.html'), + 'bar': nrd.manual_structure.XrefTarget('bar', '<br/>', 'toc2', 'title2', 'index.html', True), + }) + assert c._render("[](#foo)") == '<p><a class="xref" href="index.html#foo" title="title1" ><hr/></a></p>' + assert c._render("[](#bar)") == '<p><a class="xref" href="index.html" title="title2" ><br/></a></p>' + with pytest.raises(nrd.html.UnresolvedXrefError) as exc: + c._render("[](#baz)") + assert exc.value.args[0] == 'bad local reference, id #baz not known' + +def test_full() -> None: + c = Converter({ 'man(1)': 'http://example.org' }, {}) + assert c._render(sample1) == unpretty(""" + <div class="warning"> + <h3 class="title">Warning</h3> + <p>foo</p> + <div class="note"> + <h3 class="title">Note</h3> + <p>nested</p> + </div> + </div> + <p> + <a class="link" href="link" target="_top">↵ + multiline↵ + </a> + </p> + <p> + <a class="link" href="http://example.org" target="_top"> + <span class="citerefentry"><span class="refentrytitle">man</span>(1)</span> + </a> reference + </p> + <p><a id="b" />some <a id="a" />nested anchors</p> + <p> + <span class="emphasis"><em>emph</em></span>␣ + <span class="strong"><strong>strong</strong></span>␣ + <span class="emphasis"><em>nesting emph <span class="strong"><strong>and strong</strong></span>␣ + and <code class="literal">code</code></em></span> + </p> + <div class="itemizedlist"> + <ul class="itemizedlist " style="list-style-type: disc;"> + <li class="listitem"><p>wide bullet</p></li> + <li class="listitem"><p>list</p></li> + </ul> + </div> + <div class="orderedlist"> + <ol class="orderedlist " type="1"> + <li class="listitem"><p>wide ordered</p></li> + <li class="listitem"><p>list</p></li> + </ol> + </div> + <div class="itemizedlist"> + <ul class="itemizedlist compact" style="list-style-type: disc;"> + <li class="listitem"><p>narrow bullet</p></li> + <li class="listitem"><p>list</p></li> + </ul> + </div> + <div class="orderedlist"> + <ol class="orderedlist compact" type="1"> + <li class="listitem"><p>narrow ordered</p></li> + <li class="listitem"><p>list</p></li> + </ol> + </div> + <div class="blockquote"> + <blockquote class="blockquote"> + <p>quotes</p> + <div class="blockquote"> + <blockquote class="blockquote"> + <p>with <span class="emphasis"><em>nesting</em></span></p> + <pre class="programlisting">↵ + nested code block↵ + </pre> + </blockquote> + </div> + <div class="itemizedlist"> + <ul class="itemizedlist compact" style="list-style-type: disc;"> + <li class="listitem"><p>and lists</p></li> + <li class="listitem"> + <pre class="programlisting">↵ + containing code↵ + </pre> + </li> + </ul> + </div> + <p>and more quote</p> + </blockquote> + </div> + <div class="orderedlist"> + <ol class="orderedlist compact" start="100" type="1"> + <li class="listitem"><p>list starting at 100</p></li> + <li class="listitem"><p>goes on</p></li> + </ol> + </div> + <div class="variablelist"> + <dl class="variablelist"> + <dt><span class="term">deflist</span></dt> + <dd> + <div class="blockquote"> + <blockquote class="blockquote"> + <p> + with a quote↵ + and stuff + </p> + </blockquote> + </div> + <pre class="programlisting">↵ + code block↵ + </pre> + <pre class="programlisting">↵ + fenced block↵ + </pre> + <p>text</p> + </dd> + <dt><span class="term">more stuff in same deflist</span></dt> + <dd> + <p>foo</p> + </dd> + </dl> + </div>""") 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 index 660c410a85c..f53442a96d4 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py @@ -1,11 +1,13 @@ -import nixos_render_docs +import nixos_render_docs as nrd import pytest from markdown_it.token import Token -class Converter(nixos_render_docs.md.Converter): +class Converter(nrd.md.Converter[nrd.docbook.DocBookRenderer]): # actual renderer doesn't matter, we're just parsing. - __renderer__ = nixos_render_docs.docbook.DocBookRenderer + def __init__(self, manpage_urls: dict[str, str]) -> None: + super().__init__() + self._renderer = nrd.docbook.DocBookRenderer(manpage_urls) @pytest.mark.parametrize("ordered", [True, False]) def test_list_wide(ordered: bool) -> None: diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py index fbfd21358a8..9b7e1652f0f 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py @@ -1,4 +1,4 @@ -import nixos_render_docs +import nixos_render_docs as nrd from sample_md import sample1 @@ -6,15 +6,10 @@ from typing import Mapping, Optional import markdown_it -class Converter(nixos_render_docs.md.Converter): - def __renderer__(self, manpage_urls: Mapping[str, str], - parser: Optional[markdown_it.MarkdownIt] = None - ) -> nixos_render_docs.manpage.ManpageRenderer: - return nixos_render_docs.manpage.ManpageRenderer(manpage_urls, self.options_by_id, parser) - +class Converter(nrd.md.Converter[nrd.manpage.ManpageRenderer]): def __init__(self, manpage_urls: Mapping[str, str], options_by_id: dict[str, str] = {}): - self.options_by_id = options_by_id - super().__init__(manpage_urls) + super().__init__() + self._renderer = nrd.manpage.ManpageRenderer(manpage_urls, options_by_id) def test_inline_code() -> None: c = Converter({}) @@ -32,17 +27,15 @@ def test_expand_link_targets() -> None: def test_collect_links() -> None: c = Converter({}, { '#foo': "bar" }) - assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) - c._md.renderer.link_footnotes = [] + c._renderer.link_footnotes = [] assert c._render("[a](link1) [b](link2)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[2]\\fR" - assert c._md.renderer.link_footnotes == ['link1', 'link2'] + assert c._renderer.link_footnotes == ['link1', 'link2'] def test_dedup_links() -> None: c = Converter({}, { '#foo': "bar" }) - assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) - c._md.renderer.link_footnotes = [] + c._renderer.link_footnotes = [] assert c._render("[a](link) [b](link)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[1]\\fR" - assert c._md.renderer.link_footnotes == ['link'] + assert c._renderer.link_footnotes == ['link'] def test_full() -> None: c = Converter({ 'man(1)': 'http://example.org' }) 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 index 1d836a916d9..f94ede6382b 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -1,10 +1,12 @@ -import nixos_render_docs +import nixos_render_docs as nrd from markdown_it.token import Token -class Converter(nixos_render_docs.md.Converter): +class Converter(nrd.md.Converter[nrd.docbook.DocBookRenderer]): # actual renderer doesn't matter, we're just parsing. - __renderer__ = nixos_render_docs.docbook.DocBookRenderer + def __init__(self, manpage_urls: dict[str, str]) -> None: + super().__init__() + self._renderer = nrd.docbook.DocBookRenderer(manpage_urls) def test_attr_span_parsing() -> None: c = Converter({}) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index e4edd20221a..8f158790a7a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-cR0ixSnvyj6ZQ9rZielxXr8JfmMJKNru3S++WH4O/YU="; + hash = "sha256-jAhIpNjWtcm1DEoz1XnzYiuEwxiwLotNxpbwcDcRxPM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 6fee9ea187c..f006bb60190 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.69.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-Mc9yI18D4OYv8l4axQ8W0XZ8HfmEZ5IhHC6/uKkv0Ec="; + sha256 = "sha256-tuHrkL3tL+sCLPxNElVgnb4zQ6OTu65X9pb/cX6vD/w="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 7b041df665e..7d3f3a21f1b 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-VSogUulfBTmZMmBbw9Ya/kfoHZlvJMujCPdjhRsjnPo="; + sha256 = "sha256-murez5uHLv1YXIaDDaFXCDPPggK1GAXjaSmZJhlqN80="; }; doCheck = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config nix ]; - cargoSha256 = "sha256-DZQ1Q+4I6Qm2WFvBoPNILp0wwP+01msx6zP12EHaPQc="; + cargoSha256 = "sha256-+6I6+LZs84OcyebAIg/9KeAxV1UdK9IgaT7UsPJ5rWQ="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index a24fd43bc6f..8b8e6d811d5 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.15.0"; + version = "0.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-Q3yExefODBrrziRnCYETrJgSn42BOR7ZsL8pu3q5D/w="; + sha256 = "sha256-AYw2czg8HwA/ATQZO0snfb5GRsz77J6cPGDQ8b4W6AI="; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index f0032916db9..6425ae8721c 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -12,6 +12,7 @@ let atLeast27 = lib.versionAtLeast version "2.7pre"; atLeast210 = lib.versionAtLeast version "2.10pre"; atLeast213 = lib.versionAtLeast version "2.13pre"; + atLeast214 = lib.versionAtLeast version "2.14pre"; in { stdenv , autoconf-archive @@ -43,6 +44,7 @@ in , openssl , perl , pkg-config +, rapidcheck , Security , sqlite , util-linuxMinimal @@ -109,6 +111,8 @@ self = stdenv.mkDerivation { lowdown ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ libcpuid + ] ++ lib.optionals atLeast214 [ + rapidcheck ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ @@ -167,6 +171,8 @@ self = stdenv.mkDerivation { ] ++ lib.optionals (!atLeast24) [ # option was removed in 2.4 "--disable-init-state" + ] ++ lib.optionals atLeast214 [ + "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" ] ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 365ec641c13..b21969f7cab 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -124,7 +124,12 @@ in lib.makeExtensible (self: { sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; }; + nix_2_14 = common { + version = "2.14.1"; + sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg="; + }; + stable = self.nix_2_13; - unstable = self.stable; + unstable = self.nix_2_14; }) diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix index f1d170e7d59..c11255e6ab8 100644 --- a/pkgs/tools/security/aiodnsbrute/default.nix +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -1,44 +1,38 @@ { lib -, buildPythonApplication , fetchFromGitHub -, aiodns -, click -, tqdm -, uvloop +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aiodnsbrute"; version = "0.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "blark"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; - # https://github.com/blark/aiodnsbrute/pull/8 - prePatch = '' - substituteInPlace setup.py --replace " 'asyncio', " "" - ''; - - propagatedBuildInputs = [ - aiodns - click - tqdm - uvloop + propagatedBuildInputs = with python3.pkgs; [ + aiodns + click + tqdm + uvloop ]; - # no tests present + # Project no tests doCheck = false; - pythonImportsCheck = [ "aiodnsbrute.cli" ]; + pythonImportsCheck = [ + "aiodnsbrute.cli" + ]; meta = with lib; { description = "DNS brute force utility"; homepage = "https://github.com/blark/aiodnsbrute"; - # https://github.com/blark/aiodnsbrute/issues/5 + changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/ares-rs/default.nix b/pkgs/tools/security/ares-rs/default.nix new file mode 100644 index 00000000000..433cdaa5792 --- /dev/null +++ b/pkgs/tools/security/ares-rs/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ares-rs"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "bee-san"; + repo = "ares"; + rev = "refs/tags/${version}"; + hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; + }; + + cargoHash = "sha256-7zDq66oWT+j6t9LEBUoeby8MQ1Ihhvk3KLwWPQAThyc="; + + meta = with lib; { + description = "Automated decoding of encrypted text without knowing the key or ciphers used"; + homepage = "https://github.com/bee-san/ares"; + changelog = "https://github.com/bee-san/Ares/releases/tag${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "ares"; + }; +} diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 8180f9013df..8dc9a070875 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E="; + sha256 = "sha256-mBs/euuIcVU9ETzfgirg2K/l+sV0OCyyfduvHR5vvek="; }; - cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg="; + cargoHash = "sha256-OgoYWHMgHVkjyRKr0w3hPNfFpN3VmrkVohiaQclIiA0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 4895e3def18..72420b7c745 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - hash = "sha256-AndX0PISGKhVmUFcJ2pCu8dqH67nVCe+25MIcF9d+8A="; + rev = "refs/tags/v${version}"; + hash = "sha256-auVdBt8XT0qvEC9TfuROBbV/D6uQXBODZs/vrkJolwI="; }; - vendorHash = "sha256-+a6GgKHQ1D/hW9MEutyfbNbyDJuQGJ7Vd9Pz6w08lfo="; + vendorHash = "sha256-6z40pIj6cgC7lXS2qDhkYec5zIrmjHzh2W0U5BDmSzU="; # Tests require network access doCheck = false; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to gather network ranges using ASN information"; homepage = "https://github.com/projectdiscovery/asnmap"; + changelog = "https://github.com/projectdiscovery/asnmap/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index b00aede1581..9b7ad8c1a66 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { directly from Nmap output. ''; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 70767373258..0498f059905 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -1,43 +1,34 @@ { lib , stdenv -, fetchFromGitHub -, fetchurl -, meson -, ninja -, pkg-config , asciidoc -, makeWrapper -, jansson -, jose +, coreutils , cryptsetup , curl +, fetchFromGitHub +, gnugrep +, gnused +, jansson +, jose , libpwquality , luksmeta -, coreutils +, makeWrapper +, meson +, ninja +, pkg-config , tpm2-tools -, gnugrep -, gnused }: stdenv.mkDerivation rec { pname = "clevis"; - version = "18"; + version = "19"; src = fetchFromGitHub { owner = "latchset"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; + rev = "refs/tags/v${version}"; + hash = "sha256-3J3ti/jRiv+p3eVvJD7u0ko28rPd8Gte0mCJaVaqyOs="; }; - patches = [ - # sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl - (fetchurl { - url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch"; - sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM="; - }) - ]; - postPatch = '' for f in $(find src/ -type f); do grep -q "/bin/cat" "$f" && substituteInPlace "$f" \ @@ -51,15 +42,34 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin" ''; - nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ]; - buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta tpm2-tools ]; + nativeBuildInputs = [ + asciidoc + makeWrapper + meson + ninja + pkg-config + ]; + + buildInputs = [ + cryptsetup + curl + jansson + jose + libpwquality + luksmeta + tpm2-tools + ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; - meta = { + meta = with lib; { description = "Automated Encryption Framework"; homepage = "https://github.com/latchset/clevis"; - maintainers = with lib.maintainers; [ ]; - license = lib.licenses.gpl3Plus; + changelog = "https://github.com/latchset/clevis/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index f03a1a17171..dc58effa2ac 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TV2knPG5n5l8APeAmpDfu6vQLtEhjqH21JXAZLk0DDI="; + hash = "sha256-kB6nH/5/76r9SGyaFPXjwgZ+b5ha85Z7v1GFNgqluDY="; }; - vendorHash = "sha256-xMHlooXuLECQi7co2/WvY0TIoV0S5OgcBklICCFk3ls="; + vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o="; # Some tests are failing because of wrong filename/path doCheck = false; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 46852f61e97..b5b4e1454c3 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-02-28"; + version = "2023-03-01"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hEuOGnAWyX3oBfrUWBhT58WAjDWTWeLIYuyfUs3q0Jc="; + hash = "sha256-+1yu5R3JUmp6PylmkIWZlEXlq05fi9Lb1q36iBPWdso="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index f73710c1d19..8334b034841 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -2,19 +2,18 @@ , buildGoModule , fetchFromGitHub , installShellFiles - , openssl }: buildGoModule rec { pname = "grype"; - version = "0.57.1"; + version = "0.59.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; - rev = "v${version}"; - hash = "sha256-NACasOoCABoHmb4U5LvQ8EPO7G10A7uQtX4th/WJqrw="; + rev = "refs/tags/v${version}"; + hash = "sha256-TAoF67Fxl0OUiQd48h786+lIsdEuk4C/zdeEO/DRX/k="; # 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; @@ -26,14 +25,19 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; + proxyVendor = true; - vendorHash = "sha256-DLY0tcacGFcP17IqUVvpVkUjd2xQMO5JZxltmL4b+Wo="; + vendorHash = "sha256-kRxKa3HUO2yvMai03voVvsprg/Kd01OtJQHJn3ECk58="; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ + openssl + ]; + subPackages = [ "." ]; excludedPackages = "test/integration"; @@ -55,7 +59,6 @@ buildGoModule rec { ldflags+=" -X github.com/anchore/grype/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - nativeCheckInputs = [ openssl ]; preCheck = '' # test all dirs (except excluded) unset subPackages diff --git a/pkgs/tools/security/ioc-scan/default.nix b/pkgs/tools/security/ioc-scan/default.nix new file mode 100644 index 00000000000..0fea93dc508 --- /dev/null +++ b/pkgs/tools/security/ioc-scan/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ioc-scan"; + version = "1.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "cisagov"; + repo = "ioc-scanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-dRrLd41HVVHJse7nkem8Cy+ltfJRnJiWrX/WShMfcOw="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + docopt + ]; + + nativeCheckInputs = with python3.pkgs; [ + pyfakefs + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ioc_scan" + ]; + + meta = with lib; { + description = "Tool to search a filesystem for indicators of compromise (IoC)"; + homepage = "https://github.com/cisagov/ioc-scanner"; + changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/v${version}"; + license = with licenses; [ cc0 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 558c0fd0c37..a7249481454 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-gA3tXsrJgk0WCI2rKy81f3PrGu/Ml1WExJ0P9AzLQ+c="; + sha256 = "sha256-I2TYuOLwgEm6ofF2onWI7j2yu9wpXxNt7lJePSpF9VM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix index 7c2174c5233..a5ac8f06d16 100644 --- a/pkgs/tools/security/medusa/default.nix +++ b/pkgs/tools/security/medusa/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jmk-foofus/medusa"; description = "A speedy, parallel, and modular, login brute-forcer"; license = licenses.gpl2; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 5aadac1760f..d43ea431eac 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.4" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.5" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index afffd279837..f188fc2c4d9 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b37bae6ba447ad490205554e35ae2d0b54561f08 - ref: refs/tags/6.3.4 + revision: a5332d9785cb7c8d0bbc3f0d8532287858b15aea + ref: refs/tags/6.3.5 specs: - metasploit-framework (6.3.4) + metasploit-framework (6.3.5) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.108) + metasploit-payloads (= 2.0.113) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -128,19 +128,19 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.716.0) + aws-partitions (1.720.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.366.0) + aws-sdk-ec2 (1.367.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.75.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.62.0) + aws-sdk-kms (1.63.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.119.1) @@ -236,7 +236,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.108) + metasploit-payloads (2.0.113) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) @@ -286,12 +286,12 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.4.5) + pg (1.4.6) public_suffix (5.0.1) - puma (6.1.0) + puma (6.1.1) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.3) rack-protection (3.0.5) rack rack-test (2.0.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 10ce3bc93ca..548f656930b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.4"; + version = "6.3.5"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-HlW30Y+fEAB3URY2/tnAf1RR02gduBjZcHLc7eyz5dM="; + sha256 = "sha256-T6MrvTnaTE+Pvx3UwzBZmw9jWcL4qr4TDbyCCqI6O0g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index b4f1d2cb848..803631d68e0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1"; + sha256 = "0f9dc7igx4wxza0vim2fg15hj1bgi6js2a2w2fkr2h8mi019nrgs"; type = "gem"; }; - version = "1.716.0"; + version = "1.720.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1caq5zkjxn06lk9jzf3izm2b94f9zj738nr4x83zx95warj3v2qp"; + sha256 = "1xxfa17xv9rl2xd0wp4vh9ddjj9zzb93nbb8y2n34phz7l2yxd0w"; type = "gem"; }; - version = "1.366.0"; + version = "1.367.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -144,10 +144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; + sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02"; type = "gem"; }; - version = "1.62.0"; + version = "1.63.0"; }; aws-sdk-s3 = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b37bae6ba447ad490205554e35ae2d0b54561f08"; - sha256 = "1lz5ngnfvp3jf3ciif0xd39m2m3zq3czwdhna5vh044ziz8vfm8y"; + rev = "a5332d9785cb7c8d0bbc3f0d8532287858b15aea"; + sha256 = "0j1v7ai0m0mw1l9vxapqq9cn63wvb4qc7m0xpy7lyk6s76yjp8sg"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.4"; + version = "6.3.5"; }; metasploit-model = { groups = ["default"]; @@ -626,10 +626,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm9vzh562vckxcc751bc4yr4fgprlwjjmwq1sjw7zhh27bmz82"; + sha256 = "0wmck8jldfdhfvax8dqa3dbxq76sn10xsvs02gf9wbs9zcp0nypi"; type = "gem"; }; - version = "2.0.108"; + version = "2.0.113"; }; metasploit_data_models = { groups = ["default"]; @@ -907,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.4.5"; + version = "1.4.6"; }; public_suffix = { groups = ["default"]; @@ -927,10 +927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k"; + sha256 = "1j1hx19hh0hhnfcyn075i8rzxxv4vjrny0q1ywzfdbflbwzg7b21"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; racc = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.6.3"; }; rack-protection = { groups = ["default"]; @@ -1353,7 +1353,7 @@ version = "3.0.5"; }; sqlite3 = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index dcb1c0bb0cb..056c379ac68 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y="; + hash = "sha256-Z11CDw9ykmJ7MI7I0H4Y/i+8/I+hRgC2frklYPP1di0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/openrisk/default.nix b/pkgs/tools/security/openrisk/default.nix new file mode 100644 index 00000000000..fc8475ca71a --- /dev/null +++ b/pkgs/tools/security/openrisk/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "openrisk"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-8DGwNoucLpdazf9r4PZrN4DEOMpTr5U7tal2Rab92pA="; + }; + + vendorHash = "sha256-BLowqqlMLDtsthS4uKeycmtG7vASG25CARGpUcuibcw="; + + meta = with lib; { + description = "Tool that generates an AI-based risk score"; + homepage = "https://github.com/projectdiscovery/openrisk"; + changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix new file mode 100644 index 00000000000..1a95f099b23 --- /dev/null +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ospd-openvas"; + version = "22.4.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "ospd-openvas"; + rev = "refs/tags/v${version}"; + hash = "sha256-tgLOO4L/P6USiPf72uZse36r8HhXJnUUT8PfZH4E/jg="; + }; + + pythonRelaxDeps = [ + "packaging" + "python-gnupg" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + deprecated + lxml + packaging + paho-mqtt + psutil + python-gnupg + redis + sentry-sdk + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ospd_openvas" + ]; + + meta = with lib; { + description = "OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"; + homepage = "https://github.com/greenbone/ospd-openvas"; + changelog = "https://github.com/greenbone/ospd-openvas/blob/${version}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index b5678dff7d8..032372d87e9 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "otpauth"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-toFBkUssU10ejoZzWnrm5o2P0p5Oq8kKP4vb2ASDC0s="; + sha256 = "sha256-jeKxCuE3cA/oTEKwdrCGPchsrtaMyirTzv8oLl9gxtA="; }; - vendorSha256 = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ="; + vendorHash = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ="; doCheck = true; meta = with lib; { diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index e367314ba19..6fadf0c8f36 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -54,7 +54,7 @@ let homepage = "https://github.com/sigstore/rekor"; changelog = "https://github.com/sigstore/rekor/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ lesuisse jk ]; + maintainers = with maintainers; [ lesuisse jk developer-guy ]; }; }; in { diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 37666bf7c21..2024cd8ff27 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "safe"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "starkandwayne"; repo = "safe"; rev = "v${version}"; - sha256 = "sha256-i8L7L06nBIiwrMEF5+jwCm2/iox6W+yE1HcruB6EQNM="; + sha256 = "sha256-sg0RyZ5HpYu7M11bNy17Sjxm7C3pkQX3I17edbALuvU="; }; - vendorSha256 = "sha256-w8gHCqOfmZg4JZgg1nZBtTJ553Rbp0a0JsoQVDFjehM="; + vendorHash = "sha256-w8gHCqOfmZg4JZgg1nZBtTJ553Rbp0a0JsoQVDFjehM="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index afd41660390..52b10dfae6d 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.3"; + version = "2.36.4"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-xNOID8/xdC4vkq8TAocvBVu2jVMDwioFBqlmFcMmMII="; + sha256 = "sha256-bUXiF+GlmNe8zoEjC8aWsbKEnymUKQv+121dTUVtqEQ="; }; vendorHash = "sha256-APwtLd8+Imy4cBSlm4sHPdA/DQCN4pDFSM/R5ib3k4E="; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index f3cb9e85dce..deb31ca4f88 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.5.5"; + version = "1.6.1"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nx4a5VH5UIvvBwwzB77XdBv/2ofoOY7iVgXFYyGclnI="; + sha256 = "sha256-4OSzb0VMMSQSlD8951nJmRnehJw2IQI6fEYO/Y5hZiU="; }; - vendorHash = "sha256-RRC1eOSJBbaGMoc81OMu4OGDL950L7u1mheQLSpUXJk="; + vendorHash = "sha256-nYi4ZQHsrFSyB+5YI+nlaZ28FaefG3EZ+tT3SX/bI7o="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 06047a1925c..344fcfb2cff 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-d21TQRPRDEDYj7Fqf7R7mHj2tLPd/EXNkeL56KyLgIg="; + hash = "sha256-gJsezi7yczVagR7faQvehyGWW6E7sfDXrJEVdsUSSp0="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-Oh8tldLuM3j17OUX1TkgyOL9Ae/x1H8FrB2lNbtZ8pI="; + vendorHash = "sha256-YsZGs5/QQLdnXOeEnDXevlnJrOBoLkdYqTj2ZIoUOkA="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 83786aced77..7ae37cf286c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.28.4"; + version = "3.28.7"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-GEmWgS8Y56LJbVxmDXVUk5MHZwP9W0Wo7o/YKvZD7ts="; + hash = "sha256-6oOIKvUocImC3HMeG5aJXLlruymechcsDhMxEyYiNzU="; }; - vendorHash = "sha256-d8xc7yCyG1xfno/8ANe5eu7irP2yKDY2LKs3XdlktQk="; + vendorHash = "sha256-/4xZjqstrjfIlD15x2INSunb57WGR7NzKaQxUABxQV0="; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/tools/security/trustymail/default.nix new file mode 100644 index 00000000000..eb384ce1625 --- /dev/null +++ b/pkgs/tools/security/trustymail/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "trustymail"; + version = "0.8.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "cisagov"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-hKiQWAOzUjmoCcEH9OTgkgU7s1V+Vv3+93OLkqDRDoU="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + dnspython + docopt + publicsuffixlist + pydns + pyspf + requests + ] ++ publicsuffixlist.optional-dependencies.update; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "trustymail" + ]; + + meta = with lib; { + description = "Tool to scan domains and return data based on trustworthy email best practices"; + homepage = "https://github.com/cisagov/trustymail"; + changelog = "https://github.com/cisagov/trustymail/releases/tag/v${version}"; + license = with licenses; [ cc0 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 5c2a2e9b0d8..266ed3f5c88 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE="; + sha256 = "sha256-F9Ki+3jMkJ+CI2yQmrnqT98xJqSSKQTtYHxQTYdfNbQ="; }; - vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ="; + vendorHash = "sha256-Ny4TTa67x/mwTclZrtPoWU6nHu5q4KafP1s4rvk21Hs="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/tools/security/waf-tester/default.nix index 427bb1db2c3..b8dd01ed19b 100644 --- a/pkgs/tools/security/waf-tester/default.nix +++ b/pkgs/tools/security/waf-tester/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "waf-tester"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; - rev = "v${version}"; - hash = "sha256-baj9JuC4PF5c50K2aY+xwdE9t4aTzOu+isqJ6r1pWuc="; + rev = "refs/tags/v${version}"; + hash = "sha256-UPviooQNGRVwf/bTz9ApedJDAGeCvh9iD1HXFOQXPcw="; }; - vendorSha256 = "sha256-qVzgZX4HVXZ3qgYAu3a46vcGl4Pk2D1Zx/giEmPEG88="; + vendorHash = "sha256-HOYHrR1LtVcXMKFHPaA7PYH4Fp9nhqal2oxYTq/i4/8="; ldflags = [ "-s" @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to test Web Application Firewalls (WAFs)"; homepage = "https://github.com/jreisinger/waf-tester"; + changelog = "https://github.com/jreisinger/waf-tester/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index ceee8c9efa6..b2a7bb8a8b5 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.62"; + version = "1.0.68"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3T9/VAr/ZrGTZZK3rsIpnOeKdp9WxPO0JkGamDi3hyM="; + sha256 = "sha256-wtmyUlkruFE3dQmsb9x2683gwEVjsBCQJ8VW4b0IdkU="; }; - cargoHash = "sha256-rNMEXvAGpKxn2t6uvgTx3sc3tpGCXmzOM/iPWwWq2JM="; + cargoHash = "sha256-nQx70KtWzvg6w8UNJqTrqzBc5SZKwCiHx2jhoBbmNP4="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 07b0163b5ac..68766c10d21 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.32.0"; + version = "5.33.0"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY="; + sha256 = "sha256-Gs6InAGDRzqdcBYN9lM7tuEzjcE1T1koUHgD4eKoY7U="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d5612331e82..fb3d30174b1 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, jemalloc, libuv, zlib +, netdata-go-plugins +, bash, curl, jemalloc, libuv, zlib , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups , withDBengine ? true, lz4 @@ -14,9 +15,7 @@ , withDebug ? false }: -let - go-d-plugin = callPackage ./go.d.plugin.nix {}; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well version = "1.38.1"; pname = "netdata"; @@ -32,7 +31,8 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; - buildInputs = [ curl jemalloc libuv zlib ] + # bash is only used to rewrite shebangs + buildInputs = [ bash curl jemalloc libuv zlib ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] ++ lib.optionals withCups [ cups ] @@ -65,13 +65,14 @@ in stdenv.mkDerivation rec { # to bootstrap tools: # https://github.com/NixOS/nixpkgs/pull/175719 # We pick zlib.dev as a simple canary package with pkg-config input. - disallowedReferences = [ zlib.dev ]; + disallowedReferences = if withDebug then [] else [ zlib.dev ]; + donStrip = withDebug; env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + ln -s ${netdata-go-plugins}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${netdata-go-plugins}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 5b45ddbb3ae..dd3b52eca66 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, buildGo119Module }: -buildGo119Module rec { - pname = "netdata-go.d.plugin"; - version = "0.50.0"; +{ lib, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + pname = "netdata-go-plugins"; + version = "0.51.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "5kDc6zszVuFTDkNMuHBRwrfDnH+AdD6ULzmywtvL8iA="; + sha256 = "sha256-u87kTNM1oAmJRtm/iEESjVvQ9qEpFCGqRT8M+iVEwlI="; }; - vendorSha256 = "sha256-Wv6xqzpQxlZCrVnS+g9t1qiYCkm3NfXfW8XDYA9Txxs="; + vendorSha256 = "sha256-QB+Sf7biNPD8/3y9pFxOJZXtc6BaBcQsUGP7y9Wukwg="; doCheck = false; diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index ef56a9ea1d6..b8898fcad65 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.7.6"; + version = "2.7.8"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-aieUCQ5JVJQs4RoTGaXwfTv3xC1ozSsQyfCLsD245go="; + hash = "sha256-cgp/kkHgH5JIWMgrUHHHyuKedbJ3n6L9xBglXCcMYms="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY="; + vendorHash = "sha256-l9Fl0j8Fa/hiV/2ebmIlnFtekYLwDg3eMpY7lLBreGg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index b2b6516ba78..fe806bd21db 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "openseachest"; - version = "22.07"; + version = "23.03"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - sha256 = "sha256-YZOQfABDr5DGkL08TYn908XdCSCJCg+9nlWXRBjYBOU="; + sha256 = "sha256-D/TvT+LnAVhkQ32U+VdW7AA3BfKurmK4mwIY8vwXIpc="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix index b10d9e81caa..83c3e65e417 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/tools/system/pdisk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }) # Replace removed sys_nerr and sys_errlist with strerror (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo="; }) ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index fcc90685b4c..5de802ba880 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.1"; + version = "2.5.2"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-j3WurlNJ67iXBt+jn1iGGtGup8m6OYQtqJTYwUkJ4Ro="; + sha256 = "sha256-Ex3HSGJJDPPciX0Po9TpySVPUL257wz1ZjaLCa2igCM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix new file mode 100644 index 00000000000..e22054eeefa --- /dev/null +++ b/pkgs/tools/system/ttop/default.nix @@ -0,0 +1,24 @@ +{ lib, nimPackages, fetchFromGitHub }: + +nimPackages.buildNimPackage rec { + pname = "ttop"; + version = "0.8.6"; + nimBinOnly = true; + + src = fetchFromGitHub { + owner = "inv2004"; + repo = "ttop"; + rev = "v${version}"; + hash = "sha256-2TuDaStWRsO02l8WhYLWX7vqsC0ne2adxrzqrFF9BfQ="; + }; + + buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ]; + + meta = with lib; + src.meta // { + description = "Top-like system monitoring tool"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 282bd31571d..25552ad8b86 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -12,13 +12,13 @@ assert nvidiaSupport -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ="; + sha256 = "sha256-GrrdE9Ih8x8N2HN+1NfxfthfHbufLAT/Ac+ZZWW5Zg8="; }; # remove cargo config so it can find the linker on aarch64-linux @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y="; + cargoHash = "sha256-2VgyUVBcmSlmPSqAWrzWjH5J6Co/rAC9EQCckYzfW2o="; nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/text/book-summary/default.nix b/pkgs/tools/text/book-summary/default.nix index 563d486b800..a1bbe710273 100644 --- a/pkgs/tools/text/book-summary/default.nix +++ b/pkgs/tools/text/book-summary/default.nix @@ -1,30 +1,18 @@ { lib , rustPlatform -, fetchFromGitHub -, fetchpatch +, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "book-summary"; version = "0.2.1"; - src = fetchFromGitHub { - owner = "dvogt23"; - repo = pname; - rev = version; - sha256 = "1dawddkpyasy22biqz35c912xqmwcx6ihpqp6cnikbdzv8ni8adr"; + src = fetchCrate { + inherit pname version; + hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c="; }; - cargoPatches = [ - # add Cargo.lock - # can be removed after https://github.com/dvogt23/book-summary/pull/23 gets merged - (fetchpatch { - url = "https://github.com/dvogt23/book-summary/commit/9d941a57db5cd2fd0e9813230d69eb1d166a48f8.patch"; - sha256 = "sha256-91dwJKdaLukxVZHA3RH1rxj45U/+mabFTflBaLd2rK8="; - }) - ]; - - cargoSha256 = "sha256-chuEzYUfZC/ZdWIUEmAXJAnXG2s8mCcNs6cuq8Lh5PQ="; + cargoHash = "sha256-QwydecdQaxvh6vWZvO30zgvvgUT6T5dvGRSmcuTUJmc="; meta = with lib; { description = "Book auto-summary for gitbook and mdBook"; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 922a66a9e1d..fdd3539b08e 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -1,42 +1,42 @@ -{ lib, fetchpatch, python3 }: +{ lib +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.5"; + version = "1.1.1"; + format = "setuptools"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; + hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM="; }; - patches = [ - # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. - (fetchpatch { - url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; - sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ agate agate-excel agate-dbf agate-sql - six - setuptools ]; nativeCheckInputs = with python3.pkgs; [ - nose pytestCheckHook ]; - pythonImportsCheck = [ "csvkit" ]; + pythonImportsCheck = [ + "csvkit" + ]; + + disabledTests = [ + # Test is comparing CLI output + "test_decimal_format" + ]; meta = with lib; { + changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst"; description = "A suite of command-line tools for converting to and working with CSV"; - maintainers = with maintainers; [ vrthra ]; - license = licenses.mit; homepage = "https://github.com/wireservice/csvkit"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index a8e8aa1a851..3934f8fbd85 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.43.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc="; + sha256 = "sha256-AJwOft5hZoeraDDjwUBsdXn3V+4p8jOGSCYFCEOkWJA="; }; depsExtraArgs = { @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw="; + cargoSha256 = "sha256-iCkBXbwEUooybQ3IY8bxPZwD2tsWFEpVzJ5l2nkF/dg="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index f98f5e1cc03..b30a21a6f49 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gucci"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; rev = "refs/tags/${version}"; - sha256 = "sha256-x4qCdw+hw1cZ9NY+9eEHksBn+6K0v3QZ1fuT9PX75pc="; + sha256 = "sha256-0ZVRjzU/KTqhaQC6zubbcNp1jX2pgFSGyyIYcWaHzeU="; }; - vendorSha256 = "sha256-YSAzbilyLip3cbnfVGlbHTW5cxmJyw/FYdYHXAqet+Q="; + vendorHash = "sha256-/4OnbtxxhXQnmSV6UbjgzXdL7szhL9rKiG5BR8FsyqI="; ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 7b7062a7526..bb0db2740d3 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.8"; + version = "0.3.9"; src = fetchCrate { inherit pname version; - hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68="; + hash = "sha256-FsKHGw/6n/8eCJh1XatNsw3iCzD+siHdJ3i0dNKD5Go="; }; - cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0="; + cargoHash = "sha256-nyLWbwruzQeyPGkVuMiRCTHtFE+E9nQ57ZMXxqIcLxE="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index e8a7e4ecf5a..812b76796e2 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-B+VPz0uT+mdMfh/v2Rq3s8JUEmHk+pv53Xt/HVBpW8M="; + sha256 = "sha256-1TP91mZ5f3x2Q0Qv/p+aE+rvWEW3zVArcgELLNWi4JY="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-qpmzg1pmR4zv6wmwPB2ysgGU4v/QebpwKFpjbszEb/Q="; + cargoSha256 = "sha256-aqOaU9K+dHwyqPqRnD+Gw2enmHF9eJAAHeP7sGBiWtg="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 9d00ab028a9..250c094d301 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miller"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-Uvf2kkWD6ir8XicEX+FNYmd2A9c/jd6GgwjYomNfjfc="; + sha256 = "sha256-fKgw4ii/riPTklEB+Q8/sOx2dCMS/kevyvXgpyFlkVs="; }; - vendorSha256 = "sha256-VW0mTq0oc95wVkFa+0rpsiOlS/9LT2Xy6u0RtSTsEoA="; + vendorHash = "sha256-uZa9H7Tj2ynwl3fFY9U+WZ0FcNuvHRQf7RCW6rebm5g="; subPackages = [ "cmd/mlr" ]; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 0fc39b8da28..d25d068b7e0 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg -, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract +, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract3 }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract3 ]}" ''; # Use upstream's example data to run a couple of queries to ensure the dependencies diff --git a/pkgs/tools/text/tuc/default.nix b/pkgs/tools/text/tuc/default.nix index 5401515d0fb..3598a317633 100644 --- a/pkgs/tools/text/tuc/default.nix +++ b/pkgs/tools/text/tuc/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tuc"; - version = "0.11.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "riquito"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M2SK6KF8R0WcyFf8eTyYNK5oXj/DfCrAkUZJ3J2LF6U="; + sha256 = "sha256-zEWQ1wGpEowVPdlezC/LZhoPGS546nuqREfavo3fbTs="; }; - cargoSha256 = "sha256-MhEIDRC40zQ8mBXxONavtPr87SrueV57HhmIRLIagGA="; + cargoHash = "sha256-YRw1HxVy1/SOWfareR6rh6M78xFm+Im//klhXGGt95g="; meta = with lib; { description = "When cut doesn't cut it"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 1bfdfadd03a..20c9226efd9 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.23.0"; + version = "2.23.3"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-HvdopsSI5CZOAA+C+FJGc7WhrA2qt43cAHe9HoxO91o="; + hash = "sha256-M4tq/gUpI0tGMJJOHE2TtGIbFzbv9/pP6yZGDf68VHI="; }; - vendorHash = "sha256-aH8KWvTXRlWVR/RdYlGjpZ4bOncQfLap1PVKxEnaz6A="; + vendorHash = "sha256-ZgBt4BgZWViNqYCuqb/Wt1zVjFM9h1UsmsYox7kMJ1A="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 32d9cc9d3d7..098b437ea08 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -16,14 +16,14 @@ let rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; in rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.6.1"; + version = "0.6.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-70O9/QRADaEYVvZjEfuBOxPF8lCZ138L2fbFWpj3VUw="; + sha256 = "sha256-XaxxakVwogJlqyZGL275jGSZDLoRLl8SAAg8V+X4cmQ="; }; - cargoHash = "sha256-iHOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkgCdgw="; + cargoHash = "sha256-66mVkoqMl+KNCXWsGUbu8nBrazgHP+5dTaT2Ye0btWY="; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/tools/wayland/gnome-randr/default.nix index 9c88130f27b..130b29f8412 100644 --- a/pkgs/tools/wayland/gnome-randr/default.nix +++ b/pkgs/tools/wayland/gnome-randr/default.nix @@ -24,10 +24,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - meta = { + meta = with lib; { description = "An xrandr-like CLI for configuring displays on GNOME/Wayland, on distros that don't support `wlr-randr`"; homepage = "https://github.com/maxwellainatchi/gnome-randr-rust"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.roberth ]; + license = licenses.mit; + maintainers = [ maintainers.roberth ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 642faf41005..6ec80f484da 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jovanlanik/gtklock"; license = licenses.gpl3; maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index f285fb12821..6bb83aafae7 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-BWHQtaDnM6lBEMkD8Y7M2NrWD78rY3yL8dzsa6PBiR0="; + hash = "sha256-u8vnRNxi7wLn0M2VZu9YTZuSAM/0afHRP01vve9tD9c="; }; - cargoHash = "sha256-uckdpzCD3ItUVvpF2fHofcZFkQZzt8Xz/VWFiQ9Hkrs="; + cargoHash = "sha256-2HAtkIIJMpYQ+Bk07L8D1w3YlfEuHTcbq14reFja0Kk="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix index 2426e50c066..c190c232fda 100644 --- a/pkgs/tools/wayland/sirula/default.nix +++ b/pkgs/tools/wayland/sirula/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/DorianRudolph/sirula"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ twitchyliquid64 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index fae8652a828..b9b139c7a1f 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/milgra/sov"; license = with licenses; [ mit ]; maintainers = with maintainers; [ travisdavis-ops ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/tools/wayland/swayimg/default.nix index f3ba661e91f..353a7be97e1 100644 --- a/pkgs/tools/wayland/swayimg/default.nix +++ b/pkgs/tools/wayland/swayimg/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 789ca9a3216..58c6258dfbb 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.sr.ht/~tsdh/swayr"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ artturin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 2b47767b5da..a05dccd75ad 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/hyask/swaysome"; license = licenses.mit; maintainers = with maintainers; [ esclear ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix index e4584436c4e..a5cde9f7f0c 100644 --- a/pkgs/tools/wayland/swaytools/default.nix +++ b/pkgs/tools/wayland/swaytools/default.nix @@ -18,5 +18,6 @@ buildPythonApplication rec { description = "Collection of simple tools for sway (and i3)"; license = licenses.gpl3Only; maintainers = with maintainers; [ atila ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 7943457d381..47b59353af8 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -40,10 +40,11 @@ ocamlPackages.buildDunePackage rec { doCheck = true; - meta = { + meta = with lib; { homepage = "https://github.com/talex5/wayland-virtwl-proxy"; description = "Proxy Wayland connections across a VM boundary"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.sternenseemann ]; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 10facbca50c..486bed320c5 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { description = "Mirrors an output of a wlroots compositor to a window"; homepage = "https://github.com/progandy/wdomirror"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ jpas ]; }; } diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index 51b763d6dfe..e450de2f2dc 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix index daa040c5cb5..0c127f751df 100644 --- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix +++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ artturin ]; mainProgram = "xclip"; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 729a8a915aa..1ab7071a46c 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-NUujjcDRVpC5LbJNy2I5cVCOSoqS14XxjsYiZNOBs+s="; + hash = "sha256-jjOcEr/E7l3ykdLAfiDlRSI0u76byDmBwfispTbopk8="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index 7f9935b6c3c..de150c3af30 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "A wayland based logout menu"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } # TODO: shell completions diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index 637876e0a3d..b6f69992fec 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~emersion/wlr-randr"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/tools/wayland/wlrctl/default.nix index 3915e3a18a0..4b093a65cd1 100644 --- a/pkgs/tools/wayland/wlrctl/default.nix +++ b/pkgs/tools/wayland/wlrctl/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~brocellous/wlrctl"; license = licenses.mit; maintainers = with maintainers; [ puffnfresh artturin ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index dcff3dff9cb..5ddce9d3632 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://sr.ht/~kennylevinsen/wlsunset/"; changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index bb03399f55f..32fad72384f 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index 3ce14b54387..268dbd8ddbc 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only mit ]; # Some portions of the code are taken from Sway which is MIT licensed. # TODO: gpl3Only or gpl3Plus (ask upstream)? - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ primeos berbiche ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index efcad38414c..9d82d78b42c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -371,7 +371,6 @@ mapAliases ({ digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13 disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 - displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12 dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 dnnl = oneDNN; # Added 2020-04-22 docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 @@ -389,6 +388,8 @@ mapAliases ({ double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; + dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 + dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 @@ -1625,6 +1626,7 @@ mapAliases ({ virtmanager = virt-manager; # Added 2019-10-29 virtmanager-qt = virt-manager-qt; # Added 2019-10-29 virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 + vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21 vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 522025e8baf..bdbc13df66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,6 +290,8 @@ with pkgs; ansi = callPackage ../development/tools/ansi { }; + ares-rs = callPackage ../tools/security/ares-rs { }; + arti = callPackage ../tools/security/arti { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -492,9 +494,7 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; - dtv-scan-tables_linuxtv = callPackage ../data/misc/dtv-scan-tables/linuxtv.nix { }; - dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { }; - dtv-scan-tables = dtv-scan-tables_linuxtv; + dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; @@ -1362,7 +1362,7 @@ with pkgs; aioblescan = with python3Packages; toPythonApplication aioblescan; - aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; + aiodnsbrute = callPackage ../tools/security/aiodnsbrute { }; aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; @@ -1923,6 +1923,10 @@ with pkgs; git-sizer = callPackage ../applications/version-management/git-sizer { }; + git-stack = callPackage ../applications/version-management/git-stack { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-standup = callPackage ../applications/version-management/git-standup { }; git-stree = callPackage ../applications/version-management/git-stree { }; @@ -2820,6 +2824,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-assume-role = callPackage ../tools/admin/aws-assume-role { }; + aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; aws-env = callPackage ../tools/admin/aws-env { }; @@ -4566,7 +4572,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_22; + electron = electron_23; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5399,6 +5405,8 @@ with pkgs; ossutil = callPackage ../tools/admin/ossutil {}; + ospd-openvas = callPackage ../tools/security/ospd-openvas {}; + osv-detector = callPackage ../tools/security/osv-detector {}; osv-scanner = callPackage ../tools/security/osv-scanner {}; @@ -5941,6 +5949,8 @@ with pkgs; cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdist = python3Packages.callPackage ../tools/admin/cdist { }; + cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; cdpr = callPackage ../tools/networking/cdpr { }; @@ -6755,7 +6765,7 @@ with pkgs; dtc = callPackage ../development/compilers/dtc { }; - dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; + dt-schema = with python3Packages; toPythonApplication dtschema; dub = callPackage ../development/tools/build-managers/dub { }; @@ -6965,7 +6975,11 @@ with pkgs; volctl = callPackage ../tools/audio/volctl { }; - volk = callPackage ../development/libraries/volk { }; + volk = if (stdenv.isDarwin && stdenv.isAarch64) then + (callPackage ../development/libraries/volk/2.5.0.nix { }) + else + (callPackage ../development/libraries/volk { }) + ; vorta = libsForQt5.callPackage ../applications/backup/vorta { }; @@ -7424,6 +7438,8 @@ with pkgs; fdk-aac-encoder = callPackage ../applications/audio/fdkaac { }; + fead = callPackage ../applications/misc/fead { }; + feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; fbcat = callPackage ../tools/misc/fbcat { }; @@ -7741,6 +7757,8 @@ with pkgs; gitea = callPackage ../applications/version-management/gitea { }; + gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; + forgejo = callPackage ../applications/version-management/forgejo {}; gokart = callPackage ../development/tools/gokart { }; @@ -7981,6 +7999,8 @@ with pkgs; libdevil = libdevil-nox; }; + grass-sass = callPackage ../tools/misc/grass-sass { }; + gridtracker = callPackage ../applications/radio/gridtracker { }; grig = callPackage ../applications/radio/grig { }; @@ -8545,6 +8565,8 @@ with pkgs; iodine = callPackage ../tools/networking/iodine { }; + ioc-scan = callPackage ../tools/security/ioc-scan { }; + ioccheck = callPackage ../tools/security/ioccheck { }; ioping = callPackage ../tools/system/ioping { }; @@ -9284,6 +9306,8 @@ with pkgs; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; + # Exposed here so the bots can auto-upgrade it + netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix {}; netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); netsurf-browser = netsurf.browser; @@ -10227,6 +10251,8 @@ with pkgs; nb = callPackage ../tools/misc/nb { }; + kb = callPackage ../tools/misc/kb { }; + notable = callPackage ../applications/misc/notable { }; nth = with python3Packages; toPythonApplication name-that-hash; @@ -11412,7 +11438,9 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { }; + qscintilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/qscintilla { + inherit (libsForQt5) qmake qtbase qtmacextras; + }; qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; @@ -12568,9 +12596,13 @@ with pkgs; telegraf = callPackage ../servers/monitoring/telegraf { }; - teleport = callPackage ../servers/teleport { + teleport_11 = callPackage ../servers/teleport/11.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }; + teleport_12 = callPackage ../servers/teleport/12.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; + }; + teleport = teleport_12; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -12882,6 +12914,8 @@ with pkgs; }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; + ttop = callPackage ../tools/system/ttop { }; + tty-clock = callPackage ../tools/misc/tty-clock { }; tty-share = callPackage ../applications/misc/tty-share { }; @@ -13012,7 +13046,7 @@ with pkgs; unrtf = callPackage ../tools/text/unrtf { }; - unrpa = with python38Packages; toPythonApplication unrpa; + unrpa = with python3Packages; toPythonApplication unrpa; untex = callPackage ../tools/text/untex { }; @@ -13217,7 +13251,7 @@ with pkgs; wakapi = callPackage ../tools/misc/wakapi { }; - wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; + wakatime = callPackage ../tools/misc/wakatime { }; wambo = callPackage ../development/tools/wambo { }; @@ -15157,6 +15191,7 @@ with pkgs; graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; + graalvm19-ce = graalvmCEPackages.graalvm19-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; }).override; @@ -15510,8 +15545,10 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c - { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; + obliv-c = callPackage ../development/compilers/obliv-c { + stdenv = gcc10StdenvCompat; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; ocaml-ng = callPackage ./ocaml-packages.nix { }; ocaml = ocamlPackages.ocaml; @@ -16987,6 +17024,8 @@ with pkgs; gImageReader = callPackage ../applications/misc/gImageReader { }; + gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { }; + guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; # Needed for autogen @@ -19652,6 +19691,8 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + eigenmath = callPackage ../applications/science/math/eigenmath { }; + vapoursynth = callPackage ../development/libraries/vapoursynth { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -19785,7 +19826,11 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; - fftwQuad = fftw.override { precision = "quad-precision"; }; + # Need gcc >= 4.6.0 to build with FFTW with quad precision, but Darwin defaults to Clang + fftwQuad = fftw.override { + precision = "quad-precision"; + stdenv = gccStdenv; + }; fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -20148,7 +20193,9 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { + unsafeStringSupport = true; + }); }; glui = callPackage ../development/libraries/glui {}; @@ -25902,6 +25949,8 @@ with pkgs; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; + displaycal = callPackage ../applications/graphics/displaycal { }; + displaylink = callPackage ../os-specific/linux/displaylink { inherit (linuxPackages) evdi; }; @@ -26907,6 +26956,8 @@ with pkgs; trust-dns = callPackage ../servers/dns/trust-dns { }; + trustymail = callPackage ../tools/security/trustymail { }; + tunctl = callPackage ../os-specific/linux/tunctl { }; twa = callPackage ../tools/networking/twa { }; @@ -29706,6 +29757,7 @@ with pkgs; dlm = callPackage ../applications/display-managers/greetd/dlm.nix { }; greetd = callPackage ../applications/display-managers/greetd { }; gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; + regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; }; @@ -30471,6 +30523,8 @@ with pkgs; sonixd = callPackage ../applications/audio/sonixd { }; + sonobus = callPackage ../applications/audio/sonobus { }; + sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; spectmorph = callPackage ../applications/audio/spectmorph { }; @@ -30542,9 +30596,7 @@ with pkgs; wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_14; - }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; @@ -31718,7 +31770,7 @@ with pkgs; libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - mpv-unwrapped = callPackage ../applications/video/mpv { + mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { inherit lua; }; @@ -32303,8 +32355,6 @@ with pkgs; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; - libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; @@ -33528,7 +33578,7 @@ with pkgs; tesseract3 tesseract4 tesseract5; - tesseract = tesseract3; + tesseract = tesseract5; tetraproc = callPackage ../applications/audio/tetraproc { }; @@ -34306,6 +34356,8 @@ with pkgs; gtk = gtk2; }; + xborders = callPackage ../tools/X11/xborders { }; + xxh = callPackage ../tools/networking/xxh { }; kodiPackages = recurseIntoAttrs (kodi.packages); @@ -34886,9 +34938,7 @@ with pkgs; taro = callPackage ../applications/blockchains/taro { }; - inherit (callPackages ../applications/blockchains/teos { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }) + inherit (callPackages ../applications/blockchains/teos { }) teos teos-watchtower-plugin; @@ -38662,9 +38712,7 @@ with pkgs; tvbrowser = callPackage ../applications/misc/tvbrowser { }; - tvheadend = callPackage ../servers/tvheadend { - dtv-scan-tables = dtv-scan-tables_tvheadend; - }; + tvheadend = callPackage ../servers/tvheadend { }; twiggy = callPackage ../development/tools/twiggy { }; @@ -39100,6 +39148,8 @@ with pkgs; openring = callPackage ../applications/misc/openring { }; + openrisk = callPackage ../tools/security/openrisk { }; + openvino = callPackage ../development/libraries/openvino { python = python3; }; @@ -39409,4 +39459,8 @@ with pkgs; volantes-cursors = callPackage ../data/icons/volantes-cursors { }; gnss-share = callPackage ../servers/gnss-share { }; + + ali = callPackage ../tools/networking/ali { }; + + udict = callPackage ../applications/misc/udict { }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fa83d6c925f..acb5b3d1740 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -611,7 +611,7 @@ in { }); packageAliases = { - linux_default = packages.linux_5_15; + linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! linux_latest = packages.linux_6_2; linux_mptcp = packages.linux_mptcp_95; diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index ddd33e151eb..ecc5a9e0bb7 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -11,6 +11,8 @@ lib.makeScope newScope (self: }; fetchNimble = callPackage ../development/nim-packages/fetch-nimble { }; + asciigraph = callPackage ../development/nim-packages/asciigraph { }; + astpatternmatching = callPackage ../development/nim-packages/astpatternmatching { }; @@ -39,6 +41,8 @@ lib.makeScope newScope (self: hts-nim = callPackage ../development/nim-packages/hts-nim { }; + illwill = callPackage ../development/nim-packages/illwill { }; + jester = callPackage ../development/nim-packages/jester { }; jsonschema = callPackage ../development/nim-packages/jsonschema { }; @@ -65,6 +69,8 @@ lib.makeScope newScope (self: packedjson = callPackage ../development/nim-packages/packedjson { }; + parsetoml = callPackage ../development/nim-packages/parsetoml { }; + pixie = callPackage ../development/nim-packages/pixie { }; redis = callPackage ../development/nim-packages/redis { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b8cc7341e0..21e75c13296 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1895,6 +1895,8 @@ self: super: with self; { cmd2 = callPackage ../development/python-modules/cmd2 { }; + cmd2-ext-test = callPackage ../development/python-modules/cmd2-ext-test { }; + cmdline = callPackage ../development/python-modules/cmdline { }; cmigemo = callPackage ../development/python-modules/cmigemo { @@ -2142,6 +2144,8 @@ self: super: with self; { csvw = callPackage ../development/python-modules/csvw { }; + ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { }; + cu2qu = callPackage ../development/python-modules/cu2qu { }; cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; @@ -2229,6 +2233,8 @@ self: super: with self; { dask = callPackage ../development/python-modules/dask { }; + dask-awkward = callPackage ../development/python-modules/dask-awkward { }; + dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; @@ -2894,6 +2900,8 @@ self: super: with self; { dtlssocket = callPackage ../development/python-modules/dtlssocket { }; + dtschema = callPackage ../development/python-modules/dtschema { }; + ducc0 = callPackage ../development/python-modules/ducc0 { }; duckdb = callPackage ../development/python-modules/duckdb { @@ -3159,6 +3167,8 @@ self: super: with self; { et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + evaluate = callPackage ../development/python-modules/evaluate { }; + ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; evdev = callPackage ../development/python-modules/evdev { }; @@ -3188,6 +3198,8 @@ self: super: with self; { exchangelib = callPackage ../development/python-modules/exchangelib { }; + execnb = callPackage ../development/python-modules/execnb { }; + execnet = callPackage ../development/python-modules/execnet { }; executing = callPackage ../development/python-modules/executing { }; @@ -3273,6 +3285,8 @@ self: super: with self; { faraday-plugins = callPackage ../development/python-modules/faraday-plugins { }; + fastai = callPackage ../development/python-modules/fastai { }; + fastapi = callPackage ../development/python-modules/fastapi { }; fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; @@ -3287,6 +3301,8 @@ self: super: with self; { fastdiff = callPackage ../development/python-modules/fastdiff { }; + fastdownload = callPackage ../development/python-modules/fastdownload { }; + fastdtw = callPackage ../development/python-modules/fastdtw { }; fastecdsa = callPackage ../development/python-modules/fastecdsa { }; @@ -3325,6 +3341,8 @@ self: super: with self; { fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; + faust-cchardet = callPackage ../development/python-modules/faust-cchardet { }; + favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; @@ -5868,6 +5886,8 @@ self: super: with self; { python3Packages = self; }); + merge3 = callPackage ../development/python-modules/merge3 { }; + mergedb = callPackage ../development/python-modules/mergedb { }; mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -6290,6 +6310,8 @@ self: super: with self; { nbconvert = callPackage ../development/python-modules/nbconvert { }; + nbdev = callPackage ../development/python-modules/nbdev { }; + nbdime = callPackage ../development/python-modules/nbdime { }; nbformat = callPackage ../development/python-modules/nbformat { }; @@ -6530,6 +6552,8 @@ self: super: with self; { Nuitka = callPackage ../development/python-modules/nuitka { }; + nuheat = callPackage ../development/python-modules/nuheat { }; + nulltype = callPackage ../development/python-modules/nulltype { }; num2words = callPackage ../development/python-modules/num2words { }; @@ -6637,6 +6661,8 @@ self: super: with self; { oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + okta = callPackage ../development/python-modules/okta { }; + olefile = callPackage ../development/python-modules/olefile { }; oletools = callPackage ../development/python-modules/oletools { }; @@ -7387,6 +7413,8 @@ self: super: with self; { python-memcached = callPackage ../development/python-modules/python-memcached { }; + python-otbr-api = callPackage ../development/python-modules/python-otbr-api { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; @@ -7681,6 +7709,8 @@ self: super: with self; { publicsuffix = callPackage ../development/python-modules/publicsuffix { }; + publicsuffixlist = callPackage ../development/python-modules/publicsuffixlist { }; + pubnub = callPackage ../development/python-modules/pubnub { }; pubnubsub-handler = callPackage ../development/python-modules/pubnubsub-handler { }; @@ -7733,6 +7763,8 @@ self: super: with self; { py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py-dormakaba-dkey = callPackage ../development/python-modules/py-dormakaba-dkey { }; + py-nightscout = callPackage ../development/python-modules/py-nightscout { }; py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; @@ -8077,6 +8109,8 @@ self: super: with self; { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + pyexploitdb = callPackage ../development/python-modules/pyexploitdb { }; + pyezviz = callPackage ../development/python-modules/pyezviz { }; pyface = callPackage ../development/python-modules/pyface { }; @@ -8451,6 +8485,12 @@ self: super: with self; { pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { }; + pymorphy3 = callPackage ../development/python-modules/pymorphy3 { }; + + pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3/dicts-ru.nix { }; + + pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { }; + pympler = callPackage ../development/python-modules/pympler { }; pymsgbox = callPackage ../development/python-modules/pymsgbox { }; @@ -9130,7 +9170,9 @@ self: super: with self; { pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - pytest-logdog = callPackage ../development/python-modules/pytest-logdog{ }; + pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; + + pytest-md-report = callPackage ../development/python-modules/pytest-md-report { }; pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; @@ -9172,6 +9214,8 @@ self: super: with self; { pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + pytest-recording = callPackage ../development/python-modules/pytest-recording { }; + pytest-regressions = callPackage ../development/python-modules/pytest-regressions { }; pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; @@ -11466,6 +11510,10 @@ self: super: with self; { textacy = callPackage ../development/python-modules/textacy { }; + textnets = callPackage ../development/python-modules/textnets { + en_core_web_sm = spacy_models.en_core_web_sm; + }; + texttable = callPackage ../development/python-modules/texttable { }; text-unidecode = callPackage ../development/python-modules/text-unidecode { }; @@ -11963,6 +12011,8 @@ self: super: with self; { ukrainealarm = callPackage ../development/python-modules/ukrainealarm { }; + ulid-transform = callPackage ../development/python-modules/ulid-transform { }; + ultraheat-api = callPackage ../development/python-modules/ultraheat-api { }; umalqurra = callPackage ../development/python-modules/umalqurra { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e5412c409ed..2b503bce7c0 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -199,8 +199,8 @@ let # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not - # supported. - pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + # supported. 32-bit is also not supported. + pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then nixpkgsFun { overlays = [ (self': super': { pkgsMusl = super'; })] ++ overlays; @@ -208,7 +208,7 @@ let then "localSystem" else "crossSystem"} = { parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; }; - } else throw "Musl libc only supports Linux systems."; + } else throw "Musl libc only supports 64-bit Linux systems."; # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... |