diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig index 7d0157a6c4..b780def5d1 100644 --- a/third_party/nixpkgs/.editorconfig +++ b/third_party/nixpkgs/.editorconfig @@ -61,9 +61,6 @@ trim_trailing_whitespace = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] trim_trailing_whitespace = unset -[nixos/tests/systemd-networkd-vrf.nix] -trim_trailing_whitespace = unset - [pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset indent_style = unset diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 417fb51a29..944f88bbfb 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -118,7 +118,7 @@ # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq -/pkgs/build-support/rust @andir @zowoq +/pkgs/build-support/rust @zowoq # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers @@ -272,10 +272,20 @@ # Cinnamon /pkgs/desktops/cinnamon @mkg20001 -#nim -/pkgs/development/compilers/nim @ehmry -/pkgs/development/nim-packages @ehmry +# nim +/pkgs/development/compilers/nim @ehmry +/pkgs/development/nim-packages @ehmry /pkgs/top-level/nim-packages.nix @ehmry # terraform providers /pkgs/applications/networking/cluster/terraform-providers @zowoq + +# Matrix +/pkgs/servers/heisenbridge @piegamesde +/pkgs/servers/matrix-conduit @piegamesde @pstn +/pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde +/nixos/modules/services/misc/heisenbridge.nix @piegamesde +/nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde +/nixos/modules/services/misc/matrix-conduit.nix @piegamesde @pstn +/nixos/tests/matrix-appservice-irc.nix @piegamesde +/nixos/tests/matrix-conduit.nix @piegamesde @pstn diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md index 09ffba3dc6..d5b5f5a601 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -227,7 +227,7 @@ digraph { } ``` -[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/merge-staging.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. ### Master branch {#submitting-changes-master-branch} diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 88e1a0b295..f7af28a167 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -84,7 +84,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila ``` -* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. +* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. This gets done in the `preFixup` phase. * `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. * `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`. * `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index 1e20fcd40e..bb76fae486 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -22,24 +22,6 @@ import ./nixos/lib/eval-config.nix (args // { modules = let - vmConfig = (import ./nixos/lib/eval-config.nix - (args // { - modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ]; - })).config; - - vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix - (args // { - modules = modules ++ [ - ./nixos/modules/virtualisation/qemu-vm.nix - { virtualisation.useBootLoader = true; } - ({ config, ... }: { - virtualisation.useEFIBoot = - config.boot.loader.systemd-boot.enable || - config.boot.loader.efi.canTouchEfiVariables; - }) - ]; - })).config; - moduleDeclarationFile = let # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't @@ -63,11 +45,6 @@ system.nixos.versionSuffix = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; system.nixos.revision = final.mkIf (self ? rev) self.rev; - - system.build = { - vm = vmConfig.system.build.vm; - vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; - }; } ]; }); diff --git a/third_party/nixpkgs/lib/asserts.nix b/third_party/nixpkgs/lib/asserts.nix index 8a5f1fb3fe..9ae357cbc9 100644 --- a/third_party/nixpkgs/lib/asserts.nix +++ b/third_party/nixpkgs/lib/asserts.nix @@ -2,35 +2,33 @@ rec { - /* Print a trace message if pred is false. + /* Throw if pred is false, else return pred. Intended to be used to augment asserts with helpful error messages. Example: assertMsg false "nope" - => false - stderr> trace: nope + stderr> error: nope - assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); "" - stderr> trace: foo is not bar, silly - stderr> assert failed at … + assert assertMsg ("foo" == "bar") "foo is not bar, silly"; "" + stderr> error: foo is not bar, silly Type: assertMsg :: Bool -> String -> Bool */ # TODO(Profpatsch): add tests that check stderr assertMsg = pred: msg: - if pred - then true - else builtins.trace msg false; + pred || builtins.throw msg; /* Specialized `assertMsg` for checking if val is one of the elements of a list. Useful for checking enums. Example: - let sslLibrary = "libressl" + let sslLibrary = "libressl"; in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] - => false - stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl" + stderr> error: sslLibrary must be one of [ + stderr> "openssl" + stderr> "bearssl" + stderr> ], but is: "libressl" Type: assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 43df157cd9..1cf7513d65 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1950,6 +1950,12 @@ githubId = 543423; name = "Alex Wied"; }; + cfhammill = { + email = "cfhammill@gmail.com"; + github = "cfhammill"; + githubId = 7467038; + name = "Chris Hammill"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -2854,6 +2860,12 @@ githubId = 706758; name = "Christian Gerbrandt"; }; + derekcollison = { + email = "derek@nats.io"; + github = "derekcollison"; + githubId = 90097; + name = "Derek Collison"; + }; DerGuteMoritz = { email = "moritz@twoticketsplease.de"; github = "DerGuteMoritz"; @@ -4244,6 +4256,16 @@ githubId = 1313787; name = "Gabriel Gonzalez"; }; + gador = { + email = "florian.brandes@posteo.de"; + github = "gador"; + githubId = 1883533; + name = "Florian Brandes"; + keys = [{ + longkeyid = "rsa4096/0xBBB3E40E53797FD9"; + fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; + }]; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; @@ -4443,6 +4465,16 @@ githubId = 1621335; name = "Andrew Trachenko"; }; + gordias = { + name = "Gordias"; + email = "gordias@disroot.org"; + github = "NotGordias"; + githubId = 94724133; + keys = [{ + longkeyid = "ed25519/0x5D47284830FAA4FA"; + fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; + }]; + }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; @@ -7138,6 +7170,12 @@ githubId = 13791; name = "Luke Gorrie"; }; + luker = { + email = "luker@fenrirproject.org"; + github = "LucaFulchir"; + githubId = 2486026; + name = "Luca Fulchir"; + }; lumi = { email = "lumi@pew.im"; github = "lumi-me-not"; @@ -8492,10 +8530,10 @@ name = "Xinhao Luo"; }; newam = { - email = "alexmgit@protonmail.com"; + email = "alex@thinglab.org"; github = "newAM"; githubId = 7845120; - name = "Alex M."; + name = "Alex Martens"; }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; @@ -9808,6 +9846,13 @@ githubId = 1016742; name = "Rafael García"; }; + raitobezarius = { + email = "ryan@lahfa.xyz"; + matrix = "@raitobezarius:matrix.org"; + github = "RaitoBezarius"; + githubId = 314564; + name = "Ryan Lahfa"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; @@ -11087,6 +11132,12 @@ fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; }]; }; + smasher164 = { + email = "aindurti@gmail.com"; + github = "smasher164"; + githubId = 12636891; + name = "Akhil Indurti"; + }; smironov = { email = "grrwlf@gmail.com"; github = "grwlf"; @@ -12166,6 +12217,12 @@ githubId = 1183303; name = "Jakob Klepp"; }; + trundle = { + name = "Andreas Stührk"; + email = "andy@hammerhartes.de"; + github = "Trundle"; + githubId = 332418; + }; tscholak = { email = "torsten.scholak@googlemail.com"; github = "tscholak"; diff --git a/third_party/nixpkgs/nixos/default.nix b/third_party/nixpkgs/nixos/default.nix index c11872f144..6beb4cd3a7 100644 --- a/third_party/nixpkgs/nixos/default.nix +++ b/third_party/nixpkgs/nixos/default.nix @@ -9,27 +9,6 @@ let modules = [ configuration ]; }; - # This is for `nixos-rebuild build-vm'. - vmConfig = (import ./lib/eval-config.nix { - inherit system; - modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; - }).config; - - # This is for `nixos-rebuild build-vm-with-bootloader'. - vmWithBootLoaderConfig = (import ./lib/eval-config.nix { - inherit system; - modules = - [ configuration - ./modules/virtualisation/qemu-vm.nix - { virtualisation.useBootLoader = true; } - ({ config, ... }: { - virtualisation.useEFIBoot = - config.boot.loader.systemd-boot.enable || - config.boot.loader.efi.canTouchEfiVariables; - }) - ]; - }).config; - in { @@ -37,7 +16,5 @@ in system = eval.config.system.build.toplevel; - vm = vmConfig.system.build.vm; - - vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; + inherit (eval.config.system.build) vm vmWithBootLoader; } diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 6b706e4aea..59da373f38 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1420,6 +1420,15 @@ Superuser created successfully. for those who want to have all RetroArch cores available. + + + The Linux kernel for security reasons now restricts access to + BPF syscalls via BPF_UNPRIV_DEFAULT_OFF=y. + Unprivileged access can be reenabled via the + kernel.unprivileged_bpf_disabled sysctl + knob. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index e77ca0a852..ce45b0d797 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -32,10 +32,14 @@ - Mattermost has been updated to version 6.2. Migrations may - take a while, see the - upgrade - notes. + Mattermost has been updated to extended support release 6.3, + as the previously packaged extended support release 5.37 is + reaching + its end of life. Migrations may take a while, see the + changelog + and + important + upgrade notes. @@ -90,6 +94,13 @@ services.heisenbridge. + + + ergochat, a modern + IRC with IRCv3 features. Available as + services.ergochat. + + PowerDNS-Admin, @@ -150,6 +161,22 @@ services.prosody-filer. + + + timetagger, + an open source time-tracker with an intuitive user experience + and powerful reporting. + services.timetagger. + + + + + rstudio-server, + a browser-based version of the RStudio IDE for the R + programming language. Available as + services.rstudio-server. + +
@@ -193,6 +220,13 @@ removed due to it being an outdated version. + + + The mailpile email webclient + (services.mailpile) has been removed due to + its reliance on python2. + + The MoinMoin wiki engine @@ -237,6 +271,14 @@ virtualisation.docker.daemon.settings. + + + The backward compatibility in + services.dokuwiki to configure sites with + the old interface has been removed. Please use + services.dokuwiki.sites instead. + + opensmtpd-extras is no longer build with python2 scripting @@ -311,6 +353,73 @@ unmaintained + + + MultiMC has been replaced with the fork PolyMC due to upstream + developers being hostile to 3rd party package maintainers. + PolyMC removes all MultiMC branding and is aimed at providing + proper 3rd party packages like the one contained in Nixpkgs. + This change affects the data folder where game instances and + other save and configuration files are stored. Users with + existing installations should rename + ~/.local/share/multimc to + ~/.local/share/polymc. The main config + file’s path has also moved from + ~/.local/share/multimc/multimc.cfg to + ~/.local/share/polymc/polymc.cfg. + + + + + pkgs.noto-fonts-cjk is now deprecated in + favor of pkgs.noto-fonts-cjk-sans and + pkgs.noto-fonts-cjk-serif because they each + have different release schedules. To maintain compatibility + with prior releases of Nixpkgs, + pkgs.noto-fonts-cjk is currently an alias + of pkgs.noto-fonts-cjk-sans and doesn’t + include serif fonts. + + + + + The interface that allows activation scripts to restart units + has been reworked. Restarting and reloading is now done by a + single file + /run/nixos/activation-restart-list that + honors restartIfChanged and + reloadIfChanged of the units. + + + + + The services.bookstack.cacheDir option has + been removed, since the cache directory is now handled by + systemd. + + + + + The services.bookstack.extraConfig option + has been replaced by + services.bookstack.config which implements + a + settings-style + configuration. + + + + + lib.assertMsg and + lib.assertOneOf no longer return + false if the passed condition is + false, throwing the + given error message instead (which makes the resulting error + message less cluttered). This will not impact the behaviour of + code using these functions as intended, namely as top-level + wrapper for assert conditions. + +
@@ -341,6 +450,28 @@ socket /run/redis-${serverName}/redis.sock. + + + The option + virtualisation.vmVariant + was added to allow users to make changes to the + nixos-rebuild build-vm configuration that + do not apply to their normal system. + + + The config.system.build.vm attribute now + always exists and defaults to the value from + vmVariant. Configurations that import the + virtualisation/qemu-vm.nix module + themselves will override this value, such that + vmVariant is not used. + + + Similarly + virtualisation.vmVariantWithBootloader + was added. + + The @@ -432,6 +563,14 @@ renamed to linux-firmware. + + + The services.mbpfan module was converted to + a + RFC + 0042 configuration. + + A new module was added for the @@ -441,6 +580,49 @@ programs.starship.settings. + + + services.mattermost.plugins has been added + to allow the declarative installation of Mattermost plugins. + Plugins are automatically repackaged using autoPatchelf. + + + + + The zrepl package has been updated from + 0.4.0 to 0.5: + + + + + The RPC protocol version was bumped; all zrepl daemons in + a setup must be updated and restarted before replication + can resume. + + + + + A bug involving encrypt-on-receive has been fixed. Read + the + zrepl + documentation and check the output of + zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS + on the receiver. + + + + + + + Renamed option + services.openssh.challengeResponseAuthentication + to + services.openssh.kbdInteractiveAuthentication. + Reason is that the old name has been deprecated upstream. + Using the old option name will still work, but produce a + warning. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 48adc4ad33..1b59842e02 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -417,6 +417,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `retroArchCores` has been removed. This means that using `nixpkgs.config.retroarch` to customize RetroArch cores is not supported anymore. Instead, use package overrides, for example: `retroarch.override { cores = with libretro; [ citra snes9x ]; };`. Also, `retroarchFull` derivation is available for those who want to have all RetroArch cores available. +- The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be reenabled via the `kernel.unprivileged_bpf_disabled` sysctl knob. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index 5957f82bce..25b3ada2c5 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -13,8 +13,9 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP 8.1 is now available -- Mattermost has been updated to version 6.2. Migrations may take a while, - see the [upgrade notes](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6.2-feature-release). +- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). + Migrations may take a while, see the [changelog](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release) + and [important upgrade notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html). ## New Services {#sec-release-22.05-new-services} @@ -30,6 +31,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). +- [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable). + - [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable). - [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable). @@ -46,6 +49,12 @@ In addition to numerous new and upgraded packages, this release has the followin - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). + +- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). + + + ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} - `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`. @@ -67,6 +76,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. +- The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. + - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. @@ -79,6 +90,9 @@ In addition to numerous new and upgraded packages, this release has the followin - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. +- The backward compatibility in `services.dokuwiki` to configure sites with the + old interface has been removed. Please use `services.dokuwiki.sites` instead. + - opensmtpd-extras is no longer build with python2 scripting support due to python2 deprecation in nixpkgs - The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details. @@ -100,6 +114,28 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.docbookrx` was removed since it's unmaintained +- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. + +- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` + and `pkgs.noto-fonts-cjk-serif` because they each have different release + schedules. To maintain compatibility with prior releases of Nixpkgs, + `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and + doesn't include serif fonts. + +- The interface that allows activation scripts to restart units has been reworked. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. + +- The `services.bookstack.cacheDir` option has been removed, since the + cache directory is now handled by systemd. + +- The `services.bookstack.extraConfig` option has been replaced by + `services.bookstack.config` which implements a + [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) + configuration. + +- `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions. + + + ## Other Notable Changes {#sec-release-22.05-notable-changes} - The option [services.redis.servers](#opt-services.redis.servers) was added @@ -118,6 +154,16 @@ In addition to numerous new and upgraded packages, this release has the followin to the members of the Unix group `redis-${serverName}` through the Unix socket `/run/redis-${serverName}/redis.sock`. +- The option [virtualisation.vmVariant](#opt-virtualisation.vmVariant) was added + to allow users to make changes to the `nixos-rebuild build-vm` configuration + that do not apply to their normal system. + + The `config.system.build.vm` attribute now always exists and defaults to the + value from `vmVariant`. Configurations that import the `virtualisation/qemu-vm.nix` + module themselves will override this value, such that `vmVariant` is not used. + + Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added. + - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added. - The `influxdb2` package was split into `influxdb2-server` and @@ -152,5 +198,20 @@ In addition to numerous new and upgraded packages, this release has the followin - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. +- The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. + - A new module was added for the [Starship](https://starship.rs/) shell prompt, providing the options `programs.starship.enable` and `programs.starship.settings`. + +- `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins. + Plugins are automatically repackaged using autoPatchelf. + +- The `zrepl` package has been updated from 0.4.0 to 0.5: + * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. + * A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. + +- Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`. + Reason is that the old name has been deprecated upstream. + Using the old option name will still work, but produce a warning. + + diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index 62d09b8173..00e58e24e9 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -88,13 +88,8 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; -in withWarnings { - - # Merge the option definitions in all modules, forming the full - # system configuration. - inherit (nixosWithUserModules) config options _module type; - +in +withWarnings nixosWithUserModules // { inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; } diff --git a/third_party/nixpkgs/nixos/modules/config/malloc.nix b/third_party/nixpkgs/nixos/modules/config/malloc.nix index 84da564300..a3fed33afa 100644 --- a/third_party/nixpkgs/nixos/modules/config/malloc.nix +++ b/third_party/nixpkgs/nixos/modules/config/malloc.nix @@ -22,8 +22,15 @@ let ''; }; - scudo = { - libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so"; + scudo = let + platformMap = { + aarch64-linux = "aarch64"; + x86_64-linux = "x86_64"; + }; + + systemPlatform = platformMap.${pkgs.stdenv.hostPlatform.system} or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}"); + in { + libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, which aims at providing additional mitigations against heap based diff --git a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix index 145f71b5d0..a459e7304c 100644 --- a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix +++ b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix @@ -94,7 +94,9 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} + # Use the cmdline variable to allow the user to specify custom kernel params + # when chainloading this script from other iPXE scripts like netboot.xyz + kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} ''${cmdline} initrd initrd boot ''; diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 61e7a6a8fc..9d62008430 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -182,7 +182,7 @@ in yandexdisk = 143; mxisd = 144; # was once collectd #consul = 145;# dynamically allocated as of 2021-09-03 - mailpile = 146; + #mailpile = 146; # removed 2022-01-12 redmine = 147; #seeks = 148; # removed 2020-06-21 prosody = 149; @@ -353,6 +353,7 @@ in distcc = 321; webdav = 322; pipewire = 323; + rstudio-server = 324; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -502,7 +503,7 @@ in #yandexdisk = 143; # unused mxisd = 144; # was once collectd #consul = 145; # unused - mailpile = 146; + #mailpile = 146; # removed 2022-01-12 redmine = 147; #seeks = 148; # removed 2020-06-21 prosody = 149; @@ -660,6 +661,7 @@ in distcc = 321; webdav = 322; pipewire = 323; + rstudio-server = 324; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index db3646b284..fdf93f2e17 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -394,6 +394,7 @@ ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix + ./services/development/rstudio-server/default.nix ./services/development/lorri.nix ./services/display-managers/greetd.nix ./services/editors/emacs.nix @@ -740,6 +741,7 @@ ./services/networking/ejabberd.nix ./services/networking/epmd.nix ./services/networking/ergo.nix + ./services/networking/ergochat.nix ./services/networking/eternal-terminal.nix ./services/networking/fakeroute.nix ./services/networking/ferm.nix @@ -790,7 +792,6 @@ ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/lxd-image-server.nix - ./services/networking/mailpile.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix ./services/networking/mjpg-streamer.nix @@ -967,6 +968,7 @@ ./services/security/vault.nix ./services/security/vaultwarden/default.nix ./services/security/yubikey-agent.nix + ./services/system/cachix-agent/default.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix @@ -1187,6 +1189,7 @@ ./tasks/powertop.nix ./testing/service-runner.nix ./virtualisation/anbox.nix + ./virtualisation/build-vm.nix ./virtualisation/container-config.nix ./virtualisation/containerd.nix ./virtualisation/containers.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/chromium.nix b/third_party/nixpkgs/nixos/modules/programs/chromium.nix index 602253a321..8a1653318a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/chromium.nix +++ b/third_party/nixpkgs/nixos/modules/programs/chromium.nix @@ -7,6 +7,7 @@ let defaultProfile = filterAttrs (k: v: v != null) { HomepageLocation = cfg.homepageLocation; + DefaultSearchProviderEnabled = cfg.defaultSearchProviderEnabled; DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; ExtensionInstallForcelist = cfg.extensions; @@ -50,6 +51,13 @@ in example = "https://nixos.org"; }; + defaultSearchProviderEnabled = mkOption { + type = types.nullOr types.bool; + description = "Enable the default search provider."; + default = null; + example = true; + }; + defaultSearchProviderSearchURL = mkOption { type = types.nullOr types.str; description = "Chromium default search provider url."; diff --git a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix index 65d4db7834..28db962538 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix @@ -7,7 +7,7 @@ let inherit (lib.modules) mkDefault mkIf; inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.strings) concatStringsSep optionalString toLower; - inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule; + inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule; # Checks if given list of strings contains unique # elements when compared without considering case. @@ -35,7 +35,7 @@ let ''; }; options.server = mkOption { - type = strMatching ".+"; + type = nonEmptyStr; example = "tsmserver.company.com"; description = '' Host/domain name or IP address of the IBM TSM server. @@ -56,7 +56,7 @@ let ''; }; options.node = mkOption { - type = strMatching ".+"; + type = nonEmptyStr; example = "MY-TSM-NODE"; description = '' Target node name on the IBM TSM server. @@ -144,7 +144,7 @@ let }; config.name = mkDefault name; # Client system-options file directives are explained here: - # https://www.ibm.com/support/knowledgecenter/SSEQVQ_8.1.8/client/c_opt_usingopts.html + # https://www.ibm.com/docs/en/spectrum-protect/8.1.13?topic=commands-processing-options config.extraConfig = mapAttrs (lib.trivial.const mkDefault) ( { diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 0171a8511d..b9a2f47f3f 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -17,35 +17,56 @@ with lib; (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) # Completely removed modules + (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs") + (mkRemovedOptionModule [ "hardware" "brightnessctl" ] '' + The brightnessctl module was removed because newer versions of + brightnessctl don't require the udev rules anymore (they can use the + systemd-logind API). Instead of using the module you can now + simply add the brightnessctl package to environment.systemPackages. + '') + (mkRemovedOptionModule [ "hardware" "u2f" ] '' + The U2F modules module was removed, as all it did was adding the + udev rules from libu2f-host to the system. Udev gained native support + to handle FIDO security tokens, so this isn't necessary anymore. + '') + (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") + (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) + (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' + The hidepid module was removed, since the underlying machinery + is broken when using cgroups-v2. + '') + (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") - (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") - (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") - (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") - (mkRemovedOptionModule ["services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") - (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") + (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") + (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") + (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + - "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) - (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' - services.xserver.multitouch (which uses xf86_input_mtrack) has been removed - as the underlying package isn't being maintained. Working alternatives are - libinput and synaptics. + (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "prey" ] '' + prey-bash-client is deprecated upstream '') + (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs") + (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces..wakeOnLan") + (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "xserver" "displayManager" "auto" ] '' The services.xserver.displayManager.auto module has been removed because it was only intended for use in internal NixOS tests, and gave the @@ -53,38 +74,13 @@ with lib; LightDM. Please use the services.xserver.displayManager.autoLogin options instead, or any other display manager in NixOS as they all support auto-login. '') - (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") - (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") - (mkRemovedOptionModule ["hardware" "brightnessctl" ] '' - The brightnessctl module was removed because newer versions of - brightnessctl don't require the udev rules anymore (they can use the - systemd-logind API). Instead of using the module you can now - simply add the brightnessctl package to environment.systemPackages. + (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' + services.xserver.multitouch (which uses xf86_input_mtrack) has been removed + as the underlying package isn't being maintained. Working alternatives are + libinput and synaptics. '') (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") - (mkRemovedOptionModule ["services" "prey" ] '' - prey-bash-client is deprecated upstream - '') - - (mkRemovedOptionModule ["hardware" "u2f" ] '' - The U2F modules module was removed, as all it did was adding the - udev rules from libu2f-host to the system. Udev gained native support - to handle FIDO security tokens, so this isn't necessary anymore. - '') - - (mkRemovedOptionModule [ "services" "seeks" ] "") - (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") - - (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' - The hidepid module was removed, since the underlying machinery - is broken when using cgroups-v2. - '') - (mkRemovedOptionModule ["services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces..wakeOnLan") - - (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") - # Do NOT add any option renames here, see top of the file ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 220c571b92..2c307a701f 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -30,7 +30,7 @@ let } trap 'on_exit' INT TERM QUIT EXIT - archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})" + archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})" archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" ${cfg.preHook} '' + optionalString cfg.doInit '' @@ -60,7 +60,7 @@ let '' + optionalString (cfg.prune.keep != { }) '' borg prune $extraArgs \ ${mkKeepArgs cfg} \ - --prefix ${escapeShellArg cfg.prune.prefix} \ + ${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"} $extraPruneArgs ${cfg.postPrune} ''; @@ -99,7 +99,18 @@ let BORG_REPO = cfg.repo; inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs; } // (mkPassEnv cfg) // cfg.environment; - inherit (cfg) startAt; + }; + + mkBackupTimers = name: cfg: + nameValuePair "borgbackup-job-${name}" { + description = "BorgBackup job ${name} timer"; + wantedBy = [ "timers.target" ]; + timerConfig = { + Persistent = cfg.persistentTimer; + OnCalendar = cfg.startAt; + }; + # if remote-backup wait for network + after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; }; # utility function around makeWrapper @@ -284,7 +295,7 @@ in { }; archiveBaseName = mkOption { - type = types.strMatching "[^/{}]+"; + type = types.nullOr (types.strMatching "[^/{}]+"); default = "${globalConfig.networking.hostName}-${name}"; defaultText = literalExpression ''"''${config.networking.hostName}-"''; description = '' @@ -292,6 +303,7 @@ in { determined by , will be appended. The full name can be modified at runtime ($archiveName). Placeholders like {hostname} must not be used. + Use null for no base name. ''; }; @@ -320,6 +332,19 @@ in { ''; }; + persistentTimer = mkOption { + default = false; + type = types.bool; + example = true; + description = literalDocBook '' + Set the persistentTimer option for the + systemd.timer + 5 + which triggers the backup immediately if the last trigger + was missed (e.g. if the system was powered down). + ''; + }; + user = mkOption { type = types.str; description = '' @@ -471,11 +496,11 @@ in { }; prune.prefix = mkOption { - type = types.str; + type = types.nullOr (types.str); description = '' Only consider archive names starting with this prefix for pruning. By default, only archives created by this job are considered. - Use "" to consider all archives. + Use "" or null to consider all archives. ''; default = config.archiveBaseName; defaultText = literalExpression "archiveBaseName"; @@ -694,6 +719,10 @@ in { # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo // mapAttrs' mkRepoService repos; + # A job named "foo" is mapped to systemd.timers.borgbackup-job-foo + # only generate the timer if interval (startAt) is set + systemd.timers = mapAttrs' mkBackupTimers (filterAttrs (_: cfg: cfg.startAt != []) jobs); + users = mkMerge (mapAttrsToList mkUsersConfig repos); environment.systemPackages = with pkgs; [ borgbackup ] ++ (mapAttrsToList mkBorgWrapper jobs); diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix b/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix index 6c23874579..4e690ac6ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix @@ -5,7 +5,7 @@ let inherit (lib.attrsets) hasAttr; inherit (lib.modules) mkDefault mkIf; inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) nullOr strMatching; + inherit (lib.types) nonEmptyStr nullOr; options.services.tsmBackup = { enable = mkEnableOption '' @@ -15,7 +15,7 @@ let ''; command = mkOption { - type = strMatching ".+"; + type = nonEmptyStr; default = "backup"; example = "incr"; description = '' @@ -24,7 +24,7 @@ let ''; }; servername = mkOption { - type = strMatching ".+"; + type = nonEmptyStr; example = "mainTsmServer"; description = '' Create a systemd system service @@ -41,7 +41,7 @@ let ''; }; autoTime = mkOption { - type = nullOr (strMatching ".+"); + type = nullOr nonEmptyStr; default = null; example = "12:00"; description = '' @@ -87,16 +87,35 @@ in environment.DSM_LOG = "/var/log/tsm-backup/"; # TSM needs a HOME dir to store certificates. environment.HOME = "/var/lib/tsm-backup"; - # for exit status description see - # https://www.ibm.com/support/knowledgecenter/en/SSEQVQ_8.1.8/client/c_sched_rtncode.html - serviceConfig.SuccessExitStatus = "4 8"; - # The `-se` option must come after the command. - # The `-optfile` option suppresses a `dsm.opt`-not-found warning. - serviceConfig.ExecStart = - "${cfgPrg.wrappedPackage}/bin/dsmc ${cfg.command} -se='${cfg.servername}' -optfile=/dev/null"; - serviceConfig.LogsDirectory = "tsm-backup"; - serviceConfig.StateDirectory = "tsm-backup"; - serviceConfig.StateDirectoryMode = "0750"; + serviceConfig = { + # for exit status description see + # https://www.ibm.com/docs/en/spectrum-protect/8.1.13?topic=clients-client-return-codes + SuccessExitStatus = "4 8"; + # The `-se` option must come after the command. + # The `-optfile` option suppresses a `dsm.opt`-not-found warning. + ExecStart = + "${cfgPrg.wrappedPackage}/bin/dsmc ${cfg.command} -se='${cfg.servername}' -optfile=/dev/null"; + LogsDirectory = "tsm-backup"; + StateDirectory = "tsm-backup"; + StateDirectoryMode = "0750"; + # systemd sandboxing + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + #PrivateTmp = true; # would break backup of {/var,}/tmp + #PrivateUsers = true; # would block backup of /home/* + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = "read-only"; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + }; startAt = mkIf (cfg.autoTime!=null) cfg.autoTime; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix b/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix new file mode 100644 index 0000000000..cd903c7e55 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.rstudio-server; + + rserver-conf = builtins.toFile "rserver.conf" '' + server-working-dir=${cfg.serverWorkingDir} + www-address=${cfg.listenAddr} + ${cfg.rserverExtraConfig} + ''; + + rsession-conf = builtins.toFile "rsession.conf" '' + ${cfg.rsessionExtraConfig} + ''; + +in +{ + meta.maintainers = with maintainers; [ jbedo cfhammill ]; + + options.services.rstudio-server = { + enable = mkEnableOption "RStudio server"; + + serverWorkingDir = mkOption { + type = types.str; + default = "/var/lib/rstudio-server"; + description = '' + Default working directory for server (server-working-dir in rserver.conf). + ''; + }; + + listenAddr = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Address to listen on (www-address in rserver.conf). + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.rstudio-server; + defaultText = literalExpression "pkgs.rstudio-server"; + example = literalExpression "pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }"; + description = '' + Rstudio server package to use. Can be set to rstudioServerWrapper to provide packages. + ''; + }; + + rserverExtraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra contents for rserver.conf. + ''; + }; + + rsessionExtraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra contents for resssion.conf. + ''; + }; + + }; + + config = mkIf cfg.enable + { + systemd.services.rstudio-server = { + description = "Rstudio server"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ rserver-conf rsession-conf ]; + + serviceConfig = { + Restart = "on-failure"; + Type = "forking"; + ExecStart = "${cfg.package}/bin/rserver"; + StateDirectory = "rstudio-server"; + RuntimeDirectory = "rstudio-server"; + }; + }; + + environment.etc = { + "rstudio/rserver.conf".source = rserver-conf; + "rstudio/rsession.conf".source = rsession-conf; + "pam.d/rstudio".source = "/etc/pam.d/login"; + }; + environment.systemPackages = [ cfg.package ]; + + users = { + users.rstudio-server = { + uid = config.ids.uids.rstudio-server; + description = "rstudio-server"; + group = "rstudio-server"; + }; + groups.rstudio-server = { + gid = config.ids.gids.rstudio-server; + }; + }; + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix index 3b495d00df..fcd02ea90c 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.services.thermald; -in { +in +{ ###### interface options = { services.thermald = { @@ -41,6 +42,7 @@ in { description = "Thermal Daemon Service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { + PrivateNetwork = true; ExecStart = '' ${cfg.package}/sbin/thermald \ --no-daemon \ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix b/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix index f76f534fb4..191666bc36 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix @@ -84,7 +84,7 @@ in } // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then { # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12 loglevel = mkOD "warn"; # default is info but its spammy - cgroup_realtime_workaround = mkOD true; + cgroup_realtime_workaround = mkOD config.systemd.enableUnifiedCgroupHierarchy; } else { # https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf check_disks_schedulers = mkOD true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix index cb97a86b85..fa00d7e4f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix @@ -21,6 +21,8 @@ let This must be in a format usable by findmnt; that could be a key=value pair, or a bare path to a mount point. + Using bare paths will allow systemd to start the beesd service only + after mounting the associated path. ''; example = "LABEL=MyBulkDataDrive"; }; @@ -122,6 +124,7 @@ in StartupIOWeight = 25; SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper" }; + unitConfig.RequiresMountsFor = lib.mkIf (lib.hasPrefix "/" fs.spec) fs.spec; wantedBy = [ "multi-user.target" ]; }) cfg.filesystems; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix index 353a2781d2..7ce8a23d9a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix @@ -23,7 +23,7 @@ let in { options.services.heisenbridge = { - enable = mkEnableOption "A bouncer-style Matrix IRC bridge"; + enable = mkEnableOption "the Matrix to IRC bridge"; package = mkOption { type = types.package; @@ -172,25 +172,39 @@ in ++ (map (lib.escapeShellArg) cfg.extraArgs) ); - ProtectHome = true; - PrivateDevices = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - StateDirectory = "heisenbridge"; - StateDirectoryMode = "755"; + # Hardening options User = "heisenbridge"; Group = "heisenbridge"; + RuntimeDirectory = "heisenbridge"; + RuntimeDirectoryMode = "0700"; + StateDirectory = "heisenbridge"; + StateDirectoryMode = "0755"; - CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || cfg.identd.port < 1024) "CAP_NET_BIND_SERVICE"; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictNamespaces = true; + RemoveIPC = true; + UMask = "0077"; + + CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || (cfg.identd.enable && cfg.identd.port < 1024)) "CAP_NET_BIND_SERVICE"; AmbientCapabilities = CapabilityBoundingSet; NoNewPrivileges = true; - LockPersonality = true; RestrictRealtime = true; - PrivateMounts = true; - SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; + SystemCallFilter = ["@system-service" "~@priviledged" "@chown"]; SystemCallArchitectures = "native"; RestrictAddressFamilies = "AF_INET AF_INET6"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix index d80b6fafc2..d2b0f0da2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.mbpfan; verbose = if cfg.verbose then "v" else ""; + settingsFormat = pkgs.formats.ini {}; + settingsFile = settingsFormat.generate "config.conf" cfg.settings; in { options.services.mbpfan = { @@ -19,54 +21,6 @@ in { ''; }; - minFanSpeed = mkOption { - type = types.int; - default = 2000; - description = '' - The minimum fan speed. - ''; - }; - - maxFanSpeed = mkOption { - type = types.int; - default = 6200; - description = '' - The maximum fan speed. - ''; - }; - - lowTemp = mkOption { - type = types.int; - default = 63; - description = '' - The low temperature. - ''; - }; - - highTemp = mkOption { - type = types.int; - default = 66; - description = '' - The high temperature. - ''; - }; - - maxTemp = mkOption { - type = types.int; - default = 86; - description = '' - The maximum temperature. - ''; - }; - - pollingInterval = mkOption { - type = types.int; - default = 7; - description = '' - The polling interval. - ''; - }; - verbose = mkOption { type = types.bool; default = false; @@ -74,23 +28,61 @@ in { If true, sets the log level to verbose. ''; }; + + settings = mkOption { + default = {}; + description = "The INI configuration for Mbpfan."; + type = types.submodule { + freeformType = settingsFormat.type; + + options.general.min_fan1_speed = mkOption { + type = types.int; + default = 2000; + description = "The minimum fan speed."; + }; + options.general.max_fan1_speed = mkOption { + type = types.int; + default = 6199; + description = "The maximum fan speed."; + }; + options.general.low_temp = mkOption { + type = types.int; + default = 55; + description = "The low temperature."; + }; + options.general.high_temp = mkOption { + type = types.int; + default = 58; + description = "The high temperature."; + }; + options.general.max_temp = mkOption { + type = types.int; + default = 86; + description = "The maximum temperature."; + }; + options.general.polling_interval = mkOption { + type = types.int; + default = 1; + description = "The polling interval."; + }; + }; + }; }; + imports = [ + (mkRenamedOptionModule [ "services" "mbpfan" "pollingInterval" ] [ "services" "mbpfan" "settings" "general" "polling_interval" ]) + (mkRenamedOptionModule [ "services" "mbpfan" "maxTemp" ] [ "services" "mbpfan" "settings" "general" "max_temp" ]) + (mkRenamedOptionModule [ "services" "mbpfan" "lowTemp" ] [ "services" "mbpfan" "settings" "general" "low_temp" ]) + (mkRenamedOptionModule [ "services" "mbpfan" "highTemp" ] [ "services" "mbpfan" "settings" "general" "high_temp" ]) + (mkRenamedOptionModule [ "services" "mbpfan" "minFanSpeed" ] [ "services" "mbpfan" "settings" "general" "min_fan1_speed" ]) + (mkRenamedOptionModule [ "services" "mbpfan" "maxFanSpeed" ] [ "services" "mbpfan" "settings" "general" "max_fan1_speed" ]) + ]; + config = mkIf cfg.enable { boot.kernelModules = [ "coretemp" "applesmc" ]; - environment = { - etc."mbpfan.conf".text = '' - [general] - min_fan_speed = ${toString cfg.minFanSpeed} - max_fan_speed = ${toString cfg.maxFanSpeed} - low_temp = ${toString cfg.lowTemp} - high_temp = ${toString cfg.highTemp} - max_temp = ${toString cfg.maxTemp} - polling_interval = ${toString cfg.pollingInterval} - ''; - systemPackages = [ cfg.package ]; - }; + environment.etc."mbpfan.conf".source = settingsFile; + environment.systemPackages = [ cfg.package ]; systemd.services.mbpfan = { description = "A fan manager daemon for MacBook Pro"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix index 05713adbd8..98ddf07160 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix @@ -87,6 +87,22 @@ in { }; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings != { } + -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings) + || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings); + message = + "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration"; + } + { + assertion = cfg.settings != { } + -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings; + message = + "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration"; + } + ]; + systemd.services.adguardhome = { description = "AdGuard Home: Network-level blocker"; after = [ "network.target" ]; @@ -96,7 +112,7 @@ in { StartLimitBurst = 10; }; - preStart = '' + preStart = optionalString (cfg.settings != { }) '' if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \ && [ "${toString cfg.mutableSettings}" = "1" ]; then # Writing directly to AdGuardHome.yaml results in empty file diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix index 0bb8c87b38..d025c8f817 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix @@ -29,9 +29,9 @@ let configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; preStart = '' - install --owner ddclient -m600 ${configFile} /run/${RuntimeDirectory}/ddclient.conf + install ${configFile} /run/${RuntimeDirectory}/ddclient.conf ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then '' - install --owner ddclient -m600 ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key + install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key '' else if (cfg.passwordFile != null) then '' password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")") sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix b/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix new file mode 100644 index 0000000000..cfaf69fc61 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix @@ -0,0 +1,155 @@ +{ config, lib, options, pkgs, ... }: let + cfg = config.services.ergochat; +in { + options = { + services.ergochat = { + + enable = lib.mkEnableOption "Ergo IRC daemon"; + + openFilesLimit = lib.mkOption { + type = lib.types.int; + default = 1024; + description = '' + Maximum number of open files. Limits the clients and server connections. + ''; + }; + + configFile = lib.mkOption { + type = lib.types.path; + default = (pkgs.formats.yaml {}).generate "ergo.conf" cfg.settings; + defaultText = "generated config file from .settings"; + description = '' + Path to configuration file. + Setting this will skip any configuration done via .settings + ''; + }; + + settings = lib.mkOption { + type = (pkgs.formats.yaml {}).type; + description = '' + Ergo IRC daemon configuration file. + https://raw.githubusercontent.com/ergochat/ergo/master/default.yaml + ''; + default = { + network = { + name = "testnetwork"; + }; + server = { + name = "example.com"; + listeners = { + ":6667" = {}; + }; + casemapping = "permissive"; + enforce-utf = true; + lookup-hostnames = false; + ip-cloaking = { + enabled = false; + }; + forward-confirm-hostnames = false; + check-ident = false; + relaymsg = { + enabled = false; + }; + max-sendq = "1M"; + ip-limits = { + count = false; + throttle = false; + }; + }; + datastore = { + autoupgrade = true; + # this points to the StateDirectory of the systemd service + path = "/var/lib/ergo/ircd.db"; + }; + accounts = { + authentication-enabled = true; + registration = { + enabled = true; + allow-before-connect = true; + throttling = { + enabled = true; + duration = "10m"; + max-attempts = 30; + }; + bcrypt-cost = 4; + email-verification.enabled = false; + }; + multiclient = { + enabled = true; + allowed-by-default = true; + always-on = "opt-out"; + auto-away = "opt-out"; + }; + }; + channels = { + default-modes = "+ntC"; + registration = { + enabled = true; + }; + }; + limits = { + nicklen = 32; + identlen = 20; + channellen = 64; + awaylen = 390; + kicklen = 390; + topiclen = 390; + }; + history = { + enabled = true; + channel-length = 2048; + client-length = 256; + autoresize-window = "3d"; + autoreplay-on-join = 0; + chathistory-maxmessages = 100; + znc-maxmessages = 2048; + restrictions = { + expire-time = "1w"; + query-cutoff = "none"; + grace-period = "1h"; + }; + retention = { + allow-individual-delete = false; + enable-account-indexing = false; + }; + tagmsg-storage = { + default = false; + whitelist = [ + "+draft/react" + "+react" + ]; + }; + }; + }; + }; + + }; + }; + config = lib.mkIf cfg.enable { + + environment.etc."ergo.yaml".source = cfg.configFile; + + # merge configured values with default values + services.ergochat.settings = + lib.mapAttrsRecursive (_: lib.mkDefault) options.services.ergochat.settings.default; + + systemd.services.ergochat = { + description = "Ergo IRC daemon"; + wantedBy = [ "multi-user.target" ]; + # reload is not applying the changed config. further investigation is needed + # at some point this should be enabled, since we don't want to restart for + # every config change + # reloadIfChanged = true; + restartTriggers = [ cfg.configFile ]; + serviceConfig = { + ExecStart = "${pkgs.ergochat}/bin/ergo run --conf /etc/ergo.yaml"; + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + DynamicUser = true; + StateDirectory = "ergo"; + LimitNOFILE = toString cfg.openFilesLimit; + }; + }; + + }; + meta.maintainers = with lib.maintainers; [ lassulus tv ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mailpile.nix b/third_party/nixpkgs/nixos/modules/services/networking/mailpile.nix deleted file mode 100644 index 4673a2580b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/mailpile.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.mailpile; - - hostname = cfg.hostname; - port = cfg.port; - -in - -{ - - ###### interface - - options = { - - services.mailpile = { - enable = mkEnableOption "Mailpile the mail client"; - - hostname = mkOption { - type = types.str; - default = "localhost"; - description = "Listen to this hostname or ip."; - }; - port = mkOption { - type = types.port; - default = 33411; - description = "Listen on this port."; - }; - }; - - }; - - - ###### implementation - - config = mkIf config.services.mailpile.enable { - - users.users.mailpile = - { uid = config.ids.uids.mailpile; - description = "Mailpile user"; - createHome = true; - home = "/var/lib/mailpile"; - }; - - users.groups.mailpile = - { gid = config.ids.gids.mailpile; - }; - - systemd.services.mailpile = - { - description = "Mailpile server."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "mailpile"; - ExecStart = "${pkgs.mailpile}/bin/mailpile --www ${hostname}:${port} --wait"; - # mixed - first send SIGINT to main process, - # then after 2min send SIGKILL to whole group if neccessary - KillMode = "mixed"; - KillSignal = "SIGINT"; # like Ctrl+C - safe mailpile shutdown - TimeoutSec = 120; # wait 2min untill SIGKILL - }; - environment.MAILPILE_HOME = "/var/lib/mailpile/.local/share/Mailpile"; - }; - - environment.systemPackages = [ pkgs.mailpile ]; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index 2d498d4dbb..b41a2fd27b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -136,7 +136,7 @@ let + concatStringsSep "\n" (plainLines ++ optional (plainLines != []) '' - ${pkgs.mosquitto}/bin/mosquitto_passwd -U "$file" + ${cfg.package}/bin/mosquitto_passwd -U "$file" '' ++ hashedLines)); @@ -444,6 +444,15 @@ let globalOptions = with types; { enable = mkEnableOption "the MQTT Mosquitto broker"; + package = mkOption { + type = package; + default = pkgs.mosquitto; + defaultText = literalExpression "pkgs.mosquitto"; + description = '' + Mosquitto package to use. + ''; + }; + bridges = mkOption { type = attrsOf bridgeOptions; default = {}; @@ -556,7 +565,7 @@ in systemd.services.mosquitto = { description = "Mosquitto MQTT Broker Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; serviceConfig = { Type = "notify"; NotifyAccess = "main"; @@ -565,7 +574,7 @@ in RuntimeDirectory = "mosquitto"; WorkingDirectory = cfg.dataDir; Restart = "on-failure"; - ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${configFile}"; + ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; # Hardening diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix index 390f0ddaee..432938d59d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix @@ -26,6 +26,12 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for nix-serve."; + }; + secretKeyFile = mkOption { type = types.nullOr types.str; default = null; @@ -77,5 +83,9 @@ in "NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}"; }; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index f19624aba0..7bfc700509 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -81,6 +81,7 @@ in imports = [ (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ]) (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ]) + (mkRenamedOptionModule [ "services" "openssh" "challengeResponseAuthentication" ] [ "services" "openssh" "kbdInteractiveAuthentication" ]) ]; ###### interface @@ -218,11 +219,11 @@ in ''; }; - challengeResponseAuthentication = mkOption { + kbdInteractiveAuthentication = mkOption { type = types.bool; default = true; description = '' - Specifies whether challenge/response authentication is allowed. + Specifies whether keyboard-interactive authentication is allowed. ''; }; @@ -534,7 +535,7 @@ in PermitRootLogin ${cfg.permitRootLogin} GatewayPorts ${cfg.gatewayPorts} PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"} - ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"} + KbdInteractiveAuthentication ${if cfg.kbdInteractiveAuthentication then "yes" else "no"} PrintMotd no # handled by pam_motd diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index e37e324019..3a3d4c80ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -468,7 +468,7 @@ in { default = false; example = true; description = '' - Whether to open the default ports in the firewall: TCP 22000 for transfers + Whether to open the default ports in the firewall: TCP/UDP 22000 for transfers and UDP 21027 for discovery. If multiple users are running Syncthing on this machine, you will need @@ -504,7 +504,7 @@ in { networking.firewall = mkIf cfg.openDefaultPorts { allowedTCPPorts = [ 22000 ]; - allowedUDPPorts = [ 21027 ]; + allowedUDPPorts = [ 21027 22000 ]; }; systemd.packages = [ pkgs.syncthing ]; diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix new file mode 100644 index 0000000000..496e0b9035 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix @@ -0,0 +1,57 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cachix-agent; +in { + meta.maintainers = [ lib.maintainers.domenkozar ]; + + options.services.cachix-agent = { + enable = mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/"; + + name = mkOption { + type = types.str; + description = "Agent name, usually same as the hostname"; + default = config.networking.hostName; + defaultText = "config.networking.hostName"; + }; + + profile = mkOption { + type = types.nullOr types.str; + default = null; + description = "Profile name, defaults to 'system' (NixOS)."; + }; + + package = mkOption { + type = types.package; + default = pkgs.cachix; + defaultText = literalExpression "pkgs.cachix"; + description = "Cachix Client package to use."; + }; + + credentialsFile = mkOption { + type = types.path; + default = "/etc/cachix-agent.token"; + description = '' + Required file that needs to contain CACHIX_AGENT_TOKEN=... + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.cachix-agent = { + description = "Cachix Deploy Agent"; + after = ["network-online.target"]; + path = [ config.nix.package ]; + wantedBy = [ "multi-user.target" ]; + # don't restart while changing + reloadIfChanged = true; + serviceConfig = { + Restart = "on-failure"; + EnvironmentFile = cfg.credentialsFile; + ExecStart = "${cfg.package}/bin/cachix deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix index b509e4fff4..54eaea63b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix @@ -24,8 +24,14 @@ let $sudo ${pkgs.php}/bin/php artisan $* ''; + tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME; in { + imports = [ + (mkRemovedOptionModule [ "services" "bookstack" "extraConfig" ] "Use services.bookstack.config instead.") + (mkRemovedOptionModule [ "services" "bookstack" "cacheDir" ] "The cache directory is now handled automatically.") + ]; + options.services.bookstack = { enable = mkEnableOption "BookStack"; @@ -44,28 +50,38 @@ in { appKeyFile = mkOption { description = '' - A file containing the AppKey. - Used for encryption where needed. Can be generated with head -c 32 /dev/urandom| base64 and must be prefixed with base64:. + A file containing the Laravel APP_KEY - a 32 character long, + base64 encoded key used for encryption where needed. Can be + generated with head -c 32 /dev/urandom | base64. ''; example = "/run/keys/bookstack-appkey"; type = types.path; }; + hostname = lib.mkOption { + type = lib.types.str; + default = if config.networking.domain != null then + config.networking.fqdn + else + config.networking.hostName; + defaultText = lib.literalExpression "config.networking.fqdn"; + example = "bookstack.example.com"; + description = '' + The hostname to serve BookStack on. + ''; + }; + appURL = mkOption { description = '' The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value. If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com ''; + default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostname}"; + defaultText = ''http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostname}''; example = "https://example.com"; type = types.str; }; - cacheDir = mkOption { - description = "BookStack cache directory"; - default = "/var/cache/bookstack"; - type = types.path; - }; - dataDir = mkOption { description = "BookStack data directory"; default = "/var/lib/bookstack"; @@ -202,16 +218,59 @@ in { ''; }; - extraConfig = mkOption { - type = types.nullOr types.lines; - default = null; - example = '' - ALLOWED_IFRAME_HOSTS="https://example.com" - WKHTMLTOPDF=/home/user/bins/wkhtmltopdf + config = mkOption { + type = with types; + attrsOf + (nullOr + (either + (oneOf [ + bool + int + port + path + str + ]) + (submodule { + options = { + _secret = mkOption { + type = nullOr str; + description = '' + The path to a file containing the value the + option should be set to in the final + configuration file. + ''; + }; + }; + }))); + default = {}; + example = literalExpression '' + { + ALLOWED_IFRAME_HOSTS = "https://example.com"; + WKHTMLTOPDF = "/home/user/bins/wkhtmltopdf"; + AUTH_METHOD = "oidc"; + OIDC_NAME = "MyLogin"; + OIDC_DISPLAY_NAME_CLAIMS = "name"; + OIDC_CLIENT_ID = "bookstack"; + OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"}; + OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm"; + OIDC_ISSUER_DISCOVER = true; + } ''; description = '' - Lines to be appended verbatim to the BookStack configuration. - Refer to for details on supported values. + BookStack configuration options to set in the + .env file. + + Refer to + for details on supported values. + + Settings containing secret data should be set to an attribute + set containing the attribute _secret - a + string pointing to a file containing the value the option + should be set to. See the example to get a better picture of + this: in the resulting .env file, the + OIDC_CLIENT_SECRET key will be set to the + contents of the /run/keys/oidc_secret + file. ''; }; @@ -228,6 +287,30 @@ in { } ]; + services.bookstack.config = { + APP_KEY._secret = cfg.appKeyFile; + APP_URL = cfg.appURL; + DB_HOST = db.host; + DB_PORT = db.port; + DB_DATABASE = db.name; + DB_USERNAME = db.user; + MAIL_DRIVER = mail.driver; + MAIL_FROM_NAME = mail.fromName; + MAIL_FROM = mail.from; + MAIL_HOST = mail.host; + MAIL_PORT = mail.port; + MAIL_USERNAME = mail.user; + MAIL_ENCRYPTION = mail.encryption; + DB_PASSWORD._secret = db.passwordFile; + MAIL_PASSWORD._secret = mail.passwordFile; + APP_SERVICES_CACHE = "/run/bookstack/cache/services.php"; + APP_PACKAGES_CACHE = "/run/bookstack/cache/packages.php"; + APP_CONFIG_CACHE = "/run/bookstack/cache/config.php"; + APP_ROUTES_CACHE = "/run/bookstack/cache/routes-v7.php"; + APP_EVENTS_CACHE = "/run/bookstack/cache/events.php"; + SESSION_SECURE_COOKIE = tlsEnabled; + }; + environment.systemPackages = [ artisan ]; services.mysql = mkIf db.createLocally { @@ -258,24 +341,19 @@ in { services.nginx = { enable = mkDefault true; - virtualHosts.bookstack = mkMerge [ cfg.nginx { + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + virtualHosts.${cfg.hostname} = mkMerge [ cfg.nginx { root = mkForce "${bookstack}/public"; - extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; locations = { "/" = { index = "index.php"; - extraConfig = ''try_files $uri $uri/ /index.php?$query_string;''; - }; - "~ \.php$" = { - extraConfig = '' - try_files $uri $uri/ /index.php?$query_string; - include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REDIRECT_STATUS 200; - fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket}; - ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"} - ''; + tryFiles = "$uri $uri/ /index.php?$query_string"; }; + "~ \.php$".extraConfig = '' + fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket}; + ''; "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = { extraConfig = "expires 365d;"; }; @@ -290,50 +368,54 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; User = user; WorkingDirectory = "${bookstack}"; + RuntimeDirectory = "bookstack/cache"; + RuntimeDirectoryMode = 0700; }; - script = '' + path = [ pkgs.replace-secret ]; + script = + let + isSecret = v: isAttrs v && v ? _secret && isString v._secret; + bookstackEnvVars = lib.generators.toKeyValue { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" { + mkValueString = v: with builtins; + if isInt v then toString v + else if isString v then v + else if true == v then "true" + else if false == v then "false" + else if isSecret v then v._secret + else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; + }; + }; + secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config); + mkSecretReplacement = file: '' + replace-secret ${escapeShellArgs [ file file "${cfg.dataDir}/.env" ]} + ''; + secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config; + bookstackEnv = pkgs.writeText "bookstack.env" (bookstackEnvVars filteredConfig); + in '' + # error handling + set -euo pipefail + # set permissions umask 077 + # create .env file - echo " - APP_KEY=base64:$(head -n1 ${cfg.appKeyFile}) - APP_URL=${cfg.appURL} - DB_HOST=${db.host} - DB_PORT=${toString db.port} - DB_DATABASE=${db.name} - DB_USERNAME=${db.user} - MAIL_DRIVER=${mail.driver} - MAIL_FROM_NAME=\"${mail.fromName}\" - MAIL_FROM=${mail.from} - MAIL_HOST=${mail.host} - MAIL_PORT=${toString mail.port} - ${optionalString (mail.user != null) "MAIL_USERNAME=${mail.user};"} - ${optionalString (mail.encryption != null) "MAIL_ENCRYPTION=${mail.encryption};"} - ${optionalString (db.passwordFile != null) "DB_PASSWORD=$(head -n1 ${db.passwordFile})"} - ${optionalString (mail.passwordFile != null) "MAIL_PASSWORD=$(head -n1 ${mail.passwordFile})"} - APP_SERVICES_CACHE=${cfg.cacheDir}/services.php - APP_PACKAGES_CACHE=${cfg.cacheDir}/packages.php - APP_CONFIG_CACHE=${cfg.cacheDir}/config.php - APP_ROUTES_CACHE=${cfg.cacheDir}/routes-v7.php - APP_EVENTS_CACHE=${cfg.cacheDir}/events.php - ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "SESSION_SECURE_COOKIE=true"} - ${toString cfg.extraConfig} - " > "${cfg.dataDir}/.env" + install -T -m 0600 -o ${user} ${bookstackEnv} "${cfg.dataDir}/.env" + ${secretReplacements} + if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then + sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env" + fi # migrate db ${pkgs.php}/bin/php artisan migrate --force - - # clear & create caches (needed in case of update) - ${pkgs.php}/bin/php artisan cache:clear - ${pkgs.php}/bin/php artisan config:clear - ${pkgs.php}/bin/php artisan view:clear ''; }; systemd.tmpfiles.rules = [ - "d ${cfg.cacheDir} 0700 ${user} ${group} - -" "d ${cfg.dataDir} 0710 ${user} ${group} - -" "d ${cfg.dataDir}/public 0750 ${user} ${group} - -" "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -" diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index 9b9ae931f9..392748a93e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -1,20 +1,14 @@ { config, pkgs, lib, ... }: -let - inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types maintainers recursiveUpdate; - inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExpression; - inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; +with lib; - cfg = migrateOldAttrs config.services.dokuwiki; +let + cfg = config.services.dokuwiki; eachSite = cfg.sites; user = "dokuwiki"; webserver = config.services.${cfg.webserver}; stateDir = hostName: "/var/lib/dokuwiki/${hostName}/data"; - # Migrate config.services.dokuwiki. to config.services.dokuwiki.sites. - oldSites = filterAttrs (o: _: o != "sites" && o != "webserver"); - migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; }; - dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" '' # acl.auth.php # @@ -257,10 +251,7 @@ in options = { services.dokuwiki = mkOption { type = types.submodule { - # Used to support old interface - freeformType = types.attrsOf (types.submodule siteOpts); - # New interface options.sites = mkOption { type = types.attrsOf (types.submodule siteOpts); default = {}; @@ -301,8 +292,6 @@ in } ]) eachSite); - warnings = mapAttrsToList (hostName: _: ''services.dokuwiki."${hostName}" is deprecated use services.dokuwiki.sites."${hostName}"'') (oldSites cfg); - services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "dokuwiki-${hostName}" { inherit user; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index e08f6dcabd..a01f0049b2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -3,281 +3,312 @@ let cfg = config.services.keycloak; opt = options.services.keycloak; + + inherit (lib) types mkOption concatStringsSep mapAttrsToList + escapeShellArg recursiveUpdate optionalAttrs boolToString mkOrder + sort filterAttrs concatMapStringsSep concatStrings mkIf + optionalString optionals mkDefault literalExpression hasSuffix + foldl' isAttrs filter attrNames elem literalDocBook + maintainers; + + inherit (builtins) match typeOf; in { - options.services.keycloak = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = '' - Whether to enable the Keycloak identity and access management - server. - ''; - }; - - bindAddress = lib.mkOption { - type = lib.types.str; - default = "\${jboss.bind.address:0.0.0.0}"; - example = "127.0.0.1"; - description = '' - On which address Keycloak should accept new connections. - - A special syntax can be used to allow command line Java system - properties to override the value: ''${property.name:value} - ''; - }; - - httpPort = lib.mkOption { - type = lib.types.str; - default = "\${jboss.http.port:80}"; - example = "8080"; - description = '' - On which port Keycloak should listen for new HTTP connections. - - A special syntax can be used to allow command line Java system - properties to override the value: ''${property.name:value} - ''; - }; - - httpsPort = lib.mkOption { - type = lib.types.str; - default = "\${jboss.https.port:443}"; - example = "8443"; - description = '' - On which port Keycloak should listen for new HTTPS connections. - - A special syntax can be used to allow command line Java system - properties to override the value: ''${property.name:value} - ''; - }; - - frontendUrl = lib.mkOption { - type = lib.types.str; - apply = x: if lib.hasSuffix "/" x then x else x + "/"; - example = "keycloak.example.com/auth"; - description = '' - The public URL used as base for all frontend requests. Should - normally include a trailing /auth. - - See the - Hostname section of the Keycloak server installation - manual for more information. - ''; - }; - - forceBackendUrlToFrontendUrl = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = '' - Whether Keycloak should force all requests to go through the - frontend URL configured in . By default, - Keycloak allows backend requests to instead use its local - hostname or IP address and may also advertise it to clients - through its OpenID Connect Discovery endpoint. - - See the - Hostname section of the Keycloak server installation - manual for more information. - ''; - }; - - sslCertificate = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/run/keys/ssl_cert"; - description = '' - The path to a PEM formatted certificate to use for TLS/SSL - connections. - - This should be a string, not a Nix path, since Nix paths are - copied into the world-readable Nix store. - ''; - }; - - sslCertificateKey = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/run/keys/ssl_key"; - description = '' - The path to a PEM formatted private key to use for TLS/SSL - connections. - - This should be a string, not a Nix path, since Nix paths are - copied into the world-readable Nix store. - ''; - }; - - database = { - type = lib.mkOption { - type = lib.types.enum [ "mysql" "postgresql" ]; - default = "postgresql"; - example = "mysql"; + options.services.keycloak = + let + inherit (types) bool str nullOr attrsOf path enum anything + package port; + in + { + enable = mkOption { + type = bool; + default = false; + example = true; description = '' - The type of database Keycloak should connect to. + Whether to enable the Keycloak identity and access management + server. ''; }; - host = lib.mkOption { - type = lib.types.str; - default = "localhost"; + bindAddress = mkOption { + type = str; + default = "\${jboss.bind.address:0.0.0.0}"; + example = "127.0.0.1"; description = '' - Hostname of the database to connect to. + On which address Keycloak should accept new connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} ''; }; - port = - let - dbPorts = { - postgresql = 5432; - mysql = 3306; - }; - in - lib.mkOption { - type = lib.types.port; - default = dbPorts.${cfg.database.type}; - defaultText = lib.literalDocBook "default port of selected database"; - description = '' - Port of the database to connect to. - ''; - }; - - useSSL = lib.mkOption { - type = lib.types.bool; - default = cfg.database.host != "localhost"; - defaultText = lib.literalExpression ''config.${opt.database.host} != "localhost"''; + httpPort = mkOption { + type = str; + default = "\${jboss.http.port:80}"; + example = "8080"; description = '' - Whether the database connection should be secured by SSL / - TLS. + On which port Keycloak should listen for new HTTP connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} ''; }; - caCert = lib.mkOption { - type = lib.types.nullOr lib.types.path; + httpsPort = mkOption { + type = str; + default = "\${jboss.https.port:443}"; + example = "8443"; + description = '' + On which port Keycloak should listen for new HTTPS connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} + ''; + }; + + frontendUrl = mkOption { + type = str; + apply = x: + if x == "" || hasSuffix "/" x then + x + else + x + "/"; + example = "keycloak.example.com/auth"; + description = '' + The public URL used as base for all frontend requests. Should + normally include a trailing /auth. + + See the + Hostname section of the Keycloak server installation + manual for more information. + ''; + }; + + forceBackendUrlToFrontendUrl = mkOption { + type = bool; + default = false; + example = true; + description = '' + Whether Keycloak should force all requests to go through the + frontend URL configured in . By default, + Keycloak allows backend requests to instead use its local + hostname or IP address and may also advertise it to clients + through its OpenID Connect Discovery endpoint. + + See the + Hostname section of the Keycloak server installation + manual for more information. + ''; + }; + + sslCertificate = mkOption { + type = nullOr path; default = null; + example = "/run/keys/ssl_cert"; description = '' - The SSL / TLS CA certificate that verifies the identity of the - database server. - - Required when PostgreSQL is used and SSL is turned on. - - For MySQL, if left at null, the default - Java keystore is used, which should suffice if the server - certificate is issued by an official CA. - ''; - }; - - createLocally = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether a database should be automatically created on the - local host. Set this to false if you plan on provisioning a - local database yourself. This has no effect if - services.keycloak.database.host is customized. - ''; - }; - - username = lib.mkOption { - type = lib.types.str; - default = "keycloak"; - description = '' - Username to use when connecting to an external or manually - provisioned database; has no effect when a local database is - automatically provisioned. - - To use this with a local database, set to - false and create the database and user - manually. The database should be called - keycloak. - ''; - }; - - passwordFile = lib.mkOption { - type = lib.types.path; - example = "/run/keys/db_password"; - description = '' - File containing the database password. + The path to a PEM formatted certificate to use for TLS/SSL + connections. This should be a string, not a Nix path, since Nix paths are copied into the world-readable Nix store. ''; }; - }; - package = lib.mkOption { - type = lib.types.package; - default = pkgs.keycloak; - defaultText = lib.literalExpression "pkgs.keycloak"; - description = '' - Keycloak package to use. - ''; - }; + sslCertificateKey = mkOption { + type = nullOr path; + default = null; + example = "/run/keys/ssl_key"; + description = '' + The path to a PEM formatted private key to use for TLS/SSL + connections. - initialAdminPassword = lib.mkOption { - type = lib.types.str; - default = "changeme"; - description = '' - Initial password set for the admin - user. The password is not stored safely and should be changed - immediately in the admin panel. - ''; - }; + This should be a string, not a Nix path, since Nix paths are + copied into the world-readable Nix store. + ''; + }; - extraConfig = lib.mkOption { - type = lib.types.attrs; - default = { }; - example = lib.literalExpression '' - { - "subsystem=keycloak-server" = { - "spi=hostname" = { - "provider=default" = null; - "provider=fixed" = { - enabled = true; - properties.hostname = "keycloak.example.com"; - }; - default-provider = "fixed"; + database = { + type = mkOption { + type = enum [ "mysql" "postgresql" ]; + default = "postgresql"; + example = "mysql"; + description = '' + The type of database Keycloak should connect to. + ''; + }; + + host = mkOption { + type = str; + default = "localhost"; + description = '' + Hostname of the database to connect to. + ''; + }; + + port = + let + dbPorts = { + postgresql = 5432; + mysql = 3306; }; + in + mkOption { + type = port; + default = dbPorts.${cfg.database.type}; + defaultText = literalDocBook "default port of selected database"; + description = '' + Port of the database to connect to. + ''; }; - } - ''; - description = '' - Additional Keycloak configuration options to set in - standalone.xml. - Options are expressed as a Nix attribute set which matches the - structure of the jboss-cli configuration. The configuration is - effectively overlayed on top of the default configuration - shipped with Keycloak. To remove existing nodes and undefine - attributes from the default configuration, set them to - null. + useSSL = mkOption { + type = bool; + default = cfg.database.host != "localhost"; + defaultText = literalExpression ''config.${opt.database.host} != "localhost"''; + description = '' + Whether the database connection should be secured by SSL / + TLS. + ''; + }; - The example configuration does the equivalent of the following - script, which removes the hostname provider - default, adds the deprecated hostname - provider fixed and defines it the default: + caCert = mkOption { + type = nullOr path; + default = null; + description = '' + The SSL / TLS CA certificate that verifies the identity of the + database server. - - /subsystem=keycloak-server/spi=hostname/provider=default:remove() - /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" }) - /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed") - + Required when PostgreSQL is used and SSL is turned on. + + For MySQL, if left at null, the default + Java keystore is used, which should suffice if the server + certificate is issued by an official CA. + ''; + }; + + createLocally = mkOption { + type = bool; + default = true; + description = '' + Whether a database should be automatically created on the + local host. Set this to false if you plan on provisioning a + local database yourself. This has no effect if + services.keycloak.database.host is customized. + ''; + }; + + username = mkOption { + type = str; + default = "keycloak"; + description = '' + Username to use when connecting to an external or manually + provisioned database; has no effect when a local database is + automatically provisioned. + + To use this with a local database, set to + false and create the database and user + manually. The database should be called + keycloak. + ''; + }; + + passwordFile = mkOption { + type = path; + example = "/run/keys/db_password"; + description = '' + File containing the database password. + + This should be a string, not a Nix path, since Nix paths are + copied into the world-readable Nix store. + ''; + }; + }; + + package = mkOption { + type = package; + default = pkgs.keycloak; + defaultText = literalExpression "pkgs.keycloak"; + description = '' + Keycloak package to use. + ''; + }; + + initialAdminPassword = mkOption { + type = str; + default = "changeme"; + description = '' + Initial password set for the admin + user. The password is not stored safely and should be changed + immediately in the admin panel. + ''; + }; + + themes = mkOption { + type = attrsOf package; + default = { }; + description = '' + Additional theme packages for Keycloak. Each theme is linked into + subdirectory with a corresponding attribute name. + + Theme packages consist of several subdirectories which provide + different theme types: for example, account, + login etc. After adding a theme to this option you + can select it by its name in Keycloak administration console. + ''; + }; + + extraConfig = mkOption { + type = attrsOf anything; + default = { }; + example = literalExpression '' + { + "subsystem=keycloak-server" = { + "spi=hostname" = { + "provider=default" = null; + "provider=fixed" = { + enabled = true; + properties.hostname = "keycloak.example.com"; + }; + default-provider = "fixed"; + }; + }; + } + ''; + description = '' + Additional Keycloak configuration options to set in + standalone.xml. + + Options are expressed as a Nix attribute set which matches the + structure of the jboss-cli configuration. The configuration is + effectively overlayed on top of the default configuration + shipped with Keycloak. To remove existing nodes and undefine + attributes from the default configuration, set them to + null. + + The example configuration does the equivalent of the following + script, which removes the hostname provider + default, adds the deprecated hostname + provider fixed and defines it the default: + + + /subsystem=keycloak-server/spi=hostname/provider=default:remove() + /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" }) + /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed") + + + You can discover available options by using the jboss-cli.sh + program and by referring to the Keycloak + Server Installation and Configuration Guide. + ''; + }; - You can discover available options by using the jboss-cli.sh - program and by referring to the Keycloak - Server Installation and Configuration Guide. - ''; }; - }; - config = let # We only want to create a database if we're actually going to connect to it. @@ -285,28 +316,58 @@ in createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql"; createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql"; - mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} '' + mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" { } '' ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt ''; - keycloakConfig' = builtins.foldl' lib.recursiveUpdate { - "interface=public".inet-address = cfg.bindAddress; - "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort; - "subsystem=keycloak-server"."spi=hostname" = { - "provider=default" = { - enabled = true; - properties = { - inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl; + # Both theme and theme type directories need to be actual directories in one hierarchy to pass Keycloak checks. + themesBundle = pkgs.runCommand "keycloak-themes" { } '' + linkTheme() { + theme="$1" + name="$2" + + mkdir "$out/$name" + for typeDir in "$theme"/*; do + if [ -d "$typeDir" ]; then + type="$(basename "$typeDir")" + mkdir "$out/$name/$type" + for file in "$typeDir"/*; do + ln -sn "$file" "$out/$name/$type/$(basename "$file")" + done + fi + done + } + + mkdir -p "$out" + for theme in ${cfg.package}/themes/*; do + if [ -d "$theme" ]; then + linkTheme "$theme" "$(basename "$theme")" + fi + done + + ${concatStringsSep "\n" (mapAttrsToList (name: theme: "linkTheme ${theme} ${escapeShellArg name}") cfg.themes)} + ''; + + keycloakConfig' = foldl' recursiveUpdate + { + "interface=public".inet-address = cfg.bindAddress; + "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort; + "subsystem=keycloak-server" = { + "spi=hostname"."provider=default" = { + enabled = true; + properties = { + inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl; + }; }; + "theme=defaults".dir = toString themesBundle; }; - }; - "subsystem=datasources"."data-source=KeycloakDS" = { - max-pool-size = "20"; - user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username; - password = "@db-password@"; - }; - } [ - (lib.optionalAttrs (cfg.database.type == "postgresql") { + "subsystem=datasources"."data-source=KeycloakDS" = { + max-pool-size = "20"; + user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username; + password = "@db-password@"; + }; + } [ + (optionalAttrs (cfg.database.type == "postgresql") { "subsystem=datasources" = { "jdbc-driver=postgresql" = { driver-module-name = "org.postgresql"; @@ -314,16 +375,16 @@ in driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource"; }; "data-source=KeycloakDS" = { - connection-url = "jdbc:postgresql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak"; + connection-url = "jdbc:postgresql://${cfg.database.host}:${toString cfg.database.port}/keycloak"; driver-name = "postgresql"; - "connection-properties=ssl".value = lib.boolToString cfg.database.useSSL; - } // (lib.optionalAttrs (cfg.database.caCert != null) { + "connection-properties=ssl".value = boolToString cfg.database.useSSL; + } // (optionalAttrs (cfg.database.caCert != null) { "connection-properties=sslrootcert".value = cfg.database.caCert; "connection-properties=sslmode".value = "verify-ca"; }); }; }) - (lib.optionalAttrs (cfg.database.type == "mysql") { + (optionalAttrs (cfg.database.type == "mysql") { "subsystem=datasources" = { "jdbc-driver=mysql" = { driver-module-name = "com.mysql"; @@ -331,28 +392,40 @@ in driver-class-name = "com.mysql.jdbc.Driver"; }; "data-source=KeycloakDS" = { - connection-url = "jdbc:mysql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak"; + connection-url = "jdbc:mysql://${cfg.database.host}:${toString cfg.database.port}/keycloak"; driver-name = "mysql"; - "connection-properties=useSSL".value = lib.boolToString cfg.database.useSSL; - "connection-properties=requireSSL".value = lib.boolToString cfg.database.useSSL; - "connection-properties=verifyServerCertificate".value = lib.boolToString cfg.database.useSSL; + "connection-properties=useSSL".value = boolToString cfg.database.useSSL; + "connection-properties=requireSSL".value = boolToString cfg.database.useSSL; + "connection-properties=verifyServerCertificate".value = boolToString cfg.database.useSSL; "connection-properties=characterEncoding".value = "UTF-8"; valid-connection-checker-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"; validate-on-match = true; exception-sorter-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"; - } // (lib.optionalAttrs (cfg.database.caCert != null) { + } // (optionalAttrs (cfg.database.caCert != null) { "connection-properties=trustCertificateKeyStoreUrl".value = "file:${mySqlCaKeystore}"; "connection-properties=trustCertificateKeyStorePassword".value = "notsosecretpassword"; }); }; }) - (lib.optionalAttrs (cfg.sslCertificate != null && cfg.sslCertificateKey != null) { + (optionalAttrs (cfg.sslCertificate != null && cfg.sslCertificateKey != null) { "socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort; - "core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = { - keystore-path = "/run/keycloak/ssl/certificate_private_key_bundle.p12"; - keystore-password = "notsosecretpassword"; + "subsystem=elytron" = mkOrder 900 { + "key-store=httpsKS" = mkOrder 900 { + path = "/run/keycloak/ssl/certificate_private_key_bundle.p12"; + credential-reference.clear-text = "notsosecretpassword"; + type = "JKS"; + }; + "key-manager=httpsKM" = mkOrder 901 { + key-store = "httpsKS"; + credential-reference.clear-text = "notsosecretpassword"; + }; + "server-ssl-context=httpsSSC" = mkOrder 902 { + key-manager = "httpsKM"; + }; + }; + "subsystem=undertow" = mkOrder 901 { + "server=default-server"."https-listener=https".ssl-context = "httpsSSC"; }; - "subsystem=undertow"."server=default-server"."https-listener=https".security-realm = "UndertowRealm"; }) cfg.extraConfig ]; @@ -441,41 +514,42 @@ in # with `expression` to evaluate. prefixExpression = string: let - match = (builtins.match ''"\$\{.*}"'' string); + matchResult = match ''"\$\{.*}"'' string; in - if match != null then - "expression " + string - else - string; + if matchResult != null then + "expression " + string + else + string; writeAttribute = attribute: value: let - type = builtins.typeOf value; + type = typeOf value; in - if type == "set" then - let - names = builtins.attrNames value; - in - builtins.foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names - else if value == null then '' - if (outcome == success) of ${path}:read-attribute(name="${attribute}") - ${path}:undefine-attribute(name="${attribute}") + if type == "set" then + let + names = attrNames value; + in + foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names + else if value == null then '' + if (outcome == success) of ${path}:read-attribute(name="${attribute}") + ${path}:undefine-attribute(name="${attribute}") + end-if + '' + else if elem type [ "string" "path" "bool" ] then + let + value' = if type == "bool" then boolToString value else ''"${value}"''; + in + '' + if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}") + ${path}:write-attribute(name=${attribute}, value=${value'}) end-if '' - else if builtins.elem type [ "string" "path" "bool" ] then - let - value' = if type == "bool" then lib.boolToString value else ''"${value}"''; - in '' - if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}") - ${path}:write-attribute(name=${attribute}, value=${value'}) - end-if - '' - else throw "Unsupported type '${type}' for path '${path}'!"; + else throw "Unsupported type '${type}' for path '${path}'!"; in - lib.concatStrings - (lib.mapAttrsToList - (attribute: value: (writeAttribute attribute value)) - set); + concatStrings + (mapAttrsToList + (attribute: value: (writeAttribute attribute value)) + set); /* Produces an argument list for the JBoss `add()` function, @@ -498,98 +572,108 @@ in let makeArg = attribute: value: let - type = builtins.typeOf value; + type = typeOf value; in - if type == "set" then - "${attribute} = { " + (makeArgList value) + " }" - else if builtins.elem type [ "string" "path" "bool" ] then - "${attribute} = ${if type == "bool" then lib.boolToString value else ''"${value}"''}" - else if value == null then - "" - else - throw "Unsupported type '${type}' for attribute '${attribute}'!"; + if type == "set" then + "${attribute} = { " + (makeArgList value) + " }" + else if elem type [ "string" "path" "bool" ] then + "${attribute} = ${if type == "bool" then boolToString value else ''"${value}"''}" + else if value == null then + "" + else + throw "Unsupported type '${type}' for attribute '${attribute}'!"; + in - lib.concatStringsSep ", " (lib.mapAttrsToList makeArg set); + concatStringsSep ", " (mapAttrsToList makeArg set); - /* Recurses into the `attrs` attrset, beginning at the path - resolved from `state.path ++ node`; if `node` is `null`, - starts from `state.path`. Only subattrsets that are JBoss - paths, i.e. follows the `key=value` format, are recursed + /* Recurses into the `nodeValue` attrset. Only subattrsets that + are JBoss paths, i.e. follows the `key=value` format, are recursed into - the rest are considered JBoss attributes / maps. */ - recurse = state: node: + recurse = nodePath: nodeValue: let - path = state.path ++ (lib.optional (node != null) node); + nodeContent = + if isAttrs nodeValue && nodeValue._type or "" == "order" then + nodeValue.content + else + nodeValue; isPath = name: let - value = lib.getAttrFromPath (path ++ [ name ]) attrs; + value = nodeContent.${name}; in - if (builtins.match ".*([=]).*" name) == [ "=" ] then - if builtins.isAttrs value || value == null then - true - else - throw "Parsing path '${lib.concatStringsSep "." (path ++ [ name ])}' failed: JBoss attributes cannot contain '='!" + if (match ".*([=]).*" name) == [ "=" ] then + if isAttrs value || value == null then + true else - false; - jbossPath = "/" + (lib.concatStringsSep "/" path); - nodeValue = lib.getAttrFromPath path attrs; - children = if !builtins.isAttrs nodeValue then {} else nodeValue; - subPaths = builtins.filter isPath (builtins.attrNames children); - jbossAttrs = lib.filterAttrs (name: _: !(isPath name)) children; - in - state // { - text = state.text + ( - if nodeValue != null then '' + throw "Parsing path '${concatStringsSep "." (nodePath ++ [ name ])}' failed: JBoss attributes cannot contain '='!" + else + false; + jbossPath = "/" + concatStringsSep "/" nodePath; + children = if !isAttrs nodeContent then { } else nodeContent; + subPaths = filter isPath (attrNames children); + getPriority = name: + let + value = children.${name}; + in + if value._type or "" == "order" then value.priority else 1000; + orderedSubPaths = sort (a: b: getPriority a < getPriority b) subPaths; + jbossAttrs = filterAttrs (name: _: !(isPath name)) children; + text = + if nodeContent != null then + '' if (outcome != success) of ${jbossPath}:read-resource() ${jbossPath}:add(${makeArgList jbossAttrs}) end-if - '' + (writeAttributes jbossPath jbossAttrs) - else '' + '' + writeAttributes jbossPath jbossAttrs + else + '' if (outcome == success) of ${jbossPath}:read-resource() ${jbossPath}:remove() end-if - '') + (builtins.foldl' recurse { text = ""; inherit path; } subPaths).text; - }; + ''; + in + text + concatMapStringsSep "\n" (name: recurse (nodePath ++ [ name ]) children.${name}) orderedSubPaths; in - (recurse { text = ""; path = []; } null).text; - + recurse [ ] attrs; jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig'); - keycloakConfig = pkgs.runCommand "keycloak-config" { - nativeBuildInputs = [ cfg.package ]; - } '' - export JBOSS_BASE_DIR="$(pwd -P)"; - export JBOSS_MODULEPATH="${cfg.package}/modules"; - export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log"; + keycloakConfig = pkgs.runCommand "keycloak-config" + { + nativeBuildInputs = [ cfg.package ]; + } + '' + export JBOSS_BASE_DIR="$(pwd -P)"; + export JBOSS_MODULEPATH="${cfg.package}/modules"; + export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log"; - cp -r ${cfg.package}/standalone/configuration . - chmod -R u+rwX ./configuration + cp -r ${cfg.package}/standalone/configuration . + chmod -R u+rwX ./configuration - mkdir -p {deployments,ssl} + mkdir -p {deployments,ssl} - standalone.sh& + standalone.sh& - attempt=1 - max_attempts=30 - while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do - if [[ "$attempt" == "$max_attempts" ]]; then - echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2 - exit 1 - fi - echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)" - sleep 1 - (( attempt++ )) - done + attempt=1 + max_attempts=30 + while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do + if [[ "$attempt" == "$max_attempts" ]]; then + echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2 + exit 1 + fi + echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)" + sleep 1 + (( attempt++ )) + done - jboss-cli.sh --connect --file=${jbossCliScript} --echo-command + jboss-cli.sh --connect --file=${jbossCliScript} --echo-command - cp configuration/standalone.xml $out - ''; + cp configuration/standalone.xml $out + ''; in - lib.mkIf cfg.enable { - + mkIf cfg.enable + { assertions = [ { assertion = (cfg.database.useSSL && cfg.database.type == "postgresql") -> (cfg.database.caCert != null); @@ -599,7 +683,7 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.keycloakPostgreSQLInit = lib.mkIf createLocalPostgreSQL { + systemd.services.keycloakPostgreSQLInit = mkIf createLocalPostgreSQL { after = [ "postgresql.service" ]; before = [ "keycloak.service" ]; bindsTo = [ "postgresql.service" ]; @@ -623,7 +707,7 @@ in ''; }; - systemd.services.keycloakMySQLInit = lib.mkIf createLocalMySQL { + systemd.services.keycloakMySQLInit = mkIf createLocalMySQL { after = [ "mysql.service" ]; before = [ "keycloak.service" ]; bindsTo = [ "mysql.service" ]; @@ -650,13 +734,16 @@ in let databaseServices = if createLocalPostgreSQL then [ - "keycloakPostgreSQLInit.service" "postgresql.service" + "keycloakPostgreSQLInit.service" + "postgresql.service" ] else if createLocalMySQL then [ - "keycloakMySQLInit.service" "mysql.service" + "keycloakMySQLInit.service" + "mysql.service" ] else [ ]; - in { + in + { after = databaseServices; bindsTo = databaseServices; wantedBy = [ "multi-user.target" ]; @@ -671,52 +758,16 @@ in JBOSS_MODULEPATH = "${cfg.package}/modules"; }; serviceConfig = { - ExecStartPre = let - startPreFullPrivileges = '' - set -o errexit -o pipefail -o nounset -o errtrace - shopt -s inherit_errexit - - umask u=rwx,g=,o= - - install -T -m 0400 -o keycloak -g keycloak '${cfg.database.passwordFile}' /run/keycloak/secrets/db_password - '' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' - install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificate}' /run/keycloak/secrets/ssl_cert - install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificateKey}' /run/keycloak/secrets/ssl_key - ''; - startPre = '' - set -o errexit -o pipefail -o nounset -o errtrace - shopt -s inherit_errexit - - umask u=rwx,g=,o= - - install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration - install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml - - replace-secret '@db-password@' '/run/keycloak/secrets/db_password' /run/keycloak/configuration/standalone.xml - - export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration - add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}' - '' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' - pushd /run/keycloak/ssl/ - cat /run/keycloak/secrets/ssl_cert <(echo) \ - /run/keycloak/secrets/ssl_key <(echo) \ - /etc/ssl/certs/ca-certificates.crt \ - > allcerts.pem - openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert -inkey /run/keycloak/secrets/ssl_key -chain \ - -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \ - -CAfile allcerts.pem -passout pass:notsosecretpassword - popd - ''; - in [ - "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}" - "${pkgs.writeShellScript "keycloak-start-pre" startPre}" + LoadCredential = [ + "db_password:${cfg.database.passwordFile}" + ] ++ optionals (cfg.sslCertificate != null && cfg.sslCertificateKey != null) [ + "ssl_cert:${cfg.sslCertificate}" + "ssl_key:${cfg.sslCertificateKey}" ]; - ExecStart = "${cfg.package}/bin/standalone.sh"; User = "keycloak"; Group = "keycloak"; DynamicUser = true; RuntimeDirectory = map (p: "keycloak/" + p) [ - "secrets" "configuration" "deployments" "data" @@ -728,13 +779,39 @@ in LogsDirectory = "keycloak"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; }; + script = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + umask u=rwx,g=,o= + + install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration + install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml + + replace-secret '@db-password@' "$CREDENTIALS_DIRECTORY/db_password" /run/keycloak/configuration/standalone.xml + + export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration + add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}' + '' + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' + pushd /run/keycloak/ssl/ + cat "$CREDENTIALS_DIRECTORY/ssl_cert" <(echo) \ + "$CREDENTIALS_DIRECTORY/ssl_key" <(echo) \ + /etc/ssl/certs/ca-certificates.crt \ + > allcerts.pem + openssl pkcs12 -export -in "$CREDENTIALS_DIRECTORY/ssl_cert" -inkey "$CREDENTIALS_DIRECTORY/ssl_key" -chain \ + -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \ + -CAfile allcerts.pem -passout pass:notsosecretpassword + popd + '' + '' + ${cfg.package}/bin/standalone.sh + ''; }; - services.postgresql.enable = lib.mkDefault createLocalPostgreSQL; - services.mysql.enable = lib.mkDefault createLocalMySQL; - services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb; + services.postgresql.enable = mkDefault createLocalPostgreSQL; + services.mysql.enable = mkDefault createLocalMySQL; + services.mysql.package = mkIf createLocalMySQL pkgs.mariadb; }; meta.doc = ./keycloak.xml; - meta.maintainers = [ lib.maintainers.talyz ]; + meta.maintainers = [ maintainers.talyz ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml index 7ba656c20f..cb706932f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml @@ -85,7 +85,12 @@ The frontend URL is used as base for all frontend requests and must be configured through . It should normally include a trailing /auth - (the default web context). + (the default web context). If you use a reverse proxy, you need + to set this option to "", so that frontend URL + is derived from HTTP headers. X-Forwarded-* headers + support also should be enabled, using + respective guidelines. @@ -131,6 +136,17 @@ +
+ Themes + + You can package custom themes and make them visible to Keycloak via + + option. See the + Themes section of the Keycloak Server Development Guide + and respective NixOS option description for more information. + +
+
Additional configuration diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix index 310a673f51..2901f307dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix @@ -181,7 +181,7 @@ in description = '' Plugins to add to the configuration. Overrides any installed if non-null. This is a list of paths to .tar.gz files or derivations evaluating to - .tar.gz files. All entries will be passed to `mattermost plugin add`. + .tar.gz files. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix index 6a52c36ab2..a901a95fd5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix @@ -21,12 +21,10 @@ in { type = settingsFormat.type; - example = literalExample '' - { - secret = "mysecret"; - storeDir = "/srv/http/nginx/prosody-upload"; - } - ''; + example = { + secret = "mysecret"; + storeDir = "/srv/http/nginx/prosody-upload"; + }; defaultText = literalExpression '' { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/timetagger.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/timetagger.nix new file mode 100644 index 0000000000..373f4fcd52 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/timetagger.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption types literalExpression; + + cfg = config.services.timetagger; +in { + + options = { + services.timetagger = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Tag your time, get the insight + + + This app does not do authentication. + You must setup authentication yourself or run it in an environment where + only allowed users have access. + + ''; + }; + + bindAddr = mkOption { + description = "Address to bind to."; + type = types.str; + default = "127.0.0.1"; + }; + + port = mkOption { + description = "Port to bind to."; + type = types.port; + default = 8080; + }; + + package = mkOption { + description = '' + Use own package for starting timetagger web application. + + The ${literalExpression ''pkgs.timetagger''} package only provides a + "run.py" script for the actual package + ${literalExpression ''pkgs.python3Packages.timetagger''}. + + If you want to provide a "run.py" script for starting timetagger + yourself, you can do so with this option. + If you do so, the 'bindAddr' and 'port' options are ignored. + ''; + + default = pkgs.timetagger.override { addr = cfg.bindAddr; port = cfg.port; }; + defaultText = literalExpression '' + pkgs.timetagger.override { + addr = ${cfg.bindAddr}; + port = ${cfg.port}; + }; + ''; + type = types.package; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.timetagger = { + description = "Timetagger service"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "timetagger"; + Group = "timetagger"; + StateDirectory = "timetagger"; + + ExecStart = "${cfg.package}/bin/timetagger"; + + Restart = "on-failure"; + RestartSec = 1; + }; + }; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 82b07206a8..3a78a52646 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -136,7 +136,7 @@ in # session requirements cinnamon-screensaver # cinnamon-killer-daemon: provided by cinnamon-common - gnome.networkmanagerapplet # session requirement - also nm-applet not needed + networkmanagerapplet # session requirement - also nm-applet not needed # For a polkit authentication agent polkit_gnome @@ -145,7 +145,7 @@ in nemo cinnamon-control-center cinnamon-settings-daemon - gnome.libgnomekbd + libgnomekbd orca # theme diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 3fbab8b94c..93fff889d6 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -18,11 +18,13 @@ my $startListFile = "/run/nixos/start-list"; my $restartListFile = "/run/nixos/restart-list"; my $reloadListFile = "/run/nixos/reload-list"; -# Parse restart/reload requests by the activation script +# Parse restart/reload requests by the activation script. +# Activation scripts may write newline-separated units to this +# file and switch-to-configuration will handle them. While +# `stopIfChanged = true` is ignored, switch-to-configuration will +# handle `restartIfChanged = false` and `reloadIfChanged = true`. my $restartByActivationFile = "/run/nixos/activation-restart-list"; -my $reloadByActivationFile = "/run/nixos/activation-reload-list"; my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list"; -my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; make_path("/run/nixos", { mode => oct(755) }); @@ -382,7 +384,6 @@ sub filterUnits { } my @unitsToStopFiltered = filterUnits(\%unitsToStop); -my @unitsToStartFiltered = filterUnits(\%unitsToStart); # Show dry-run actions. @@ -395,21 +396,39 @@ if ($action eq "dry-activate") { print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); - $unitsToRestart{$_} = 1 foreach - split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // ""); + # Handle the activation script requesting the restart or reload of a unit. + foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) { + my $unit = $_; + my $baseUnit = $unit; + my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; - $unitsToReload{$_} = 1 foreach - split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // ""); + # Detect template instances. + if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { + $baseUnit = "$1\@.$2"; + $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + } + + my $baseName = $baseUnit; + $baseName =~ s/\.[a-z]*$//; + + # Start units if they were not active previously + if (not defined $activePrev->{$unit}) { + $unitsToStart{$unit} = 1; + next; + } + + handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); + } + unlink($dryRestartByActivationFile); print STDERR "would restart systemd\n" if $restartSystemd; print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" if scalar(keys %unitsToReload) > 0; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; + my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; - unlink($dryRestartByActivationFile); - unlink($dryReloadByActivationFile); exit 0; } @@ -433,13 +452,31 @@ print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; # Handle the activation script requesting the restart or reload of a unit. -# We can only restart and reload (not stop/start) because the units to be -# stopped are already stopped before the activation script is run. -$unitsToRestart{$_} = 1 foreach - split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // ""); +foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) { + my $unit = $_; + my $baseUnit = $unit; + my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; -$unitsToReload{$_} = 1 foreach - split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // ""); + # Detect template instances. + if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { + $baseUnit = "$1\@.$2"; + $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + } + + my $baseName = $baseUnit; + $baseName =~ s/\.[a-z]*$//; + + # Start units if they were not active previously + if (not defined $activePrev->{$unit}) { + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + next; + } + + handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); +} +# We can remove the file now because it has been propagated to the other restart/reload files +unlink($restartByActivationFile); # Restart systemd if necessary. Note that this is done using the # current version of systemd, just in case the new one has trouble @@ -480,7 +517,6 @@ if (scalar(keys %unitsToReload) > 0) { print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); - unlink($reloadByActivationFile); } # Restart changed services (those that have to be restarted rather @@ -489,7 +525,6 @@ if (scalar(keys %unitsToRestart) > 0) { print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; unlink($restartListFile); - unlink($restartByActivationFile); } # Start all active targets, as well as changed units we stopped above. @@ -498,6 +533,7 @@ if (scalar(keys %unitsToRestart) > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. +my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 2efe0f05e0..1c588ff969 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -148,7 +148,7 @@ in system.build = mkOption { internal = true; default = {}; - type = types.attrs; + type = types.lazyAttrsOf types.unspecified; description = '' Attribute set of derivations used to setup the system. ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix new file mode 100644 index 0000000000..4a4694950f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix @@ -0,0 +1,58 @@ +{ config, extendModules, lib, ... }: +let + + inherit (lib) + mkOption + ; + + vmVariant = extendModules { + modules = [ ./qemu-vm.nix ]; + }; + + vmVariantWithBootLoader = vmVariant.extendModules { + modules = [ + ({ config, ... }: { + _file = "nixos/default.nix##vmWithBootLoader"; + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = + config.boot.loader.systemd-boot.enable || + config.boot.loader.efi.canTouchEfiVariables; + }) + ]; + }; +in +{ + options = { + + virtualisation.vmVariant = mkOption { + description = '' + Machine configuration to be added for the vm script produced by nixos-rebuild build-vm. + ''; + inherit (vmVariant) type; + default = {}; + visible = "shallow"; + }; + + virtualisation.vmVariantWithBootLoader = mkOption { + description = '' + Machine configuration to be added for the vm script produced by nixos-rebuild build-vm-with-bootloader. + ''; + inherit (vmVariantWithBootLoader) type; + default = {}; + visible = "shallow"; + }; + + }; + + config = { + + system.build = { + vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm; + vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm; + }; + + }; + + # uses extendModules + meta.buildDocsInSandbox = false; +} diff --git a/third_party/nixpkgs/nixos/tests/adguardhome.nix b/third_party/nixpkgs/nixos/tests/adguardhome.nix new file mode 100644 index 0000000000..ddbe8ff9c1 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/adguardhome.nix @@ -0,0 +1,57 @@ +import ./make-test-python.nix { + name = "adguardhome"; + + nodes = { + minimalConf = { ... }: { + services.adguardhome = { enable = true; }; + }; + + declarativeConf = { ... }: { + services.adguardhome = { + enable = true; + + mutableSettings = false; + settings = { + dns = { + bind_host = "0.0.0.0"; + bootstrap_dns = "127.0.0.1"; + }; + }; + }; + }; + + mixedConf = { ... }: { + services.adguardhome = { + enable = true; + + mutableSettings = true; + settings = { + dns = { + bind_host = "0.0.0.0"; + bootstrap_dns = "127.0.0.1"; + }; + }; + }; + }; + }; + + testScript = '' + with subtest("Minimal config test"): + minimalConf.wait_for_unit("adguardhome.service") + minimalConf.wait_for_open_port(3000) + + with subtest("Declarative config test, DNS will be reachable"): + declarativeConf.wait_for_unit("adguardhome.service") + declarativeConf.wait_for_open_port(53) + declarativeConf.wait_for_open_port(3000) + + with subtest("Mixed config test, check whether merging works"): + mixedConf.wait_for_unit("adguardhome.service") + mixedConf.wait_for_open_port(53) + mixedConf.wait_for_open_port(3000) + # Test whether merging works properly, even if nothing is changed + mixedConf.systemctl("restart adguardhome.service") + mixedConf.wait_for_unit("adguardhome.service") + mixedConf.wait_for_open_port(3000) + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 95ce2cc5cc..b2f223e7cc 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -23,6 +23,7 @@ in { _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; + adguardhome = handleTest ./adguardhome.nix {}; aesmd = handleTest ./aesmd.nix {}; agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; @@ -103,6 +104,7 @@ in discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; + dnsdist = handleTest ./dnsdist.nix {}; doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {}; @@ -125,6 +127,7 @@ in enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; ergo = handleTest ./ergo.nix {}; + ergochat = handleTest ./ergochat.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; @@ -397,7 +400,6 @@ in prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; - prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; prowlarr = handleTest ./prowlarr.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; @@ -474,11 +476,13 @@ in taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; + thelounge = handleTest ./thelounge.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; + tinywl = handleTest ./tinywl.nix {}; tor = handleTest ./tor.nix {}; # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; @@ -487,6 +491,7 @@ in trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; + tsm-client-gui = handleTest ./tsm-client-gui.nix {}; txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/borgbackup.nix b/third_party/nixpkgs/nixos/tests/borgbackup.nix index cbb2868920..d3cd6c66bf 100644 --- a/third_party/nixpkgs/nixos/tests/borgbackup.nix +++ b/third_party/nixpkgs/nixos/tests/borgbackup.nix @@ -106,7 +106,7 @@ in { services.openssh = { enable = true; passwordAuthentication = false; - challengeResponseAuthentication = false; + kbdInteractiveAuthentication = false; }; services.borgbackup.repos.repo1 = { diff --git a/third_party/nixpkgs/nixos/tests/btrbk.nix b/third_party/nixpkgs/nixos/tests/btrbk.nix index 2689bb66c6..9f34f7dfbe 100644 --- a/third_party/nixpkgs/nixos/tests/btrbk.nix +++ b/third_party/nixpkgs/nixos/tests/btrbk.nix @@ -53,7 +53,7 @@ import ./make-test-python.nix ({ pkgs, ... }: services.openssh = { enable = true; passwordAuthentication = false; - challengeResponseAuthentication = false; + kbdInteractiveAuthentication = false; }; services.btrbk = { extraPackages = [ pkgs.lz4 ]; diff --git a/third_party/nixpkgs/nixos/tests/dnsdist.nix b/third_party/nixpkgs/nixos/tests/dnsdist.nix new file mode 100644 index 0000000000..cfc41c1386 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dnsdist.nix @@ -0,0 +1,48 @@ +import ./make-test-python.nix ( + { pkgs, ... }: { + name = "dnsdist"; + meta = with pkgs.lib; { + maintainers = with maintainers; [ jojosch ]; + }; + + machine = { pkgs, lib, ... }: { + services.bind = { + enable = true; + extraOptions = "empty-zones-enable no;"; + zones = lib.singleton { + name = "."; + master = true; + file = pkgs.writeText "root.zone" '' + $TTL 3600 + . IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d ) + . IN NS ns.example.org. + + ns.example.org. IN A 192.168.0.1 + ns.example.org. IN AAAA abcd::1 + + 1.0.168.192.in-addr.arpa IN PTR ns.example.org. + ''; + }; + }; + services.dnsdist = { + enable = true; + listenPort = 5353; + extraConfig = '' + newServer({address="127.0.0.1:53", name="local-bind"}) + ''; + }; + + environment.systemPackages = with pkgs; [ dig ]; + }; + + testScript = '' + machine.wait_for_unit("bind.service") + machine.wait_for_open_port(53) + machine.succeed("dig @127.0.0.1 +short -x 192.168.0.1 | grep -qF ns.example.org") + + machine.wait_for_unit("dnsdist.service") + machine.wait_for_open_port(5353) + machine.succeed("dig @127.0.0.1 -p 5353 +short -x 192.168.0.1 | grep -qF ns.example.org") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/ergochat.nix b/third_party/nixpkgs/nixos/tests/ergochat.nix new file mode 100644 index 0000000000..2e9dc55e64 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ergochat.nix @@ -0,0 +1,97 @@ +let + clients = [ + "ircclient1" + "ircclient2" + ]; + server = "ergochat"; + ircPort = 6667; + channel = "nixos-cat"; + iiDir = "/tmp/irc"; +in + +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "ergochat"; + nodes = { + "${server}" = { + networking.firewall.allowedTCPPorts = [ ircPort ]; + services.ergochat = { + enable = true; + settings.server.motd = pkgs.writeText "ergo.motd" '' + The default MOTD doesn't contain the word "nixos" in it. + This one does. + ''; + }; + }; + } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { + imports = [ + ./common/user-account.nix + ]; + + systemd.services.ii = { + requires = [ "network.target" ]; + wantedBy = [ "default.target" ]; + + serviceConfig = { + Type = "simple"; + ExecPreStartPre = "mkdir -p ${iiDir}"; + ExecStart = '' + ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir} + ''; + User = "alice"; + }; + }; + }) clients); + + testScript = + let + msg = client: "Hello, my name is ${client}"; + clientScript = client: [ + '' + ${client}.wait_for_unit("network.target") + ${client}.systemctl("start ii") + ${client}.wait_for_unit("ii") + ${client}.wait_for_file("${iiDir}/${server}/out") + '' + # look for the custom text in the MOTD. + '' + ${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out") + '' + # wait until first PING from server arrives before joining, + # so we don't try it too early + '' + ${client}.wait_until_succeeds("grep 'PING' ${iiDir}/${server}/out") + '' + # join ${channel} + '' + ${client}.succeed("echo '/j #${channel}' > ${iiDir}/${server}/in") + ${client}.wait_for_file("${iiDir}/${server}/#${channel}/in") + '' + # send a greeting + '' + ${client}.succeed( + "echo '${msg client}' > ${iiDir}/${server}/#${channel}/in" + ) + '' + # check that all greetings arrived on all clients + ] ++ builtins.map (other: '' + ${client}.succeed( + "grep '${msg other}$' ${iiDir}/${server}/#${channel}/out" + ) + '') clients; + + # foldl', but requires a non-empty list instead of a start value + reduce = f: list: + builtins.foldl' f (builtins.head list) (builtins.tail list); + in '' + start_all() + ${server}.systemctl("status ergochat") + ${server}.wait_for_open_port(${toString ircPort}) + + # run clientScript for all clients so that every list + # entry is executed by every client before advancing + # to the next one. + '' + lib.concatStrings + (reduce + (lib.zipListsWith (cs: c: cs + c)) + (builtins.map clientScript clients)); +}) diff --git a/third_party/nixpkgs/nixos/tests/gnome.nix b/third_party/nixpkgs/nixos/tests/gnome.nix index 06f387ecad..4471126902 100644 --- a/third_party/nixpkgs/nixos/tests/gnome.nix +++ b/third_party/nixpkgs/nixos/tests/gnome.nix @@ -18,6 +18,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { enable = true; user = "alice"; }; + # Catch GDM failures that don't happen with AutomaticLoginEnable, e.g. https://github.com/NixOS/nixpkgs/issues/149539 + gdm.autoLogin.delay = 1; }; services.xserver.desktopManager.gnome.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix b/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix index fdb7141da3..a0a3144ae6 100644 --- a/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix +++ b/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix @@ -17,7 +17,7 @@ in { }; services.openssh.enable = true; - services.openssh.challengeResponseAuthentication = false; + services.openssh.kbdInteractiveAuthentication = false; services.openssh.passwordAuthentication = false; security.googleOsLogin.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/libreswan.nix b/third_party/nixpkgs/nixos/tests/libreswan.nix index 56ab908aed..ff3d2344a6 100644 --- a/third_party/nixpkgs/nixos/tests/libreswan.nix +++ b/third_party/nixpkgs/nixos/tests/libreswan.nix @@ -89,7 +89,7 @@ in """ Sends a message as Alice to Bob """ - bob.execute("nc -lu ::0 1234 >/tmp/msg >&2 &") + bob.execute("nc -lu ::0 1234 >/tmp/msg &") alice.sleep(1) alice.succeed(f"echo '{msg}' | nc -uw 0 bob 1234") bob.succeed(f"grep '{msg}' /tmp/msg") @@ -100,7 +100,7 @@ in Starts eavesdropping on Alice and Bob """ match = "src host alice and dst host bob" - eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log >&2 &") + eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log &") start_all() diff --git a/third_party/nixpkgs/nixos/tests/lorri/default.nix b/third_party/nixpkgs/nixos/tests/lorri/default.nix index 147ae999fd..c33c750399 100644 --- a/third_party/nixpkgs/nixos/tests/lorri/default.nix +++ b/third_party/nixpkgs/nixos/tests/lorri/default.nix @@ -14,7 +14,7 @@ import ../make-test-python.nix { ) # Start the daemon and wait until it is ready - machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr >&2 &") + machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") # Ping the daemon diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix index 80cb63df5d..891001e30b 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -40,15 +40,16 @@ in { services.mysql = { enable = true; - bind = "127.0.0.1"; + settings.mysqld = { + bind-address = "127.0.0.1"; + + # FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6, + # this is a workaround. + # See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22 + innodb_read_only_compressed = 0; + }; package = pkgs.mariadb; - # FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6, - # this is a workaround. - # See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22 - extraOptions = '' - innodb_read_only_compressed=0 - ''; initialScript = pkgs.writeText "mysql-init" '' CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'hunter2'; CREATE DATABASE IF NOT EXISTS nextcloud; diff --git a/third_party/nixpkgs/nixos/tests/rstudio-server.nix b/third_party/nixpkgs/nixos/tests/rstudio-server.nix new file mode 100644 index 0000000000..c7ac7670fb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rstudio-server.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ pkgs, ... }: + { + name = "rstudio-server-test"; + meta.maintainers = with pkgs.lib.maintainers; [ jbedo cfhammill ]; + + nodes.machine = { config, lib, pkgs, ... }: { + services.rstudio-server.enable = true; + }; + + nodes.customPackageMachine = { config, lib, pkgs, ... }: { + services.rstudio-server = { + enable = true; + package = pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }; + }; + }; + + users.testuser = { + uid = 1000; + group = "testgroup"; + }; + groups.testgroup.gid = 1000; + + testScript = '' + machine.wait_for_unit("rstudio-server.service") + machine.succeed("curl -f -vvv -s http://127.0.0.1:8787") + + customPackageMachine.wait_for_unit("rstudio-server.service") + customPackageMachine.succeed("curl -f -vvv -s http://127.0.0.1:8787") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/switch-test.nix b/third_party/nixpkgs/nixos/tests/switch-test.nix index daad913488..1c32bf6beb 100644 --- a/third_party/nixpkgs/nixos/tests/switch-test.nix +++ b/third_party/nixpkgs/nixos/tests/switch-test.nix @@ -45,6 +45,50 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.restartIfChanged = false; }; + restart-and-reload-by-activation-script.configuration = { + systemd.services = rec { + simple-service = { + # No wantedBy so we can check if the activation script restart triggers them + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + + simple-restart-service = simple-service // { + stopIfChanged = false; + }; + + simple-reload-service = simple-service // { + reloadIfChanged = true; + }; + + no-restart-service = simple-service // { + restartIfChanged = false; + }; + }; + + system.activationScripts.restart-and-reload-test = { + supportsDryActivation = true; + deps = []; + text = '' + if [ "$NIXOS_ACTION" = dry-activate ]; then + f=/run/nixos/dry-activation-restart-list + else + f=/run/nixos/activation-restart-list + fi + cat <> "$f" + simple-service.service + simple-restart-service.service + simple-reload-service.service + no-restart-service.service + EOF + ''; + }; + }; + mount.configuration = { systemd.mounts = [ { @@ -261,6 +305,32 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + with subtest("restart and reload by activation script"): + out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "restarting the following units:") + assert_contains(out, "\nstarting the following units: no-restart-service.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") + assert_lacks(out, "as well:") + # Switch to the same system where the example services get restarted + # by the activation script + out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: simple-reload-service.service\n") + assert_contains(out, "restarting the following units: simple-restart-service.service, simple-service.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "as well:") + # The same, but in dry mode + out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate") + assert_lacks(out, "would stop the following units:") + assert_lacks(out, "would NOT stop the following changed units:") + assert_contains(out, "would reload the following units: simple-reload-service.service\n") + assert_contains(out, "would restart the following units: simple-restart-service.service, simple-service.service\n") + assert_lacks(out, "\nwould start the following units:") + assert_lacks(out, "as well:") + with subtest("mounts"): switch_to_specialisation("${machine}", "mount") out = machine.succeed("mount | grep 'on /testmount'") diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix index 9f09d801f7..8a1580fc2a 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix @@ -161,6 +161,7 @@ in { # NOTE: please keep in mind that the trailing whitespaces in the following strings # are intentional as the output is compared against the raw `iproute2`-output. + # editorconfig-checker-disable client_ipv4_table = """ 192.168.1.2 dev vrf1 proto static metric 100 192.168.2.3 dev vrf2 proto static metric 100 @@ -177,6 +178,7 @@ in { local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1 broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 """.strip() + # editorconfig-checker-enable # Check that networkd properly configures the main routing table # and the routing tables for the VRF. diff --git a/third_party/nixpkgs/nixos/tests/thelounge.nix b/third_party/nixpkgs/nixos/tests/thelounge.nix new file mode 100644 index 0000000000..e9b85685bf --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/thelounge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix { + nodes = { + private = { config, pkgs, ... }: { + services.thelounge = { + enable = true; + plugins = [ pkgs.theLoungePlugins.themes.solarized ]; + }; + }; + + public = { config, pkgs, ... }: { + services.thelounge = { + enable = true; + public = true; + }; + }; + }; + + testScript = '' + start_all() + + for machine in machines: + machine.wait_for_unit("thelounge.service") + machine.wait_for_open_port(9000) + + private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized") + private.wait_until_succeeds("journalctl -u thelounge.service | grep 'in private mode'") + public.wait_until_succeeds("journalctl -u thelounge.service | grep 'in public mode'") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/tinywl.nix b/third_party/nixpkgs/nixos/tests/tinywl.nix new file mode 100644 index 0000000000..b286cab779 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/tinywl.nix @@ -0,0 +1,56 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + { + name = "tinywl"; + meta = { + maintainers = with lib.maintainers; [ primeos ]; + }; + + machine = { config, ... }: { + # Automatically login on tty1 as a normal user: + imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + + environment = { + systemPackages = with pkgs; [ tinywl foot wayland-utils ]; + }; + + # Automatically start TinyWL when logging in on tty1: + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + test ! -e /tmp/tinywl.log # Only start tinywl once + readonly TEST_CMD="wayland-info |& tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok; read" + readonly FOOT_CMD="foot sh -c '$TEST_CMD'" + tinywl -s "$FOOT_CMD" |& tee /tmp/tinywl.log + touch /tmp/tinywl-exit-ok + fi + ''; + + # Switch to a different GPU driver (default: -vga std), otherwise TinyWL segfaults: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; + }; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_unit("multi-user.target") + + # Wait for complete startup: + machine.wait_until_succeeds("pgrep tinywl") + machine.wait_for_file("/run/user/1000/wayland-0") + machine.wait_until_succeeds("pgrep foot") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + + # Make a screenshot and save the result: + machine.screenshot("tinywl_foot") + print(machine.succeed("cat /tmp/test-wayland.out")) + machine.copy_from_vm("/tmp/test-wayland.out") + + # Terminate cleanly: + machine.send_key("alt-esc") + machine.wait_until_fails("pgrep foot") + machine.wait_until_fails("pgrep tinywl") + machine.wait_for_file("/tmp/tinywl-exit-ok") + machine.copy_from_vm("/tmp/tinywl.log") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/tsm-client-gui.nix b/third_party/nixpkgs/nixos/tests/tsm-client-gui.nix new file mode 100644 index 0000000000..e4bcd344a8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/tsm-client-gui.nix @@ -0,0 +1,57 @@ +# The tsm-client GUI first tries to connect to a server. +# We can't simulate a server, so we just check if +# it reports the correct connection failure error. +# After that the test persuades the GUI +# to show its main application window +# and verifies some configuration information. + +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "tsm-client"; + + enableOCR = true; + + machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + programs.tsmClient = { + enable = true; + package = pkgs.tsm-client-withGui; + defaultServername = "testserver"; + servers.testserver = { + # 192.0.0.8 is a "dummy address" according to RFC 7600 + server = "192.0.0.8"; + node = "SOME-NODE"; + passwdDir = "/tmp"; + }; + }; + }; + + testScript = '' + machine.succeed("which dsmj") # fail early if this is missing + machine.wait_for_x() + machine.execute("DSM_LOG=/tmp dsmj -optfile=/dev/null >&2 &") + + # does it report the "TCP/IP connection failure" error code? + machine.wait_for_window("IBM Spectrum Protect") + machine.wait_for_text("ANS2610S") + machine.send_key("esc") + + # it asks to continue to restore a local backupset now; + # "yes" (return) leads to the main application window + machine.wait_for_text("backupset") + machine.send_key("ret") + + # main window: navigate to "Connection Information" + machine.wait_for_text("Welcome") + machine.send_key("alt-f") # "File" menu + machine.send_key("c") # "Connection Information" + + # "Connection Information" dialog box + machine.wait_for_window("Connection Information") + machine.wait_for_text("SOME-NODE") + machine.wait_for_text("${pkgs.tsm-client.passthru.unwrapped.version}") + + machine.shutdown() + ''; + + meta.maintainers = [ lib.maintainers.yarny ]; +}) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/prosody-mysql.nix b/third_party/nixpkgs/nixos/tests/xmpp/prosody-mysql.nix deleted file mode 100644 index 9a00bcabf3..0000000000 --- a/third_party/nixpkgs/nixos/tests/xmpp/prosody-mysql.nix +++ /dev/null @@ -1,92 +0,0 @@ -import ../make-test-python.nix { - name = "prosody-mysql"; - - nodes = { - client = { nodes, pkgs, ... }: { - environment.systemPackages = [ - (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) - ]; - networking.extraHosts = '' - ${nodes.server.config.networking.primaryIPAddress} example.com - ${nodes.server.config.networking.primaryIPAddress} conference.example.com - ${nodes.server.config.networking.primaryIPAddress} uploads.example.com - ''; - }; - server = { config, pkgs, ... }: { - nixpkgs.overlays = [ - (self: super: { - prosody = super.prosody.override { - withDBI = true; - withExtraLibs = [ pkgs.luaPackages.luadbi-mysql ]; - }; - }) - ]; - networking.extraHosts = '' - ${config.networking.primaryIPAddress} example.com - ${config.networking.primaryIPAddress} conference.example.com - ${config.networking.primaryIPAddress} uploads.example.com - ''; - networking.firewall.enable = false; - services.prosody = { - enable = true; - # TODO: use a self-signed certificate - c2sRequireEncryption = false; - extraConfig = '' - storage = "sql" - sql = { - driver = "MySQL"; - database = "prosody"; - host = "mysql"; - port = 3306; - username = "prosody"; - password = "password123"; - }; - ''; - virtualHosts.test = { - domain = "example.com"; - enabled = true; - }; - muc = [ - { - domain = "conference.example.com"; - } - ]; - uploadHttp = { - domain = "uploads.example.com"; - }; - }; - }; - mysql = { config, pkgs, ... }: { - networking.firewall.enable = false; - services.mysql = { - enable = true; - initialScript = pkgs.writeText "mysql_init.sql" '' - CREATE DATABASE prosody; - CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123'; - GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server'; - FLUSH PRIVILEGES; - ''; - package = pkgs.mariadb; - }; - }; - }; - - testScript = { nodes, ... }: '' - mysql.wait_for_unit("mysql.service") - server.wait_for_unit("prosody.service") - server.succeed('prosodyctl status | grep "Prosody is running"') - - # set password to 'nothunter2' (it's asked twice) - server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com") - # set password to 'y' - server.succeed("yes | prosodyctl adduser azurediamond@example.com") - # correct password to 'hunter2' - server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com") - - client.succeed("send-message") - - server.succeed("prosodyctl deluser cthon98@example.com") - server.succeed("prosodyctl deluser azurediamond@example.com") - ''; -} - diff --git a/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix index 51dda20cc3..2603e88fcb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gettext , ncurses , gtkGUI ? false @@ -17,6 +18,16 @@ stdenv.mkDerivation rec { sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; }; + patches = [ + # Pull Gentoo fix for -fno-common toolchains. Upstream does not + # seem to have the contacts + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; + sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; + }) + ]; + buildInputs = [ gettext ncurses ] ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix index e8d2ada387..a5ef585969 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix @@ -1,40 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, fetchzip -, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, libGL, python3, ncurses, libusb1 -, gtk3, webkitgtk, curl, xvfb-run, makeWrapper - # "Debug", or "Release" -, buildType ? "Release" +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, cmake +, pkg-config +, ninja +, makeWrapper +, libjack2 +, alsa-lib +, alsa-tools +, freetype +, libusb1 +, libX11 +, libXrandr +, libXinerama +, libXext +, libXcursor +, libXScrnSaver +, libGL +, libxcb +, xcbutil +, libxkbcommon +, xcbutilkeysyms +, xcb-util-cursor +, gtk3 +, webkitgtk +, python3 +, curl +, pcre +, mount +, gnome +, Cocoa +, WebKit +, CoreServices +, CoreAudioKit + # It is not allowed to distribute binaries with the VST2 SDK plugin without a license + # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box. + # Read more in https://github.com/NixOS/nixpkgs/issues/145607 +, enableVST2 ? false }: let - projucer = stdenv.mkDerivation rec { - pname = "projucer"; - version = "5.4.7"; - - src = fetchFromGitHub { - owner = "juce-framework"; - repo = "JUCE"; - rev = version; - sha256= "0qpiqfwwpcghk7ij6w4vy9ywr3ryg7ppg77bmd7783kxg6zbhj8h"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - freetype libX11 libXrandr libXinerama libXext gtk3 webkitgtk - libjack2 curl - ]; - preBuild = '' - cd extras/Projucer/Builds/LinuxMakefile - ''; - makeFlags = [ "CONFIG=${buildType}" ]; - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out/bin - cp -a build/Projucer $out/bin/Projucer - ''; - }; - # equal to vst-sdk in ../oxefmsynth/default.nix vst-sdk = stdenv.mkDerivation rec { name = "vstsdk3610_11_06_2018_build_37"; @@ -50,70 +56,92 @@ let in stdenv.mkDerivation rec { pname = "bespokesynth"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "awwbees"; + owner = "BespokeSynth"; repo = pname; rev = "v${version}"; - sha256 = "04b2m40jszphslkd4850jcb8qwls392lwy3lc6vlj01h4izvapqk"; + sha256 = "sha256-PN0Q6/gI1PeMaF/8EZFGJdLR8JVHQZfWunAhOIQxkHw="; + fetchSubmodules = true; }; - configurePhase = '' - runHook preConfigure + cmakeBuildType = "Release"; - export HOME=$(mktemp -d) - xvfb-run sh -e < 0.0.1) - optimist (3.0.1) - pifi (0.4.11) - json (~> 2.2) - optimist (~> 3.0) - ruby-mpd (~> 0.3) - sinatra (~> 2.0) - thin (~> 1.7) - rack (2.2.3) - rack-protection (2.1.0) - rack - ruby-mpd (0.3.3) - ruby2_keywords (0.0.4) - sinatra (2.1.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) - tilt (~> 2.0) - thin (1.8.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - tilt (2.0.10) - -PLATFORMS - ruby - -DEPENDENCIES - pifi - -BUNDLED WITH - 2.1.4 diff --git a/third_party/nixpkgs/pkgs/applications/audio/pifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pifi/default.nix deleted file mode 100644 index 856807608d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/pifi/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, bundlerEnv, ruby }: - -bundlerEnv rec { - pname = "pifi"; - - version = (import ./gemset.nix).pifi.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - - meta = with lib; { - description = "MPD web client to listen to radio, written in React and Sinatra"; - homepage = "https://github.com/rccavalcanti/pifi-radio"; - license = with licenses; gpl3Only; - maintainers = with maintainers; [ kmein ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/pifi/gemset.nix b/third_party/nixpkgs/pkgs/applications/audio/pifi/gemset.nix deleted file mode 100644 index 77dd8c5528..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/pifi/gemset.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ - daemons = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; - type = "gem"; - }; - version = "1.3.1"; - }; - eventmachine = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; - type = "gem"; - }; - version = "1.2.7"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; - type = "gem"; - }; - version = "2.5.1"; - }; - mustermann = { - dependencies = ["ruby2_keywords"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; - type = "gem"; - }; - version = "1.1.1"; - }; - optimist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; - type = "gem"; - }; - version = "3.0.1"; - }; - pifi = { - dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga"; - type = "gem"; - }; - version = "0.4.11"; - }; - rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; - type = "gem"; - }; - version = "2.2.3"; - }; - rack-protection = { - dependencies = ["rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; - type = "gem"; - }; - version = "2.1.0"; - }; - ruby-mpd = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc"; - type = "gem"; - }; - version = "0.3.3"; - }; - ruby2_keywords = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; - type = "gem"; - }; - version = "0.0.4"; - }; - sinatra = { - dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; - type = "gem"; - }; - version = "2.1.0"; - }; - thin = { - dependencies = ["daemons" "eventmachine" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; - type = "gem"; - }; - version = "1.8.0"; - }; - tilt = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; - type = "gem"; - }; - version = "2.0.10"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 31929567e4..c4c53de90f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "2OaV8dONv7yBcQsfecgfedP2ypBN6svD9rgZLgUwSydyH2+rODNPne4O7z2Hahm7Y0Ae+NFxbpQ9lbNbX0vhsg=="; + sha512 = "uassNLdCXx3WLarUMJNhU8fbXugG7yTLMQacPAszLoRdmbMwcN6wT7ED26VhlNVhY3xr02GjZSDw4/LADZWqKw=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/36"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/37"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index cebf20ae78..0eaea39f24 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.38"; + version = "1.39"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-fnPYlZvCZYiKkQmp5bNtrqgZAkVtKLmLMcfkbbysMyU="; + sha256 = "sha256-ZmgsNp2fRebbLxSzzCsLdM6/7kBKo+YFUCdWLSYfI5A="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix index af35ad829d..ca51001dd6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages -, python, glibmm, libpulseaudio, libao }: +, glibmm, libpulseaudio, libao }: let version = "unstable-2018-02-10"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - python glibmm libpulseaudio libao + glibmm libpulseaudio libao ]; # SConstruct patch diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index bf74dd64f9..ce55516a40 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , alsa-lib -, python +, python3 , SDL }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-dependency-tracking" ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix index d579e78b35..54acc782c6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sfizz"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; rev = version; - sha256 = "1gzpbns89j6ggzfjjvyhgigynsv20synrs7lmc32hwp4g73l0j7n"; + sha256 = "sha256-biHsB49Ym9NU4tMOVnUNuIxPtpcIi6oCAS7JBPhxwec="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix index 59c7d91a3e..e5e875f6df 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sorcer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { pname = "sorcer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost cairomm libsndfile lv2 ntk python ]; + buildInputs = [ boost cairomm libsndfile lv2 ntk ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 diff --git a/third_party/nixpkgs/pkgs/applications/audio/split2flac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/split2flac/default.nix index 92f0753fd7..5de48d1b29 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/split2flac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/split2flac/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , shntool, cuetools , flac, faac, mp4v2, wavpack, mac -, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools +, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools , aacgain, mp3gain, vorbisgain }: @@ -12,7 +12,7 @@ let --prefix PATH : ${lib.makeBinPath [ shntool cuetools flac faac mp4v2 wavpack mac - imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools + imagemagick libiconv enca lame mutagen vorbis-tools aacgain mp3gain vorbisgain ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix index e17e850369..e91cc9cc02 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "spot"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-g0oVhlfez9i+Vv8lt/aNftCVqdgPMDySBBeLyOv7Zl8="; + hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-n10aYzkRqEe1h2WPAfARjH79Npvv+3fdX9jCtxv2a34="; + hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index 70353e2497..0a6ad4bdc4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20211016"; + version = "20220107"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-Z2lXaJweOPB9hWOuy2cx1P9/CAJ+IMc7JtPDKAg2boU="; + sha256 = "sha256-+lzgkRQHe6moid3h6az/iqt2XL5vbyM0BjSTwMBvd3I="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 691979c4de..6cc83ffbf6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { makeWrapperArgs+=(--run "cd $out/lib/btcpayserver") ''; - postInstall = '' + postFixup = '' mv $out/bin/{BTCPayServer,btcpayserver} ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix index b576cd2373..51ca4469bc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix @@ -4,7 +4,7 @@ , libsodium , cmake , substituteAll -, pythonPackages +, python3Packages }: stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { # prevent CMake from trying to get libraries on the Internet (substituteAll { src = ./dont_fetch_dependencies.patch; - pybind11_src = pythonPackages.pybind11.src; + pybind11_src = python3Packages.pybind11.src; relic_src = fetchFromGitHub { owner = "relic-toolkit"; repo = "relic"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index c4add5b67f..be3d610d8f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_3_1; dotnet-runtime = dotnetCorePackages.aspnetcore_3_1; - postInstall = '' + postFixup = '' mv $out/bin/{NBXplorer,nbxplorer} ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix index 1239ceaafd..c7f594e31b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix @@ -36,7 +36,7 @@ buildDotnetModule rec { ) ''; - postInstall = '' + postFixup = '' mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 5157ea3857..8dc15e7c9d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.5.1"; + version = "4.6.0-1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "0kyk3hv1y13b3vwg9kjcrpvz9v3l8lp0ikj977nykd5ms8b1rifa"; + sha256 = "sha256-YJ5ufo+LYbOTr9SyiEzzp1pcSx6+cHSvDLBOIcx9X+4="; }; - cargoSha256 = "1mwprsg74xv6qlxf00w7xapnkisb1aid9hkyr8r90zcwdcy8783r"; + cargoSha256 = "sha256-m/SBHv3BNYKkSXxHnCdVng3blbHrTc/HxX/nEIa1DnM="; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; buildInputs = [ boost175 libevent libsodium utf8cpp ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index dae533f1eb..c4e5880f6a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.152.1"; + version = "1.153.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-rFmgf/wg6/jIObBDN+viKX3KrewVWgxs8uVF1gCY72s="; + sha256 = "sha256-3p5wb3buZtd1gnNoEJOclNO8xEYJBZYc86HfrkFrBWU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 567b53f417..3eddccf8bb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -16,23 +16,23 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.12.22", - "sha256": "sha256-MmRJ3XDq7b9doPFfW7njSOasHej5ut0nYcJMFj+Y/Dc=" + "rev": "2022.01.07", + "sha256": "sha256-KxeaTXv0qig3O2hqjJ5HG1KCN0TTQdnd3g9jBsEc0a4=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.09.14", - "sha256": "sha256-6eC75zAtWbM1XEI9OM3iqy/a8Vj1l5WU7HGJBpmoQsA=" + "rev": "2021.12.28", + "sha256": "sha256-bXTjPdn0DIVTdoi30Ws5+M+UsC7F99IphMSTpI5ia/Q=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.12.07", - "sha256": "sha256-givCklAHao26psWLI2qK246igxcAQEeIYTGH61FX6Xo=" + "rev": "2022.01.07", + "sha256": "sha256-dgkyXrFs2hzuFjt9GW+WNyrLIp/i/AbRsM/MyMbatdA=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.12.07", - "sha256": "sha256-/2Fv/vrpbHSiJro11cjbziUaT4gfwa6y5aQBoYgq3OQ=" + "rev": "2022.01.07", + "sha256": "sha256-7QDHf0PYGMc611qrk+a8pNJHF1v1DFMWlt5hbaU/oD8=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 0c40f83b67..f7614e76ef 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick -, jdk, perl, python +, jdk, perl }: let @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ perl python libicns imagemagick ]; + buildInputs = [ perl libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 62c3a93f76..b230218e33 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , fetchpatch @@ -30,6 +31,9 @@ , nodejs , mkYarnModules , qmake +, server ? false # build server version +, sqlite +, pam }: let @@ -61,149 +65,166 @@ let panmirrorModules = mkYarnModules { inherit pname version; packageJSON = ./package.json; - yarnLock = ./yarn.lock; + yarnLock = ./yarn.lock; yarnNix = ./yarndeps.nix; }; + description = "Set of integrated tools for the R language"; in -mkDerivation rec { - inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH; +(if server then stdenv.mkDerivation else mkDerivation) + (rec { + inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH; - nativeBuildInputs = [ - cmake - unzip - ant - jdk - makeWrapper - pandoc - nodejs - copyDesktopItems - ]; + nativeBuildInputs = [ + cmake + unzip + ant + jdk + makeWrapper + pandoc + nodejs + ] ++ lib.optional (!server) [ + copyDesktopItems + ]; - buildInputs = [ - boost - zlib - openssl - R - qtbase - qtxmlpatterns - qtsensors - qtwebengine - qtwebchannel - libuuid - libyamlcpp - soci - postgresql - ]; + buildInputs = [ + boost + zlib + openssl + R + libuuid + libyamlcpp + soci + postgresql + ] ++ (if server then [ + sqlite.dev + pam + ] else [ + qtbase + qtxmlpatterns + qtsensors + qtwebengine + qtwebchannel + ]); - cmakeFlags = [ - "-DRSTUDIO_TARGET=Desktop" - "-DCMAKE_BUILD_TYPE=Release" - "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" - "-DRSTUDIO_USE_SYSTEM_SOCI=ON" - "-DRSTUDIO_USE_SYSTEM_BOOST=ON" - "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" - "-DPANDOC_VERSION=${pandoc.version}" - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" - ]; + cmakeFlags = [ + "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}" + "-DCMAKE_BUILD_TYPE=Release" + "-DRSTUDIO_USE_SYSTEM_SOCI=ON" + "-DRSTUDIO_USE_SYSTEM_BOOST=ON" + "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" + "-DPANDOC_VERSION=${pandoc.version}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" + ] ++ lib.optional (!server) [ + "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" + ]; - # Hack RStudio to only use the input R and provided libclang. - patches = [ - ./r-location.patch - ./clang-location.patch - # postFetch doesn't work with this | error: unexpected end-of-file - # replacing /usr/bin/node is done in postPatch - # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide - (fetchpatch { - name = "system-node.patch"; - url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch"; - sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM="; - }) - ]; + # Hack RStudio to only use the input R and provided libclang. + patches = [ + ./r-location.patch + ./clang-location.patch + # postFetch doesn't work with this | error: unexpected end-of-file + # replacing /usr/bin/node is done in postPatch + # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide + (fetchpatch { + name = "system-node.patch"; + url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch"; + sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM="; + }) + ]; - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} + postPatch = '' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - substituteInPlace src/cpp/CMakeLists.txt \ - --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + substituteInPlace src/cpp/CMakeLists.txt \ + --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' - substituteInPlace src/gwt/build.xml \ - --replace '/usr/bin/node' '${nodejs}/bin/node' + substituteInPlace src/gwt/build.xml \ + --replace '/usr/bin/node' '${nodejs}/bin/node' - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ + --replace '@libclang@' ${llvmPackages.libclang.lib} \ + --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace "bin/pandoc" "${pandoc}/bin/pandoc" - ''; + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace "bin/pandoc" "${pandoc}/bin/pandoc" + ''; - hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); - # These dicts contain identically-named dict files, so we only keep the - # -large versions in case of clashes - largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; - otherDicts = with lib; filter - (d: !(hasAttr "dictFileName" d && - elem d.dictFileName (map (d: d.dictFileName) largeDicts))) - hunspellDictionaries; - dictionaries = largeDicts ++ otherDicts; + hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + otherDicts = with lib; filter + (d: !(hasAttr "dictFileName" d && + elem d.dictFileName (map (d: d.dictFileName) largeDicts))) + hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; - preConfigure = '' - mkdir dependencies/dictionaries - for dict in ${builtins.concatStringsSep " " dictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -s $i dependencies/dictionaries/ + preConfigure = '' + mkdir dependencies/dictionaries + for dict in ${builtins.concatStringsSep " " dictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -s $i dependencies/dictionaries/ + done done - done - unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 + unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 - mkdir -p dependencies/pandoc/${pandoc.version} - cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc + mkdir -p dependencies/pandoc/${pandoc.version} + cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc - cp -r ${rsconnectSrc} dependencies/rsconnect - ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) + cp -r ${rsconnectSrc} dependencies/rsconnect + ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) - cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules - ''; + cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules + ''; - postInstall = '' - mkdir -p $out/share/icons/hicolor/48x48/apps $out/bin - ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps + postInstall = '' + mkdir -p $out/bin $out/share - for f in {diagnostics,rpostback,rstudio}; do - ln -s $out/lib/rstudio/bin/$f $out/bin - done + ${lib.optionalString (!server) '' + mkdir -p $out/share/icons/hicolor/48x48/apps + ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps + ''} - for f in .gitignore .Rbuildignore LICENSE README; do - find . -name $f -delete - done - rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} - rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} - ''; + for f in {${if server + then "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server" + else "diagnostics,rpostback,rstudio"}}; do + ln -s $out/lib/rstudio/bin/$f $out/bin + done - qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" - ]; + for f in .gitignore .Rbuildignore LICENSE README; do + find . -name $f -delete + done + rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} + rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} + ''; - desktopItems = [ - (makeDesktopItem { - name = "${pname}"; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio"; - genericName = "IDE"; - comment = meta.description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; - }) - ]; + meta = with lib; { + inherit description; + homepage = "https://www.rstudio.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ciil cfhammill ]; + mainProgram = "rstudio" + optionalString server "-server"; + platforms = platforms.linux; + }; - meta = with lib; { - description = "Set of integrated tools for the R language"; - homepage = "https://www.rstudio.com/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ciil ]; - platforms = platforms.linux; - }; -} + passthru = { inherit server; }; + } // lib.optionalAttrs (!server) { + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "rstudio %F"; + icon = "rstudio"; + desktopName = "RStudio"; + genericName = "IDE"; + comment = description; + categories = "Development;"; + mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + }) + ]; + }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index 4a53d585fe..2c3ddbf80b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python, qtbase, qttools }: +, python2, qtbase, qttools }: mkDerivation rec { pname = "tiled"; @@ -13,7 +13,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python qtbase qttools ]; + buildInputs = [ python2 qtbase qttools ]; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix index 09037b2f0c..c769ab4263 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; - buildInputs = [ wxGTK autoconf automake libtool python gettext ]; + buildInputs = [ wxGTK autoconf automake libtool python2 gettext ]; preConfigure = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix deleted file mode 100644 index 3b6bb01bb1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ python2 -, lib -, fetchurl -, pkg-config -, libXext -, libXxf86vm -, libX11 -, libXrandr -, libXinerama -, libXScrnSaver -, argyllcms - }: - -let - inherit (python2.pkgs) buildPythonApplication wxPython numpy dbus-python; -in buildPythonApplication rec { - pname = "displaycal"; - version = "3.8.9.3"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://sourceforge/project/dispcalgui/release/${version}/DisplayCAL-${version}.tar.gz"; - sha256 = "1sivi4q7sqsrc95qg5gh37bsm2761md4mpl89hflzwk6kyyxyd3w"; - }; - - propagatedBuildInputs = [ - libXext - libXxf86vm - libX11 - libXrandr - libXinerama - libXScrnSaver - argyllcms - wxPython - numpy - dbus-python - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - preConfigure = '' - mkdir dist - cp {misc,dist}/net.displaycal.DisplayCAL.appdata.xml - touch dist/copyright - mkdir -p $out - ln -s $out/share/DisplayCAL $out/Resources - ''; - - # no idea why it looks there - symlink .json lang (everything) - postInstall = '' - for x in $out/share/DisplayCAL/*; do - ln -s $x $out/lib/python2.7/site-packages/DisplayCAL - done - - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : ${argyllcms}/bin - done - ''; - - meta = { - description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = "https://displaycal.net/"; - license = lib.licenses.gpl3; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index b93a0fcaff..d3546f6095 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 + # TODO: Remove in Inkscape 1.1.2 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; + sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; + }) + ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index e9393a2e5a..063c5cc155 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.0.0"; + version = "5.0.2"; kde-channel = "stable"; - sha256 = "sha256-hNWDPbyrP9OkGPTDdnDYKtkZQw8MbQpXuZOQdHHuzFc="; + sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8="; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix index ff112d7ce6..ed2aae72d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -2,23 +2,23 @@ , buildDotnetModule , dotnetCorePackages , fetchFromGitHub +, glibcLocales , gtk3 -, installShellFiles -, librsvg -, makeDesktopItem +, intltool , wrapGAppsHook }: buildDotnetModule rec { pname = "Pinta"; - version = "2.0.1"; + version = "2.0.2"; nativeBuildInputs = [ - installShellFiles + intltool wrapGAppsHook ]; runtimeDeps = [ gtk3 ]; + buildInputs = runtimeDeps; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; @@ -26,7 +26,7 @@ buildDotnetModule rec { # How-to update deps: # $ nix-build -A pinta.fetch-deps # $ ./result - # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/default.nix + # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/deps.nix # TODO: create update script nugetDeps = ./deps.nix; @@ -36,52 +36,49 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "sha256-iOKJPB2bI/GjeDxzG7r6ew7SGIzgrJTcRXhEYzOpC9k="; + sha256 = "sha256-Bvzs1beq7I1+10w9pmMePqGCz2TPDp5UK5Wa9hbKERU="; }; - # FIXME: this should be propagated by wrapGAppsHook already, however for some - # reason it is not working. Maybe a bug in buildDotnetModule? - preInstall = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" - --set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - ) + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + + # Do the autoreconf/Makefile job manually + # TODO: use upstream build system + postBuild = '' + # Substitute translation placeholders + intltool-merge -x po/ xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml + intltool-merge -d po/ xdg/pinta.desktop.in xdg/pinta.desktop + + # Build translations + dotnet build Pinta \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -target:CompileTranslations,PublishTranslations \ + -p:BuildTranslations=true \ + -p:PublishDir="$NIX_BUILD_TOP/source/publish" ''; - postInstall = '' + postFixup = '' # Rename the binary - mv $out/bin/Pinta $out/bin/pinta + mv "$out/bin/Pinta" "$out/bin/pinta" - # Copy desktop icons - for size in 16x16 22x22 24x24 32x32 96x96 scalable; do - mkdir -p $out/share/icons/hicolor/$size/apps - cp xdg/$size/* $out/share/icons/hicolor/$size/apps/ - done - - # Copy runtime icons - cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ - - # Install manpage - installManPage xdg/pinta.1 - - # Fix and copy desktop file - # TODO: fix this propely by using the autoreconf+pkg-config build system - # from upstream - mkdir -p $out/share/applications - substitute xdg/pinta.desktop.in $out/share/applications/Pinta.desktop \ - --replace _Name Name \ - --replace _Comment Comment \ - --replace _GenericName GenericName \ - --replace _X-GNOME-FullName X-GNOME-FullName \ - --replace _Keywords Keywords + # Install + dotnet build installer/linux/install.proj \ + -target:Install \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:SourceDir="$NIX_BUILD_TOP/source" \ + -p:PublishDir="$NIX_BUILD_TOP/source/publish" \ + -p:InstallPrefix="$out" ''; - meta = { + meta = with lib; { homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thiagokokada ]; - platforms = with lib.platforms; linux; + license = licenses.mit; + maintainers = with maintainers; [ thiagokokada ]; + platforms = with platforms; linux; mainProgram = "pinta"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 0faed5e12e..30731afebf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -1,8 +1,25 @@ -{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation -, qtbase, qtx11extras, qtsvg, makeWrapper -, vulkan-loader, libglvnd, xorg, python3, python3Packages -, bison, pcre, automake, autoconf, addOpenGLRunpath -, waylandSupport ? false, wayland +{ lib +, fetchFromGitHub +, nix-update-script +, cmake +, pkg-config +, mkDerivation +, qtbase +, qtx11extras +, qtsvg +, makeWrapper +, vulkan-loader +, libglvnd +, xorg +, python3 +, python3Packages +, bison +, pcre +, automake +, autoconf +, addOpenGLRunpath +, waylandSupport ? false +, wayland }: let custom_swig = fetchFromGitHub { @@ -15,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn"; + sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8="; }; buildInputs = [ @@ -64,6 +81,10 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/screencloud/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/screencloud/default.nix index b7d6ecdef3..b62ca680cb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/screencloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }: with lib; stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; + buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs $prefix/opt/screencloud/screencloud.sh substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" + sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" mkdir $prefix/bin mkdir $prefix/lib ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud diff --git a/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix b/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix deleted file mode 100644 index 90373b6b00..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/airtame/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, alsa-lib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype -, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite -, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender -, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 -}: - -let libPath = lib.makeLibraryPath [ - alsa-lib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf - glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 - libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes - libXi libXrandr libXrender libXtst libpulseaudio libxcb -]; -in stdenv.mkDerivation rec { - pname = "airtame"; - version = "3.3.0"; - longName = "${pname}-application"; - - src = fetchurl { - url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; - sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - desktopItem = makeDesktopItem rec { - name = "airtame"; - exec = longName; - comment = "Airtame Streaming Client"; - desktopName = "Airtame"; - icon = name; - genericName = comment; - categories = "Network;"; - }; - - installPhase = '' - opt="$out/opt/airtame" - mkdir -p "$opt" - cp -R . "$opt" - mkdir -p "$out/bin" - ln -s "$opt/${longName}" "$out/bin/" - mkdir -p "$out/share" - cp -r "${desktopItem}/share/applications" "$out/share/" - mkdir -p "$out/share/icons" - ln -s "$opt/icon.png" "$out/share/icons/airtame.png" - - # Flags and rpath are copied from launch-airtame.sh. - vendorlib="\ - $opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\ - $opt/resources/app.asar.unpacked/encryption/out/lib:\ - $opt/resources/deps/airtame-core/lib:\ - $opt/resources/deps/airtame-encryption/lib" - - echo $vendorlib - - rpath="${libPath}:$opt:$vendorlib" - - find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \ - -exec patchelf --set-rpath "$rpath" {} \; - - # The main binary also needs libudev which was removed by --shrink-rpath. - interp="$(< $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$interp" $opt/${longName} - - wrapProgram $opt/${longName} \ - --prefix LD_LIBRARY_PATH=$rpath \ - --add-flags "--disable-gpu --enable-transparent-visuals" - ''; - - dontPatchELF = true; - - meta = with lib; { - homepage = "https://airtame.com/download"; - description = "Wireless streaming client for Airtame devices"; - license = licenses.unfree; - maintainers = with maintainers; [ thanegill ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix index 9ffc02b9c6..9998b2b559 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.22.3"; + version = "0.23.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-28qgTWCQrFCREGNfj8bePocEpB+0AZfrKNO4akn7/5I="; + sha256 = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix index 3f8edac97b..174d6e22cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { XMLWriter ]}:"$out/share/perl5 \ --prefix XDG_DATA_DIRS : "$out/share" \ - --set TEXINPUTS ":.:$out/share/texmf/tex/latex/AMC" + --set TEXINPUTS ":.:$out/tex/latex" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix new file mode 100644 index 0000000000..f8f7fb8491 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qmake +, wrapQtAppsHook +, copyDesktopItems +, makeDesktopItem +}: + +stdenv.mkDerivation rec { + pname = "cubiomes-viewer"; + version = "1.12.1"; + + src = fetchFromGitHub { + owner = "Cubitect"; + repo = pname; + rev = version; + sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE="; + fetchSubmodules = true; + }; + + buildInputs = [ + qtbase + ]; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + copyDesktopItems + ]; + + desktopItems = [ (makeDesktopItem { + name = pname; + desktopName = "Cubiomes Viewer"; + exec = pname; + icon = pname; + categories = "Game"; + comment = meta.description; + }) ]; + + preBuild = '' + # QMAKE_PRE_LINK is not executed (I dont know why) + make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp cubiomes-viewer $out/bin + + mkdir -p $out/share/pixmaps + cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Cubitect/cubiomes-viewer"; + description = "A graphical Minecraft seed finder and map viewer"; + longDescription = '' + Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding + utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation. + ''; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hqurve ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix b/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix deleted file mode 100644 index a8d041de10..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }: - -# This package uses a precompiled "binary" distribution of CuraByDagoma, -# distributed by the editor. -# -# To update the package, follow the links on https://dist.dagoma.fr/: -# * Cura By Dagoma -# * Linux -# * 64 bits -# * Genric archive -# -# I made the arbitrary choice to compile this package only for x86_64. -# I guess people owning a 3D printer generally don't use i686. -# If, however, someone needs it, we certainly can find a solution. - -let - pythonPackages = python2Packages; -in stdenv.mkDerivation rec { - pname = "curabydagoma"; - # Version is the date, UNIX format - version = "1520506579"; - # Hash of the user's choice: os, arch, package type... - hash = "58228cce5bbdcf764b7116850956f1e5"; - - src = fetchurl { - url = "https://dist.dagoma.fr/get/zip/CuraByDagoma/${version}/${hash}"; - sha256 = "16wfipdyjkf6dq8awjzs4zgkmqk6230277mf3iz8swday9hns8pq"; - }; - unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz"; - nativeBuildInputs = [ unzip ]; - buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; - - # Compile all pyc files because the included pyc files may be older than the - # py files. However, Python doesn't realize that because the packages - # have all dates set to epoch. - buildPhase = '' - python -m compileall -f curabydago - ''; - - # * Simply copy the stuff there - # * Create an executable with the correct path etc - # * Create a .desktop file to have a launcher in the desktop environments - installPhase = '' - mkdir $out - cp -r * $out/ - - mkdir $out/bin - cat > $out/bin/curabydago < $out/share/applications/curabydago.desktop < +Date: Sat, 15 Jan 2022 05:00:37 +0100 +Subject: [PATCH] Add dbus-glib dependency to main + +It is required through the ipc header and the build will fail without it on Nix: + + In file included from /build/source/src/main/search_sidebar.cc:48: + /build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory + 26 | #include + | ^~~~~~~~~~~~~~~~~~ + compilation terminated. +--- + src/main/CMakeLists.txt | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt +index 49b86371..bb8e4bb6 100644 +--- a/src/main/CMakeLists.txt ++++ b/src/main/CMakeLists.txt +@@ -74,3 +74,14 @@ target_link_libraries(main + PkgConfig::Sword + PkgConfig::Biblesync + ) ++ ++IF (DBUS) ++ target_include_directories (main ++ PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ++ PkgConfig::DBus ++ ) ++ target_link_libraries(main ++ PRIVATE ++ PkgConfig::DBus ++ ) ++ENDIF (DBUS) +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix index 87656db5e5..994127baca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix @@ -1,50 +1,29 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchFromGitHub , fetchpatch , appstream-glib -, at-spi2-core , biblesync -, brotli -, clucene_core , cmake -, dbus , dbus-glib , desktop-file-utils , docbook2x , docbook_xml_dtd_412 -, enchant -, gconf +, enchant2 , glib -, gnome-doc-utils -, gtk2 +, gtk3 , gtkhtml , icu , intltool , isocodes , itstool -, libdatrie -, libepoxy -, libglade -, libgsf -, libpsl -, libselinux -, libsepol -, libsysprof-capture -, libthai , libuuid -, libxkbcommon , libxslt , minizip -, pcre , pkg-config -, python -, scrollkeeper -, sqlite , sword , webkitgtk , wrapGAppsHook -, xorg , yelp-tools , zip }: @@ -60,62 +39,53 @@ stdenv.mkDerivation rec { hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8="; }; + patches = [ + # GLIB_VERSION_MIN_REQUIRED is not defined. + # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 + (fetchpatch { + name ="xiphos-glibc.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8"; + sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck="; + extraPrefix = ""; + }) + + # Fix D-Bus build + # https://github.com/crosswire/xiphos/pull/1103 + ./0001-Add-dbus-glib-dependency-to-main.patch + ]; + nativeBuildInputs = [ - appstream-glib + appstream-glib # for appstream-util cmake - desktop-file-utils + desktop-file-utils # for desktop-file-validate + docbook2x + docbook_xml_dtd_412 + intltool itstool + libxslt pkg-config wrapGAppsHook - yelp-tools + yelp-tools # for yelp-build + zip # for building help epubs ]; buildInputs = [ - at-spi2-core biblesync - brotli - clucene_core - dbus dbus-glib - docbook2x - docbook_xml_dtd_412 - enchant - gconf + enchant2 glib - gnome-doc-utils - gtk2 + gtk3 gtkhtml icu - intltool isocodes - libdatrie - libepoxy - libglade - libgsf - libpsl - libselinux - libsepol - libsysprof-capture - libthai libuuid - libxkbcommon - libxslt minizip - pcre - python - scrollkeeper - sqlite sword webkitgtk - zip - ] - ++ (with xorg; [ - libXdmcp - libXtst - ]); + ]; cmakeFlags = [ - "-DDBUS=OFF" + # WebKit-based editor does not build. "-DGTKHTML=ON" ]; @@ -123,22 +93,9 @@ stdenv.mkDerivation rec { # The build script won't continue without the version saved locally. echo "${version}" > cmake/source_version.txt - export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - patchFlags = [ "-p0" ]; - - patches = [ - # GLIB_VERSION_MIN_REQUIRED is not defined. - # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 - (fetchpatch { - name ="xiphos-glibc.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos"; - sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0="; - }) - ]; - meta = with lib; { description = "A GTK Bible study tool"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index b4fdf61d16..d9385ceb04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,13 +161,23 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "98" "99") [ + ] ++ lib.optionals (versionRange "97" "98") [ # A critical Ozone/Wayland fix: + # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.) + (fetchpatch { + # [linux/wayland] Fixed terminate caused by binding to wrong version. + url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch"; + excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ]; + sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; + }) + ./patches/m97-ozone-wayland-fix-surface_augmenter.patch + ] ++ lib.optionals (versionRange "98" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; }) + ] ++ lib.optionals (versionRange "97" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch new file mode 100644 index 0000000000..e63000fabc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch @@ -0,0 +1,31 @@ +diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc +index d971d15e71426..6e5408398bcea 100644 +--- a/ui/ozone/platform/wayland/host/surface_augmenter.cc ++++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc +@@ -13,7 +13,8 @@ + namespace ui { + + namespace { +-constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; ++constexpr uint32_t kMinVersion = 1; ++constexpr uint32_t kMaxVersion = 1; + } + + // static +@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, + uint32_t version) { + DCHECK_EQ(interface, kInterfaceName); + +- if (connection->surface_augmenter_) ++ if (connection->surface_augmenter_ || ++ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { + return; ++ } + +- auto augmenter = wl::Bind( +- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); ++ auto augmenter = wl::Bind(registry, name, ++ std::min(version, kMaxVersion)); + if (!augmenter) { + LOG(ERROR) << "Failed to bind surface_augmenter"; + return; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7358c1e3ab..4fa284a107 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "98.0.4758.48", - "sha256": "0c6lxmr8xxjhifm28v9ri05v5al9ph6infksx9qgd045svmfynxs", - "sha256bin64": "0m7vbd7fy4wrbk28hw3hy6x8yb8vyyyisnicdhkp6j0xq9ni5jhj", + "version": "98.0.4758.54", + "sha256": "0w3pvp23y0vyj9p7j6nfxgnnzc5jyjn65k1khx0i333hs97vidbc", + "sha256bin64": "1qxkqw45jzcrg2ziqh4npg19a52b5j1hvag4n5qlrq4bfblsbwwh", "deps": { "gn": { "version": "2021-12-07", diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index be30763ddc..440d54d88a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0"; + version = "96.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ach/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ach/firefox-96.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "88a69911dce4985251028b16a163b4db36fef47698ff73cd7f685ca3a1dd5243"; + sha256 = "70d4f4ddc319315a3cae8be4174d8b80e1cde3902dee0f0ff9804b0bc0a68d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/af/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/af/firefox-96.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7b7cebc75eb6097a6a950599fb0b1b4e695bf12bfbc3272bbb9e79f3770e14d4"; + sha256 = "cda4d331d55fdfebbe75d54469ca929563f1ba613026b50ac4371de001ac67e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/an/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/an/firefox-96.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5de8de362b479fead0b4dbe0d9e81a8692465b11a63479aca012d611eff0fa14"; + sha256 = "264f6ec85ada427027d529de8f9c5d69082e1c7306d79734cc208ccbeb771269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ar/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ar/firefox-96.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9d45cf623e4e8fc959844174284da573a9a6bab2fb00fa9bd6511ad0941a31e7"; + sha256 = "4d1893dc040fa7c0409fc5f6cbccc36676da8d04ebf8e7b0bdda50a65da6d5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ast/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ast/firefox-96.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6921a5883382c99dae6e902e079ae76e1112a86fe3aa74eed485e6c2aa5d99c1"; + sha256 = "0c9c0597b4a78fb7b704ee7791c9e76b11a2ffa390c24aef65b4e1bdaa546d39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/az/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/az/firefox-96.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "44b78fd0f6e6feeec020ad6c71581ee875e9db5c06b55699514067a8190fc9f1"; + sha256 = "155b331f614b9de671fd945ef186815afbbcfeb671bb2510d07e11858c74d500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/be/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/be/firefox-96.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "abfc8a54d035fb5b8112168cabc13f48674a8a1c870096697dd648f3a801cc5e"; + sha256 = "eb0e1589ddd53edb1cc058521a35448dbb55adf4a774906877936ac984e3c2a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/bg/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/bg/firefox-96.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7245000ff9486713add7d487e95d860cbc412fc61f292ca308553f4a447fd12b"; + sha256 = "d59d7dada004276c55f4b0a9a4ac86b0ffbe5d565e7a2d4a0c23831c20e78e3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/bn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/bn/firefox-96.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "6186942376927d18e722575894b2337958faf2eab8ed20d092722f640eb3ae1a"; + sha256 = "6537a4d874707fc4fad3d5deaa5459bd9dd783caae8f927ae8b2d8d74dff9e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/br/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/br/firefox-96.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1d4610801d2357632e469df842b70844892af9b74d4934af8a7fda5846c96116"; + sha256 = "7a50bba797980b9413b8ea1ae6b69b59aa329a43f15a5534cfbeb242c687bca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/bs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/bs/firefox-96.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7ee573e4aaba51b660d25bc6a1a90659d3240d530b8baaaaba64ef989ede6be1"; + sha256 = "a3ffb0724a224ecc211299b034d79bd9a211abdb541cf6f7d4e8e0a46aca64a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ca-valencia/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ca-valencia/firefox-96.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c9199f12b1ea4a22d01d5a51a51a085b1b37cbc731516406b34bd7c96a4b2e8f"; + sha256 = "fcfd42f15782b50304627f10f6e65a4f1a0aac24969c101cfbfc4b1a26513eca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ca/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ca/firefox-96.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1527b802e525aa3a7d3edac7b2cb1fa68730d8499ee8d9904f60dc40842e2cd9"; + sha256 = "8a3072d642dbfa2ccd2a9de29a00fd81dbfbf5a94f21120565b9db6a8a9a8d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/cak/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/cak/firefox-96.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "77c713bbff9d83b67baeb791f551a71ee0353418e95af0b070e3806bec77e501"; + sha256 = "bbc92e25947151f260bbea5bf81450958f1acf43c833ade6499e1de067156a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/cs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/cs/firefox-96.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1fdaddf381023516e4a1e476cd9f3c6d8293b2bfe755f5b35256e405956f7607"; + sha256 = "276853dbe6865fa300059c32041cffa881dbd29012d6dfbc7516c3e5acdfe255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/cy/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/cy/firefox-96.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "782e40391e1715f39961d759323ecec10860225b65be0989c923b1ae08c3bc6a"; + sha256 = "2a623edf9e2ca82e9c36adc115e07b1d931c6639f8416f4431033a76cb12028b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/da/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/da/firefox-96.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "68ab324a88c81b8309dd599e0a57e1553d3a7162c7d63639f5e2ad3ab4ff10e9"; + sha256 = "8a23f262babcee651a69dc3f8089328af81a41d324039bcf4d9ffda00bf3b1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/de/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/de/firefox-96.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "50b3677c2c6168d3d6b86b8c6d7deacd65d99d6d9ef9b91b7a1322515222b6cb"; + sha256 = "1391338182f044f4d95b6087eefd08bfb3854f8ef8e1f95749668d6d567e8deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/dsb/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/dsb/firefox-96.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "65f7ee8892636790e509637392583b918db56379ae05f482824217f26511288e"; + sha256 = "79515b5ae599f4319e35861f014e26fa87ed007a39c269226e5887bdabd8a134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/el/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/el/firefox-96.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5fe2fa3ff7284bd6b2519736e159d31150fa13459e8203eeb7b4f2a741dd11a9"; + sha256 = "fa35e87c066122bd077bcee9e32e48c49a6db421ab3ef4c4d42fe82c7d57b147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/en-CA/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/en-CA/firefox-96.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "70aeacbae6a2f924cc63eab43857303002c2d199b1ed00b8514a1d8cb32b3c2a"; + sha256 = "e1a0d585985c1d26db396649aaf7ea39cebec749fb42a053e44032b280fa4f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/en-GB/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/en-GB/firefox-96.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "89c7f6d491021a1094c19480de5e07d2d55e869ef2027be15bfff4179047e2e3"; + sha256 = "6cd3f585661194ebfe76fc7fa90ff8cfa173fae0304189376b291c3c398ae6c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/en-US/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/en-US/firefox-96.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6f6cf571331e1a5f574116943b5de4cdd6c9072f6775ebec5dcb89991ed96b0a"; + sha256 = "85143f6936bd6d5b2f55907ed6e84a91cf69bb57aa2b4427a07cf3e3e670bd30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/eo/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/eo/firefox-96.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "11222993c2357eae6cd28e4fc31a51345088510af60545738d342ef5d3d7e62c"; + sha256 = "e1881f2c785cbdd019d08aedc6a721a36679d490d3071b93da155de11c223c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/es-AR/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/es-AR/firefox-96.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "37119a97e6bdc0d708bee83ef22642d44cd34ca02348939d7dbb8daa0f520071"; + sha256 = "9bcd3ffbbaf67b74319026abba5a55c0e84810e980667a4a65abaa29c61e15ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/es-CL/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/es-CL/firefox-96.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f6805e64b01c5cf5b35cc74449a2c4f103cad153a0a396c14cce52ead176c2ce"; + sha256 = "0e57734b563435602bd470a74771331bea0f68bf12de70ae1fec2c72fb3a8dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/es-ES/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/es-ES/firefox-96.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e8e33a2219363c2d9a22e66a0b047848764d946b19b0f8539ab0ad9f3844d81e"; + sha256 = "ab4a5dba1eba3cf149830f055df87c9aea4a8d97485311243d20f20686b5c050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/es-MX/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/es-MX/firefox-96.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5593fd719736c8d0a841a6407b5fef77a10add5e72b47cabf713ae3659c76460"; + sha256 = "15d791514c92f5c676c8a72cf423c34f5dc491029ae9c1897907d4e945b3f441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/et/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/et/firefox-96.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "aec0605c75e747c46ddd1d702eb84144edb6f65fbc2c9bc8dd487a8259d15344"; + sha256 = "a3189afcbdd64a4491868712cabc80c26b8c67dab8fe41b20b47d8300e275b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/eu/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/eu/firefox-96.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6d481223fd80a84369c8afda02d2223108308e4449bc8e21e5f304519c362558"; + sha256 = "77736b1d377ea03ad43e8537aab2e5482d894082e351bbd066ba1211bdfebb59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/fa/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/fa/firefox-96.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "34689658d29304e17da97121a41602399d80fa07feaea83e1647e37dac51552e"; + sha256 = "230def61e09988d4a53af2245f59da9197a9f2e29cf88665f002d9091db34ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ff/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ff/firefox-96.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b67ea39fbf17c982ef2dd7f9ecef83d239fd43e9a6ab7ce5d41abfb8917db1b"; + sha256 = "94fe353aa805eaef97eb1e873148eef2ab1cbf0aaec0d63fb67e2e16c043f950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/fi/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/fi/firefox-96.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3a602bdd77f6da214f3f23a2428871ccd00b09e44d4e5aa42e1ceeb16bd36df3"; + sha256 = "37dbe7c39420f31941b7a7e023973b20e3bf538a595e3e21a81a82a1acd7f8e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/fr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/fr/firefox-96.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "53acf00bb148595adc58fb80d9546237d662666f7cc6240fab19d393f74e1377"; + sha256 = "9f4467c200ac3490bc9e97f814937a2c2083e133b72903ba158e3fcd275f7233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/fy-NL/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/fy-NL/firefox-96.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "92e290420735d72e0372184d268bccffb142e154f96ad3d4a1d4e4b71b5c7050"; + sha256 = "bea6f5cb0ef7a99823929156cc207c585a9bcba2d9554f749c5afa790f6d27c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ga-IE/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ga-IE/firefox-96.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04423b1cc5b0f6f955e7071d7b7bc3b4989b061a85a634ee38740917e303a93e"; + sha256 = "565c18b8a738f62b944891a472a3fd94300a3efa3b03f43896502c12b33d0d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/gd/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/gd/firefox-96.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "15ca404e594c678238369ae4e51afa46eadcda19a68b6ef2c9d465981346214b"; + sha256 = "1af3f52d4ff3fe78e4abb7a26f52725f38214ff1dc7dc50a8b39daf2dcd250c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/gl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/gl/firefox-96.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0397c87a2807b010256b97c1e490fe5b9c2f3c0b7642566053771ddbb34064c1"; + sha256 = "72108446cdf29444694e4cb52f46366eb6749e51c082d25126d768d5b867be7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/gn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/gn/firefox-96.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "98987dd795dbfbe2c72a1e4e0199b1fc2a31403879920e140bd940667e79d0d1"; + sha256 = "9ac9c828a27ba7660642b1392dcf7955c323e0e4eb9e7634a3a959cc0c62125d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/gu-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/gu-IN/firefox-96.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a98f3d1d4cc8974df23181383c1de9a524f02e47e0f8a6625d20fe713130e54"; + sha256 = "3ea6ee8dd0e20229f70438172d8dbe1e8aca98776e28d6666cdd0f53c746397a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/he/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/he/firefox-96.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "1087c87aeb9465b848985c94ad647a1bc1307ade09349de6c85ae5176f32fec4"; + sha256 = "b94fa7d26c8da38d5ee20cdc0b36f7c6a8e0186a9dc4cda359174dabfa337756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/hi-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/hi-IN/firefox-96.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f78ef9cceec602bfb645ab15ff4546d267943403f63570a38a5153c80a721ea0"; + sha256 = "38e7f9d934e5556a1f51d6f5fe1f0f7df6afc3620ca79b187df4e74f4bc62d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/hr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/hr/firefox-96.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "988a13c49fa7b1c6e3c05beb18b675c64bb6f520ed6190079d55e69cfeac6c48"; + sha256 = "ee77fae1f428b90bfbb9f6cd5310d5268c0fd0a27c927cea16d4dbd38d0ffbb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/hsb/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/hsb/firefox-96.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "821a634c479a9b4eae5f8f706d40d256406997ba7d62bb4d29ddb4539c83a937"; + sha256 = "a4cb2e444c0977abb2cb14030040768612837f1bc4959ab3bcec407f79092005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/hu/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/hu/firefox-96.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "da0659564688659c17b591a8844d481a86c7d2a01499e7cd785accf840012c04"; + sha256 = "58acba6ec61a290540cebf5d21c7e422e17d4039a26a0ed66324fb809eee2255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/hy-AM/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/hy-AM/firefox-96.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f4404195096809fe9d652821fbfd053ee9892f28262cc9cc47db7bf160e0e824"; + sha256 = "47fc6a81998d126745522c681244f94ff05c0c1781b35df16cdd4798e02504ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ia/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ia/firefox-96.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d539c129c240a96cca32d4b4da252f146444c47d375d07cb5e47a1fcdb82983d"; + sha256 = "9488d6dd3ef74028cbe6c68c7e77b5431a7c19c64abd6f17164b2c9bcb2f603c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/id/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/id/firefox-96.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d597990b39d8cfcefe626c741750e1bdddd30db9e8a7736d244538f180f53597"; + sha256 = "545cd0471c933319685b0d7c78aee65587106c6054919ccd0537694f7366a33d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/is/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/is/firefox-96.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "acdcabe2ecdc14804fbcb7a5f1e0b589893c90ae190a106a9988a6a60db64c89"; + sha256 = "a0d36e32cdca56d2602f1e875836ed626e1986a59e15016c5a7581755824112b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/it/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/it/firefox-96.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4262d0a7e6b83bad6787b48bb9aa3a31d96d4cd5a9779bfdd667ca622f9f3d2c"; + sha256 = "9b2c57944db6c50b99ce3b4d28dbbafc1fc6ae373ae0dc5e340d8a01999c9ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ja/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ja/firefox-96.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5640e018babb721fd74187e6795c64a398ffc0a233ed0b48a118444f3d2104c0"; + sha256 = "999854c3fbded0359ca01e965161f9b036de2ecb614ed01cfbae4a664feba774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ka/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ka/firefox-96.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "fb5fc8d8a1c8ab2d97a61493347c65b27709e7f725a8e7fa4f7cc3a0c793922e"; + sha256 = "e89a4fe08e96e5e0bf05278055df4889e0e8896e069f7ff8365d88911935285a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/kab/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/kab/firefox-96.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f32255c7fba167688340d0765fd6dcf6d8d6c403dc83ee6e7e9a00d984057000"; + sha256 = "aa07f94c15e9070dad736ab3c0575f04e1b4d97a8c883eb089416983a07cbf2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/kk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/kk/firefox-96.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "10464c863efb4697e2526481e5dc06e4222189f0c1ae389675f266f73fb70698"; + sha256 = "a7aa1ea4c80c7b2fc206acf56f3ac5f8c7446e1ff936d00f42cf3600fe5c6939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/km/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/km/firefox-96.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "aa01663ee6e1f15bfaaeeb9e7ff4fa33f00c7017e98dfc4316d7515940e0a8e8"; + sha256 = "001a90e9a2b9a007006e58774ed128bd32cd3478a96e6b46f0aff8405f394b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/kn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/kn/firefox-96.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "837347aadfe019fd8baf15fb1775f06c6ff5f1c7c099777a845317ccf24e0e6b"; + sha256 = "d1482ad282633ce66de08a2b4418c9a8b389fd191b064aeaee392067c3f83114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ko/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ko/firefox-96.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "18691cec2710cb89a13f5851e98951762768615ca6e45e77d9e791abad6f2132"; + sha256 = "a8e59148929054648b4f69d4fef5465a840c75bc4bf3c534c38caebc0cadb317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/lij/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/lij/firefox-96.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3515f22f97f7d0baa631ab2fea3335cbab3c5377a5184f73be9650fe121da728"; + sha256 = "4f10b104007eab4b39a61a017279d93fc899816dad62c4f25dcd2ba801f4673b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/lt/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/lt/firefox-96.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ed23664bcd177dc490fdfa623d8644c34351c4a91c71465337c8b3dfb79ed726"; + sha256 = "2c7a57aa8f16d98bea028617eaffae301f73a079486b444120948576c475b90d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/lv/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/lv/firefox-96.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8f12bd4da0fc6506121d167090f2caff7c3cd53516f0b3d0d3a02426f40799b1"; + sha256 = "62dc979eb6471fe4195cc18b6c3ff9abaec733fbf69071660bc5028d466f95b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/mk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/mk/firefox-96.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "33f9faf3f55aabf6c8dc1b7e2430b0de02ec5979f5100aaef88b683d3daeec35"; + sha256 = "4226dc59168d66efb2d8d71f4232817b4c37a6b1a894767e833bc31cd0cd336f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/mr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/mr/firefox-96.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4b57c9d1f351f3986324f3be01c2c4c8ffece6777a6f18790a02a57a53232817"; + sha256 = "22a27cb41410cda65307215c7388ee0af259f267e7d569d961b71a99a5285b0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ms/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ms/firefox-96.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9beb813a7781e9669d8e140e4a6279b04f9b16a0e790fcf53564e8f700ad0718"; + sha256 = "a2ccf8df0396b342b4fd65dd8361a5de54be08e7bdd79db214457c2f85f221cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/my/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/my/firefox-96.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3c5b78c390f3a77b490903b13ce2bdadb51f6e42b57ade221732f0c5203d052f"; + sha256 = "47a8e92f9095f532969f8a78634f157cfbd04b2fe2562baf303ee1c41dc48980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/nb-NO/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/nb-NO/firefox-96.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "05b79768c73e6d853eccd5f8b1d85d1d1abba18c3c286c20e2c22705dfa93e37"; + sha256 = "293900e86ccf9000ecc8344248e12cf2b1671b1f2543f60cb9f58b20a980f071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ne-NP/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ne-NP/firefox-96.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5083d2ca8a0e46fb4b9ed6f7cc06fa5e009f2db5f7192749a273ad9294000d75"; + sha256 = "c8e80531dc2ac9ea11a531075ca44cfdce829bed85c3fe10686ff7e89f0443f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/nl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/nl/firefox-96.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6ea95d1eaffb658f0df4ae1c3b0648fc46ceb073859315775344254dce8571a3"; + sha256 = "5d96b46954b4b92927878f34c0f4c6af90838003ec99156e1bb29c265543ddb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/nn-NO/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/nn-NO/firefox-96.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "00c36e18988bd6a73a08bbb065f668a9f20ee06d640ff26d22da5d7410898ff7"; + sha256 = "a2132947de63a8e825c2cff3e0855bb23dbab4ef0a654c6c2d8f8c196f4cd7bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/oc/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/oc/firefox-96.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a77c95cc9261d717dd62ffddc6d04b1ba6538a63a7922bdec8bb0aceca8843be"; + sha256 = "23b7a65a3e0e8a527acdd209f7ff3cd241766cfac6402c4b4b5f2ed7ad6a9f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/pa-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/pa-IN/firefox-96.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f2b636fc5c6ee58de46cc100e5eadd74e086274284b1723af429045afa3988dd"; + sha256 = "0433a761dcce926f09f8c8ca7e8a22d0fef7636790e41f819221e1896edeeb1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/pl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/pl/firefox-96.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "77afaeaf13c0e3c50b288fc5baf58d00cf0a4879b901a5681fecd95b6b477d2b"; + sha256 = "884af417358344acf53296631dc4516320908b328103da968dc2c77319ea5414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/pt-BR/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/pt-BR/firefox-96.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4e81866ec2708ea25ecaf021be1ba73e6a8314909fb2bf9814f97aeb3b8ee487"; + sha256 = "53453485e7e3d63b436407f1c48b54f3ef6f24211bf5511e9c2a8b187b1b4bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/pt-PT/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/pt-PT/firefox-96.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4fd989c61e24027f42dcaf0ae1ca9ed90bac1492683ff0c6f3acd5d22c6070cb"; + sha256 = "0550a2585e80c3ade74fbd0e238c29d23d1648ab319e909067214997114938c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/rm/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/rm/firefox-96.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7c433f0566a49c0141e42f3eabded921af8a286a335d17f4fac47867d17787f7"; + sha256 = "51c246cc1b14961717fec7b8f5b9b38f11fc8883423b16d22916b8896a71dcc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ro/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ro/firefox-96.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "26ce6ad767b7be95620309310007ef2ba2cafa3b22f8f1379b70276ecaf3f3ee"; + sha256 = "5eed24710606a6d9ae46e5086fb935b02eab1191c21fd699eb5161f9a28cbb1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ru/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ru/firefox-96.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "290a34b589bd7cf99586c9dcc1b64c65cde55a40c1851c1ce7445374523f55c8"; + sha256 = "5202a0413f66666b167366093dfc1909b0797082f308365168050e5d4e9f0a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sco/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sco/firefox-96.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3a9ff8651552d7955db6d2bf3f308c3c378aa9bd6d2e0bfca014fd95a0e9b315"; + sha256 = "66d3538be4f4225b65f4950a3df600ccb96c0869a134f72573d3c7c085f97045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/si/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/si/firefox-96.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e6f17fa62c22ed2144233707b0d58e53c8e0df4cc92cb5f8e202d6dcb651a34f"; + sha256 = "b8ae8c7e6c02178e4e56ca62c67008978d05f5c40331bf011c8f68f27d001d61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sk/firefox-96.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6b42eef534552215fdaee354a9a259756626ad2ee96b0bc867625d958286142a"; + sha256 = "32a7105c6ebd64511ce219e6fe07739ae801bf52d133a0c3e539acbc70d9fded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sl/firefox-96.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d069528bbc8066bdffc8b1d0e1f91967a82e7b9698f761a2815a777b0b616878"; + sha256 = "86b1a61a910b5e5f1c57f5eed53a9718e2c0831dec351864c3c47f8fe0c21963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/son/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/son/firefox-96.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "567a3232153e1a249ce49da88d9576f85d783fd2ef4256180e7f09a44c520ddb"; + sha256 = "2b090616040bbdc5192e853fd126a0d71fcb5a8b30a31b693273d0aa1581d359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sq/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sq/firefox-96.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7cad9d6be53e0095f41147aa373ef23729d0c5a636ae8af0680bcc054d343e5f"; + sha256 = "21f2b20f6c035b9fd016be0c56c6bf24e6953aba3b7e045181c9f39be28855c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sr/firefox-96.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c04396c4c313769edceb0b0c5a98a41c55fe27af973ff6fb3b9a2116e39a52d9"; + sha256 = "c508f033013d38d53b61ae15a8cac454d3710861d1cd3434edb830440ea5e160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/sv-SE/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/sv-SE/firefox-96.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0a24b924e3f91b0d5e45fc8f7f1969ac52a0a3f4dc9705ff6b4186c7e4fa042d"; + sha256 = "a99c21af9e34f737e406c13ee906ccdc71199f5a9540a116b2c706af2bc8d3fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/szl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/szl/firefox-96.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "55b2afae883c7de7fd1e33159e1c487f535f6d71f8db7e200c77e884da1c9290"; + sha256 = "2a17020d2c8dc36efcbec724af7dd0ac92946ce68052ae5a839c3c5727433c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ta/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ta/firefox-96.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "38abeca5e1f9e945566b8034ea3bc2c2a1cbb081f02635c152d13a8454e73bd7"; + sha256 = "db6a6434846451666263dc805a42dc579eaccd15dfc73379609046dbb1c65067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/te/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/te/firefox-96.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "970c4b0d5bfa24d03bac85bcccaf05d8d70e9884c2d73c7d3cad8539b46d0995"; + sha256 = "3621ba6af69fe808027243a27e4af59c797bc0baeeb5bc880027dbc25ecbbd90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/th/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/th/firefox-96.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7f94c556f04a78f9232c4f2ab537719e30ba6e9b5705f175768f9f41cc7921b0"; + sha256 = "b4bd33654822a3ec1c45ea99256141458ed0c139107bf916d635fc5a99a1eb3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/tl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/tl/firefox-96.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "dbeb26032ece7026a088c8130b28dc57659816ce52f61efe31cfe5b0f4d82e78"; + sha256 = "0136cecd5adec6cdd0b616e788c2bc8ed3d741c89fad3a1d19a3ddac40658e1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/tr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/tr/firefox-96.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a4f95b402f158e6edeaaa4e1e5c7ecb220e88577a9e847a52c12e8d616dddef1"; + sha256 = "3cd4f0375d20d012571422b35369c9a0e8350c2b3949f054b04ebec6e0000e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/trs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/trs/firefox-96.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3c22a4fa31761cd06df14e1e6a7cd7d3066287cfa9c97f34d8ceb75031fc378e"; + sha256 = "cc11b387a1b2c0d0f1fd6ed4f18308eb5613d2c409cfb9eac9a0bbab9fd2d33c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/uk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/uk/firefox-96.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7f6bb67e318d7c2ba322dea1636ddcb94b32180b687d4cba4c8ca885a6fbdd5a"; + sha256 = "e6e090894c2d0926db5681fcfc875424f48002e24aac05c283a51e847eb5df6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/ur/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/ur/firefox-96.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "253fc6fdf04d0cfa7e5304ffba9eb427cbbb76e387d94dcd5470e4556348ee20"; + sha256 = "7b83962242d1b8550471ac607985da427e7bd839742e12fcce972bfa5e328f1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/uz/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/uz/firefox-96.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0965894c437f9995a2cd696d87ec5da2ab21050bd3500a92558877355b07fc02"; + sha256 = "46f7e4509fd9bede934501e7e1175912b46c25435494483c3190344f1c497da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/vi/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/vi/firefox-96.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "abecf56f27ad4b464d881db55d8d7e455aea36f492b18863fd9eaf4195640796"; + sha256 = "2c0fbaba7c78581e6f6810c4eba677e4d36c567dfae379a38cfc21ffcc8f436f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/xh/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/xh/firefox-96.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e6d453b35154f0faa9c8d76808e201a9105fc6dab9158a8a688fca101d0fdb95"; + sha256 = "3e955c713ab04ea673e284a1e7a8bebd5203ad68163a0d2c1e20e4134a1255d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/zh-CN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/zh-CN/firefox-96.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9b32e92f96b2ba0df0d54e041bdebce747ab0815f5be9327aa6596d876321070"; + sha256 = "85ec531c5ad72cf4737b1e09bea9cce39b103394ba4d1e4733a36f93c366f789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-x86_64/zh-TW/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-x86_64/zh-TW/firefox-96.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "05664f6db9bfd37f09a20e37a0971cec8234f13d4480e3c02c3d280194068871"; + sha256 = "6bf84541ff65a62039f381b134668325084647a257a7fde599eab5dcd6ad3e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ach/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ach/firefox-96.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "775d3c5fb18f7219d1f1492c84ec2c62c188da71526a4896c139792e3b6c2d36"; + sha256 = "7e9f42a17de2309cf2bb0c2db66149293837a2ca8bc5314962cc68bd5f00017c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/af/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/af/firefox-96.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5781a804cd6b3205ea137ef3890ef1973240384fe2b89f4f168ecaacf5a5ea65"; + sha256 = "a0ddd7fcc61ebccad2ac697d172cd02936c9d34ce96085415255a0282433cc79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/an/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/an/firefox-96.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2507de35b2d8e28b9c950256e2a5f58d9529e1f75b3a2ae3449ffdc412fcff5f"; + sha256 = "7583e32095726fd623631b88504ec59911c56ee7f6742434a3efee1209e96cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ar/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ar/firefox-96.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9f340350cc9fd2af4af50b1aa1e3bb4371eccad04a567fd428c5cb5225773d6a"; + sha256 = "57719f2beabbfb0ae0a12c8250c60edfebefddf58764e579d658ed58c3709f91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ast/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ast/firefox-96.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0d72eddbc07dd7682ba36d731552b9e5a9eba28d10703446d1df7016783c51f7"; + sha256 = "e3e71ac1ab5cadffd6083e243d2a4a69d743a3749e6ac7d972eae4b3f6e2825d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/az/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/az/firefox-96.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "afe6aec818678974c3590f10d32f8238c83c34311af29cbd88f847256b6c2aeb"; + sha256 = "8d0c2a638e0f025f81b7958ac6775d35a6d46a85e8dd72e567f78cf3df354e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/be/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/be/firefox-96.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d3ef2a3df301eb00e769f634f413e1b7a7134e1ffd4bc5e5add9ae63b04b2060"; + sha256 = "a8e06cdcd987d0001b69e48297beeb8e7d056ee526f9293f27e16578978a3ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/bg/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/bg/firefox-96.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4368ae3a9e1bc1c3b6f29e5931da3b48fde38f9289ac3b435de6d25035ecb381"; + sha256 = "96eeafd9d1c17028b1eea7f67ca9da2e13f05ba07b846121d06a9ce9a5722bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/bn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/bn/firefox-96.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "4b3a502e6929c1b07ab4ba1ea436005e6b9dd8334dd262c2ae07cf12732ac8f1"; + sha256 = "a44d8004516d0e74343df7cbfa636ed6f1675fb7fd64a49b0fd74644675513b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/br/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/br/firefox-96.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ec1988c78c09c606f19ebc971dbb310d63f751c941f855251c1f52dc52a898d0"; + sha256 = "40219b7179fe5e93cf81632647adc5227f141062419559a13e2c96adb619edf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/bs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/bs/firefox-96.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "45a9ffa6b755efaa4e4cbb9d8789158f0c0da7428d60d6afda29dc49356230ec"; + sha256 = "1a260fabd6fa3d200bcac7d59523fdd03ee7a2100386848d273c98871a9a8cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ca-valencia/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ca-valencia/firefox-96.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b632eb69763a4284958be3a31bbeaf5d3a782e0c7b7a765b65e0e2b82de72d56"; + sha256 = "0fda5a630ffae654a761361620989fdad3e395758c6ca453f7181d5594a9f430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ca/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ca/firefox-96.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "88869f236c16676b6dfcbf86cab21224e36870ad539c4cb918ec67c6662af0b7"; + sha256 = "6304b319a9da49492dea2a268719f6bcfd1b57313fe22a57d104c693e465b237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/cak/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/cak/firefox-96.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "857ed1a071d5f9545209272b699987645322389e7eb541617d74c4ee967567f0"; + sha256 = "ac93bef164ede21d362db4c130ca2182239681d32aa41ceecc6040321521ac1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/cs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/cs/firefox-96.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9c65991015af9ef40b9595e905831d0e4baf88b52ae2b678966ef56ca89dfb6f"; + sha256 = "6ddafa9c714bac65e5a06bf459e62ba95287d540a891921d0054d485617984e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/cy/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/cy/firefox-96.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bd4366031cd402481ac7021c2b891a9a0af34d1c8f3bc04077f22098366e8263"; + sha256 = "247e05e6ebca3213b837dfc9d5b5cb00154eb86bb097a1c8cfa1e76f181f1492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/da/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/da/firefox-96.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c3900f2a4584bcb6d41a1744e4f82bf12ab451213293ec19a474750f707907cd"; + sha256 = "e66dac7ac62ab4337b78f1bf9565044a064e88a3a5ca48a41ceb6a6288e0f25e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/de/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/de/firefox-96.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5d29d0d70371163d751be0636b912176ae665f65d9f32bf62e01f69dc0349a91"; + sha256 = "6b6de662320063cb030977f6c9375dfa9e5c218686333ebaff00f4ba9626ac01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/dsb/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/dsb/firefox-96.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0682f59ce11000f78b908e063daa07a0e4f53913e9beb731f604fe372ed4f7e5"; + sha256 = "903ee6402b4f37b87ba0ff39a7c3a903cf29555c11796021e98646b4d1584ab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/el/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/el/firefox-96.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5418f2235bc8bd565d88f3eac49b2d2fe82a9117aa600612a68ef27c127115a2"; + sha256 = "4b023b27b2c575f984c43308a13c86156da437bb8fd7085da3616494b39eac37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/en-CA/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/en-CA/firefox-96.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d52c73155cf23a5a746ce3689571a1b9dd437ea182bdb21b556dfa0aa13818d8"; + sha256 = "3dd23a34cfee05b0de52a50d1c0bdaef69406425bc373571e3327424a301b42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/en-GB/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/en-GB/firefox-96.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ec3fe9fca914d607f44fe048d33afd1945018e69c2fe31cc7d8d35eded88d91a"; + sha256 = "ba26bc03bbd97169e683460ddc77cbd0404bc24f83d66b2b3c1bc1b5f0f4f993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/en-US/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/en-US/firefox-96.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dfd82a4d8dc06cbf64b1a772dffcc7975b8cd128af2725785c68f5918ff903aa"; + sha256 = "1108c32b4a4de68a056c44b1676db1642916ff310612b4683c126ccfc0f14cec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/eo/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/eo/firefox-96.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "9ceae21a7f36761e30debb370d0bfb97de5a489c277e8679b6f29872595d8751"; + sha256 = "76595cb29d2d773e37e251a292c6c9dd7d5c6491c16e75fdafa638a8f753054c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/es-AR/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/es-AR/firefox-96.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cdfd1b2289039eea5b2f05cd3af0c18f0c909246ec7f7c3f04e7f1485be9e894"; + sha256 = "6f44be9c4450b438b4a1651a7190fa32aaa9a43f5fe58353f83ef7eb218a1fa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/es-CL/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/es-CL/firefox-96.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "df7e0cebfb8209a29bf43af5dfdf5f496437c6017f3c8c428f0830feb17a929c"; + sha256 = "168a389fe8a5d2b9c8898e740a13f8f48a6e7f57cc1e1cd998a8a9d26b9534d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/es-ES/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/es-ES/firefox-96.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "41dbe20494da17a73aeed807805cb86b70cb443bcd41aacf8fbdf2445846f58c"; + sha256 = "762c5910b1fc6e2e64fb14326b7da6bbb1106a3bba45821d1cb7908d484d03a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/es-MX/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/es-MX/firefox-96.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "74e8c4b50e0e95a0bf95bf4436a3ee7a35df9e6e19703a8632a697f47199b545"; + sha256 = "d215acff39e7e2d31fc0b02f820209b2874c6d75760a888abc880da2a4aa7cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/et/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/et/firefox-96.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a2830273d08f6b0cb9d95e9875866e09b3327d411c2bc202bbf5b4c9e32ef05f"; + sha256 = "e9ee93c11644179d9032e042bf00d9620536b846611e7b3bb9924228ea26a47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/eu/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/eu/firefox-96.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b1e7b452cc57b1df9bf9c4b0936a43625f88900e2682c3081b026a3842321be8"; + sha256 = "3de1a6e07db385fce85ebdf8ed4299e5d8e95578f4e00e69abd62a24fd4ce769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/fa/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/fa/firefox-96.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "572c26e61a98706ca36760627000794f9f22c2ead6763e0e7c3d8fc4182853a9"; + sha256 = "8d3ed0432dffd19b8b5b02ebe7bc71e6b9119a1cd8db2d8bade391286ea5da7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ff/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ff/firefox-96.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f931798b40ad9bd538c78b7bfdb84a170cc4dd97a35ede3b90cb0b17a7dd33be"; + sha256 = "3daca20b3c0710a5bc587bd087fc98d261a1d8bfb8b81a13ab8bd770f1e02619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/fi/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/fi/firefox-96.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "413320e2e3e339864139ea1cbd38bb35a2182a5c651491b56d6c6cc3fc16f001"; + sha256 = "eb28ffcc96735a3d5b2e1e63b496fbec142bdde057140bbf4885e3b6dfba967d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/fr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/fr/firefox-96.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0c98180aa71d229b8615d10f2f0d472aa9103aba961e7b72309ae4c4dbf201a8"; + sha256 = "98cf0c26f0a81c240dded3e4e4ec1ae4fc14b6944ced9f6cf196e568f4fa8b52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/fy-NL/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/fy-NL/firefox-96.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b79e8afc2333db64744811be301d30732efbbd5058870aea60be605356911dfa"; + sha256 = "ed035b9763ff6d3a3bb9e6f283df2c6c7758e0dbc80124626822fb802b086215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ga-IE/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ga-IE/firefox-96.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5389751c882932ea285c0694dd06b02b723acea7a40494a0f5c8005613cbc31a"; + sha256 = "96e22258417ae821ba19961da62158454d4d5b6882cab908da3dc2875ed6e4cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/gd/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/gd/firefox-96.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ecd23ae7a86a14e8a2be920ed0df8d9db7d4d9d9cebfcd1dcd31242935df437c"; + sha256 = "6162712f9875132025088bd1d5b7288eb768cb9d666b85c37a75bd29bfa97c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/gl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/gl/firefox-96.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7304d29ecedb07d8b192b7c08d390ed6e59e7ecfcae3808d74ccdb24d82a5267"; + sha256 = "eb90f192145ff258876c35c1cad609b547f1b4ae2e0819148908575092da6fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/gn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/gn/firefox-96.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6e4c6f2262e5bb4573c471631584a4e0421b799f643ccfe2503f7409663d4046"; + sha256 = "4d954ad5adea89cedc31d4bd3ee06c31718c8be69e8df4fb734cb9fa0fc6666f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/gu-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/gu-IN/firefox-96.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b484b4c95bf9ff0ff622563caa2b8efaec483b76ebf6de0b6ea5392ce6dfa687"; + sha256 = "a3ddf64b28b0309d8c3c60a31a301cac34c70868a83517a418f68a06780d50de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/he/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/he/firefox-96.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1e86f10829c12a635d6c8fea6afc496e440d1e91b44280befb2dbf46244091cd"; + sha256 = "949d9dd58b170902e43a232931ae366bf2ad2d753b4dee7ddec728db4c5c2cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/hi-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/hi-IN/firefox-96.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "53fe58cc3cb8a6fff3e7870ac3435b4a096bb428c52597c75eccc11c199eb4eb"; + sha256 = "0440859bdd04fe66811f59e0f00475bf1840a42e4af6887a70e510bbd33bc238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/hr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/hr/firefox-96.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e03229a236dd34c9dc199afbb44d0fd10ed3b8b68b43ffa09b717ef5536bdf78"; + sha256 = "ae452061984ae42e20b43a1c6dd2b843561f3df0a700dfcfc3a6eab1e607bbbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/hsb/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/hsb/firefox-96.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d8fa249baa33bed71e51d4e0008c4a524748e84394401f681fcdeb4ebfda93a2"; + sha256 = "722a3f671c3ca0d9f8e894bc7150a247ce45a011db199af029354ad03b2e6961"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/hu/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/hu/firefox-96.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "10eab8a65010ec5116d70739e85fbff2f9d93d336a5f8ac26c9b4621bb6adb31"; + sha256 = "df5c83b65ebed8894c2046c6649326927f719cf754e05a90050201947aedc2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/hy-AM/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/hy-AM/firefox-96.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fcd08666ba84487167a7f1ba93bda53c2a01d8cea07002581a796932559589ca"; + sha256 = "30119473a01cb79fca861bcb3d4b8edd8920367267fa356dc2349f10556fc58b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ia/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ia/firefox-96.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "8f1b6585bef3546d3450d498bc22b4111edc48a5161c613f9593dab960ea51ad"; + sha256 = "7ffb03fe4afc58757afc7172cc58a99f88fd1f0b715ce065a4e0c05ec77d4e58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/id/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/id/firefox-96.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fd6dadbee240001e31b0c55b290b61f6187395d6c6d92ef547552d16def9fe67"; + sha256 = "069409053f3ed5c4d3cb3201335d9f535c84ddb38bac2e00612c1ff3b9bd5294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/is/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/is/firefox-96.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "6813330e8fc3b04134ba91af756f7e2afab4f352f4402844032a56283948a3a6"; + sha256 = "1a85a73f85fa25d1028c481e5e615fb0295a143e4cac2662e601e0ba01fdf6db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/it/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/it/firefox-96.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "570607d27fe8bb210bf5f6694c0cbe505d78a4e7753767a63eff5205d4cfd9ea"; + sha256 = "0fdc8b691c06764ca4fbcb6f14dad02b095542e29d262c73916e6410b65c2b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ja/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ja/firefox-96.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "966b3e9d6c069d0ea2c3ca2cc1090a7ecaecc7e75a20bd06d988bfd7a1785320"; + sha256 = "407b36c40f3c3a83232b59569edbbf75e25cea2d8ca6819b4ab89ba2b950ef06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ka/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ka/firefox-96.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7c4efd6d06eb594b0e23031eae5a46696b629c192606ab94364b3c96a3985bd8"; + sha256 = "21f718a2a2f1b69b49b4551382c9946ce4b5f98758c5d36e2bd14864ffcb95d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/kab/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/kab/firefox-96.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c0a044eb514c5c8dc7f670f55169df5612806ead901fc9be93b930a87c58c632"; + sha256 = "fe5978a2f22f87fbd79dbbb8b30885e67011c5d264ea59b36449dc72e93e26ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/kk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/kk/firefox-96.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1a10eb4f758fbb4597cdb67f7ee8e3caab41548a816d02892e34fc245748f07b"; + sha256 = "7202218b736e5754134ea7f233748a108006b78a866abb009ed5f69049e3e2e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/km/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/km/firefox-96.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "c4d65e12d05ae7a88b86a46f86f7d562ad4e6e0d00e8f179ae5c0e02eacf3d11"; + sha256 = "1a5ac6c5c8060187210a9b3edf827fec7581b7120c0844432d7e000ec6ab0d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/kn/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/kn/firefox-96.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f0db59ca26eb8ba8a2731c77ae3fba2df34d9bab7985b8bb25a0e5e085fa99e9"; + sha256 = "a9f44a276a63e95e8bfb560306bbe063bd490b4a292d1c890e34993b4922e32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ko/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ko/firefox-96.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d0d1268e6e5d179e366a9be43a07eae1d595c61d322024e8829c6c0474e21c88"; + sha256 = "087ebdad604bdbc1217101abb46792e87ad8e699b9de46c89c76bbf09eab9fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/lij/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/lij/firefox-96.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "ab1ba9d76e9ea282ed34aee8656e12bc169c0725bfb1f005824a522c94f91f2c"; + sha256 = "18658b4702781932656955581ad8274485df0cece8ea10a42351b6434ea70248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/lt/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/lt/firefox-96.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "284dfd1e39c91b86116d06743fb08ff93d63ad102930fb5dbbb759355e596d5c"; + sha256 = "54b39021bea1cc0df72b2987f5e7f4bd22c70fee6321c0019f4f8c289ff726a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/lv/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/lv/firefox-96.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "e7f764b9cd295e3b157bbee214ba26178d8bafd3dfda7fcde7742d23e745ba4d"; + sha256 = "ff98715d29da51180c243b5430e2b1f00195173f671371fe1ac48878e8522169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/mk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/mk/firefox-96.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "32f6bf3ff2976393e3e1992b3f65af41ae948553bfbc015f343b2c6daa689777"; + sha256 = "805244fa550ca460bbd2b579953e37e8c5ae80a1bc476b8f7ca88ce3efb44145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/mr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/mr/firefox-96.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "beb39f170e77fd7a0d46b7f9cbc6cef1bdfdd83688eb0a2aeae77aa17a39dabd"; + sha256 = "1115ed83e193a5b07235d329294ebe40e89eb51e4ce12ae8a1e9b4f532f15843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ms/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ms/firefox-96.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c698053be91b78f6424fbcb739250e8f507f8a1de9f5a995790db533be3474d9"; + sha256 = "b0f63831385a3861328d87204658355d15c613d21a845c5c8dc9a1c10bbc4a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/my/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/my/firefox-96.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6f922f29a6ceca5ad09033df03b4683c4dee4ec9f4fb02a2bcb6275beabf706c"; + sha256 = "8f2ce2941ed3699bc3391a772feb487bd3db8b725712e00017041ea144dad260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/nb-NO/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/nb-NO/firefox-96.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "70302578ef21d062d8d8a6fefda85827051bf66690f3f80ca68384f56045bb98"; + sha256 = "62b2d55a7d93960136630098990f7d9bf3201adb2f83674d65c1a01f9e880661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ne-NP/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ne-NP/firefox-96.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d16eb28cfd200cee6066a6d03e84bc90b14dfbc0e5010f2eb2d23208b586dd35"; + sha256 = "d9e9ebe109510bc7c682c70302d8513d1485892903c2415ce380664c64958f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/nl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/nl/firefox-96.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d2269a95fc075d27c1590816f0d6b953f8435a9ef1c38af46ae30142495937bf"; + sha256 = "3c2a208fd8041087ab7c27043c4b30b2f46fc37db63dc20d9a3e7583b53add32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/nn-NO/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/nn-NO/firefox-96.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ec1431f428483221a89bbea288ffeb40dd28d19fff58ac988d377fe184bef032"; + sha256 = "c17cb0d640544e6ff18b88c011f3f1cb2ff38b0100265dd171f80415fb33941b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/oc/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/oc/firefox-96.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9541418a5d1f3feb445d1adb5b9e1a6d06d7e2cdcd0a517e321cd4ea6b72ac85"; + sha256 = "f26d24a2d9e00cfa2d6f6e0292ae9c8e47764e686aba7bc8202e04a7a2ac2455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/pa-IN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/pa-IN/firefox-96.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0c2e402172cbc84975bbc073e32d48ad8353b39b8eb936bc81d90d249ce7bd55"; + sha256 = "98c13f5a1164bc6c0545f1134ab4f8a114e6ec317de3a78f1116e42cca10bb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/pl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/pl/firefox-96.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1b7c0b1ff2e112dae86e425aec72746e1f320c4794aae66f6cdbc0a5fbd68458"; + sha256 = "8da390aceebd3f8ada061b955ec4f2e0b50c3e550f3fe966a0621daf19a7362d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/pt-BR/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/pt-BR/firefox-96.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c8b18b3c756614b774606693a0c74f5c91272431a8582e5a71d63dc9ea0b2c1f"; + sha256 = "9b704bd207ec1d046e21d351e7110f01e7057350fac100b2f4afe8e92d94d5a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/pt-PT/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/pt-PT/firefox-96.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "36dcd7d573301179f47e7d073d7fe9089b703f91018ac652b7048423ae2102e0"; + sha256 = "32610508fd9ff1b4d902f8584c9bfdcbce34ba74e2282a67195e5107043a86a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/rm/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/rm/firefox-96.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c70b472fbf5447e5eb2b2e43ddc0127fa8d1f97557ca6940c5086346c84c295b"; + sha256 = "382dc90854525ad799b558544b6a40fe1fc9abeaa2bb231d6f7a043b99dd93c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ro/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ro/firefox-96.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c913a3c2b05a57eacf83b4a95f6c8ef770ad632f183381750e6faad93152eb20"; + sha256 = "2847b9c8a97d7907720b0b5d672d5eea697f34acad777da2003ff7550481d713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ru/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ru/firefox-96.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "98db217f5f77b15f760bbab79892e3bc511ef0be3ad55d75cc1278a5fcc3dab3"; + sha256 = "f5c0e7c12a8d6e5213cbebc929272c057617e0dfa35d999196528fafde2ab2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sco/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sco/firefox-96.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "12f2422d485bfbe780e8db94b1cbfd187d430230c5036d4b00596d89bb64bd3c"; + sha256 = "50809c7b9a01e970a95dfd798bd4a8d3830be773feeadb53384f79647621812f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/si/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/si/firefox-96.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5ad07f521cc312b92ea40a3ee8f575b01524ab20be1315f5cbbe6ecdfecd64f4"; + sha256 = "41995afb9efda0e8dfb55b4ebf50efbdf19312e0a51925385cf6a4443fd87648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sk/firefox-96.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a71cfb4fc3fd0a18172819763f3780a292c77c0441837aafa97d8db8736fa854"; + sha256 = "55827591e4780395b8bd61cd3f012f28adb7b16f4947ea5a11d8baead58adb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sl/firefox-96.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4b3b9d9ebd5035ca309724c6980422ab0b64db3af6c9d1ba08938a7dcdd65297"; + sha256 = "92294aa987214638a26d04df3172810840e4e3ee376a701f0e13449a86cc8dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/son/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/son/firefox-96.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "ac7c0714a079b11894260f391330b4a5a555b5fe0274d826929f181954c1f692"; + sha256 = "44f20f8e5ebaafd172c2c1aae53c84fdc431e8a75e16ac92f0d780d658744ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sq/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sq/firefox-96.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9334c0ffb21c09c5529412d67156eb096d1fc08be0bb0360449b00ce24da25ad"; + sha256 = "51a815d555d1fe2f4381b9e24959e654e86c5d2db331bfc37f6eafd659a6a8a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sr/firefox-96.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a8b29a1a317566ba3b37e75d3c105008487daf44a0ab3907ce0cbc9d47d25848"; + sha256 = "9f5413c7ea5c1cc1fa4d8830b70d7ea0ff7f5111eef0097a4597f408c51bea0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/sv-SE/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/sv-SE/firefox-96.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "05563bd29b8a89ddf517e8d4d997d177abb2e21722b14ebf0dd141d0211832af"; + sha256 = "7ff0f61d652b0c465401bd00fbe92685582e00516eddd84724ad3eaf7e327ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/szl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/szl/firefox-96.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3e49f4d70b6314bc0a92d252e2504ddfb4447c6f7d3611561c8f73065dfe770c"; + sha256 = "b8a21ac4fcff9551249959ebf55a168a8ad8cc30be212563ed68bd3f93283fb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ta/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ta/firefox-96.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8b6a00cc80951cc0438d0acf05b105ad7e5ff720bfcf3b84ca96c519430b06f2"; + sha256 = "9fd00bf87c76747832a1930c4ce526d6e280b86c5634e1b132791fbda70e9e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/te/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/te/firefox-96.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d988737a9e5a6afaf70ee0b8834a5b443bdb282f058f346b564fcfce0c1f2b7b"; + sha256 = "332357b136ca53f54c5fffde603d6fb1fc4d1837b73d87717df227b490ba37a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/th/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/th/firefox-96.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "611552a0dee6a811c92ce5e90f6e85dc8685a3c015dc6fbb4816ab3ba886f31c"; + sha256 = "1ad3f1b9f54af9e039d094e6039f77c7a3ccdfbf70b2178893bb4a91de74357d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/tl/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/tl/firefox-96.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e8196540096bb834647e8ade99b5ce143b96e5d9157936fb9635b6e5df12e277"; + sha256 = "2ad07a41fd029ba2d2cf84ba392e6a3ddca5df8f9ed81dd4b4d1dfe592f2f048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/tr/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/tr/firefox-96.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "965ff28ceae8270b873b94be3a99c6363abb841e50454d5013eeba132f61bea2"; + sha256 = "dd3dd66c7933dbd1177b7e2f435d654b4d500698536bcb41b46711f717fdb319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/trs/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/trs/firefox-96.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "5c57ca45aa8150a8c2a723091565750593df71b8b4d4615601af61daeb5c6107"; + sha256 = "2ad69a163f840f6be6bc6900bb7a782b7d4e851ac9f5499d2ed95eeb9aa7db20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/uk/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/uk/firefox-96.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "57789c73d243297ffad9e483a9921ce151d24ad60ba1b05caf9c6eff051b5fcf"; + sha256 = "121946a0f845e7ed7735e5c59c1be45937052c34c7e424acb11128227d39f254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/ur/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/ur/firefox-96.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ff0e216802ce19e11ec239e5dd063d4bd599917442c692e6745326ea48d1570e"; + sha256 = "e9b4b2281f9ce81065bc6a23313f545cd05966cfb6fefafbcb7ef03111ea72e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/uz/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/uz/firefox-96.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "05c07f003c18da0cc2b1087a53da126ccf53964bc4fbd79ce182e840f994aa50"; + sha256 = "d8c224173410e8c1715e9ec36cafc055c75e56f7915c656cca9767ad0549f914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/vi/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/vi/firefox-96.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f3df214f93b857276d412b0415f2b02b623617d4a4f9a34a17c1d5afef10f036"; + sha256 = "0005d0f255e02cbe00395028989e6a8f500017c1e4e97541fff0a65d5f1455a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/xh/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/xh/firefox-96.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "df5e1b4a027b66fc0a6e8a68332a7b8db0180233bdf7e90d74301b82318397cb"; + sha256 = "b987fd9b99a87fadf1103a83eba1758b2c326858e5d806cfce8c4737887edae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/zh-CN/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/zh-CN/firefox-96.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f3b3ee9eb3f42ec7b4d8f2bfa45f733b03c420d1b10c8719f0254feca5c482d9"; + sha256 = "0c779c6d1e4556c032ac8f086dabe322c7b05b5f10357f82f39fe8e6090b9a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0/linux-i686/zh-TW/firefox-96.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.1/linux-i686/zh-TW/firefox-96.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3752ae6594afc74d8c460c7569a5467ef8f432f154256d42ae4e7e24cd8b2687"; + sha256 = "45c9a7eb698491ba67618b3649e22357d999e0e292d71bbcad7a19a0cc4d6f9c"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index d1b4e92639..192f700e6b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "96.0"; + version = "96.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "39f553474537eb4e521f4182e38f0ddff039fa6b40b939d461937d2cef27f7182097b478f08f90d64fdcbe9c063e78f14f6863a8a82a16207ec7a1d3fdfda4ff"; + sha512 = "c0d2ccf9ca930def63dcb9dc269e47f60fd4bbbdcbc01463df0c30e11109a543e310fb36f2334d17b90cb9c96b8dcdd97d0e2d6c589a779de5e4f197c052f9a5"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index fe6ef5c059..33a9e9f865 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, libkrb5, libdrm, mesa +, libkrb5, libdrm, libglvnd, mesa , libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - libkrb5 libdrm mesa coreutils + libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva @@ -119,12 +119,6 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share - # To fix --use-gl=egl: - test -e $out/share/google/$appname/libEGL.so - ln -s libEGL.so $out/share/google/$appname/libEGL.so.1 - test -e $out/share/google/$appname/libGLESv2.so - ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2 - substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index c80ce2d71c..866119fde1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.9.5"; + version = "1.10.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8="; + sha256 = "sha256-5K2Fm7CkzVcHM3JC1rgh/vCyXfVTTY47nZFzqgQcoSs"; fetchSubmodules = true; }; @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; - hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; - installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv Lagrange.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix index ae4a649724..552c05ac9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-r2+jvmnW9EeQf/2X2cOxnOa+HGuGHV6YMftT2MxbSYQ="; + sha256 = "sha256-W42e1p70dMhF9C7BBPp1Yhp2PrRb8/Lu07yOGiUSmNg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 2eb0f63bc3..8282713aa0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { callaudiod gtk3 libpeas - libgdata # required by some dependency transitively sofia_sip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index a3b14264e0..4c99319fbb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo117Module, fetchFromGitHub }: -buildGoModule rec { +buildGo117Module rec { pname = "cloudflared"; - version = "2021.12.3"; + version = "2022.1.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-+T8BtYc/TBP2qL/Wfi2CDwD6VAqY/0F7QIUEhjOnLUk="; + hash = "sha256-PdmYOFy6CWMqHlcK0PeHPGCVSLhIJOIDnXOAh/qYt+8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index c937c84147..6d1cfa4f73 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.2.1"; - commit = "122ecefc3abfe8b691a08d9f3cecf9a170cc8c37"; + version = "2.2.2"; + commit = "03b17e0233e64787ffb5fcf65c740cc2a20822ba"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-BI4aoe9XVmuyb4oDPd2Clz5IWVzu4rAMHDi6Cb6spyE="; + sha256 = "sha256-xExtGKM3iNgX849xmLcgIwRbXJSJnGDuVhRMkti+Mkc="; }; - vendorSha256 = "sha256-GeU8uQM+oMottzYsE6oQyKZL3aWB5vQgTDLQiuQdapw="; + vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index f74f87ad11..e7550ae837 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "0mdi5cjcs0qzj238lfjqbjgi131r2vxj810zx1gv1lc9y0aq0hkl"; + sha256 = "sha256-OBcvJ1+VAE7jDeQ/I/9uc0wiU0iibeflRMmb+ulgDtQ="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 7b7a7a40e2..14a3675797 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LXXTzpG0UDSzEL6RdczvBZHlH5eJTkt7oc3wMFLO1JQ="; + sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; }; - vendorSha256 = "sha256-jFTtg3p8nS8j267CZ+wuoynruwFTRamwkEpResQSMjk="; + vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index e1ea0a690c..8bdbf63a9f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.17.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y="; + sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM="; }; - vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; + vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 67b7cc9cd7..b25e956b18 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -7,82 +7,97 @@ , cdrtools # libvirt }: let - list = lib.importJSON ./providers.json; - - buildWithGoModule = data: + # Our generic constructor to build new providers. + # + # Is designed to combine with the terraform.withPlugins implementation. + mkProvider = + { owner + , repo + , rev + , version + , sha256 + , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , deleteVendor ? false + , proxyVendor ? false + , provider-source-address + }@attrs: buildGoModule { - pname = data.repo; - inherit (data) vendorSha256 version; + pname = repo; + inherit vendorSha256 version deleteVendor proxyVendor; subPackages = [ "." ]; doCheck = false; # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X main.version=${data.version}" "-X main.commit=${data.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; src = fetchFromGitHub { - inherit (data) owner repo rev sha256; + inherit owner repo rev sha256; }; - deleteVendor = data.deleteVendor or false; - proxyVendor = data.proxyVendor or false; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}"; - passthru = data; + postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}"; + passthru = attrs; }; - # Our generic constructor to build new providers - mkProvider = attrs: - (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else throw /* added 2022/01 */ "vendorSha256 missing: please use `buildGoModule`") - attrs; + list = lib.importJSON ./providers.json; # These providers are managed with the ./update-all script automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list; # These are the providers that don't fall in line with the default model - special-providers = let archived = throw "the provider has been archived by upstream"; in { - # Packages that don't fit the default model - gandi = callPackage ./gandi { }; - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 - libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); - teleport = callPackage ./teleport { }; - vpsadmin = callPackage ./vpsadmin { }; - } // (lib.optionalAttrs (config.allowAliases or false) { - arukas = archived; # added 2022/01 - bitbucket = archived; # added 2022/01 - chef = archived; # added 2022/01 - cherryservers = archived; # added 2022/01 - clc = archived; # added 2022/01 - cloudstack = throw "removed from nixpkgs"; # added 2022/01 - cobbler = archived; # added 2022/01 - cohesity = archived; # added 2022/01 - dyn = archived; # added 2022/01 - genymotion = archived; # added 2022/01 - hedvig = archived; # added 2022/01 - ignition = archived; # added 2022/01 - incapsula = archived; # added 2022/01 - influxdb = archived; # added 2022/01 - jdcloud = archived; # added 2022/01 - kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; - librato = archived; # added 2022/01 - logentries = archived; # added 2022/01 - metalcloud = archived; # added 2022/01 - mysql = archived; # added 2022/01 - nixos = archived; # added 2022/01 - oneandone = archived; # added 2022/01 - packet = archived; # added 2022/01 - profitbricks = archived; # added 2022/01 - pureport = archived; # added 2022/01 - rancher = archived; # added 2022/01 - rightscale = archived; # added 2022/01 - runscope = archived; # added 2022/01 - segment = throw "removed from nixpkgs"; # added 2022/01 - softlayer = archived; # added 2022/01 - telefonicaopencloud = archived; # added 2022/01 - terraform = archived; # added 2022/01 - ultradns = archived; # added 2022/01 - vthunder = throw "provider was renamed to thunder"; # added 2022/01 - }); + special-providers = + { + # Packages that don't fit the default model + + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); + teleport = callPackage ./teleport { }; + vpsadmin = callPackage ./vpsadmin { }; + }; + + # Put all the providers we not longer support in this list. + removed-providers = + let + archived = date: throw "the provider has been archived by upstream on ${date}"; + removed = date: throw "removed from nixpkgs on ${date}"; + in + lib.optionalAttrs (config.allowAliases or false) { + arukas = archived "2022/01"; + bitbucket = archived "2022/01"; + chef = archived "2022/01"; + cherryservers = archived "2022/01"; + clc = archived "2022/01"; + cloudstack = removed "2022/01"; + cobbler = archived "2022/01"; + cohesity = archived "2022/01"; + dyn = archived "2022/01"; + genymotion = archived "2022/01"; + hedvig = archived "2022/01"; + ignition = archived "2022/01"; + incapsula = archived "2022/01"; + influxdb = archived "2022/01"; + jdcloud = archived "2022/01"; + kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; + librato = archived "2022/01"; + logentries = archived "2022/01"; + metalcloud = archived "2022/01"; + mysql = archived "2022/01"; + nixos = archived "2022/01"; + oneandone = archived "2022/01"; + packet = archived "2022/01"; + profitbricks = archived "2022/01"; + pureport = archived "2022/01"; + rancher = archived "2022/01"; + rightscale = archived "2022/01"; + runscope = archived "2022/01"; + segment = removed "2022/01"; + softlayer = archived "2022/01"; + telefonicaopencloud = archived "2022/01"; + terraform = archived "2022/01"; + ultradns = archived "2022/01"; + vthunder = throw "provider was renamed to thunder on 2022/01"; + }; in -automated-providers // special-providers // { inherit mkProvider; } +automated-providers // special-providers // removed-providers // { inherit mkProvider; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix deleted file mode 100644 index 359adcef5d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-gandi"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "go-gandi"; - repo = "terraform-provider-gandi"; - rev = "v${version}"; - sha256 = "sha256-PI7cujatzmljyxosGMaqg3Jizee9Py7ffq9gKdehlvo="; - }; - - vendorSha256 = "sha256-dASIvZ3d7xTYMfvqeTcSJt+kaswGNRNqjHDcgoRVxNk="; - deleteVendor = true; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/terraform-provider-gandi{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for the Gandi LiveDNS service."; - homepage = "https://github.com/tiramiseb/terraform-provider-gandi"; - license = licenses.mpl20; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 55b285a1b2..cb980ca6f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -21,10 +21,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.4.0", - "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i", - "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v", - "version": "2.4.0" + "rev": "v2.5.0", + "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a", + "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx", + "version": "2.5.0" }, "akamai": { "owner": "akamai", @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.151.0", - "sha256": "0pdvbq9kfq7vwkfk75fjy6jaiq5bfkjmvr3z07712b76z29m10bz", + "rev": "v1.152.0", + "sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a", "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.151.0" + "version": "1.152.0" }, "ansible": { "owner": "nbering", @@ -94,28 +94,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.71.0", - "sha256": "0jr9mk6gvimh8picpcc47pcan323k4rml438743ma53g8jhcvn2a", - "vendorSha256": "02ax2717xci8qia3k7q19yknazn67idb64hf5mwahfnx1fjmdc22", - "version": "3.71.0" + "rev": "v3.72.0", + "sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb", + "vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y", + "version": "3.72.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.14.0", - "sha256": "0sjpwhywc165gkxd1ybkwi1aww4xivry82wh0mbh4bgs607mn8lg", + "rev": "v2.15.0", + "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv", "vendorSha256": null, - "version": "2.14.0" + "version": "2.15.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.91.0", - "sha256": "0db23ch46wi5mjmwibp7n98y0j3cl06mq2pzmvw1scbzvgh0gcqp", + "rev": "v2.92.0", + "sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q", "vendorSha256": null, - "version": "2.91.0" + "version": "2.92.0" }, "azurestack": { "owner": "hashicorp", @@ -185,10 +185,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.6.0", - "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d", - "vendorSha256": "1rdgjb1gfz5fs6s3c15nj92rm8ifb23n25wpxl16mz4aifkjgqam", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb", + "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm", + "version": "3.7.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -266,10 +266,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.16.0", - "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", + "rev": "v2.17.0", + "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d", "vendorSha256": null, - "version": "2.16.0" + "version": "2.17.0" }, "dme": { "owner": "DNSMadeEasy", @@ -347,10 +347,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.39.0", - "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8", + "rev": "v0.40.0", + "sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i", "vendorSha256": null, - "version": "0.39.0" + "version": "0.40.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -370,6 +370,15 @@ "vendorSha256": null, "version": "1.13.2" }, + "gandi": { + "owner": "go-gandi", + "provider-source-address": "registry.terraform.io/go-gandi/gandi", + "repo": "terraform-provider-gandi", + "rev": "v2.0.0", + "sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m", + "vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523", + "version": "2.0.0" + }, "github": { "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", @@ -393,29 +402,29 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.5.0", - "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px", + "rev": "v4.6.0", + "sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c", "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la", - "version": "4.5.0" + "version": "4.6.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.5.0", - "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4", + "rev": "v4.6.0", + "sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k", "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la", - "version": "4.5.0" + "version": "4.6.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.17.0", - "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd", - "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw", - "version": "1.17.0" + "rev": "v1.18.0", + "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn", + "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn", + "version": "1.18.0" }, "gridscale": { "owner": "gridscale", @@ -466,10 +475,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.32.0", - "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw", + "rev": "v1.32.1", + "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als", "vendorSha256": null, - "version": "1.32.0" + "version": "1.32.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -493,10 +502,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.37.1", - "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc", - "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji", - "version": "1.37.1" + "rev": "v1.38.0", + "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w", + "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4", + "version": "1.38.0" }, "icinga2": { "owner": "Icinga", @@ -674,10 +683,10 @@ "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.1.1", - "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd", - "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip", - "version": "1.1.1" + "rev": "v1.2.0", + "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", + "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", + "version": "1.2.0" }, "ncloud": { "owner": "NaverCloudPlatform", @@ -701,10 +710,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.34.1", - "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5", - "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap", - "version": "2.34.1" + "rev": "v2.35.0", + "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f", + "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp", + "version": "2.35.0" }, "nomad": { "owner": "hashicorp", @@ -757,19 +766,19 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.58.0", - "sha256": "0cxzy9sj4n7yz7zbqhpkr92h7gqqfx7qxpr0a1jgh9a087j3752c", + "rev": "v4.59.0", + "sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h", "vendorSha256": null, - "version": "4.58.0" + "version": "4.59.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.20.2", - "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9", - "vendorSha256": "0fyxm6wff5pz5g3rjnia23npar9qbwcv01pa3rsskxkl8jc3v13j", - "version": "3.20.2" + "rev": "v3.20.3", + "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv", + "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc", + "version": "3.20.3" }, "oktaasa": { "owner": "oktadeveloper", @@ -857,10 +866,10 @@ "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.9.1", - "sha256": "05jsap80dcgmncxa8xbx1hnrbpi9bxjz2k9jnfnws1pmbjxl94hf", + "rev": "v1.9.2", + "sha256": "03585rm434lcp6xk58185i78iv5fjd18z7nrdnbhxxy94yhhf335", "vendorSha256": null, - "version": "1.9.1" + "version": "1.9.2" }, "pass": { "owner": "camptocamp", @@ -1001,10 +1010,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.64.2", - "sha256": "0h47ik93lhb9mjg3ai9n76ya918h1mk3fyp70yr26rwc3rihvjm6", - "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4", - "version": "1.64.2" + "rev": "v1.65.0", + "sha256": "1gk4v6lxa4k8za6c1zxrrrc6qw3ymsk46w97qhfri6y7vrc3vxh0", + "vendorSha256": "0xhzj8lmrh0mcpbxa7xkzhhgl3jfk6mz5adia0jgflgrx4wjaf38", + "version": "1.65.0" }, "stackpath": { "owner": "stackpath", @@ -1046,10 +1055,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.60.26", - "sha256": "1diwiyfswmgqm1iizj228s2ysrnx4z3lqlq82a7gp0z9p8rzd0vs", + "rev": "v1.61.1", + "sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4", "vendorSha256": null, - "version": "1.60.26" + "version": "1.61.1" }, "tfe": { "owner": "hashicorp", @@ -1128,10 +1137,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.5.0", - "sha256": "1sdcjizg0gip55042p0599wvjicibyx9kiymxq45af14yhnwqyv5", + "rev": "v3.5.1", + "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q", "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s", - "version": "3.5.0" + "version": "3.5.1" }, "venafi": { "deleteVendor": true, diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 573cb83ccc..bc179ea55e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -160,20 +160,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_12 = mkTerraform { - version = "0.12.31"; - sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; - patches = [ - ./provider-path.patch - (fetchpatch { - name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; - sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; - }) - ]; - passthru = { inherit plugins; }; - }; - terraform_0_13 = mkTerraform { version = "0.13.7"; sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; @@ -198,8 +184,8 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.3"; - sha256 = "sha256-dvAuzVmwnM2PQcILzw3xNacBwuRY7cZEU3nv4/DzOKE="; + version = "1.1.4"; + sha256 = "sha256-PzBdo4zqWB9ma+uYFGmZtJNCXlRnAHxQmzWxZFPzHH0="; vendorSha256 = "sha256-Rk2hHtJfaS553MJIea6n51irMas3qcBrWAD+adzTi1Y="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix index a8541336b3..98ce3c474f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk="; + sha256 = "sha256-Jhq0pkyF1KWJ6HgeWLoRfIxo7QHvOwwXzsIxZQgQtK4="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,core,modules,lib} - mv bin core modules lib $out/ + mv bin core modules lib share $out/ wrapProgram $out/bin/terranix-doc-json \ --prefix PATH : ${lib.makeBinPath [ jq nix ]} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix deleted file mode 100644 index ead46366cb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, fetchdarcs, python2Packages, libvncserver, zlib -, gnutls, libvpx, makeDesktopItem, mkDerivationWith }: - -mkDerivationWith python2Packages.buildPythonApplication rec { - - pname = "blink"; - version = "3.2.0"; - - src = fetchdarcs { - url = "http://devel.ag-projects.com/repositories/blink-qt"; - rev = "release-${version}"; - sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; - }; - - patches = [ ./pythonpath.patch ]; - postPatch = '' - sed -i 's|@out@|'"''${out}"'|g' blink/resources.py - ''; - - propagatedBuildInputs = with python2Packages; [ - pyqt5_with_qtwebkit - cjson - sipsimple - twisted - google-api-python-client - ]; - - buildInputs = [ - python2Packages.cython - zlib - libvncserver - libvpx - ]; - - desktopItem = makeDesktopItem { - name = "Blink"; - exec = "blink"; - comment = meta.description; - desktopName = "Blink"; - icon = "blink"; - genericName = "Instant Messaging"; - categories = "Internet;"; - }; - - dontWrapQtApps = true; - - postInstall = '' - mkdir -p "$out/share/applications" - mkdir -p "$out/share/pixmaps" - cp "$desktopItem"/share/applications/* "$out/share/applications" - cp "$out"/share/blink/icons/blink.* "$out/share/pixmaps" - ''; - - preFixup = '' - makeWrapperArgs+=( - --prefix "LD_LIBRARY_PATH" ":" "${gnutls.out}/lib" - "''${qtWrapperArgs[@]}" - ) - ''; - - meta = with lib; { - homepage = "https://icanblink.com/"; - description = "A state of the art, easy to use SIP client for Voice, Video and IM"; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch deleted file mode 100644 index 0df8bc84ff..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- blink-2.0.0/blink/resources.py 2016-03-09 14:39:07.000000000 +0100 -+++ blink-2.0.0/blink/resources-patched.py 2016-03-12 21:34:14.965476623 +0100 -@@ -1,7 +1,10 @@ -+# Copyright (C) 2010-2013 AG Projects. See LICENSE for details. -+# - - """Provide access to Blink's resources""" - --import __main__ -+__all__ = ['ApplicationData', 'Resources', 'IconManager'] -+ - import imghdr - import os - import platform -@@ -19,14 +22,10 @@ - from blink.util import run_in_gui_thread - - --__all__ = ['ApplicationData', 'Resources', 'IconManager'] -- -- - class DirectoryContextManager(unicode): - def __enter__(self): - self.directory = os.getcwdu() - os.chdir(self) -- - def __exit__(self, type, value, traceback): - os.chdir(self.directory) - -@@ -61,18 +60,7 @@ - @classproperty - def directory(cls): - if cls._cached_directory is None: -- try: -- binary_directory = os.path.dirname(os.path.realpath(__main__.__file__)) -- except AttributeError: -- if hasattr(sys, 'frozen'): -- application_directory = os.path.dirname(os.path.realpath(sys.executable)) -- else: -- application_directory = os.path.realpath('') # executed in interactive interpreter -- else: -- if os.path.basename(binary_directory) == 'bin': -- application_directory = os.path.dirname(binary_directory) -- else: -- application_directory = binary_directory -+ application_directory = '@out@' - if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): - cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) - else: diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix new file mode 100644 index 0000000000..4bc9ac98df --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -0,0 +1,14 @@ +{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: + +stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r "${desktopName}.app" $out/Applications + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 6154ce668c..2f58ec414a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,35 +1,89 @@ -{ branch ? "stable", pkgs }: +{ branch ? "stable", pkgs, lib, stdenv }: let inherit (pkgs) callPackage fetchurl; -in { - stable = callPackage ./base.nix rec { - pname = "discord"; - binaryName = "Discord"; - desktopName = "Discord"; - version = "0.0.16"; - src = fetchurl { - url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; + versions = if stdenv.isLinux then { + stable = "0.0.16"; + ptb = "0.0.27"; + canary = "0.0.132"; + } else { + stable = "0.0.264"; + ptb = "0.0.58"; + canary = "0.0.280"; + }; + version = versions.${branch}; + srcs = { + x86_64-linux = { + stable = fetchurl { + url = + "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; + }; + ptb = fetchurl { + url = + "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; + sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + }; + canary = fetchurl { + url = + "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv"; + }; + }; + x86_64-darwin = { + stable = fetchurl { + url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; + sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; + }; + ptb = fetchurl { + url = + "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; + }; + canary = fetchurl { + url = + "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; + sha256 = "0ccchsywry68vv81pqzzxmh1r19lnvxr429iwvgfr9y82lyjvz06"; + }; + }; + # Only PTB bundles a MachO Universal binary with ARM support. + aarch64-darwin = { + ptb = fetchurl { + url = + "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; + }; }; }; - ptb = callPackage ./base.nix rec { - pname = "discord-ptb"; - binaryName = "DiscordPTB"; - desktopName = "Discord PTB"; - version = "0.0.26"; - src = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4"; + src = srcs.${stdenv.hostPlatform.system}.${branch}; + + meta = with lib; { + description = "All-in-one cross-platform voice and text chat for gamers"; + homepage = "https://discordapp.com/"; + downloadPage = "https://discordapp.com/download"; + license = licenses.unfree; + maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ] + ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; + }; + package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + packages = { + stable = callPackage package rec { + inherit src version meta; + pname = "discord"; + binaryName = "Discord"; + desktopName = "Discord"; + }; + ptb = callPackage package rec { + inherit src version meta; + pname = "discord-ptb"; + binaryName = "DiscordPTB"; + desktopName = "Discord PTB"; + }; + canary = callPackage package rec { + inherit src version meta; + pname = "discord-canary"; + binaryName = "DiscordCanary"; + desktopName = "Discord Canary"; }; }; - canary = callPackage ./base.nix rec { - pname = "discord-canary"; - binaryName = "DiscordCanary"; - desktopName = "Discord Canary"; - version = "0.0.132"; - src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv"; - }; - }; -}.${branch} +in packages.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix similarity index 52% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 5943917dc6..866b288909 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,17 +1,14 @@ -{ pname, version, src, binaryName, desktopName -, autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig -, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid -, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu -, writeScript, common-updater-scripts -}: +{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf +, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 +, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes +, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss +, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript +, common-updater-scripts }: -let - inherit binaryName; -in stdenv.mkDerivation rec { - inherit pname version src; +stdenv.mkDerivation rec { + inherit pname version src meta; nativeBuildInputs = [ alsa-lib @@ -33,13 +30,45 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango libXScrnSaver - libappindicator-gtk3 libdbusmenu - ]; + libcxx + systemd + libpulseaudio + libdrm + mesa + stdenv.cc.cc + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libnotify + libX11 + libXcomposite + libuuid + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + libxcb + pango + libXScrnSaver + libappindicator-gtk3 + libdbusmenu + ]; installPhase = '' mkdir -p $out/{bin,opt/${binaryName},share/pixmaps} @@ -56,7 +85,9 @@ in stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ # Without || true the install would fail on case-insensitive filesystems - ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${ + lib.strings.toLower binaryName + } || true ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ @@ -76,18 +107,11 @@ in stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + url=$(curl -sI "https://discordapp.com/api/download/${ + builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname + }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') version=''${url##https://dl*.discordapp.net/apps/linux/} version=''${version%%/*.tar.gz} update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix ''; - - meta = with lib; { - description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = "https://discordapp.com/"; - downloadPage = "https://discordapp.com/download"; - license = licenses.unfree; - maintainers = with maintainers; [ ldesgoui MP2E ]; - platforms = [ "x86_64-linux" ]; - }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 2e0a913705..c091a882d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.8", + "version": "1.9.9", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -22,7 +22,7 @@ "lint": "yarn lint:types && yarn lint:js", "lint:js": "eslint --max-warnings 0 src scripts hak", "lint:js-fix": "eslint --fix src scripts hak", - "lint:types": "tsc --noEmit", + "lint:types": "tsc --noEmit && tsc -p scripts/hak/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit", "build:native": "yarn run hak", "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink", "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32", @@ -37,7 +37,7 @@ "docker:install": "scripts/in-docker.sh yarn install", "debrepo": "scripts/mkrepo.sh", "clean": "rimraf webapp.asar dist packages deploys lib", - "hak": "node scripts/hak/index.js" + "hak": "ts-node scripts/hak/index.ts" }, "dependencies": { "auto-launch": "^5.0.5", @@ -52,6 +52,9 @@ "@types/auto-launch": "^5.0.1", "@types/counterpart": "^0.18.1", "@types/minimist": "^1.2.1", + "@types/mkdirp": "^1.0.2", + "@types/pacote": "^11.1.1", + "@types/rimraf": "^3.0.2", "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "allchange": "^1.0.6", @@ -76,6 +79,7 @@ "pacote": "^11.3.5", "rimraf": "^3.0.2", "tar": "^6.1.2", + "ts-node": "^10.4.0", "typescript": "^4.5.3" }, "hakDependencies": { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index bce13052e5..1a0c25c606 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,6 +7,7 @@ , fetchYarnDeps , electron , element-web +, sqlcipher , callPackage , Security , AppKit @@ -78,7 +79,9 @@ mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper + # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" ''; @@ -94,7 +97,7 @@ mkYarnPackage rec { name = "element-desktop"; exec = "${executableName} %u"; icon = "element"; - desktopName = "Element (Riot)"; + desktopName = "Element"; genericName = "Matrix Client"; comment = meta.description; categories = "Network;InstantMessaging;Chat;"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json index b0dc0c2e73..25e335decc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.8", - "desktopSrcHash": "o6SICu7QDdBv9WXDconkypQRj3TbrU4ZAxayO9yemvc=", - "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18", - "webHash": "141fqvh4d5lwm692yc8mfwrlvqnfixvc7vlbfis86qi557vq6ljq" + "version": "1.9.9", + "desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=", + "desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y", + "webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 9723f7111e..92e39f091b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.10"; + version = "5.7.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-tm9tuIP4pVociJAiXVsZkDU+zCM5tVAlt+FNpOaiths="; + sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index d63318ecfa..4496af4a1d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -24,6 +24,7 @@ , libnotify , xdg-utils , mesa +, libappindicator-gtk3 }: # Helper function for building a derivation for Franz and forks. @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ]; + runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index a4693dc667..f35db8e3a1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -47,22 +47,24 @@ mkDerivation rec { ] ++ pythonPath; pythonPath = with python3Packages; [ + pillow aiofiles appdirs - blist cairosvg filetype html-sanitizer - hsluv - matrix-nio + lxml mistune - plyer pymediainfo - pyotherside + plyer + sortedcontainers + watchgod redbaron + hsluv simpleaudio setuptools watchgod + dbus-python ]; qmakeFlags = [ @@ -84,6 +86,6 @@ mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ colemickens AndersonTorres ]; inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || python3Packages.isPy37 || python3Packages.isPy38; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index ef9ce5bca7..f393a17c1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, python } : +{ lib, stdenv, fetchurl, pidgin, intltool, python2 } : stdenv.mkDerivation rec { pname = "purple-plugin-pack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python ]; + buildInputs = [ pidgin intltool python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 384feaac63..a874d60f13 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -113,6 +113,9 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop + # Create required symlinks: + ln -s libGLESv2.so $out/lib/Signal/libGLESv2.so.2 + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch new file mode 100644 index 0000000000..61474d0ab4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch @@ -0,0 +1,34 @@ +diff --git a/signalbackup/setfiletimestamp.cc b/signalbackup/setfiletimestamp.cc +index f53a168..d2d1c5e 100644 +--- a/signalbackup/setfiletimestamp.cc ++++ b/signalbackup/setfiletimestamp.cc +@@ -21,24 +21,23 @@ + + #if !defined(_WIN32) && !defined(__MINGW64__) + +-#include +-#include ++#include + + bool SignalBackup::setFileTimeStamp(std::string const &file, long long int time_usec) const + { +- struct timespec ntimes[] = ++ struct timeval ntimes[] = + { + { // ntimes[0] = + time_usec / 1000, // tv_sec, seconds +- (time_usec % 1000) * 1000 // tv_usec, nanoseconds ++ static_cast(time_usec) // tv_usec, nanoseconds + }, + { // ntimes[1] = + time_usec / 1000, // tv_sec, seconds +- (time_usec % 1000) * 1000 // tv_usec, nanoseconds ++ static_cast(time_usec) // tv_usec, nanoseconds + } + }; + +- return (utimensat(AT_FDCWD, file.c_str(), ntimes, 0) == 0); ++ return (utimes(file.c_str(), ntimes) == 0); + } + + #else // this is poorly tested, I don't have windows diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix new file mode 100644 index 0000000000..5da0536b37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: + +stdenv.mkDerivation rec { + pname = "signalbackup-tools"; + version = "20220107"; + + src = fetchFromGitHub { + owner = "bepaald"; + repo = pname; + rev = version; + sha256 = "sha256-sB8/xQgSORtwupcwSejKUhHoz04exdYS0ymefw9wXDQ="; + }; + + # Remove when Apple SDK is >= 10.13 + patches = lib.optional (stdenv.system == "x86_64-darwin") ./apple-sdk-missing-utimensat.patch; + + buildInputs = [ openssl sqlite ]; + buildFlags = [ + "-Wall" + "-Wextra" + "-Wshadow" + "-Wold-style-cast" + "-Woverloaded-virtual" + "-pedantic" + "-std=c++2a" + "-O3" + "-march=native" + ]; + buildPhase = '' + $CXX $buildFlags */*.cc *.cc -lcrypto -lsqlite3 -o signalbackup-tools + ''; + + installPhase = '' + mkdir -p $out/bin + cp signalbackup-tools $out/bin/ + ''; + + meta = with lib; { + description = "Tool to work with Signal Backup files"; + homepage = "https://github.com/bepaald/signalbackup-tools"; + license = licenses.gpl3Only; + maintainers = [ maintainers.malo ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix index 8fece54127..3278d68cd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }: +{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: stdenv.mkDerivation rec { pname = "torchat"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ python wxPython wrapPython ]; - pythonPath = [ wxPython ]; + buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; + pythonPath = with python2.pkgs; [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat - makeWrapper ${python}/bin/python $out/bin/torchat \ + makeWrapper ${python2}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ --run "cd $out/lib/torchat" \ --add-flags "-O $out/lib/torchat/torchat.py" diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index a7627feb94..d66efa86a7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.1"; + version = "0.14.4"; - vendorSha256 = "sha256-vDNWYgWlM3kJqlHW/6Bj6P+t6M61TvOVRJwDN2p0mi4="; + vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-GELCd12LhA4CBe9DRRBu4r+AwCksaRVIWcSAJScvnbk="; + sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix index 19cc4445b3..a8888b8e29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk="; + sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0="; }; - vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg="; + vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/ii/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/ii/default.nix index 18a9a8882f..e39f7b75bb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/ii/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/ii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ii"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; - sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; + sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc="; }; makeFlags = [ "CC:=$(CC)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index 2e6c8cf023..d0050f7375 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -40,6 +40,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; license = licenses.isc; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix index 6aa09f70ba..6de601348c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,9 +1,13 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook -, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme -, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false +{ lib, python3, fetchFromGitHub, file, gnupg, gawk, notmuch, procps, withManpage ? false }: -buildPythonPackage rec { +with python3.pkgs; + +let + notmuch2 = callPackage ./notmuch.nix { + inherit notmuch; + }; +in buildPythonApplication rec { pname = "alot"; version = "0.10"; outputs = [ "out" ] ++ lib.optional withManpage "man"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/notmuch.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix rename to third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/notmuch.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix deleted file mode 100644 index cab43750a5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: - -python2Packages.buildPythonApplication rec { - pname = "mailpile"; - version = "1.0.0rc2"; - - src = fetchFromGitHub { - owner = "mailpile"; - repo = "Mailpile"; - rev = version; - sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; - }; - - postPatch = '' - patchShebangs scripts - ''; - - nativeBuildInputs = with python2Packages; [ pbr git ]; - PBR_VERSION=version; - - propagatedBuildInputs = with python2Packages; [ - appdirs - cryptography - fasteners - gnupg1orig - jinja2 - pgpdump - pillow - python2Packages.lxml - spambayes - ]; - - postInstall = '' - wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${lib.makeBinPath [ gnupg1orig openssl ]}" \ - --set-default MAILPILE_SHARED "$out/share/mailpile" - ''; - - # No tests were found - doCheck = false; - - meta = with lib; { - description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; - homepage = "https://www.mailpile.is/"; - license = [ licenses.asl20 licenses.agpl3 ]; - platforms = platforms.linux; - maintainers = [ ]; - knownVulnerabilities = [ - "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104" - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index a3a6051ef0..f95439b2fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -23,6 +23,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; license = licenses.mit; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/unstable.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix similarity index 88% rename from third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/unstable.nix rename to third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix index 73a28de7b4..4e1f5ee6ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/unstable.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix @@ -3,8 +3,8 @@ }: let - apispec3 = callPackage ../apispec/3.nix {}; - jinja2 = callPackage ../jinja2/2.nix {}; + apispec3 = callPackage ./apispec.nix {}; + jinja2 = callPackage ../../../../development/python2-modules/jinja2 {}; in buildPythonPackage rec { pname = "aiohttp-apispec"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/3.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/apispec.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/apispec/3.nix rename to third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/apispec.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix index 774aea642d..6a8f93a293 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix @@ -6,8 +6,7 @@ let libtorrent = (python3.pkgs.toPythonModule ( libtorrent-rasterbar-1_2_x.override { python = python3; })).python; - aiohttp-apispec = python3.pkgs.callPackage - ../../../../development/python-modules/aiohttp-apispec/unstable.nix { }; + aiohttp-apispec = python3.pkgs.callPackage ./aiohttp-apispec.nix { }; in stdenv.mkDerivation rec { pname = "tribler"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix index 1d05cafef8..9c708b7958 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix @@ -13,7 +13,10 @@ let }; }; - boostPython = boost.override { enablePython = true; }; + boostPython = boost.override { + enablePython = true; + python = python2; + }; in stdenv.mkDerivation rec { pname = "twister"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix index 54581a6070..779de53d3c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc="; + sha256 = "sha256-AavNiFZlpX6XZQLP1kl9igA833i0gxOTYGubo3MvpSU="; }; - vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq"; + vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; checkInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ping/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ping/default.nix index 8b8748d70f..6074b1a51c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ping/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ping/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -14,7 +15,6 @@ , libsoup , libgee , wrapGAppsHook -, vala_0_40 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala_0_40 + vala pkg-config python3 wrapGAppsHook @@ -65,5 +65,12 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; mainProgram = "com.github.jeremyvaartjes.ping"; + # Does not build with vala 0.48 or later + # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from + # `GLib.HashTable' to `GLib.HashTable?' + # HashTable tempDataList = Soup.Form.decode(testObjs[id].data); + # ^^^^^^^^^^^^ + # Upstream has no activity since 28 Dec 2020 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index bec35fdd53..fe8f22b4d4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-qGPAfNsl20+k5Gn0w6aY8VFSOmpPk7S5u4FHPrSCz80="; + sha256 = "sha256-fkIHHyhwZV0/aB/JFwz3XrYVOaCn5ZK3ihY3GVoOAHg="; }; - vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M="; + vendorSha256 = "sha256-D16jlzP1amkiHW+/BqQV/DISf/H9MlZgvMJmlGtvrhg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix new file mode 100644 index 0000000000..f313bdcded --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix @@ -0,0 +1,25 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations }: + +mkDerivation rec { + pname = "PageEdit"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "Sigil-Ebook"; + repo = pname; + rev = version; + hash = "sha256-/t08ZS2iYWIDkco0nhACBQs1X+X77SJ/g+ow7KemfRY="; + }; + + nativeBuildInputs = [ cmake qttranslations ]; + propagatedBuildInputs = [ qtsvg qtwebengine ]; + cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0"; + + meta = with lib; { + description = "ePub XHTML Visual Editor"; + homepage = "https://sigil-ebook.com/pageedit/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.pasqui23 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix index c0cdfd75d9..d07133e906 100644 --- a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { pantheon.granite sqlite webkitgtk - libgdata # required by some dependency transitively libhandy curl ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix b/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix index d588580a8d..84635f42ee 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "notion-app-enhanced"; - version = "2.0.16-5"; + version = "2.0.18-1"; name = "${pname}-v${version}"; src = fetchurl { url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage"; - sha256 = "1v733b4clc9sjgb72fasmbqiyz26d09f3kmvd1nqshwp5d14dajz"; + sha256 = "sha256-SqeMnoMzxxaViJ3NPccj3kyMc1xvXWULM6hQIDZySWY="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index f5bc6d0d14..830c1c4255 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.12.8"; + version = "22.1.7"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-iVcGJz4lxyn303ACYBUVm9cOYjVrETpyUapjAieMpqE="; + sha256 = "7ac13816e47e23e8469f47b6d48a29f7e98416de0fa9ef77eb3da63b191829f3"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix b/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix index 7b72ddcf0d..1de5a8b817 100644 --- a/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix @@ -1,65 +1,59 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch -, cmake -, gdk-pixbuf -, gtk3 -, vala -, gettext +, meson , ninja -, pantheon , pkg-config +, python3 +, vala +, wrapGAppsHook +, glib +, gtk3 , json-glib -, libgudev , libevdev , libgee +, libgudev , libsoup -, wrapGAppsHook +, pantheon }: stdenv.mkDerivation rec { pname = "spice-up"; - version = "1.8.2"; + version = "1.9.1"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m"; + sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc="; }; - USER = "pbuilder"; - nativeBuildInputs = [ - cmake - gettext + meson ninja pkg-config + python3 vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite - gdk-pixbuf + glib gtk3 json-glib libevdev libgee libgudev libsoup + pantheon.elementary-icon-theme + pantheon.granite ]; - patches = [ - # Fix build with Vala 0.46 - # https://github.com/Philip-Scott/Spice-up/pull/288 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch"; - sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39"; - }) - ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; passthru = { updateScript = nix-update-script { @@ -74,6 +68,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; - mainProgram = "com.github.philip-scott.spice-up"; + mainProgram = "com.github.philip_scott.spice-up"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix index f4f83ce8e7..5267771624 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; pythonPath = with python3.pkgs; [ - wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956 + wxPython_4_1 humblewx icalendar markdown diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index fc4605911d..39bb5d1bf1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.49.4"; + version = "0.49.5"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "078w7jjkn8af3i0y0s236ky54h08b2wgzcaiakqiqx4gxdpf6jrq"; + sha256 = "0bis0xkpcr8rvhm9364v0np5cnvkscv2fgl90f455lcwy7kk9m12"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0hygdxb97373z5cn3s4wr66wc41w7a55kxjyb8alck1fl9l6agn1"; + sha256 = "1wv9xz1asjadz1jzgpaxf6lzbj5azgsq0qpawp3y257h488r1z9k"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix index 7584debc20..cf4fa35974 100644 --- a/third_party/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/watson/default.nix @@ -10,7 +10,8 @@ let # Workaround the issue by providing click 7 explicitly. python = python3.override { packageOverrides = self: super: { - click = self.callPackage ../../../development/python-modules/click/7.nix { }; + # Use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; }; }; in with python.pkgs; buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix index a9f5fc991f..46b0714bd4 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; + sha256 = "02mhxaqpj0094sbb3c28r5xznw9z8ayvlkczknizlk75ag895zz2"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix similarity index 54% rename from third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix rename to third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix index 372300895c..784ab7bd0f 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.7.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix @@ -7,7 +7,6 @@ , pkg-config , volk , cppunit -, swig , orc , boost , log4cpp @@ -21,33 +20,39 @@ , libjack2 , CoreAudio , uhd -, comedilib -, libusb1 , SDL , gsl +, soapysdr +, libsodium +, libsndfile +, libunwind +, thrift , cppzmq , zeromq +# Needed only if qt-gui is disabled, from some reason +, icu # GUI related -, gtk2 +, gtk3 , pango +, gobject-introspection , cairo -, qt4 -, qwt6_qt4 +, qt5 +, libsForQt5 # Features available to override, the list of them is in featuresInfo. They -# are all turned on by default +# are all turned on by default. , features ? {} # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" , versionAttr ? { - major = "3.7"; - minor = "14"; + major = "3.9"; + minor = "5"; patch = "0"; } }: let - sourceSha256 = "BiUDibXV/5cEYmAAaIxT4WTxF/ni4MJumF5oJ/vuOyc="; + sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; featuresInfo = { # Needed always basic = { @@ -56,27 +61,30 @@ let pkg-config orc ]; - runtime = [ boost log4cpp mpir ]; - pythonNative = with python.pkgs; [ Mako six ]; - }; - volk = { - cmakeEnableFlag = "VOLK"; runtime = [ volk + boost + log4cpp + mpir + ] + # when gr-qtgui is disabled, icu needs to be included, otherwise + # building with boost 1.7x fails + ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; + pythonNative = with python.pkgs; [ + Mako + six ]; }; doxygen = { native = [ doxygen ]; cmakeEnableFlag = "DOXYGEN"; }; - sphinx = { - pythonNative = with python.pkgs; [ sphinx ]; - cmakeEnableFlag = "SPHINX"; + man-pages = { + cmakeEnableFlag = "MANPAGES"; }; python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ - swig python ]; cmakeEnableFlag = "PYTHON"; @@ -85,31 +93,44 @@ let native = [ cppunit ]; cmakeEnableFlag = "TESTING"; }; + post-install = { + cmakeEnableFlag = "POSTINSTALL"; + }; gnuradio-runtime = { cmakeEnableFlag = "GNURADIO_RUNTIME"; + pythonRuntime = [ + python.pkgs.pybind11 + ]; }; gr-ctrlport = { - cmakeEnableFlag = "GR_CTRLPORT"; - native = [ - swig + runtime = [ + libunwind + thrift ]; + pythonRuntime = with python.pkgs; [ + python.pkgs.thrift + # For gr-perf-monitorx + matplotlib + networkx + ]; + cmakeEnableFlag = "GR_CTRLPORT"; }; gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - cheetah - lxml - pygtk + Mako numpy - # propagated by pygtk, but since wrapping is done externally, it help - # the wrapper if it's here - pycairo - pygobject2 + pygobject3 + ]; + native = [ + python.pkgs.pytest ]; runtime = [ - gtk2 + gtk3 pango + gobject-introspection cairo + libsndfile ]; cmakeEnableFlag = "GRC"; }; @@ -126,6 +147,10 @@ let gr-filter = { runtime = [ fftwFloat ]; cmakeEnableFlag = "GR_FILTER"; + pythonRuntime = with python.pkgs; [ + scipy + pyqtgraph + ]; }; gr-analog = { cmakeEnableFlag = "GR_ANALOG"; @@ -136,9 +161,6 @@ let gr-dtv = { cmakeEnableFlag = "GR_DTV"; }; - gr-atsc = { - cmakeEnableFlag = "GR_ATSC"; - }; gr-audio = { runtime = [] ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] @@ -146,33 +168,46 @@ let ; cmakeEnableFlag = "GR_AUDIO"; }; - gr-comedi = { - runtime = [ comedilib ]; - cmakeEnableFlag = "GR_COMEDI"; - }; gr-channels = { cmakeEnableFlag = "GR_CHANNELS"; }; - gr-noaa = { - cmakeEnableFlag = "GR_NOAA"; - }; - gr-pager = { - cmakeEnableFlag = "GR_PAGER"; - }; gr-qtgui = { - runtime = [ qt4 qwt6_qt4 ]; - pythonRuntime = [ python.pkgs.pyqt4 ]; + runtime = [ qt5.qtbase libsForQt5.qwt ]; + pythonRuntime = [ python.pkgs.pyqt5 ]; cmakeEnableFlag = "GR_QTGUI"; }; gr-trellis = { cmakeEnableFlag = "GR_TRELLIS"; }; gr-uhd = { - runtime = [ uhd ]; + runtime = [ + uhd + ]; cmakeEnableFlag = "GR_UHD"; }; + gr-uhd-rfnoc = { + runtime = [ + uhd + ]; + cmakeEnableFlag = "UHD_RFNOC"; + }; gr-utils = { cmakeEnableFlag = "GR_UTILS"; + pythonRuntime = with python.pkgs; [ + # For gr_plot + matplotlib + ]; + }; + gr-modtool = { + pythonRuntime = with python.pkgs; [ + setuptools + click + click-plugins + ]; + cmakeEnableFlag = "GR_MODTOOL"; + }; + gr-blocktool = { + cmakeEnableFlag = "GR_BLOCKTOOL"; }; gr-video-sdl = { runtime = [ SDL ]; @@ -182,27 +217,28 @@ let runtime = [ codec2 gsm ]; cmakeEnableFlag = "GR_VOCODER"; }; - gr-fcd = { - runtime = [ libusb1 ]; - cmakeEnableFlag = "GR_FCD"; - }; gr-wavelet = { cmakeEnableFlag = "GR_WAVELET"; - runtime = [ gsl ]; + runtime = [ gsl libsodium ]; }; gr-zeromq = { runtime = [ cppzmq zeromq ]; cmakeEnableFlag = "GR_ZEROMQ"; }; - gr-wxgui = { - pythonRuntime = with python.pkgs; [ numpy wxPython ]; - cmakeEnableFlag = "GR_WXGUI"; + gr-network = { + cmakeEnableFlag = "GR_NETWORK"; + }; + gr-soapy = { + cmakeEnableFlag = "GR_SOAPY"; + runtime = [ + soapysdr + ]; }; }; shared = (import ./shared.nix { inherit - lib stdenv + lib python removeReferencesTo featuresInfo @@ -212,8 +248,8 @@ let overrideSrc fetchFromGitHub ; - qt = qt4; - gtk = gtk2; + qt = qt5; + gtk = gtk3; }); inherit (shared) hasFeature; # function in @@ -225,57 +261,33 @@ stdenv.mkDerivation rec { src nativeBuildInputs buildInputs + cmakeFlags disallowedReferences - postInstall + stripDebugList doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; - + patches = [ + # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 + ./modtool-newmod-permissions.patch + ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must inherit boost volk; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-qtgui") { + inherit (libsForQt5) qwt; }; - cmakeFlags = shared.cmakeFlags - # From some reason, if these are not set, libcodec2 and gsm are - # not detected properly (slightly different then what's in - # ./default.nix). - ++ lib.optionals (hasFeature "gr-vocoder") [ - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" - "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include" - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" - "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm" - ] - ++ lib.optionals (hasFeature "volk" && volk != null) [ - "-DENABLE_INTERNAL_VOLK=OFF" - ] - ; - stripDebugList = shared.stripDebugList - # gr-fcd feature was dropped in 3.8 - ++ lib.optionals (hasFeature "gr-fcd") [ "share/gnuradio/examples/fcd" ] - ; - preConfigure = "" - # wxgui and pygtk are not looked up properly, so we force them to be - # detected as found, if they are requested by the `features` attrset. - + lib.optionalString (hasFeature "gr-wxgui") '' - sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt - '' - + lib.optionalString (hasFeature "gnuradio-companion") '' - sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt + + postInstall = shared.postInstall + # This is the only python reference worth removing, if needed. + + lib.optionalString (!hasFeature "python-support") '' + ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) + ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; - patches = [ - # Don't install python referencing files if python support is disabled. - # See: https://github.com/gnuradio/gnuradio/pull/3856 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/acef55433d15c231661fa44751f9a2d90a4baa4b.diff"; - sha256 = "2CEX44Ll8frfLXTIWjdDhKl7aXcjiAWsezVdwrynelE="; - }) - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/a2681edcfaabcb1ecf878ae861161b6a6bf8459d.diff"; - sha256 = "2Pitgu8accs16B5X5+/q51hr+IY9DMsA15f56gAtBs8="; - }) - ]; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 784ab7bd0f..3e1366547e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -9,7 +9,7 @@ , cppunit , orc , boost -, log4cpp +, spdlog , mpir , doxygen , python @@ -18,6 +18,8 @@ , fftwFloat , alsa-lib , libjack2 +, libiio +, libad9361 , CoreAudio , uhd , SDL @@ -45,14 +47,14 @@ , overrideSrc ? {} , pname ? "gnuradio" , versionAttr ? { - major = "3.9"; - minor = "5"; + major = "3.10"; + minor = "0"; patch = "0"; } }: let - sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; + sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4="; featuresInfo = { # Needed always basic = { @@ -64,7 +66,7 @@ let runtime = [ volk boost - log4cpp + spdlog mpir ] # when gr-qtgui is disabled, icu needs to be included, otherwise @@ -171,6 +173,22 @@ let gr-channels = { cmakeEnableFlag = "GR_CHANNELS"; }; + gr-pdu = { + cmakeEnableFlag = "GR_PDU"; + runtime = [ + libiio + libad9361 + ]; + }; + gr-iio = { + cmakeEnableFlag = "GR_IIO"; + runtime = [ + libiio + ]; + }; + common-precompiled-headers = { + cmakeEnableFlag = "COMMON_PCH"; + }; gr-qtgui = { runtime = [ qt5.qtbase libsForQt5.qwt ]; pythonRuntime = [ python.pkgs.pyqt5 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 514fac80d1..6678b933d8 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15.2"; + version = "2.15.4"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-LWuSJbzQKHoCbkyRQ7KqUxFXzA99kuafPibH8Xx7mXs="; + sha256 = "sha256-iQlrnkc1EMR8sUUAHh+7RfS/05unrcDm/kJ/Q4Vst2Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index efd438adf6..79dcab19ac 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -2,7 +2,8 @@ , fetchFromGitHub, cmake , libusb-compat-0_1, pkg-config , usePython ? false -, python, ncurses, swig2 +, python ? null +, ncurses, swig2 , extraPackages ? [] } : diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix deleted file mode 100644 index 91a0017444..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, htslib, zlib, curl, openssl, samblaster, sambamba -, samtools, hexdump, python2Packages, which }: - -let - python = - python2Packages.python.withPackages (pkgs: with pkgs; [ pysam numpy ]); - -in stdenv.mkDerivation rec { - pname = "lumpy"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "arq5x"; - repo = "lumpy-sv"; - rev = "v${version}"; - sha256 = "0r71sg7qch8r6p6dw995znrqdj6q49hjdylhzbib2qmv8nvglhs9"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ which ]; - buildInputs = - [ htslib zlib curl openssl python samblaster sambamba samtools hexdump ]; - - preConfigure = '' - patchShebangs ./. - - # Use Nix htslib over bundled version - sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile - sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile - # Also make sure we use the includes from Nix's htslib - sed -i 's|../../lib/htslib/|${htslib}|' src/filter/Makefile - ''; - - # Upstream's makefile doesn't have an install target - installPhase = '' - mkdir -p $out - cp -r bin $out - cp -r scripts $out - sed -i 's|/build/source|'$out'|' $out/bin/lumpyexpress.config - ''; - - meta = with lib; { - description = "Probabilistic structural variant caller"; - homepage = "https://github.com/arq5x/lumpy-sv"; - maintainers = with maintainers; [ jbedo ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index 062cdd56c7..bba8a02b76 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ="; + sha256 = "sha256-sEp7/Y5ifV9LTqrkhlkfykTJYMMuc+VtF7PvmIpBxUw="; }; buildInputs = [ zlib ]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; + badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix index b2cefefb5c..efbedf9a12 100755 --- a/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: -pythonPackages.buildPythonPackage rec { +python2Packages.buildPythonPackage rec { pname = "poretools"; version = "unstable-2016-07-10"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; }; - propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; + propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas]; meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix index cb606a6b34..e56d91dc2c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa -, samtools, findutils, python }: +{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa +, samtools, findutils }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tebreak"; version = "1.1"; @@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec { sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz"; }; - nativeBuildInputs = [ findutils python3Packages.cython ]; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = [ findutils python3.pkgs.cython ]; + propagatedBuildInputs = with python3.pkgs; [ pysam scipy bx-python @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' $out/bin/tebreak -b test/data/example.ins.bam -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa pushd test - ${python.interpreter} checktest.py + ${python3.interpreter} checktest.py ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index 30ef1f5d10..6029bf5a99 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "sha256-3JNkwKkr/fdz/2UFAHwhn03PHqX9YFOMf3Q7kkbTZYk="; + sha256 = "sha256-MUS1dIsULDJ5DahCtDpbHZq56nltHShli7+uoW1/Tqw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 2f4fd63574..961519bad1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - # "6.99.0" doesn't have "-unknown", yet; so leaving this in case it returns postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" \ @@ -105,7 +104,7 @@ stdenv.mkDerivation rec { ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" ] - ++ optionals (!withPCM) [ + ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 44a538370d..95e88ff140 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -22,7 +22,7 @@ , sanitizeAddress ? false , sanitizeThreads ? false , with3d ? true -, withI18n ? false +, withI18n ? true , withPCM ? true # Plugin and Content Manager , srcs ? { } }: diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 5fed12b002..f1ae123c71 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.0"; + version = "6.0.1"; src = { - rev = "d3dd2cf0fa975548d027db88d19b8a88866866d8"; - sha256 = "1jrfwyi4zs0rpcpsj01z6687a433nnr56cxbnz12jfg2yafpxk23"; + rev = "79c1e3a40b913f818bddb69ae98d4d38ab81f926"; + sha256 = "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr"; }; }; libVersion = { - version = "6.0.0"; + version = "6.0.1"; libSources = { - symbols.rev = "275f22eb9eecd5b6deabdefd82c9a826254d9f23"; - symbols.sha256 = "0wjk464l60xknvgc9d870901lqnx296dw7amlh3wg0wf78izarfr"; - templates.rev = "3a422b5b0928f3fd31579769d4dee2b009a85a11"; - templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; - footprints.rev = "3ea7895b0817abecaa34276346749a711b0c69f6"; - footprints.sha256 = "0jv2plwzhhkfx7a2zankkjkbfzjxv43ab8rqpxzqfq2fnx83q6r5"; - packages3d.rev = "e607286d4a48ddf654585b37b45d74416a9a70c7"; + symbols.rev = "9f21fdcd5728ce6339dd4e1b26ebe60a1bba05e0"; + symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + templates.rev = "5a9266bc796ba5c285401dd1fd900dbc4b6a8cd3"; + templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; + footprints.rev = "c7f4881b9ec1cbe7f7e5a0828946d0dd909afbee"; + footprints.sha256 = "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb"; + packages3d.rev = "5d0c3590b26835f9d206a355d7579706c06d8bfe"; packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2021-12-23"; + version = "2022-01-13"; src = { - rev = "21eb92821866d558acd9e737b643b300a8b18202"; - sha256 = "01hg0byp60xzgz0xxfwvyq1hbvbllsys6lx9yfj27d3qjc3bdk42"; + rev = "33a4c9b08e040a17daefae9069fdf834063555b4"; + sha256 = "1ma0i0vgvdsjrmlfzdi34byly7n1vsaynwp9f1hny4s1m53nirha"; }; }; libVersion = { - version = "2021-12-25"; + version = "2022-01-13"; libSources = { - symbols.rev = "125a2e736504e776e4c6fb7f5131efad75edf245"; - symbols.sha256 = "0wjk464l60xknvgc9d870901lqnx296dw7amlh3wg0wf78izarfr"; - templates.rev = "8c9ff3dadb9c75cf2932f11c09a46c0c9d84784b"; - templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; - footprints.rev = "ac8de318d8ef7b3eb64c78c6c2650b7b085f3271"; - footprints.sha256 = "0jv2plwzhhkfx7a2zankkjkbfzjxv43ab8rqpxzqfq2fnx83q6r5"; - packages3d.rev = "1080b6e565e56bae9be46db2278a1542092d7a2d"; - packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; + symbols.rev = "e3b198d827817b79fb8a6df07f0cfc1cb9140edf"; + symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; + templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; + footprints.rev = "a939c691f1c515d6830e54cf035a420de3e5a92c"; + footprints.sha256 = "13g6y1l95znz6ixc4dpqsxp3icrzs951xpabnzr5znw42577gm9j"; + packages3d.rev = "196a26294d8e501b0e8b06c1df1abae0ebe23051"; + packages3d.sha256 = "0ywlk00dfwv7hc494finmazdh3g1yx0ir7bvnd8zp6cq4ql0nwl4"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 78c2a56dc1..c9ba47eca1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.37.0"; + version = "3.38.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "e69ab934262eb6f141344fdaec98ede68a9102b6"; - sha256 = "19sigzbrdl90jqk7lvl3q8j6n4nnidzwp9zzmzgq3zxxgywa2ghp"; + rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9"; + sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 911d0043ed..3cb018b9a5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -6,7 +6,7 @@ # build , cmake , ctags -, pythonPackages +, python2Packages , swig # math , eigen @@ -36,7 +36,7 @@ , withSvmLight ? false }: -assert pythonSupport -> pythonPackages != null; +assert pythonSupport -> python2Packages != null; assert opencvSupport -> opencv != null; assert (!blas.isILP64) && (!lapack.isILP64); @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; nativeBuildInputs = [ cmake swig ctags ] - ++ (with pythonPackages; [ python jinja2 ply ]); + ++ (with python2Packages; [ python jinja2 ply ]); buildInputs = [ eigen @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nlopt lp_solve colpack - ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) + ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ]) ++ lib.optional opencvSupport opencv; cmakeFlags = let diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index 5a9f1ef93f..f9931c7d4c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.0.13"; + version = "2.14.0.14"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk="; + sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index af88263889..d24cff9e86 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -1,167 +1,172 @@ -{ lib, stdenv -, coreutils -, patchelf -, requireFile -, callPackage +{ lib +, stdenv +, autoPatchelfHook +, buildEnv , makeWrapper +, requireFile , alsa-lib +, cups , dbus +, flite , fontconfig , freetype -, gcc +, gcc-unwrapped , glib -, libssh2 +, gmpxx +, keyutils +, libGL +, libGLU +, libpcap +, libtins +, libuuid +, libxkbcommon +, libxml2 +, llvmPackages_12 +, matio +, mpfr , ncurses , opencv4 +, openjdk11 , openssl +, pciutils +, tre , unixODBC , xkeyboard_config , xorg , zlib -, libxml2 -, libuuid , lang ? "en" -, libGL -, libGLU }: let - l10n = - import ./l10ns.nix { - lib = lib; - inherit requireFile lang; - }; -in -stdenv.mkDerivation rec { + l10n = import ./l10ns.nix { + inherit lib requireFile lang; + }; +in stdenv.mkDerivation { inherit (l10n) version name src; - buildInputs = [ - coreutils - patchelf + nativeBuildInputs = [ + autoPatchelfHook makeWrapper + ]; + + buildInputs = [ alsa-lib - coreutils + cups.lib dbus + flite fontconfig freetype - gcc.cc - gcc.libc glib - libssh2 - ncurses - opencv4 - openssl - stdenv.cc.cc.lib - unixODBC - xkeyboard_config - libxml2 - libuuid - zlib + gmpxx + keyutils.lib libGL libGLU + libpcap + libtins + libuuid + libxkbcommon + libxml2 + llvmPackages_12.libllvm.lib + matio + mpfr + ncurses + opencv4 + openjdk11 + openssl + pciutils + tre + unixODBC + xkeyboard_config ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - libXcursor - libXfixes - libXrandr libICE libSM + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXinerama + libXmu + libXrandr + libXrender + libXtst + libxcb ]); - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + wrapProgramFlags = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}" + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" + # Fix libQt errors - #96490 + "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" + # Fix xkeyboard config path for Qt + "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + ]; unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file + runHook preUnpack + + # Find offset from file offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix + tail -c +$(($offset + 1)) $src | tar -xf - + + runHook postUnpack ''; installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller + runHook preInstall - # Fix the installation script as follows: - # 1. Adjust the shebang - # 2. Use the wrapper in the desktop items + cd "$TMPDIR/Unix/Installer" + + mkdir -p "$out/lib/udev/rules.d" + + # Patch MathInstaller's shebangs and udev rules dir + patchShebangs MathInstaller substituteInPlace MathInstaller \ - --replace "/bin/bash" "/bin/sh" \ - --replace "Executables/Mathematica" "../../bin/mathematica" + --replace /etc/udev/rules.d $out/lib/udev/rules.d - # Install the desktop items - export XDG_DATA_HOME="$out/share" + # Remove PATH restriction, root and avahi daemon checks, and hostname call + sed -i ' + s/^PATH=/# &/ + s/isRoot="false"/# &/ + s/^checkAvahiDaemon$/# &/ + s/`hostname`/""/ + ' MathInstaller - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent + # NOTE: some files placed under HOME may be useful + XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ + ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Fix library paths - cd $out/libexec/Mathematica/Executables - for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path - done + # Check if MathInstaller produced any errors + errLog="$out/libexec/Mathematica/InstallErrors" + if [ -f "$errLog" ]; then + echo "Installation errors:" + cat "$errLog" + return 1 + fi - # Fix xkeyboard config path for Qt - for path in mathematica Mathematica; do - sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path - done - - # Remove some broken libraries - rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* - - # Set environment variable to fix libQt errors - see https://github.com/NixOS/nixpkgs/issues/96490 - wrapProgram $out/bin/mathematica --set USE_WOLFRAM_LD_LIBRARY_PATH 1 + runHook postInstall ''; preFixup = '' - echo "=== PatchElfing away ===" - # This code should be a bit forgiving of errors, unfortunately - set +e - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf --shrink-rpath "$f" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi + for bin in $out/libexec/Mathematica/Executables/*; do + wrapProgram "$bin" ''${wrapProgramFlags[@]} done ''; + dontConfigure = true; dontBuild = true; - # This is primarily an IO bound build; there's little benefit to building remotely. + # This is primarily an IO bound build; there's little benefit to building remotely preferLocalBuild = true; - # all binaries are already stripped + # All binaries are already stripped dontStrip = true; - # we did this in prefixup already - dontPatchELF = true; + # NOTE: Some deps are still not found; ignore for now + autoPatchelfIgnoreMissingDeps = true; meta = with lib; { description = "Wolfram Mathematica computational software system"; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index 67ab202160..7cbf37fcaf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , cmake @@ -65,5 +66,6 @@ in mkDerivation rec { homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gplates.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix index 4b45a3c06f..4f452c96b8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/graphia/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.bgamari ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 225a81f1f6..9962b1ce60 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -9,6 +9,7 @@ , gl2ps , glew , gsl +, lapack , libX11 , libXpm , libXft @@ -19,6 +20,7 @@ , llvm_9 , lz4 , xz +, openblas , pcre , nlohmann_json , pkg-config @@ -55,11 +57,13 @@ stdenv.mkDerivation rec { pcre zlib zstd + lapack libxml2 llvm_9 lz4 xz gsl + openblas xxHash libAfterImage giflib @@ -153,6 +157,7 @@ stdenv.mkDerivation rec { "-Droot7=OFF" "-Dsqlite=OFF" "-Dssl=OFF" + "-Dtmva=ON" "-Dvdt=OFF" "-Dwebgui=OFF" "-Dxml=ON" diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix index bbbe80eb65..d12f9454ce 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub, gcc, python }: +{ lib, fetchFromGitHub, gcc, python2 }: let xhtml2pdf = import ./xhtml2pdf.nix { inherit lib; - fetchPypi = python.pkgs.fetchPypi; - buildPythonPackage = python.pkgs.buildPythonPackage; - html5lib = python.pkgs.html5lib; - httplib2 = python.pkgs.httplib2; - nose = python.pkgs.nose; - pillow = python.pkgs.pillow; - pypdf2 = python.pkgs.pypdf2; - reportlab = python.pkgs.reportlab; + fetchPypi = python2.pkgs.fetchPypi; + buildPythonPackage = python2.pkgs.buildPythonPackage; + html5lib = python2.pkgs.html5lib; + httplib2 = python2.pkgs.httplib2; + nose = python2.pkgs.nose; + pillow = python2.pkgs.pillow; + pypdf2 = python2.pkgs.pypdf2; + reportlab = python2.pkgs.reportlab; }; in -python.pkgs.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { pname = "sasview"; version = "4.2.0"; - checkInputs = with python.pkgs; [ + checkInputs = with python2.pkgs; [ pytest unittest-xml-reporting ]; @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) py.test ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python2.pkgs; [ bumps gcc h5py diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix index a25fbe7565..b13ad0ad10 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix @@ -1,39 +1,46 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "toil"; - version = "5.4.0"; + version = "5.6.0"; + format = "setuptools"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd"; + sha256 = "sha256-m6tzrRCCLULO+wB8htUlt0KESLm/vdIeTzBrihnAo/I="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "docker = " "docker = 'docker' #" \ - --replace "addict = " "addict = 'addict' #" - ''; - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ addict docker pytz pyyaml enlighten psutil + py-tes python-dateutil dill ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; - pytestFlagsArray = [ "src/toil/test" ]; - pythonImportsCheck = [ "toil" ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/toil/test" + ]; + + pythonImportsCheck = [ + "toil" + ]; meta = with lib; { + description = "Workflow engine written in pure Python"; homepage = "https://toil.ucsc-cgl.org/"; license = with licenses; [ asl20 ]; - description = "Workflow engine written in pure Python"; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix index 62d638717f..1dfd47a3d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 -, cmake, makeWrapper, libjpeg, python }: +, cmake, makeWrapper, libjpeg, python2 }: let version = "5.2.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; }; - buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f30e94f03d..dd4bb6ef14 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2021.4"; + version = "2021.5"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "07ds8abxq0k7vfpjvxb8in3fhb6lz0pbdzbmlidyzaw37qz8lw6b"; + sha256 = "1dh9l2gcv61h1r6qsg8vr3k1xp8jgd27czzg24kzf4k823k3z9pb"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 3331877e1f..5065723995 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.7.1"; + version = "10.7.2"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "sha256-mMjy7Ve7wEmPxkAmux0WahUgJ86ylnWZP4smDZeBs8Q="; + sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix index 6b535e5ad4..653d727525 100644 --- a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix @@ -18,17 +18,20 @@ , sassc , udisks2 , wrapGAppsHook +, libX11 +, libXext +, libXNVCtrl }: stdenv.mkDerivation rec { pname = "monitor"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-xWhhjn7zk/juXx50wLG2TpB5aqU+588kWBBquWrVJbM="; + sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; fetchSubmodules = true; }; @@ -53,8 +56,19 @@ stdenv.mkDerivation rec { libwnck sassc udisks2 + libX11 + libXext + libXNVCtrl ]; + # Force link against Xext, otherwise build fails with: + # ld: /nix/store/...-libXNVCtrl-495.46/lib/libXNVCtrl.a(NVCtrl.o): undefined reference to symbol 'XextAddDisplay' + # ld: /nix/store/...-libXext-1.3.4/lib/libXext.so.6: error adding symbols: DSO missing from command line + # https://github.com/stsdc/monitor/issues/292 + NIX_LDFLAGS = "-lXext"; + + mesonFlags = [ "-Dindicator-wingpanel=enabled" ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix deleted file mode 100644 index 5d5ce5d772..0000000000 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchgit, makeWrapper, pkg-config, - gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, - configH ? "" -}: - -stdenv.mkDerivation { - pname = "evilvte"; - version = "0.5.2-20140827"; - - src = fetchgit { - url = "https://github.com/caleb-/evilvte.git"; - rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; - sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; - }; - - buildInputs = [ - gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkg-config - ]; - - buildPhase = '' - cat >src/config.h <> $out/nix-support/propagated-user-env-packages + + cp -r 'shell-integration' "$shell_integration" + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lilyterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/lilyterm/default.nix deleted file mode 100644 index 9e2d2a67b4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub -, pkg-config -, autoconf, automake, intltool, gettext -, gtk, vte -, flavour ? "stable" -}: - -assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; - -let - pname = "lilyterm"; - stuff = - if flavour == "stable" - then rec { - version = "0.9.9.4"; - src = fetchurl { - url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz"; - sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; - }; - } - else { - version = "2019-07-25"; - src = fetchFromGitHub { - owner = "Tetralet"; - repo = pname; - rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d"; - sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7"; - }; - }; - -in -with lib; -stdenv.mkDerivation rec { - inherit pname; - - inherit (stuff) src version; - - nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ]; - buildInputs = [ gtk vte ]; - - preConfigure = "sh autogen.sh"; - - configureFlags = [ - "--enable-nls" - "--enable-safe-mode" - ]; - - meta = with lib; { - description = "A fast, lightweight terminal emulator"; - longDescription = '' - LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. - ''; - homepage = "https://lilyterm.luna.com.tw/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres Profpatsch ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index b9f7d4ef67..48c4f6f2c4 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "arakiken"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1 - sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; + sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro="; }; nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix index 3a2180ce8d..35baec9d0e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "st"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY="; + hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc="; }; inherit patches; @@ -49,19 +49,17 @@ stdenv.mkDerivation rec { libXft ] ++ extraLibs; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall + preInstall = '' + export TERMINFO=$out/share/terminfo ''; + installFlags = [ "PREFIX=$(out)" ]; + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; maintainers = with maintainers; [ andsild ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix index ac1659cccf..a886f6b332 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix @@ -1,5 +1,5 @@ { lib -, python3Packages +, python3 , fetchFromGitHub , enableGoogle ? false , enableAWS ? false @@ -7,59 +7,88 @@ , enableSSH ? false }: -with python3Packages; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "0.24.3"; + version = "2.9.3"; + format = "setuptools"; - # PyPi only has wheel src = fetchFromGitHub { owner = "iterative"; - repo = "dvc"; + repo = pname; rev = version; - sha256 = "1wqq4i23hppilp20fx5a5nj93xwf3wwwr2f8aasvn6jkv2l22vpl"; + hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ="; }; - propagatedBuildInputs = [ - ply - configparser - zc_lockfile - future + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + setuptools-scm-git-archive + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + aiohttp-retry colorama configobj - networkx - pyyaml - GitPython - setuptools - nanotime - pyasn1 - schema - jsonpath_rw - requests - grandalf - asciimatics + configobj + dictdiffer + diskcache distro - appdirs - ] - ++ lib.optional enableGoogle google-cloud-storage - ++ lib.optional enableAWS boto3 - ++ lib.optional enableAzure azure-storage-blob - ++ lib.optional enableSSH paramiko; - - # tests require access to real cloud services - # nix build tests have to be isolated and run locally - doCheck = false; + dpath + flatten-dict + flufl_lock + funcy + grandalf + nanotime + networkx + pathspec + ply + psutil + pydot + pygtrie + pyparsing + python-benedict + requests + rich + ruamel-yaml + scmrepo + shortuuid + shtab + tabulate + toml + tqdm + typing-extensions + voluptuous + zc_lockfile + ] ++ lib.optional enableGoogle [ + google-cloud-storage + ] ++ lib.optional enableAWS [ + boto3 + ] ++ lib.optional enableAzure [ + azure-storage-blob + ] ++ lib.optional enableSSH [ + paramiko + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; patches = [ ./dvc-daemon.patch ]; postPatch = '' - substituteInPlace dvc/daemon.py --subst-var-by dvc "$out/bin/dcv" + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf>=0.6" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" ''; + # Tests require access to real cloud services + doCheck = false; + meta = with lib; { description = "Version Control System for Machine Learning Projects"; - license = licenses.asl20; homepage = "https://dvc.org"; - maintainers = with maintainers; [ cmcdragonkai ]; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch b/third_party/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch index 5c2d363b17..2263ce118d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch +++ b/third_party/nixpkgs/pkgs/applications/version-management/dvc/dvc-daemon.patch @@ -1,21 +1,18 @@ diff --git a/dvc/daemon.py b/dvc/daemon.py -index 1d67a37..7ce6fde 100644 +index 9854a0e1..fefdd613 100644 --- a/dvc/daemon.py +++ b/dvc/daemon.py -@@ -67,14 +67,8 @@ def daemon(args): - Args: - args (list): list of arguments to append to `dvc daemon` command. - """ -- cmd = [sys.executable] -- if not is_binary(): -- cmd += ['-m', 'dvc'] -- cmd += ['daemon', '-q'] + args +@@ -103,11 +103,8 @@ def daemon(args): + logger.debug("skipping launching a new daemon.") + return + +- cmd = ["daemon", "-q"] + args - - env = fix_env() - file_path = os.path.abspath(inspect.stack()[0][1]) -- env['PYTHONPATH'] = os.path.dirname(os.path.dirname(file_path)) +- env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path)) + cmd = [ "@dvc@" , "daemon", "-q"] + args + env = None + env[DVC_DAEMON] = "1" - logger.debug("Trying to spawn '{}' with env '{}'".format(cmd, env)) - + _spawn(cmd, env) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b0279f004c..7783c28927 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; + sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg="; }; - cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A="; + cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 8dec11dde8..626e3db5ca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.11"; + version = "1.5.12"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WAQ4DwPKkATLa52GE5LZRVY0YH4nRStjPuQg7kdXRjw="; + sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE="; }; - cargoSha256 = "sha256-UK3gUAs+FalqboK7MuhE9kOc/Smu/EAN0BYbgg4PWns="; + cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk="; # tests require it to be in a git repository preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index e43c602d6d..7cfa5765df 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -45,6 +45,6 @@ buildGoPackage { homepage = "https://github.com/rgburke/grv"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix index 006809db62..682f0d97f6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix @@ -1,17 +1,20 @@ -{ lib, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python3 }: -python2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "git-crecord"; - version = "20161216.0"; + version = "20201025.0"; src = fetchFromGitHub { owner = "andrewshadura"; repo = "git-crecord"; rev = version; - sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i"; + sha256 = "1rkdmy2d2vsx22fx97nd9afh0g5lq4pns7rdxyl711apq1bhiihn"; }; - propagatedBuildInputs = with python2Packages; [ docutils ]; + propagatedBuildInputs = with python3.pkgs; [ docutils ]; + + # has no tests + doCheck = false; meta = { homepage = "https://github.com/andrewshadura/git-crecord"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 6d856caecd..1337c18692 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.9"; + version = "1.15.10"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-DzPgAy7Curypc/66c1NqYSHFgtovpY5qEq/Le+0VYk4="; + sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx"; }; unpackPhase = '' @@ -77,6 +77,6 @@ buildGoPackage rec { description = "Git with a cup of tea"; homepage = "https://gitea.io"; license = licenses.mit; - maintainers = with maintainers; [ disassembler kolaente ma27 ]; + maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix deleted file mode 100644 index 63ceb6e386..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitinspector/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "gitinspector"; - version = "0.4.4"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "ejwa"; - repo = "gitinspector"; - rev = "v${version}"; - sha256 = "sha256-9bChvE5aAZFunu599pH7QKHZFd7aQzv0i9LURrvh2t0="; - }; - - checkInputs = with python2Packages; [ - unittest2 - ]; - - meta = with lib; { - homepage = "https://github.com/ejwa/gitinspector"; - description = "Statistical analysis tool for git repositories"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 4a47fdeaf2..121e9b1440 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.6.1", - "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1", + "version": "14.6.2", + "repo_hash": "0n7l1f1w70nqb9ackcmi1yhx69a32zlkxa962v67782nn2vdcbiz", "yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.6.1-ee", + "rev": "v14.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.6.1", + "GITALY_SERVER_VERSION": "14.6.2", "GITLAB_PAGES_VERSION": "1.49.0", "GITLAB_SHELL_VERSION": "13.22.1", - "GITLAB_WORKHORSE_VERSION": "14.6.1" + "GITLAB_WORKHORSE_VERSION": "14.6.2" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 04cfd0e471..8366de49cf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,7 +33,7 @@ let }; }; - version = "14.6.1"; + version = "14.6.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -45,7 +45,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4="; + sha256 = "sha256-a9qFAtQP5QtI+E6V3LBYAMYQbvhgOcn75l+6pSQPZ+0="; }; vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0ac84d8aa0..6977dd81e2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.6.1"; + version = "14.6.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix index 310158e3ee..ed8cd551fc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitless/default.nix @@ -6,10 +6,10 @@ buildPythonApplication rec { version = "0.8.8"; src = fetchFromGitHub { - owner = "sdg-mit"; + owner = "gitless-vcs"; repo = "gitless"; rev = "v${version}"; - sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g"; + sha256 = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; }; propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index ac3beb54f6..858f15a50b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.57"; + version = "1.0.0-beta"; src = fetchCrate { inherit version pname; - sha256 = "sha256-HhGUoO8UHJkfQ5QQ/H+PT8mqvdPb8Ok4D3j7QArLBeA="; + sha256 = "sha256-s7fHg6Le4y0yAyxOQf6iUUHA4dYsamlTUb0KISOHI7Q="; }; - cargoSha256 = "sha256-SyyJqUC7bCUJf53/+GJ/7+huab8hycNABwAFaHHmJtY="; + cargoSha256 = "sha256-09PWy1yfr1FY2AsKaoZZswi4P5JdNcumIOmTm+M21UE="; doCheck = false; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix index 33eba79732..60d011b653 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python ]; + buildInputs = [ wxGTK subversion apr aprutil python2 ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix index cddcd3d8aa..1735449e3f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }: +{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }: stdenv.mkDerivation rec { pname = "src"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python rcs git ]; + buildInputs = [ python2 rcs git ]; preConfigure = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix index 11dbfc299a..60260ee4de 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2, curl }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake antlr2 ]; - buildInputs = [ libxml2 libxslt boost libarchive python curl ]; + buildInputs = [ libxml2 libxslt boost libarchive python2 curl ]; meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index ce64a70237..e7ac4881b5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -81,13 +81,13 @@ }: let - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "sha256-Usz2+U1Wb8yJ5W2HqV0FqBaaE25fuVKk/NwKBHaKzwk="; + sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; }; versionFile = writeText "version.txt" '' diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix new file mode 100644 index 0000000000..bca61e902e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: +buildKodiAddon rec { + pname = "arrow"; + namespace = "script.module.arrow"; + version = "1.0.3.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l"; + }; + + propagatedBuildInputs = [ + dateutil + typing_extensions + ]; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.arrow"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/razzeee/script.module.arrow"; + description = "Better dates & times for Python"; + license = licenses.asl20; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix new file mode 100644 index 0000000000..ad7610e0f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -0,0 +1,31 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: +buildKodiAddon rec { + pname = "trakt-module"; + namespace = "script.module.trakt"; + version = "4.4.0+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8"; + }; + + propagatedBuildInputs = [ + requests + six + arrow + ]; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.trakt-module"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/Razzeee/script.module.trakt"; + description = "Python trakt.py library packed for Kodi"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix new file mode 100644 index 0000000000..f2a662616c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: +buildKodiAddon rec { + pname = "trakt"; + namespace = "script.trakt"; + version = "3.5.0"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v"; + }; + + propagatedBuildInputs = [ + dateutil + trakt-module + ]; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.trakt"; + }; + }; + + meta = with lib; { + homepage = "https://kodi.wiki/view/Add-on:Trakt"; + description = "Trakt.tv movie and TV show scrobbler for Kodi"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix new file mode 100644 index 0000000000..0fddddfb1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -0,0 +1,25 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +buildKodiAddon rec { + pname = "typing_extensions"; + namespace = "script.module.typing_extensions"; + version = "3.7.4.3"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq"; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.typing_extensions"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/python/typing/tree/master/typing_extensions"; + description = "Python typing extensions"; + license = licenses.psfl; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh index 6422a53aa9..b4888365a6 100755 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh @@ -26,7 +26,7 @@ if [ ! -d "$git_dir" ]; then git init --initial-branch="$git_branch" "$git_dir" git -C "$git_dir" remote add origin "$git_url" fi -git -C "$git_dir" fetch --depth=1 origin "$git_branch" +git -C "$git_dir" fetch origin "$git_branch" # use latest commit before today, we should not call the version *today* # because there might still be commits coming diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix index e39805ad62..4845b1b646 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "colima"; - version = "0.2.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vWNkYsT2XF+oMOQ3pb1+/a207js8B+EmVanRQrYE/2A="; + sha256 = "sha256-hZ5BqNHQAMzL69ptpbTT+fN4NdV4AFhboCL2t1sF5AQ="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-VGSwu1WBYfcWjA6BczfMY1s+r9s9aGjlQJjPXgss56s="; + vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc="; postInstall = '' wrapProgram $out/bin/colima \ @@ -35,7 +35,6 @@ buildGoModule rec { description = "Container runtimes on MacOS with minimal setup"; homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; - platforms = platforms.darwin; maintainers = with maintainers; [ aaschmid ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 1e59fa0d6a..2164f16bd3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-hO3gOZ0AaSvymIDvoylHzlHscoN1+G7wDXTCP1c5uIw="; + sha256 = "sha256-j2+ga+jnKnjnFGmrOOym99keLALg7wR7Jk+jjesiMc4="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 21c04da501..35856eae01 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-2wNC3APKbJ3Ug8M3w4nllfWlKTd10W7W/Csq/3xbXAI="; + sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q="; }; - vendorSha256 = "sha256-tBm4yPeH02kie77A8KvylfH/wI2OsLyAlUb1zBJgT0g="; + vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww="; - ldflags = ["-X github.com/docker/compose/v2/internal.Version=${version}"]; + ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; doCheck = false; installPhase = '' @@ -22,7 +22,8 @@ buildGoModule rec { meta = with lib; { description = "Docker CLI plugin to define and run multi-container applications with Docker"; + homepage = "https://github.com/docker/compose"; license = licenses.asl20; - maintainers = [ maintainers.babariviere ]; + maintainers = with maintainers; [ babariviere SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix index d202061346..ad9955cc47 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bO7o3z9E7mGiUtlqI+mhhh+D6CG9j3BZ7IB8o/LDUPM="; + sha256 = "sha256-vOoRwV4BO40cUWNxmWubgbN1q7WPKe2vifg8F1duaVA="; }; - vendorSha256 = "sha256-xIkB1QG/nYPe3CuZP7zVHCCAJeNRqKtFWxEqswyXp5o="; + vendorSha256 = "sha256-118TYmpGUNMZgFKsOzqOy71SabG9tN6IeOkpgwVSXTY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 79a21075f0..0dd3da4b37 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; + sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix index a536a44d45..4018a34b57 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, fetchFromGitHub }: +{ i3lock-color, lib, stdenv, fetchFromGitHub }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -17,5 +17,6 @@ i3lock-color.overrideAttrs (oldAttrs : rec { license = licenses.bsd3; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin }; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index 63a4995311..7f08891385 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix index da23359b64..fd424e3074 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "0ziya8d5pvvxg16jhy4i04pvq11bdvj68gz5q654ar4dldil17nn"; + sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix index 7366ff1969..67097ca151 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation { buildInputs = [ xorgproto libX11 libXft ]; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "https://tools.suckless.org/tabbed"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix index 965ec67b6e..b89d9dafd9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; description = ''A "minimum viable product" Wayland compositor based on wlroots''; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers; license = licenses.cc0; inherit (wlroots.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix index d0c35ab7cb..6759e15ee8 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ libixp_hg txt2tags dash python which + buildInputs = [ libixp_hg txt2tags dash python2 which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help diff --git a/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix index 0a5b17a4a3..49a61f4e5d 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix @@ -224,7 +224,7 @@ let "''${dotnetInstallFlags[@]}" \ "''${dotnetFlags[@]}" done - '' + (lib.optionalString packNupkg '' + '' + lib.optionalString packNupkg '' for project in ''${projectFile[@]}; do dotnet pack "$project" \ -p:ContinuousIntegrationBuild=true \ @@ -235,16 +235,24 @@ let "''${dotnetPackFlags[@]}" \ "''${dotnetFlags[@]}" done - '') + (if executables != null then '' - for executable in $executables; do + '' + '' + runHook postInstall + ''; + + preFixup = '' + _wrapDotnetProgram() { + makeWrapper "$1" "$out/bin/$(basename "$executable")" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + "''${gappsWrapperArgs[@]}" \ + "''${makeWrapperArgs[@]}" + } + '' + (if executables != null then '' + for executable in ''${executables[@]}; do execPath="$out/lib/${args.pname}/$executable" if [[ -f "$execPath" && -x "$execPath" ]]; then - makeWrapper "$execPath" "$out/bin/$(basename "$executable")" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ - "''${gappsWrapperArgs[@]}" \ - "''${makeWrapperArgs[@]}" + _wrapDotnetProgram $execPath else echo "Specified binary \"$executable\" is either not an executable, or does not exist!" exit 1 @@ -253,16 +261,10 @@ let '' else '' for executable in $out/lib/${args.pname}/*; do if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then - makeWrapper "$executable" "$out/bin/$(basename "$executable")" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ - "''${gappsWrapperArgs[@]}" \ - "''${makeWrapperArgs[@]}" + _wrapDotnetProgram $executable fi done - '') + '' - runHook postInstall - ''; + ''); }); in package diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index ae7151c31c..e44519a040 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -71,7 +71,7 @@ let "pki" ]; in concatStringsSep "\n " - (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files); + (map (file: "--ro-bind-try $(${coreutils}/bin/readlink -f /etc/${file}) /etc/${file}") files); # Create this on the fly instead of linking from /nix # The container might have to modify it and re-run ldconfig if there are diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix index 65c8880b13..2e0a29ac12 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -650,7 +650,7 @@ let name = "buildRustCrate-tests"; meta = { description = "Test cases for buildRustCrate"; - maintainers = [ lib.maintainers.andir ]; + maintainers = [ ]; }; constituents = builtins.attrValues tests; }; diff --git a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix index 50d83f2fff..cd65196540 100644 --- a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix +++ b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix @@ -21,9 +21,9 @@ # : lines , postInstall # : list Maintainer -, maintainers ? [] +, maintainers ? [ ] # : passtrhu arguments (e.g. tests) -, passthru ? {} +, passthru ? { } }: @@ -54,7 +54,8 @@ let "CONTRIBUTING" ]; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname version; src = fetchurl { @@ -73,8 +74,8 @@ in stdenv.mkDerivation { # This might not hold for e.g. BSD. "--with-sysdep-devurandom=yes" (if stdenv.isDarwin - then "--disable-shared" - else "--enable-shared") + then "--disable-shared" + else "--enable-shared") ] # On darwin, the target triplet from -dumpmachine includes version number, # but skarnet.org software uses the triplet to test binary compatibility. @@ -82,10 +83,12 @@ in stdenv.mkDerivation { # binary built on a different version of darwin. # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph ++ (lib.optional stdenv.isDarwin - "--build=${stdenv.hostPlatform.system}"); + "--build=${stdenv.hostPlatform.system}"); inherit postConfigure; + makeFlags = lib.optional stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; + # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version index 0ac6b3cf8c..88cf7d459a 100755 --- a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -10,7 +10,8 @@ die() { usage() { echo "Usage: $scriptName [] []" - echo " [--version-key=] [--system=] [--file=] [--rev=]" + echo " [--version-key=] [--source-key=]" + echo " [--system=] [--file=] [--rev=]" echo " [--ignore-same-hash] [--print-changes]" } @@ -25,6 +26,9 @@ for arg in "$@"; do --version-key=*) versionKey="${arg#*=}" ;; + --source-key=*) + sourceKey="${arg#*=}" + ;; --file=*) nixFile="${arg#*=}" if [[ ! -f "$nixFile" ]]; then @@ -79,6 +83,10 @@ if [[ -z "$versionKey" ]]; then versionKey=version fi +if [[ -z "$sourceKey" ]]; then + sourceKey=src +fi + # Allow finding packages among flake outputs in repos using flake-compat. pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo) if [[ -z "$pname" ]]; then @@ -106,7 +114,7 @@ if [[ -z "$nixFile" ]]; then fi # flake-compat will return paths in the Nix store, we need to correct for that. - possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"') + possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" 2>/dev/null | tr -d '"') if [[ -n "$possiblyOutPath" ]]; then outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g') pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g') @@ -114,21 +122,21 @@ if [[ -z "$nixFile" ]]; then fi fi -oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') -oldHash=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"') +oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.$sourceKey.drvAttrs.outputHashAlgo" | tr -d '"') +oldHash=$(nix-instantiate $systemArg --eval --strict -A "$attr.$sourceKey.drvAttrs.outputHash" | tr -d '"') if [[ -z "$oldHashAlgo" || -z "$oldHash" ]]; then - die "Couldn't evaluate old source hash from '$attr.src'!" + die "Couldn't evaluate old source hash from '$attr.$sourceKey'!" fi if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"') if [[ -z "$oldUrl" ]]; then - die "Couldn't evaluate source url from '$attr.src'!" + die "Couldn't evaluate source url from '$attr.$sourceKey'!" fi oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') @@ -146,9 +154,9 @@ if [[ "$oldVersion" = "$newVersion" ]]; then fi if [[ -n "$newRevision" ]]; then - oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"') + oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.$sourceKey.rev" | tr -d '"') if [[ -z "$oldRevision" ]]; then - die "Couldn't evaluate source revision from '$attr.src'!" + die "Couldn't evaluate source revision from '$attr.$sourceKey'!" fi fi @@ -228,7 +236,7 @@ fi # If new hash not given on the command line, recalculate it ourselves. if [[ -z "$newHash" ]]; then - nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true + nix-build $systemArg --no-out-link -A "$attr.$sourceKey" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed newHash=$(sed '1,/hash mismatch in fixed-output derivation/d' "$attr.fetchlog" | grep --perl-regexp --only-matching 'got: +.+[:-]\K.+') @@ -242,12 +250,12 @@ fi if [[ -z "$newHash" ]]; then cat "$attr.fetchlog" >&2 - die "Couldn't figure out new hash of '$attr.src'!" + die "Couldn't figure out new hash of '$attr.$sourceKey'!" fi if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "$newHash" ]]; then mv "$nixFile.bak" "$nixFile" - die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" + die "Both the old and new source hashes of '$attr.$sourceKey' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index d6b4488daf..11f911aeb4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , fetchurl -, fetchzip , cairo , python3 , pkg-config @@ -61,6 +60,42 @@ let maintainers = with maintainers; [ mathnerd314 emily ]; }; }; + + mkNotoCJK = { typeface, version, rev, sha256 }: + stdenvNoCC.mkDerivation { + pname = "noto-fonts-cjk-${lib.toLower typeface}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-cjk"; + inherit rev sha256; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc + ''; + + meta = with lib; { + description = "Beautiful and free fonts for CJK languages"; + homepage = "https://www.google.com/get/noto/help/cjk/"; + longDescription = '' + Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as + an intermediate style between the modern and traditional. It is + intended to be a multi-purpose digital font for user interface + designs, digital content, reading on laptops, mobile devices, and + electronic books. Noto ${typeface} CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a + unified font family. It supports regional variants of ideographic + characters for each of the four languages. In addition, it supports + Japanese kana, vertical forms, and variant characters (itaiji); it + supports Korean hangeul — both contemporary and archaic. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 emily ]; + }; + }; in { @@ -74,39 +109,18 @@ in weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; }; - noto-fonts-cjk = let zip = fetchzip { - url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in - "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip"; - # __MACOSX... - stripRoot = false; - sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi"; - }; in stdenvNoCC.mkDerivation { - pname = "noto-fonts-cjk"; - version = "2.001"; + noto-fonts-cjk-sans = mkNotoCJK { + typeface = "Sans"; + version = "2.004"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + }; - buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc - ''; - - meta = with lib; { - description = "Beautiful and free fonts for CJK languages"; - homepage = "https://www.google.com/get/noto/help/cjk/"; - longDescription = - '' - Noto Sans CJK is a sans serif typeface designed as an intermediate style - between the modern and traditional. It is intended to be a multi-purpose - digital font for user interface designs, digital content, reading on laptops, - mobile devices, and electronic books. Noto Sans CJK comprehensively covers - Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font - family. It supports regional variants of ideographic characters for each of the - four languages. In addition, it supports Japanese kana, vertical forms, and - variant characters (itaiji); it supports Korean hangeul — both contemporary and - archaic. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily ]; - }; + noto-fonts-cjk-serif = mkNotoCJK { + typeface = "Serif"; + version = "2.000"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; }; noto-fonts-emoji = let diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 3d87e9577d..f6ac136d4a 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1c317ac43ff70sxn1syx20qhs4nkccv6hbf69fmi3acswqsll1z4"; + sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix new file mode 100644 index 0000000000..3ed389569b --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, allColorVariants ? false +, circularFolder ? false +, colorVariants ? [] # default is standard +}: + +let + pname = "tela-circle-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2021-12-24"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495"; + sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki"; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may installs almost 400 000 small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + ./install.sh -d $out/share/icons \ + ${lib.optionalString circularFolder "-c"} \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} + + jdupes -L -r $out/share/icons + + runHook postInstall + ''; + + meta = with lib; { + description = "Flat and colorful personality icon theme"; + homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix b/third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix index 6debaa9ebe..417bd7392b 100644 --- a/third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/adapta-backgrounds/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ meson ninja pkg-config glib ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ glib ]; meta = with lib; { description = "Wallpaper collection for adapta-project"; diff --git a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix index 49645ee800..b6d8a4b6b6 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -26,7 +26,7 @@ let homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ andir fpletz lukegb ]; + maintainers = with maintainers; [ fpletz lukegb ]; license = licenses.mpl20; }; certdata = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 22308a5cf0..489570b082 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "52e5aa39956d0d5a8158320897630fed86ec2ed3", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz", - "sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz", - "msg": "Update from Hackage at 2022-01-05T00:50:25Z" + "commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz", + "sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27", + "msg": "Update from Hackage at 2022-01-14T12:47:41Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 218ae3d80d..89e12785b7 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20211228022859"; + version = "20220114024213"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-wDz4msCaX6BPzxrg5GeZSrMuxsCx8uimhaHghWdDp8s="; + sha256 = "sha256-sF9WvXhyfMUvSXmFjkfGq4cZE/MiAnOKbkpv2CHSV3Q="; }; vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 23ebf57b39..444d595858 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202201060033"; + version = "202201130034"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "57f0e64ece0582314958c027198b8e50daa353d2"; - sha256 = "sha256-RG7sLp9u8k1U5XVFcwAF57UcvwhF3pFKCFLLJ2x7q00="; + rev = "68254f88c97e6ac1ec587bcf6491902ccf29a447"; + sha256 = "sha256-fpwJpXampcHiP68ABcEW5HawPuLwbcmNOY0aiFSzwcs="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix b/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix deleted file mode 100644 index a2d6568b9a..0000000000 --- a/third_party/nixpkgs/pkgs/data/themes/cdetheme/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: - -stdenv.mkDerivation rec { - pname = "cdetheme"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "josvanr"; - repo = "cde-motif-theme"; - rev = version; - sha256 = "1v5c4db69cmzdci8xxlkx3s3cifg1h5160qq5siwfps0sj7pvggj"; - }; - - dontBuild = true; - - pythonPath = with python2Packages; [ pyqt4 pillow pyxdg pyyaml ]; - nativeBuildInputs = with python2Packages; [ python wrapPython ]; - - installPhase = '' - mkdir -p $out/share/themes - cp -r cdetheme $out/share/themes - patchShebangs $out/share/themes/cdetheme/scripts/switchtheme - wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $pythonPath" - ''; - - meta = with lib; { - description = "Gtk2 / Gtk3 theme mimicking CDE / Motif"; - homepage = "https://www.gnome-look.org/p/1231025"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - hydraPlatforms = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix index 42d4c5c753..7f3ee33c03 100644 --- a/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix @@ -15,28 +15,21 @@ let pname = "graphite-gtk-theme"; - throwIfNotSubList = name: given: valid: - let - unexpected = lib.subtractLists valid given; - in - lib.throwIfNot (unexpected == []) - "${name}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}"; - in -throwIfNotSubList "${pname}: theme variants" themeVariants [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] -throwIfNotSubList "${pname}: color variants" colorVariants [ "standard" "light" "dark" ] -throwIfNotSubList "${pname}: size variants" sizeVariants [ "standard" "compact" ] -throwIfNotSubList "${pname}: tweaks" tweaks [ "nord" "black" "midblack" "rimless" "normal" ] +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-01-04"; + version = "unstable-2022-01-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "947cac4966377d8f5b5a4e2966ec2b9a6041d205"; - sha256 = "11pl8hzk4fwniqdib0ffvjilpspr1n5pg1gw39kal13wxh4sdg28"; + rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec"; + sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/lightly-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/lightly-qt/default.nix new file mode 100644 index 0000000000..7b653d9524 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/lightly-qt/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kdecoration +, plasma-workspace +, qtbase +, qt5 +}: + +mkDerivation rec { + pname = "lightly-qt"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "Luwx"; + repo = "Lightly"; + rev = "v${version}"; + sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"; + }; + + buildInputs = [ + kdecoration + plasma-workspace + qtbase + qt5.qtx11extras + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; + homepage = "https://github.com/Luwx/Lightly"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pwoelfel ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix b/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix index bf2014344a..56d7dfcf37 100644 --- a/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -10,24 +10,42 @@ , optipng , sassc , which +, buttonSizeVariants ? [] # default to standard +, buttonVariants ? [] # default to all +, colorVariants ? [] # default to all +, opacityVariants ? [] # default to all +, themeVariants ? [] # default to MacOS blue +, wallpapers ? false }: -stdenv.mkDerivation rec { +let pname = "mojave-gtk-theme"; - version = "2021-07-20"; +in +lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants +lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants + +stdenv.mkDerivation rec { + inherit pname; + version = "unstable-2021-12-20"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "08j70kmjhvh06c3ahcracarrfq4vpy0zsp6zkcivbw4nf3bzp2zc"; + rev = "c148646ccab382f7a2d5fdc421fc32d843cb4172"; + sha256 = "sha256-h4MSSh8cu9M81bM+WJSyl1SQ7CVth1DvjIVOUJXqpxs"; }) + ] + ++ + lib.optional wallpapers (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; sha256 = "18zzkwm1kqzsdaj8swf0xby1n65gxnyslpw4lnxcx1rphip0rwf7"; }) - ]; + ; sourceRoot = "source"; @@ -76,9 +94,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - name= ./install.sh --theme all --dest $out/share/themes - install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* - jdupes -l -r $out/share + + name= ./install.sh \ + ${lib.optionalString (buttonSizeVariants != []) "--small " + builtins.toString buttonSizeVariants} \ + ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + --dest $out/share/themes + + ${lib.optionalString wallpapers '' + install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* + ''} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 53% + jdupes -L -r $out/share + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix index 8d41ce5e38..a2a518d3f0 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -1,77 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gtk-engine-murrine +, jdupes +}: stdenv.mkDerivation rec { pname = "nordic"; - version = "2.1.0"; + version = "unstable-2022-01-08"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "0112af91943b8819f7a1af9a508cda7fe3d74051"; - sha256 = "sha256-ccOA5/jXTx20495NpTgVu7DvsjfTEULqL3IyJ+Pd/ug"; + rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86"; + sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b30d2c844cc6ef5d020308f1c02791de45b607a7"; - sha256 = "sha256-g5yCCFXzipZLmUat+1r6QWHB7DWQvMKhMexHPV/DJHM"; + rev = "46c9e6665963ccb54938d7730e520bd8c52f4307"; + sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "6d38d6af363528f42619f663e3ecd4c08dfd2411"; - sha256 = "sha256-jaRiSE6yfTltzZ2vr8w4d+YtSz7REOcL7vOOhQvIMlQ"; + rev = "da5c930386427fce65ea185f164709c8a20e362f"; + sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "4142817c14c27b371d42796445bedc84dc94672c"; - sha256 = "sha256-FAb1+EREcwYrfSxAl6LrPaJtkHMt67NV3bG87g1cFT4"; + rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7"; + sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2a91d6f3db70412b0a80ed33546fbe93075627d8"; - sha256 = "sha256-Su+amS7moc2IDONNvqw3bjL6Q0WLJWzHu6WvfcVDcDY"; + rev = "259e30ce13566214c7594b038dd2c240648a07a0"; + sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3ebd334f97d638fdc888b16d69851e3ee31131f2"; - sha256 = "sha256-h0IXtWcdDvAEVi/1cLZF4Vacdl6VAY+5uo0LGPNe0bg"; + rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30"; + sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "803926882f8178c72b433466a377aaa33c5b372a"; - sha256 = "sha256-G7Vu03PoFOEU9uxb5JiHR4Tr8qk47fPo7Gg7Vt9Zzns"; + rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f"; + sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "988cb8a16ece3901b8b0e7a5b86503400491cb1e"; - sha256 = "sha256-Zx1mrzJm5o4wQwOR8ZU2OEcjD3/6UXwLrBYpMtCkQbg"; + rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06"; + sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU="; name = "Nordic-Polar-standard-buttons"; }) ]; sourceRoot = "."; + nativeBuildInputs = [ jdupes ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' @@ -101,6 +108,10 @@ stdenv.mkDerivation rec { mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ rm -rf $out/share/themes/Nordic/kde + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 65% + jdupes -L -r $out/share + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/themes/sierra/default.nix b/third_party/nixpkgs/pkgs/data/themes/sierra/default.nix index d3fbb5fe78..e87f646614 100644 --- a/third_party/nixpkgs/pkgs/data/themes/sierra/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/sierra/default.nix @@ -1,26 +1,67 @@ -{ lib, stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, jdupes +, librsvg +, libxml2 +, buttonVariants ? [] # default to all +, colorVariants ? [] # default to all +, opacityVariants ? [] # default to all +, sizeVariants ? [] # default to all +}: -stdenv.mkDerivation rec { +let pname = "sierra-gtk-theme"; - version = "2019-12-16"; +in +lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants + +stdenv.mkDerivation { + inherit pname; + version = "unstable-2021-05-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "14hlz8kbrjypyd6wyrwmnj2wm9w3kc8y00ms35ard7x8lmhs56hr"; + rev = "05899001c4fc2fec87c4d222cb3997c414e0affd"; + sha256 = "174l5mryc34ma1r42pk6572c6i9hmzr9vj1a6w06nqz5qcfm1hds"; }; - nativeBuildInputs = [ libxml2 ]; + nativeBuildInputs = [ + jdupes + libxml2 + ]; - buildInputs = [ gdk-pixbuf librsvg ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' - patchShebangs . + runHook preInstall + + patchShebangs install.sh + mkdir -p $out/share/themes - name= ./install.sh --dest $out/share/themes + name= ./install.sh --dest $out/share/themes \ + ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \ + ${lib.optionalString (sizeVariants != []) "--flat " + builtins.toString sizeVariants} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 79% + jdupes -L -r $out/share + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index 9a0e054fd8..47e4375844 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.0"; + version = "5.2.3"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ehcqRlI1d/KWNas36dz+hb7KU1H8wtQHTpg2fz1XdXU="; + sha256 = "sha256-kPxwWciNf4KQx3JG1qPQcZJeOa4B+udMyQmH8A7JcfQ="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix index 5ef6026f2f..90d6fd0b7a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix @@ -62,8 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; - vte = callPackage ./desktop/vte { }; - #### BINDINGS libglademm = callPackage ./bindings/libglademm { }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/alt.patch b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/alt.patch deleted file mode 100644 index 65c3ddf1fc..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/alt.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 12 May 2012 18:48:05 +0200 -Subject: [PATCH] keymap: Treat ALT as META - -https://bugzilla.gnome.org/show_bug.cgi?id=663779 ---- - src/vte.c | 23 ++++++++++++++--------- - 1 files changed, 14 insertions(+), 9 deletions(-) - -diff --git a/src/vte.c b/src/vte.c -index dd27e9a..0657921 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -5170,19 +5170,24 @@ static void - vte_terminal_read_modifiers (VteTerminal *terminal, - GdkEvent *event) - { -+ GdkKeymap *keymap; - GdkModifierType modifiers; - - /* Read the modifiers. */ -- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) { -- GdkKeymap *keymap; --#if GTK_CHECK_VERSION (2, 90, 8) -- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); --#else -- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window)); -+ if (!gdk_event_get_state((GdkEvent*)event, &modifiers)) -+ return; -+ -+ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); -+ -+ gdk_keymap_add_virtual_modifiers (keymap, &modifiers); -+ -+#if 1 -+ /* HACK! Treat ALT as META; see bug #663779. */ -+ if (modifiers & GDK_MOD1_MASK) -+ modifiers |= VTE_META_MASK; - #endif -- gdk_keymap_add_virtual_modifiers (keymap, &modifiers); -- terminal->pvt->modifiers = modifiers; -- } -+ -+ terminal->pvt->modifiers = modifiers; - } - - /* Read and handle a keypress event. */ --- -1.7.5.1.217.g4e3aa.dirty \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch deleted file mode 100644 index 9e3e83b126..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: vte-0.26.0/src/vte.c -=================================================================== ---- vte-0.26.0.orig/src/vte.c 2010-11-30 23:04:53.000000000 -0800 -+++ vte-0.26.0/src/vte.c 2010-12-07 20:05:07.865548000 -0800 -@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina - long wcount, start, delta; - gboolean leftovers, modified, bottom, again; - gboolean invalidated_text; -+ gboolean in_scroll_region; - GArray *unichars; - struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; - -@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina - cursor = screen->cursor_current; - cursor_visible = terminal->pvt->cursor_visible; - -+ in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ - /* We should only be called when there's data to process. */ - g_assert(terminal->pvt->incoming || - (terminal->pvt->pending->len > 0)); -@@ -3979,6 +3984,8 @@ skip_chunk: - * points to the first character which isn't part of this - * sequence. */ - if ((match != NULL) && (match[0] != '\0')) { -+ gboolean new_in_scroll_region; -+ - /* Call the right sequence handler for the requested - * behavior. */ - _vte_terminal_handle_sequence(terminal, -@@ -3989,12 +3996,20 @@ skip_chunk: - start = (next - wbuf); - modified = TRUE; - -- /* if we have moved during the sequence handler, restart the bbox */ -+ new_in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ -+ delta = screen->scroll_delta; /* delta may have changed from sequence. */ -+ -+ /* if we have moved greatly during the sequence handler, or moved into a scroll_region -+ * from outside it, restart the bbox */ - if (invalidated_text && -- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { -+ ((new_in_scroll_region && !in_scroll_region) || -+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { - /* Clip off any part of the box which isn't already on-screen. */ - bbox_topleft.x = MAX(bbox_topleft.x, 0); - bbox_topleft.y = MAX(bbox_topleft.y, delta); -@@ -4014,6 +4029,8 @@ skip_chunk: - bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; - bbox_topleft.x = bbox_topleft.y = G_MAXINT; - } -+ -+ in_scroll_region = new_in_scroll_region; - } else - /* Second, we have a NULL match, and next points to the very - * next character in the buffer. Insert the character which diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix deleted file mode 100644 index 6ce8df2daf..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses -, pythonSupport ? false, python27Packages}: - -let - inherit (python27Packages) python pygtk; -in stdenv.mkDerivation rec { - name = "vte-0.28.2"; - - src = fetchurl { - url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2"; - sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d"; - }; - - patches = [ - ./alt.patch - ./change-scroll-region.patch - # CVE-2012-2738 - # fixed in upstream version 0.32.2 - (fetchpatch{ - name = "CVE-2012-2738-1.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch"; - sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; - }) - (fetchpatch{ - name = "CVE-2012-2738-2.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch"; - sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool glib gtk2 ncurses ] ++ - lib.optionals pythonSupport [python pygtk]; - - configureFlags = [ - (lib.enableFeature pythonSupport "python") - ]; - - postInstall = lib.optionalString pythonSupport '' - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - ''; - - meta = { - homepage = "https://www.gnome.org/"; - description = "A library implementing a terminal emulator widget for GTK"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = lib.licenses.lgpl2; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 9447a381a3..580d0a8cc8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { rev = "master"; sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk="; }; - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool enchant isocodes autoreconfHook ]; - - patchFlags = [ "-p0" ]; patches = [ # Enables enchant2 support. @@ -24,7 +19,12 @@ stdenv.mkDerivation rec { (fetchpatch { name ="enchant-2.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; - sha256 = "sha256-jkA/GgIiJZmxkbcBGQ26OZ1nuI502BMPwbPhsZkbgbY="; + sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; + extraPrefix = ""; }) ]; + + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ intltool enchant isocodes autoreconfHook ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index c4eaeea9b3..11308bfcf5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.2"; + version = "3.42.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HBTYbnoNjm5PGpYTfjGmGdK8+/yArR8OrDje4sAkerw="; + sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; }; patches = [ @@ -38,7 +38,15 @@ stdenv.mkDerivation rec { libcanberra-gtk3 pcre libphonenumber boost protobuf ]; - propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; + propagatedBuildInputs = [ + db + libsecret + nss + nspr + libical + libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs + libsoup + ]; cmakeFlags = [ "-DENABLE_UOA=OFF" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 919bb5206c..1c16c3dd35 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { evolution-data-server gsettings-desktop-schemas folks - libgdata # required by some dependency transitively gnome-desktop libhandy libxml2 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix index a3f0107c28..2b36373e2b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix @@ -280,89 +280,128 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-autoar = callPackage ./misc/gnome-autoar { }; gnome-packagekit = callPackage ./misc/gnome-packagekit { }; -} // lib.optionalAttrs (config.allowAliases or true) { -#### Legacy aliases +}) // lib.optionalAttrs (config.allowAliases or true) { +#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - bijiben = gnome-notes; # added 2018-09-26 - evolution_data_server = evolution-data-server; # added 2018-02-25 - geocode_glib = pkgs.geocode-glib; # added 2018-02-25 - glib_networking = pkgs.glib-networking; # added 2018-02-25 - gnome_common = gnome-common; # added 2018-02-25 - gnome_control_center = gnome-control-center; # added 2018-02-25 - gnome_desktop = gnome-desktop; # added 2018-02-25 - gnome_keyring = gnome-keyring; # added 2018-02-25 - gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 - gnome_session = gnome-session; # added 2018-02-25 - gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 - gnome_shell = gnome-shell; # added 2018-02-25 - gnome_terminal = gnome-terminal; # added 2018-02-25 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 - gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 - gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - libgames-support = libgnome-games-support; # added 2018-03-14 - libgnome_keyring = libgnome-keyring; # added 2018-02-25 - inherit (pkgs) rarian; # added 2018-04-25 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - yelp_xsl = yelp-xsl; # added 2018-02-25 - yelp_tools = yelp-tools; # added 2018-02-25 + bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 + evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25 + geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25 + glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25 + gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25 + gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25 + gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-desktop’ directly."; # added 2018-02-25 + gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25 + gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25 + gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25 + gnome_settings_daemon = throw "The ‘gnome.gnome_settings_daemon’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-settings-daemon’ directly."; # added 2018-02-25 + gnome_shell = throw "The ‘gnome.gnome_shell’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-shell’ directly."; # added 2018-02-25 + gnome_terminal = throw "The ‘gnome.gnome_terminal’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-terminal’ directly."; # added 2018-02-25 + gnome-themes-standard = throw "The ‘gnome.gnome-themes-standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-extra’ directly."; # added 2018-03-14 + gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25 + gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21 + gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25 + libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14 + libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25 + rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25 + networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25 + networkmanager_iodine = throw "The ‘gnome.networkmanager_iodine’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-iodine’ directly."; # added 2018-02-25 + networkmanager_l2tp = throw "The ‘gnome.networkmanager_l2tp’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-l2tp’ directly."; # added 2018-02-25 + networkmanager_openconnect = throw "The ‘gnome.networkmanager_openconnect’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-openconnect’ directly."; # added 2018-02-25 + networkmanager_openvpn = throw "The ‘gnome.networkmanager_openvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-openvpn’ directly."; # added 2018-02-25 + networkmanager_vpnc = throw "The ‘gnome.networkmanager_vpnc’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-vpnc’ directly."; # added 2018-02-25 + yelp_xsl = throw "The ‘gnome.yelp_xsl’ alias was removed on 2022-01-13. Please use ‘gnome.yelp-xsl’ directly."; # added 2018-02-25 + yelp_tools = throw "The ‘gnome.yelp_tools’ alias was removed on 2022-01-13. Please use ‘gnome.yelp-tools’ directly."; # added 2018-02-25 - # added 2019-02-08 - inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4 - easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; - inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 - inherit (pkgs) gnome-video-effects; # added 2019-08-19 - inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 - inherit (pkgs) glib-networking; # added 2019-09-02 - inherit (pkgs) nemiver; # added 2019-09-09 + atk = throw "The ‘gnome.atk’ alias was removed on 2022-01-13. Please use ‘pkgs.atk’ directly."; # added 2019-02-08 + glib = throw "The ‘gnome.glib’ alias was removed on 2022-01-13. Please use ‘pkgs.glib’ directly."; # added 2019-02-08 + gobject-introspection = throw "The ‘gnome.gobject-introspection’ alias was removed on 2022-01-13. Please use ‘pkgs.gobject-introspection’ directly."; # added 2019-02-08 + gspell = throw "The ‘gnome.gspell’ alias was removed on 2022-01-13. Please use ‘pkgs.gspell’ directly."; # added 2019-02-08 + webkitgtk = throw "The ‘gnome.webkitgtk’ alias was removed on 2022-01-13. Please use ‘pkgs.webkitgtk’ directly."; # added 2019-02-08 + gtk3 = throw "The ‘gnome.gtk3’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk3’ directly."; # added 2019-02-08 + gtkmm3 = throw "The ‘gnome.gtkmm3’ alias was removed on 2022-01-13. Please use ‘pkgs.gtkmm3’ directly."; # added 2019-02-08 + libgtop = throw "The ‘gnome.libgtop’ alias was removed on 2022-01-13. Please use ‘pkgs.libgtop’ directly."; # added 2019-02-08 + libgudev = throw "The ‘gnome.libgudev’ alias was removed on 2022-01-13. Please use ‘pkgs.libgudev’ directly."; # added 2019-02-08 + libhttpseverywhere = throw "The ‘gnome.libhttpseverywhere’ alias was removed on 2022-01-13. Please use ‘pkgs.libhttpseverywhere’ directly."; # added 2019-02-08 + librsvg = throw "The ‘gnome.librsvg’ alias was removed on 2022-01-13. Please use ‘pkgs.librsvg’ directly."; # added 2019-02-08 + libsecret = throw "The ‘gnome.libsecret’ alias was removed on 2022-01-13. Please use ‘pkgs.libsecret’ directly."; # added 2019-02-08 + gdk-pixbuf = throw "The ‘gnome.gdk-pixbuf’ alias was removed on 2022-01-13. Please use ‘pkgs.gdk-pixbuf’ directly."; # added 2019-02-08 + gtksourceview = throw "The ‘gnome.gtksourceview’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceview’ directly."; # added 2019-02-08 + gtksourceviewmm = throw "The ‘gnome.gtksourceviewmm’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceviewmm’ directly."; # added 2019-02-08 + gtksourceview4 = throw "The ‘gnome.gtksourceview4’ alias was removed on 2022-01-13. Please use ‘pkgs.gtksourceview4’ directly."; # added 2019-02-08 + easytag = throw "The ‘gnome.easytag’ alias was removed on 2022-01-13. Please use ‘pkgs.easytag’ directly."; # added 2019-02-08 + meld = throw "The ‘gnome.meld’ alias was removed on 2022-01-13. Please use ‘pkgs.meld’ directly."; # added 2019-02-08 + orca = throw "The ‘gnome.orca’ alias was removed on 2022-01-13. Please use ‘pkgs.orca’ directly."; # added 2019-02-08 + rhythmbox = throw "The ‘gnome.rhythmbox’ alias was removed on 2022-01-13. Please use ‘pkgs.rhythmbox’ directly."; # added 2019-02-08 + shotwell = throw "The ‘gnome.shotwell’ alias was removed on 2022-01-13. Please use ‘pkgs.shotwell’ directly."; # added 2019-02-08 + gnome-usage = throw "The ‘gnome.gnome-usage’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-usage’ directly."; # added 2019-02-08 + clutter = throw "The ‘gnome.clutter’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter’ directly."; # added 2019-02-08 + clutter-gst = throw "The ‘gnome.clutter-gst’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter-gst’ directly."; # added 2019-02-08 + clutter-gtk = throw "The ‘gnome.clutter-gtk’ alias was removed on 2022-01-13. Please use ‘pkgs.clutter-gtk’ directly."; # added 2019-02-08 + cogl = throw "The ‘gnome.cogl’ alias was removed on 2022-01-13. Please use ‘pkgs.cogl’ directly."; # added 2019-02-08 + gtk-vnc = throw "The ‘gnome.gtk-vnc’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk-vnc’ directly."; # added 2019-02-08 + libdazzle = throw "The ‘gnome.libdazzle’ alias was removed on 2022-01-13. Please use ‘pkgs.libdazzle’ directly."; # added 2019-02-08 + libgda = throw "The ‘gnome.libgda’ alias was removed on 2022-01-13. Please use ‘pkgs.libgda’ directly."; # added 2019-02-08 + libgit2-glib = throw "The ‘gnome.libgit2-glib’ alias was removed on 2022-01-13. Please use ‘pkgs.libgit2-glib’ directly."; # added 2019-02-08 + libgxps = throw "The ‘gnome.libgxps’ alias was removed on 2022-01-13. Please use ‘pkgs.libgxps’ directly."; # added 2019-02-08 + libgdata = throw "The ‘gnome.libgdata’ alias was removed on 2022-01-13. Please use ‘pkgs.libgdata’ directly."; # added 2019-02-08 + libgepub = throw "The ‘gnome.libgepub’ alias was removed on 2022-01-13. Please use ‘pkgs.libgepub’ directly."; # added 2019-02-08 + libpeas = throw "The ‘gnome.libpeas’ alias was removed on 2022-01-13. Please use ‘pkgs.libpeas’ directly."; # added 2019-02-08 + libgee = throw "The ‘gnome.libgee’ alias was removed on 2022-01-13. Please use ‘pkgs.libgee’ directly."; # added 2019-02-08 + geocode-glib = throw "The ‘gnome.geocode-glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2019-02-08 + libgweather = throw "The ‘gnome.libgweather’ alias was removed on 2022-01-13. Please use ‘pkgs.libgweather’ directly."; # added 2019-02-08 + librest = throw "The ‘gnome.librest’ alias was removed on 2022-01-13. Please use ‘pkgs.librest’ directly."; # added 2019-02-08 + libzapojit = throw "The ‘gnome.libzapojit’ alias was removed on 2022-01-13. Please use ‘pkgs.libzapojit’ directly."; # added 2019-02-08 + libmediaart = throw "The ‘gnome.libmediaart’ alias was removed on 2022-01-13. Please use ‘pkgs.libmediaart’ directly."; # added 2019-02-08 + gfbgraph = throw "The ‘gnome.gfbgraph’ alias was removed on 2022-01-13. Please use ‘pkgs.gfbgraph’ directly."; # added 2019-02-08 + gexiv2 = throw "The ‘gnome.gexiv2’ alias was removed on 2022-01-13. Please use ‘pkgs.gexiv2’ directly."; # added 2019-02-08 + folks = throw "The ‘gnome.folks’ alias was removed on 2022-01-13. Please use ‘pkgs.folks’ directly."; # added 2019-02-08 + totem-pl-parser = throw "The ‘gnome.totem-pl-parser’ alias was removed on 2022-01-13. Please use ‘pkgs.totem-pl-parser’ directly."; # added 2019-02-08 + gcr = throw "The ‘gnome.gcr’ alias was removed on 2022-01-13. Please use ‘pkgs.gcr’ directly."; # added 2019-02-08 + gsound = throw "The ‘gnome.gsound’ alias was removed on 2022-01-13. Please use ‘pkgs.gsound’ directly."; # added 2019-02-08 + libgnomekbd = throw "The ‘gnome.libgnomekbd’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnomekbd’ directly."; # added 2019-02-08 + vte = throw "The ‘gnome.vte’ alias was removed on 2022-01-13. Please use ‘pkgs.vte’ directly."; # added 2019-02-08 + vte_290 = throw "The ‘gnome.vte_290’ alias was removed on 2022-01-13. Please use ‘pkgs.vte_290’ directly."; # added 2019-02-08 + gnome-menus = throw "The ‘gnome.gnome-menus’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-menus’ directly."; # added 2019-02-08 + gdl = throw "The ‘gnome.gdl’ alias was removed on 2022-01-13. Please use ‘pkgs.gdl’ directly."; # added 2019-02-08 - defaultIconTheme = adwaita-icon-theme; - gtk = gtk3; - gtkmm = gtkmm3; - rest = librest; - pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 + gsettings-desktop-schemas = throw "The ‘gnome.gsettings-desktop-schemas’ alias was removed on 2022-01-13. Please use ‘pkgs.gsettings-desktop-schemas’ directly."; # added 2019-04-16 + gnome-video-effects = throw "The ‘gnome.gnome-video-effects’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-video-effects’ directly."; # added 2019-08-19 + gnome-online-accounts = throw "The ‘gnome.gnome-online-accounts’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-online-accounts’ directly."; # added 2019-08-23 + grilo = throw "The ‘gnome.grilo’ alias was removed on 2022-01-13. Please use ‘pkgs.grilo’ directly."; # added 2019-08-23 + grilo-plugins = throw "The ‘gnome.grilo-plugins’ alias was removed on 2022-01-13. Please use ‘pkgs.grilo-plugins’ directly."; # added 2019-08-23 + tracker = throw "The ‘gnome.tracker’ alias was removed on 2022-01-13. Please use ‘pkgs.tracker’ directly."; # added 2019-08-23 + tracker-miners = throw "The ‘gnome.tracker-miners’ alias was removed on 2022-01-13. Please use ‘pkgs.tracker-miners’ directly."; # added 2019-08-23 + gnome-photos = throw "The ‘gnome.gnome-photos’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-photos’ directly."; # added 2019-08-23 + glib-networking = throw "The ‘gnome.glib-networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2019-09-02 + nemiver = throw "The ‘gnome.nemiver’ alias was removed on 2022-01-13. Please use ‘pkgs.nemiver’ directly."; # added 2019-09-09 - # added 2019-08-25 - corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`"; - optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`"; - gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`"; + defaultIconTheme = throw "The ‘gnome.defaultIconTheme’ alias was removed on 2022-01-13. Please use ‘gnome.adwaita-icon-theme’ directly."; # added 2019-02-08 + gtk = throw "The ‘gnome.gtk’ alias was removed on 2022-01-13. Please use ‘pkgs.gtk3’ directly."; # added 2019-02-08 + gtkmm = throw "The ‘gnome.gtkmm’ alias was removed on 2022-01-13. Please use ‘pkgs.gtkmm3’ directly."; # added 2019-02-08 + rest = throw "The ‘gnome.rest’ alias was removed on 2022-01-13. Please use ‘pkgs.librest’ directly."; # added 2019-02-08 - nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; + pidgin-im-gnome-shell-extension = throw "The ‘gnome.pidgin-im-gnome-shell-extension’ alias was removed on 2022-01-13. Please use ‘pkgs.gnomeExtensions.pidgin-im-integration’ directly."; # added 2019-08-01 - inherit (pkgs) vala; # added 2019-10-10 + vala = throw "The ‘gnome.vala’ alias was removed on 2022-01-13. Please use ‘pkgs.vala’ directly."; # added 2019-10-10 - inherit (pkgs) gnome-user-docs; # added 2019-11-20 + gnome-user-docs = throw "The ‘gnome.gnome-user-docs’ alias was removed on 2022-01-13. Please use ‘pkgs.gnome-user-docs’ directly."; # added 2019-11-20 - inherit (pkgs) gjs; # added 2019-01-05 + gjs = throw "The ‘gnome.gjs’ alias was removed on 2022-01-13. Please use ‘pkgs.gjs’ directly."; # added 2019-01-05 - inherit (pkgs) yelp-tools; # added 2019-11-20 + yelp-tools = throw "The ‘gnome.yelp-tools’ alias was removed on 2022-01-13. Please use ‘pkgs.yelp-tools’ directly."; # added 2019-11-20 - inherit (pkgs) dconf; # added 2019-11-30 + dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 - inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12 - inherit (pkgs) glade; # added 2020-05-15 + glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 - vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 - - gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 - - maintainers = lib.teams.gnome.members; + maintainers = throw "The ‘gnome.maintainers’ alias was removed on 2022-01-13. Please use ‘lib.teams.gnome.members’ directly."; # added 2020-04-01 mutter328 = throw "Removed as Pantheon is upgraded to mutter338."; mutter334 = throw "Removed as Pantheon is upgraded to mutter338."; gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; - - # Added 2021-05-07 - gnome3 = self // { recurseForDerivations = false; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b431e7da44..da95f32440 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,10 +3,13 @@ , gjs , gnome , gobject-introspection -, xprop +, pulseaudio +, python3 +, substituteAll , touchegg , vte , wrapGAppsHook +, xprop }: let # Helper method to reduce redundancy @@ -62,6 +65,18 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "shell-volume-mixer@derhofbauer.at" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch; + inherit pulseaudio; + inherit python3; + }) + ]; + + meta.maintainers = with lib.maintainers; [ rhoriguchi ]; + })) + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch new file mode 100644 index 0000000000..f1064feb54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch @@ -0,0 +1,32 @@ +diff --git a/lib/utils/paHelper.js b/lib/utils/paHelper.js +index be28d21..a410a63 100755 +--- a/lib/utils/paHelper.js ++++ b/lib/utils/paHelper.js +@@ -57,13 +57,7 @@ async function execHelper(type, index = undefined) { + return null; + } + +- const python = await findPython(); +- +- if (!python) { +- return null; +- } +- +- const args = ['/usr/bin/env', python, paUtilPath, type]; ++ const args = ['@python3@/bin/python', paUtilPath, type]; + + if (!isNaN(index)) { + args.push(index); +diff --git a/pautils/lib/libpulse.py b/pautils/lib/libpulse.py +index a32c272..8225f2f 100755 +--- a/pautils/lib/libpulse.py ++++ b/pautils/lib/libpulse.py +@@ -16,7 +16,7 @@ + from ctypes import * + + try: +- lib = CDLL('libpulse.so.0') ++ lib = CDLL('@pulseaudio@/lib/libpulse.so.0') + except: + lib = CDLL('libpulse.so') + diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 13983bb088..2f3afec364 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "015nrlzlcams4k8svrq7692xbjlai1dmwvjdldncsbrgrmfa702m"; + sha256 = "ccvDcEstSUVvJ7gf0bsCxCPPMRXSkZh+tKOKWNnzMt4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 019e2cf5a2..c7c5becd70 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation rec { libhandy libical libnotify - libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 932b54e82b..7135795914 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/camera/pull/216 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; + sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index f83839f6c9..5007e29726 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -38,6 +39,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/code/pull/1165 + (fetchpatch { + url = "https://github.com/elementary/code/commit/a2607cce3a6b1bb62d02456456d3cbc3c6530bb0.patch"; + sha256 = "sha256-VKR83IOUYsQhBRlU9JUTlMJtXWv/AyG4wDsjMU2vmU8="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 21e25bad94..4b829321c3 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -43,6 +44,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/files/pull/1973 + (fetchpatch { + url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch"; + sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 90058633e9..58be49ab4b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/mail/pull/751 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch"; + sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix index bee11ed055..cceeeabf15 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch"; sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx"; }) + # Fix build with meson 0.61 + # https://github.com/elementary/music/pull/674 + (fetchpatch { + url = "https://github.com/elementary/music/commit/fb3d840049c1e2e0bf8fdddea378a2db647dd096.patch"; + sha256 = "sha256-tQZv7hZExLqbkGXahZxDfg7bkgwCKYbDholC2zuwlNw="; + }) ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 176c2919be..9e65a56287 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -28,6 +29,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/screenshot/pull/241 + (fetchpatch { + url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch"; + sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 4840f69e7c..f3402299ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/terminal/pull/649 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch"; + sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix index c8e6f11f11..50a3317d6e 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; }) + # Fix build with meson 0.61 + # https://github.com/elementary/switchboard/pull/226 + (fetchpatch { + url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; + sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 25bce374c2..72df609c5a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -90,6 +91,12 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) + # Fix build with meson 0.61 + # https://github.com/elementary/greeter/pull/590 + (fetchpatch { + url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; + sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; + }) ]; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index fbde187ce6..1d4a1cb741 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -21,15 +22,22 @@ stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; version = "1.2.1"; - repoName = "shortcut-overlay"; - src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "shortcut-overlay"; rev = version; sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/shortcut-overlay/pull/113 + (fetchpatch { + url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch"; + sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils libxml2 diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 1164e0592b..3f7408d9df 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { libical libsoup wingpanel - libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index ed9919b0b0..588061b22e 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -21,15 +22,22 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; version = "2.4.0"; - repoName = "capnet-assist"; - src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "capnet-assist"; rev = version; sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/capnet-assist/pull/76 + (fetchpatch { + url = "https://github.com/elementary/capnet-assist/commit/0e77bf8023ba1b35e3a5badb72c246cabf6552b9.patch"; + sha256 = "sha256-B/KEs/TCxR+i3uQSRtWxTi2+cu0n6QLcfKCbMCvSsvs="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 3f749c85b2..ec64a60fb5 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala , gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,13 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; }; - # Does not build with vala 0.48 or later - # Upstream has no activity for a while - # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible - # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. - # public virtual signal bool remote_event (string name, GLib.Value value); - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ]; + nativeBuildInputs = [ pkg-config vala wafHook python3 ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' @@ -39,5 +33,12 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ volth ] ++ teams.xfce.members; + # Does not build with vala 0.48 or later + # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible + # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. + # public virtual signal bool remote_event (string name, GLib.Value value); + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + # Upstream has no activity since 20 May 2020 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix index c4fe29077f..8ff6a5120f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bAoSFHX8sQgmV3hAXsR9qT4BnUsyneeynRAByEfzjE4="; + sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix index 68c6ea39cf..62d8f65ff8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix @@ -16,7 +16,7 @@ , makeWrapper , numactl , perl -, python +, python2 , rocclr , rocm-comgr , rocm-device-libs @@ -56,7 +56,7 @@ let substituteInPlace bin/hip_embed_pch.sh \ --replace '$LLVM_DIR/bin/' "" - sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py + sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; }; - nativeBuildInputs = [ cmake python makeWrapper perl ]; + nativeBuildInputs = [ cmake python2 makeWrapper perl ]; buildInputs = [ libxml2 numactl libglvnd libX11 ]; propagatedBuildInputs = [ clang diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix index 6ed01d9bbc..32b91f5ddf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix @@ -1,54 +1,43 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper }: +{ lib +, stdenv +, autoPatchelfHook +, buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "inklecate"; version = "1.0.0"; - src = - if stdenv.isLinux then - fetchurl { - url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_linux.zip"; - sha256 = "6e17db766222998ba0ae5a5da9857e34896e683b9ec42fad528c3f8bea7398ea"; - name = "${pname}-${version}"; - } - else if stdenv.isDarwin then - fetchurl { - url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_mac.zip"; - sha256 = "b6f4dd1f95c180637ce193dbb5fa6d59aeafe49a2121a05b7822e6cbbaa6931f"; - name = "${pname}-${version}"; - } - else throw "Not supported on ${stdenv.hostPlatform.system}."; + src = fetchFromGitHub { + owner = "inkle"; + repo = "ink"; + rev = "v${version}"; + sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc"; + }; - # Work around the "unpacker appears to have produced no directories" - # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=$(pwd)"; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; - nativeBuildInputs = [ unzip makeWrapper ]; - - unpackPhase = '' - unzip -qq -j $src -d $pname-$version - - rm $pname-$version/ink-engine-runtime.dll - rm $pname-$version/ink_compiler.dll - ''; - - installPhase = '' - mkdir -p $out/bin/ - - cp $pname-$version/inklecate $out/bin/inklecate - ''; + projectFile = "inklecate/inklecate.csproj"; + nugetDeps = if stdenv.isDarwin then ./deps-darwin.nix else ./deps-linux.nix; + executables = [ "inklecate" ]; + dotnet-runtime = dotnetCorePackages.runtime_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; meta = with lib; { - description = "Compiler for ink, inkle's scripting language"; + description = "Compiler for ink, inkle's scripting language"; longDescription = '' Inklecate is a command-line compiler for ink, inkle's open source scripting language for writing interactive narrative - ''; - homepage = "https://www.inklestudios.com/ink/"; - downloadPage = "https://github.com/inkle/ink/releases"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ shreerammodi ]; + ''; + homepage = "https://www.inklestudios.com/ink/"; + downloadPage = "https://github.com/inkle/ink/"; + license = licenses.mit; + platforms = platforms.unix; + badPlatforms = platforms.aarch64; + maintainers = with maintainers; [ shreerammodi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-darwin.nix new file mode 100644 index 0000000000..b8aaefebc5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-darwin.nix @@ -0,0 +1,31 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +] diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-linux.nix new file mode 100644 index 0000000000..8f26b91eea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps-linux.nix @@ -0,0 +1,31 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +] diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index 85332a9464..176affd047 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ gloaming ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/intel-graphics-compiler.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix index b46dee899a..9da506900b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix @@ -1,18 +1,26 @@ -{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }: +{ lib +, stdenv +, fetchFromRepoOrCz +, perl +, texinfo +, which +}: stdenv.mkDerivation rec { pname = "tcc"; - version = "unstable-2021-10-09"; + version = "0.9.27+date=2022-01-11"; src = fetchFromRepoOrCz { repo = "tinycc"; - rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6"; - sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw="; + rev = "4e0e9b8f210d69893b306d6b24d2dd615a22f246"; + hash = "sha256-0BJ5wXsgDLBIvcbq+rL9UQC4NjLHCI9r6sUWF98APPg="; }; - nativeBuildInputs = [ perl texinfo which ]; - - hardeningDisable = [ "fortify" ]; + nativeBuildInputs = [ + perl + texinfo + which + ]; postPatch = '' patchShebangs texi2pod.pl @@ -46,37 +54,39 @@ stdenv.mkDerivation rec { install -Dt $out/lib/pkgconfig libtcc.pc -m 444 ''; + outputs = [ "out" "info" "man" ]; + doCheck = true; checkTarget = "test"; meta = with lib; { + homepage = "https://repo.or.cz/tinycc.git"; description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' - TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike - other C compilers, it is meant to be self-sufficient: you do not - need an external assembler or linker because TCC does that for - you. + TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike other C + compilers, it is meant to be self-sufficient: you do not need an external + assembler or linker because TCC does that for you. - TCC compiles so fast that even for big projects Makefiles may not - be necessary. + TCC compiles so fast that even for big projects Makefiles may not be + necessary. - TCC not only supports ANSI C, but also most of the new ISO C99 - standard and many GNU C extensions. + TCC not only supports ANSI C, but also most of the new ISO C99 standard + and many GNU C extensions. - TCC can also be used to make C scripts, i.e. pieces of C source - that you run as a Perl or Python script. Compilation is so fast - that your script will be as fast as if it was an executable. + TCC can also be used to make C scripts, i.e. pieces of C source that you + run as a Perl or Python script. Compilation is so fast that your script + will be as fast as if it was an executable. - TCC can also automatically generate memory and bound checks while - allowing all C pointers operations. TCC can do these checks even - if non patched libraries are used. + TCC can also automatically generate memory and bound checks while allowing + all C pointers operations. TCC can do these checks even if non patched + libraries are used. - With libtcc, you can use TCC as a backend for dynamic code - generation. + With libtcc, you can use TCC as a backend for dynamic code generation. ''; - homepage = "https://repo.or.cz/tinycc.git"; license = licenses.lgpl21Only; - platforms = platforms.linux; - maintainers = [ maintainers.joachifm ]; + maintainers = with maintainers; [ joachifm AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: more multiple outputs +# TODO: self-compilation diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index daa9bf49b6..9a1365d0c9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -15,19 +15,7 @@ let # header file isn't available at all, but that patch (./gvc-compat.patch) # can be shared between all versions of Vala so far. graphvizPatch = - let - fp = { commit, sha256 }: fetchpatch { - url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch"; - inherit sha256; - }; - - in { - - # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 - # We've fixed the single merge conflict in the following patch. - # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch - "0.40" = ./disable-graphviz-0.40.12.patch; - + { "0.48" = ./disable-graphviz-0.46.1.patch; "0.52" = ./disable-graphviz-0.46.1.patch; @@ -98,19 +86,14 @@ let }); in rec { - vala_0_40 = generic { - version = "0.40.25"; - sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7"; - }; - vala_0_48 = generic { - version = "0.48.21"; - sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg="; + version = "0.48.22"; + sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; }; vala_0_52 = generic { - version = "0.52.9"; - sha256 = "sha256-HpMH2B4hHxniUB6P5PtN0Z+5J8SEtV/873FOjFFdAHk="; + version = "0.52.10"; + sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; }; vala_0_54 = generic { diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch deleted file mode 100644 index fdc1eabf51..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff --git i/configure.ac w/configure.ac -index 694ffd200..915062053 100644 ---- i/configure.ac -+++ w/configure.ac -@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) - AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) --AC_MSG_CHECKING([for CGRAPH]) --cgraph_tmp_LIBADD="$LIBADD" --cgraph_tmp_CFLAGS="$CFLAGS" --LIBADD="$LIBADD $LIBGVC_LIBS" --CFLAGS="$CFLAGS $LIBGVC_CFLAGS" --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([ -- #include -- -- int main(void) { -- #ifdef WITH_CGRAPH -- return 0; -- #else -- return -1; -- #endif -- } -- ])], [ -- AC_MSG_RESULT([yes]) -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -- have_cgraph=yes -- ], [ -- AC_MSG_RESULT([no]) -- have_cgraph=no -- ] --) --LIBADD="$cgraph_tmp_LIBADD" --CFLAGS="$cgraph_tmp_CFLAGS" -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) -+ AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" -+ cgraph_tmp_LIBADD="$LIBADD" -+ cgraph_tmp_CFLAGS="$CFLAGS" -+ LIBADD="$LIBADD $LIBGVC_LIBS" -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" -+ AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([ -+ #include -+ int main(void) { -+ #ifdef WITH_CGRAPH -+ return 0; -+ #else -+ return -1; -+ #endif -+ } -+ ])], [ -+ AC_MSG_RESULT([yes]) -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -+ have_cgraph=yes -+ ], [ -+ AC_MSG_RESULT([no]) -+ have_cgraph=no -+ ] -+ ) -+ LIBADD="$cgraph_tmp_LIBADD" -+ CFLAGS="$cgraph_tmp_CFLAGS" -+fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index f3f790e76..3c5dc4c80 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala -index 192e488cd..ec0960222 100644 ---- i/libvaladoc/html/basicdoclet.vala -+++ w/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala -index dcc4dad76..cf9c860b8 100644 ---- i/libvaladoc/html/htmlmarkupwriter.vala -+++ w/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } diff --git a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix index ad2fae32b2..e4ad7fe5f7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytest-runner }: +, sphinx_rtd_theme, pytest-runner, setuptools-scm }: let sample-contract = writeText "example.vy" '' @@ -21,15 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q="; }; - nativeBuildInputs = [ pytest-runner ]; - - # Replace the dynamic commit hash lookup with the hash from the tag - postPatch = '' - substituteInPlace setup.py \ - --replace 'asttokens==' 'asttokens>=' \ - --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \ - --replace 'commithash.decode("utf-8").strip()' "'6e7dba7a8b5f29762d3470da4f44634b819c808d'" - ''; + nativeBuildInputs = [ pytest-runner setuptools-scm ]; propagatedBuildInputs = [ asttokens diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix index dee1a45276..662d997d88 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -22,11 +22,11 @@ }: let - version = "11.50.19"; - openjdk = "11.0.12"; + version = "11.52.13"; + openjdk = "11.0.13"; - sha256_linux = "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3"; - sha256_darwin = "9bc6874932f7f88d0a48220d3200449ddf7dc5c0e82af2df2738bc13d21b0e4e"; + sha256_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; + sha256_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix deleted file mode 100644 index e25a7b83e9..0000000000 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchurl, python2Packages, picocom -, avrdude, arduino-core }: - -python2Packages.buildPythonApplication rec { - pname = "ino"; - version = "0.3.6"; - - src = fetchurl { - url = "mirror://pypi/i/ino/ino-${version}.tar.gz"; - sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv"; - }; - - # TODO: add avrgcclibc, it must be rebuild with C++ support - propagatedBuildInputs = with python2Packages; [ - arduino-core - avrdude - picocom - configobj - jinja2 - pyserial - six - ]; - - patchPhase = '' - echo "Patching Arduino distribution path" - sed -i 's@/usr/local/share/arduino@${arduino-core}/share/arduino@g' \ - ino/environment.py - sed -i -e 's@argparse@@' -e 's@ordereddict@@' \ - requirements.txt - sed -i -e 's@from ordereddict@from collections@' \ - ino/environment.py ino/utils.py - - # Patch the upload command so it uses the correct avrdude - substituteInPlace ino/commands/upload.py \ - --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \ - --replace "'-C', self.e['avrdude.conf']," "" - ''; - - meta = with lib; { - description = "Command line toolkit for working with Arduino hardware"; - homepage = "http://inotool.org/"; - license = licenses.mit; - maintainers = with maintainers; [ antono ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index bca4f87f9a..9652a95ee2 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.2.1"; + version = "6.4.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "0m5h01iq0mgrr9svj4gmykfi9lsyjpqzrkvlizff26c8dqad59c5"; + sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/grnet/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/grnet/default.nix index 568e63a77b..6e8b72a656 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/grnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/grnet/default.nix @@ -52,6 +52,7 @@ mkDerivation { pname = "gr-grnet"; version = version.name; inherit src; + disabledForGRafter = "3.10"; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix index f26e4695a1..48bbc68c80 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -20,7 +20,6 @@ let version = { "3.7" = "2.0.0"; "3.8" = "3.0.1"; - "3.9" = null; }.${gnuradio.versionAttr.major}; src = fetchFromGitHub { owner = "myriadrf"; @@ -29,7 +28,6 @@ let sha256 = { "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq"; "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U="; - "3.9" = null; }.${gnuradio.versionAttr.major}; }; in mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix index ebb34afee1..326a2b9d9b 100644 --- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -24,16 +24,14 @@ let version = { "3.7" = "0.1.5"; - "3.8" = "0.2.2"; - "3.9" = null; + "3.8" = "0.2.3"; }.${gnuradio.versionAttr.major}; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; rev = "v${version}"; sha256 = { "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; - "3.8" = "HT6xlN6cJAnvF+s1g2I1uENhBJJizdADlLXeSD0rEqs="; - "3.9" = null; + "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo="; }.${gnuradio.versionAttr.major}; }; in mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index f5dcc06cc1..1b765bee00 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -181,7 +181,8 @@ self: super: { # base bound digit = doJailbreak super.digit; - hnix = generateOptparseApplicativeCompletion "hnix" + # hnix.patch needed until the next release is bumped + hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix" (overrideCabal (drv: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` doCheck = false; @@ -189,7 +190,7 @@ self: super: { # needs newer version of relude and semialign than stackage has relude = self.relude_1_0_0_1; semialign = self.semialign_1_2_0_1; - })); + }))); # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; @@ -1185,7 +1186,6 @@ self: super: { # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2; # 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage. gitit = doJailbreak super.gitit; @@ -1522,7 +1522,10 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; + # substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363 + hercules-ci-agent = overrideCabal { preConfigure = '' + substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version" + ''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [ unmarkBroken @@ -1862,29 +1865,22 @@ self: super: { # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; - # 2021-05-09 haskell-ci pins ShellCheck 0.7.1 - # https://github.com/haskell-CI/haskell-ci/issues/507 - # 2021-09-05 haskell-ci needs Cabal 3.4, - # cabal-install-parsers uses Cabal 3.6 since 0.4.3 - haskell-ci = super.haskell-ci.override { - ShellCheck = self.ShellCheck_0_7_1; - cabal-install-parsers = self.cabal-install-parsers_0_4_2; - }; + # 2022-01-16 haskell-ci needs Cabal 3.6, + haskell-ci = super.haskell-ci.overrideScope (self: super: { + attoparsec = self.attoparsec_0_14_4; + Cabal = self.Cabal_3_6_2_0; + }); - # Build haskell-ci from git repository, including some useful fixes, - # e. g. required for generating the workflows for the cabal2nix repository - haskell-ci-unstable = (overrideSrc rec { - version = "0.13.20211116-${builtins.substring 0 7 src.rev}"; + # Build haskell-ci from git repository + haskell-ci-unstable = overrideSrc rec { + version = "0.14.1-${builtins.substring 0 7 src.rev}"; src = pkgs.fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "b61df11e7f6010ce09920c231321ab1545a990b5"; - sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy"; + rev = "8311a999b8e8be3aa31f65f314def256aa2d5535"; + sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav"; }; - } super.haskell-ci).overrideScope (self: super: { - attoparsec = self.attoparsec_0_14_3; - Cabal = self.Cabal_3_6_2_0; - }); + } self.haskell-ci; Frames-streamly = super.Frames-streamly.override { relude = super.relude_1_0_0_1; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index ec55156593..ac0364e0c7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -49,11 +49,6 @@ self: super: { # cabal-install-parsers is written for Cabal 3.6 cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; - # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 - cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { - Cabal = self.Cabal_3_4_1_0; - }; - # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; system-fileio = doJailbreak super.system-fileio; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 1082f792e8..1a0589ce74 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -83,7 +83,7 @@ self: super: { # Jailbreaks & Version Updates assoc = doJailbreak super.assoc; async = doJailbreak super.async; - attoparsec = super.attoparsec_0_14_3; + attoparsec = super.attoparsec_0_14_4; base64-bytestring = doJailbreak super.base64-bytestring; base-compat = self.base-compat_0_12_1; base-compat-batteries = self.base-compat-batteries_0_12_1; @@ -102,23 +102,23 @@ self: super: { genvalidity-hspec = self.genvalidity-hspec_1_0_0_0; ghc-byteorder = doJailbreak super.ghc-byteorder; ghc-exactprint = overrideCabal (drv: { - # HACK: ghc-exactprint 1.3.0 is not buildable for GHC < 9.2, + # HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2, # but hackage2nix evaluates the cabal file with GHC 8.10.*, # causing the build-depends to be skipped. Since the dependency # list hasn't changed much since 0.6.4, we can just reuse the # normal expression. - inherit (self.ghc-exactprint_1_3_0) src version; + inherit (self.ghc-exactprint_1_4_1) src version; revision = null; editedCabalFile = null; libraryHaskellDepends = [ self.fail self.ordered-containers ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; - ghc-lib = self.ghc-lib_9_2_1_20211101; - ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101; + ghc-lib = self.ghc-lib_9_2_1_20220109; + ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; hackage-security = doJailbreak super.hackage-security; - hashable = super.hashable_1_4_0_1; + hashable = super.hashable_1_4_0_2; hashable-time = doJailbreak super.hashable-time_0_3; hedgehog = doJailbreak super.hedgehog; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); @@ -131,13 +131,13 @@ self: super: { ormolu = self.ormolu_0_4_0_0; OneTuple = super.OneTuple_0_3_1; parallel = doJailbreak super.parallel; - path = doJailbreak super.path_0_9_1; + path = doJailbreak super.path_0_9_2; polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); primitive = doJailbreak super.primitive; quickcheck-instances = super.quickcheck-instances_0_3_27; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; - retrie = doDistribute self.retrie_1_2_0_0; + retrie = doDistribute self.retrie_1_2_0_1; semialign = super.semialign_1_2_0_1; singleton-bool = doJailbreak super.singleton-bool; scientific = doJailbreak super.scientific; @@ -234,7 +234,7 @@ self: super: { sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc"; }; } (super.hlint_3_3_6.overrideScope (self: super: { - ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101; + ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; })) ); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0919e16750..dc3670fa2c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -455,6 +455,7 @@ broken-packages: - brick-dropdownmenu - bricks-internal - brillig + - broadcast-chan-tests - broccoli - brok - broker-haskell @@ -571,6 +572,7 @@ broken-packages: - capnp - capped-list - capri + - captcha-core - caramia - carbonara - cardano-coin-selection @@ -3881,6 +3883,7 @@ broken-packages: - pretty-ncols - prettyprinter-vty - prim-array + - primecount - primes-type - prim-instances - PrimitiveArray-Pretty @@ -4452,6 +4455,8 @@ broken-packages: - show-prettyprint - Shpadoinkle-backend-pardiff - Shpadoinkle-backend-snabbdom + - Shpadoinkle-backend-static + - Shpadoinkle-html - Shpadoinkle-isreal - Shpadoinkle-streaming - Shpadoinkle-template @@ -4852,6 +4857,7 @@ broken-packages: - tagsoup-selection - tai - tai64 + - tailwind - takahashi - Takusen - takusen-oracle diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cdb939f1e2..4477e2f190 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -158,8 +158,6 @@ extra-packages: - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version - ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version @@ -623,3 +621,6 @@ dont-distribute-packages: - webkitgtk3 - webkitgtk3-javascriptcore - websnap + + # glade relies on system libglade which is deprecated + - glade diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 1f42d38134..fa48b18c71 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -618,6 +618,8 @@ dont-distribute-packages: - bricks-parsec - bricks-rendering - bricks-syntax + - broadcast-chan-conduit + - broadcast-chan-pipes - bronyradiogermany-streaming - brotli-conduit - brotli-streams @@ -659,6 +661,8 @@ dont-distribute-packages: - canteven-http - cao - cap + - captcha-2captcha + - captcha-capmonster - car-pool - carboncopy - cartel @@ -827,6 +831,8 @@ dont-distribute-packages: - copilot-language - copilot-libraries - copilot-theorem + - core-webserver-servant + - core-webserver-warp - coroutine-enumerator - coroutine-iteratee - couch-simple @@ -1186,7 +1192,7 @@ dont-distribute-packages: - funnyprint - funsat - fused-effects-squeal - - futhark_0_21_2 + - futhark_0_21_4 - fwgl-glfw - fwgl-javascript - fxpak @@ -1652,6 +1658,7 @@ dont-distribute-packages: - hsfacter - hslogstash - hspec-expectations-pretty + - hspec-expectations-pretty-diff_0_7_2_6 - hspec-pg-transact - hspec-setup - hspec-shouldbe @@ -1810,6 +1817,7 @@ dont-distribute-packages: - ivy-web - iyql - j2hs + - jacinda - jail - java-bridge-extras - java-character @@ -1890,6 +1898,7 @@ dont-distribute-packages: - knead-arithmetic - knit-haskell - knots + - koji-tool - korfu - ks-test - kurita @@ -2161,6 +2170,7 @@ dont-distribute-packages: - mprover - mps - mptcp + - mptcpanalyzer - msgpack-aeson - msgpack-idl - msgpack-rpc @@ -2295,7 +2305,7 @@ dont-distribute-packages: - pairing - panda - pandoc-japanese-filters - - pandoc_2_16_2 + - pandoc_2_17 - papa - papa-base - papa-base-implement @@ -2443,6 +2453,7 @@ dont-distribute-packages: - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork + - psql - puffytools - pugs-compat - pugs-hsregex diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 86a60fd909..4198cf11c2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -818,6 +818,12 @@ self: super: builtins.intersectAttrs super { platforms = pkgs.lib.platforms.x86; } super.geomancy; + hlint = overrideCabal (drv: { + postInstall = '' + install -Dm644 data/hlint.1 -t "$out/share/man/man1" + '' + drv.postInstall or ""; + }) super.hlint; + hls-brittany-plugin = overrideCabal (drv: { testToolDepends = [ pkgs.git ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index b94e9d070b..10f2f447a0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2818,6 +2818,8 @@ self: { pname = "Cabal"; version = "3.6.2.0"; sha256 = "0hmw2wkypd42qyyfi6rhbsxmymbxg9rrw683yg39627vlw33v44y"; + revision = "1"; + editedCabalFile = "1s79dmxxzyczldakjcwg7jqxhhfw724fwbjh7s656cynxnalq85f"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -10824,8 +10826,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.7.2"; sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5"; - revision = "1"; - editedCabalFile = "1lccw8x48xxmw1cpd260fdr9mxqr39f4b623i78027l0m93dw38b"; + revision = "2"; + editedCabalFile = "1wqk9mnzxwphiza6lwg526nvr6mzbwv0l22kwbsd2r9vv1gix1rk"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11221,6 +11223,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "IPv6Addr_2_0_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "2.0.4"; + sha256 = "1d20cfnxvahcnr8iq71ymyykfl6cgxzl5i6vmdl7ill2bj07xy08"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -18339,34 +18360,6 @@ self: { broken = true; }) {}; - "ShellCheck_0_7_1" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, containers - , deepseq, Diff, directory, filepath, mtl, parsec, process - , QuickCheck, regex-tdfa - }: - mkDerivation { - pname = "ShellCheck"; - version = "0.7.1"; - sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec process QuickCheck regex-tdfa - ]; - executableHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec QuickCheck regex-tdfa - ]; - testHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec QuickCheck regex-tdfa - ]; - description = "Shell script analysis tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - "ShellCheck" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , deepseq, Diff, directory, filepath, mtl, parsec, process @@ -18588,6 +18581,8 @@ self: { libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-console" = callPackage @@ -18704,6 +18699,8 @@ self: { ]; description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-isreal" = callPackage @@ -33855,15 +33852,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_1_1_0" = callPackage + "ascii_1_1_1_2" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group , ascii-predicates, ascii-superset, ascii-th, base, bytestring , text }: mkDerivation { pname = "ascii"; - version = "1.1.1.0"; - sha256 = "11a2hwjz439damkjcx3ybbwjnvhdrhwxw78203vgydym4v1k2hrn"; + version = "1.1.1.2"; + sha256 = "0wyr8s678dz2f45aiaish7xagdpnzn9rdx56zd4cs0aib0w71gl6"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring text @@ -33901,6 +33898,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_10" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.10"; + sha256 = "1vncwrngvqlzacs8084s7xvbj02zpq5irciwmv8cxh8pwjk2vhpw"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -33913,6 +33923,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_0_14" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.14"; + sha256 = "0mdmcxp5bd89akh6z7kdyhl679pbm58rww0mhzj6y41sj4g7j4m4"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -33952,6 +33975,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_10" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.10"; + sha256 = "0swkv40jlcix8qs62zszkbsvw0k833l6rmrx21jzxvfi41pycd5r"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -33979,6 +34015,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-predicates_1_0_0_8" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.8"; + sha256 = "1pl1pw6z1yc2r21v70qrm1wfnbzyq8cl0z3xn0268w1qx4qlnpng"; + libraryHaskellDepends = [ ascii-char base ]; + testHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -34037,6 +34086,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-superset_1_0_1_10" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.1.10"; + sha256 = "1filq9yr5lmwmn6m5ax0hpnyxlk160qbw2ikvjk4rs6078xwjwl9"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + testHaskellDepends = [ ascii-char base text ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -34072,6 +34136,25 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_8" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, bytestring + , template-haskell, text + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.8"; + sha256 = "1685msxir8di3blnaykj036b640z8jsmlzvj1vwr86wf92g9gbdz"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + testHaskellDepends = [ + ascii-char ascii-superset base bytestring text + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -35220,8 +35303,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "atomic-modify"; - version = "0.1.0.2"; - sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5"; + version = "0.1.0.3"; + sha256 = "1kz3sbr4sh2c405plf0d4078j47kmvw0gwsw53vyvsyxwhm9db3z"; libraryHaskellDepends = [ base stm ]; description = "A typeclass for mutable references that have an atomic modify operation"; license = lib.licenses.asl20; @@ -35603,19 +35686,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "attoparsec_0_14_3" = callPackage + "attoparsec_0_14_4" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector + , containers, deepseq, directory, filepath, ghc-prim, http-types + , parsec, QuickCheck, quickcheck-unicode, scientific, tasty + , tasty-bench, tasty-quickcheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "attoparsec"; - version = "0.14.3"; - sha256 = "1j7sy24d7kf9qb99cr36zchb4gsj3gcy4yflawxqnng31lqdxjal"; - revision = "1"; - editedCabalFile = "1i3dwcq8970d7i7via7y0384hv7xqlajjlr9dlwlx1f29bx98pdn"; + version = "0.14.4"; + sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -35625,10 +35706,11 @@ self: { scientific tasty tasty-quickcheck text transformers vector ]; benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text + array base bytestring case-insensitive containers deepseq directory + filepath ghc-prim http-types parsec scientific tasty-bench text transformers unordered-containers vector ]; + doHaddock = false; description = "Fast combinator parsing for bytestrings and text"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -36432,6 +36514,21 @@ self: { license = lib.licenses.mit; }) {}; + "autoexporter_2_0_0_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "2.0.0.1"; + sha256 = "1sdpfqd8ypi1d8bkxj695midhgi9ynahknwlc72gh718ah26xc18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -38631,6 +38728,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "barbies_2_0_3_1" = callPackage + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "barbies"; + version = "2.0.3.1"; + sha256 = "0gfzb52k3py1qnr2b6gshdg7c9aj1j9y2xsdhz86n01ybv81yg51"; + libraryHaskellDepends = [ base distributive transformers ]; + testHaskellDepends = [ + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "barbies-layered" = callPackage ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec , hspec-discover, transformers @@ -39425,6 +39539,8 @@ self: { pname = "basement-cd"; version = "0.0.12.1"; sha256 = "18w1rzn6p3a25y075rr1lmln74mfiv9dzgf01mipwjqfsirki15b"; + revision = "1"; + editedCabalFile = "12z794dzdyjkc9l55yw5c7y3knplsrkz1ndhn9bi87a8vn7kwvcq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; @@ -41675,6 +41791,25 @@ self: { license = lib.licenses.mit; }) {}; + "binary-parser_0_5_7_1" = callPackage + ({ mkDerivation, base, bytestring, mtl, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.7.1"; + sha256 = "1k3rc1szwahc5w2lxddnjpd4zkfi2hmcq398sixf2qx44f2kk6vp"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "A highly-efficient but limited parser API specialised for bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-lexing, case-insensitive, criterion, deepseq @@ -43232,18 +43367,18 @@ self: { "bisc" = callPackage ({ mkDerivation, base, bytestring, configurator, data-default , directory, exceptions, filepath, leveldb-haskell, mtl - , optparse-applicative, selda, selda-sqlite, text + , optparse-applicative, resourcet, selda, selda-sqlite, text, unix }: mkDerivation { pname = "bisc"; - version = "0.4.0.0"; - sha256 = "1x0i3yjgfnhw5nsx2fr150anf199z29g630xv58315xz6a526js0"; + version = "0.4.1.0"; + sha256 = "06jb8kikpdc9fz5ndy8qmqv1zmvxjg130wvsh23hhp8a01n4pxca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring configurator data-default directory exceptions - filepath leveldb-haskell mtl optparse-applicative selda - selda-sqlite text + filepath leveldb-haskell mtl optparse-applicative resourcet selda + selda-sqlite text unix ]; description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; @@ -47114,7 +47249,7 @@ self: { license = lib.licenses.agpl3Only; }) {}; - "brittany_0_14_0_0" = callPackage + "brittany_0_14_0_2" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, ghc-exactprint, hspec @@ -47123,8 +47258,8 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.14.0.0"; - sha256 = "10xphm9szdflwqkfbhz9pngiq0sn5jmysa015dhqc3prhz4qha2b"; + version = "0.14.0.2"; + sha256 = "03jnjmp4hy0g22h0jq5md60iz5y94fzhdjx849s89mvb28pdfd1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47166,16 +47301,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "broadcast-chan_0_2_1_2" = callPackage + ({ mkDerivation, async, base, criterion, deepseq, stm, transformers + , unliftio-core + }: + mkDerivation { + pname = "broadcast-chan"; + version = "0.2.1.2"; + sha256 = "1zsrafz3q9l8np8wafmrbi8ilwwsgnzkc8jfjkjfgs4kq65yglqw"; + libraryHaskellDepends = [ base transformers unliftio-core ]; + benchmarkHaskellDepends = [ async base criterion deepseq stm ]; + description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "broadcast-chan-conduit" = callPackage ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests , conduit, containers, resourcet, transformers, unliftio-core }: mkDerivation { pname = "broadcast-chan-conduit"; - version = "0.2.1.1"; - sha256 = "0w0f4skprhnm1x4vzchkgjgjljzqizpb678251jgj65jsg1mnyfc"; - revision = "1"; - editedCabalFile = "0pk09frf24jg2id13l1nx47wwvf2z4qjqv17y7ji036iwp9xk6nw"; + version = "0.2.1.2"; + sha256 = "0mwd82arm50zwz559qzxi70ia9d4h5kjwdvhk09jf966hd0knnmm"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -47184,6 +47332,7 @@ self: { ]; description = "Conduit-based parallel streaming code for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "broadcast-chan-pipes" = callPackage @@ -47192,16 +47341,15 @@ self: { }: mkDerivation { pname = "broadcast-chan-pipes"; - version = "0.2.1"; - sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr"; - revision = "1"; - editedCabalFile = "0zz05sc0ny5czzyw71c1fdzlfawjwhznbr8z683bf83821ra5fcv"; + version = "0.2.1.1"; + sha256 = "06nghcddlcnc97p3464fsgcfvjlsnxv7i7khzws3g3myl8hrd89c"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe ]; description = "Pipes-based parallel streaming code for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "broadcast-chan-tests" = callPackage @@ -47212,10 +47360,10 @@ self: { }: mkDerivation { pname = "broadcast-chan-tests"; - version = "0.2.1.1"; - sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3"; - revision = "4"; - editedCabalFile = "04hgr1ik1z9v317x8rw6amxqrmc94g6cghzxghddszqismz44gaq"; + version = "0.2.1.2"; + sha256 = "08qjvhdx2pwgj5kcl5fmg5qdlzbdchxjihmqch4sgv48kcga06nv"; + revision = "1"; + editedCabalFile = "1x2bmnkybh627yf22ackvqh3xfhdxv88ijsl8ryg8qhr6qm51jfj"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -47226,6 +47374,8 @@ self: { ]; description = "Helpers for generating tests for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "broccoli" = callPackage @@ -48194,6 +48344,27 @@ self: { license = lib.licenses.isc; }) {}; + "burrito_2_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.0"; + sha256 = "1b8c4sdk60sj20rrrhra4hx0f1y1injih4xcg4q19fgaf04chr91"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -50338,35 +50509,6 @@ self: { broken = true; }) {}; - "cabal-install-parsers_0_4_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , binary, binary-instances, bytestring, Cabal, containers - , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko - , network-uri, parsec, pretty, tar, tasty, tasty-golden - , tasty-hunit, text, time, transformers, tree-diff - }: - mkDerivation { - pname = "cabal-install-parsers"; - version = "0.4.2"; - sha256 = "08ny95sryii4nzyy8b2zf15vk329y84gbvpy7302hnjxanc6awx5"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary binary-instances bytestring - Cabal containers cryptohash-sha256 deepseq directory filepath lukko - network-uri parsec pretty tar text time transformers - ]; - testHaskellDepends = [ - ansi-terminal base base16-bytestring bytestring Cabal containers - directory filepath pretty tar tasty tasty-golden tasty-hunit - tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring Cabal containers criterion directory filepath - ]; - description = "Utilities to work with cabal-install files"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - }) {}; - "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers @@ -50538,6 +50680,8 @@ self: { pname = "cabal-plan"; version = "0.7.2.1"; sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r"; + revision = "1"; + editedCabalFile = "1pb8r65f279m9ps67mkkcbcpbprbj7pd12b9m2s64l8fgn9in422"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -51223,35 +51367,39 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , cachix-api, concurrent-extra, conduit, conduit-extra, containers , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify , hercules-ci-cnix-store, here, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, lzma-conduit - , megaparsec, memory, mmorph, netrc, nix, optparse-applicative - , process, protolude, resourcet, retry, safe-exceptions, servant - , servant-auth, servant-auth-client, servant-client - , servant-client-core, servant-conduit, stm, temporary, text, unix - , uri-bytestring, vector, versions + , http-client-tls, http-conduit, http-types, inline-c-cpp, katip + , lzma-conduit, megaparsec, memory, mmorph, netrc, nix + , optparse-applicative, pretty-terminal, process, protolude + , resourcet, retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-conduit, systemd, temporary, text, time + , unix, unordered-containers, uri-bytestring, uuid, vector + , versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "0.6.1"; - sha256 = "0fgm7035ahlgl3vbk0lqf3l07wagsykmw9z0pkzqqcwh1wlv1np7"; + version = "0.7.0"; + sha256 = "10yyzk26hmx4xqv4zc83a5m69bj88fd6v2fs76nfbqc2kcpiis6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring bytestring cachix-api concurrent-extra - conduit conduit-extra containers cookie cryptonite dhall directory - ed25519 filepath fsnotify hercules-ci-cnix-store here http-client - http-client-tls http-conduit http-types lzma-conduit megaparsec - memory mmorph netrc optparse-applicative process protolude - resourcet retry safe-exceptions servant servant-auth - servant-auth-client servant-client servant-client-core - servant-conduit stm text unix uri-bytestring vector versions + aeson async base base64-bytestring bytestring cachix-api + concurrent-extra conduit conduit-extra containers cookie cryptonite + dhall directory ed25519 filepath fsnotify hercules-ci-cnix-store + here http-client http-client-tls http-conduit http-types + inline-c-cpp katip lzma-conduit megaparsec memory mmorph netrc + optparse-applicative pretty-terminal process protolude resourcet + retry safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit stm stm-conduit + systemd temporary text time unix unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; - executableHaskellDepends = [ base cachix-api ]; + executableHaskellDepends = [ base cachix-api safe-exceptions ]; executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ base cachix-api directory here hspec protolude servant-auth-client @@ -51263,24 +51411,24 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, exceptions, hspec , hspec-discover, http-api-data, http-media, jose, lens, memory , nix-narinfo, protolude, resourcet, servant, servant-auth , servant-auth-swagger, servant-client, servant-swagger , servant-swagger-ui-core, string-conv, swagger2, text, time - , transformers + , transformers, unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "0.6.0"; - sha256 = "0q6kl5lb05c1m62yqj0d8vimlghhrc3avl3bz5wjp70azs28jcd3"; + version = "0.7.0"; + sha256 = "0l9bvzpf0g3rnr417gvxq0lgbmi3pn3cr9ap2m7sbwvikal8wlxg"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - deepseq exceptions http-api-data http-media jose lens memory - nix-narinfo protolude resourcet servant servant-auth + aeson async base base16-bytestring bytestring conduit cookie + cryptonite deepseq exceptions http-api-data http-media jose lens + memory nix-narinfo protolude resourcet servant servant-auth servant-auth-swagger servant-client string-conv swagger2 text time - transformers + transformers unordered-containers uuid websockets ]; testHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite @@ -51329,8 +51477,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "0.6.0.5"; - sha256 = "048d46g7xnqbkb061hs3ix8rzpp1mwww9iznpgrrkvimafb0r0m0"; + version = "1.0.0.0"; + sha256 = "1sfk4kh7jk762dqfp4c0hq9jqmp1r0x0727vp0cp48wsp9yn4d8f"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -51928,8 +52076,8 @@ self: { }: mkDerivation { pname = "candid"; - version = "0.3"; - sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x"; + version = "0.3.1"; + sha256 = "0swz07qn3829dpr850973baj1ki5pizlh90gy4xrp1d9bsvwy4sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52343,6 +52491,75 @@ self: { license = lib.licenses.bsd3; }) {}; + "captcha-2captcha" = callPackage + ({ mkDerivation, aeson, base, bytestring, captcha-core + , data-default, errors, extra, http-client, lens, lens-aeson, mtl + , o-clock, string-conversions, string-interpolate, tasty + , tasty-hunit, text, unliftio, wreq + }: + mkDerivation { + pname = "captcha-2captcha"; + version = "0.1.0.0"; + sha256 = "19r7977vkbyd6if9bvh9m2vv2wmhynly6qzsq7ndckn4yw4xc5wx"; + libraryHaskellDepends = [ + aeson base bytestring captcha-core errors extra http-client lens + lens-aeson mtl o-clock string-conversions string-interpolate text + unliftio wreq + ]; + testHaskellDepends = [ + aeson base bytestring captcha-core data-default errors extra + http-client lens lens-aeson mtl o-clock string-conversions + string-interpolate tasty tasty-hunit text unliftio wreq + ]; + description = "A package for integrating a variety of captcha solving services"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "captcha-capmonster" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, captcha-core + , data-default, errors, extra, http-client, lens, lens-aeson, mtl + , o-clock, string-conversions, string-interpolate, tasty + , tasty-hunit, text, unliftio, wreq + }: + mkDerivation { + pname = "captcha-capmonster"; + version = "0.1.0.0"; + sha256 = "0ps7dwbkafi92a408c0fcc15vjp8b2gf400ijbx4vz5vm0s9dzvl"; + libraryHaskellDepends = [ + aeson aeson-qq base bytestring captcha-core errors extra + http-client lens lens-aeson mtl o-clock string-interpolate text + unliftio wreq + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring captcha-core data-default errors + extra http-client lens lens-aeson mtl o-clock string-conversions + string-interpolate tasty tasty-hunit text unliftio wreq + ]; + description = "A package for integrating a variety of captcha solving services"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "captcha-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, cookie + , data-default-extra, lens, mtl, o-clock, string-conversions, text + , unliftio, wreq + }: + mkDerivation { + pname = "captcha-core"; + version = "0.1.0.0"; + sha256 = "08bvgmxj7rs0gz8rnidrxmw7p9ahw40p07k3gs3vk5h275dnqsk7"; + libraryHaskellDepends = [ + aeson base bytestring cookie data-default-extra lens mtl o-clock + string-conversions text unliftio wreq + ]; + description = "A package for integrating a variety of captcha solving services"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "car-pool" = callPackage ({ mkDerivation, base, blaze-html, containers, digestive-functors , digestive-functors-blaze, digestive-functors-happstack @@ -52950,8 +53167,8 @@ self: { }: mkDerivation { pname = "casr-logbook"; - version = "0.6.6"; - sha256 = "0nq6jkaxw68dn4m9pqa717w0k1kbvqz00ji4sjal3r2imykpwrfa"; + version = "0.6.9"; + sha256 = "0ga60asv7i5jdmvbv25s9h7b23p4f4aasmksh6swbxz5fzky7g7g"; libraryHaskellDepends = [ base containers digit lens lucid text time ]; @@ -55304,10 +55521,8 @@ self: { }: mkDerivation { pname = "chell"; - version = "0.5"; - sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg"; - revision = "1"; - editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0"; + version = "0.5.0.1"; + sha256 = "10zpnalrz4riyqbk2bwsdml4b23x3mrn0cg4hmssffsa50yq93gs"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -55320,8 +55535,8 @@ self: { ({ mkDerivation, base, chell, HUnit }: mkDerivation { pname = "chell-hunit"; - version = "0.3"; - sha256 = "18p9rhs81b43jb95dqg650h3cajsw45w7cgsavkm18h0qhrz41kb"; + version = "0.3.0.1"; + sha256 = "01dv6lv4bj1m0sk7v90w5jnlyvir2v969sw8hrif2h3hy9f3pc9v"; libraryHaskellDepends = [ base chell HUnit ]; description = "HUnit support for the Chell testing library"; license = lib.licenses.mit; @@ -55331,8 +55546,8 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.5.2"; - sha256 = "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03"; + version = "0.2.5.3"; + sha256 = "1bm2gva5g9y71z2kbnl4dinplvlbisnjqhlcvgf6a9ir7y4r5c0x"; libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for the Chell testing library"; license = lib.licenses.mit; @@ -55926,6 +56141,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.1"; sha256 = "0fvf26394rpn9g4f3rp13bq8rrhzs9d95k7nbcpayzml2j9rsv3l"; + revision = "1"; + editedCabalFile = "13c4sc83kl6wvx39b1i09mjgsnn4l7ffcynnhsnn9v5y3nzw3j78"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -56143,8 +56360,8 @@ self: { }: mkDerivation { pname = "cimple"; - version = "0.0.8"; - sha256 = "08mm6v0a52l7wq4kaj4zs9wyvnf7g0qmhxvbdbbrcqgxm8a9mc9v"; + version = "0.0.11"; + sha256 = "1n7633c6w4n4996i3k9v60yhpiddd8b7600c7hpam2axm9cqb19i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56555,7 +56772,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_6" = callPackage + "citeproc_0_6_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -56564,8 +56781,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.6"; - sha256 = "1dx61f8y32b5w84d2fzaxfgdj2gyr0wyqhh6jl2jf2lfn5cbhll3"; + version = "0.6.0.1"; + sha256 = "015ansq3a710s0hzs2157fx12bc4f1hy45l4dbi6j477sy800bqc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57741,8 +57958,19 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "cli-arguments"; - version = "0.3.1.0"; - sha256 = "14zgzsps25xr47a2l888xrzg3d09zfdz62g6d3liawhmf1kiwbkp"; + version = "0.6.0.0"; + sha256 = "0vg5xmdg84bv6bab03iv9zj0i1vkp9xlfjbm1rpzjjhpihp8v5sg"; + libraryHaskellDepends = [ base ]; + description = "A library to process command line arguments in some more convenient way"; + license = lib.licenses.mit; + }) {}; + + "cli-arguments-strict" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cli-arguments-strict"; + version = "0.1.0.0"; + sha256 = "06m6b5jcc00n4xaqz27f4f3vyb13ic8vnqf3nazhr2dnx0xjfad3"; libraryHaskellDepends = [ base ]; description = "A library to process command line arguments in some more convenient way"; license = lib.licenses.mit; @@ -60948,6 +61176,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_3" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3"; + sha256 = "02zq9ma58yngabz1rw0alaq9s8lsfmxjn8m3dfjxavvq2pl3748f"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -61246,12 +61496,27 @@ self: { }) {}; "compactable" = callPackage - ({ mkDerivation, base, containers, transformers, vector }: + ({ mkDerivation, aeson, base, base-compat, bifunctors, containers + , contravariant, data-default-class, deepseq, genvalidity + , genvalidity-sydtest, hashable, keys, lens, QuickCheck + , semigroupoids, sydtest, sydtest-discover, these, transformers + , transformers-compat, unordered-containers, vector + , vector-instances + }: mkDerivation { pname = "compactable"; - version = "0.1.2.4"; - sha256 = "13lynjbwr78jy3j0zx6g2rk8qvyzkgw1smriqm6sslp3nn0v1g4r"; - libraryHaskellDepends = [ base containers transformers vector ]; + version = "0.2.0.0"; + sha256 = "0ngcrmb9yihwn5dm6dcfkclgk31m92qa14rk99i2g6hbdmd6w747"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors containers contravariant + data-default-class deepseq hashable keys lens QuickCheck + semigroupoids these transformers transformers-compat + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-sydtest QuickCheck sydtest + sydtest-discover these vector + ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = lib.licenses.bsd3; }) {}; @@ -65604,8 +65869,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.6"; - sha256 = "0h43slh084wj7kwn2rdn0s63pqzy930h6z2vk38kn6yqic8d9s9y"; + version = "3.7"; + sha256 = "1s39w0vqk2pdd9b3kxvjzi6r300x4mxz6rbkpdjzccagnk08xzay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65624,8 +65889,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.6"; - sha256 = "18p7pijx2f7bw61bzfs5994xpkygghf7hvwpklhp72jkshjdjj1m"; + version = "3.7"; + sha256 = "0k30n2w6sw76fdm42vrn28jrz23w3sydkmmh3lmbd42kipp01h7b"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -65658,10 +65923,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.6"; - sha256 = "00v8la4q15qj27wyqcbsv0h7m5k5ln98y4zkdzpng3z5gw4mpkm9"; - revision = "2"; - editedCabalFile = "0yrrrksyhn7xq0hrp5shlrs0mf725dwzaskd5f13v143k8yx6c7c"; + version = "3.7"; + sha256 = "0mf6mim94ryixdbwwdr39bvc704fwi0pdj3zkdl4csnj3gv4mr40"; libraryHaskellDepends = [ base dlist mtl pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -65679,8 +65942,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.6"; - sha256 = "0b1cl4v5w54nx007mmnsx49hh3zxjm55ninlzkd78balnyah8nlk"; + version = "3.7"; + sha256 = "1p1l7ciyvwgghnshf7apjwarf9w2wsyqflib5xghq9y1dhmz0xg4"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify mtl ]; @@ -65695,8 +65958,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.6"; - sha256 = "0s6y1is91nbvlrb9fdp9xhaq9wx3j5pm67gjrlajiik4029a2dxd"; + version = "3.7"; + sha256 = "1lqi3ml5vw0qjki4rmb1kk6q6yapc24zwvmsccnlik5llnrhb7lv"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -65730,8 +65993,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.6"; - sha256 = "17l8xq4zd9jfih5p21l6xkahdgrfbmpy8wxc38w88w98qmz5ix59"; + version = "3.7"; + sha256 = "1h587747s52gx03qspnhx5jbkrrxhg618mibbwfcxpk7w7bdayv1"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65940,8 +66203,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.1.7.3"; - sha256 = "05l6s3bw1gp36wx052c5q3mvzzmfdv922851kmr6ax79m5fxdsd9"; + version = "0.1.8.1"; + sha256 = "024npp0cm5f3v1h70iw03hv2lj0r2ylsp7w2pm1iv6zr8j63k1iy"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program core-text exceptions http-streams io-streams locators mtl random @@ -65985,6 +66248,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-webserver-servant" = callPackage + ({ mkDerivation, base, core-program, core-telemetry + , core-webserver-warp, mtl, safe-exceptions, servant + , servant-server, vault, wai + }: + mkDerivation { + pname = "core-webserver-servant"; + version = "0.1.0.0"; + sha256 = "1d888qpm9g867czdhyv65302badpwg275xran5n3mapfjvk1zbqd"; + libraryHaskellDepends = [ + base core-program core-telemetry core-webserver-warp mtl + safe-exceptions servant servant-server vault wai + ]; + description = "Interoperability with Servant"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "core-webserver-warp" = callPackage + ({ mkDerivation, async, base, bytestring, core-data, core-program + , core-telemetry, core-text, http-types, http2, mtl + , safe-exceptions, vault, wai, warp + }: + mkDerivation { + pname = "core-webserver-warp"; + version = "0.1.1.0"; + sha256 = "0yfd2037bq6vljixkhrk2v2mlywj2br16pf5dpz2vahjpk0079yj"; + libraryHaskellDepends = [ + async base bytestring core-data core-program core-telemetry + core-text http-types http2 mtl safe-exceptions vault wai warp + ]; + description = "Interoperability with Wai/Warp"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -67413,6 +67712,8 @@ self: { pname = "criterion"; version = "1.5.12.0"; sha256 = "0wrb48byp906f9wc9ii2mi2b2k008ycbi8ffrrj86plhp5rpvzz5"; + revision = "1"; + editedCabalFile = "154jscaip9y081mvf70vcwqw0acynfb9hwxgqwmzqq9q6d8b1wfw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -68461,8 +68762,8 @@ self: { pname = "cryptonite-cd"; version = "0.29.1"; sha256 = "053zfjxwnpaiw0kkky0fdbdqqyarygqnvmlm4vziqqrlkm4nba0c"; - revision = "1"; - editedCabalFile = "1y97mmslygswj5aydkvlj5vvf5xzkjxxjrblp3h9mx6wr9k63iyi"; + revision = "3"; + editedCabalFile = "1j7ch1h7irlk8lx0zjk41f4j0fmn3x96zf5355m669dwivan3m7s"; libraryHaskellDepends = [ base basement-cd bytestring deepseq ghc-prim integer-gmp memory-cd ]; @@ -69978,12 +70279,12 @@ self: { license = lib.licenses.mit; }) {}; - "d10_1_0_0_1" = callPackage + "d10_1_0_0_2" = callPackage ({ mkDerivation, base, hedgehog, template-haskell }: mkDerivation { pname = "d10"; - version = "1.0.0.1"; - sha256 = "0jaql1ql1pm0s6xd0mmi0gadx7z0ms62q46rxy4ida8k4v76r7cl"; + version = "1.0.0.2"; + sha256 = "10jc4sa986r194py1gg90mixvb2h4d1m12zwi6y5hffmrc910qva"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hedgehog template-haskell ]; description = "Digits 0-9"; @@ -74325,6 +74626,29 @@ self: { license = lib.licenses.mit; }) {}; + "deferred-folds_0_9_18" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.18"; + sha256 = "15yd5wqkksainhwwiq8vlf49ih2789wz9njv7050s5mr20b2rqy1"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -75465,6 +75789,22 @@ self: { license = lib.licenses.mit; }) {}; + "derulo_2_0_0_1" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "derulo"; + version = "2.0.0.1"; + sha256 = "15lq7yv69i7azz2vxbx29k9csz62pp3a01qk8sng6yrq734qw8dx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Parse and render JSON simply"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "describe" = callPackage ({ mkDerivation, base, bytestring, cereal, fixed-vector, lens , mmorph, monad-control, mtl, profunctors, QuickCheck @@ -76956,8 +77296,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "4"; - editedCabalFile = "1hsi63kig21mb71qa4kf27h4g99xxqwlfqzl9jpca451sadlk7mp"; + revision = "5"; + editedCabalFile = "0qfsfrg9igmma9k68qdlkbgnla09w9y1a55kzxk49sfvfzvkilz5"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -77110,6 +77450,8 @@ self: { pname = "diagrams-lib"; version = "1.4.5.1"; sha256 = "1hkxp549i99s45qk8zmhjvz1xyyv3i0ffl8155bifkic6fd8y2gz"; + revision = "1"; + editedCabalFile = "0yqpasggmdkzg2n67a6m20rbhzcgchnfhs66m95lnp5n9vl7v8mn"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -77309,8 +77651,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3.1"; sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237"; - revision = "1"; - editedCabalFile = "0534kgm9r70s5yhfjy4pkqy1f2aflg0acfp2g23xjfzr9kwq9v7m"; + revision = "2"; + editedCabalFile = "056nfj2srbhh68jc5al8hffcfrqlr89173pjf6bhpmnzxhwlv55k"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -78711,20 +79053,21 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , containers, data-default, emoji, http-client, iso8601-time - , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, text, time - , unliftio, unordered-containers, vector, websockets, wuss + , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, scientific + , text, time, unliftio, unordered-containers, vector, websockets + , wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.10.0"; - sha256 = "1im1yjlnk8b8fcwyhlza1iggmry5r96sdibq2whcsyxqnpg24fr0"; + version = "1.11.0"; + sha256 = "10vak5aar5fx25ani676pi870mnnvzrn6n1b1akhdyags1hrsghm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default emoji http-client iso8601-time JuicyPixels MonadRandom - mtl req safe-exceptions text time unliftio unordered-containers - vector websockets wuss + mtl req safe-exceptions scientific text time unliftio + unordered-containers vector websockets wuss ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; @@ -84098,8 +84441,8 @@ self: { pname = "ed25519"; version = "0.0.5.0"; sha256 = "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"; - revision = "3"; - editedCabalFile = "1yidh86ymzwmp2b449pwim6vvfcs1qgkkncbixw1zmb7wj6v167v"; + revision = "4"; + editedCabalFile = "1jr8v3kw69fdchnynflq3gz1bwx4jm5jpl7c00bnflrhkdrfbndn"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck @@ -88034,8 +88377,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; - revision = "1"; - editedCabalFile = "08y607nwnw12vlbmwcppv1ydw726x8p3kwwx4rgaiss906hgnzrp"; + revision = "2"; + editedCabalFile = "1x1bhmkx7zxwdfassc9ypl9d319p6f14rv6d3mjgvac7nxfbq245"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -88987,6 +89330,8 @@ self: { pname = "evdev"; version = "2.1.0"; sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; + revision = "1"; + editedCabalFile = "0c930gd1a9pwlr4p9r9d9nizr90g06l836rai5b83z5sa0s3p01n"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops rawfilepath time unix @@ -89005,17 +89350,16 @@ self: { "evdev-streamly" = callPackage ({ mkDerivation, base, bytestring, containers, evdev, extra - , posix-paths, rawfilepath, streamly, streamly-fsnotify, unix + , filepath-bytestring, rawfilepath, streamly, streamly-fsnotify + , unix }: mkDerivation { pname = "evdev-streamly"; - version = "0.0.1.0"; - sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp"; - revision = "1"; - editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj"; + version = "0.0.2.0"; + sha256 = "0vrkg3d1171lsr71k3vrcf9vbl18mdnvpi02sxvzjp2zbv3gs7v6"; libraryHaskellDepends = [ - base bytestring containers evdev extra posix-paths rawfilepath - streamly streamly-fsnotify unix + base bytestring containers evdev extra filepath-bytestring + rawfilepath streamly streamly-fsnotify unix ]; description = "Bridge for working with evdev and streamly"; license = lib.licenses.bsd3; @@ -90781,16 +91125,16 @@ self: { "exploring-interpreters" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , fgl, http-types, mtl, network, readline, scientific, text - , transformers + , exceptions, fgl, haskeline, http-types, mtl, network, scientific + , text, transformers }: mkDerivation { pname = "exploring-interpreters"; - version = "1.0.0.0"; - sha256 = "11anvk0m8ihl2pgf3wmlw97hc886wg2rngvw86zwyd5hzg0chi66"; + version = "1.3.0.0"; + sha256 = "12a2z2z5c8kaqn7mks28ppazmkfvxn9lah6argmjqsd5ahwsxazs"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers fgl http-types mtl - network readline scientific text transformers + aeson attoparsec base bytestring containers exceptions fgl + haskeline http-types mtl network scientific text transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; @@ -96348,6 +96692,19 @@ self: { license = lib.licenses.mit; }) {}; + "flow_2_0_0_0" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "flow"; + version = "2.0.0.0"; + sha256 = "03zhamnwni9y0div9lwdmw5nl63m6ykjppxhyhl95zknc0dml1vj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Write more understandable Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -97741,19 +98098,13 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, attoparsec, base, containers, doctest, foldl - , generic-lens, numhask, scientific, tdigest, text, transformers - }: + ({ mkDerivation, base, containers, text }: mkDerivation { pname = "formatn"; - version = "0.0.1"; - sha256 = "0rw1xli4df72wxylf211jhm0v2y842rfn8nalrp04yzklvyrri84"; - libraryHaskellDepends = [ - attoparsec base containers foldl generic-lens numhask scientific - tdigest text transformers - ]; - testHaskellDepends = [ base doctest numhask ]; - description = "Number text formatting"; + version = "0.1.0"; + sha256 = "1svixdvwzxmf5n6vx3pgx065z2gkabk563pp38bmp5z4mxvf67d9"; + libraryHaskellDepends = [ base containers text ]; + description = "Formatting of doubles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -98001,8 +98352,8 @@ self: { }: mkDerivation { pname = "fortran-vars"; - version = "0.1.0"; - sha256 = "1j1k4paca1g6w38kd7fl1h4vzf6rb8ypdfilhkn2fk5llxkkw226"; + version = "0.3.0"; + sha256 = "0095ifc9psi2mv348qw7538rl1ld2drfq5pcsbdyxrhklm12h5ji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98183,25 +98534,23 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_4_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , containers, Diff, directory, dlist, exceptions, filepath + "fourmolu_0_5_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring + , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb , temporary, text }: mkDerivation { pname = "fourmolu"; - version = "0.4.0.0"; - sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb"; - revision = "1"; - editedCabalFile = "03bwhqj547brmgk191gy3k9xayi6fqqk2f5sbz3ail1bk7b73xnq"; + version = "0.5.0.0"; + sha256 = "0rw2mkhlzcbczhmn93sffmnwsbmn3j0y6np3wn5f72166vjfr02i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal containers Diff directory - dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl - syb text + aeson ansi-terminal array base bytestring Cabal containers Diff + directory dlist exceptions filepath ghc-lib-parser HsYAML + HsYAML-aeson mtl syb text ]; executableHaskellDepends = [ base directory filepath ghc-lib-parser gitrev optparse-applicative @@ -98515,8 +98864,8 @@ self: { }: mkDerivation { pname = "franz"; - version = "0.5.2"; - sha256 = "0mah7ghfzgg41iazvwpxzr6gc0afw30hsp6v3vg1vadnsp96nfnl"; + version = "0.5.3"; + sha256 = "034fz3k07l5sf9hd9c56646df9d570dv7lcdwlsf68a7hrd0icqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98556,33 +98905,35 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , case-insensitive, conduit, data-default, datadog, directory - , doctest, ekg-core, errors, exceptions, fast-logger, filepath - , Glob, hspec, hspec-core, hspec-expectations-lifted - , hspec-junit-formatter, http-client, http-conduit - , http-link-header, http-types, immortal, iproute, lens, lens-aeson - , load-env, monad-control, monad-logger, MonadRandom, mtl, network - , network-uri, persistent, persistent-postgresql, postgresql-simple - , primitive, process, resource-pool, retry, rio, template-haskell + , case-insensitive, conduit, containers, data-default, datadog + , directory, doctest, ekg-core, errors, exceptions, fast-logger + , filepath, Glob, hashable, hspec, hspec-core + , hspec-expectations-lifted, hspec-junit-formatter, http-client + , http-conduit, http-link-header, http-types, immortal, iproute + , lens, lens-aeson, load-env, monad-control, monad-logger + , MonadRandom, mtl, network, network-uri, persistent + , persistent-postgresql, postgresql-simple, primitive, process + , resource-pool, retry, rio, safe, semigroupoids, template-haskell , temporary, text, time, transformers, transformers-base, unliftio - , unliftio-core, unordered-containers, wai, wai-extra, yaml, yesod - , yesod-core + , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml + , yesod, yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.2"; - sha256 = "1n7fp40v8zac1b9gmq07c6d5lnbjh64ma0ykh35v87kd3jdrf9rk"; + version = "1.0.2.3"; + sha256 = "05khvp1gr3ngrcfz4ly9zjmxp8pdiyjmmbrc4pv2rrlpgmnj1zfk"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit - data-default datadog doctest ekg-core errors exceptions fast-logger - filepath Glob hspec hspec-core hspec-expectations-lifted - hspec-junit-formatter http-client http-conduit http-link-header - http-types immortal iproute lens load-env monad-control - monad-logger MonadRandom mtl network network-uri persistent - persistent-postgresql postgresql-simple primitive process - resource-pool retry rio template-haskell text time transformers - transformers-base unliftio unliftio-core unordered-containers wai - wai-extra yaml yesod yesod-core + containers data-default datadog doctest ekg-core errors exceptions + fast-logger filepath Glob hashable hspec hspec-core + hspec-expectations-lifted hspec-junit-formatter http-client + http-conduit http-link-header http-types immortal iproute lens + load-env monad-control monad-logger MonadRandom mtl network + network-uri persistent persistent-postgresql postgresql-simple + primitive process resource-pool retry rio safe semigroupoids + template-haskell text time transformers transformers-base unliftio + unliftio-core unordered-containers vector wai wai-extra yaml yesod + yesod-core ]; testHaskellDepends = [ aeson base bytestring directory hspec http-types lens lens-aeson @@ -99100,6 +99451,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "freer-simple_1_2_1_2" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.2.1.2"; + sha256 = "11ypffdkpaxc03hlik6ymilhnk41fy7m92zzwqjma97g614vn0lw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation template-haskell transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + description = "A friendly effect system for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "freer-simple-catching" = callPackage ({ mkDerivation, base, freer-simple, hspec }: mkDerivation { @@ -100417,8 +100794,8 @@ self: { pname = "functor-infix"; version = "0.0.5"; sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn"; - revision = "1"; - editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf"; + revision = "2"; + editedCabalFile = "0ypnjnxwz4dpdhajqk8y67lrcwjgyc4lh1i3d3zjxmgr3zbym8d2"; libraryHaskellDepends = [ base template-haskell ]; description = "Infix operators for mapping over compositions of functors. Lots of them."; license = lib.licenses.mit; @@ -100892,7 +101269,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_21_2" = callPackage + "futhark_0_21_4" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 @@ -100907,8 +101284,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.2"; - sha256 = "09cvyqkhwnp5h759j0rggp2i6n48hkb7ck8284d8ahkq3lh47isg"; + version = "0.21.4"; + sha256 = "0ij7sc9zq3l8i100kf7acwvrmqnq3f6x78wv5a7r8mfmb8bs51b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105811,7 +106188,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_2_1_20211101" = callPackage + "ghc-lib_9_2_1_20220109" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -105819,8 +106196,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.1.20211101"; - sha256 = "10rzvj7m6m664szxjaf3mk1v42lb4imwkrvpqn26x7p3jd7ywph0"; + version = "9.2.1.20220109"; + sha256 = "0858r81w2al9h9q53z4paqkf3fvxraf3ghvb4ga4kilxiq5rp8z6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -105873,15 +106250,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_2_1_20211101" = callPackage + "ghc-lib-parser_9_2_1_20220109" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.1.20211101"; - sha256 = "0dxhpczlpppdsmn1cnz2minpkvlz27njzv7xcbqgfgl0bvp5wx0n"; + version = "9.2.1.20220109"; + sha256 = "0scm320w19lm40y2i1858h24704s9hvci37pxmlraxa0virjhcx6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -106430,21 +106807,20 @@ self: { }) {}; "ghc-tags-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion - , deepseq, directory, filepath, filepath-bytestring, ghc, lattices - , mtl, pipes, pipes-attoparsec, pipes-bytestring, QuickCheck + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , directory, filepath, filepath-bytestring, ghc, lattices, mtl + , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text , transformers }: mkDerivation { pname = "ghc-tags-core"; - version = "0.3.0.0"; - sha256 = "035k7akyhhn5jf2231ahplgggymc8h8k2kxia6i22v9cv976zgna"; + version = "0.3.1.0"; + sha256 = "052ylgf0sjwmkf1p1lzsisk9j1dgwpjgw1n81bnfhvlvarhncavq"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers ]; - libraryToolDepends = [ cpphs ]; testHaskellDepends = [ attoparsec base bytestring directory filepath filepath-bytestring lattices mtl pipes QuickCheck quickcheck-instances tasty @@ -106468,8 +106844,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.3.0.0"; - sha256 = "1d39jnz79vlxqqg2bw3cj1djii3bkmayqs4sm2a6bs5xzsplc5w3"; + version = "0.4.0.0"; + sha256 = "078l3m6sl60ilqj25zd9sqjjpss348ylsbz8l7bvhf45n91gx6yn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106486,8 +106862,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.7.0.0"; - sha256 = "0lnvfahphrkvg4r0r5imxqjj0a5bb5cpcx85svw4g4y9p13i94jh"; + version = "0.7.1.0"; + sha256 = "02qmqmhlcfn53hs7wl92r65r6dcg01fdrwqn4capjlxs1bdsfpbr"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -106601,6 +106977,8 @@ self: { pname = "ghc-typelits-natnormalise"; version = "0.7.6"; sha256 = "09d70iw58m5g6yi8k2b52f1g0pfdqm5fzhs8rd7fgrgmi70np9bx"; + revision = "1"; + editedCabalFile = "1b587pryjkbvgayqwm8cn7ljmcyd4jikrxxkgm6zq1v9qhi7xy22"; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra integer-gmp transformers ]; @@ -110335,6 +110713,30 @@ self: { license = lib.licenses.mit; }) {}; + "github-release_2_0_0_0" = callPackage + ({ mkDerivation, aeson, base, burrito, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers + }: + mkDerivation { + pname = "github-release"; + version = "2.0.0.0"; + sha256 = "03bvbqpaa3xp9rnmg8a95qs9j7chng1xsk53f30520m1cfyyikgq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + executableHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + description = "Upload files to GitHub releases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-rest" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty @@ -119428,8 +119830,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "8"; - editedCabalFile = "1xpzcdpfz0agbv75sadsylq6r8pq7zr0pyzbzrz0nz130yixsv5f"; + revision = "9"; + editedCabalFile = "14g1zr05qcvrn5ghhjmk6pz9h2ypa84bgqddxm0sk0qxbzpnxmqi"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -123150,7 +123552,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_4_0_1" = callPackage + "hashable_1_4_0_2" = callPackage ({ mkDerivation, base, base-orphans, bytestring, containers , deepseq, ghc-prim, HUnit, integer-gmp, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -123158,10 +123560,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.4.0.1"; - sha256 = "04v61w87hvm6lg9a7p5mz177iab3rvb86pzcclcdw0w314dsxpaw"; - revision = "1"; - editedCabalFile = "1rcvw4fjm3v29phg0q54x8358c4qvg1y8cwy6lqzmg1kvhd9qp63"; + version = "1.4.0.2"; + sha256 = "003nlhi8wzlsikfwi0q6ma3b38wizvazci6dbq3lr4bd6pfnwq43"; libraryHaskellDepends = [ base base-orphans bytestring containers deepseq ghc-prim integer-gmp text @@ -123996,8 +124396,8 @@ self: { }: mkDerivation { pname = "haskell-ci"; - version = "0.12.1"; - sha256 = "0bdb3x2kk5nqm6ly2ycdpx6xw7pspgg67x73cjscqj6pxcx1wjzf"; + version = "0.14"; + sha256 = "1vaxbby4sfrzzr0bzw6dv3kb9f6k3i4w16xfxvm3h2jazrw56122"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -126793,8 +127193,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.64.10"; - sha256 = "16dslrdkl4dw7ywjf181mr8vnrjwz9yrc03jr80c704vc0034ymj"; + version = "0.64.16"; + sha256 = "13dbx5szx87zhb5xq007lbpisr94593sf3a144a5052pbghcyj4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126841,8 +127241,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.64.10"; - sha256 = "01nlxy8s37nizvliq6167aaiqy4nl7an3qnhka0pnzawlvn6hdhk"; + version = "0.64.16"; + sha256 = "01fgnbvwhxz4829ksv01165bvnhqyd3djjqm96819jp5r1ifzjin"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -128116,8 +128516,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.10"; - sha256 = "1s339xkqdz1hcd8i183lzf565radl95zqq0y7h2r2ayz3rh36485"; + version = "0.4.0.11"; + sha256 = "1dkx0r874qzn2kb8wimr1n75vmx70jx5ddi8088dlw5cxhj2v950"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -133572,18 +133972,18 @@ self: { license = lib.licenses.bsd3; }) {}; - "hie-bios_0_8_0" = callPackage + "hie-bios_0_8_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, exceptions, extra, file-embed, filepath, ghc, hslogger - , hspec-expectations, optparse-applicative, process, tasty - , tasty-expected-failure, tasty-hunit, temporary, text, time - , transformers, unix-compat, unordered-containers, vector, yaml + , optparse-applicative, process, tasty, tasty-expected-failure + , tasty-hunit, temporary, text, time, transformers, unix-compat + , unordered-containers, vector, yaml }: mkDerivation { pname = "hie-bios"; - version = "0.8.0"; - sha256 = "1apy7zdafrw96f7sbhhq62hlk4blcsi4kc4kq59wcm2yvj134rvv"; + version = "0.8.1"; + sha256 = "1rd0aasab8z8ilwyzngvs99wbb861hlmc8bmmnnfgd742xldxs2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133596,7 +133996,7 @@ self: { base directory filepath ghc optparse-applicative ]; testHaskellDepends = [ - aeson base directory extra filepath ghc hspec-expectations tasty + aeson base directory extra filepath ghc tasty tasty-expected-failure tasty-hunit temporary text unordered-containers yaml ]; @@ -137559,8 +137959,8 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.14.0.5"; - sha256 = "1h2m9vrgss4mg25dyfwhb93h1c60nrkw122b7hnpiff5lm1jy89f"; + version = "0.14.0.7"; + sha256 = "1irwfq4gx5rzryqp8hh2cwf3c4cz9pmilbc2qhb3h609bfn5rwlq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140154,8 +140554,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.14.0.0"; - sha256 = "143ghr188d9kp0cz421pr87sdvf2nzabp76b3py716xmrz9jckq5"; + version = "1.14.1.0"; + sha256 = "17ixli3w1ixa7hspvcgggyslpxgprl40vjjavi81c44crj7w4m4q"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -140674,21 +141074,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; - "hruby_0_4_0_0" = callPackage + "hruby_0_5_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , process, QuickCheck, ruby, scientific, stm, text , unordered-containers, vector }: mkDerivation { pname = "hruby"; - version = "0.4.0.0"; - sha256 = "0qd3mfc8mr5b0vmvfqnmjrba5abvwb4vn6mjlm0mhlgigmh685f9"; + version = "0.5.0.0"; + sha256 = "10ldq23lgp3jcxpdm9b1dryjf4sprsjlc4qs1lnjb9cmfcafrqj4"; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; - librarySystemDepends = [ ruby ]; + libraryPkgconfigDepends = [ ruby ]; testHaskellDepends = [ aeson attoparsec base QuickCheck text vector ]; @@ -141412,8 +141812,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.0"; - sha256 = "0z9fwppsgyrw56r4fcb0ds06rvn2vskmc3l7fhkdb47j71fill58"; + version = "0.0.3.1"; + sha256 = "0z4j2jih8076xic39kil0w0p6vcjbpcmpbfiskx2i7ycm2cg4gs2"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c @@ -141733,6 +142133,26 @@ self: { broken = true; }) {}; + "hs-tags_0_1_5_3" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc + , ghc-paths, mtl, process, strict + }: + mkDerivation { + pname = "hs-tags"; + version = "0.1.5.3"; + sha256 = "17h1jgi7nr6p93zhsqxx6gx1yjwv0gahz84pw14gnsr79v3q9z1f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths mtl process + strict + ]; + description = "Create tag files (ctags and etags) for Haskell code"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -144765,6 +145185,23 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-pretty-diff_0_7_2_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, Diff, hscolour, hspec + , HUnit, nicify-lib, text, unicode-show + }: + mkDerivation { + pname = "hspec-expectations-pretty-diff"; + version = "0.7.2.6"; + sha256 = "0wksgvdj50yc3p4bg3wmacf2w75v7p8nlq1g33z5amrwllig6m49"; + libraryHaskellDepends = [ + ansi-terminal base Diff hscolour HUnit nicify-lib text unicode-show + ]; + testHaskellDepends = [ aeson base hspec HUnit text ]; + description = "Catchy combinators for HUnit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-experimental" = callPackage ({ mkDerivation, base, hspec, hspec-meta, HUnit, QuickCheck }: mkDerivation { @@ -148923,28 +149360,30 @@ self: { "hup" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , hspec, hspec-core, hspec-wai, http-client, http-client-tls - , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar - , temporary, text, transformers, wai, wai-extra, zlib + , http-types, lifted-base, mtl, network, QuickCheck, scotty, shelly + , split, tagsoup, tar, temporary, text, transformers, vector, wai + , wai-extra, warp, zlib }: mkDerivation { pname = "hup"; - version = "0.3.0.2"; - sha256 = "05xgbdzy3jg9qpxrxrfb6mjydw80wa65gkjcpqj2ckmk0vd6hmhr"; + version = "0.3.0.3"; + sha256 = "0igs4w546zqpav40c3v99lfi8gix70ssx97b0dnq6fw6c02kacq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath http-client http-client-tls - http-types mtl split tar zlib + http-types mtl split tar text zlib ]; executableHaskellDepends = [ - base bytestring cmdargs directory mtl shelly tagsoup text - transformers + base bytestring cmdargs directory lifted-base mtl shelly tagsoup + text transformers ]; testHaskellDepends = [ base bytestring filepath hspec hspec-core hspec-wai http-client - http-types QuickCheck simple temporary transformers wai wai-extra + http-types mtl network QuickCheck scotty temporary text + transformers vector wai wai-extra warp ]; - description = "Upload packages or documentation to a hackage server"; + description = "Upload packages and/or documentation to a hackage server"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; broken = true; @@ -149894,6 +150333,31 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) rdkafka;}; + "hw-kafka-client_5_0_0" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers + , either, hspec, hspec-discover, monad-loops, rdkafka, text + , transformers, unix + }: + mkDerivation { + pname = "hw-kafka-client"; + version = "5.0.0"; + sha256 = "1w0c80pn43xg4rrmwwq37yya96fil124sdly9djjnxm1g0brwjz6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors bytestring containers text transformers unix + ]; + librarySystemDepends = [ rdkafka ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bifunctors bytestring containers either hspec monad-loops text + ]; + testToolDepends = [ hspec-discover ]; + description = "Kafka bindings for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) rdkafka;}; + "hw-kafka-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conduit , conduit-extra, containers, exceptions, extra, hspec @@ -153814,12 +154278,16 @@ self: { }) {}; "include-env" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, containers, template-haskell + , th-lift-instances + }: mkDerivation { pname = "include-env"; - version = "0.4.0.0"; - sha256 = "0swq7fzij24wmqid0zb7hz6v4q8nm3qvd741wd183lidrkisgpf0"; - libraryHaskellDepends = [ base template-haskell ]; + version = "0.5.0.0"; + sha256 = "1jcq2hnak3mwxxpqp81gh8adm97czip0fb7h92k6n8sxrbvf4b1c"; + libraryHaskellDepends = [ + base containers template-haskell th-lift-instances + ]; description = "Include the value of an environment variable at compile time"; license = lib.licenses.bsd3; }) {}; @@ -155868,8 +156336,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.1.2"; - sha256 = "0cnzlsmqg6snvggq7fh2c6hmjaijxqz8ng0lnzfyz8p3lk4p42zi"; + version = "1.2.0"; + sha256 = "1n9db9p3v7da1d3j21lrm46s2py0m1rdfjpvilx43n7yd6630i81"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -156615,6 +157083,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "ip6addr_1_0_3" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "1.0.3"; + sha256 = "16dbvrsbg7l4z31faxm1pxps0plg89d4ny2mxsgwyq8r351irmwc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + description = "Commandline tool to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ipa" = callPackage ({ mkDerivation, attoparsec, base, hspec, template-haskell, text , unicode-transforms @@ -156869,6 +157351,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ipynb_0_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, directory, filepath, microlens, microlens-aeson + , tasty, tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "ipynb"; + version = "0.2"; + sha256 = "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath microlens microlens-aeson + tasty tasty-hunit text + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , cryptonite, directory, filepath, memory, parsec, process @@ -157280,6 +157784,19 @@ self: { license = lib.licenses.asl20; }) {}; + "isbn_1_1_0_3" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "isbn"; + version = "1.1.0.3"; + sha256 = "16srdvsjsiqzcm0hb3rhwry1vr170fz85g84wk6nyk1glbva4bga"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + description = "ISBN Validation and Manipulation"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "isdicom" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck , template-haskell @@ -157495,8 +158012,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "isocline"; - version = "1.0.6"; - sha256 = "0yxnylxmim43a4gc8hnz32gv3p1mzfx5v0j0pn2frn3xhjx9mxhn"; + version = "1.0.7"; + sha256 = "0pcvi7rq6v32q6zqcl7fh7ncbjd2qirhb4z380x2d57qal5lk1lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -158392,6 +158909,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "jacinda" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, happy + , microlens, microlens-mtl, mtl, optparse-applicative + , prettyprinter, recursion, regex-rure, tasty, tasty-hunit, text + , transformers, vector + }: + mkDerivation { + pname = "jacinda"; + version = "0.2.0.0"; + sha256 = "17kayg0xlfm0a037kg2h0hyrjnzwaxkkjmf08pid8vqaq14x0p1g"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers microlens microlens-mtl mtl + prettyprinter recursion regex-rure text transformers vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base bytestring optparse-applicative + ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + doHaddock = false; + description = "Functional, expression-oriented data processing language"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "jack" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list , explicit-exception, libjack2, midi, non-negative, semigroups @@ -160130,6 +160674,26 @@ self: { license = lib.licenses.mit; }) {}; + "json-feed_2_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "2.0.0.0"; + sha256 = "1d2xjyi5b6v5sq0g4aayirfjj4l7lskwv28w6601dxwz7yrsp234"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -160280,7 +160844,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell @@ -160871,6 +161435,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "jsonpath_0_2_1_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring + , file-embed, hspec, hspec-attoparsec, hspec-discover, text + , unordered-containers, vector + }: + mkDerivation { + pname = "jsonpath"; + version = "0.2.1.0"; + sha256 = "1d9h6j0xzrpxc56wym9b0sdanpw1v2rcx1sdm49h6iriwwmckb10"; + libraryHaskellDepends = [ + aeson attoparsec base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring file-embed hspec + hspec-attoparsec text unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library to parse and execute JSONPath"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonresume" = callPackage ({ mkDerivation, aeson, base, bytestring, old-locale, text, time , unordered-containers @@ -163889,6 +164475,28 @@ self: { broken = true; }) {}; + "koji-tool" = callPackage + ({ mkDerivation, base, directory, extra, filepath, format-numbers + , Glob, http-directory, koji, pretty-simple, rpm-nvr, simple-cmd + , simple-cmd-args, text, time, xdg-userdirs + }: + mkDerivation { + pname = "koji-tool"; + version = "0.6.1"; + sha256 = "1l2w0dcy4fcv865z27661j7jmfy3blf8q321mv18dn44f3wr0xax"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath format-numbers Glob http-directory + koji pretty-simple rpm-nvr simple-cmd simple-cmd-args text time + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Koji CLI tool for querying tasks and installing builds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -164530,6 +165138,19 @@ self: { license = lib.licenses.mit; }) {}; + "lackey_2_0_0_0" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "2.0.0.0"; + sha256 = "06ad35nmppblqb7400563l5qk3zna6l3kasp5ng0iacgmqzmvcrv"; + libraryHaskellDepends = [ base servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167593,8 +168214,8 @@ self: { }: mkDerivation { pname = "lazy-async"; - version = "1.0.0.0"; - sha256 = "0kk8pzwm04z4jljl38gd0n03nkxw3mxg8rg93ka0rvnibfwm8dda"; + version = "1.0.0.1"; + sha256 = "1nw24hfpw0wd099lxjsi1iqssbb7yw6isilkv4a68agv2q1ranvk"; libraryHaskellDepends = [ base exceptions lifted-async monad-control rank2classes stm transformers transformers-base @@ -172703,6 +173324,18 @@ self: { license = lib.licenses.isc; }) {}; + "list-singleton_2_0_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "list-singleton"; + version = "2.0.0.0"; + sha256 = "1mv2567as9vsnrqp23dzb7rlvcmid484rk94nrrfl8za97i1s4c0"; + libraryHaskellDepends = [ base ]; + description = "Easily and clearly create lists with only one element in them"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, semigroups, transformers @@ -173982,12 +174615,25 @@ self: { license = lib.licenses.asl20; }) {}; + "loc_0_1_3_16" = callPackage + ({ mkDerivation, base, containers, doctest, hedgehog }: + mkDerivation { + pname = "loc"; + version = "0.1.3.16"; + sha256 = "0bizqfczhc5higdzrrhinr5q3s971a3klfl3gpffnq9gyzd16nrq"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hedgehog ]; + description = "Types representing line and column positions and ranges in text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.8"; - sha256 = "0jg6p0lfd5xgrwbmlskj5f1x8l5b0b3dqh460ds2nii8isccgvcq"; + version = "0.1.3.10"; + sha256 = "0mppiz4nv86mfdk43w83jx3wn8c6w7g9k3m3jhgmwlgqpcpdrryd"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = lib.licenses.asl20; @@ -176226,12 +176872,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-alpine_0_1_0_4" = callPackage + "lucid-alpine_0_1_0_5" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { pname = "lucid-alpine"; - version = "0.1.0.4"; - sha256 = "1pr2fg5r43jvgh694lhqbmwl1dida9ymgw161j16dcj66jx8fjk6"; + version = "0.1.0.5"; + sha256 = "1prcr3rfpg3saybfjmfik9xznj0knvfxy5dwllkq6s5szi2bqyaz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lucid text ]; @@ -176309,12 +176955,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-htmx_0_1_0_3" = callPackage + "lucid-htmx_0_1_0_4" = callPackage ({ mkDerivation, base, lucid, servant, text }: mkDerivation { pname = "lucid-htmx"; - version = "0.1.0.3"; - sha256 = "1fgb4gika5f3bbba2as4bkg6m8nn2w25k17m45b389rwmhyg6syj"; + version = "0.1.0.4"; + sha256 = "0rq25ixsyvnp3zh3wsfmijlyv4dg94d1k1bhhwq8y624v819yg8r"; libraryHaskellDepends = [ base lucid servant text ]; testHaskellDepends = [ base lucid servant text ]; description = "Use htmx in your lucid templates"; @@ -179836,22 +180482,22 @@ self: { "matrix-client" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base, base64 , bytestring, containers, exceptions, hashable, hspec, http-client - , http-client-tls, http-types, retry, SHA, text, time + , http-client-tls, http-types, profunctors, retry, SHA, text, time , unordered-containers }: mkDerivation { pname = "matrix-client"; - version = "0.1.2.0"; - sha256 = "18n5il56p3hr6iax2d1m0b7vximc0z4jzj0dav0rhv3yrwy8p5w2"; + version = "0.1.3.0"; + sha256 = "14vsz507l93zdddr3k6rwvqwpwdmsansv5ryq87k58v04fyfmvz6"; libraryHaskellDepends = [ aeson aeson-casing base base64 bytestring containers exceptions - hashable http-client http-client-tls http-types retry SHA text time - unordered-containers + hashable http-client http-client-tls http-types profunctors retry + SHA text time unordered-containers ]; testHaskellDepends = [ aeson aeson-casing aeson-pretty base base64 bytestring containers exceptions hashable hspec http-client http-client-tls http-types - retry SHA text time unordered-containers + profunctors retry SHA text time unordered-containers ]; description = "A matrix client library"; license = lib.licenses.asl20; @@ -181536,6 +182182,8 @@ self: { pname = "memory-cd"; version = "0.16.0.1"; sha256 = "05dkgkms159k4mk4l1ngcnxqs2hbnzmh9zv3gks0cx7wba6qyrf1"; + revision = "1"; + editedCabalFile = "1kja8j32h1ff6vkn3smj88k4gzgi0il8kv47cm8hwgn0v0cjjy9f"; libraryHaskellDepends = [ base basement-cd bytestring deepseq ghc-prim ]; @@ -184106,8 +184754,8 @@ self: { }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "6"; - sha256 = "1bwnpf7jvbc8z7aipw0fvkgjq1mmwn1xmm6vaaipf3ami10gpfn5"; + version = "7"; + sha256 = "1asr82fnqpb936kfj8fnilas76l5r5ndylvzf1van2z57sxjx9ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187327,20 +187975,24 @@ self: { }) {}; "monoid-statistics" = callPackage - ({ mkDerivation, base, math-functions, QuickCheck, tasty - , tasty-quickcheck, vector, vector-th-unbox + ({ mkDerivation, base, criterion, doctest, exceptions + , math-functions, mwc-random, QuickCheck, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector + , vector-th-unbox }: mkDerivation { pname = "monoid-statistics"; - version = "1.0.1.0"; - sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9"; - revision = "1"; - editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv"; + version = "1.1.0"; + sha256 = "12q86bh057pn040wdr39wlq066mcffpgsx71jy5h8rj02qi4b78f"; libraryHaskellDepends = [ - base math-functions vector vector-th-unbox + base exceptions math-functions vector vector-th-unbox ]; testHaskellDepends = [ - base math-functions QuickCheck tasty tasty-quickcheck + base doctest math-functions QuickCheck tasty tasty-expected-failure + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion math-functions mwc-random vector ]; description = "Monoids for calculation of statistics of sample"; license = lib.licenses.bsd3; @@ -187586,8 +188238,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "3"; - editedCabalFile = "1j57vvb2vs0jd5jsq2dh0q5wpvxibwn43dwkg1l3ysl46k5sv58i"; + revision = "4"; + editedCabalFile = "1prni51r2kca7cff4jshas87bxvfmqkp9r5yhkmapphxc9w8vanb"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -188909,6 +189561,52 @@ self: { broken = true; }) {}; + "mptcpanalyzer" = callPackage + ({ mkDerivation, aeson, aeson-extra, aeson-pretty, ansi-terminal + , base, bytestring, Cabal, cereal, Chart, Chart-cairo, containers + , directory, filepath, foldl, formatting, Frames, ghci-dap + , hashable, haskeline, haskell-dap, haskell-debug-adapter, hspec + , HUnit, ip, lens, mptcp, mptcp-pm, mtl, network + , optparse-applicative, pipes, pipes-parse, pipes-safe, polysemy + , polysemy-log, polysemy-log-co, polysemy-plugin, process + , QuickCheck, readable, template-haskell, temporary, text, time + , transformers, unix, utf8-string, vector, vinyl, wide-word + }: + mkDerivation { + pname = "mptcpanalyzer"; + version = "0.0.2.0"; + sha256 = "0x13kbh693h27adxwna4v4swvcma0k9r7inh156rzd4jqbv1faz3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-extra aeson-pretty ansi-terminal base bytestring Cabal + cereal Chart Chart-cairo containers directory filepath foldl + formatting Frames ghci-dap hashable haskeline haskell-dap + haskell-debug-adapter ip lens mptcp mptcp-pm mtl network + optparse-applicative pipes pipes-parse pipes-safe polysemy + polysemy-log polysemy-log-co polysemy-plugin process readable + template-haskell temporary text time transformers unix utf8-string + vector vinyl wide-word + ]; + executableHaskellDepends = [ + aeson aeson-extra aeson-pretty ansi-terminal base bytestring Cabal + cereal Chart Chart-cairo containers directory filepath foldl + formatting Frames ghci-dap hashable haskeline haskell-dap + haskell-debug-adapter ip lens mptcp mptcp-pm mtl network + optparse-applicative pipes pipes-parse pipes-safe polysemy + polysemy-log polysemy-log-co polysemy-plugin process readable + template-haskell temporary text time transformers unix utf8-string + vector vinyl wide-word + ]; + testHaskellDepends = [ + base Cabal Frames hspec HUnit ip mptcp polysemy polysemy-log + polysemy-log-co QuickCheck + ]; + description = "A Multipath TCP analyzer"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "mpvguihs" = callPackage ({ mkDerivation, base, directory, filepath, gtk, mtl, process , template-haskell, unix @@ -189046,8 +189744,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.4.0.1"; - sha256 = "1yjvbn6a50wvcibvi5na6x1d7864zyspqhljvr0dpcfrz3s2yc31"; + version = "0.4.0.2"; + sha256 = "0lkvl74ckxsdxwvrm45z5gk2ax65yfpd00j86w8iax4askz76vxc"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -189259,8 +189957,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.6.0.2"; - sha256 = "1glp86kbimsjh1hlmdivp12qzvcy6c5yyx5ynvrwibwnxj5g968v"; + version = "0.6.0.3"; + sha256 = "0pgc5p018xc7pmn4mrmgwrh9zy3cxk2gkpqnw2lhnw7h0akhq5im"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -189548,8 +190246,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.5.0.2"; - sha256 = "0kr8gqi34zgg8vj5x0c0mx3xjkhjr4ynparplysga7qzzj58a7f3"; + version = "0.5.0.3"; + sha256 = "1ahi51sslxlmv4yi6518bn3i4ks7hpc8327r6lz0l6d4q192k1nq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189574,19 +190272,17 @@ self: { , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text - , th-abstraction, tracing + , th-abstraction, tracing-control }: mkDerivation { pname = "mu-grpc-client"; - version = "0.4.0.1"; - sha256 = "030b8ajbplb1w5llzm8vn8jpwa7v4kw0y8zli8xagc50k19wp75v"; - revision = "2"; - editedCabalFile = "1zs17a684mww8ppgams79xbr019mlr27bxnnhvyhq3k5y1lwz7dh"; + version = "0.4.0.2"; + sha256 = "19y39ixf2d97wfm6x3sl99kwfxsd57mf2s2rqp4s80v3rs8b41iw"; libraryHaskellDepends = [ async avro base bytestring conduit http2 http2-client http2-client-grpc http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans - stm-conduit template-haskell text th-abstraction tracing + stm-conduit template-haskell text th-abstraction tracing-control ]; description = "gRPC clients from Mu definitions"; license = lib.licenses.asl20; @@ -192633,13 +193329,13 @@ self: { }) {}; "nat-optics" = callPackage - ({ mkDerivation, base, hedgehog, optics-core, text }: + ({ mkDerivation, base, optics-core, text }: mkDerivation { pname = "nat-optics"; - version = "1.0.0.1"; - sha256 = "1ba5lnb70gdaa9hwfcg2r0x76h2mxknn49rwplmbgcyxyh79x4jl"; + version = "1.0.0.2"; + sha256 = "12m6267dirzykj4d0rjqq5h3n2zrnp7ixavryvbgqdvrnk6y2ik4"; libraryHaskellDepends = [ base optics-core text ]; - testHaskellDepends = [ base hedgehog optics-core text ]; + testHaskellDepends = [ base optics-core text ]; description = "Refinement types for natural numbers with an optics interface"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -193443,7 +194139,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_1_0" = callPackage + "net-mqtt_0_8_2_0" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -193452,8 +194148,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.1.0"; - sha256 = "1cy17mv8ld3aifh1nr5sggm4x08h58vaa6q1s7nd7nhnkj1icajk"; + version = "0.8.2.0"; + sha256 = "0krh8imyjls1incrsz8pnn3zww0yxygy3hy15r55gbs80x5w7j13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204102,19 +204798,19 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "pandoc_2_16_2" = callPackage + "pandoc_2_17" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions , commonmark-pandoc, connection, containers, data-default, deepseq , Diff, directory, doclayout, doctemplates, emojis, exceptions - , file-embed, filepath, Glob, haddock-library, hslua + , file-embed, filepath, Glob, haddock-library, hslua, hslua-aeson , hslua-marshalling, hslua-module-path, hslua-module-system , hslua-module-text, hslua-module-version, http-client , http-client-tls, http-types, ipynb, jira-wiki-markup, JuicyPixels - , lpeg, mtl, network, network-uri, pandoc-types, parsec, pretty - , pretty-show, process, QuickCheck, random, safe, scientific, SHA - , skylighting, skylighting-core, split, syb, tagsoup, tasty + , lpeg, mtl, network, network-uri, pandoc-lua-marshal, pandoc-types + , parsec, pretty, pretty-show, process, random, safe, scientific + , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty , tasty-bench, tasty-golden, tasty-hunit, tasty-lua , tasty-quickcheck, temporary, texmath, text, text-conversions , time, unicode-collation, unicode-transforms, unix, xml @@ -204122,10 +204818,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.16.2"; - sha256 = "0pnw4v5i20bi9j3gg0i9wlikk2fhj34x5vhh23zhj8v4p72r3wkj"; - revision = "1"; - editedCabalFile = "013i4hsgfdq38zsxq4c3l80hqxrqccy41h1ihyakamb8m3p3pq8q"; + version = "2.17"; + sha256 = "0wbq4mzvjzyl9nzfagbjljv11khajzv030sr51n5wfxf8rm463y6"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -204136,20 +204830,20 @@ self: { commonmark commonmark-extensions commonmark-pandoc connection containers data-default deepseq directory doclayout doctemplates emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-marshalling hslua-module-path hslua-module-system + hslua-aeson hslua-marshalling hslua-module-path hslua-module-system hslua-module-text hslua-module-version http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels lpeg mtl network - network-uri pandoc-types parsec pretty pretty-show process random - safe scientific SHA skylighting skylighting-core split syb tagsoup - temporary texmath text text-conversions time unicode-collation - unicode-transforms unix xml xml-conduit yaml zip-archive zlib + network-uri pandoc-lua-marshal pandoc-types parsec pretty + pretty-show process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-collation unicode-transforms unix xml + xml-conduit yaml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring containers Diff directory doctemplates exceptions - filepath Glob hslua mtl pandoc-types process QuickCheck tasty - tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml - zip-archive + filepath Glob hslua mtl pandoc-types process tasty tasty-golden + tasty-hunit tasty-lua tasty-quickcheck text time xml zip-archive ]; benchmarkHaskellDepends = [ base bytestring deepseq mtl tasty-bench text @@ -204472,8 +205166,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.1.3"; - sha256 = "0x4r0w2gavphc5f6yr4szb31blsvw3hdyackwza8dmzag952nc9k"; + version = "0.1.3.1"; + sha256 = "04q433gpqkydyy2gx6jhyvv7lahx186b1d90clkggach1x0rg8ii"; libraryHaskellDepends = [ base bytestring containers exceptions hslua hslua-marshalling lua pandoc-types safe text @@ -204608,8 +205302,8 @@ self: { pname = "pandoc-plot"; version = "1.3.0"; sha256 = "0d33cbw0ygsdwh718q7q5gw2s6565dbrjwi3rz0qdf78q14wiayi"; - revision = "1"; - editedCabalFile = "1l4rxi23i8ngfrv6vk94l0j0cfczwxchp2bwh1l894b4dfhkq1ks"; + revision = "2"; + editedCabalFile = "14q1l5m29736f9zybh3sba74mxvs73lbr4hqvmdyzfz369r41rmv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204786,8 +205480,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.9"; - sha256 = "0z02q7bxrrij4vls3gpxg34z47y2ijapjwagw6aw8dpsn75hj798"; + version = "0.5.0"; + sha256 = "144k1cqb4gkwyh3w01cwsax58n9w3h1giggdb8b0dw64pnhsq8zd"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -206546,14 +207240,15 @@ self: { "parsley-core" = callPackage ({ mkDerivation, array, base, bytestring, containers, cpphs - , deepseq, dependent-map, dependent-sum, ghc-prim, hashable, mtl - , pretty-terminal, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-test-utils, unordered-containers + , deepseq, dependent-map, dependent-sum, gauge, ghc-prim, hashable + , mtl, pretty-terminal, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-test-utils + , unordered-containers }: mkDerivation { pname = "parsley-core"; - version = "2.0.0.0"; - sha256 = "1v46wpi80fdjpdgr6jcrhljxjrmf1gf7cxmi3y0sdlininr4273i"; + version = "2.1.0.0"; + sha256 = "0vr4qlgkwsh92a8fv4fj48l9625xd80mkkmihwf20zln6svcsbfs"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -206564,6 +207259,9 @@ self: { base containers deepseq tasty tasty-hunit tasty-quickcheck template-haskell th-test-utils ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge QuickCheck + ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -206729,12 +207427,25 @@ self: { license = lib.licenses.asl20; }) {}; + "partial-semigroup_0_5_1_14" = callPackage + ({ mkDerivation, base, doctest, hedgehog }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.5.1.14"; + sha256 = "11xbdv24jy54wniappiqp6j27nm3wjgrbc8zmjkbfwdgb7fzlrws"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hedgehog ]; + description = "A partial binary associative operator"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-semigroup-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.8"; - sha256 = "0gldqqrfc87x1ff33qgan3pp62siqgal3imkf81b9rynws0saxh7"; + version = "0.6.0.10"; + sha256 = "1i40ndpk6dwq56fd83za46wn1fyzm46hnx06s29h4pz1ilfrk1xx"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -207072,7 +207783,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "patch_0_0_5_1" = callPackage + "patch_0_0_5_2" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-map, dependent-sum, directory, filemanip, filepath , hedgehog, hlint, HUnit, lens, monoidal-containers, semialign @@ -207080,8 +207791,8 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.5.1"; - sha256 = "073q0kxjkjyv7cvxmxksln91s0dqki07by9fbg4ls1lh5mwyn3vk"; + version = "0.0.5.2"; + sha256 = "1l1rd5xybp0a9lvk89i64a4vr82vsha8fkcpwd6hwv2klsxbrwf6"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers @@ -210982,8 +211693,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.8.2.0"; - sha256 = "0mlzmsal1phg2r7mwdgxbc55ybziqys6avzkv7pw3il1vy7kyzyx"; + version = "0.8.3.0"; + sha256 = "0vsvj3958czr812jwgkqgnq9jnr79pf1bh1pip49xahp2b35j7ml"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -211099,8 +211810,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.8.0.0"; - sha256 = "12hpqlcwccv2c25fxyxq5vdnmzwqykcvmp8rj118hc3yssc2ygj8"; + version = "0.8.2.0"; + sha256 = "14p2fr80qw8svqb5bdhm2lcbwrciad7vx2lswvz1h8g62wd03py7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -211146,8 +211857,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "5.0"; - sha256 = "0g17jbnrgl2crgd04sy9s8d1g8da7p8wxq7hgnlg9h4n40yjxbd8"; + version = "5.1"; + sha256 = "0ihw0pjiqwfny8nqbdglg13dch622m2agp2y328n7fqar79xx6dv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212606,6 +213317,8 @@ self: { pname = "pipes-lzma"; version = "0.2.0.0"; sha256 = "1b1xnjq1bvp14rl0lvzfxkckvwsihmq0j61wbmx1k0vqjy2b350m"; + revision = "1"; + editedCabalFile = "1i501pqamv0sjrp2ngppvy1wy6gr7xk89hzpfmvnj02ja2m49z41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring exceptions lzma pipes ]; @@ -218045,8 +218758,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.2.0"; - sha256 = "0ddrgvpvss342zmnyd0svj7424k8gynd7bwb2i0r10zw1l4kai26"; + version = "0.2.1"; + sha256 = "09amgmzyypjilz6armsvyjjxj8frx48aq3nq8vjkp30j2xs7a7a4"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq servant servant-client servant-client-core text time @@ -219360,6 +220073,8 @@ self: { pname = "prettyprinter-graphviz"; version = "1.1.0.0"; sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm"; + revision = "1"; + editedCabalFile = "1q8mp6rzb9l6jm8bc902si99ns2nw3vzimqvzwhxbkxf4ljdzqwq"; libraryHaskellDepends = [ base graphviz prettyprinter text ]; description = "A prettyprinter backend for graphviz"; license = lib.licenses.bsd3; @@ -219371,6 +220086,8 @@ self: { pname = "prettyprinter-lucid"; version = "0.1.0.1"; sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh"; + revision = "1"; + editedCabalFile = "02vqw79j1pj9f1z2gl08jny75lfdm29jw2g6kqg23x5sayzh1f89"; libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; license = lib.licenses.bsd3; @@ -219538,6 +220255,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "primecount" = callPackage + ({ mkDerivation, base, primecount, silently, tasty, tasty-bench + , tasty-hunit + }: + mkDerivation { + pname = "primecount"; + version = "0.1.0.0"; + sha256 = "16ls5fb8z0mpnggs9c1sjksgzpj558gdp9fk3wrv55z41pch53r0"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ primecount ]; + testHaskellDepends = [ base silently tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Bindings to the primecount library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) primecount;}; + "primes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -219629,8 +220364,8 @@ self: { ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-checked"; - version = "0.7.0.0"; - sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s"; + version = "0.7.2.0"; + sha256 = "1swb10hd18w2xnxiwnscsv4fxmvrql3aw7fll5qlqi2hczbkd4lf"; libraryHaskellDepends = [ base primitive ]; description = "primitive functions with bounds-checking"; license = lib.licenses.bsd3; @@ -219699,7 +220434,7 @@ self: { license = lib.licenses.mit; }) {}; - "primitive-extras_0_10_1_3" = callPackage + "primitive-extras_0_10_1_4" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit @@ -219707,8 +220442,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.3"; - sha256 = "03i65knf4fkhai1668k5vlpa7z8jdvwy9kay4i4qr2l013qx29yf"; + version = "0.10.1.4"; + sha256 = "00x8jwmkijc110idviz6i4q25dfxnjv4gcdkhsyrldrg8g1bn90f"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -221147,6 +221882,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "prometheus_2_2_3" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , http-client, http-client-tls, http-types, network-uri, text + , transformers, wai, warp + }: + mkDerivation { + pname = "prometheus"; + version = "2.2.3"; + sha256 = "1ggav326fpkrvg39a5rxg2ysg6mb16zzdv4yw0753fyk61v2g4pz"; + libraryHaskellDepends = [ + atomic-primops base bytestring containers http-client + http-client-tls http-types network-uri text transformers wai warp + ]; + description = "Prometheus Haskell Client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "prometheus-client" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, deepseq, doctest, exceptions, hspec, mtl @@ -222367,6 +223120,32 @@ self: { license = lib.licenses.mit; }) {}; + "psql" = callPackage + ({ mkDerivation, base, bytestring, cgroup-rts-threads, concurrency + , containers, cryptonite, exceptions, hspec, massiv, megaparsec + , mtl, postgresql-libpq, semigroupoids, simpoole, sop-core + , template-haskell, text, unordered-containers, vector + }: + mkDerivation { + pname = "psql"; + version = "0.0.0"; + sha256 = "15f0404yvs6bixzb0wbcp9nnn07wf0vq0dgaxr1pkch4gy8n79ij"; + revision = "1"; + editedCabalFile = "0pfi16q3kv0kxwamggk3jsvy5mmgc7g6qawzxwmz14n8mg61885w"; + libraryHaskellDepends = [ + base bytestring concurrency containers cryptonite exceptions + megaparsec mtl postgresql-libpq semigroupoids simpoole + template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring cgroup-rts-threads exceptions hspec massiv mtl + postgresql-libpq semigroupoids sop-core unordered-containers vector + ]; + description = "PostgreSQL client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "psql-helpers" = callPackage ({ mkDerivation, base, postgresql-simple }: mkDerivation { @@ -223742,7 +224521,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "pyfi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 @@ -223760,7 +224539,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs @@ -226432,6 +227211,20 @@ self: { license = lib.licenses.isc; }) {}; + "rampart_2_0_0_0" = callPackage + ({ mkDerivation, base, criterion, hspec }: + mkDerivation { + pname = "rampart"; + version = "2.0.0.0"; + sha256 = "1hmn6dm5x2n9mn31lwa3dg77plahqmfj0h6s2h3v5y09d7s2fjhv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Determine how intervals relate to each other"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -227335,6 +228128,28 @@ self: { license = lib.licenses.mit; }) {}; + "ratel_2_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, uuid + }: + mkDerivation { + pname = "ratel"; + version = "2.0.0.0"; + sha256 = "02pkc0mkzxvv07kzwsrxp1hlgb5gypxc7phsv85k9kr6vvkh58jf"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -227350,6 +228165,22 @@ self: { license = lib.licenses.mit; }) {}; + "ratel-wai_2_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "2.0.0.0"; + sha256 = "1z95ydab4q8r3lmsin3ghzqcnfliw2km7sdldzm6crvgvpj90l73"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratelimiter" = callPackage ({ mkDerivation, base, containers, extra, mtl, time, timespan , vector @@ -231084,14 +231915,14 @@ self: { }: mkDerivation { pname = "regex-rure"; - version = "0.1.0.0"; - sha256 = "0fji4j0nhq47s956ahxq7rh1a50q6y65b5m9rdcn3mjahqmirkal"; + version = "0.1.0.2"; + sha256 = "1nqly1c2pg7c44jaajl3kj8hibybm5w8ly4ndyfgmrs60d2kzhyw"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "Bindings to Rust's regex library"; - license = lib.licenses.gpl3Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {rure = null;}; @@ -231554,8 +232385,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "regression-simple"; - version = "0.1"; - sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq"; + version = "0.1.1"; + sha256 = "18gq05xrkkxg2zrnkx9z7n91g8lagz6j3cfw7mqik7dyc2m1w675"; libraryHaskellDepends = [ base vector ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; @@ -231743,7 +232574,7 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "rel8_1_2_1_0" = callPackage + "rel8_1_2_2_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , case-insensitive, comonad, containers, contravariant, hasql , hasql-transaction, hedgehog, mmorph, opaleye, pretty @@ -231753,8 +232584,8 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.2.1.0"; - sha256 = "0f4rnyr90f989ww4hh8h65fhnj16ir144qsin9abc767fxnb7wis"; + version = "1.2.2.0"; + sha256 = "1jbss5liyz8r747yzva1ciadacd63lida1gzrw9g7075hsawfwjf"; libraryHaskellDepends = [ aeson base bifunctors bytestring case-insensitive comonad contravariant hasql opaleye pretty product-profunctors profunctors @@ -233423,8 +234254,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; - revision = "3"; - editedCabalFile = "0af5dsdyn04i76d012xhhfkkml10bqzl6q2yivkhf8rlvh1fiii5"; + revision = "4"; + editedCabalFile = "1d3dsbvrwynnbdj32fswiwh90h28p31h6fsfpq5zh85rd29yp210"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -236552,13 +237383,15 @@ self: { "rounded-hw" = callPackage ({ mkDerivation, array, base, Cabal, deepseq, doctest, fp-ieee - , gauge, hspec, long-double, primitive, QuickCheck, random, tagged - , vector + , hspec, long-double, primitive, QuickCheck, random, tagged + , tasty-bench, vector }: mkDerivation { pname = "rounded-hw"; - version = "0.2.0"; - sha256 = "01393ps7i83ncxlj9yi6jhngr26py6sdafq67mbhigrclyax6ysi"; + version = "0.3.0"; + sha256 = "15y6yz101mnfkc2ff4w6wnqc5r6ykipd7jh0pbg9rjm67jmyr4b5"; + revision = "1"; + editedCabalFile = "139hr8a1qyfkdcpxn9pwmi9c7v4q3g86bjrx654nc0q7v87q4afh"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base deepseq fp-ieee long-double primitive tagged vector @@ -236568,7 +237401,7 @@ self: { QuickCheck random vector ]; benchmarkHaskellDepends = [ - array base deepseq fp-ieee gauge primitive vector + array base deepseq fp-ieee primitive tasty-bench vector ]; description = "Directed rounding for built-in floating types"; license = lib.licenses.bsd3; @@ -238601,6 +239434,19 @@ self: { license = lib.licenses.mit; }) {}; + "salve_2_0_0_0" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "salve"; + version = "2.0.0.0"; + sha256 = "0ddja5py6wjxvlc9340v0z9qh7b59vfp81hz882nfq0c0d2bdna5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Semantic version numbers and constraints"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -240002,6 +240848,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "scheduling" = callPackage + ({ mkDerivation, aeson, base, bimap, bytestring, containers, gogol + , gogol-sheets, lens, mime-mail, mtl, optparse-generic, random, sbv + , servant, text, time + }: + mkDerivation { + pname = "scheduling"; + version = "0.1.0.0"; + sha256 = "14kl43l624b9wl7igj52vxjgw42mdkx1n7f2i6ng638y2wfc0xzl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap bytestring containers gogol gogol-sheets lens + mime-mail mtl optparse-generic random sbv servant text time + ]; + executableHaskellDepends = [ + aeson base bimap bytestring containers gogol gogol-sheets lens + mime-mail mtl optparse-generic random sbv servant text time + ]; + description = "An interview scheduler using constraint satisfaction and Google Sheets"; + license = lib.licenses.bsd3; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -241168,6 +242037,28 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_3_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.3.1"; + sha256 = "1lnscy9vc3h9fhh65iq60kma79q4pkb00r8lqx8i3ax2v53yl626"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -242536,6 +243427,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "semigroupoids_5_3_7" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.7"; + sha256 = "169pjrm7lxjxrqj5q1iyl288bx5nj8n0pf2ri1cclxccqnvcsibd"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -244403,8 +245314,8 @@ self: { ({ mkDerivation, base, bytestring, http-media, servant, text }: mkDerivation { pname = "servant-fiat-content"; - version = "1.0.0"; - sha256 = "1108npqddwsbplxzf65hq0w3aqnyfrk8lcdffkszwx3g8s8xblg7"; + version = "1.0.1"; + sha256 = "1vkmwllgy9s8kd72yg8ipvqyp1w2fi3mbf98ylwjzjsvm9vbgysx"; libraryHaskellDepends = [ base bytestring http-media servant text ]; @@ -248398,14 +249309,14 @@ self: { license = lib.licenses.mit; }) {}; - "shikensu_0_4_0" = callPackage + "shikensu_0_4_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow , Glob, tasty, tasty-hunit, text, unordered-containers }: mkDerivation { pname = "shikensu"; - version = "0.4.0"; - sha256 = "0ln51nw01k776lv8bxg1pp8cpnchhr4aj12llxvh4zzi4asxj2x6"; + version = "0.4.1"; + sha256 = "0qf0rc0sxhj6x03g9mdxhnk8dk8n0jpi6061ky0cqhvivn4fd9hy"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers @@ -250419,48 +251330,51 @@ self: { }) {}; "simplexmq" = callPackage - ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async - , attoparsec, base, base64-bytestring, bytestring, composition - , constraints, containers, cryptonite, cryptostore, direct-sqlite - , directory, file-embed, filepath, generic-random, hspec - , hspec-core, http-types, HUnit, ini, iso8601-time, memory, mtl - , network, network-transport, optparse-applicative, QuickCheck - , random, simple-logger, sqlite-simple, stm, template-haskell, text - , time, timeit, transformers, unliftio, unliftio-core, websockets - , x509 + ({ mkDerivation, aeson, ansi-terminal, asn1-encoding, asn1-types + , async, attoparsec, base, base64-bytestring, bytestring + , composition, constraints, containers, cryptonite, cryptostore + , data-default, direct-sqlite, directory, file-embed, filepath + , generic-random, hspec, hspec-core, http-types, HUnit, ini + , iso8601-time, memory, mtl, network, network-transport + , optparse-applicative, process, QuickCheck, random, simple-logger + , sqlite-simple, stm, template-haskell, text, time, timeit, tls + , transformers, unliftio, unliftio-core, websockets, x509 + , x509-store, x509-validation }: mkDerivation { pname = "simplexmq"; - version = "0.5.0"; - sha256 = "0wmhqmrxzgb4zvxmcsv49lzmvgqrqljivzcjfp4s04j87968x79j"; + version = "1.0.0"; + sha256 = "0ldri2kp1hadsx9kbypkkijijak1c6zy2h5apj6kgnh7f9a851pm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal asn1-encoding asn1-types async attoparsec base + aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers - cryptonite direct-sqlite directory file-embed filepath - generic-random http-types iso8601-time memory mtl network - network-transport QuickCheck random simple-logger sqlite-simple stm - template-haskell text time transformers unliftio unliftio-core - websockets x509 + cryptonite cryptostore data-default direct-sqlite directory + file-embed filepath generic-random http-types iso8601-time memory + mtl network network-transport QuickCheck random simple-logger + sqlite-simple stm template-haskell text time tls transformers + unliftio unliftio-core websockets x509 x509-store x509-validation ]; executableHaskellDepends = [ - ansi-terminal asn1-encoding asn1-types async attoparsec base + aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers - cryptonite cryptostore direct-sqlite directory file-embed filepath - generic-random http-types ini iso8601-time memory mtl network - network-transport optparse-applicative QuickCheck random - simple-logger sqlite-simple stm template-haskell text time - transformers unliftio unliftio-core websockets x509 + cryptonite cryptostore data-default direct-sqlite directory + file-embed filepath generic-random http-types ini iso8601-time + memory mtl network network-transport optparse-applicative process + QuickCheck random simple-logger sqlite-simple stm template-haskell + text time tls transformers unliftio unliftio-core websockets x509 + x509-store x509-validation ]; testHaskellDepends = [ - ansi-terminal asn1-encoding asn1-types async attoparsec base + aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers - cryptonite direct-sqlite directory file-embed filepath - generic-random hspec hspec-core http-types HUnit iso8601-time - memory mtl network network-transport QuickCheck random - simple-logger sqlite-simple stm template-haskell text time timeit - transformers unliftio unliftio-core websockets x509 + cryptonite cryptostore data-default direct-sqlite directory + file-embed filepath generic-random hspec hspec-core http-types + HUnit iso8601-time memory mtl network network-transport QuickCheck + random simple-logger sqlite-simple stm template-haskell text time + timeit tls transformers unliftio unliftio-core websockets x509 + x509-store x509-validation ]; description = "SimpleXMQ message broker"; license = lib.licenses.agpl3Only; @@ -250489,8 +251403,8 @@ self: { }: mkDerivation { pname = "simpoole"; - version = "0.3.0"; - sha256 = "188c6r5vzi7bdyk8qgi5z2zxw7cjacf7fa986y7r1v89q0advr8v"; + version = "0.4.0"; + sha256 = "12gvmgjngbl8inf0w5nfngbpk3l2shsc4gi3hxk9m5l85ngz2y16"; libraryHaskellDepends = [ base concurrency containers exceptions mtl time ]; @@ -257898,6 +258812,8 @@ self: { pname = "stack"; version = "2.7.3"; sha256 = "0i2v5i6bg90n6i4clcaww8m8702d3y5z8r03xdizdisjhf0zijj7"; + revision = "1"; + editedCabalFile = "0j99hh3lf886qvf86xwgv9a0ps9vp40z2s3xnl4lr4mgn9f0lrvb"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -258019,8 +258935,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.4.4"; - sha256 = "1z2lvvpzlaxwxxbb30xyr62sm483bqiknxwmzdnfb0ri7qf31kfr"; + version = "0.4.5"; + sha256 = "04qc3z7xgs8p814lnpwyqgwza7i6wz9mkmzzk0ggq6mv32zzz7kb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -259326,6 +260242,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "statistics_0_16_0_1" = callPackage + ({ mkDerivation, aeson, async, base, binary, data-default-class + , deepseq, dense-linear-algebra, erf, ieee754, math-functions + , monad-par, mwc-random, primitive, QuickCheck, random, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector + , vector-algorithms, vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.16.0.1"; + sha256 = "16ynj3bj8j70w4iq4xsrz7h140cp0jff0fv1iybsjl3lr83hdvk0"; + libraryHaskellDepends = [ + aeson async base binary data-default-class deepseq + dense-linear-algebra math-functions monad-par mwc-random primitive + random vector vector-algorithms vector-binary-instances + vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf ieee754 math-functions + primitive QuickCheck tasty tasty-expected-failure tasty-hunit + tasty-quickcheck vector vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -261450,6 +262393,8 @@ self: { pname = "streamly"; version = "0.8.1.1"; sha256 = "13m415pcyyzipm5nsf9l8lcan3dn2ck666rq014y46zd66l5ahb9"; + revision = "1"; + editedCabalFile = "0y9pq53jd2wf7xb5i51pa6vm728sza405dx37j8rqnqxxbm5sq7y"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions filepath fusion-plugin-types ghc-prim heaps lockfree-queue @@ -261675,8 +262620,8 @@ self: { }: mkDerivation { pname = "streamly-lz4"; - version = "0.1.0"; - sha256 = "0jp6px6m85rji0wpq0xfp2cv63jidvqmb1x1z33q95xfh6v73yng"; + version = "0.1.1"; + sha256 = "1ac7lby73pylzyg84nr155sfkcjj2p9kaj0v99va3kx4r6j4jr81"; libraryHaskellDepends = [ base exceptions fusion-plugin-types streamly ]; @@ -261710,19 +262655,19 @@ self: { }) {}; "streamly-process" = callPackage - ({ mkDerivation, base, directory, exceptions, fusion-plugin, hspec - , process, QuickCheck, streamly, tasty-bench, unix + ({ mkDerivation, base, directory, exceptions, hspec, process + , QuickCheck, streamly, tasty-bench, unix }: mkDerivation { pname = "streamly-process"; - version = "0.1.0"; - sha256 = "066ldbphb230cc21jvsmmqlnjli6cwqpphs7vjb88q62lbl8yf6p"; + version = "0.2.0"; + sha256 = "0ryf0hbqdpzlips3hyrhb310ha3h8fbna4rd8lqzj67dya66rd3r"; libraryHaskellDepends = [ base exceptions process streamly unix ]; testHaskellDepends = [ base directory exceptions hspec process QuickCheck streamly ]; benchmarkHaskellDepends = [ - base directory fusion-plugin process streamly tasty-bench + base directory process streamly tasty-bench ]; description = "Use OS processes as stream transformation functions"; license = lib.licenses.asl20; @@ -262055,6 +263000,8 @@ self: { pname = "strict-tuple"; version = "0.1.4"; sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq"; + revision = "1"; + editedCabalFile = "127byff30qm6vfnpdb2jfhag6dfv8zz306hkdnlkryx4gf5aab86"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; @@ -262566,6 +263513,18 @@ self: { license = lib.licenses.mit; }) {}; + "stripe-concepts_1_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.3.1"; + sha256 = "1mi538f8nm90mygrcv6w90bxf0d0lc4qxkbrq19j35l9r1xlm5bk"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -262697,18 +263656,20 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite - , memory, stripe-concepts, text + ({ mkDerivation, base, base16-bytestring, bytestring + , cryptohash-sha256, stripe-concepts, text }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.10"; - sha256 = "04b5z6hnm000fii4qiczm4xpr41v55fgcj07yh35iwh4gwgc7c4h"; + version = "1.0.0.14"; + sha256 = "0r982h1vd06yd1kyhyqf3s982a34amlnfzwykg3cs6pscpqbg7mz"; libraryHaskellDepends = [ - base base16-bytestring bytestring cryptonite memory stripe-concepts + base base16-bytestring bytestring cryptohash-sha256 stripe-concepts text ]; - testHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring stripe-concepts text + ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -262758,8 +263719,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "2.0.0.1"; - sha256 = "1kqmdw0f9cppbvirizmyfcsc26iczwrn6hrhmi9y6fhhxiy4wd1z"; + version = "2.0.1.0"; + sha256 = "16jiqhkl6ww1rk0n3bp26p30x536akyaaww75bwz0rwzxkr8rjsh"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -262801,6 +263762,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.1"; + sha256 = "1vhszra49nfqx3lfyc378krxx8gf3cs2s6vb602fzlbjbm54i9mh"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hspec, path, tasty , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell @@ -263529,8 +264508,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "successors"; - version = "0.1.0.2"; - sha256 = "0q6sfxxzc0ws1iky79iyx7sf7l3jqdwxz9ngsi11km1bp7rd8ycw"; + version = "0.1.0.3"; + sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -264267,8 +265246,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "4"; - editedCabalFile = "1731ryf1bymy0s4hg109f2g7wn6mm9b52y2r4gw2d59170lxzv8f"; + revision = "5"; + editedCabalFile = "0cnv8rx410mprjvdmzz8j9lmd05wb87zk9bcpjhyymz4qhcbqpl2"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -267626,6 +268605,35 @@ self: { license = lib.licenses.mit; }) {}; + "tailwind" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deriving-aeson, directory, filepath, filepattern + , lens, monad-logger, mtl, neat-interpolation, optparse-applicative + , parser-combinators, profunctors, relude, safe-exceptions + , temporary, text, time, unliftio, which, with-utf8 + }: + mkDerivation { + pname = "tailwind"; + version = "0.1.0.0"; + sha256 = "1wvmygaf8dmy9h0wzxb3623rpdmzvhzr879yc4sm94bzd42y8cy6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deriving-aeson + directory filepath filepattern lens monad-logger mtl + neat-interpolation profunctors relude safe-exceptions temporary + text time unliftio which with-utf8 + ]; + executableHaskellDepends = [ + base data-default filepath filepattern lens monad-logger + optparse-applicative parser-combinators relude with-utf8 + ]; + description = "Tailwind wrapped in Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tak" = callPackage ({ mkDerivation, base, bytestring, hashable, hslogger, HUnit , matrix, network, parsec, random-shuffle, safe @@ -268432,6 +269440,29 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-golden_2_3_5" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, tagged, tasty + , tasty-hunit, temporary, text, typed-process + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.5"; + sha256 = "03klnxn9rcv0l7fl4w8q6s59fzl1328j1wzwi1za4gb0l90vadwb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative tagged tasty temporary text typed-process + ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hunit temporary typed-process + ]; + description = "Golden tests support for tasty"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-grading-system" = callPackage ({ mkDerivation, aeson, base, containers, directory, filepath , generic-deriving, mtl, stm, tagged, tasty, tasty-hunit, text @@ -270670,6 +271701,8 @@ self: { pname = "termbox"; version = "0.3.0"; sha256 = "1vi2ssylwvc6xqnhpnvc9q9c70glbf6s63rmyblc53g4qra2wkah"; + revision = "1"; + editedCabalFile = "1d0sv2ycizpy0fsn0v4n2bbziyr56y2md8qnqmr0bx1rkriz67li"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -270683,6 +271716,8 @@ self: { pname = "termbox-banana"; version = "0.3.0"; sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s"; + revision = "1"; + editedCabalFile = "0k62lbwigk97shxlx5c34d2k81ndims9nc36rlcv34s0iig0lh7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base reactive-banana termbox ]; @@ -271326,8 +272361,8 @@ self: { }: mkDerivation { pname = "test-lib"; - version = "0.3"; - sha256 = "15b3gsy03z3hqc0d2b7hjk3l79ykkcdhb5mrz453p8s4bgd8l6av"; + version = "0.4"; + sha256 = "0jp0k27vvdz4lfrdi7874j7gnnn051kvqfn1k3zg1ap4m9jzyb45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271767,6 +272802,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.4"; + sha256 = "1k7hh75jzgysh7b7jkvy4w07dbkvm5fcc5hkkixz6xzrp2fvnws3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process temporary text + utf8-string xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -272545,7 +273603,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_9_5" = callPackage + "text-show_3_9_6" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -272555,8 +273613,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.9.5"; - sha256 = "03gp01wim236xdznxi5naq42lz9whdb2ms8xj01g39l54i83n22q"; + version = "3.9.6"; + sha256 = "1wcnwfshsscwy96jg709m2vrprcy4hi65n7f65a45q9rr81jiriw"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -275500,8 +276558,8 @@ self: { pname = "timer-wheel"; version = "0.3.0"; sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s"; - revision = "1"; - editedCabalFile = "03wprm88wl6smfcq6dfr62l4igi8lfg6wkk65rsmyzxxkjzhc6f1"; + revision = "2"; + editedCabalFile = "0kfckbmcf9c8538i38r40agrc31mgk771hfnm54sgslnam1idiym"; libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base ]; description = "A timer wheel"; @@ -275700,8 +276758,8 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.10"; - sha256 = "0lks0mgshcsq36aminfbrz524mgn5q02lwln8lli1l54d8bn4x8n"; + version = "0.1.0.11"; + sha256 = "0lpsmjy99l1yqz23dqb31cx08wg19bd4qzfmsqzz7hfmz0dgjqsj"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; @@ -278311,6 +279369,8 @@ self: { pname = "transformers-compat"; version = "0.7.1"; sha256 = "102hydcqn7yjskzp586fvsw39dp3fi34fkskc7ykqkf16haqc2xc"; + revision = "1"; + editedCabalFile = "03xi4gxwvim33xkv289g6wz9dpz43zd91s5j2ini7bhcg40gagl7"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = lib.licenses.bsd3; @@ -280461,16 +281521,16 @@ self: { "twain" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie - , either, http-types, text, time, transformers, wai, wai-extra - , warp + , either, exceptions, http-types, http2, text, time, transformers + , vault, wai, wai-extra }: mkDerivation { pname = "twain"; - version = "1.0.0.0"; - sha256 = "0brxvqddnhxs4q5hm9g8fzkznk3xjagivy0glfiqrx24p4k8s9yb"; + version = "2.0.1.0"; + sha256 = "0wal0qr3bacy7phgbvi2sif5q490jk8mhw675lpl2ch8dmmf769p"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive cookie either http-types - text time transformers wai wai-extra warp + aeson base bytestring case-insensitive cookie either exceptions + http-types http2 text time transformers vault wai wai-extra ]; description = "Tiny web application framework for WAI"; license = lib.licenses.bsd3; @@ -281631,6 +282691,8 @@ self: { pname = "type-map"; version = "0.1.6.0"; sha256 = "0zakl5bdzwng1r0x384w066zhwgwcf24s6jsm6d4zsx7xmngzmr5"; + revision = "1"; + editedCabalFile = "184jzydzkm8qa3wbfzx173yjhydss9fnki0g81dp4yij90lr1qf9"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -281639,6 +282701,23 @@ self: { license = lib.licenses.mit; }) {}; + "type-map_0_1_7_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, HUnit, test-framework + , test-framework-hunit, vector + }: + mkDerivation { + pname = "type-map"; + version = "0.1.7.0"; + sha256 = "0612y1n2ydnb5sw411a1xnjmp03qhjl3iv9pnwdj59l17bcmqq21"; + libraryHaskellDepends = [ base containers ghc-prim vector ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Type-indexed maps"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-natural" = callPackage ({ mkDerivation, base, constraints, equational-reasoning, ghc , ghc-typelits-knownnat, ghc-typelits-natnormalise @@ -283794,6 +284873,8 @@ self: { pname = "unicode-data"; version = "0.3.0"; sha256 = "0pwjjsk0gjkn73ghj10s603p84xr7h2kfg351c9grzngrcv9giq8"; + revision = "1"; + editedCabalFile = "1invxbc1f635rywnkcpap9s93z08mbdfi3rzi7882lssf1wy0i85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -283932,6 +285013,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0"; sha256 = "0m234yhjizl28xm8y08bdhrbni666r7q2z71a8s64lynqk4lzq5k"; + revision = "1"; + editedCabalFile = "18k7z25byg9x05rydbcgjfvhz9qdv6yxjvxac58kxw8pfj8xlcap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284539,8 +285622,8 @@ self: { }: mkDerivation { pname = "units"; - version = "2.4.1.4"; - sha256 = "1r6innb99d6ljbbbrl2q9i4l6j4cb96mmv0k56q9l2xckwlsfz32"; + version = "2.4.1.5"; + sha256 = "09ssrid1an2nv6j9skb787i3hqiz5hgz020q13552w55m0smw4c9"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space @@ -284959,6 +286042,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-compat_0_5_4" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "unix-compat"; + version = "0.5.4"; + sha256 = "1cd4lh2c16h7y5hzrcn5l9vir8aq2wcizwksppnagklsdsfmf942"; + libraryHaskellDepends = [ base unix ]; + description = "Portable POSIX-compatibility layer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var }: mkDerivation { @@ -289298,8 +290393,8 @@ self: { }: mkDerivation { pname = "verset"; - version = "0.0.1.6"; - sha256 = "1fk53vd2mh6ngrj4v2322fzdx0k0cj0zc2w1xpwkvyy3584l8af8"; + version = "0.0.1.7"; + sha256 = "12bbadznnp4pksy1yb7lw4zniksnaz7ipmfyji0ak6b0bqfh74s2"; libraryHaskellDepends = [ base bytestring containers extra mtl safe text time uuid ]; @@ -290054,8 +291149,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.1.0"; - sha256 = "06skwy5k4sgmh7m20m5v3g82kvm6sxq2sxmg039s45pvkbfp1c32"; + version = "0.5.2.0"; + sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -290963,6 +292058,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "wai-env" = callPackage + ({ mkDerivation, base, data-default, vault, wai }: + mkDerivation { + pname = "wai-env"; + version = "1.0.0.0"; + sha256 = "03hnp38qgi2qqkzpds7ac2arvsjvpbfdkwwfcl5c6f6zjdwzq97y"; + libraryHaskellDepends = [ base data-default vault wai ]; + description = "WAI middleware to parameterize requests with environment"; + license = lib.licenses.bsd3; + }) {}; + "wai-eventsource" = callPackage ({ mkDerivation, wai }: mkDerivation { @@ -292760,15 +293866,13 @@ self: { "warc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions , filepath, free, hashable, lens, mmorph, optparse-applicative - , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time + , pipes, pipes-attoparsec, pipes-bytestring, text, time , transformers, unordered-containers }: mkDerivation { pname = "warc"; - version = "1.0.4"; - sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b"; - revision = "6"; - editedCabalFile = "0s563lg70ks3s6plvwi79glq6vkrh7n769fh6l6b4pvj7vp604cj"; + version = "1.0.5"; + sha256 = "1s01x0w37gsh4kkv1jq54i0yf7mxk6m6jr6djwql8dz8nqrny8j7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292778,8 +293882,8 @@ self: { ]; executableHaskellDepends = [ attoparsec base bytestring errors exceptions filepath free lens - optparse-applicative pipes pipes-attoparsec pipes-bytestring - pipes-zlib text time transformers + optparse-applicative pipes pipes-attoparsec pipes-bytestring text + time transformers ]; description = "A parser for the Web Archive (WARC) format"; license = lib.licenses.bsd3; @@ -294014,6 +295118,41 @@ self: { broken = true; }) {}; + "webgear-core" = callPackage + ({ mkDerivation, arrows, base, bytestring, case-insensitive + , filepath, http-api-data, http-media, http-types, jose, mime-types + , network, safe-exceptions, tagged, template-haskell, text + , unordered-containers, wai + }: + mkDerivation { + pname = "webgear-core"; + version = "1.0.1"; + sha256 = "06yg14x40j7jg5gy875f2g4fplnh08678qy3naqapd8ysvw52rmb"; + libraryHaskellDepends = [ + arrows base bytestring case-insensitive filepath http-api-data + http-media http-types jose mime-types network safe-exceptions + tagged template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP APIs"; + license = lib.licenses.mpl20; + }) {}; + + "webgear-openapi" = callPackage + ({ mkDerivation, arrows, base, http-media, http-types + , insert-ordered-containers, lens, openapi3, text, webgear-core + }: + mkDerivation { + pname = "webgear-openapi"; + version = "1.0.1"; + sha256 = "0fxj5bhsqxkjizyl0wcwbs5ai05lksf3cwzz2535lb4rh90ndx3b"; + libraryHaskellDepends = [ + arrows base http-media http-types insert-ordered-containers lens + openapi3 text webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + }) {}; + "webgear-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , bytestring-conversion, case-insensitive, http-api-data @@ -294040,6 +295179,32 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-server_1_0_1" = callPackage + ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring + , bytestring-conversion, http-api-data, http-media, http-types + , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai + , webgear-core + }: + mkDerivation { + pname = "webgear-server"; + version = "1.0.1"; + sha256 = "0v27iq4jqbxyn66pzi7sz0qapd4a0k1iifvj2ng488jl2j852xa2"; + libraryHaskellDepends = [ + aeson arrows base base64-bytestring bytestring + bytestring-conversion http-api-data http-media http-types jose + monad-time mtl text unordered-containers wai webgear-core + ]; + testHaskellDepends = [ + base base64-bytestring bytestring http-types QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai + webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -295141,8 +296306,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "3"; - editedCabalFile = "10jidn34rmv0amhw3c24pkl64q5xl3c6l9yqwcvqdn0vkbd0bf2v"; + revision = "4"; + editedCabalFile = "17wzjaj16q4bm8kz2mcs02naj6v89lnbwjfgmrf81c9dw873l9px"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library"; @@ -295332,6 +296497,26 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "witch_1_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit + , template-haskell, text, time + }: + mkDerivation { + pname = "witch"; + version = "1.0.0.1"; + sha256 = "010agcfcmyjmcz6wl7wrwd6w7y60d4163vlvrp1b2h8w86z87jlm"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit template-haskell text time + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -295660,6 +296845,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "wl-pprint-text_1_2_0_2" = callPackage + ({ mkDerivation, base, base-compat, text }: + mkDerivation { + pname = "wl-pprint-text"; + version = "1.2.0.2"; + sha256 = "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj"; + libraryHaskellDepends = [ base base-compat text ]; + description = "A Wadler/Leijen Pretty Printer for Text values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wlc-hs" = callPackage ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty , process, transformers, wlc, xkbcommon @@ -296031,8 +297228,8 @@ self: { }: mkDerivation { pname = "wordlist"; - version = "0.1.0.4"; - sha256 = "0v2xnm4iqk8wh3l05vkmfblwk49q54awp2qr1cwszgxfzaz4n9zb"; + version = "0.1.0.5"; + sha256 = "11h52dykc23ks3wn3apnp81jm091igqy8dkgs7apk8yh141vdfak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optparse-applicative text ]; @@ -297117,6 +298314,21 @@ self: { license = lib.licenses.mit; }) {}; + "wuss_2_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "2.0.0.1"; + sha256 = "17s6wilzyzsdc174a3an12pkq20cy7x2pfrn4jmdp30f468r47fb"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -298344,6 +299556,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "xml-hamlet_0_5_0_2" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, parsec + , shakespeare, template-haskell, text, xml-conduit + }: + mkDerivation { + pname = "xml-hamlet"; + version = "0.5.0.2"; + sha256 = "109fck1626d74s00ssjffg837584wf7dxpswkil37wqqfy94mw2z"; + libraryHaskellDepends = [ + base containers parsec shakespeare template-haskell text + xml-conduit + ]; + testHaskellDepends = [ + base containers hspec HUnit parsec shakespeare template-haskell + text xml-conduit + ]; + description = "Hamlet-style quasiquoter for XML content"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "xml-helpers" = callPackage ({ mkDerivation, base, xml }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hnix.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hnix.patch new file mode 100644 index 0000000000..25373db15a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hnix.patch @@ -0,0 +1,24 @@ +From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001 +From: Anton Latukha +Date: Sun, 16 Jan 2022 18:16:50 +0200 +Subject: [PATCH] fix aeson <2 support + +--- + src/Nix/Json.hs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs +index 3fe05269..329899e4 100644 +--- a/src/Nix/Json.hs ++++ b/src/Nix/Json.hs +@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL + #if MIN_VERSION_aeson(2,0,0) + import qualified Data.Aeson.Key as AKM + import qualified Data.Aeson.KeyMap as AKM ++#else ++import Nix.Expr.Types + #endif + import qualified Data.Vector as V + import Nix.Atoms +-- +2.34.1 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix index a1b59b8bf6..51b1cfa114 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname -, openssl, glucose, minisat, abc-verifier, z3, python +, openssl, glucose, minisat, abc-verifier, z3, python2 , certifyBooks ? true } @ args: @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { which perl hostname makeWrapper # Some of the books require one or more of these external tools: openssl.out glucose minisat abc-verifier libipasir - z3 (python.withPackages (ps: [ ps.z3 ])) + z3 (python2.withPackages (ps: [ ps.z3 ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix index 7bd3913260..d8fa630c30 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -8,7 +8,7 @@ , unzip , nodePackages , xcbuild -, python +, python2 , openssl , pkgs , fetchgit @@ -154,7 +154,7 @@ stdenv.mkDerivation { nodejs clojure jre - python + python2 openssl gnutar nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix new file mode 100644 index 0000000000..1e994a7a60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ivy"; + version = "0.1.13"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "robpike"; + repo = "ivy"; + sha256 = "sha256-IiQrmmHitKUItm/ZSTQ3jGO3ls8vPPexyOtUvfq3yeU="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + subPackages = [ "." ]; + + meta = with lib; { + homepage = "https://github.com/robpike/ivy"; + description = "ivy, an APL-like calculator"; + license = licenses.bsd3; + maintainers = with maintainers; [ smasher164 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix index ed002d99fb..41778270f7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, - libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, - libtheora, which, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config +, SDL2, libGLU, libGL, openal, luajit +, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg +, libtheora, which, autoconf, automake, libtool }: -let +stdenv.mkDerivation rec { pname = "love"; version = "0.10.2"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchFromBitbucket { - owner = "rude"; + src = fetchFromGitHub { + owner = "love2d"; repo = "love"; rev = version; sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; @@ -32,7 +30,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = "http://love2d.org"; + homepage = "https://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = lib.licenses.zlib; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix deleted file mode 100644 index 6d8b996f18..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, SDL, libGLU, libGL, openal, lua -, libdevil, freetype, physfs -, libmodplug, mpg123, libvorbis, libogg -, libmng -}: - -stdenv.mkDerivation rec { - pname = "love"; - version = "0.7.2"; - - src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; - sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; - }; - - # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) - patches = [ ./0.7-gl-prototypes.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - SDL libGLU libGL openal lua - libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng - ]; - - preConfigure = '' - luaoptions="${"''"} lua luajit " - for i in lua luajit-; do - for j in 5 5.0 5.1 5.2 5.3 5.4; do - luaoptions="$luaoptions $i$j " - done - done - luaso="$(echo "${lua}/lib/"lib*.so.*)" - luaso="''${luaso##*/lib}" - luaso="''${luaso%%.so*}" - luaoptions="$luaoptions $luaso" - sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure - - luaincdir="$(echo "${lua}/include"/*/ )" - test -d "$luaincdir" && { - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" - } || true - ''; - - NIX_CFLAGS_COMPILE = '' - -I${SDL.dev}/include/SDL - -I${freetype.dev}include/freetype2 - ''; - - meta = { - homepage = "http://love2d.org"; - description = "A Lua-based 2D game engine/scripting language"; - license = lib.licenses.zlib; - - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.raskin ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.8.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.8.nix deleted file mode 100644 index 8bad501170..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.8.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, SDL, libGLU, libGL, openal, lua -, libdevil, freetype, physfs -, libmodplug, mpg123, libvorbis, libogg -}: - -stdenv.mkDerivation rec { - pname = "love"; - version = "0.8.0"; - - src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz"; - sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - SDL libGLU libGL openal lua - libdevil freetype physfs libmodplug mpg123 libvorbis libogg - ]; - - preConfigure = '' - luaoptions="${"''"} lua luajit " - for i in lua luajit-; do - for j in 5 5.0 5.1 5.2 5.3 5.4; do - luaoptions="$luaoptions $i$j " - done - done - luaso="$(echo "${lua}/lib/"lib*.so.*)" - luaso="''${luaso##*/lib}" - luaso="''${luaso%%.so*}" - luaoptions="$luaoptions $luaso" - sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure - - luaincdir="$(echo "${lua}/include"/*/ )" - test -d "$luaincdir" && { - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" - } || true - ''; - - NIX_CFLAGS_COMPILE = toString [ - "-I${SDL.dev}/include/SDL" - "-I${freetype.dev}include/freetype2" - "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2 - ]; - - meta = { - homepage = "http://love2d.org"; - description = "A Lua-based 2D game engine/scripting language"; - license = lib.licenses.zlib; - - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.raskin ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix deleted file mode 100644 index 512aade7f9..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, SDL2, libGLU, libGL, openal, luajit -, libdevil, freetype, physfs -, libmodplug, mpg123, libvorbis, libogg -}: - -stdenv.mkDerivation rec { - pname = "love"; - version = "0.9.1"; - - src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; - sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - SDL2 libGLU libGL openal luajit - libdevil freetype physfs libmodplug mpg123 libvorbis libogg - ]; - - configureFlags = [ - "--with-lua=luajit" - ]; - - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 - - meta = { - homepage = "http://love2d.org"; - description = "A Lua-based 2D game engine/scripting language"; - license = lib.licenses.zlib; - - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.raskin ]; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/11.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/11.nix similarity index 60% rename from third_party/nixpkgs/pkgs/development/interpreters/love/11.1.nix rename to third_party/nixpkgs/pkgs/development/interpreters/love/11.nix index bf76547a07..83095ac092 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/11.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/love/11.nix @@ -1,20 +1,18 @@ -{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, - libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, - libtheora, which, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config +, SDL2, libGLU, libGL, openal, luajit +, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg +, libtheora, which, autoconf, automake, libtool }: -let +stdenv.mkDerivation rec { pname = "love"; - version = "11.3"; -in + version = "11.4"; -stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchFromBitbucket { - owner = "rude"; + src = fetchFromGitHub { + owner = "love2d"; repo = "love"; rev = version; - sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7"; + sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb"; }; nativeBuildInputs = [ pkg-config ]; @@ -32,7 +30,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = "http://love2d.org"; + homepage = "https://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = lib.licenses.zlib; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 87de82eb26..4e2931aa76 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = "http://luajit.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ]; + maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ]; } // extraMeta; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix index cf4339c69a..bf53e71a22 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.7.0"; + version = "0.7.4"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4014p+4QJ7nytFHHszAOYQHXLYXqR+Cip+vHxsH9l8="; + sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc="; }; - cargoSha256 = "sha256-RnaAiumTP4cW2eHUbnwyPdgJQLK65gqDI/NP2SOrO4E="; + cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 1cc63d7b58..316b37f2e0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.26"; - sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; + version = "7.4.27"; + sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563"; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 8cf7d4ebc8..b34f5974ff 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.13"; - sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; + version = "8.0.14"; + sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v"; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix deleted file mode 100644 index 3fb909b0bb..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, fetchurl, python2Packages }: - -python2Packages.buildPythonPackage rec { - pname = "pyrex"; - version = "0.9.5.1.1"; - - src = fetchurl { - url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; - sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; - }; - - doCheck = false; - - meta = { - homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; - description = "A language for writing Python extension modules"; - license = lib.licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix deleted file mode 100644 index e9d8d30970..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, fetchurl, python2Packages }: - -python2Packages.buildPythonPackage rec { - pname = "pyrex"; - version = "0.9.6.4"; - - src = fetchurl { - url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; - sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; - }; - - doCheck = false; - - meta = { - homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; - description = "A language for writing Python extension modules"; - license = lib.licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 91029b302c..b6d60ba8a8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -273,29 +273,29 @@ in { sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; }; - pypy27_prebuilt = callPackage ./pypy/prebuilt.nix { + pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "6"; }; - sha256 = "1cfpdyvbvzwc0ynjr7248jhwgcpl7073wlp7w3g2v4fnrh1bc4pl"; # linux64 + sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; - pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { # Not included at top-level - self = pythonInterpreters.pypy36_prebuilt; + self = pythonInterpreters.pypy38_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "7"; }; - sha256 = "02lys9bjky9bqg6ggv8djirbd3zzcsq7755v4yvwm0k4a7fmzf2g"; # linux64 - pythonVersion = "3.6"; + sha256 = "sha256-Xe43x8PLixYAKPveOlkBxoBD36VFoWeUUCuJfUvEDX4="; # linux64 + pythonVersion = "3.8"; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 460af1cc67..69de6e94e3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -6,8 +6,9 @@ , which # Dependencies , bzip2 +, sqlite , zlib -, openssl_1_0_2 +, openssl , expat , ncurses6 , tcl-8_5 @@ -27,12 +28,12 @@ with lib; let isPy3k = majorVersion == "3"; - passthru = passthruFun { + passthru = passthruFun rec { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; executable = "pypy${if isPy3k then "3" else ""}"; - sitePackages = "site-packages"; + sitePackages = "lib/${libPrefix}/site-packages"; hasDistutilsCxxPatch = false; # Not possible to cross-compile with. @@ -49,8 +50,9 @@ let deps = [ bzip2 + sqlite zlib - openssl_1_0_2 + openssl expat ncurses6 tcl-8_5 @@ -68,10 +70,9 @@ in with passthru; stdenv.mkDerivation { buildInputs = [ which ]; installPhase = '' - mkdir -p $out/lib + mkdir -p $out echo "Moving files to $out" - mv -t $out bin include lib-python lib_pypy site-packages - mv lib/libffi.so.6* $out/lib/ + mv -t $out bin include lib mv $out/bin/libpypy*-c.so $out/lib/ @@ -84,8 +85,9 @@ in with passthru; stdenv.mkDerivation { $out/bin/pypy* pushd $out - find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; + + find ./lib -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; + find ./lib -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix new file mode 100644 index 0000000000..460af1cc67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -0,0 +1,132 @@ +{ lib +, stdenv +, fetchurl +, python-setup-hook +, self +, which +# Dependencies +, bzip2 +, zlib +, openssl_1_0_2 +, expat +, ncurses6 +, tcl-8_5 +, tk-8_5 +# For the Python package set +, packageOverrides ? (self: super: {}) +, sourceVersion +, pythonVersion +, sha256 +, passthruFun +}: + +# This version of PyPy is primarily added to speed-up translation of +# our PyPy source build when developing that expression. + +with lib; + +let + isPy3k = majorVersion == "3"; + passthru = passthruFun { + inherit self sourceVersion pythonVersion packageOverrides; + implementation = "pypy"; + libPrefix = "pypy${pythonVersion}"; + executable = "pypy${if isPy3k then "3" else ""}"; + sitePackages = "site-packages"; + hasDistutilsCxxPatch = false; + + # Not possible to cross-compile with. + pythonOnBuildForBuild = throw "${pname} does not support cross compilation"; + pythonOnBuildForHost = self; + pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; + pythonOnHostForHost = throw "${pname} does not support cross compilation"; + pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; + }; + pname = "${passthru.executable}_prebuilt"; + version = with sourceVersion; "${major}.${minor}.${patch}"; + + majorVersion = substring 0 1 pythonVersion; + + deps = [ + bzip2 + zlib + openssl_1_0_2 + expat + ncurses6 + tcl-8_5 + tk-8_5 + ]; + +in with passthru; stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + inherit sha256; + }; + + buildInputs = [ which ]; + + installPhase = '' + mkdir -p $out/lib + echo "Moving files to $out" + mv -t $out bin include lib-python lib_pypy site-packages + mv lib/libffi.so.6* $out/lib/ + + mv $out/bin/libpypy*-c.so $out/lib/ + + rm $out/bin/*.debug + + echo "Patching binaries" + interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) + patchelf --set-interpreter $interpreter \ + --set-rpath $out/lib \ + $out/bin/pypy* + + pushd $out + find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; + + echo "Removing bytecode" + find . -name "__pycache__" -type d -depth -exec rm -rf {} \; + popd + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + + ''; + + doInstallCheck = true; + + # Check whether importing of (extension) modules functions + installCheckPhase = let + modules = [ + "ssl" + "sys" + "curses" + ] ++ optionals (!isPy3k) [ + "Tkinter" + ] ++ optionals isPy3k [ + "tkinter" + ]; + imports = concatMapStringsSep "; " (x: "import ${x}") modules; + in '' + echo "Testing whether we can import modules" + $out/bin/${executable} -c '${imports}' + ''; + + setupHook = python-setup-hook sitePackages; + + donPatchElf = true; + dontStrip = true; + + inherit passthru; + + meta = with lib; { + homepage = "http://pypy.org/"; + description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 3a6a14133e..ee610b2620 100755 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -242,7 +242,9 @@ DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' FORMATS = { 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, - 'wheel' : 'whl' + 'wheel' : 'whl', + 'pyproject' : 'tar.gz', + 'flit' : 'tar.gz' } def _determine_fetcher(text): @@ -281,12 +283,8 @@ def _determine_extension(text, fetcher): if extension is None: if src_format is None: src_format = 'setuptools' - elif src_format == 'flit': - raise ValueError("Don't know how to update a Flit package.") elif src_format == 'other': raise ValueError("Don't know how to update a format='other' package.") - elif src_format == 'pyproject': - raise ValueError("Don't know how to update a pyproject package.") extension = FORMATS[src_format] elif fetcher == 'fetchurl': @@ -352,9 +350,19 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - text = _replace_value('rev', f"{prefix}${{version}}", text) - # incase there's no prefix, just rewrite without interpolation - text = text.replace('"${version}";', 'version;') + # in the case of fetchFromGitHub, it's common to see `rev = version;` + # in which no string value is meant to be substituted. + # Verify that the attribute is set to a variable + regex = '(rev\s+=\s+([_a-zA-Z][_a-zA-Z0-9\.]*);)' + regex = re.compile(regex) + value = regex.findall(text) + n = len(value) + + if n == 0: + # value is set to a string, e.g. `rev = "v${version}";` + text = _replace_value('rev', f"{prefix}${{version}}", text) + # incase there's no prefix, just rewrite without interpolation + text = text.replace('"${version}";', 'version;') with open(path, 'w') as f: f.write(text) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix deleted file mode 100644 index b0c10c8a65..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2 -, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib -, glib -}: - -with python2Packages; - -stdenv.mkDerivation rec { - pname = "renpy"; - version = "7.3.5"; - - meta = with lib; { - description = "Ren'Py Visual Novel Engine"; - homepage = "https://renpy.org/"; - license = licenses.mit; - platforms = platforms.linux; - }; - - src = fetchurl { - url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"; - }; - - patches = [ - ./launcherenv.patch - ]; - - postPatch = '' - substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - python cython wrapPython tkinter - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib - ]; - - pythonPath = [ pygame_sdl2 tkinter ]; - - RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib - ]); - - buildPhase = '' - python module/setup.py build - ''; - - installPhase = '' - mkdir -p $out/share/renpy - cp -vr * $out/share/renpy - rm -rf $out/share/renpy/module - - python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module - - makeWrapper ${python}/bin/python $out/bin/renpy \ - --set PYTHONPATH $PYTHONPATH \ - --set RENPY_BASE $out/share/renpy \ - --add-flags "-O $out/share/renpy/renpy.py" - ''; - - NIX_CFLAGS_COMPILE = "-I${pygame_sdl2}/include/${python.libPrefix}"; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch b/third_party/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch deleted file mode 100644 index 85a6c6439b..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/launcherenv.patch +++ /dev/null @@ -1,14 +0,0 @@ -# The launcher game starts projects in a separate python process -# with the -E flag, which prevents the nix set PYTHONPATH envvar -# from taking effect, preventing the loading of pygame_sdl2 ---- a/launcher/game/project.rpy -+++ b/launcher/game/project.rpy -@@ -239,7 +239,7 @@ - raise Exception("Python interpreter not found: %r", executables) - - # Put together the basic command line. -- cmd = [ executable, "-EO", sys.argv[0] ] -+ cmd = [ executable, "-O", sys.argv[0] ] - - cmd.append(self.path) - cmd.extend(args) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 675a7cdd6b..6022245cac 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }: +{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; - nativeBuildInputs = [ python cmake clang ]; + nativeBuildInputs = [ python2 cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix new file mode 100644 index 0000000000..738b73d8e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "yex-lang"; + version = "unstable-2021-12-25"; + + src = fetchFromGitHub { + owner = "nonamescm"; + repo = "yex-lang"; + rev = "a97def1431b73b8693700f530ec023f1776eaf83"; + hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw="; + }; + + cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ="; + + meta = with lib; { + homepage = "https://github.com/nonamesc/yex-lang"; + description = "A cool functional scripting language written in rust"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isAarch64 && stdenv.isLinux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index 41c9da0420..bd6f2545b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -41,12 +41,14 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit + systemd ]; mesonFlags = [ "-Dadmin_group=wheel" "-Dlocalstatedir=/var" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dsystemd=true" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index a66db48001..bc0da2ddea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python3, clfft, clblas @@ -8,11 +8,14 @@ stdenv.mkDerivation rec { pname = "arrayfire"; - version = "3.6.4"; + version = "3.7.3"; - src = fetchurl { - url = "http://arrayfire.com/arrayfire_source/arrayfire-full-${version}.tar.bz2"; - sha256 = "1fin7a9rliyqic3z83agkpb8zlq663q6gdxsnm156cs8s7f7rc9h"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0gcbg6b6gs38xhks5pp0vkcqs89zl7rh9982jqlzsd0h724qddw0"; + fetchSubmodules = true; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index afecd561b7..3a1118c0d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; - version = "0.3.2"; + version = "0.4.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; + sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU="; }; buildInputs = [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix index c4a983d879..2b5e5a4add 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/blitz/default.nix @@ -4,7 +4,7 @@ , pkg-config , gfortran , texinfo -, python +, python2 , boost # Select SIMD alignment width (in bytes) for vectorization. , simdWidth ? 1 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh"; }; - nativeBuildInputs = [ pkg-config python texinfo ]; + nativeBuildInputs = [ pkg-config python2 texinfo ]; buildInputs = [ gfortran texinfo boost ]; configureFlags = diff --git a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix index 4a8afcfc2b..bfd7bee94b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ andir cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix index 855a9eef8e..9d3ea6f32d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix @@ -1,21 +1,29 @@ -{ cmake, fetchFromGitHub, icu, lib, pkg-config, stdenv, enableUnicodeHelp ? true }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, icu +, pkg-config +, enableUnicodeHelp ? true +}: stdenv.mkDerivation rec { name = "cxxopts"; - version = "unstable-2020-12-14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "jarro2783"; repo = name; - rev = "2d8e17c4f88efce80e274cb03eeb902e055a91d3"; - sha256 = "0pwrac81zfqjs17g3hx8r3ds2xf04npb6mz111qjy4bx17314ib7"; + rev = "v${version}"; + sha256 = "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"; }; + # CMake does not set CMAKE_LIBRARY_ARCHITECTURE variable in Nix, which breaks architecture-independent library path generation + patches = [ ./fix-install-path.patch ]; + buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] - ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE" - # Due to -Wsuggest-override, remove when cxxopts is updated - ++ lib.optional stdenv.isDarwin "-DCXXOPTS_ENABLE_WARNINGS=OFF"; + ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"; nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/fix-install-path.patch b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/fix-install-path.patch new file mode 100644 index 0000000000..d91e3fb6dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/fix-install-path.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/cxxopts.cmake b/cmake/cxxopts.cmake +index 46e87ba..0ead543 100644 +--- a/cmake/cxxopts.cmake ++++ b/cmake/cxxopts.cmake +@@ -87,7 +87,12 @@ endfunction() + + # Helper function to ecapsulate install logic + function(cxxopts_install_logic) +- string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") ++ if(CMAKE_LIBRARY_ARCHITECTURE) ++ string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") ++ else() ++ # On some systems (e.g. NixOS), `CMAKE_LIBRARY_ARCHITECTURE` can be empty ++ set(CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}") ++ endif() + set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/cxxopts" CACHE STRING "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.") + set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake") + set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake") diff --git a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix index 0e96a346f4..59b1613840 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + # see https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=libfreenect&id=0d17db49ba64bcb9e3a4eed61cf55c9a5ceb97f1 + patchPhase = lib.concatMapStrings (x: '' + substituteInPlace ${x} --replace "{GLUT_LIBRARY}" "{GLUT_LIBRARIES}" + '') [ "examples/CMakeLists.txt" "wrappers/cpp/CMakeLists.txt" ]; + meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; homepage = "http://openkinect.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 234d986b21..0e57160f19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libjpeg, libtiff, zlib -, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl +, postgresql, libmysqlclient, libgeotiff, python3Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] - ++ (with python2Packages; [ python numpy wrapPython ]) + ++ (with python3Packages; [ python numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 62735dfa9b..124c0a48cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.3.2"; + version = "3.4.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM="; + sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97"; }; sourceRoot = "source/gdal"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { expat libxml2 postgresql - ] ++ (with pythonPackages; [ python numpy wrapPython ]) + ] ++ (with pythonPackages; [ python setuptools numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix index a59541edb2..fa4cb404b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix index 015147d70b..1a8ea5c1ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; - rev = "4c70d818ed18231563fe49ff197d1c41054be592"; - sha256 = "02xy3c2ix3nw8109aw75ixj651knzc5rjqwqrxximm4hzwx09frk"; + rev = "v${version}"; + sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index d76a58fc63..08ce423549 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.1.0"; + version = "22.1.1"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0giba5274kzpjb5rp3d9bbnvcz7fp8ybi4s3hha2idxk0l5yamf1"; + sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 1d4afb973f..732efda1df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "2021.06.30"; + version = "2022.01.04"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "sha256-1bSeGI8IufKtdcyxVHX4DVxkPKfJrUBVzzIGe8rQ/AA="; + sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04="; }; patches = lib.optional withTracing ./tracing.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 5ce953be07..fb5313ecf0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -12,18 +12,19 @@ , libepoxy , libGL , xorg +, libunwind }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.157.0"; + version = "4.192.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h"; + sha256 = "19i7p9z8mmki5yq26059dp9055cccgxs0vfdlx0w1qak7pmv1vpm"; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { libepoxy libGL xorg.libX11 + libunwind ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix index 334fc61fc3..b5b628455d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.4.8"; + version = "2.4.10"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-GVYG+ioqGo0k6ClrJu2mijtuBBFc9l6dNexNDNyh5+8="; + sha256 = "sha256-NdkWG7QdsMwx605m4P4LqBJTEqlIQhI3ChOvYwERkis="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index e95adbd629..d7eba4c873 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "sha256-shcGJebjXJ3ORvcdINJFLiuW7ySqe6HyPUQioeUG/wM="; + sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8="; }; nativeBuildInputs = [ gnused python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix index 3b9c2768f4..43c96027d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf-archive }: stdenv.mkDerivation rec { pname = "libxls"; version = "1.6.2"; - src = fetchurl { - url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "sha256-XazDTZS/IRWSbIDG+2nk570u1kA9Uc/0kEGpQXL143E="; + src = fetchFromGitHub { + owner = "libxls"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vjmYByk+IDBon8xGR1+oNaEQTiJK+IVpDXsG1IyVNoY="; }; - nativeBuildInputs = [ unzip ]; + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/libxls/libxls/commit/007e63c1f5e19bc73292f267c85d7dd14e9ecb38.patch"; + sha256 = "sha256-PjPHuXth4Yaq9nVfk5MYJMRo5B0R6YA1KEqgwfjF3PM="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook autoconf-archive ]; enableParallelBuilding = true; meta = with lib; { description = "Extract Cell Data From Excel xls files"; - homepage = "https://sourceforge.net/projects/libxls/"; + homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix index a465b047a1..e379c34726 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "A YAML parser and emitter for C++"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix index 28156e3e20..9b30ce19b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "A YAML parser and emitter for C++"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix index 9aea86d5e5..994fbe3f14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = version; - sha256 = "sha256-OQVGopAInAI7KCEVr3BxaKD6np2QcFCaDjgNWjT202U="; + sha256 = "sha256-8mKUYvw/0aqrerNNKk0V7r5LByEaaJLg43R/0pwM4Z8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix new file mode 100644 index 0000000000..a00893c157 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "nsync"; + version = "1.24.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = version; + sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + homepage = "https://github.com/google/nsync"; + description = "C library that exports various synchronization primitives"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ puffnfresh ]; + # On macOS we get an error for some reason: + # > mkdir: cannot create directory 'build': File exists + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix index eef6bbdd58..033b9d8c61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }: stdenv.mkDerivation rec { pname = "ntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkg-config python ]; + nativeBuildInputs = [ pkg-config python2 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix index e5c2d66827..baae8ae81b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1jfhydfcnqpksb2bhi960v3h10prf4v5gx42mm2rp6p0jfbqcy50"; + sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opae/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opae/default.nix index cba7e7b285..4e9e4d79dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opae/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opae/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake , libuuid, json_c -, doxygen, perl, python2, python2Packages +, doxygen, perl, python3 }: stdenv.mkDerivation rec { @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=address-of-packed-member" + "-Wno-array-bounds" ]; - nativeBuildInputs = [ cmake doxygen perl python2Packages.sphinx ]; - buildInputs = [ libuuid json_c python2 ]; + nativeBuildInputs = [ cmake doxygen perl python3.pkgs.sphinx ]; + buildInputs = [ libuuid json_c python3 ]; # Set the Epoch to 1980; otherwise the Python wheel/zip code # gets very angry diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix index 4f2f31d614..627d5bbe29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }: +{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }: stdenv.mkDerivation rec { pname = "openbabel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib libxml2 eigen python cairo pcre ]; + buildInputs = [ zlib libxml2 eigen python2 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix index ed2f700dc8..34dcd24083 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib -, enablePython ? false, pythonPackages +, enablePython ? false, python2Packages , enableGtk2 ? false, gtk2 , enableJPEG ? true, libjpeg , enablePNG ? true, libpng @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ lib.optional enablePython pythonPackages.python + ++ lib.optional enablePython python2Packages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ; - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + propagatedBuildInputs = lib.optional enablePython python2Packages.numpy; nativeBuildInputs = [ cmake pkg-config unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix index 8cd4b318cc..dd94a4a088 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2 , boost, eigen, zlib } : @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmake gfortran perl - python + python2 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 65fb04b707..5c3bc936e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python +, python ? null , withPython ? false }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index eba1b21059..dc14a4b801 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , nix-update-script , # base build deps meson @@ -26,7 +27,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.6"; + version = "0.4.7"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,9 +36,18 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-y+Gj9EZn67W3U81zXgp+6JAFxZSZTwwT0TB3Kueb/Tw="; + sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM="; }; + patches = [ + # backport a fix for default device selection + # FIXME remove this after 0.4.8 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch"; + sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M="; + }) + ]; + nativeBuildInputs = [ meson pkg-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index bd731e7b05..dcc077e3dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -25,6 +25,8 @@ , elogind # needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222) , withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) +# cross build fails on polkit-1-scan (https://github.com/NixOS/nixpkgs/pull/152704) +, withGtkDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -119,7 +121,7 @@ stdenv.mkDerivation rec { "-Dos_type=redhat" # only affects PAM includes "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" - "-Dgtk_doc=${lib.boolToString true}" + "-Dgtk_doc=${lib.boolToString withGtkDoc}" "-Dman=true" ] ++ lib.optionals stdenv.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix index d0bdb95fec..561c9cf93c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python pkg-config ]; + buildInputs = [ zlib python2 pkg-config ]; # Can be removed in the next release # https://github.com/wdas/ptex/pull/42 diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix index 28933f96fa..80eb64a577 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, hexio +{ lib, stdenv, fetchFromGitHub, python3Packages, hexio , cmake, bash, arpa2cm, git, asn2quickder }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = with python2Packages; [ + buildInputs = with python3Packages; [ arpa2cm asn1ate hexio diff --git a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96e4a42ad0..7cd3a086cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }: +{ fetchurl, lib, stdenv, ant, jdk, jre, python2, makeWrapper }: stdenv.mkDerivation rec { pname = "rabbitmq-java-client"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jdk python ]; + buildInputs = [ ant jdk python2 ]; buildPhase = "ant dist"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix index e80607ab95..b65ab0bf63 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix @@ -30,6 +30,15 @@ let version = "2019.1.0"; + # TODO: test with newer pytest + pytest = pythonPackages.callPackage + ../../../../python2-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = pythonPackages.hypothesis.override { + doCheck = false; + }; + }; + dijitso = pythonPackages.buildPythonPackage { pname = "dijitso"; inherit version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index 88560e0cd9..d7a0dcfe06 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix index 8c5b4e87d9..fd53db0dcf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python ]; + buildInputs = [ zlib python3 ]; meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/snack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/snack/default.nix index 8c97d0224c..1c876cf363 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/snack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ -# alsa-lib vorbis-tools python can be made optional +# alsa-lib vorbis-tools python2 can be made optional -{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: +{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation rec { pname = "snack"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postUnpack = ''sourceRoot="$sourceRoot/unix"''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; + buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index cbac792e44..3533472156 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib, sqlite }: stdenv.mkDerivation rec { pname = "sqlcipher"; @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { ]; CFLAGS = [ - "-DSQLITE_ENABLE_COLUMN_METADATA=1" - "-DSQLITE_SECURE_DELETE=1" - "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" + # We want feature parity with sqlite + sqlite.NIX_CFLAGS_COMPILE "-DSQLITE_HAS_CODEC" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix b/third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix index 2325c043d0..ef30c5916e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, python +, python2 , libidn , lua , miniupnpc @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python + python2 libidn lua miniupnpc diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 6bc0d3ef75..19ebadd895 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -13,7 +13,7 @@ , libpqxx , clang-tools , catch2 -, python +, python3 , gtest , doxygen , fixDarwinDylibNames @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ clang-tools cmake - python + python3 doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index e69d0e9689..f85834e852 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.2"; + version = "0.17.5"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-D9Kb67HACi8guMoT5n3Yp9INigjuuGAIyKMgcICBJmA="; + sha256 = "sha256-9mNKYFiQtzkBTQEuVWIfR9+e2jAqDszlHGMEQpcRe8U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 0c48c6500c..28eea05251 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DURIPARSER_BUILD_DOCS=OFF" - ]; + ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; checkInputs = [ gtest ]; - doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { homepage = "https://uriparser.github.io/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/5_x.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/5_x.nix deleted file mode 100644 index 441a5559b5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/5_x.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils, xcbuild -, doCheck ? false -, static ? false -}: - -assert readline != null; - -let - arch = if stdenv.isx86_64 then "x64" - else if stdenv.isi686 then "ia32" - else if stdenv.isAarch64 then "arm64" - else if stdenv.isAarch32 then "arm" - else throw "Unknown architecture for v8"; - git_url = "https://chromium.googlesource.com"; - clangFlag = if stdenv.isDarwin then "1" else "0"; - sharedFlag = if static then "static_library" else "shared_library"; - - deps = { - build = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; - sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "e7079f0e0e14108ab0dba58728ff219637458563"; - sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; - sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; - }; - buildtools = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; - sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; - }; - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; - sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; - }; - "platform/inspector_protocol" = fetchgit { - url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; - rev = "f49542089820a34a9a6e33264e09b73779407512"; - sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; - }; - "tools/mb" = fetchgit { - url = "${git_url}/chromium/src/tools/mb.git"; - rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; - sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/external/swarming.client.git"; - rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; - sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; - }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; - sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/simdjs/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; - rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; - sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; - sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; - sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; - sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; - }; - }; - -in - -stdenv.mkDerivation rec { - pname = "v8"; - version = "5.4.232"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - # Patch based off of: - # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches - patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; - - postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - gypfiles/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dclang=${clangFlag} \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dcomponent=${sharedFlag} \ - -Dconsole=readline \ - -Dv8_target_arch=${arch} \ - -Dv8_use_external_startup_data=0 - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ] - ++ lib.optional stdenv.isDarwin xcbuild - ++ lib.optional stdenv.isLinux patchelf; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" - + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; - - buildFlags = [ - "LINK=c++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - enableParallelBuilding = true; - - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; - - # the `libv8_libplatform` target is _only_ built as a static library, - # and is expected to be statically linked in when needed. - # see the following link for further commentary: - # https://github.com/cowboyd/therubyracer/issues/391 - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if static then "" - else if stdenv.isDarwin then '' - install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - mkdir -p "$out/lib" - cp -v out/Release/*.a "$out/lib" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix new file mode 100644 index 0000000000..5d95a0716e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix @@ -0,0 +1,169 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub +, gn, ninja, python3, glib, pkg-config, icu +, xcbuild, darwin +, fetchpatch +}: + +# Use update.sh to update all checksums. + +let + version = "8.8.278.14"; + v8Src = fetchgit { + url = "https://chromium.googlesource.com/v8/v8"; + rev = version; + sha256 = "0w6zldyas9w6p394876ssn3pnr5rjzjy1a5dcsmdkfj51m4rlg8m"; + }; + + git_url = "https://chromium.googlesource.com"; + + # This data is from the DEPS file in the root of a V8 checkout. + deps = { + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "eb94f1c7aa96207f469008f29989a43feb2718f8"; + sha256 = "14gym38ncc9cysknv3jrql7jvcpjxf2d1dh4m8jgqb967jyzy5cj"; + }; + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "2101eff1ac4bfd25f2dfa71ad632a600a38c1ed9"; + sha256 = "0i3xcwzi4pkv4xpgjkbmcpj5h6mji80zqskkx0jx3sx0ji63fylz"; + }; + "third_party/googletest/src" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "4fe018038f87675c083d0cfb6a6b57c274fb1753"; + sha256 = "1ilm9dmnm2v4y6l1wyfsajsbqv56j29ldfbpd0ykg4q90gpxz201"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1"; + sha256 = "0lgzxf7hmfsgqazs74v5li9ifg8r0jx5m3gxh1mnw33vpwp7qqf4"; + }; + "third_party/zlib" = fetchgit { + url = "${git_url}/chromium/src/third_party/zlib.git"; + rev = "e84c9a3fd75fdc39055b7ae27d6ec508e50bd39e"; + sha256 = "03z30djnb3srhd0nvlxvx58sjqm2bvxk7j3vp4fk6h7a0sa2bdpi"; + }; + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "a82a4944a7f2496639f34a89c9923be5908b80aa"; + sha256 = "02mkjwkrzhrg16zx97z792l0faz7gc8vga8w10r5y94p98jymnyz"; + }; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "0944e71f4b2cb9a871bcbe353f95e889b64a611a"; + sha256 = "052ij8i7nkqchbvzv6ykj929hvfxjbzq7az2l01r0l2gfazhvdb9"; + }; + }; + + # See `gn_version` in DEPS. + gnSrc = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "53d92014bf94c3893886470a1c7c1289f8818db0"; + sha256 = "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"; + }; + + myGn = gn.overrideAttrs (oldAttrs: { + version = "for-v8"; + src = gnSrc; + }); + +in + +stdenv.mkDerivation rec { + pname = "v8"; + inherit version; + + doCheck = true; + + patches = [ + ./darwin.patch + ]; + + src = v8Src; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + chmod u+w -R . + ''; + + postPatch = '' + ${lib.optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + ''} + ${lib.optionalString stdenv.isDarwin '' + substituteInPlace build/config/compiler/compiler.gni \ + --replace 'strip_absolute_paths_from_debug_symbols = true' \ + 'strip_absolute_paths_from_debug_symbols = false' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ + 'false' + ''} + echo 'checkout_google_benchmark = false' > build/config/gclient_args.gni + ''; + + gnFlags = [ + "use_custom_libcxx=false" + "is_clang=${lib.boolToString stdenv.cc.isClang}" + "use_sysroot=false" + # "use_system_icu=true" + "clang_use_chrome_plugins=false" + "is_component_build=false" + "v8_use_external_startup_data=false" + "v8_monolithic=true" + "is_debug=true" + "is_official_build=false" + "treat_warnings_as_errors=false" + "v8_enable_i18n_support=true" + "use_gold=false" + # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' + ''host_toolchain="//build/toolchain/linux/unbundle:default"'' + ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + + NIX_CFLAGS_COMPILE = "-O2"; + FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; + + nativeBuildInputs = [ + myGn + ninja + pkg-config + python3 + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + darwin.DarwinTools + python3.pkgs.setuptools + ]; + buildInputs = [ glib icu ]; + + ninjaFlags = [ ":d8" "v8_monolith" ]; + + enableParallelBuilding = true; + + installPhase = '' + install -D d8 $out/bin/d8 + install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a + install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + cp -r ../../include $out + + mkdir -p $out/lib/pkgconfig + cat > $out/lib/pkgconfig/v8.pc << EOF + Name: v8 + Description: V8 JavaScript Engine + Version: ${version} + Libs: -L$out/lib -lv8 -pthread + Cflags: -I$out/include + EOF + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + platforms = platforms.unix; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index 7c463aa012..1d2911c131 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -1,75 +1,85 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, pythonPackages, glib, pkg-config, icu +, gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: +# Use update.sh to update all checksums. + let + version = "9.7.106.18"; + v8Src = fetchgit { + url = "https://chromium.googlesource.com/v8/v8"; + rev = version; + sha256 = "0cb3w733w1xn6zq9dsr43nx6llcg9hrmb2dkxairarj9c0igpzyh"; + }; + git_url = "https://chromium.googlesource.com"; - # This data is from the DEPS file in the root of a V8 checkout + # This data is from the DEPS file in the root of a V8 checkout. deps = { "base/trace_event/common" = fetchgit { url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "dab187b372fc17e51f5b9fad8201813d0aed5129"; - sha256 = "0dmpj9hj4xv3xb0fl1kb9hm4bhpbs2s5csx3z8cgjd5vwvhdzig4"; + rev = "7f36dbc19d31e2aad895c60261ca8f726442bfbb"; + sha256 = "01b2fhbxznqbakxv42ivrzg6w8l7i9yrd9nf72d6p5xx9dm993j4"; }; - build = fetchgit { + "build" = fetchgit { url = "${git_url}/chromium/src/build.git"; - rev = "26e9d485d01d6e0eb9dadd21df767a63494c8fea"; - sha256 = "1jjvsgj0cs97d26i3ba531ic1f9gqan8x7z4aya8yl8jx02l342q"; + rev = "cf325916d58a194a935c26a56fcf6b525d1e2bf4"; + sha256 = "1ix4h1cpx9bvgln8590xh7lllhsd9w1hd5k9l1gx5yxxrmywd3s4"; }; "third_party/googletest/src" = fetchgit { url = "${git_url}/external/github.com/google/googletest.git"; - rev = "e3f0319d89f4cbf32993de595d984183b1a9fc57"; - sha256 = "18xz71l2xjrqsc0q317whgw4xi1i5db24zcj7v04f5g6r1hyf1a5"; + rev = "16f637fbf4ffc3f7a01fa4eceb7906634565242f"; + sha256 = "11012k3c3mxzdwcw2iparr9lrckafpyhqzclsj26hmfbgbdi0rrh"; }; "third_party/icu" = fetchgit { url = "${git_url}/chromium/deps/icu.git"; - rev = "f2223961702f00a8833874b0560d615a2cc42738"; - sha256 = "0z5p53kbrjfkjn0i12dpk55cp8976j2zk7a4wk88423s2c5w87zl"; - }; - "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "b41863e42637544c2941b574c7877d3e1f663e25"; - sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; - }; - "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; - sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; + rev = "eedbaf76e49d28465d9119b10c30b82906e606ff"; + sha256 = "0mppvx7wf9zlqjsfaa1cf06brh1fjb6nmiib0lhbb9hd55mqjdjj"; }; "third_party/zlib" = fetchgit { url = "${git_url}/chromium/src/third_party/zlib.git"; - rev = "156be8c52f80cde343088b4a69a80579101b6e67"; - sha256 = "0hxbkkzmlv714fjq2jlp5dd2jc339xyh6gkjx1sz3srwv33mlk92"; + rev = "6da1d53b97c89b07e47714d88cab61f1ce003c68"; + sha256 = "0v7ylmbwfwv6w6wp29qdf77kjjnfr2xzin08n0v1yvbhs01h5ppy"; + }; + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "ee69aa00ee8536f61db6a451f3858745cf587de6"; + sha256 = "1fsnd5h0gisfp8bdsfd81kk5v4mkqf8z368c7qlm1qcwc4ri4x7a"; + }; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "1b882ef6372b58bfd55a3285f37ed801be9137cd"; + sha256 = "1jnjidbh03lhfaawimkjxbprmsgz4snr0jl06630dyd41zkdw5kr"; }; }; + # See `gn_version` in DEPS. + gnSrc = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "8926696a4186279489cc2b8d768533e61bba73d7"; + sha256 = "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk"; + }; + + myGn = gn.overrideAttrs (oldAttrs: { + version = "for-v8"; + src = gnSrc; + }); + in stdenv.mkDerivation rec { pname = "v8"; - version = "8.4.255"; + inherit version; doCheck = true; patches = [ - # Remove unrecognized clang debug flags - (fetchpatch { - url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; - sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1"; - }) ./darwin.patch - ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149 ]; - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "07ymw4kqbz7kv311gpk5bs5q90wj73n2q7jkyfhqk4hvhs1q5bw7"; - }; + src = v8Src; postUnpack = '' ${lib.concatStringsSep "\n" ( @@ -80,16 +90,20 @@ stdenv.mkDerivation rec { chmod u+w -R . ''; - postPatch = lib.optionalString stdenv.isAarch64 '' - substituteInPlace build/toolchain/linux/BUILD.gn \ - --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace build/config/compiler/compiler.gni \ - --replace 'strip_absolute_paths_from_debug_symbols = true' \ - 'strip_absolute_paths_from_debug_symbols = false' - substituteInPlace build/config/compiler/BUILD.gn \ - --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ - 'false' + postPatch = '' + ${lib.optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + ''} + ${lib.optionalString stdenv.isDarwin '' + substituteInPlace build/config/compiler/compiler.gni \ + --replace 'strip_absolute_paths_from_debug_symbols = true' \ + 'strip_absolute_paths_from_debug_symbols = false' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ + 'false' + ''} + touch build/config/gclient_args.gni ''; gnFlags = [ @@ -106,7 +120,6 @@ stdenv.mkDerivation rec { "treat_warnings_as_errors=false" "v8_enable_i18n_support=true" "use_gold=false" - "init_stack_vars=false" # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' @@ -116,14 +129,14 @@ stdenv.mkDerivation rec { FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; nativeBuildInputs = [ - gn + myGn ninja pkg-config - python + python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools - pythonPackages.setuptools + python3.pkgs.setuptools ]; buildInputs = [ glib icu ]; @@ -133,7 +146,8 @@ stdenv.mkDerivation rec { installPhase = '' install -D d8 $out/bin/d8 - install -D obj/libv8_monolith.a $out/lib/libv8.a + install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a + install -D -m644 icudtl.dat $out/share/v8/icudtl.dat cp -r ../../include $out mkdir -p $out/lib/pkgconfig diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch b/third_party/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch deleted file mode 100644 index 09579561fd..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h -index 1826601..d123305 100644 ---- a/third_party/zlib/contrib/optimizations/insert_string.h -+++ b/third_party/zlib/contrib/optimizations/insert_string.h -@@ -26,15 +26,23 @@ - #define _cpu_crc32_u32 _mm_crc32_u32 - - #elif defined(CRC32_ARMV8_CRC32) -- #if defined(__clang__) -+ #if defined(__GNUC__) || defined(__clang__) - #undef TARGET_CPU_WITH_CRC -- #define __crc32cw __builtin_arm_crc32cw -+ #if defined(__clang__) -+ #define __crc32cw __builtin_arm_crc32cw -+ #elif defined(__GNUC__) -+ #define __crc32cw __builtin_aarch64_crc32cw -+ #endif - #endif - - #define _cpu_crc32_u32 __crc32cw - - #if defined(__aarch64__) -- #define TARGET_CPU_WITH_CRC __attribute__((target("crc"))) -+ #if defined(__clang__) -+ #define TARGET_CPU_WITH_CRC __attribute__((target("crc"))) -+ #elif defined(__GNUC__) -+ #define TARGET_CPU_WITH_CRC __attribute__((target("+crc"))) -+ #endif - #else // !defined(__aarch64__) - #define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc"))) - #endif // defined(__aarch64__) diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/libv8-5.4.232.patch b/third_party/nixpkgs/pkgs/development/libraries/v8/libv8-5.4.232.patch deleted file mode 100644 index 16c227cfe3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/libv8-5.4.232.patch +++ /dev/null @@ -1,97 +0,0 @@ -From c9f42d1314c6026efcfcc01824f4e2fdfd05ebcf Mon Sep 17 00:00:00 2001 -From: Ben Sklaroff -Date: Sat, 23 Jul 2016 18:16:55 -0400 -Subject: [PATCH] libv8-5.4.232 - ---- - Makefile | 5 +---- - gypfiles/all.gyp | 32 -------------------------------- - gypfiles/standalone.gypi | 5 ++++- - 3 files changed, 5 insertions(+), 37 deletions(-) - -diff --git a/Makefile b/Makefile -index 5ea5c58..d1b2d73 100644 ---- a/Makefile -+++ b/Makefile -@@ -261,11 +261,8 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ - gypfiles/shim_headers.gypi gypfiles/features.gypi \ - gypfiles/standalone.gypi \ - gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \ -- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \ -- test/unittests/unittests.gyp src/v8.gyp \ -- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ - buildtools/third_party/libc++abi/libc++abi.gyp \ -- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ -+ buildtools/third_party/libc++/libc++.gyp \ - src/third_party/vtune/v8vtune.gyp src/d8.gyp - - # If vtunejit=on, the v8vtune.gyp will be appended. -diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp -index ff1bea4..96820a0 100644 ---- a/gypfiles/all.gyp -+++ b/gypfiles/all.gyp -@@ -16,38 +16,6 @@ - '../tools/parser-shell.gyp:parser-shell', - ], - }], -- # These items don't compile for Android on Mac. -- ['host_os!="mac" or OS!="android"', { -- 'dependencies': [ -- '../samples/samples.gyp:*', -- '../test/cctest/cctest.gyp:*', -- '../test/fuzzer/fuzzer.gyp:*', -- '../test/unittests/unittests.gyp:*', -- ], -- }], -- ['test_isolation_mode != "noop"', { -- 'dependencies': [ -- '../test/bot_default.gyp:*', -- '../test/benchmarks/benchmarks.gyp:*', -- '../test/default.gyp:*', -- '../test/ignition.gyp:*', -- '../test/intl/intl.gyp:*', -- '../test/message/message.gyp:*', -- '../test/mjsunit/mjsunit.gyp:*', -- '../test/mozilla/mozilla.gyp:*', -- '../test/optimize_for_size.gyp:*', -- '../test/perf.gyp:*', -- '../test/preparser/preparser.gyp:*', -- '../test/simdjs/simdjs.gyp:*', -- '../test/test262/test262.gyp:*', -- '../test/webkit/webkit.gyp:*', -- '../tools/check-static-initializers.gyp:*', -- '../tools/gcmole/run_gcmole.gyp:*', -- '../tools/jsfunfuzz/jsfunfuzz.gyp:*', -- '../tools/run-deopt-fuzzer.gyp:*', -- '../tools/run-valgrind.gyp:*', -- ], -- }], - ] - } - ] -diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi -index 89f06a0..a43976d 100644 ---- a/gypfiles/standalone.gypi -+++ b/gypfiles/standalone.gypi -@@ -506,6 +506,9 @@ - }], # fastbuild!=0 - ], - 'target_conditions': [ -+ ['_type=="static_library"', { -+ 'standalone_static_library': 1, -+ }], - ['v8_code == 0', { - 'defines!': [ - 'DEBUG', -@@ -770,7 +773,7 @@ - [ 'visibility=="hidden" and v8_enable_backtrace==0', { - 'cflags': [ '-fvisibility=hidden' ], - }], -- [ 'component=="shared_library"', { -+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64" or v8_target_arch=="arm")', { - 'cflags': [ '-fPIC', ], - }], - [ 'clang==0 and coverage==1', { --- -2.9.0 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/update.sh b/third_party/nixpkgs/pkgs/development/libraries/v8/update.sh index f046bb8e68..c3fbab6faf 100755 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/update.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/update.sh @@ -1,29 +1,45 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl -p nix-prefetch-git +#! nix-shell -i bash -p curl -p nix-prefetch-git -p jq VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux -TARGET_CHANNEL=beta -FILE_PATH=6_x.nix +TARGET_CHANNEL=stable set -eo pipefail -v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }") +if [ -n "$1" ]; then + v8_version="$1" + shift +else + v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }") +fi + +if [ -n "$1" ]; then + file_path="$1" +else + file_path=default.nix +fi echo "Using V8 version --> $v8_version" -sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH} -sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \ - | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') -sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH} +prefetched=$(nix-prefetch-git --no-deepClone https://chromium.googlesource.com/v8/v8 "refs/tags/${v8_version}") -deps="$(mktemp)" +path=$(echo "$prefetched" | jq -r .path) +sha256=$(echo "$prefetched" | jq -r .sha256) +sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${file_path} +sed -e "/v8Src = fetchgit/ { n; n; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path} -curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS" -echo $deps +deps="$path/DEPS" -sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do +echo "$deps" + +echo "Processing gn" +gn_rev=$(sed -ne "s/.*'gn_version': 'git_revision:\([^']*\).*/\1/p" < "$deps") +gn_sha256=$(nix-prefetch-git --no-deepClone https://gn.googlesource.com/gn "$gn_rev" 2>/dev/null | jq -r .sha256) +sed -e "/gnSrc = fetchgit/ { n; n; s/\".*\"/\"${gn_rev}\"/; n; s/\".*\"/\"${gn_sha256}\"/ }" -i ${file_path} + +sed -ne '/" = fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${file_path} | while read dep; do echo "Processing dependency --> $dep" escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g') - dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps") + dep_rev=$(sed -ne "/'${escaped_dep}':/ { n; s#.*+ '##; s#'.*##; p }" "$deps") if [ "$dep_rev" = "" ]; then echo "Failed to resolve dependency $dep, not listed in DEPS file" @@ -31,8 +47,8 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d exit 2 fi - repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH}) - sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') + repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${file_path}) + sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | jq -r .sha256) if [ "$sha256" = "" ]; then echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev" @@ -40,8 +56,7 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d exit 2 fi - sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH} + sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path} done -rm -f "$deps" echo done. diff --git a/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix index d6d43e6a1f..a4371e7d1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix @@ -12,12 +12,11 @@ , libpng , libtiff , openexr -, python2Packages +, python3 }: let - inherit (python2Packages) python numpy; - # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... + python = python3.withPackages (py: with py; [ numpy ]); in stdenv.mkDerivation rec { pname = "vigra"; @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - numpy openexr python ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix index 5c9271f2a8..6991d3c884 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix index 93ecf0bd3a..e7cf7bc9b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix @@ -2,6 +2,7 @@ , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang +, nixosTests , enableXWayland ? true, xwayland ? null }: @@ -49,6 +50,9 @@ stdenv.mkDerivation rec { done ''; + # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): + passthru.tests.tinywl = nixosTests.tinywl; + meta = with lib; { description = "A modular Wayland compositor library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 4f842e5de1..a8450b414e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256:13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv"; + sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix index aa7db78c4c..514ebe9975 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zxing-cpp"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "nu-book"; repo = pname; rev = "v${version}"; - hash = "sha256-N2FTzsjxm3EE5Wqz7xt+FS4zQ60Ow4WbdX6Eo08ktek="; + hash = "sha256-M565VNKhSmYFmCMEI9UFuHWNZWeHrf9qzZkMAw9LUr4="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" + "-DBUILD_BLACKBOX_TESTS=OFF" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index 7f40453a6f..fd9bb4dd67 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: +{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl, nixosTests }: let inherit (pkgs) lib; @@ -442,6 +442,8 @@ let echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home patch -d $out/lib/node_modules/thelounge -p1 < ${./thelounge-packages-path.patch} ''; + passthru.tests = { inherit (nixosTests) thelounge; }; + meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; }; }; yaml-language-server = super.yaml-language-server.override { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix index ffd0b5003c..e960167c86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "fix"; - version = "20201120"; + version = "20211231"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; rev = "${version}"; - sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg="; + sha256 = "sha256-T/tbiC95yzPb60AiEcvMRU47D8xUZNN5C4X33Y1VB9E="; }; minimumOCamlVersion = "4.03"; @@ -18,7 +18,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://gitlab.inria.fr/fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; - license = licenses.cecill-c; + license = licenses.lgpl2Only; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index 8e503f5ddd..3649ee284e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "index"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c"; + sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx"; }; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix index 3357b99ceb..264d95f39f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }: +{ stdenv, lib, python2, cmake, libllvm, ocaml, findlib, ctypes }: let version = lib.getVersion libllvm; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit (libllvm) src; nativeBuildInputs = [ cmake ]; - buildInputs = [ python ocaml findlib ctypes ]; + buildInputs = [ python2 ocaml findlib ctypes ]; propagatedBuildInputs = [ libllvm ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix index a3c0a5add3..4c00ff9846 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix @@ -1,23 +1,20 @@ -{ lib, buildDunePackage, fetchurl -, mtime, terminal_size, alcotest, astring, fmt +{ lib, buildDunePackage +, fmt, logs, mtime, optint, terminal, vector +, alcotest, astring }: buildDunePackage rec { pname = "progress"; - version = "0.1.1"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; useDune2 = true; - src = fetchurl { - url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; - sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32"; - }; + inherit (terminal) version src; - propagatedBuildInputs = [ mtime terminal_size ]; + propagatedBuildInputs = [ fmt logs mtime optint terminal vector ]; doCheck = true; - checkInputs = [ alcotest astring fmt ]; + checkInputs = [ alcotest astring ]; meta = with lib; { description = "Progress bar library for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix index bee8a6106e..c19b40eb9a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }: +{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }: # This is the original pycaml version with patches from debian. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sourceRoot = "pycaml"; patches = [ "../debian/patches/*.patch" ]; - buildInputs = [ ncurses ocaml findlib python ocaml_make ]; + buildInputs = [ ncurses ocaml findlib python2 ocaml_make ]; createFindlibDestdir = true; # the Makefile is not shipped with an install target, hence we do it ourselves. diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix new file mode 100644 index 0000000000..1fcdc1a5cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchurl, ocaml +, stdlib-shims, uutf, uucp +, alcotest, fmt +}: + +buildDunePackage rec { + pname = "terminal"; + version = "0.2.1"; + + minimalOCamlVersion = "4.03"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz"; + sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs"; + }; + + propagatedBuildInputs = [ stdlib-shims uutf uucp ]; + + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest fmt ]; + + meta = with lib; { + description = "Basic utilities for interacting with terminals"; + homepage = "https://github.com/CraigFe/progress"; + license = licenses.mit; + maintainers = [ maintainers.vbgl ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vector/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vector/default.nix new file mode 100644 index 0000000000..c5f4336bb8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vector/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "vector"; + version = "1.0.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/backtracking/vector/releases/download/${version}/vector-${version}.tbz"; + sha256 = "sha256:0hb6prpada4c5z07sxf5ayj5xbahsnwall15vaqdwdyfjgbd24pj"; + }; + + doCheck = true; + + meta = { + description = "Resizable arrays for OCaml"; + license = lib.licenses.lgpl2Only; + homepage = "https://github.com/backtracking/vector"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix index 01b384fe0b..43fc5b245c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix @@ -1,9 +1,18 @@ -{ stdenv, ocaml, findlib, zarith, z3 }: +{ stdenv, lib, ocaml, findlib, zarith, z3 }: -let z3-with-ocaml = z3.override { +if !lib.versionAtLeast ocaml.version "4.07" +then throw "z3 is not available for OCaml ${ocaml.version}" +else + +let z3-with-ocaml = (z3.override { ocamlBindings = true; inherit ocaml findlib zarith; -}; in +}).overrideAttrs (o: { + patches = (o.patches or []) ++ [ + # Fix build; see: https://github.com/Z3Prover/z3/issues/5776 + ./ocamlfind.patch + ]; +}); in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/ocamlfind.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/ocamlfind.patch new file mode 100644 index 0000000000..d84907cf79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/ocamlfind.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/mk_util.py b/scripts/mk_util.py +index 042e6af46..1e105b002 100644 +--- a/scripts/mk_util.py ++++ b/scripts/mk_util.py +@@ -1995,7 +1995,7 @@ class MLComponent(Component): + + LIBZ3 = LIBZ3 + ' ' + ' '.join(map(lambda x: '-cclib ' + x, LDFLAGS.split())) + +- stubs_install_path = '$$(%s printconf path)/stublibs' % OCAMLFIND ++ stubs_install_path = '$$(%s printconf destdir)/stublibs' % OCAMLFIND + if not STATIC_LIB: + loadpath = '-ccopt -L' + stubs_install_path + dllpath = '-dllpath ' + stubs_install_path diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix index 74c3879aa9..db2f45a5ac 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl # Build-time dependencies -, mlterm , ncurses # >= 5 , units }: @@ -17,7 +16,6 @@ buildOctavePackage rec { }; buildInputs = [ - mlterm ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a29c721b92..9d6e49cfdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.2"; + version = "3.19.3"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-zsnv3Lw+CWhNQ9ovXAuIujAXfkjiiWm797ncHIN3y/E="; + sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix index 9685f5c996..fd4fb79a59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.7.3"; + version = "0.7.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; rev = version; - sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw"; + sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix index c63b3b4ffd..d80b564ea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.5"; + version = "3.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LrrYWQtqAYPA2Yk1I7RY7c6YeuRTMznFrBhc+sMtrxo="; + sha256 = "3ba2c25dd03fbf3992353595be18152e2fb6042f47b526ea66cd5838bb9f1fb6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix index 8ad6fa98ff..d379e65250 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix @@ -6,22 +6,29 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "afsapi"; - version = "0.0.4"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "zhelev"; + owner = "wlcrs"; repo = "python-afsapi"; rev = version; - sha256 = "aevxhHuRedDs0JxeMlYSKHDQwcIs7miRm4FCtssdE0w="; + hash = "sha256-9cExuVFbESOUol10DUj9Bt6evtXi1ctBeAsGitrSDqc="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ aiohttp lxml @@ -42,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Frontier Silicon API"; - homepage = "https://github.com/zhelev/python-afsapi"; + homepage = "https://github.com/wlcrs/python-afsapi"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index ca74671ab8..b51f5f1656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,20 +7,25 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S+ntSC9KySj2njkxEkr7p2TDsBqY0Gf+zzwomnGwSEk="; + hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8="; }; - propagatedBuildInputs = [ pyvex ]; + propagatedBuildInputs = [ + pyvex + ]; # Tests depend on angr (possibly a circular dependency) doCheck = false; + #pythonImportsCheck = [ "ailment" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 9249df059b..92e87e1ab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "21.11.0"; + version = "22.1.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,16 +21,9 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw="; + sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM="; }; - postPatch = '' - # Upstream is releasing with the help of a CI to PyPI, GitHub releases - # are not in their focus - substituteInPlace setup.py \ - --replace 'version="main",' 'version="${version}",' - ''; - propagatedBuildInputs = [ aiohttp async-timeout @@ -42,7 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aiogithubapi" ]; + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "aiogithubapi" + ]; meta = with lib; { description = "Python client for the GitHub API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix index fea1956e33..6e77c5589e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.8"; + version = "0.2.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47"; + sha256 = "sha256-T30pLzPWD+5pb0ShkpNdiBFO45RdiMYgCOSg8rx+t+Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix new file mode 100644 index 0000000000..3cd0fe0984 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-aiohttp +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiohttp-retry"; + version = "2.5.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "inyutin"; + repo = "aiohttp_retry"; + rev = "v${version}"; + hash = "sha256-jyt4YPn3gSgR1YfHYLs+5VCsjAk9Ij+2m5Kzy51CnLk="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiohttp_retry" + ]; + + meta = with lib; { + description = "Retry client for aiohttp"; + homepage = "https://github.com/inyutin/aiohttp_retry"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix index b9b2801f75..538f628abe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiohwenergy"; - version = "0.4.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = version; - sha256 = "Rs7kD+jN/z0j4KmkitquB+cm2UcYG87YHczZR0A4axI="; + sha256 = "006q2kgc28dn43skk2x76d13fp51sy073nm8f2hrxn4wqwkccsx3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index f4d1541a13..be6a0cca00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4="; + sha256 = "05m5jgn8g3kwrp92x3mdfpnpga1jc4whlxx9vlymg0r9s5y84lz5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix index 892046908c..7458ca11e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , docopt , fetchFromGitHub +, fetchpatch , hypothesis , passlib , poetry-core +, pytest-logdog , pytest-asyncio , pytestCheckHook , pythonOlder @@ -15,24 +17,21 @@ buildPythonPackage rec { pname = "amqtt"; - version = "0.10.0"; + version = "unstable-2022-01-11"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Yakifo"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I="; + rev = "8961b8fff57007a5d9907b98bc555f0519974ce9"; + hash = "sha256-3uwz4RSoa6KRC8mlVfeIMLPH6F2kOJjQjjXCrnVX0Jo="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'websockets = "^9.0"' 'websockets = "^10.0"' \ - --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' \ - ''; - - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ docopt @@ -44,22 +43,30 @@ buildPythonPackage rec { checkInputs = [ hypothesis + pytest-logdog pytest-asyncio pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' + ''; + disabledTestPaths = [ # Test are not ported from hbmqtt yet "tests/test_cli.py" "tests/test_client.py" ]; - disabledTests = [ - # Requires network access - "test_connect_tcp" - ]; + preCheck = '' + # Some tests need amqtt + export PATH=$out/bin:$PATH + ''; - pythonImportsCheck = [ "amqtt" ]; + pythonImportsCheck = [ + "amqtt" + ]; meta = with lib; { description = "Python MQTT client and broker implementation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 4468dfabec..55153f5cf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -22,6 +22,7 @@ , pycparser , pythonOlder , pyvex +, sympy , sqlalchemy , rpyc , sortedcontainers @@ -45,18 +46,18 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A="; + hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA="; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; - propagatedBuildInputs = [ ailment archinfo @@ -75,20 +76,24 @@ buildPythonPackage rec { progressbar2 protobuf psutil - sqlalchemy pycparser pyvex - sqlalchemy rpyc sortedcontainers + sqlalchemy + sympy unicorn' ]; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ + "--plat-name" + "linux" + ]; + # Tests have additional requirements, e.g., pypcode and angr binaries # cle is executing the tests with the angr binaries doCheck = false; - # See http://angr.io/api-doc/ pythonImportsCheck = [ "angr" "claripy" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix index bad2bb01bf..25781fbcd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fmagin"; repo = "angr-cli"; rev = "v${version}"; - sha256 = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s="; + hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 7989a06b60..20272b35ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8M3d8lG7jDNgICjzjFRi9Wl2I7aYI5b5IvjEhixsk9k="; + hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA="; }; propagatedBuildInputs = [ @@ -28,7 +30,10 @@ buildPythonPackage rec { # 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; - pythonImportsCheck = [ "angrop" ]; + + pythonImportsCheck = [ + "angrop" + ]; meta = with lib; { description = "ROP gadget finder and chain builder"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index ce7bfb1668..beae6671be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , pytestCheckHook , nose +, pythonOlder }: buildPythonPackage rec { pname = "archinfo"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VLFbjKX7WXWoJCS9hYwtEikGC48gRg7E24D9Un+/gdc="; + hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0="; }; checkInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "archinfo" ]; + pythonImportsCheck = [ + "archinfo" + ]; meta = with lib; { description = "Classes with architecture-specific information"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix new file mode 100644 index 0000000000..3a1861bbd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "asgineer"; + version = "0.8.1"; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "almarklein"; + repo = pname; + rev = "v${version}"; + sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx"; + }; + + checkInputs = [ + pytestCheckHook + requests + ]; + + meta = with lib; { + description = "A really thin ASGI web framework"; + license = licenses.bsd2; + homepage = "https://asgineer.readthedocs.io"; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix index dd772e007c..4bcfa7d8e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.25"; + version = "0.9.26"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "newville"; repo = pname; rev = version; - sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs="; + sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix index cb87b9027f..3a9834ec86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix @@ -1,19 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }: +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, pythonOlder +, nose +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "attrdict"; version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70"; + hash = "sha256-NckGmLVcaDlGCRF3F3qenAcToIYPDgSf69cmSczXe3A="; }; - propagatedBuildInputs = [ coverage nose six ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + coverage + nose + ]; + + postPatch = '' + substituteInPlace attrdict/merge.py \ + --replace "from collections" "from collections.abc" + substituteInPlace attrdict/mapping.py \ + --replace "from collections" "from collections.abc" + substituteInPlace attrdict/default.py \ + --replace "from collections" "from collections.abc" + substituteInPlace attrdict/mixins.py \ + --replace "from collections" "from collections.abc" + ''; + + # Tests are not shipped and source is not tagged + doCheck = false; + + pythonImportsCheck = [ + "attrdict" + ]; meta = with lib; { description = "A dict with attribute-style access"; homepage = "https://github.com/bcj/AttrDict"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix index 95910a66e8..de3ddb803a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.6.1"; + version = "5.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40="; + sha256 = "6ac364e5f1c5b376604c3b5a25ad0be5e3a5f96368f590e05b47e6745f1006ee"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 2b2327d9f0..7b088728b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 2685d8803b..545eef7f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b"; + sha256 = "c5f831ff09573247579c0dabe7854324620d176143b28cc4ef2e71ca49791dcc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index cb1d15179b..bfd0b61969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d2a3cfe844bd9e51499b81bba7510e2c8df4fc3a40a7059e6224ed043d65a786"; + sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index 2023eb0ab5..e61cd221db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2"; + sha256 = "4da3bf142d31bc25d80ee26641b95b7f52eb1baf4f326b9954e9f0613944ef3c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 404caf4ebf..005f5ca8f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -1,26 +1,36 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.4.0"; + version = "1.0.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733"; + sha256 = "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.imagebuilder" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.core" + "azure.mgmt.imagebuilder" + ]; meta = with lib; { description = "Microsoft Azure Image Builder Client Library for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index dbe22478d7..edf8057e50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "6.0.1"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "306088088ee10e86c4cf24cc82a9ca619db5cdfc0da3fa207d00ec7f77f06e8e"; + sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index 1c9cb2e945..ad7930016a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24"; + sha256 = "a58750df23d5d4cb8eff283a93312e933ee3ef4272324576005c3dc8c22ce944"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index bf474c0314..b4e37c33fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.4.0"; + version = "7.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4="; + sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix index 283a314666..64e7a8f63d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "8.0.0.0"; + version = "8.2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d"; + sha256 = "f49c8759447970817b9b2d3d4b97439765dcf75ba01b6066ce96b605052fbb23"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 4be6c43ba9..b24417b325 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3f782c9b590b8ae43678c6e003df8ca8cca675832039d270b0b7437ff01557fd"; + sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index 336c6b2e51..a20d0c696c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -1,12 +1,12 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook -, unittest2 , future , numpy , pillow +, fetchpatch , scipy , scikit-learn , scikitimage @@ -16,27 +16,53 @@ buildPythonPackage rec { pname = "batchgenerators"; version = "0.21"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MIC-DKFZ"; repo = pname; rev = "v${version}"; - sha256 = "16bk4r0q3m2c9fawpmj4l7kz0x3fyv1spb92grf44gmyricq3jdb"; - + hash = "sha256-q8mBWcy+PkJcfiKtq8P2bnTw56FE1suVS0zUgUEmc5k="; }; propagatedBuildInputs = [ - future numpy pillow scipy scikit-learn scikitimage threadpoolctl + future + numpy + pillow + scipy + scikit-learn + scikitimage + threadpoolctl ]; - checkInputs = [ pytestCheckHook unittest2 ]; + checkInputs = [ + pytestCheckHook + ]; - meta = { + patches = [ + # Remove deprecated unittest2, https://github.com/MIC-DKFZ/batchgenerators/pull/78 + (fetchpatch { + name = "remove-unittest2.patch"; + url = "https://github.com/MIC-DKFZ/batchgenerators/commit/87a9437057df8a7550aa3b3eaf840871cc0d5cef.patch"; + sha256 = "sha256-vozBK7g2dLxx9din/R2vU28Mm+LoGAO/BmQlt/ShmEo="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"unittest2",' "" + ''; + + pythonImportsCheck = [ + "batchgenerators" + ]; + + meta = with lib; { description = "2D and 3D image data augmentation for deep learning"; homepage = "https://github.com/MIC-DKFZ/batchgenerators"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ bcdarwin ]; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix index d69b2d6ce4..2c24578f45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,33 +1,49 @@ { lib -, buildPythonPackage, fetchFromGitHub -, future, pyparsing -, glibcLocales, nose, unittest2 +, buildPythonPackage +, fetchFromGitHub +, future +, pyparsing +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bibtexparser"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # PyPI tarball does not ship tests src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c"; + hash = "sha256-M9fDI28Yq0uUHPx51wiuRPmRTLkjVqj7ixapbSftnJc="; }; - propagatedBuildInputs = [ future pyparsing ]; + propagatedBuildInputs = [ + future + pyparsing + ]; - checkInputs = [ nose unittest2 glibcLocales ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests + postPatch = '' + # https://github.com/sciunto-org/python-bibtexparser/pull/259 + substituteInPlace bibtexparser/tests/test_crossref_resolving.py \ + --replace "import unittest2 as unittest" "import unittest" ''; - meta = { - description = "Bibtex parser for python 2.7 and 3.3 and newer"; + pythonImportsCheck = [ + "bibtexparser" + ]; + + meta = with lib; { + description = "Bibtex parser for Python"; homepage = "https://github.com/sciunto-org/python-bibtexparser"; - license = with lib.licenses; [ gpl3 bsd3 ]; - maintainers = with lib.maintainers; [ fridh ]; + license = with licenses; [ lgpl3Only /* or */ bsd3 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 004b7d4e3e..0f6334d279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.8.7"; + version = "0.8.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - hash = "sha256-nLZdaV341mULXIngkEqiLQeg4G2NDFGNg/AUozgJe74="; + hash = "sha256-xt21mcXcucUhJlqwDLrAHvQLg9++uc/cX5Sy+Sppsbo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix deleted file mode 100644 index af129f4aa5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/blist/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchpatch -, fetchPypi -, isPyPy -}: - -buildPythonPackage rec { - pname = "blist"; - version = "1.3.6"; - disabled = isPyPy; - - src = fetchPypi { - inherit pname version; - sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; - }; - - - patches = [ - # Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78 - (fetchpatch { - url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; - sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; - }) - - # Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91 - (fetchpatch { - url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch"; - sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga"; - }) - ]; - - meta = with lib; { - homepage = "http://stutzbachenterprises.com/blist/"; - description = "A list-like type with better asymptotic performance and similar performance on small lists"; - license = licenses.bsd0; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index ba8d15909f..f1f7f0e81b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -54,6 +54,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" + "-W" + "ignore::DeprecationWarning" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index 8e26517ba2..cc4e19d6be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -12,16 +12,67 @@ , cairo , cffi , numpy -, withXcffib ? false, xcffib +, withXcffib ? false +, xcffib , python , glib , gdk-pixbuf -}@args: +}: + +buildPythonPackage rec { + pname = "cairocffi"; + version = "1.3.0"; -import ./generic.nix ({ - version = "1.2.0"; - sha256 = "sha256-mpebUAxkyBef7ChvM36P5kTsovLNBYYM4LYtJfIuoUA="; - dlopen_patch = ./dlopen-paths.patch; disabled = pythonOlder "3.5"; - inherit withXcffib; -} // args) + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-EIo6fLCeIDvdhQHZuq2R14bSBFYb1x6TZOizSJfEe5E="; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + propagatedNativeBuildInputs = [ cffi ]; + + # pytestCheckHook does not work + checkInputs = [ numpy pytest glibcLocales ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "pytest-cov" "" \ + --replace "pytest-flake8" "" \ + --replace "pytest-isort" "" \ + --replace "--flake8 --isort" "" + ''; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0 + (substituteAll { + src = ./dlopen-paths.patch; + ext = stdenv.hostPlatform.extensions.sharedLibrary; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk-pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = "https://github.com/SimonSapin/cairocffi"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix deleted file mode 100644 index 004cf8ae78..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ version -, sha256 -, dlopen_patch -, disabled ? false -, ... -}@args: - -with args; - -buildPythonPackage rec { - pname = "cairocffi"; - inherit version disabled; - - src = fetchPypi { - inherit pname version sha256; - }; - - LC_ALL = "en_US.UTF-8"; - - # checkPhase require at least one 'normal' font and one 'monospace', - # otherwise glyph tests fails - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; - propagatedNativeBuildInputs = [ cffi ]; - - # pytestCheckHook does not work - checkInputs = [ numpy pytest glibcLocales ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" \ - --replace "pytest-cov" "" \ - --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" \ - --replace "--flake8 --isort" "" - ''; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - patches = [ - # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0 - (substituteAll { - src = dlopen_patch; - ext = stdenv.hostPlatform.extensions.sharedLibrary; - cairo = cairo.out; - glib = glib.out; - gdk_pixbuf = gdk-pixbuf.out; - }) - ./fix_test_scaled_font.patch - ]; - - meta = with lib; { - homepage = "https://github.com/SimonSapin/cairocffi"; - license = licenses.bsd3; - maintainers = with maintainers; []; - description = "cffi-based cairo bindings for Python"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix index 188ab9cb56..a68d73e124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -1,39 +1,75 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, aenum -, wrapt -, typing ? null -, pyserial -, nose -, mock -, hypothesis +, fetchFromGitHub , future -, pytest - }: +, hypothesis +, parameterized +, msgpack +, pyserial +, pytest-timeout +, pytestCheckHook +, pythonOlder +, typing-extensions +, wrapt +}: buildPythonPackage rec { pname = "python-can"; - version = "3.3.4"; + version = "unstable-2022-01-11"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hardbyte"; + repo = pname; + rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b"; + hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0="; }; - propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; - checkInputs = [ nose mock pytest hypothesis future ]; + propagatedBuildInputs = [ + msgpack + pyserial + typing-extensions + wrapt + ]; - # Add the scripts to PATH - checkPhase = '' - PATH=$out/bin:$PATH pytest -c /dev/null + checkInputs = [ + future + hypothesis + parameterized + pytest-timeout + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" "" ''; + disabledTestPaths = [ + # We don't support all interfaces + "test/test_interface_canalystii.py" + ]; + + disabledTests = [ + # Tests require access socket + "BasicTestUdpMulticastBusIPv4" + "BasicTestUdpMulticastBusIPv6" + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "can" + ]; + meta = with lib; { - homepage = "https://github.com/hardbyte/python-can"; description = "CAN support for Python"; - license = licenses.lgpl3; - maintainers = with maintainers; [ sorki ]; + homepage = "python-can.readthedocs.io"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab sorki ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix index ecba8f9cc3..c4d4e88920 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, unittest2 }: buildPythonPackage rec { @@ -27,7 +26,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - unittest2 ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index a62dcbd249..7105e36056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -2,13 +2,16 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast , pythonOlder , typing-extensions +, zipp }: buildPythonPackage rec { pname = "catalogue"; version = "2.0.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,16 +22,27 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions + zipp ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "catalogue" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/explosion/catalogue/issues/27 + "test_entry_points" + ]; + + pythonImportsCheck = [ + "catalogue" + ]; meta = with lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cjson/default.nix deleted file mode 100644 index d34534e3eb..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cjson/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: - -buildPythonPackage rec { - pname = "python-cjson"; - version = "1.2.2"; - disabled = isPy3k || isPyPy; - - src = fetchPypi { - inherit pname version; - sha256 = "3006c2c218297be3448dc793218e0b15d20fe9839775521bfc294fc6aa24972b"; - }; - - meta = with lib; { - description = "A very fast JSON encoder/decoder for Python"; - homepage = "https://ag-projects.com/"; - license = licenses.lgpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index d96d684e3e..f026f39ccf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,21 +13,18 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66dc0y4mu5S5PtTx2fRkBdpNlH53ZpTiKyM3s0OUamw="; + sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk="; }; - # Use upstream z3 implementation - postPatch = '' - substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" "" - ''; - propagatedBuildInputs = [ cachetools decorator @@ -41,7 +38,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "claripy" ]; + postPatch = '' + # Use upstream z3 implementation + substituteInPlace setup.py \ + --replace "z3-solver>=4.8.5.0" "" + ''; + + pythonImportsCheck = [ + "claripy" + ]; meta = with lib; { description = "Python abstraction layer for constraint solvers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 212267b007..abe8594626 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.10913"; + version = "9.1.11508"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -29,13 +29,15 @@ in buildPythonPackage rec { pname = "cle"; inherit version; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z8hBOqeI7T6Rov00OySDBdzUQ6jeBRseE7sz8VfIJmk="; + hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index a9e3daa837..15f0249fd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "733f65d8c921e0cffa8f7ae4c8735bd7ecdffec383c5246f647ddd0fddb33448"; + sha256 = "sha256-DMwc/Noaxk3H7YPXATBVzxnll50p5Wwh87aS3gFVWq4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix index 4f9a562543..75c4513d1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix @@ -7,7 +7,6 @@ , attrs , od , docutils -, repeated_test , pygments , unittest2 , pytestCheckHook @@ -22,11 +21,13 @@ buildPythonPackage rec { sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d"; }; + # repeated_test no longer exists in nixpkgs + # also see: https://github.com/epsy/clize/issues/74 + doCheck = false; checkInputs = [ pytestCheckHook python-dateutil pygments - repeated_test unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index 1422452213..7a2416728c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -8,6 +8,7 @@ , intbitset , pytest-xdist , pytestCheckHook +, pythonAtLeast , pythonOlder , requests , saneyaml @@ -19,6 +20,7 @@ buildPythonPackage rec { pname = "commoncode"; version = "30.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -49,12 +51,18 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist ]; + disabledTests = lib.optionals stdenv.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/nexB/commoncode/issues/36 + "src/commoncode/fetch.py" + ]; + pythonImportsCheck = [ "commoncode" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index ed6f2da514..bfe4fc2214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -7,7 +7,6 @@ , clickclick , decorator , fetchFromGitHub -, fetchpatch , flask , inflection , jsonschema @@ -23,14 +22,16 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.9.0"; + version = "2.10.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik"; + sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8="; }; propagatedBuildInputs = [ @@ -55,16 +56,20 @@ buildPythonPackage rec { testfixtures ]; - patches = [ - # No minor release for later versions, https://github.com/zalando/connexion/pull/1402 - (fetchpatch { - name = "allow-later-flask-and-werkzeug-releases.patch"; - url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch"; - sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k"; - }) + postPatch = '' + substituteInPlace setup.py \ + --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \ + --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1" + ''; + + disabledTests = [ + # We have a later PyYAML release + "test_swagger_yaml" ]; - pythonImportsCheck = [ "connexion" ]; + pythonImportsCheck = [ + "connexion" + ]; meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix index 7722226ef3..a31930bd0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix @@ -1,29 +1,51 @@ -{ buildPythonPackage, lib, fetchFromGitHub, dissononce, python-axolotl-curve25519 -, transitions, protobuf, nose +{ lib +, buildPythonPackage +, fetchFromGitHub +, dissononce +, python-axolotl-curve25519 +, transitions +, protobuf +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "consonance"; - version = "0.1.3"; + version = "0.1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tgalal"; repo = "consonance"; rev = version; - sha256 = "1ifs0fq6i41rdna1kszv5sf87qbqx1mn98ffyx4xhw4i9r2grrjv"; + hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ="; }; - checkInputs = [ nose ]; - checkPhase = '' - # skipping online test as it requires network with uplink - nosetests tests/test_handshakes_offline.py - ''; + propagatedBuildInputs = [ + dissononce + python-axolotl-curve25519 + transitions + protobuf + ]; - propagatedBuildInputs = [ dissononce python-axolotl-curve25519 transitions protobuf ]; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/test_handshakes_offline.py" + ]; + + pythonImportsCheck = [ + "consonance" + ]; meta = with lib; { - homepage = "https://pypi.org/project/consonance/"; - license = licenses.gpl3; description = "WhatsApp's handshake implementation using Noise Protocol"; + homepage = "https://github.com/tgalal/consonance"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix index 607057b73f..20ccfd6e0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix @@ -1,27 +1,57 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k -, colorlog, pyvmomi, requests, verboselogs -, psutil, pyopenssl, setuptools -, mock, pytest-mock, pytestCheckHook, qemu +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, colorlog +, pyvmomi +, requests +, verboselogs +, pyopenssl +, setuptools +, mock +, pytest-mock +, pytestCheckHook +, qemu }: buildPythonPackage rec { pname = "cot"; version = "2.2.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635"; + hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; }; - propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] - ++ lib.optional (pythonOlder "3.3") psutil; + propagatedBuildInputs = [ + colorlog + pyvmomi + requests + verboselogs + pyopenssl + setuptools + ]; - checkInputs = [ mock pytestCheckHook pytest-mock qemu ]; + checkInputs = [ + mock + pytestCheckHook + pytest-mock + qemu + ]; + + prePatch = '' + # argparse is part of the standardlib + substituteInPlace setup.py \ + --replace "'argparse'," "" + ''; - # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf) - # try enabling these tests with ovftool once/if it is added to nixpkgs disabledTests = [ + # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf) + # try enabling these tests with ovftool once/if it is added to nixpkgs "HelperGenericTest" "TestCOTAddDisk" "TestCOTAddFile" @@ -34,14 +64,15 @@ buildPythonPackage rec { "TestQCOW2" "TestRAW" "TestVMDKConversion" + # CLI test fails with AssertionError + "test_help" ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py --replace "'argparse'," "" - ''; + pythonImportsCheck = [ + "COT" + ]; meta = with lib; { description = "Common OVF Tool"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix deleted file mode 100644 index f7e0af0826..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ buildPythonPackage -, isPy3k -, fetchFromGitHub -, lib -, z3 -, ply -, igraph -, oset -, ordered-set -, dictionaries -, setuptools -}: - -buildPythonPackage { - pname = "cozy"; - version = "2.0a1"; - disabled = !isPy3k; - - propagatedBuildInputs = [ - setuptools - z3 - ply - igraph - oset - ordered-set - dictionaries - ]; - - src = fetchFromGitHub { - owner = "CozySynthesizer"; - repo = "cozy"; - rev = "f553e9b"; - sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j"; - }; - - # - yoink the Z3 dependency name, because our Z3 package doesn't provide it. - # - remove "dictionaries" version bound - # - patch igraph package name - postPatch = '' - sed -i -e '/z3-solver/d' \ - -e 's/^dictionaries.*$/dictionaries/' \ - -e 's/python-igraph/igraph/' \ - requirements.txt - ''; - - # Tests are not correctly set up in the source tree. - doCheck = false; - pythonImportsCheck = [ "cozy" ]; - - # There is some first-time-run codegen that we will force to happen. - postInstall = '' - $out/bin/cozy --help - ''; - - - meta = with lib; { - description = "The collection synthesizer"; - homepage = "https://cozy.uwplse.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ MostAwesomeDude ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 9d1aec8625..6c1c5de2c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder +, fetchpatch , fetchPypi , setuptools-scm , toml @@ -22,6 +24,14 @@ buildPythonPackage rec { sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; }; + patches = lib.optionals (pythonAtLeast "3.10") [ + # fix tests for python3.10 + (fetchpatch { + url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch"; + sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ="; + }) + ]; + nativeBuildInputs = [ setuptools-scm toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index c0ae043587..90e2608069 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.8.4"; + version = "6.9"; src = fetchPypi { inherit pname version; - sha256 = "aec66432bc207b699b252f9468e8cc6d61efda72269cab3a3231d6f95c0328f9"; + sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b"; }; disabled = pythonOlder "3.5"; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of scripts and modules for freezing Python scripts into executables"; - homepage = "http://cx-freeze.sourceforge.net/"; + homepage = "https://marcelotduarte.github.io/cx_Freeze/"; license = licenses.psfl; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix index 67b1722be5..ba74695fb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix @@ -2,12 +2,15 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "dacite"; version = "1.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -21,7 +24,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "dacite" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/konradhalas/dacite/issues/167 + "test_from_dict_with_union_and_wrong_data" + ]; + + pythonImportsCheck = [ + "dacite" + ]; meta = with lib; { description = "Python helper to create data classes from dictionaries"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix new file mode 100644 index 0000000000..38de0218de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sqlalchemy +, alembic +, banal +}: + +buildPythonPackage rec { + pname = "dataset"; + version = "1.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; + }; + + propagatedBuildInputs = [ + sqlalchemy alembic banal + ]; + + # checks attempt to import nonexistent module 'test.test' and fail + doCheck = false; + + pythonImportsCheck = [ + "dataset" + ]; + + meta = with lib; { + description = "Toolkit for Python-based database access"; + homepage = "https://dataset.readthedocs.io"; + license = licenses.mit; + maintainers = [ maintainers.xfnw ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index b25440d0e0..9c6663d278 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "4.3.0"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "17l11mhv1qkdbhmwwal3zfgr1a3w1c4bwm9lqi78gadpl5lli4i2"; + sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix index 25e2692af3..a25ecd74b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix @@ -1,25 +1,34 @@ -{ lib, python, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, python +, buildPythonPackage +, fetchPypi +, isPy3k +}: buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - checkPhase = lib.optionalString isPy3k '' - ${python.interpreter} -m lib2to3 -w test/test_demjson.py - '' + '' + doCheck = !(isPy3k); + + checkPhase = '' ${python.interpreter} test/test_demjson.py ''; + pythonImportsCheck = [ + "demjson" + ]; + meta = with lib; { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = "https://github.com/dmeranda/demjson"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix new file mode 100644 index 0000000000..5e043e55f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dictdiffer"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "inveniosoftware"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner>=2.7'," "" + substituteInPlace pytest.ini \ + --replace ' --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=dictdiffer --cov-report=term-missing' "" + ''; + + pythonImportsCheck = [ + "dictdiffer" + ]; + + meta = with lib; { + description = "Module to diff and patch dictionaries"; + homepage = "https://github.com/inveniosoftware/dictdiffer"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix index 4ceb8e71f6..500fe05661 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "doit"; - version = "0.33.1"; + version = "0.34.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143"; + sha256 = "sha256-jvHeEFy8qTnHPoNt/4bIEskijhHthwL2lVt6CGyqwC0="; }; propagatedBuildInputs = [ cloudpickle ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-jwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-jwt/default.nix index 2cf125c8df..1b2292b46b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-jwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-jwt/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "drf-jwt"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "Styria-Digital"; repo = "django-rest-framework-jwt"; rev = version; - sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g="; + hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix index d0c072901c..2a6c10da35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "elgato"; - version = "2.2.0"; + version = "3.0.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; rev = "v${version}"; - sha256 = "sha256-xsIglJSnvtd3NKqwoRAonPRN+C9KWyar0mrYcC3hPpw="; + sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix index 8257af2e45..cc16231773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI="; + sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw="; }; # qt bindings cannot be found during tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 6ab7495fcb..5480809154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -1,5 +1,4 @@ { lib -, backports-datetime-fromisoformat , backports-zoneinfo , buildPythonPackage , cached-property @@ -27,16 +26,16 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.6.2"; + version = "4.7.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1vax4xqjav6nr3kfkz390ism3cs69dxnbx6sc0f9ci4mn3rxjwdy"; + sha256 = "sha256-APT/esskyigt6u3A+KVTAlmZDMppeyKb9Ws+95hDLcM="; }; propagatedBuildInputs = [ @@ -55,8 +54,6 @@ buildPythonPackage rec { tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo - ] ++ lib.optionals (pythonOlder "3.7") [ - backports-datetime-fromisoformat ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index ebef907f91..ca0969b951 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.5.9"; + version = "1.5.10"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-rU7BF1lXLgJYLed5FVKXroivxKpmmNE5woGCpAcKAwg="; + sha256 = "sha256-Xj1Ibl+xDN3uCww54StUBCc+w/iPMdbWucRqdb+GHVI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix new file mode 100644 index 0000000000..80150a60de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, mock }: + +buildPythonPackage rec { + pname = "file-read-backwards"; + version = "2.0.0"; + + src = fetchPypi { + pname = "file_read_backwards"; + inherit version; + sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8"; + }; + + checkInputs = [ mock ]; + pythonImportsCheck = [ "file_read_backwards" ]; + + meta = with lib; { + homepage = "https://github.com/RobinNil/file_read_backwards"; + description = "Memory efficient way of reading files line-by-line from the end of file"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix new file mode 100644 index 0000000000..c0bbf7d014 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flask +, pytestCheckHook +, pygments +}: + +buildPythonPackage rec { + pname = "flask-gravatar"; + version = "0.5.0"; + + src = fetchPypi { + pname = "Flask-Gravatar"; + inherit version; + sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE="; + }; + + postPatch = '' + sed -i setup.py \ + -e "s|tests_require=tests_require,||g" \ + -e "s|extras_require=extras_require,||g" \ + -e "s|setup_requires=setup_requires,||g" + # pep8 is deprecated and cov not needed + substituteInPlace pytest.ini \ + --replace "--pep8" "" \ + --replace "--cov=flask_gravatar --cov-report=term-missing" "" + ''; + + propagatedBuildInputs = [ + flask + ]; + + checkInputs = [ + pytestCheckHook + pygments + ]; + + pythonImportsCheck = [ "flask_gravatar" ]; + + meta = with lib; { + homepage = "https://github.com/zzzsochi/Flask-Gravatar"; + description = "Small and simple integration of gravatar into flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix new file mode 100644 index 0000000000..787b34a93b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flask-paranoid"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = pname; + rev = "v${version}"; + sha256 = "0WWc/ktAOuTk4A75xI1jCj/aef2+1TjLKBA9+PRfJO0="; + }; + + postPatch = '' + # tests have a typo in one of the assertions + substituteInPlace tests/test_paranoid.py --replace "01-Jan-1970" "01 Jan 1970" + ''; + + propagatedBuildInputs = [ + flask + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "flask_paranoid" ]; + + meta = with lib; { + homepage = "https://github.com/miguelgrinberg/flask-paranoid/"; + description = "Simple user session protection"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix new file mode 100644 index 0000000000..ddf5aa05c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flask +, blinker +, setuptools +, itsdangerous +, flask_principal +, passlib +, email_validator +, flask_wtf +, flask_login +, pytestCheckHook +, flask_mail +, sqlalchemy +, flask_sqlalchemy +, flask-mongoengine +, peewee +, pony +, zxcvbn +, mongoengine +, cryptography +, pyqrcode +, phonenumbers +, bleach +, mongomock +}: + +buildPythonPackage rec { + pname = "flask-security-too"; + version = "4.1.2"; + + src = fetchPypi { + pname = "Flask-Security-Too"; + inherit version; + sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8"; + }; + + propagatedBuildInputs = [ + flask + flask_login + flask_principal + flask_wtf + email_validator + itsdangerous + passlib + blinker + setuptools + ]; + + checkInputs = [ + pytestCheckHook + flask_mail + sqlalchemy + flask_sqlalchemy + flask-mongoengine + peewee + pony + zxcvbn + mongoengine + cryptography + pyqrcode + phonenumbers + bleach + mongomock + ]; + + pythonImportsCheck = [ "flask_security" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/Flask-Security-Too/"; + description = "Simple security for Flask apps (fork)"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix new file mode 100644 index 0000000000..e7bda9378b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "flatten-dict"; + version = "0.4.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ianlini"; + repo = pname; + rev = version; + hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flatten_dict" + ]; + + meta = with lib; { + description = "Module for flattening and unflattening dict-like objects"; + homepage = "https://github.com/ianlini/flatten-dict"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index b68dd6fd4d..5e4ec4290f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.1"; + version = "0.28.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-4Er9n3dx2j4/dAmNiQVGh7vwbjtKk8+KOFClyDrLOsk="; + sha256 = "sha256-mD6pTrUAzApJamqqcLzzQI2JDKy3PAn5TtQz5/aPFXg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 8a774e6607..469c0d613b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "glean_parser"; - version = "4.3.1"; + version = "4.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s="; + sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 9d548b685e..d6dedff38e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.2.2"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997"; + sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index d901bb78cd..6cb405d3c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "4c759ae99979d9f94ed0bdfe4937f41c81634f934ec11d25eb089430781eafec"; + sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 903db740c0..a06bf326e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "fdc8cb68a3ee54780f673f06b3cce83a5bb5d600db7ad363c85e38bf45afb59c"; + sha256 = "6e93c134669bbb7b79be4bd73329842c5e5f071f1fde624fc82233da42677021"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d8cd4d3b58..96a10e1a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.31.0"; + version = "2.32.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ff66d7d1f64795a855784706c3baa52d18fa0cd1cc4f0a150cf74268abb53ac0"; + sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 0e0d5982c6..bf9e8552ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d"; + sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7f26b2df28..3badd79612 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e012d76aa32b918c71392c11e1c727328c1570364f8d8e0676e52bc64c57a7af"; + sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 8773b09e59..a3418e3a90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0b249fa87deb57f5c7107a7d5d303673590a6524a7f113fc95f87493f3328606"; + sha256 = "3a757a3fafab46f28ffd2465ae06c5f87071aee1b41aee13f44255074483d480"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index ceacab720a..aa49340f24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "c5aaf6dbdf8bb1425bd42ef482a6c0ecc4b4d1718d49267d510799015c6ff1d2"; + sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 404a515299..e982aefae5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494"; + sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index f9aa3e4355..5f2737912e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3a15400d2fab2ec161c9b647730e8ba92feb9cbe6a1c0c7734ec8e8941290dbd"; + sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index f74944a45e..a90f9c73cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.44.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001"; + sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index e055d462b1..c1b58c0e1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "2fd2222901a7d8ba65f28f9019cb41f5d4c952d012f020bdde105527a3f5ae43"; + sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 54af78da3e..d4551b4954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7a755c1247e32e92bd6df4fa2240dab185b29da9777ab3b946c3b3d9f1abf5d3"; + sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs="; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix index 6056d215d2..c4e7eb4d74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix @@ -3,20 +3,22 @@ , fetchFromGitHub , pyparsing , future -, pytest -, pytest-runner +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "grandalf"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # fetch from github to acquire tests src = fetchFromGitHub { owner = "bdcht"; - repo = "grandalf"; + repo = pname; rev = "v${version}"; - sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg"; + hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4="; }; propagatedBuildInputs = [ @@ -24,18 +26,22 @@ buildPythonPackage rec { future ]; - checkInputs = [ pytest pytest-runner ]; + checkInputs = [ + pytestCheckHook + ]; - patches = [ ./no-setup-requires-pytestrunner.patch ]; + patches = [ + ./no-setup-requires-pytestrunner.patch + ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ + "grandalf" + ]; meta = with lib; { - description = "A python package made for experimentations with graphs and drawing algorithms"; + description = "Module for experimentations with graphs and drawing algorithms"; homepage = "https://github.com/bdcht/grandalf"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix rename to third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 5f72411e9e..5a17b4679e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "v${version}"; - hash = "sha256-O9SaEveZntb7VWL5k1WjTDK9fXhTWFIsVh5v7NKASnQ="; + hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 17fb02fd10..8de737eeed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -4,6 +4,7 @@ , poetry-core , pytestCheckHook , python-gvm +, pythonAtLeast , pythonOlder }: @@ -36,6 +37,8 @@ buildPythonPackage rec { disabledTests = [ # Don't test sending "SendTargetTestCase" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "HelpFormattingParserTestCase" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 058a8f4d98..c20ff49b5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.19.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-i3pNbIYISvZ681KLnxP9ZpITnkX7p0rBWjs1KidlFrM="; + sha256 = "sha256-oD4HXdzlQJZ/+ceF9zfmGs6S8DEVoxzLv5h/IURJnOY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix index 1832803388..3b5e0a218b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hangups"; - version = "0.4.15"; + version = "0.4.17"; disabled = pythonOlder "3.6"; @@ -26,13 +26,12 @@ buildPythonPackage rec { owner = "tdryer"; repo = "hangups"; rev = "v${version}"; - sha256 = "sha256-47OvfFK92AtX6KiYnvro2B17RfQWyzgsgvOfl5T3Kag="; + hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q="; }; postPatch = '' substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<3.17" "protobuf" \ - --replace "async-timeout>=2,<4" "async-timeout" \ + --replace "protobuf>=3.1.0,<3.20" "protobuf" \ --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index c58e50bee8..63a2e941f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.3.0"; + version = "4.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM="; + sha256 = "sha256-dSiI2W4U4FYwMRBInpxb/wkQLKxPzLHIkLPNgiZEhUA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 48788537a6..d1228fc0c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-0E8eiHzqbxHbtAd97MbvFMRDWTu25E9x/44oNGC4mUM="; + sha256 = "sha256-qN7AXs4hJpuP+GaxjOPR2CqKMYyDJxTrCuE5HreZnhU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index fb10dc5168..2a1cb87903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchpatch , pytestCheckHook +, pythonAtLeast , pythonOlder , pytest-aiohttp , pytest-asyncio @@ -54,11 +55,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace homematicip/aio/connection.py \ - --replace ", loop=self._loop" "" - ''; - disabledTests = [ # Assert issues with datetime "test_contact_interface_device" @@ -82,6 +78,11 @@ buildPythonPackage rec { "test_home_unknown_types" # Requires network access "test_websocket" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_connection_lost" + "test_user_disconnect_and_reconnect" + "test_ws_message" + "test_ws_no_pong" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix new file mode 100644 index 0000000000..e0c9dd09bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "httpagentparser"; + version = "1.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY="; + }; + + # PyPi version does not include test directory + doCheck = false; + + pythonImportsCheck = [ "httpagentparser" ]; + + meta = with lib; { + homepage = "https://github.com/shon/httpagentparser"; + description = "Extracts OS Browser etc information from http user agent string"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix index b88fc96337..77f0c75e01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "humanfriendly"; - version = "9.2"; + version = "10.0"; src = fetchPypi { inherit pname version; - sha256 = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48"; + sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix index d4d091c36f..1bd1e6650c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix @@ -8,11 +8,15 @@ , mnemonic , pyaes , typing-extensions +, pythonOlder }: buildPythonPackage rec { pname = "hwi"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bitcoin-core"; @@ -34,18 +38,21 @@ buildPythonPackage rec { # make compatible with libusb1 2.x postPatch = '' substituteInPlace setup.py \ - --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' + --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \ + --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," ''; # tests require to clone quite a few firmwares doCheck = false; - pythonImportsCheck = [ "hwilib" ]; + pythonImportsCheck = [ + "hwilib" + ]; - meta = { + meta = with lib; { description = "Bitcoin Hardware Wallet Interface"; homepage = "https://github.com/bitcoin-core/hwi"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ prusnak ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix index ed87f3678b..34a3664297 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { disabledTests = [ # Failure seems to be related to arrow > 1.0 "test_event" + # Broke with TatSu 5.7: + "test_many_lines" ]; pythonImportsCheck = [ "ics" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index a5da612467..79d141c6a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.3"; + version = "2.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r7Ta/OumYdm+brM6UgAPTWvxODpex1Mg0Arq94tPdnM="; + sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix new file mode 100644 index 0000000000..a19f27a0a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, flit-core +, mock +}: + +buildPythonPackage rec { + pname = "installer"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pradyunsg"; + repo = pname; + rev = version; + sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI="; + }; + + nativeBuildInputs = [ flit-core ]; + + checkInputs = [ + pytestCheckHook + mock + ]; + + meta = with lib; { + homepage = "https://github.com/pradyunsg/installer"; + description = "A low-level library for installing a Python package from a wheel distribution."; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud fridh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix deleted file mode 100644 index 1f62cc9bc1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -# Build dependencies -, glibcLocales -# Test dependencies -, nose -, pygments -# Runtime dependencies -, jedi -, decorator -, pickleshare -, traitlets -, prompt-toolkit -, pexpect -, appnope -, backcall -}: - -buildPythonPackage rec { - pname = "ipython"; - version = "7.16.1"; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; - - propagatedBuildInputs = [ - jedi - decorator - pickleshare - traitlets - prompt-toolkit - pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - - pythonImportsCheck = [ - "IPython" - ]; - - meta = with lib; { - description = "IPython: Productive Interactive Computing"; - homepage = "http://ipython.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor fridh ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index 423ec4ecf2..15747d3f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "irc"; - version = "19.0.1"; + version = "20.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "99fd5d1fa1d054dee4fbb81e0d5193dc1e8200db751d5da9a97850a62162b9ab"; + sha256 = "59acb8d69d61a0cbd290e77e6ff10a8c7f2201fb8c7b7d5a195b5883d0c40b0a"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix index c67259eee0..ade063a625 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itanium_demangler/default.nix @@ -1,30 +1,36 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, pytest +, pytestCheckHook }: buildPythonPackage rec { - pname = "itanium_demangler"; + pname = "itanium-demangler"; version = "1.0"; # pulled from pypi version src = fetchFromGitHub { owner = "whitequark"; - repo = "python-${pname}"; + repo = "python-itanium_demangler"; rev = "29c77860be48e6dafe3496e4d9d0963ce414e366"; - sha256 = "0qm95l6542nk63986w9lgzkxg824l31714i584s02rh9xwfg1xfx"; + hash = "sha256-3fXwHO8JZgE0QSWScMKgRKDX5380cYPSMNMKUgwtqWI="; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest tests/test.py - ''; + pytestFlagsArray = [ + "tests/test.py" + ]; + + pythonImportsCheck = [ + " itanium_demangler " + ]; meta = with lib; { - description = "A pure Python parser for the Itanium C++ ABI symbol mangling language"; + description = "Python parser for the Itanium C++ ABI symbol mangling language"; homepage = "https://github.com/whitequark/python-itanium_demangler"; license = licenses.bsd0; - maintainers = [ maintainers.pamplemousse ]; + maintainers = with maintainers; [ pamplemousse ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemdb/default.nix new file mode 100644 index 0000000000..f9afc4c5cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemdb/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "itemdb"; + version = "1.1.1"; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "almarklein"; + repo = pname; + rev = "v${version}"; + sha256 = "0ksad5j91nlbsn0a11clf994qz7r9ijand5hxnjhgd66i9hl3y78"; + }; + + meta = with lib; { + description = "Easy transactional database for Python dicts, backed by SQLite"; + license = licenses.bsd2; + homepage = "https://itemdb.readthedocs.io"; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix index 64766c232c..d25278a4e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, funcsigs , setuptools-scm , pytestCheckHook , pythonOlder @@ -11,22 +10,19 @@ buildPythonPackage rec { pname = "logfury"; version = "1.0.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; + hash = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - funcsigs - ]; - checkInputs = [ pytestCheckHook testfixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix new file mode 100644 index 0000000000..ce47d6b3a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mailchecker"; + version = "4.1.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RLZunjRX7lljKQl+sJ/py8bTR/YZsDewTJao9IBuLbE="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "MailChecker" + ]; + + meta = with lib; { + description = "Module for temporary (disposable/throwaway) email detection"; + homepage = "https://github.com/FGRibreau/mailchecker"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix new file mode 100644 index 0000000000..44d37b988a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, attrs +}: + +buildPythonPackage rec { + pname = "matrix_common"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4="; + }; + + propagatedBuildInputs = [ attrs ]; + pythonImportsCheck = [ "matrix_common" ]; + + meta = with lib; { + description = "Common utilities for Synapse, Sydent and Sygnal"; + homepage = "https://github.com/matrix-org/matrix-python-common"; + license = licenses.asl20; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 4e4e6dcc63..63f6466622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.3"; + version = "0.14.4"; src = fetchPypi { inherit pname version; - sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701"; + sha256 = "sha256-SipDW1ahPHnC/BYv/I+uuzCYpFtOw3b4Oiu7N9LxFik="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index 6cc67c1614..6bc9635a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.2"; + version = "0.4.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = version; - sha256 = "sha256-/sUY8XU3IYdvlIfxmKIrF9KH/LubR0EZCW7ehrb2YNk="; + sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 983b214bd7..d146d7d645 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.53"; + version = "1.2.57"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-UJ0bq/xBE+qyd//tk/xlI3wtUcE0+PLCIVGmjFMZ+VQ="; + sha256 = "sha256-olh8DUYg3s72ll1+p+0QapdKR2+aaSvgSUrZuGFif1s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix index 789d68c7f9..d99bdec4b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitogen/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "mitogen"; - version = "0.3.0"; + version = "0.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mitogen-hq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SotxlsJDIeFd4BN9C7afyyybET5ST2yaoWVEyT/lr48="; + sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg="; }; # Tests require network access and Docker support doCheck = false; - pythonImportsCheck = [ "mitogen" ]; + pythonImportsCheck = [ + "mitogen" + ]; meta = with lib; { description = "Python Library for writing distributed self-replicating programs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 8039bdb154..658470ec72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch , alembic , click , cloudpickle @@ -20,6 +20,8 @@ , sqlalchemy , gorilla , gunicorn +, prometheus-flask-exporter +, importlib-metadata }: buildPythonPackage rec { @@ -58,6 +60,17 @@ buildPythonPackage rec { sqlalchemy gorilla gunicorn + prometheus-flask-exporter + importlib-metadata + ]; + + patches = [ + # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245 + (fetchpatch { + name = "relax-alembic-version.patch"; + url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch"; + sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0="; + }) ]; meta = with lib; { @@ -65,7 +78,5 @@ buildPythonPackage rec { description = "Open source platform for the machine learning lifecycle"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; - # missing prometheus-flask-exporter, not packaged in nixpkgs - broken = true; # 2020-08-15 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix new file mode 100644 index 0000000000..0f2f305c97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, sentinels +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mongomock"; + version = "3.23.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + sentinels + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mongomock" ]; + + meta = with lib; { + homepage = "https://github.com/mongomock/mongomock"; + description = "Fake pymongo stub for testing simple MongoDB-dependent code"; + license = licenses.bsd3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index a673d96893..f81395f024 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm"; + sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix index 5bb8b15f68..79c48e57f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.12"; + version = "0.9.13"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-YZHAWRTYquUm3Ymi/3mSQqxYZuoxsH5Q/LZOPDftEzU="; + sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0="; }; propagatedBuildInputs = [ @@ -29,10 +31,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner",' "" + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" ''; - pythonImportsCheck = [ "nexia" ]; + pythonImportsCheck = [ + "nexia" + ]; meta = with lib; { description = "Python module for Nexia thermostats"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix index aa275cb27a..698795c75b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, unittest2, repeated_test }: +{ lib, buildPythonPackage, fetchPypi, unittest2 }: buildPythonPackage rec { pname = "od"; @@ -9,8 +9,10 @@ buildPythonPackage rec { sha256 = "1az30snc3w6s4k1pi7mspcv8y0kp3ihf3ly44z517nszmz9lrjfi"; }; + # repeated_test no longer exists in nixpkgs + # also see: https://github.com/epsy/od/issues/1 + doCheck = false; checkInputs = [ - repeated_test unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix new file mode 100644 index 0000000000..11d677e110 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, git +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pdm-pep517"; + version = "0.9.4"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c="; + }; + + preCheck = '' + HOME=$TMPDIR + + git config --global user.name nobody + git config --global user.email nobody@example.com + ''; + + checkInputs = [ + pytestCheckHook + git + ]; + + meta = with lib; { + homepage = "https://github.com/pdm-project/pdm-pep517"; + description = "Yet another PEP 517 backend."; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix new file mode 100644 index 0000000000..f46ddfca1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, smbus-cffi +, urwid +}: + +buildPythonPackage rec { + pname = "pijuice"; + version = "1.7"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "PiSupply"; + repo = "PiJuice"; + # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project + # does not use Github tags facility + rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3"; + sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4="; + }; + + patches = [ + # The pijuice_cli.cli file doesn't have a shebang as the first line of the + # script. Without it, the pythonWrapPrograms hook will not wrap the program. + # Add a python shebang here so that the the hook is triggered. + ./patch-shebang.diff + ]; + + PIJUICE_BUILD_BASE = 1; + + preBuild = '' + cd Software/Source + ''; + + propagatedBuildInputs = [ smbus-cffi urwid ]; + + # Remove the following files from the package: + # + # pijuice_cli - A precompiled ELF binary that is a setuid wrapper for calling + # pijuice_cli.py + # + # pijuiceboot - a precompiled ELF binary for flashing firmware. Not needed for + # the python library. + # + # pijuice_sys.py - A program that acts as a system daemon for monitoring the + # pijuice. + preFixup = '' + rm $out/bin/pijuice_cli + rm $out/bin/pijuice_sys.py + rm $out/bin/pijuiceboot + mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli + ''; + + meta = with lib; { + description = "Library and resources for PiJuice HAT for Raspberry Pi"; + homepage = "https://github.com/PiSupply/PiJuice"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pijuice/patch-shebang.diff b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/patch-shebang.diff new file mode 100644 index 0000000000..eb899c9a5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/patch-shebang.diff @@ -0,0 +1,9 @@ +diff --git a/Software/Source/src/pijuice_cli.py b/Software/Source/src/pijuice_cli.py +index c366fee..37af383 100644 +--- a/Software/Source/src/pijuice_cli.py ++++ b/Software/Source/src/pijuice_cli.py +@@ -1,3 +1,4 @@ ++#!/usr/bin/python3 + # This python script to be executed as user pijuice by the setuid program pijuice_cli + # Python 3 only + # diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 6f0f733c47..f52467f3e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.3.0"; + version = "4.3.1"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-9dSJ6+rZd49rFSQExYnFBGQGZ8MnFM+z/0Iz/nYkW4E="; + hash = "sha256-u/NDDJGCcctWL3ivxtU+8CSlQH+5qkmXUcF4RkQOiPI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix index ca66c777f5..27a53eee42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.4.0.20210819"; + version = "1.4.0.20220110"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RBRUR9Rzw3/yd2ZnteEBigDApJPBagpIk5lSGzeGqL4="; + sha256 = "sha256-EWuAhVTX6nXvyXtMuQQIVUbbRZNO8xUXXLR1XHpEid4="; }; # Tests are not shipped and there are no GitHub tags diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix index 03330c4cfe..27c35abe57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix @@ -1,25 +1,42 @@ -{ lib, python, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pony"; - version = "0.7.14"; + version = "0.7.15rc1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ponyorm"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ="; }; - doCheck = true; + checkInputs = [ + pytestCheckHook + ]; - # stripping the tests - postInstall = '' - rm -rf $out/${python.sitePackages}/pony/orm/tests - ''; + disabledTests = [ + # Tests are outdated + "test_exception_msg" + "test_method" + ]; + + pythonImportsCheck = [ + "pony" + ]; meta = with lib; { - description = "Pony is a Python ORM with beautiful query syntax"; + description = "Library for advanced object-relational mapping"; homepage = "https://ponyorm.org/"; - maintainers = with maintainers; [ d-goldin xvapx ]; license = licenses.asl20; + maintainers = with maintainers; [ d-goldin xvapx ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix new file mode 100644 index 0000000000..fae2c8a428 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, nodejs +}: + +buildPythonPackage rec { + pname = "pscript"; + version = "0.7.6"; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "flexxui"; + repo = pname; + rev = "v${version}"; + sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; + }; + + checkInputs = [ + pytestCheckHook + nodejs + ]; + + preCheck = '' + # do not execute legacy tests + rm -rf pscript_legacy + ''; + + meta = with lib; { + description = "Python to JavaScript compiler"; + license = licenses.bsd2; + homepage = "https://pscript.readthedocs.io"; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix new file mode 100644 index 0000000000..633dc6fa5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix @@ -0,0 +1,49 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, future +, python-dateutil +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "py-tes"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ohsu-comp-bio"; + repo = pname; + rev = version; + hash = "sha256-HZeyCQHiqfdquWQD5axS73JDjDMUieONwm5VyA+vTFk="; + }; + + propagatedBuildInputs = [ + attrs + future + python-dateutil + requests + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "tes" + ]; + + meta = with lib; { + description = "Python SDK for the GA4GH Task Execution API"; + homepage = "https://github.com/ohsu-comp-bio/py-tes"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 38077ec3e0..f55c869a7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9a407fd58a406a53ae44ae8ff5f2edb4396be67bca3436523f791642d8561de3"; + sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976"; }; propagatedBuildInputs = [ aiohttp requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 36bf117122..9f1bd00810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.9.7"; + version = "0.9.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1ikv9m1348sjv31gch5w0sj97jlr4yjxbqfyds7alxxcm5hrhai4"; + sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix index 7bf5296eb3..dff1374087 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.22"; + version = "0.0.23"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hl8UmoVUbbHCSpCWdUTxoIlop5di+rUmGUQI9UWq3ik="; + sha256 = "54b4fe565c10000c54d5644d081e2de1f850daefbac39cea74cea649b47bfb12"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix index 797da43352..375453231b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2021.03.1"; + version = "2022.01.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = version; - sha256 = "sha256-V3R6i1/FZrjcfRqJhczjURr/+x++iCvZ3aCK9wdEL1A="; + sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix index eb6734649b..ae7277202b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix @@ -15,22 +15,14 @@ buildPythonPackage rec { pname = "pygal"; - version = "2.4.0"; + version = "3.0.0"; doCheck = !isPyPy; # one check fails with pypy src = fetchPypi { inherit pname version; - sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83"; + sha256 = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI="; }; - patches = [ - # Fixes compatibility with latest pytest. October 12, 2020. - # Should be included in the next release after 2.4.0 - (fetchpatch { - url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch"; - sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l"; - }) - ]; buildInputs = [ flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix index f62d8bd130..fb0b22cd44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.4.3"; + version = "0.4.6"; format = "pyproject"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "v${version}"; - sha256 = "sha256-SCMASYBOdq9nko5RSQ5BEbRLjOB4FlgwOKwdDggiOv8="; + hash = "sha256-muUVZYBUloKRnAx7H8ry72eg85GzmnpTG8M/MfKcnGM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynut2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynut2/default.nix new file mode 100644 index 0000000000..11313dcadc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynut2/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pynut2"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "mezz64"; + repo = "python-nut2"; + rev = version; + sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx"; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ "pynut2.nut2" ]; + + # tests are unmaintained and broken + doCheck = false; + + meta = with lib; { + description = "API overhaul of PyNUT, a Python library to allow communication with NUT (Network UPS Tools) servers."; + homepage = "https://github.com/mezz64/python-nut2"; + license = with licenses; [ gpl3Plus ]; + maintainers = [ maintainers.luker ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix index da15590e5d..3a86e42f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -5,26 +5,28 @@ , pyaes , pysocks , async-lru +, tgcrypto , pytestCheckHook , pytest-asyncio }: buildPythonPackage rec { pname = "pyrogram"; - version = "1.3.1"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - sha256 = "e883c001ebf2d0f5ce6805063470c92436c493eb15547923e5d437e2c13f66cd"; + hash = "sha256-51/to8ZCyK6cYWQCGWcQ07rGDR29awfxcUNnSF5vIKE="; }; propagatedBuildInputs = [ pyaes pysocks async-lru + tgcrypto ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix new file mode 100644 index 0000000000..c626a1cfac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-logdog"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ods"; + repo = pname; + rev = version; + hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_logdog" + ]; + + meta = with lib; { + description = "Pytest plugin to test logging"; + homepage = "https://github.com/ods/pytest-logdog"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix deleted file mode 100644 index ee04e3be42..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy -, atomicwrites -, attrs -, hypothesis -, more-itertools -, packaging -, pathlib2 -, pluggy -, py -, pygments -, setuptools -, setuptools-scm -, six -, toml -, wcwidth -, writeText -}: - -buildPythonPackage rec { - version = "5.4.3"; - pname = "pytest"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - - checkInputs = [ hypothesis pygments ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - atomicwrites - attrs - more-itertools - packaging - pluggy - py - setuptools - six - toml - wcwidth - ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 - checkPhase = '' - runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py - runHook postCheck - ''; - - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - preDistPhases+=" pytestcachePhase" - - # pytest generates it's own bytecode files to improve assertion messages. - # These files similar to cpython's bytecode files but are never laoded - # by python interpreter directly. We remove them for a few reasons: - # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 - # (file headers are generatedt by pytest directly and contain timestamps) - # - files are not needed after tests are finished - pytestRemoveBytecodePhase () { - # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/5.4.3/src/_pytest/assertion/rewrite.py#L42-L45 - find $out -name "*-pytest-*.py[co]" -delete - } - preDistPhases+=" pytestRemoveBytecodePhase" - ''; - - pythonImportsCheck = [ - "pytest" - ]; - - meta = with lib; { - homepage = "https://docs.pytest.org"; - description = "Framework for writing tests"; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix new file mode 100644 index 0000000000..9cf5ffc63a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -0,0 +1,75 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder + +, mailchecker +, phonenumbers +, python-dateutil +, python-fsutil +, python-slugify +, pyyaml +, ftfy +, requests +, six +, toml +, xmltodict +}: + +buildPythonPackage rec { + pname = "python-benedict"; + version = "0.24.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fabiocaccamo"; + repo = pname; + rev = version; + hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; + }; + + propagatedBuildInputs = [ + mailchecker + phonenumbers + python-dateutil + python-fsutil + python-slugify + pyyaml + ftfy + requests + six + toml + xmltodict + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_from_base64_with_valid_url_valid_content" + "test_from_json_with_valid_url_valid_content" + "test_from_pickle_with_valid_url_valid_content" + "test_from_plist_with_valid_url_valid_content" + "test_from_query_string_with_valid_url_valid_content" + "test_from_toml_with_valid_url_valid_content" + "test_from_xml_with_valid_url_valid_content" + "test_from_yaml_with_valid_url_valid_content" + ]; + + pythonImportsCheck = [ + "benedict" + ]; + + meta = with lib; { + description = "Module with keylist/keypath support"; + homepage = "https://github.com/fabiocaccamo/python-benedict"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index baf385bb7d..da92963875 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.0"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-ohNRtceh0bHBlnGSFUckG5KzoLY8Q1jvpFee7T78Vto="; + sha256 = "sha256-8595zivZmff0agFiQd5Qyd/T3BDxYcsb4RjA5AWXVNM="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix new file mode 100644 index 0000000000..17dbd579e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "python-fsutil"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fabiocaccamo"; + repo = pname; + rev = version; + hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ="; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + disabledTests = [ + # Tests require network access + "test_download_file" + "test_read_file_from_url" + ]; + + pythonImportsCheck = [ + "fsutil" + ]; + + meta = with lib; { + description = "Module with file-system utilities"; + homepage = "https://github.com/fabiocaccamo/python-fsutil"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index 10ff6ddf62..17c3cb07be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -2,7 +2,6 @@ , asyncclick , buildPythonPackage , fetchFromGitHub -, fetchpatch , importlib-metadata , poetry-core , pytest-asyncio @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "08blmz5kg826l08pf6yrvl8gc8iz3hfb6wsfqih606dal08kdhdi"; + sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak="; }; nativeBuildInputs = [ @@ -42,26 +41,14 @@ buildPythonPackage rec { voluptuous ]; - patches = [ - # Switch to poetry-core, https://github.com/python-kasa/python-kasa/pull/226 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/python-kasa/python-kasa/commit/05c2a4a7dedbd60038e177b4d3f5ac5798544d11.patch"; - sha256 = "0cla11yqx88wj2s50s3xxxhv4nz4h3wd9pi12v79778hzdlg58rr"; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'asyncclick = "^7"' 'asyncclick = "*"' - ''; - disabledTestPaths = [ # Skip the examples tests "kasa/tests/test_readme_examples.py" ]; - pythonImportsCheck = [ "kasa" ]; + pythonImportsCheck = [ + "kasa" + ]; meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 6cd16a9dec..24c51af4fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.9.1"; + version = "0.5.9.2"; disabled = pythonOlder "3.6.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fWLN1mGSoB+H6YSwTYpx1fuXfkrHBgdRkhzDLbmMBcg="; + sha256 = "sha256-AFwarRhFknfwTSvSDGoWE+/mv1KUD2XnWK/xCBqrN4o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 635f9cd13d..0484a75eae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.5.0"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg="; + sha256 = "sha256-mtXGSd7Y+frT22EL3QmiBNatwc6IrJqGBRfsQlD8LLk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix new file mode 100644 index 0000000000..bf9cb69721 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, attrs +, cached-property +, click +, six +, packaging +, pytest-cov +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "pythonfinder"; + version = "1.2.9"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sarugaku"; + repo = pname; + rev = version; + sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs="; + }; + + propagatedBuildInputs = [ + attrs + cached-property + click + six + packaging + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + pytest-timeout + ]; + + pytestFlagsArray = [ "--no-cov" ]; + + # these tests invoke git in a subprocess and + # for some reason git can't be found even if included in checkInputs + disabledTests = [ + "test_shims_are_kept" + "test_shims_are_removed" + ]; + + meta = with lib; { + homepage = "https://github.com/sarugaku/pythonfinder"; + description = "Cross Platform Search Tool for Finding Pythons"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index f570a0a5c9..df3e5da4c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -11,6 +11,7 @@ , patchelf , pyyaml , requests +, setuptools , typing-extensions }: @@ -41,6 +42,7 @@ in buildPythonPackage { numpy pyyaml requests + setuptools typing-extensions ]; @@ -72,7 +74,7 @@ in buildPythonPackage { # https://docs.nvidia.com/cuda/eula/index.html # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix index dd3e5dc1ae..61f1e59d09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -22,5 +22,30 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; }; + x86_64-darwin-37 = { + name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE="; + }; + x86_64-darwin-38 = { + name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I="; + }; + x86_64-darwin-39 = { + name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw="; + }; + aarch64-darwin-38 = { + name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ="; + }; + aarch64-darwin-39 = { + name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY="; + }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index a357e45a5f..aecbbbd650 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.3"; + version = "1.6.4"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-5g9MQB7vpeuorVGExt0scHtLdrWlkuLOZMT38FhAsi4="; + hash = "sha256-kAIFFK7VnwL7o4G512f7kVVDBLz2SnjapzzpNM/KNKA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 211ba18ae6..7b8aef7ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -7,23 +7,21 @@ , fetchPypi , future , pycparser +, pythonOlder }: buildPythonPackage rec { pname = "pyvex"; - version = "9.1.10913"; + version = "9.1.11508"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EUgCyjD5ia5KQMvZWVAsXeKRjmSVE7tRRYH5u/Ozug0="; + hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME="; }; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar' - ''; - - setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; - propagatedBuildInputs = [ archinfo bitstring @@ -32,15 +30,29 @@ buildPythonPackage rec { pycparser ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace vex/Makefile-gcc \ + --replace '/usr/bin/ar' 'ar' + ''; + + setupPyBuildFlags = lib.optionals stdenv.isLinux [ + "--plat-name" + "linux" + ]; + preBuild = '' export CC=${stdenv.cc.targetPrefix}cc - substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar' + substituteInPlace pyvex_c/Makefile \ + --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar' ''; # No tests are available on PyPI, GitHub release has tests # Switch to GitHub release after all angr parts are present doCheck = false; - pythonImportsCheck = [ "pyvex" ]; + + pythonImportsCheck = [ + "pyvex" + ]; meta = with lib; { description = "Python interface to libVEX and VEX IR"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index faec2c2026..b1c9c434d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "0IMNOPTmY22JCHccIVuZxDhVr41cDcKNkx8bp+5h2CU="; + sha256 = "abby4o9LmiRZwNkPhYfFOWgRtxU8e5CURQnutz6cWjQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix deleted file mode 100644 index 2c51238e19..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/repeated_test/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, unittest2 -, six -}: - -buildPythonPackage rec { - pname = "repeated_test"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "65107444a4945668ab7be6d1a3e1814cee9b2cfc577e7c70381700b11b809d27"; - }; - - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ six ]; - - meta = with lib; { - description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; - homepage = "https://github.com/epsy/repeated_test"; - license = licenses.mit; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix index b25b28eca9..9a4a0f1336 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix @@ -5,18 +5,20 @@ , readme_renderer , packaging , pygments -, mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "restview"; - version = "2.9.3"; + version = "3.0.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-WVGqIYLnqao6uQbb0PDTPfj+k+ZjGKholknBIorXTNg="; + sha256 = "sha256-K5iWEKrtL9Qtpk9s3FOc8+5wzjcLy6hy23JCGtUV3R4="; }; propagatedBuildInputs = [ @@ -27,7 +29,6 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index ca73975982..f6194970ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.16.2"; + version = "11.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVenprbWq+ucQPAM1e9sNVYWbGAeo7qdEBy+cvqAMK8="; + sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix deleted file mode 100644 index 97eee2155a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, python -, fetchFromGitHub -, fetchpatch -, qtbase -, boost -, assimp -, gym -, bullet-roboschool -, pkg-config -, which -}: - -buildPythonPackage rec { - pname = "roboschool"; - version = "1.0.39"; - - src = fetchFromGitHub { - owner = "openai"; - repo = "roboschool"; - rev = version; - sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; - }; - - # fails to find boost_python for some reason - disabled = !isPy3k; - - propagatedBuildInputs = [ - gym - ]; - - nativeBuildInputs = [ - pkg-config - qtbase # needs the `moc` tool - which - ]; - - buildInputs = [ - bullet-roboschool - assimp - qtbase - boost - ]; - - dontWrapQtApps = true; - - NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; - - patches = [ - # Remove kwarg that was removed in upstream gym - # https://github.com/openai/roboschool/pull/180 - (fetchpatch { - name = "remove-close-kwarg.patch"; - url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch"; - sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r"; - }) - ]; - - preBuild = '' - # First build the cpp dependencies - cd roboschool/cpp-household - make \ - MOC=moc \ - -j$NIX_BUILD_CORES - cd ../.. - ''; - - # Does a QT sanity check, but QT is not expected to work in isolation - doCheck = false; - - meta = with lib; { - description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = "https://github.com/openai/roboschool"; - license = licenses.mit; - maintainers = with maintainers; [ timokau ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix index 2a97993669..dff19589dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix @@ -37,6 +37,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # hbmqtt was replaced by amqtt + substituteInPlace tests/test_roomba_integration.py \ + --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" + ''; + disabledTestPaths = [ # Requires network access "tests/test_discovery.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix new file mode 100644 index 0000000000..205cefad61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +let + pname = "rpi-bad-power"; + version = "0.1.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "shenxn"; + repo = pname; + rev = "v${version}"; + hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk"; + }; + + pythonImportsCheck = [ + "rpi_bad_power" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python library to detect bad power supply on Raspberry Pi"; + homepage = "https://github.com/shenxn/rpi-bad-power"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index adc86b7c04..c42510e072 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.70.0"; + version = "2.72.2"; src = fetchPypi { inherit pname version; - sha256 = "1bc0b783befa4d07dd9c43da1d1d0f3a0e66767ce8aa2af0c376cfa47c12689a"; + sha256 = "7bc62eb713d6b2e72bf4b5635e2b1d18790f08ebd80cc9f380b5ba3a5000e727"; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix index 0e9b563f0f..f7d0e62ff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage -, pytest_5 +, pytest , numpy , scipy , matplotlib @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ opencl-headers ]; # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ pytest_5 ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index c96cf1b2dd..78ed6446f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.2"; + version = "2.6.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983"; + sha256 = "9693da78d1bd0bd6af8db59aeaaed92a399c6af36960c6a0a665a2130eab59e7"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix new file mode 100644 index 0000000000..f4a024a46e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -0,0 +1,53 @@ +{ lib +, asyncssh +, buildPythonPackage +, dulwich +, fetchFromGitHub +, fsspec +, funcy +, GitPython +, pathspec +, pygit2 +, pygtrie +, pythonOlder +}: + +buildPythonPackage rec { + pname = "scmrepo"; + version = "0.0.7"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = version; + hash = "sha256-tZsogqcfAqpSo9yOz4z0mgY9SVU1epPmcBuyLJsHLfY="; + }; + + propagatedBuildInputs = [ + asyncssh + dulwich + fsspec + funcy + GitPython + pathspec + pygit2 + pygtrie + ]; + + # Requires a running Docker instance + doCheck = false; + + pythonImportsCheck = [ + "scmrepo" + ]; + + meta = with lib; { + description = "SCM wrapper and fsspec filesystem"; + homepage = "https://github.com/iterative/scmrepo"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 1ba09d33c9..c26ec74ac3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -86,9 +86,10 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - # Disable doctest plugin because it causes pytest to hang preCheck = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" + # Disable doctest plugin because it causes pytest to hang + substituteInPlace pytest.ini \ + --replace "--doctest-modules" "" ''; disabledTestPaths = [ @@ -116,6 +117,7 @@ buildPythonPackage rec { "test_peek_fifo" "test_peek_one_element" "test_peek_lifo" + "test_callback_kwargs" ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" @@ -127,7 +129,9 @@ buildPythonPackage rec { install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; - pythonImportsCheck = [ "scrapy" ]; + pythonImportsCheck = [ + "scrapy" + ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/2.nix deleted file mode 100644 index 378be5be31..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }: - -buildPythonPackage rec { - pname = "secretstorage"; - version = "2.3.1"; - - src = fetchPypi { - pname = "SecretStorage"; - inherit version; - sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis"; - }; - - propagatedBuildInputs = [ cryptography dbus-python ]; - - # Needs a D-Bus Sesison - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/mitya57/secretstorage"; - description = "Python bindings to FreeDesktop.org Secret Service API"; - license = licenses.bsd3; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 8d73407c98..6b7061712a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = version; - sha256 = "sha256-LUM7SP03U3mRxCTjgxPRXh/ZLz15R04zBWOxLKnan98="; + hash = "sha256-X+sGfcEodxWkBmDamJkrZVsjyKkuqzsZ5BJFwOgL63M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix new file mode 100644 index 0000000000..17c2c94a30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sentinels"; + version = "1.0.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cglkxph47pki4db4kjx5g4ikxp2milqdlcjgqwmx4p1gx6p1q3v"; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "sentinels" ]; + + meta = with lib; { + homepage = "https://github.com/vmalloc/sentinels/"; + description = "Various objects to denote special meanings in python"; + license = licenses.bsd3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 0d06fa9656..a59ec10be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "sha256-vQ5zeAscPMQH3L+Ogj50IZZp2pBoYaxHzvcXakaoC4k="; + sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix new file mode 100644 index 0000000000..efac8148a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "shtab"; + version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Wuc4m3VdOGEcevYXUpbL4gTvyW9t13pj57zPYdqx0UY="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytest-timeout + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" + ''; + + disabledTests = [ + # bash tests are failing + "bash" + ]; + + pythonImportsCheck = [ + "shtab" + ]; + + meta = with lib; { + description = "Module for shell tab completion of Python CLI applications"; + homepage = "https://docs.iterative.ai/shtab/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix index b61e64684c..49ba916b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, repeated_test , sphinx , mock , coverage @@ -19,11 +18,15 @@ buildPythonPackage rec { sha256 = "e7789628ec0d02e421bca76532b0d5da149f96f09e7ed4a5cbf318624b75e949"; }; - buildInputs = [ repeated_test sphinx mock coverage unittest2 ]; propagatedBuildInputs = [ funcsigs six ]; patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; + # repeated_test no longer exists in nixpkgs + # Also see: https://github.com/epsy/sigtools/issues/26 + doCheck = false; + checkInputs = [ sphinx mock coverage unittest2 ]; + meta = with lib; { description = "Utilities for working with 3.3's inspect.Signature objects."; homepage = "https://pypi.python.org/pypi/sigtools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix new file mode 100644 index 0000000000..2842e37517 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/socketio-client/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, requests +, six +, websocket-client +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "socketio-client"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "invisibleroads"; + repo = "socketio-client"; + rev = version; + sha256 = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho="; + }; + + propagatedBuildInputs = [ + six + websocket-client + requests + ]; + + # Perform networking tests. + doCheck = false; + + pythonImportsCheck = [ + "socketIO_client" + ]; + + meta = with lib; { + description = "A socket.io client library for protocol 1.x"; + homepage = "https://github.com/invisibleroads/socketIO-client"; + license = licenses.mit; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 743bd4d83c..bc39bb998e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.6"; + version = "7.1.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "ebd3b2aa9230835f8a68ea7f5a10324ddf35d70d89a9c92c8cba81c558565efb"; + sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix new file mode 100644 index 0000000000..7e4d572e18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix @@ -0,0 +1,34 @@ +{ lib +, callPackage +, fetchPypi +, buildPythonPackage +, wandb +, wasabi +}: + +buildPythonPackage rec { + pname = "spacy-loggers"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-F9DiSbLmxlRsSfxlYaCmhfkajtvySlsrd1nq1EPHRlQ="; + }; + + propagatedBuildInputs = [ + wandb + wasabi + ]; + + pythonImportsCheck = [ "spacy_loggers" ]; + + # skipping the checks, becaus it requires a cycle dependency to spacy as well. + doCheck = false; + + meta = with lib; { + description = "Logging utilities for spaCy"; + homepage = "https://github.com/explosion/spacy-loggers"; + license = licenses.mit; + maintainers = with maintainers; [ stunkymonkey ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 0d095cfef0..05561e995a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -25,17 +25,19 @@ , python , tqdm , typing-extensions +, spacy-loggers +, langcodes }: buildPythonPackage rec { pname = "spacy"; - version = "3.2.0"; + version = "3.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3"; + sha256 = "sha256-9uusURYndAqMorEXuR71UVyPCy+xF6aevgHQEN1PxTw="; }; propagatedBuildInputs = [ @@ -58,6 +60,8 @@ buildPythonPackage rec { tqdm typer wasabi + spacy-loggers + langcodes ] ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/speaklater3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/speaklater3/default.nix new file mode 100644 index 0000000000..60c4c99fd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/speaklater3/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "speaklater3"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI="; + }; + + pythonImportsCheck = [ "speaklater" ]; + + meta = with lib; { + description = "Implements a lazy string for python useful for use with gettext"; + homepage = "https://github.com/mitsuhiko/speaklater"; + license = licenses.bsd0; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index bb757ab45b..bfae1d7b3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, unittest2, scripttest, pytz, mock -, testtools, pbr, tempita, decorator, sqlalchemy +, scripttest, pytz, pbr, tempita, decorator, sqlalchemy , six, sqlparse, testrepository }: + buildPythonPackage rec { pname = "sqlalchemy-migrate"; version = "0.13.0"; @@ -13,21 +13,27 @@ buildPythonPackage rec { }; # See: https://review.openstack.org/#/c/608382/ - patches = [ (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; - sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; + }) + ]; - checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ]; + postPatch = '' + substituteInPlace test-requirements.txt \ + --replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \ + --replace "ibm-db-sa-py3;python_version>='3.0'" "" \ + --replace "tempest-lib>=0.1.0" "" \ + --replace "testtools>=0.9.34,<0.9.36" "" \ + --replace "pylint" "" + ''; + + checkInputs = [ scripttest pytz testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; doCheck = !stdenv.isDarwin; - prePatch = '' - sed -i -e /tempest-lib/d \ - -e /testtools/d \ - test-requirements.txt - ''; checkPhase = '' export PATH=$PATH:$out/bin echo sqlite:///__tmp__ > test_db.cfg @@ -41,9 +47,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/openstack/sqlalchemy-migrate"; + homepage = "https://opendev.org/x/sqlalchemy-migrate"; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; - maintainers = with maintainers; [ makefu ]; + maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix index 9759443228..13c8107c9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix @@ -33,7 +33,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \ - --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' + --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \ + --replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"' ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 789e054dbb..18ab606afd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.1"; + version = "5.7.3"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "12ljff6l29q92625pgsg4f7xf4dz6iz1c3zdkzz188s4lnwpy8b8"; + sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix index 5fa1ad4c53..39f7a82cd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchPypi +, fetchpatch , pbr , cliff , jsonschema @@ -20,7 +21,6 @@ , prettytable , urllib3 , debtcollector -, unittest2 , hacking , oslotest , bash @@ -36,6 +36,14 @@ buildPythonApplication rec { sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9"; }; + patches = [ + # remove need for unittest2 + (fetchpatch { + url = "https://github.com/openstack/tempest/commit/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch"; + sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk="; + }) + ]; + propagatedBuildInputs = [ pbr cliff @@ -56,7 +64,6 @@ buildPythonApplication rec { prettytable urllib3 debtcollector - unittest2 ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 19e42e917d..d1e07df211 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.4.2"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw="; + sha256 = "sha256-5ZGj3ZS+KGtnlphyUF1xb9e2XuHa4qbOWWtyzZwP1RM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 99be9957a5..b582bf4bc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , mock , pytestCheckHook +, pythonAtLeast +, pythonOlder , sybil , twisted , zope_component @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "testfixtures"; version = "6.18.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -19,29 +23,42 @@ buildPythonPackage rec { }; checkInputs = [ - pytestCheckHook mock + pytestCheckHook sybil - zope_component twisted + zope_component ]; - doCheck = !isPy27; - disabledTestPaths = [ # Django is too much hasle to setup at the moment "testfixtures/tests/test_django" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/simplistix/testfixtures/issues/168 + "test_invalid_communicate_call" + "test_invalid_kill" + "test_invalid_parameters" + "test_invalid_poll" + "test_invalid_send_signal" + "test_invalid_terminate" + "test_invalid_wait_call" + "test_replace_delattr_cant_remove" + "test_replace_delattr_cant_remove_not_strict" + ]; + pytestFlagsArray = [ "testfixtures/tests" ]; - pythonImportsCheck = [ "testfixtures" ]; + pythonImportsCheck = [ + "testfixtures" + ]; meta = with lib; { + description = "Collection of helpers and mock objects for unit tests and doc tests"; homepage = "https://github.com/Simplistix/testfixtures"; - description = "A collection of helpers and mock objects for unit tests and doc tests"; license = licenses.mit; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index 2e46762672..fdd4c2bf0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -1,53 +1,55 @@ { lib -, fetchPypi , buildPythonPackage -, isPy27 -, isPy3k +, dask +, fetchPypi +, fsspec +, lxml , numpy -, imagecodecs-lite -, enum34 ? null -, futures ? null -, pathlib ? null -, pytest +, pytestCheckHook +, pythonOlder +, zarr }: buildPythonPackage rec { pname = "tifffile"; version = "2021.11.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b"; + hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs="; }; - patches = lib.optional isPy27 ./python2-regex-compat.patch; - - # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles - # and test data missing from PyPI tarball - doCheck = false; - - checkInputs = [ - pytest - ]; - - checkPhase = '' - pytest - ''; - propagatedBuildInputs = [ numpy - ] ++ lib.optionals isPy3k [ - imagecodecs-lite - ] ++ lib.optionals isPy27 [ - futures - enum34 - pathlib + ]; + + checkInputs = [ + dask + fsspec + lxml + pytestCheckHook + zarr + ]; + + disabledTests = [ + # Test require network access + "test_class_omexml" + "test_write_ome" + # Test file is missing + "test_write_predictor" + ]; + + pythonImportsCheck = [ + "tifffile" ]; meta = with lib; { - description = "Read and write image data from and to TIFF files."; - homepage = "https://www.lfd.uci.edu/~gohlke/"; - maintainers = [ maintainers.lebastr ]; + description = "Read and write image data from and to TIFF files"; + homepage = "https://github.com/cgohlke/tifffile/"; license = licenses.bsd3; + maintainers = with maintainers; [ lebastr ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix new file mode 100644 index 0000000000..58bf190495 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitHub +, pytestCheckHook +, requests +}: + +python3Packages.buildPythonPackage rec { + pname = "timetagger"; + version = "22.1.2"; + + src = fetchFromGitHub { + owner = "almarklein"; + repo = pname; + rev = "v${version}"; + sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; + }; + + meta = with lib; { + homepage = "https://timetagger.app"; + license = licenses.gpl3; + description = "Tag your time, get the insight"; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + + checkInputs = [ + pytestCheckHook + requests + ]; + + preCheck = '' + # https://github.com/NixOS/nixpkgs/issues/12591 + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + propagatedBuildInputs = with python3Packages; [ + asgineer + itemdb + jinja2 + markdown + pscript + pyjwt + uvicorn + ]; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix new file mode 100644 index 0000000000..331729e25c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchPypi +, python +, buildPythonPackage +, pythonOlder +, pytorch +, pytestCheckHook +, torchvision +}: + +buildPythonPackage rec { + pname = "torchinfo"; + version = "1.6.3"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-g1xhtdwygzPTTswP8iZ364ynBQE7D+aAsZ3d9EpyvIA="; + }; + + propagatedBuildInputs = [ + pytorch + torchvision + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Skip as it downloads pretrained weights (require network access) + "test_eval_order_doesnt_matter" + ]; + + pythonImportsCheck = [ "torchvision" ]; + + meta = { + description = "API to visualize pytorch models"; + homepage = "https://github.com/TylerYep/torchinfo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ petterstorvik ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 5479a0b122..917aef54b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.12.5"; + version = "4.15.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy"; + sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg"; }; nativeBuildInputs = [ packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 0dca476deb..76a82e7c62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , six , pygraphviz , pytestCheckHook @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "transitions"; version = "0.8.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -36,6 +38,16 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/pytransitions/transitions/issues/563 + "test_multiple_models" + "test_timeout" + ]; + + pythonImportsCheck = [ + "transitions" + ]; + meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; description = "A lightweight, object-oriented finite state machine implementation in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix index bdea03896c..4e8c1431cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix @@ -27,9 +27,12 @@ buildPythonPackage rec { sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m"; }; - patches = [ - ./relax-deps.patch - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \ + --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \ + --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"' + ''; nativeBuildInputs = [ poetry-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treex/relax-deps.patch b/third_party/nixpkgs/pkgs/development/python-modules/treex/relax-deps.patch deleted file mode 100644 index 347098a4a6..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/treex/relax-deps.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index f0ff8a0..56787ca 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -16,9 +16,9 @@ secondary = true - [tool.poetry.dependencies] - python = "^3.7" - flax = "^0.3.4" --PyYAML = "^5.4.1" -+PyYAML = ">=5.4.1" - rich = "^10.7.0" --optax = "^0.0.9" -+optax = ">=0.0.9" - einops = "^0.3.2" - treeo = "^0.0.9" - # treeo = { path = "../treeo", develop = true } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix index fc856430da..77eb17b9fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix @@ -7,19 +7,26 @@ buildPythonPackage rec { pname = "twinkly-client"; - version = "0.0.2"; + version = "0.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i"; + sha256 = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "twinkly_client" ]; + + pythonImportsCheck = [ + "twinkly_client" + ]; meta = with lib; { description = "Python module to communicate with Twinkly LED strings"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-freezegun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-freezegun/default.nix new file mode 100644 index 0000000000..687ddd1b17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-freezegun/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-freezegun"; + version = "1.1.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8="; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "freezegun-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for freezegun"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix new file mode 100644 index 0000000000..9e5c9b628b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-tabulate"; + version = "0.8.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw="; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "tabulate-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for tabulate"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 15f098d90e..f3c8792e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.4.3"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c="; + sha256 = "sha256-VevtbXtOTKQEqVYpNKFrDhvyDBJY+uQMhld6in+EroE="; }; nativeBuildInputs = [ @@ -41,15 +41,6 @@ buildPythonPackage rec { enum34 ]; - patches = [ - (fetchpatch { - url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch"; - sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd"; - stripLen = "2"; - extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/"; - }) - ]; - dontUseCmakeConfigure = true; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 528e39878b..f4d14ed2e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -35,13 +35,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.7"; + version = "0.12.9"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "sha256-YG0BSIENnmF9n+oNIBcbpTh7obYx+Lpuak8pJzvjuJ8="; + sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix index 9068293631..d8db35fbda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix @@ -1,8 +1,8 @@ { lib -, buildPythonPackage -, fetchPypi , attrdict +, buildPythonPackage , cairosvg +, fetchPypi , pillow , pytestCheckHook , setuptools-scm @@ -14,9 +14,11 @@ buildPythonPackage rec { pname = "wavedrom"; version = "2.0.3.post2"; + format = "setuptools"; + src = fetchPypi { inherit pname version; - sha256 = "239b3435ff116b09007d5517eed755fc8591891b7271a1cd40db9e400c02448d"; + hash = "sha256-I5s0Nf8RawkAfVUX7tdV/IWRiRtycaHNQNueQAwCRI0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,22 +34,25 @@ buildPythonPackage rec { ]; checkInputs = [ + cairosvg + pillow pytestCheckHook xmldiff - pillow - cairosvg ]; disabledTests = [ - "test_upstream" # requires to clone a full git repository + # Requires to clone a full git repository + "test_upstream" ]; - pythonImportsCheck = [ "wavedrom" ]; + pythonImportsCheck = [ + "wavedrom" + ]; - meta = { + meta = with lib; { description = "WaveDrom compatible Python command line"; homepage = "https://github.com/wallento/wavedrompy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ airwoodix ]; + license = licenses.mit; + maintainers = with maintainers; [ airwoodix ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index e19ed16d48..9ddb0631f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -77,6 +77,9 @@ buildPythonPackage rec { disabledTests = [ # needs the Ahem font (fails on macOS) "test_font_stretch" + # sensitive to sandbox environments + "test_tab_size" + "test_tabulation_character" ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix index 96440c438b..48764d509f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix @@ -2,21 +2,29 @@ , buildPythonPackage , fetchPypi , markupsafe +, Babel +, pytestCheckHook +, email_validator }: buildPythonPackage rec { - version = "2.3.3"; + version = "3.0.1"; pname = "WTForms"; src = fetchPypi { inherit pname version; - sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c"; + sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb"; }; - propagatedBuildInputs = [ markupsafe ]; + propagatedBuildInputs = [ markupsafe Babel ]; - # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." - doCheck = false; + + checkInputs = [ + pytestCheckHook + email_validator + ]; + + pythonImportsCheck = [ "wtforms" ]; meta = with lib; { description = "A flexible forms validation and rendering library for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 9b9ef513f7..d83b031fe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.15"; + version = "1.1.19"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EK9jmbU3A2rNx/H8WOsZiGA7tqzg/XJkW/DV5s+2Y3U="; + sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index b19aed0c6f..218c2edd0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.19.5"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-haZe5afwkU8wD8s2lrmHJuVo6TO3CcQ/0TuJbHPmqvU="; + hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix b/third_party/nixpkgs/pkgs/development/python2-modules/Pygments/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/Pygments/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/TurboCheetah/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/TurboCheetah/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/TurboCheetah/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/TurboCheetah/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/1_17.nix b/third_party/nixpkgs/pkgs/development/python2-modules/boto3/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/boto3/1_17.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/boto3/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/1_20.nix b/third_party/nixpkgs/pkgs/development/python2-modules/botocore/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/botocore/1_20.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/botocore/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certifi/python2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/certifi/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/certifi/python2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/certifi/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/chardet/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/chardet/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheetah/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/cheetah/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/cheetah/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/cheetah/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click/7.nix b/third_party/nixpkgs/pkgs/development/python2-modules/click/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/click/7.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/click/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix b/third_party/nixpkgs/pkgs/development/python2-modules/configparser/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/configparser/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix b/third_party/nixpkgs/pkgs/development/python2-modules/construct/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/construct/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/0.nix b/third_party/nixpkgs/pkgs/development/python2-modules/contextlib2/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/contextlib2/0.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/contextlib2/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix b/third_party/nixpkgs/pkgs/development/python2-modules/cryptography-vectors/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/cryptography-vectors/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix b/third_party/nixpkgs/pkgs/development/python2-modules/cryptography/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/cryptography/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decorator/4.nix b/third_party/nixpkgs/pkgs/development/python2-modules/decorator/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/decorator/4.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/decorator/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enum/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/enum/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/enum/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/enum/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filelock/3.2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/filelock/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/filelock/3.2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/filelock/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/flask/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/flask/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/flask/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/third_party/nixpkgs/pkgs/development/python2-modules/freezegun/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/freezegun/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/futures/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/futures/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/futures/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/futures/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/google-apputils/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/google-apputils/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/0.nix b/third_party/nixpkgs/pkgs/development/python2-modules/httpretty/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/httpretty/0.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/httpretty/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/idna/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/idna/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/idna/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/importlib-metadata/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/importlib-metadata/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/ipaddr/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/ipaddr/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/ipaddr/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/itsdangerous/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/itsdangerous/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/libcloud/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/libcloud/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lpod/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/lpod/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/lpod/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/lpod/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/marisa/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/marisa/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/marisa/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/markdown/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/markdown/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/markupsafe/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/markupsafe/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/markupsafe/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/2.7.nix b/third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/more-itertools/2.7.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix b/third_party/nixpkgs/pkgs/development/python2-modules/mutagen/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/mutagen/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix b/third_party/nixpkgs/pkgs/development/python2-modules/numpy/default.nix similarity index 98% rename from third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/numpy/default.nix index 1ab958a15f..b1d71bd66f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/numpy/default.nix @@ -54,7 +54,7 @@ in buildPythonPackage rec { # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. - ./numpy-distutils-C++_1.16.patch + ./numpy-distutils-C++.patch ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch b/third_party/nixpkgs/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch rename to third_party/nixpkgs/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/packaging/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pillow/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pillow/6.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pillow/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pillow/generic.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pillow/generic.nix new file mode 100644 index 0000000000..3e33f1a8aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pillow/generic.nix @@ -0,0 +1,77 @@ +{ pname +, version +, disabled +, src +, meta +, ... +}@args: + +with args; + +buildPythonPackage rec { + inherit pname version src meta; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = lib.optionals stdenv.isDarwin [ + "test_grab" + "test_grabclipboard" + "test_save" + + # pillow-simd + "test_roundtrip" + "test_basic" + ] ++ lib.optionals (lib.versions.major version == "6") [ + # RuntimeError: Error setting from dictionary + "test_custom_metadata" + ]; + + propagatedBuildInputs = [ olefile ] + ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; + + checkInputs = [ pytestCheckHook pyroma numpy ]; + + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] + ++ lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="$LDFLAGS -L${libwebp}/lib" + export CFLAGS="$CFLAGS -I${libwebp}/include" + '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + '' + lib.optionalString stdenv.isDarwin '' + # Remove impurities + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/20.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pip/20.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pluggy/0.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pluggy/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pluggy/0.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pluggy/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/prettytable/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/prettytable/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/prettytable/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/protobuf/default.nix new file mode 100644 index 0000000000..30e9fbf9ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/protobuf/default.nix @@ -0,0 +1,59 @@ +{ buildPackages +, lib +, fetchpatch +, python +, buildPythonPackage +, isPy37 +, protobuf +, google-apputils ? null +, six +, pyext +, isPy27 +, disabled +, doCheck ? true +}: + +buildPythonPackage { + inherit (protobuf) pname src version; + inherit disabled; + doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 + + propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; + buildInputs = [ protobuf ]; + + patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2")) + # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; + sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; + stripLen = 1; + }) + ; + + prePatch = '' + while [ ! -d python ]; do + cd * + done + cd python + ''; + + setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0") + "--cpp_implementation"; + + pythonImportsCheck = [ + "google.protobuf" + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [ + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + }; + + passthru.protobuf = protobuf; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/1.18.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pycairo/1.18.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pygobject/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pygobject/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtk/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pygtk/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pyjwt/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pyjwt/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroma/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pyroma/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pyroma/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pyroma/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pysqlite/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pysqlite/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pysqlite/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest-runner/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pytest-runner/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/5.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pyyaml/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pyyaml/5.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/pyyaml/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/qpid-python/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/qpid-python/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/qpid-python/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/0_4.nix b/third_party/nixpkgs/pkgs/development/python2-modules/s3transfer/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/s3transfer/0_4.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/s3transfer/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scandir/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/scandir/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/scandir/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/scandir/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/tag-date.patch b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/tag-date.patch new file mode 100644 index 0000000000..441177a5d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/tag-date.patch @@ -0,0 +1,12 @@ +diff --git a/setup.cfg b/setup.cfg +index f23714b6..8aaeb330 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,6 +1,6 @@ + [egg_info] + tag_build = .post +-tag_date = 1 ++tag_date = 0 + + [aliases] + clean_egg_info = egg_info -Db '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/sphinx/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinx/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/sphinx/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/python2-lexer.patch b/third_party/nixpkgs/pkgs/development/python2-modules/sphinx/python2-lexer.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinx/python2-lexer.patch rename to third_party/nixpkgs/pkgs/development/python2-modules/sphinx/python2-lexer.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/typing/default.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix b/third_party/nixpkgs/pkgs/development/python2-modules/urllib3/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/urllib3/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix b/third_party/nixpkgs/pkgs/development/python2-modules/vcrpy/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/vcrpy/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/werkzeug/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/werkzeug/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/0.14.nix b/third_party/nixpkgs/pkgs/development/python2-modules/wsproto/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/wsproto/0.14.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/wsproto/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix b/third_party/nixpkgs/pkgs/development/python2-modules/wxPython/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/wxPython/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix b/third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix rename to third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix diff --git a/third_party/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix b/third_party/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix index 5eeac8fed3..b20b61d6c5 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,16 +1,23 @@ -{ lib, runCommand, R, rstudio, wrapQtAppsHook, recommendedPackages, packages, qtbase }: +{ lib +, runCommand +, R +, rstudio +, makeWrapper +, wrapQtAppsHook +, recommendedPackages +, packages +, fontconfig +}: -let - qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}"; -in -runCommand (rstudio.name + "-wrapper") { +runCommand (rstudio.name + "-wrapper") +{ preferLocalBuild = true; allowSubstitutes = false; - nativeBuildInputs = [wrapQtAppsHook]; + nativeBuildInputs = [ (if rstudio.server then makeWrapper else wrapQtAppsHook) ]; dontWrapQtApps = true; - buildInputs = [R rstudio] ++ recommendedPackages ++ packages; + buildInputs = [ R rstudio ] ++ recommendedPackages ++ packages; # rWrapper points R to a specific set of packages by using a wrapper # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets @@ -22,14 +29,27 @@ runCommand (rstudio.name + "-wrapper") { # uses R_PROFILE_USER to load this code at startup in RStudio. fixLibsR = "fix_libs.R"; } -'' -mkdir $out -ln -s ${rstudio}/share $out -echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR -echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR -echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR -echo -n "\"))" >> $out/$fixLibsR -echo >> $out/$fixLibsR -makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \ - --set R_PROFILE_USER $out/$fixLibsR -'' + ( + '' + mkdir -p $out/bin + ln -s ${rstudio}/share $out + echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR + echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR + echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR + echo -n "\"))" >> $out/$fixLibsR + echo >> $out/$fixLibsR + '' + + (if + rstudio.server then '' + makeWrapper ${rstudio}/bin/rsession $out/bin/rsession \ + --set R_PROFILE_USER $out/$fixLibsR --set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf + + makeWrapper ${rstudio}/bin/rserver $out/bin/rserver \ + --add-flags --rsession-path=$out/bin/rsession + '' + else + '' + makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \ + --set R_PROFILE_USER $out/$fixLibsR + '') + ) diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 64b9d9ca4c..a3d787ad8e 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -26,7 +26,7 @@ , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool +, CoreServices, DarwinTools, cctools, libtool, discount }@args: let @@ -135,6 +135,17 @@ in hardeningDisable = [ "format" ]; }; + rdiscount = attrs: { + # Use discount from nixpkgs instead of vendored version + dontBuild = false; + buildInputs = [ discount ]; + patches = [ + # Adapted from Debian: + # https://sources.debian.org/data/main/r/ruby-rdiscount/2.1.8-1/debian/patches/01_use-system-libmarkdown.patch + ./rdiscount-use-nixpkgs-libmarkdown.patch + ]; + }; + ethon = attrs: { dontBuild = false; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/rdiscount-use-nixpkgs-libmarkdown.patch b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/rdiscount-use-nixpkgs-libmarkdown.patch new file mode 100644 index 0000000000..3539b80ae3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/rdiscount-use-nixpkgs-libmarkdown.patch @@ -0,0 +1,14 @@ +diff --git a/ext/extconf.rb b/ext/extconf.rb +index 30764cb..b87ac2b 100644 +--- a/ext/extconf.rb ++++ b/ext/extconf.rb +@@ -46,4 +46,9 @@ if /mswin/.match RbConfig::CONFIG['host_os'] + $defs.push("-Dinline=__inline") + end + ++$srcs = %w[ ++ rdiscount.c ++] ++have_library('markdown') ++ + create_makefile('rdiscount') diff --git a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix index 13b0e8d257..784a872333 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = @@ -83,10 +83,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A="; + sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y="; + sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o="; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 6402f90d56..8de3f71a5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.18.3"; + version = "0.18.5"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-n43n9rmLWmGF7JXz/jspT6Stn0fQnkbkxqbuqXiZLHA="; + sha256 = "sha256-vYfoCKHN7kaXSkZI7cdh9pzlX3LqYQNeENaoztKwcII="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-dJey7z0gRUu5MRKOfR909eQNTt3zpZnoWYvRhHzZlGs="; + cargoSha256 = "sha256-I7a3Vm/+oUqVLPYXvlz+I0Epuems7swePmV8vmmP6TU="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 3ddde0c282..1a4b296718 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.712"; + version = "2.0.727"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-iUplSd4/OcJtfby2bn7b6GwCbXnBMqUSuLjkkh+7W9Y="; + hash = "sha256-hegbkmM8ZN6zO2iANGRr2QRW3ErdtwYaTo618uELev0="; }; nativeBuildInputs = with py.pkgs; [ @@ -81,6 +81,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ + --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \ --replace "jsonschema==3.0.2" "jsonschema>=3.0.2" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index c22f25fbc9..06acec262d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.45.1"; + version = "9.2.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-H4w/rjVBhZCfBzLavd4/BkojwhCu05VsxrtzyS0wyk4="; + sha256 = "sha256-EqZt/Er9A02ggThXF8y5wCjUgTE8mHPBLs9/XNsJ2vY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix index 72154e909b..edad1f0dd9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }: stdenv.mkDerivation rec { pname = "oclgrind"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ]; + buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ]; cmakeFlags = [ "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index 1f7c6641b1..6b238fb926 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: +{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: let name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = kcachegrind.src; - buildInputs = [ qtbase perl python php ]; + buildInputs = [ qtbase perl python2 php ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix index 698f9e8231..a6ac4fbce1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-Z5mqLkeA7AZnvKdpdRzaYfNMsGUI7i7wPTXVyIRYwxI="; + sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index c316ef970f..c4cdf85a7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig="; + sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index b012522c83..49d454d868 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.12"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - sha256 = "sha256-ct4SsIs6ErWl2XbxfqX3FTOU9K9tTKo8YWu1QT83iTI="; + sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 38382ea434..3eb7c7e261 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - version = "1.4.0"; + version = "1.5.0"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-v2ijRZ5xvYkL3YO7Xfgalzxzd9C5BKdaQF7VT5UoqOk="; + vendorSha256 = "sha256-bYjEVmQ7lPd+Gn5cJwlzBQkMkLAXA1iSa1DXz/IM1Ss="; doCheck = false; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-+70PWHGd8AQP6ih0b/+VOIbJcF8tSOAO9wsGqQWX+bU="; + sha256 = "sha256-TFIGKTVrAMSOFEmu3afdDKBgyEwF2KIv3rt1fS6rCxw="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 65132b7239..5823b5dac0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.1"; + version = "2.319.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0qm562v7jwc9mjpbn1f808kg97axy1mraq3s5h679niffn588jvy"; + sha256 = "0lx5fng98l9qci5jqwav8dmcnp7k7glfg0ccwqi0xqk90jqqs302"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index f177ced309..9119dbce15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -1,18 +1,19 @@ -{ buildGoModule, fetchgit, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "cue"; - version = "0.4.0"; + version = "0.4.1"; - src = fetchgit { - url = "https://cue.googlesource.com/cue"; + src = fetchFromGitHub { + owner = "cue-lang"; + repo = "cue"; rev = "v${version}"; - sha256 = "sha256-rcGEl+CMFyxZKsOKhVimhv5/ONo3xS6FjgKModZGR2o="; + sha256 = "1q1mkqb6fk515g556yn8ks3gqrimfbadprmbv5rill1lpipq5xbj"; }; - vendorSha256 = "sha256-eSKVlBgnHR1R0j1lNwtFoIgRuj8GqoMbvuBl/N1SanY="; + vendorSha256 = "12p77a97lbff6qhncs5qx13k3wmf9hrr09mhh12isw5s0p0n53xm"; - doCheck = false; + checkPhase = "go test ./..."; subPackages = [ "cmd/cue" ]; @@ -20,6 +21,11 @@ buildGoModule rec { "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/cue eval - <<<'a: "all good"' > /dev/null + ''; + meta = { description = "A data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix index 9fa8685734..e8f053679c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix @@ -20,13 +20,13 @@ buildPythonApplication rec { pname = "pgcli"; - version = "3.2.0"; + version = "3.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6cde97e71996bf910a40b579e5285483c10ea04962a08def01c12433d5f7c6b7"; + sha256 = "sha256-/MyeVcpopK0Ih6z6KZGvs7ivk/PM6a2iSeatiYeZM6E="; }; propagatedBuildInputs = [ @@ -46,11 +46,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook mock ]; - disabledTests = [ - # tests that expect output from an older version of cli-helpers - "test_format_output" - "test_format_output_auto_expand" - ] ++ lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; meta = with lib; { description = "Command-line interface for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix index 930078b2dc..220554f95d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pyrseas/default.nix @@ -1,7 +1,7 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage rec { + pgdbconn = python2Packages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { @@ -13,13 +13,13 @@ let # The tests are impure (they try to access a PostgreSQL server) doCheck = false; propagatedBuildInputs = [ - pythonPackages.psycopg2 - pythonPackages.pytest + python2Packages.psycopg2 + python2Packages.pytest ]; }; in -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { pname = "pyrseas"; version = "0.8.0"; src = fetchFromGitHub { @@ -31,9 +31,9 @@ pythonPackages.buildPythonApplication { # The tests are impure (they try to access a PostgreSQL server) doCheck = false; propagatedBuildInputs = [ - pythonPackages.psycopg2 - pythonPackages.pytest - pythonPackages.pyyaml + python2Packages.psycopg2 + python2Packages.pytest + python2Packages.pyyaml pgdbconn ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix index 91d501a050..83d57ba5c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.16"; + version = "0.1.19"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-I+Nq3kjXoQlwfj8r7oNu6KFE6hnB076M9aJMdwCas3k="; + sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/deadnix/default.nix b/third_party/nixpkgs/pkgs/development/tools/deadnix/default.nix new file mode 100644 index 0000000000..34fb92973b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/deadnix/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "deadnix"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "astro"; + repo = "deadnix"; + rev = "v${version}"; + sha256 = "0ddnxmcr9fncgrqg1vvqcbx49c3lccdpb40h9rvzyldzy9xynzi7"; + }; + + cargoSha256 = "19vgjv70vxgxssrxvdjwfl16bwdbdrpb2wzb3fg9vlz4fhbj2lv9"; + + meta = with lib; { + description = "Find and remove unused code in .nix source files"; + homepage = "https://github.com/astro/deadnix"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index eeca6ccfbb..b7b8e3ed3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -24,41 +24,6 @@ rec { electron = electron_16; - electron_3 = mkElectron "3.1.13" { - x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; - x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; - i686-linux = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; - armv7l-linux = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; - aarch64-linux = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; - }; - - electron_4 = mkElectron "4.2.12" { - x86_64-linux = "72c5319c92baa7101bea3254a036c0cd3bcf257f4a03a0bb153668b7292ee2dd"; - x86_64-darwin = "89b0e16bb9b7072ed7ed1906fccd08540acdd9f42dd8a29c97fa17d811b8c5e5"; - i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; - armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; - aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; - headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; - }; - - electron_5 = mkElectron "5.0.13" { - x86_64-linux = "8ded43241c4b7a6f04f2ff21c75ae10e4e6db1794e8b1b4f7656c0ed21667f8f"; - x86_64-darwin = "589834815fb9667b3c1c1aa6ccbd87d50e5660ecb430f6b475168b772b9857cd"; - i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; - armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; - aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; - headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; - }; - - electron_6 = mkElectron "6.1.12" { - x86_64-linux = "dc628216588a896e72991d46071d06ef11aed2cdeca18d11d472c29cfbf12349"; - x86_64-darwin = "6c7244319fdfb90899a48ffd0f426e36dba7c3fc5e29b28a4d29fdca7fb924d3"; - i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; - armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; - aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; - headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; - }; - electron_7 = mkElectron "7.3.3" { x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; @@ -115,43 +80,43 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.6" { - armv7l-linux = "4d8a8bde1c993bfc20afb2b23e55101ad2048f5ddd89ab86043f510470aeba8d"; - aarch64-linux = "6d1480f80d43cdebd9f74cb62b64c9d16bee29b68b863faf7c50fcb91f63985c"; - x86_64-linux = "62b9ba2fea4f0f54fd54bce8a532d14132302a66ec99173764f44234fa76925e"; - i686-linux = "b83860318b2e591b150dc9578ea749f66ab9a18aafbe69dadb622b9ca131e695"; - x86_64-darwin = "a59b7270f86286e4ee217552b8729621f4b282360ad15391886d5686008b6933"; - aarch64-darwin = "1f445d2f02d1054a760bdaafb755677a35c495e64385e2d2a5547b6750a82dfa"; - headers = "0qdlw17jxhhcamr8g2ybbs2jkijzdq82qgc3knr4kdxb425q898r"; + electron_13 = mkElectron "13.6.7" { + armv7l-linux = "13acf496801d2a311f9c0644d086df26976259e915cb2201fd29665d8122a98b"; + aarch64-linux = "8d751e9e998f5eece15dba8cae1a7aa4b780da1b802235bafcd86a3540f4efe2"; + x86_64-linux = "af93b62e197a40c648c964d44939d24fc56ff4fa8ccac22cfb020660c726f4e7"; + i686-linux = "68085a6849aa571fea7682b66207abd2b6adb0a515195a00862776f37f2ff3f0"; + x86_64-darwin = "70d51ac6adc50df3195af022e700d3d10056c9e1fb770c79540215cdee9d67b3"; + aarch64-darwin = "4d9facf75a94f6d053c02db97ca4012833274b3d3f9ab0438733a302d4a28f60"; + headers = "1ydyl2s58vf65ywih2n3iam8l6yggmsn6hv0jhwp1rsash8hl4x4"; }; - electron_14 = mkElectron "14.2.3" { - armv7l-linux = "d4ed85690c49b6ec1b532256bd63ccfb670d14da9bb5ccf706e03da2f5fe377e"; - aarch64-linux = "ac8be1a06ad4b3da16438cc9c257b3c443417d5d9272830b0d51c1f2c9b14f52"; - x86_64-linux = "c72ce5943e9e5e9b10b0822b3e60de74612db81c4ebaf475e5fa8735af344b22"; - i686-linux = "9dec585682c0a08f048f1eda6a931cad3c85d47842786aae565af930a7ef7b51"; - x86_64-darwin = "fb90d61855b63ac1115a60683d476931a6b6bf194e77867192d927bbb9051070"; - aarch64-darwin = "035e6e2e8d50e867eee37b0631fc95b3f0e8760294af71c23bc73c0f3fc99f83"; - headers = "0m03nb1nlwd03wn765rs06yiqzkxlk9jafab0zaxywsq94z5np0y"; + electron_14 = mkElectron "14.2.4" { + armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; + aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; + x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; + i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; + x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; + aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; + headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; }; - electron_15 = mkElectron "15.3.4" { - armv7l-linux = "caff953cbffdac63307b75a3b78be82ea6003782e981edfdcba14da5ee48b8b6"; - aarch64-linux = "dba1e09b3e4924148b57539d86840fa22e5500f3e15a694dcd2e26b830c1f780"; - x86_64-linux = "5e13b64c3b1b025ddea92b3bda577e00fc533902a9cf92bfd87b976637f7b59a"; - i686-linux = "1253e837e98fc41c14f6b71f0f917b8f42a0777bd2554046567b512f747240d8"; - x86_64-darwin = "ea1cb757f9c8c4c99c840357ecab42a0bcbe8c7a6a3a1265106c238088ad18f1"; - aarch64-darwin = "65b9b3235efdb681e3a4db85068dc9fe6dfbcb7fbb146053c0a534e4b44a2f7a"; - headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r"; + electron_15 = mkElectron "15.3.5" { + armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; + aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; + x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; + i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; + x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; + aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; + headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; }; - electron_16 = mkElectron "16.0.6" { - armv7l-linux = "f15d665cbf487538f5448a318519e16e3c07a5f7b55895541df1c067c9cfcb55"; - aarch64-linux = "92037b0886a9404c7f9027e7597df552b2c0011ded100537f4287e4e925db6dc"; - x86_64-linux = "0017aba47756b962b9571ccd9dcf6297af0f603b879e26f49bab8728bb64567d"; - i686-linux = "11ae3628d27d12612a8742b72b0dc4521c9b2cd303619046c6f6a36282f43c72"; - x86_64-darwin = "250489ca6b1bec91f4d59766c1d4f65407f016765395517a6dfd5625e93d646f"; - aarch64-darwin = "a4416627a3055308259689fd156a7d4fd704983420a20e8939409b08195af204"; - headers = "00iq8v3nm42f9fphwd50vdng51bd291rk33zcavpidiw29hrqi9m"; + electron_16 = mkElectron "16.0.7" { + armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; + aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; + x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; + i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; + x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; + aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; + headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index cbbceba702..f70767a059 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -28,7 +28,7 @@ let maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; - knownVulnerabilities = optional (versionOlder version "12.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index c3ed6ce6b1..4995fbe1c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.8"; + version = "0.14.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-RyxlU6Wf+rHSZ/xuhiCbF+KYhMxHEEh3XvLCdwAVTYw="; + sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile index 5db8cdb734..13106b879d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile +++ b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "github_changelog_generator", "1.14.3" +gem "github_changelog_generator", "1.16.4" diff --git a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock index d1f67ddd47..726ef5ae7b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -1,49 +1,101 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.2) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - concurrent-ruby (1.1.4) - faraday (0.15.4) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + async (1.30.1) + console (~> 1.10) + nio4r (~> 2.3) + timers (~> 4.1) + async-http (0.56.5) + async (>= 1.25) + async-io (>= 1.28) + async-pool (>= 0.2) + protocol-http (~> 0.22.0) + protocol-http1 (~> 0.14.0) + protocol-http2 (~> 0.14.0) + async-http-faraday (0.11.0) + async-http (~> 0.42) + faraday + async-io (1.32.2) + async + async-pool (0.3.9) + async (>= 1.25) + concurrent-ruby (1.1.9) + console (1.14.0) + fiber-local + faraday (1.9.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) multipart-post (>= 1.2, < 3) - faraday-http-cache (2.0.0) - faraday (~> 0.8) - github_changelog_generator (1.14.3) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + fiber-local (1.0.0) + github_changelog_generator (1.16.4) activesupport + async (>= 1.25.0) + async-http-faraday faraday-http-cache multi_json octokit (~> 4.6) - rainbow (>= 2.1) + rainbow (>= 2.2.1) rake (>= 10.0) - retriable (~> 2.1) - i18n (1.2.0) + i18n (1.8.11) concurrent-ruby (~> 1.0) - minitest (5.11.3) - multi_json (1.13.1) - multipart-post (2.0.0) - octokit (4.13.0) + minitest (5.15.0) + multi_json (1.15.0) + multipart-post (2.1.1) + nio4r (2.5.8) + octokit (4.22.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (3.0.3) - rainbow (3.0.0) - rake (12.3.2) - retriable (2.1.0) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) + protocol-hpack (1.4.2) + protocol-http (0.22.5) + protocol-http1 (0.14.2) + protocol-http (~> 0.22) + protocol-http2 (0.14.2) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) + public_suffix (4.0.6) + rainbow (3.1.1) + rake (13.0.6) + ruby2_keywords (0.0.5) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + timers (4.3.3) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) PLATFORMS ruby DEPENDENCIES - github_changelog_generator (= 1.14.3) + github_changelog_generator (= 1.16.4) BUNDLED WITH 2.1.4 diff --git a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix index 173ee55b6e..3a68811b0f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/github-changelog-generator/gemset.nix @@ -1,155 +1,420 @@ { activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; type = "gem"; }; - version = "5.2.2"; + version = "7.0.1"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.5.2"; + version = "2.8.0"; + }; + async = { + dependencies = ["console" "nio4r" "timers"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mdv66xn5xjyaidyrp66mfnx7d4habkbfmx9y57k75h5q6fd2b65"; + type = "gem"; + }; + version = "1.30.1"; + }; + async-http = { + dependencies = ["async" "async-io" "async-pool" "protocol-http" "protocol-http1" "protocol-http2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v3451bnn7rhgvl6ng0ys0dgm7cmyi3m41kmf5wyrpb83dhds13l"; + type = "gem"; + }; + version = "0.56.5"; + }; + async-http-faraday = { + dependencies = ["async-http" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ndynkfknabv6m9wzcmdnj4r4bhlxqkg9c6rzsjc1pk8q057kslv"; + type = "gem"; + }; + version = "0.11.0"; + }; + async-io = { + dependencies = ["async"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10l9m0x2ffvsaaxc4mfalrljjx13njkyir9w6yfif8wpszc291h8"; + type = "gem"; + }; + version = "1.32.2"; + }; + async-pool = { + dependencies = ["async"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r6cyvralcv2yn1jj0plxynwr7rvxym13vlxd2wxk1bymfq9fd9"; + type = "gem"; + }; + version = "0.3.9"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.9"; + }; + console = { + dependencies = ["fiber-local"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ylq7x9zk79r79pssnjvby14shcyamwcbap842p9gvmkf7xblmr"; + type = "gem"; + }; + version = "1.14.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; type = "gem"; }; - version = "0.15.4"; + version = "1.9.3"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; }; faraday-http-cache = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0"; + sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; - github_changelog_generator = { - dependencies = ["activesupport" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" "retriable"]; + faraday-httpclient = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylqfmc78i6jf42ydkyng0gzvsl5w80wr3rjkhd6q4kgi96n70lr"; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; type = "gem"; }; - version = "1.14.3"; + version = "1.0.1"; }; - i18n = { - dependencies = ["concurrent-ruby"]; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + type = "gem"; + }; + version = "1.0.3"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; version = "1.2.0"; }; - minitest = { + faraday-patron = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; type = "gem"; }; - version = "5.11.3"; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; + fiber-local = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9"; + type = "gem"; + }; + version = "1.0.0"; + }; + github_changelog_generator = { + dependencies = ["activesupport" "async" "async-http-faraday" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04d6z2ysq3gzvpw91lq8mxmdlqcxkmvp8rw9zrzkmksh3pjdzli1"; + type = "gem"; + }; + version = "1.16.4"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + type = "gem"; + }; + version = "1.8.11"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + version = "5.15.0"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; + }; + nio4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + type = "gem"; + }; + version = "2.5.8"; }; octokit = { - dependencies = ["sawyer"]; + dependencies = ["faraday" "sawyer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6"; + sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; type = "gem"; }; - version = "4.13.0"; + version = "4.22.0"; + }; + protocol-hpack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sd85am1hj2w7z5hv19wy1nbisxfr1vqx3wlxjfz9xy7x7s6aczw"; + type = "gem"; + }; + version = "1.4.2"; + }; + protocol-http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lhg47b3w1d6pdwdkyha8ijzfhjrh90snwydkhwfnl5r10dd9cg5"; + type = "gem"; + }; + version = "0.22.5"; + }; + protocol-http1 = { + dependencies = ["protocol-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z56p7zqbyvwlrsbs19knny4v9f7ycsgblhv50ar8wgyifvsddf6"; + type = "gem"; + }; + version = "0.14.2"; + }; + protocol-http2 = { + dependencies = ["protocol-hpack" "protocol-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a9klpfmi7w465zq5xz8y8h1qvj42hkm0qd0nlws9d2idd767q5j"; + type = "gem"; + }; + version = "0.14.2"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "3.0.3"; + version = "4.0.6"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "12.3.2"; + version = "13.0.6"; }; - retriable = { + ruby2_keywords = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1123kqmy3yk7k3vidvcwa46lknmhilv8axpaiag1wifa576hkqy1"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "2.1.0"; + version = "0.0.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; - thread_safe = { + timers = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "00xdi97gm01alfqhjgvv5sff9n1n2l6aym69s9jh8l9clg63b0jc"; type = "gem"; }; - version = "0.3.6"; + version = "4.3.3"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.5"; + version = "2.0.4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index a5b8540db4..c704380390 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.9"; + version = "0.11.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Z0wngo7FP5sHpmPkTwitqTvNL0IEqqWwccy3mZpTIKU="; + outputHash = "sha256-sxm4xh4INXz1wtgVkuJ9sJG2k+9OC4ck6wFJjhD37XY=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix new file mode 100644 index 0000000000..621058be66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "dura"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "tkellogg"; + repo = "dura"; + rev = "v0.1.0"; + sha256 = "sha256-XnsR1oL9iImtj0X7wJ8Pp/An0/AVF5y+sD551yX4IGo="; + }; + + cargoSha256 = "sha256-+Tq0a5cs2XZoT7yzTf1oIPd3kgD6SyrQqxQ1neTcMwk="; + + doCheck = false; + + buildInputs = [ + openssl + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = with lib; { + description = "A background process that saves uncommited changes on git"; + longDescription = '' + Dura is a background process that watches your Git repositories and + commits your uncommitted changes without impacting HEAD, the current + branch, or the Git index (staged files). If you ever get into an + "oh snap!" situation where you think you just lost days of work, + checkout a "dura" branch and recover. + ''; + homepage = "https://github.com/tkellogg/dura"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix index 5e0f54b2fe..83c04495f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix @@ -12,17 +12,16 @@ stdenv.mkDerivation rec { pname = "gpuvis"; - version = "20210220"; + version = "20211204"; src = fetchFromGitHub { owner = "mikesart"; repo = pname; - rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9"; - sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz"; + rev = "7f47419470687c7ecbdf086b81f5bafdb05d1bef"; + sha256 = "sha256-29Bv+y0zWzn7QtpsjRV6hr19bCeyVJusPcYiAIEIluk="; }; # patch dlopen path for gtk3 - # python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62 postPatch = '' substituteInPlace src/hook_gtk3.h \ --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index 759c83e81c..64d299db15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index c275777c12..d0f33d750c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl ]; nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; + enableParallelBuilding = true; dontUseCmakeConfigure = true; EXTRA_LDFLAGS = "-fuse-ld=${llvmPackages_latest.lld}/bin/ld.lld"; LTO = 1; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index ec394630fd..93493452d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.35.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-IiYEDvTHb25xolE/IfpFgcJArxU6c89P5oNgt1T2VXA="; + sha256 = "sha256-Eoc+1Jwv0xUAQNtyHWCKezcpV6zWMFgNYtmkqAoedV0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix b/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix index 0008fab744..f01d87be6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/packethost/prometheus-packet-sd"; license = licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.andir ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 6995c41cc9..e8039b1bd9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -56,6 +56,7 @@ tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; + tree-sitter-org = lib.importJSON ./tree-sitter-org.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json new file mode 100644 index 0000000000..038a4f51ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/milisims/tree-sitter-org", + "rev": "39a377f5072ee9f79884e227dc49d42c2eba67d8", + "date": "2021-11-01T23:43:23-04:00", + "path": "/nix/store/cgsn53p4gp1ahq2zl38jz51xal60dckf-tree-sitter-org", + "sha256": "0vfnph4xxvkalzk3rgvzi6ckqkjg31ddzgh4mwbk7qwsacbq9rss", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/third_party/nixpkgs/pkgs/development/tools/phantomjs2/default.nix index 448e7dd440..d9e4ec1fb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/phantomjs2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/phantomjs2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg -, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase +, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase , darwin, writeScriptBin, cups, makeWrapper }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ bison flex fontconfig freetype gperf icu openssl - libjpeg libpng perl python ruby sqlite qtwebkit qtbase + libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase makeWrapper ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix index 1c09bb502a..9d2d9b3962 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, installShellFiles }: with python3.pkgs; @@ -27,6 +28,8 @@ in buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ installShellFiles ]; + postPatch = '' # pipenv invokes python in a subprocess to create a virtualenv # and to call setup.py. @@ -38,6 +41,13 @@ in buildPythonApplication rec { propagatedBuildInputs = runtimeDeps python3.pkgs; + postInstall = '' + installShellCompletion --cmd pipenv \ + --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \ + --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \ + --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv) + ''; + doCheck = true; checkPhase = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index b828dbfc71..31eafb1086 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,5 +1,5 @@ { lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake, python2, python2Packages +, cpio, elfutils, kernel, gnumake, python3 }: let @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; + nativeBuildInputs = [ pkg-config cpio ]; + buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; enableParallelBuilding = true; }; @@ -33,7 +33,7 @@ let done ''; - pypkgs = with python2Packages; makePythonPath [ pyparsing ]; + pypkgs = with python3.pkgs; makePythonPath [ pyparsing ]; in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; diff --git a/third_party/nixpkgs/pkgs/development/tools/pur/default.nix b/third_party/nixpkgs/pkgs/development/tools/pur/default.nix index dc37e3fa20..359f3519ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pur/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pur/default.nix @@ -7,7 +7,8 @@ let py = python3.override { packageOverrides = self: super: { # newest version doesn't support click >8.0 https://github.com/alanhamlett/pip-update-requirements/issues/38 - click = self.callPackage ../../../development/python-modules/click/7.nix { }; + # Use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; }; }; inherit (py.pkgs) buildPythonApplication click pytestCheckHook; diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/default.nix b/third_party/nixpkgs/pkgs/development/tools/ronn/default.nix index 3569638b21..4d06db77a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ronn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ronn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }: +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff, callPackage }: stdenv.mkDerivation rec { pname = "ronn"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "ronn"; + passthru.tests.reproducible-html-manpage = callPackage ./test-reproducible-html.nix { }; + meta = with lib; { description = "markdown-based tool for building manpages"; homepage = "https://rtomayko.github.io/ronn/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/test-reproducible-html.nix b/third_party/nixpkgs/pkgs/development/tools/ronn/test-reproducible-html.nix new file mode 100644 index 0000000000..6bc9d6cdbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ronn/test-reproducible-html.nix @@ -0,0 +1,30 @@ +{ runCommand +, diffutils +, ronn +}: +runCommand "ronn-test-reproducible-html" { } '' + set -euo pipefail + + cat > aprog.1.ronn << EOF + aprog + ===== + + ## AUTHORS + + Vincent Haupert + EOF + + # We have to repeat the manpage generation a few times to be confident + # it is in fact reproducible. + for i in {1..20}; do + ${ronn}/bin/ronn --html --pipe aprog.1.ronn > aprog.1.html-1 + ${ronn}/bin/ronn --html --pipe aprog.1.ronn > aprog.1.html-2 + + ${diffutils}/bin/diff -q aprog.1.html-1 aprog.1.html-2 \ + || (printf 'The HTML manpage is not reproducible (round %d)' "$i" && exit 1) + done + + echo 'The HTML manpage appears reproducible' + + mkdir $out +'' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 695a071491..adc8a81a7e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.10"; + version = "1.0.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-9Zov1XTU02TjQ707Z/Muv70AGtQL03V1G3suabY3D48="; + sha256 = "sha256-uusPj4lt1tjS2WaFMjSr8MN3NxHXod4t7EoNRIDsjvA="; }; - cargoSha256 = "sha256-toWzjfHU5ce/50kCbuxj6sIG2R3i8q9HBcIzlwW0C9A="; + cargoSha256 = "sha256-iIrnlDKni0kUjp0Qonq98H+UhqV45jnVSOx8BJKyBpg="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index a86e531e7f..b3a12c5e10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/kolloch/crate2nix"; license = licenses.asl20; - maintainers = with maintainers; [ kolloch andir cole-h ]; + maintainers = with maintainers; [ kolloch cole-h ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index acf86ee50a..20501594c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.19.0"; + version = "0.21.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-LNJd88Gw8HaE1qnRbD7mipVEFgG7jCsyUu9pbwY/4JY="; + sha256 = "0mxzbbxrg1jysxpjqcvgwwmh8qf0lyf64fl1gxxp0whph0x279qj"; }; - cargoSha256 = "sha256-Qg/wA3R98FAb8UZ5s7GOEgOeifrqwFJ4lg0BC2SZOE8="; + cargoSha256 = "0kvya6swx1nsxxlhn2w8x4dhl4j3v56jxqr2h259cx6lzv3xjhin"; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 3b3e5be296..c1b47d9019 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.3.0"; + version = "3.3.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "PlLQVNn2HomcR9grqGFgaXYWxg9EU7ihd28wXruZiBs="; + outputHash = "hEfy8hNuWin7mKXs9yD9bEKHCVNuxrz5qasTeLOi1zY="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index d27506e2c4..ee75f2e081 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.5.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-dSj3wNbQghiGfqe7dNDbWnbXYLSiG+0mYv2yFmGsAc8="; + sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/udis86/default.nix b/third_party/nixpkgs/pkgs/development/tools/udis86/default.nix index 1885d1a432..dd4ad058c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/udis86/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/udis86/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }: stdenv.mkDerivation rec { pname = "udis86"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; }; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python2 ]; configureFlags = [ "--enable-shared" diff --git a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix index 352dc83f9a..58fef12cd6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, fetchurl, python2Packages, makeDesktopItem }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "winpdb"; version = "1.4.8"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; }; - propagatedBuildInputs = [ pythonPackages.wxPython ]; + propagatedBuildInputs = [ python2Packages.wxPython ]; desktopItem = makeDesktopItem { name = "winpdb"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index dd49657859..a6c2b6db97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.6"; + version = "1.19.7"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eFrILGq6rlm/u8RAxGHRaFgOT88I8T4inAKCoJpqPYA="; + sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg="; }; - cargoSha256 = "sha256-8JgtaSROcS9DwcnK7Yky8Ol8AJPI7guU08iaz9yPC8g="; + cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 32507f0d5a..a0c724c1d3 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg="; + sha256 = "sha256-S4Dt6SrSE/TLGhjAkTrIdvNR71A6ykxSxq72aiyWUX8="; }; - cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8="; + cargoSha256 = "1ph392jxkln2ihq3x4hhjb1k3fsd2g54m37qgqkza4abvmc7adns"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v17.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v17.nix index 2242a923f0..5da7cb5497 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v17.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v17.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "17.3.1"; - sha256 = "070xy8rk5z6jmxiay95sjw0jld6pp2ymig7ryypday5aaiw8y26g"; + version = "17.4.0"; + sha256 = "1ch1hc5qc13qbk7gmpw729wb7s9kmda6sjlhzdw53iq6fzq7336g"; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. diff --git a/third_party/nixpkgs/pkgs/games/amoeba/default.nix b/third_party/nixpkgs/pkgs/games/amoeba/default.nix index 61f5a5bf82..0e21a9a1b9 100644 --- a/third_party/nixpkgs/pkgs/games/amoeba/default.nix +++ b/third_party/nixpkgs/pkgs/games/amoeba/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { - name = "amoeba-${version}-${debver}"; + pname = "amoeba"; version = "1.1"; debver = "29.1"; diff --git a/third_party/nixpkgs/pkgs/games/among-sus/default.nix b/third_party/nixpkgs/pkgs/games/among-sus/default.nix index 454c7d181f..be9ecc7adf 100644 --- a/third_party/nixpkgs/pkgs/games/among-sus/default.nix +++ b/third_party/nixpkgs/pkgs/games/among-sus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "among-sus-unstable"; - version = "2020-10-29"; + version = "2021-05-19"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "among-sus"; - rev = "1f4c8d800d025d36ac66826937161be3252fbc57"; - sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh"; + rev = "554e60bf52e3fa931661b9414189a92bb8f69d78"; + sha256 = "0j1158nczhvy5i1ykvzvhlv4ndhibgng0dq1lw2bmi8q6k1q1s0w"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/blackshades/default.nix b/third_party/nixpkgs/pkgs/games/blackshades/default.nix index bd29c7b616..76f22e98d9 100644 --- a/third_party/nixpkgs/pkgs/games/blackshades/default.nix +++ b/third_party/nixpkgs/pkgs/games/blackshades/default.nix @@ -1,29 +1,27 @@ { lib, stdenv, fetchFromSourcehut -, SDL, stb, libGLU, libGL, openal, libvorbis, freealut }: +, zig, glfw, libGLU, libGL, openal, libsndfile }: stdenv.mkDerivation rec { pname = "blackshades"; - version = "1.3.1"; + version = "2.4.7"; src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; - sha256 = "0yzp74ynkcp6hh5m4zmvrgx5gwm186hq7p3m7qkww54qdyijb3rv"; + fetchSubmodules = true; + sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8="; }; - buildInputs = [ SDL stb libGLU libGL openal libvorbis freealut ]; + nativeBuildInputs = [ zig ]; + buildInputs = [ glfw libGLU libGL openal libsndfile ]; - postPatch = '' - sed -i -e s,Data/,$out/share/$pname/,g \ - -e s,Data:,$out/share/$pname/,g \ - src/*.cpp + preBuild = '' + export HOME=$TMPDIR ''; installPhase = '' - mkdir -p $out/bin $out/share - cp build/blackshades $out/bin - cp -R Data $out/share/$pname + zig build -Drelease-fast -Dcpu=baseline --prefix $out install ''; meta = { diff --git a/third_party/nixpkgs/pkgs/games/blightmud/default.nix b/third_party/nixpkgs/pkgs/games/blightmud/default.nix new file mode 100644 index 0000000000..2e177f169f --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/blightmud/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, alsa-lib, openssl +, withTTS ? false, llvmPackages, speechd }: + +rustPlatform.buildRustPackage rec { + pname = "blightmud"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-DaICzwBew90YstV42wiY0IbvR1W4Hm8dzo3xY2qlMGQ="; + }; + + cargoSha256 = "sha256-BamMTPh+GN9GG4puxyTauPhjCC8heCu1wsgFaw98s9U="; + + buildFeatures = lib.optional withTTS "tts"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsa-lib openssl ] ++ lib.optional withTTS [ speechd ]; + + # Building the speech-dispatcher-sys crate for TTS support requires setting + # LIBCLANG_PATH. + LIBCLANG_PATH = lib.optionalString withTTS "${llvmPackages.libclang.lib}/lib"; + + preBuild = lib.optionalString withTTS '' + # When building w/ TTS the speech-dispatcher-sys crate's build.rs uses + # rust-bindgen with libspeechd. This bypasses the normal nixpkgs CC wrapper + # so we have to adapt the BINDGEN_EXTRA_CLANG_ARGS env var to compensate. See + # this blog post[0] for more information. + # + # [0]: https://hoverbear.org/blog/rust-bindgen-in-nix/ + + export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + -isystem ${llvmPackages.libclang.lib}/lib/clang/${ + lib.getVersion llvmPackages.clang + }/include \ + -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${ + lib.getVersion stdenv.cc.cc + }/include \ + -idirafter ${speechd}/include" + ''; + + checkFlags = let + # Most of Blightmud's unit tests pass without trouble in the isolated + # Nixpkgs build env. The following tests need to be skipped. + skipList = [ + "test_connect" + "test_gmcp_negotiation" + "test_ttype_negotiation" + "test_reconnect" + "test_mud" + "test_server" + "test_lua_script" + "timer_test" + "validate_assertion_fail" + ]; + skipFlag = test: "--skip " + test; + in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = with lib; { + description = "A terminal MUD client written in Rust"; + longDescription = '' + Blightmud is a terminal client for connecting to Multi User Dungeon (MUD) + games. It is written in Rust and supports TLS, GMCP, MSDP, MCCP2, tab + completion, text searching and a split view for scrolling. Blightmud can + be customized with Lua scripting for aliases, triggers, timers, customized + status bars, and more. Blightmud supports several accessibility features + including an optional built-in text-to-speech engine and a screen reader + friendly mode. + ''; + homepage = "https://github.com/Blightmud/Blightmud"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cpu ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/crawl/default.nix b/third_party/nixpkgs/pkgs/games/crawl/default.nix index 02e34e5f74..e5eea7ece6 100644 --- a/third_party/nixpkgs/pkgs/games/crawl/default.nix +++ b/third_party/nixpkgs/pkgs/games/crawl/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; + pname = "crawl${lib.optionalString tileMode "-tiles"}"; version = "0.27.1"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 93f51df181..316d1308eb 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -9,7 +9,8 @@ let in stdenv.mkDerivation { - name = "dwarf-therapist-${dwarf-therapist.version}"; + pname = "dwarf-therapist"; + version = dwarf-therapist.version; wrapper = substituteAll { src = ./dwarf-therapist.in; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix index 5b25cf4ff4..27b54667f0 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix @@ -72,7 +72,8 @@ let in stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-${release.unfuckRelease}"; + pname = "dwarf_fortress_unfuck"; + version = release.unfuckRelease; src = fetchFromGitHub { owner = "svenstaro"; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix index ce989b98ff..3d1c3ead06 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -92,7 +92,8 @@ let in stdenv.mkDerivation { - name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; + pname = "dwarf-fortress"; + version = dwarf-fortress.dfVersion; dfInit = substituteAll { name = "dwarf-fortress-init"; diff --git a/third_party/nixpkgs/pkgs/games/gnubg/default.nix b/third_party/nixpkgs/pkgs/games/gnubg/default.nix index 7402049a9d..6f50869e6c 100644 --- a/third_party/nixpkgs/pkgs/games/gnubg/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnubg/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }: -let version = "1.06.002"; in -stdenv.mkDerivation { - name = "gnubg-"+version; +stdenv.mkDerivation rec { + pname = "gnubg"; + version = "1.06.002"; src = fetchurl { url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix index 931de10c18..4ddb58c814 100644 --- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix @@ -11,17 +11,19 @@ , xdg-user-dirs , wine , winetricks +, pciutils +, glxinfo }: python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.64.16"; + version = "4.10.2"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; - rev = "a5bc65e094bbfb86e6142ac1da59017ddccff69e"; - sha256 = "sha256-3+5LWn+UBgLAX683MPHRHQMpW+gC5hGIwTtRVJHRWeE="; + rev = "9a7cf806d35b4d53b3d3762339eba7d861b5043d"; + sha256 = "sha256-cKZv9qPCnl7i4kb6PG8RYx3HNLcwgI4d2zkw899MA6E="; }; nativeBuildInputs = [ @@ -43,13 +45,14 @@ python3Packages.buildPythonApplication rec { packaging psutil setuptools + unidecode ]; dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" - "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks ]}" + "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks pciutils glxinfo ]}" ]; postPatch = '' @@ -84,7 +87,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://gitlab.com/brinkervii/grapejuice"; - description = "Simple Wine+Roblox management tool"; + description = "A wine+Roblox management application"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; diff --git a/third_party/nixpkgs/pkgs/games/hawkthorne/default.nix b/third_party/nixpkgs/pkgs/games/hawkthorne/default.nix deleted file mode 100644 index 3da78349db..0000000000 --- a/third_party/nixpkgs/pkgs/games/hawkthorne/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchgit, lib, stdenv, love, curl, zip }: - -stdenv.mkDerivation { - version = "0.12.1"; - pname = "hawkthorne"; - - src = fetchgit { - url = "https://github.com/hawkthorne/hawkthorne-journey.git"; - rev = "610b9b3907b2a1b21da2ae926e4c7c4c9e19959b"; - sha256 = "013smhdf9sh91153fpk2bwhhnpg6pn7kfrpw77jmf0v48i3q44h2"; - }; - - buildInputs = [ - love curl zip - ]; - - patches = [ - ./makefile.patch - ]; - - enableParallelBuilding = true; - - meta = { - description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community"; - longDescription = '' - Journey to the Center of Hawkthorne is an open source game written in Love2D. - It's based on the show Community, starring Jim Rash and Joel McHale as - the primary will-they-or-won't-they relationship. - - This game has been entirely developed by fans of the show, who were inspired - to bring to life the video game used to determine the winner of Pierce - Hawthorne's inheritance. - ''; - homepage = "https://www.reddit.com/r/hawkthorne"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ campadrenalin ]; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/hawkthorne/makefile.patch b/third_party/nixpkgs/pkgs/games/hawkthorne/makefile.patch deleted file mode 100644 index 16a7968314..0000000000 --- a/third_party/nixpkgs/pkgs/games/hawkthorne/makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Makefile b/Makefile -index 55eb817..f3406aa 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,10 +18,14 @@ endif - - tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx)) - --maps: $(tilemaps) -- - love: build/hawkthorne.love - -+shebang: build/hawkthorne.love -+ cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne -+ chmod +x build/hawkthorne -+ -+maps: $(tilemaps) -+ - build/hawkthorne.love: $(tilemaps) src/* - mkdir -p build - cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \ -@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/* - run: $(tilemaps) $(LOVE) - $(LOVE) src - -+check: test -+ -+install: shebang -+ mkdir -p $(out)/bin -+ cp build/hawkthorne $(out)/bin -+ - src/maps/%.lua: src/maps/%.tmx bin/tmx2lua - bin/tmx2lua $< diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index a877eed621..bcbe2a6c65 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let pname = "heroic"; diff --git a/third_party/nixpkgs/pkgs/games/hhexen/default.nix b/third_party/nixpkgs/pkgs/games/hhexen/default.nix index 0306c54ef4..19a0b783ef 100644 --- a/third_party/nixpkgs/pkgs/games/hhexen/default.nix +++ b/third_party/nixpkgs/pkgs/games/hhexen/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, SDL, stdenv }: stdenv.mkDerivation rec { - name = "hhexen"; + pname = "hhexen"; version = "1.6.3"; src = fetchurl { url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; diff --git a/third_party/nixpkgs/pkgs/games/instead/default.nix b/third_party/nixpkgs/pkgs/games/instead/default.nix index 5c35219c19..cafdd2b84f 100644 --- a/third_party/nixpkgs/pkgs/games/instead/default.nix +++ b/third_party/nixpkgs/pkgs/games/instead/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkg-config, lua, zlib, unzip }: let - version = "3.3.2"; - # I took several games at random from https://instead.syscall.ru/games/ games = [ (fetchurl { @@ -28,8 +26,9 @@ let ]; in -stdenv.mkDerivation { - name = "instead-" + version; +stdenv.mkDerivation rec { + pname = "instead"; + version = "3.3.2"; src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix index cbdfbc2289..fe3761f12d 100644 --- a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.18"; + version = "0.20.24"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "0d31c8grvcw7y3sh2x90cxhj612k6f491w2r12j1q33d2v9sqm4j"; + sha256 = "sha256-4VN/2FoAXTaumPsplV9wgdUSQsFitC1hqWveAW/yt58="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/update.sh b/third_party/nixpkgs/pkgs/games/minecraft-server/update.sh deleted file mode 100755 index 433a12a9ca..0000000000 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -BASEDIR="$(dirname "$0")" - -# get current release version -versions=$(curl -s 'https://launchermeta.mojang.com/mc/game/version_manifest.json') -version=$(echo $versions | jq .latest.release) -url=$(echo $versions | jq -r ".versions[] | select(.id == $version) | .url") - -# get current server.jar -versions=$(curl -s $url | jq .downloads.server) -sha1=$(echo $versions | jq .sha1) -url=$(echo $versions | jq .url) - -echo $version: $url:$sha1 - -# change default.nix -sed -i "s/version = \"[0-9.]*\";/version = ${version};/g" "$BASEDIR/default.nix" -sed -i "s+url = \"[a-zA-Z0-9/:.]*/server.jar\";+url = $url;+g" "$BASEDIR/default.nix" -sed -i "s/sha1 = \"[a-zA-Z0-9]*\";/sha1 = ${sha1};/g" "$BASEDIR/default.nix" diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix new file mode 100644 index 0000000000..f3d4aad166 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix @@ -0,0 +1,24 @@ +{ callPackage, lib, javaPackages }: +let + versions = lib.importJSON ./versions.json; + + latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); + escapeVersion = builtins.replaceStrings [ "." ] [ "-" ]; + + getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless; + + packages = lib.mapAttrs' + (version: value: { + name = "vanilla-${escapeVersion version}"; + value = callPackage ./derivation.nix { + inherit (value) version url sha1; + jre_headless = getJavaVersion (if value.javaVersion == null then 8 else value.javaVersion); # versions <= 1.6 will default to 8 + }; + }) + versions; +in +lib.recurseIntoAttrs ( + packages // { + vanilla = builtins.getAttr "vanilla-${escapeVersion latestVersion}" packages; + } +) diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix similarity index 67% rename from third_party/nixpkgs/pkgs/games/minecraft-server/default.nix rename to third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix index 02054f1ad8..eda7da943c 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/derivation.nix @@ -1,13 +1,9 @@ -{ lib, stdenv, fetchurl, nixosTests, jre_headless }: +{ lib, stdenv, fetchurl, nixosTests, jre_headless, version, url, sha1 }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.18.1"; + inherit version; - src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar"; - # sha1 because that comes from mojang via api - sha1 = "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9"; - }; + src = fetchurl { inherit url sha1; }; preferLocalBuild = true; @@ -27,7 +23,7 @@ stdenv.mkDerivation { passthru = { tests = { inherit (nixosTests) minecraft-server; }; - updateScript = ./update.sh; + updateScript = ./update.py; }; meta = with lib; { @@ -35,6 +31,6 @@ stdenv.mkDerivation { homepage = "https://minecraft.net"; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice tomberek costrouc ]; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc jyooru ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py b/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py new file mode 100755 index 0000000000..4fe84ee21a --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py @@ -0,0 +1,155 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3Packages.requests python3Packages.dataclasses-json + +import json +from dataclasses import dataclass, field +from datetime import datetime +from typing import Any, Dict, List, Optional + +import requests +from dataclasses_json import DataClassJsonMixin, LetterCase, config +from marshmallow import fields + + +@dataclass +class Download(DataClassJsonMixin): + sha1: str + size: int + url: str + + +@dataclass +class Version(DataClassJsonMixin): + id: str + type: str + url: str + time: datetime = field( + metadata=config( + encoder=datetime.isoformat, + decoder=datetime.fromisoformat, + mm_field=fields.DateTime(format="iso"), + ) + ) + release_time: datetime = field( + metadata=config( + encoder=datetime.isoformat, + decoder=datetime.fromisoformat, + mm_field=fields.DateTime(format="iso"), + letter_case=LetterCase.CAMEL, + ) + ) + + def get_manifest(self) -> Any: + """Return the version's manifest.""" + response = requests.get(self.url) + response.raise_for_status() + return response.json() + + def get_downloads(self) -> Dict[str, Download]: + """ + Return all downloadable files from the version's manifest, in Download + objects. + """ + return { + download_name: Download.from_dict(download_info) + for download_name, download_info in self.get_manifest()["downloads"].items() + } + + def get_java_version(self) -> Any: + """ + Return the java version specified in a version's manifest, if it is + present. Versions <= 1.6 do not specify this. + """ + return self.get_manifest().get("javaVersion", {}).get("majorVersion", None) + + def get_server(self) -> Optional[Download]: + """ + If the version has a server download available, return the Download + object for the server download. If the version does not have a server + download avilable, return None. + """ + downloads = self.get_downloads() + if "server" in downloads: + return downloads["server"] + return None + + +def get_versions() -> List[Version]: + """Return a list of Version objects for all available versions.""" + response = requests.get( + "https://launchermeta.mojang.com/mc/game/version_manifest.json" + ) + response.raise_for_status() + data = response.json() + return [Version.from_dict(version) for version in data["versions"]] + + +def get_major_release(version_id: str) -> str: + """ + Return the major release for a version. The major release for 1.17 and + 1.17.1 is 1.17. + """ + if not len(version_id.split(".")) >= 2: + raise ValueError(f"version not in expected format: '{version_id}'") + return ".".join(version_id.split(".")[:2]) + + +def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]: + """ + Return a dictionary containing each version grouped by each major release. + The key "1.17" contains a list with two Version objects, one for "1.17" + and another for "1.17.1". + """ + groups: Dict[str, List[Version]] = {} + for release in releases: + major_release = get_major_release(release.id) + if major_release not in groups: + groups[major_release] = [] + groups[major_release].append(release) + return groups + + +def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]: + """ + Return a dictionary containing the latest version for each major release. + The latest major release for 1.16 is 1.16.5, so the key "1.16" contains a + Version object for 1.16.5. + """ + return { + major_release: sorted(releases, key=lambda x: x.id, reverse=True)[0] + for major_release, releases in group_major_releases(releases).items() + } + + +def generate() -> Dict[str, Dict[str, str]]: + """ + Return a dictionary containing the latest url, sha1 and version for each major + release. + """ + versions = get_versions() + releases = list( + filter(lambda version: version.type == "release", versions) + ) # remove snapshots and betas + latest_major_releases = get_latest_major_releases(releases) + + servers = { + version: Download.schema().dump(download_info) # Download -> dict + for version, download_info in { + version: value.get_server() + for version, value in latest_major_releases.items() + }.items() + if download_info is not None # versions < 1.2 do not have a server + } + for server in servers.values(): + del server["size"] # don't need it + + for version, server in servers.items(): + server["version"] = latest_major_releases[version].id + server["javaVersion"] = latest_major_releases[version].get_java_version() + return servers + + +if __name__ == "__main__": + with open("versions.json", "w") as file: + json.dump(generate(), file, indent=2) + file.write("\n") diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json new file mode 100644 index 0000000000..ba0b652a6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json @@ -0,0 +1,104 @@ +{ + "1.18": { + "url": "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar", + "sha1": "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9", + "version": "1.18.1", + "javaVersion": 17 + }, + "1.17": { + "url": "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar", + "sha1": "a16d67e5807f57fc4e550299cf20226194497dc2", + "version": "1.17.1", + "javaVersion": 16 + }, + "1.16": { + "url": "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar", + "sha1": "1b557e7b033b583cd9f66746b7a9ab1ec1673ced", + "version": "1.16.5", + "javaVersion": 8 + }, + "1.15": { + "url": "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar", + "sha1": "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07", + "version": "1.15.2", + "javaVersion": 8 + }, + "1.14": { + "url": "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar", + "sha1": "3dc3d84a581f14691199cf6831b71ed1296a9fdf", + "version": "1.14.4", + "javaVersion": 8 + }, + "1.13": { + "url": "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar", + "sha1": "3737db93722a9e39eeada7c27e7aca28b144ffa7", + "version": "1.13.2", + "javaVersion": 8 + }, + "1.12": { + "url": "https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar", + "sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f", + "version": "1.12.2", + "javaVersion": 8 + }, + "1.11": { + "url": "https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar", + "sha1": "f00c294a1576e03fddcac777c3cf4c7d404c4ba4", + "version": "1.11.2", + "javaVersion": 8 + }, + "1.10": { + "url": "https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar", + "sha1": "3d501b23df53c548254f5e3f66492d178a48db63", + "version": "1.10.2", + "javaVersion": 8 + }, + "1.9": { + "url": "https://launcher.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar", + "sha1": "edbb7b1758af33d365bf835eb9d13de005b1e274", + "version": "1.9.4", + "javaVersion": 8 + }, + "1.8": { + "url": "https://launcher.mojang.com/v1/objects/b58b2ceb36e01bcd8dbf49c8fb66c55a9f0676cd/server.jar", + "sha1": "b58b2ceb36e01bcd8dbf49c8fb66c55a9f0676cd", + "version": "1.8.9", + "javaVersion": 8 + }, + "1.7": { + "url": "https://launcher.mojang.com/v1/objects/4cec86a928ec171fdc0c6b40de2de102f21601b5/server.jar", + "sha1": "4cec86a928ec171fdc0c6b40de2de102f21601b5", + "version": "1.7.9", + "javaVersion": 8 + }, + "1.6": { + "url": "https://launcher.mojang.com/v1/objects/050f93c1f3fe9e2052398f7bd6aca10c63d64a87/server.jar", + "sha1": "050f93c1f3fe9e2052398f7bd6aca10c63d64a87", + "version": "1.6.4", + "javaVersion": null + }, + "1.5": { + "url": "https://launcher.mojang.com/v1/objects/f9ae3f651319151ce99a0bfad6b34fa16eb6775f/server.jar", + "sha1": "f9ae3f651319151ce99a0bfad6b34fa16eb6775f", + "version": "1.5.2", + "javaVersion": null + }, + "1.4": { + "url": "https://launcher.mojang.com/v1/objects/2f0ec8efddd2f2c674c77be9ddb370b727dec676/server.jar", + "sha1": "2f0ec8efddd2f2c674c77be9ddb370b727dec676", + "version": "1.4.7", + "javaVersion": null + }, + "1.3": { + "url": "https://launcher.mojang.com/v1/objects/3de2ae6c488135596e073a9589842800c9f53bfe/server.jar", + "sha1": "3de2ae6c488135596e073a9589842800c9f53bfe", + "version": "1.3.2", + "javaVersion": null + }, + "1.2": { + "url": "https://launcher.mojang.com/v1/objects/d8321edc9470e56b8ad5c67bbd16beba25843336/server.jar", + "sha1": "d8321edc9470e56b8ad5c67bbd16beba25843336", + "version": "1.2.5", + "javaVersion": null + } +} diff --git a/third_party/nixpkgs/pkgs/games/moon-buggy/default.nix b/third_party/nixpkgs/pkgs/games/moon-buggy/default.nix index b623d7bd53..12eb6b24a8 100644 --- a/third_party/nixpkgs/pkgs/games/moon-buggy/default.nix +++ b/third_party/nixpkgs/pkgs/games/moon-buggy/default.nix @@ -1,16 +1,15 @@ {lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - baseName = "moon-buggy"; + pname = "moon-buggy"; version = "1.0.51"; - name = "${baseName}-${version}"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://m.seehuhn.de/programs/${name}.tar.gz"; + url = "http://m.seehuhn.de/programs/moon-buggy-${version}.tar.gz"; sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m"; }; diff --git a/third_party/nixpkgs/pkgs/games/multimc/default.nix b/third_party/nixpkgs/pkgs/games/multimc/default.nix deleted file mode 100644 index 732a66ef8b..0000000000 --- a/third_party/nixpkgs/pkgs/games/multimc/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: - -let - libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; -in mkDerivation rec { - pname = "multimc"; - version = "unstable-2021-09-08"; - src = fetchFromGitHub { - owner = "MultiMC"; - repo = "MultiMC5"; - rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b"; - sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8="; - fetchSubmodules = true; - }; - nativeBuildInputs = [ cmake file makeWrapper ]; - buildInputs = [ qtbase jdk8 zlib ]; - - patches = [ ./0001-pick-latest-java-first.patch ]; - - postPatch = '' - # hardcode jdk paths - substituteInPlace launcher/java/JavaUtils.cpp \ - --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ - --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' - - # add client ID - substituteInPlace notsecrets/Secrets.cpp \ - --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' - ''; - - cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; - - postInstall = '' - install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg - install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop - - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/multimc \ - --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} - ''; - - meta = with lib; { - homepage = "https://multimc.org/"; - description = "A free, open source launcher for Minecraft"; - longDescription = '' - Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. - ''; - platforms = platforms.linux; - license = licenses.asl20; - # upstream don't want us to re-distribute this application: - # https://github.com/NixOS/nixpkgs/issues/131983 - hydraPlatforms = []; - maintainers = with maintainers; [ cleverca22 starcraft66 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/n2048/default.nix b/third_party/nixpkgs/pkgs/games/n2048/default.nix index b3d06a51fd..ec3a4e2bbe 100644 --- a/third_party/nixpkgs/pkgs/games/n2048/default.nix +++ b/third_party/nixpkgs/pkgs/games/n2048/default.nix @@ -1,35 +1,26 @@ -{lib, stdenv, fetchurl, ncurses}: -let - s = - rec { - baseName = "n2048"; - version = "0.1"; - name = "${baseName}-${version}"; - url = "http://www.dettus.net/n2048/${baseName}_v${version}.tar.gz"; +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "n2048"; + version = "0.1"; + src = fetchurl { + url = "http://www.dettus.net/n2048/n2048_v${version}.tar.gz"; sha256 = "184z2rr0rnj4p740qb4mzqr6kgd76ynb5gw9bj8hrfshcxdcg1kk"; }; buildInputs = [ ncurses ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; makeFlags = [ "DESTDIR=$(out)" ]; preInstall = '' mkdir -p "$out"/{share/man,bin} ''; - meta = { - inherit (s) version; + meta = with lib; { description = "Console implementation of 2048 game"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "http://www.dettus.net/n2048/"; }; } diff --git a/third_party/nixpkgs/pkgs/games/nethack/default.nix b/third_party/nixpkgs/pkgs/games/nethack/default.nix index f9939f063c..2b29bddad9 100644 --- a/third_party/nixpkgs/pkgs/games/nethack/default.nix +++ b/third_party/nixpkgs/pkgs/games/nethack/default.nix @@ -20,9 +20,9 @@ let in stdenv.mkDerivation rec { version = "3.6.6"; - name = if x11Mode then "nethack-x11-${version}" - else if qtMode then "nethack-qt-${version}" - else "nethack-${version}"; + pname = if x11Mode then "nethack-x11" + else if qtMode then "nethack-qt" + else "nethack"; src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; diff --git a/third_party/nixpkgs/pkgs/games/nottetris2/default.nix b/third_party/nixpkgs/pkgs/games/nottetris2/default.nix deleted file mode 100644 index 179673c05b..0000000000 --- a/third_party/nixpkgs/pkgs/games/nottetris2/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }: - -let - pname = "nottetris2"; - version = "2.0"; - - desktopItem = makeDesktopItem { - name = "nottetris2"; - exec = pname; - comment = "It's like tetris, but it's not"; - desktopName = "nottetris2"; - genericName = "nottetris2"; - categories = "Game"; - }; - -in - -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "Stabyourself"; - repo = pname; - rev = "v${version}"; - sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs"; - }; - - nativeBuildInputs = [ zip makeWrapper ]; - buildInputs = [ love_0_7 ]; - - installPhase = - '' - mkdir -p $out/bin $out/share/games/lovegames $out/share/applications - zip -9 -r ${pname}.love ./* - mv ${pname}.love $out/share/games/lovegames/${pname}.love - makeWrapper ${love_0_7}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - chmod +x $out/bin/${pname} - ''; - - meta = with lib; { - description = "It's like Tetris, but it's not"; - platforms = platforms.linux; - license = licenses.wtfpl; - maintainers = with maintainers; [ yorickvp ]; - downloadPage = "https://stabyourself.net/nottetris2/"; - }; - -} diff --git a/third_party/nixpkgs/pkgs/games/openra/common.nix b/third_party/nixpkgs/pkgs/games/openra/common.nix index 41c903e101..01bd44ee24 100644 --- a/third_party/nixpkgs/pkgs/games/openra/common.nix +++ b/third_party/nixpkgs/pkgs/games/openra/common.nix @@ -2,7 +2,7 @@ and out-of-tree mod packages (mod.nix). */ { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper -, lua, mono, dotnetPackages, python +, lua, mono, dotnetPackages, python2 , libGL, freetype, openal, SDL2 , zenity }: @@ -10,7 +10,7 @@ with lib; let - path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); + path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { } ./mkdirp.sh; @@ -66,7 +66,7 @@ in { makeWrapper mkdirp mono - python + python2 ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix b/third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix index c29af6d810..2debd15f81 100644 --- a/third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix +++ b/third_party/nixpkgs/pkgs/games/planetaryannihilation/default.nix @@ -1,26 +1,15 @@ { lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk -, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }: +, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }: -# TODO: use dynamic attributes once Nix 1.7 is out -assert ((config.planetary_annihilation or null).url or null) != null; -assert ((config.planetary_annihilation or null).sha256 or null) != null; +stdenv.mkDerivation rec { + pname = "planetary-annihalation"; + version = "62857"; -/* to setup: - $ cat ~/.config/nixpkgs/config.nix - { - planetary_annihilation = { - url = "file:///home/user/PA_Linux_62857.tar.bz2"; + src = requireFile { + message = "This file has to be downloaded manually via nix-prefetch-url."; + name = "PA_Linux_${version}.tar.bz2"; sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k"; }; -} -*/ - -stdenv.mkDerivation { - name = "planetary-annihalation"; - - src = fetchurl { - inherit (config.planetary_annihilation) url sha256; - }; nativeBuildInputs = [ patchelf makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch b/third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch similarity index 100% rename from third_party/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch rename to third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch diff --git a/third_party/nixpkgs/pkgs/games/polymc/default.nix b/third_party/nixpkgs/pkgs/games/polymc/default.nix new file mode 100644 index 0000000000..ddfc76b8b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/polymc/default.nix @@ -0,0 +1,92 @@ +{ lib +, mkDerivation +, makeDesktopItem +, fetchFromGitHub +, cmake +, jdk8 +, jdk +, zlib +, file +, makeWrapper +, xorg +, libpulseaudio +, qtbase +, libGL +, msaClientID ? "" +}: + +mkDerivation rec { + pname = "polymc"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "PolyMC"; + repo = "PolyMC"; + rev = version; + sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake file makeWrapper ]; + buildInputs = [ qtbase jdk8 zlib ]; + + patches = [ ./0001-pick-latest-java-first.patch ]; + + postPatch = '' + # hardcode jdk paths + substituteInPlace launcher/java/JavaUtils.cpp \ + --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ + --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + ''; + + cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ + lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + + desktopItems = [ + (makeDesktopItem { + name = "polymc"; + desktopName = "PolyMC"; + genericName = "Minecraft Launcher"; + comment = "Free, open source launcher and instance manager for Minecraft."; + icon = "launcher"; + exec = "polymc"; + categories = "Game"; + terminal = "false"; + }) + ]; + + dontWrapQtApps = true; + + postInstall = let + libpath = with xorg; lib.makeLibraryPath [ + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + libpulseaudio + libGL + ]; + in '' + install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg + + # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + wrapProgram $out/bin/polymc \ + "''${qtWrapperArgs[@]}" \ + --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + ''; + + meta = with lib; { + homepage = "https://polymc.org/"; + description = "A free, open source launcher for Minecraft"; + longDescription = '' + Allows you to have multiple, separate instances of Minecraft (each with + their own mods, texture packs, saves, etc) and helps you manage them and + their associated options with a simple interface. + ''; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cleverca22 starcraft66 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/rimshot/default.nix b/third_party/nixpkgs/pkgs/games/rimshot/default.nix deleted file mode 100644 index 997da768c6..0000000000 --- a/third_party/nixpkgs/pkgs/games/rimshot/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: - -stdenv.mkDerivation rec { - pname = "rimshot"; - version = "1.0"; - - src = fetchurl { - url = "https://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip"; - sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi"; - }; - - icon = fetchurl { - url = "http://stabyourself.net/images/screenshots/rimshot-2.png"; - sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd"; - }; - - desktopItem = makeDesktopItem { - name = "rimshot"; - exec = pname; - icon = icon; - comment = "Create your own music"; - desktopName = "Rimshot"; - genericName = "rimshot"; - categories = "Audio;AudioVideo;Music"; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ lua love ]; - - unpackPhase = '' - unzip -j $src - ''; - - installPhase = - '' - mkdir -p $out/bin - mkdir -p $out/share/games/lovegames - - cp -v ./*.love $out/share/games/lovegames/${pname}.love - makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - ''; - - meta = with lib; { - description = "Create your own music"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = licenses.free; - downloadPage = "http://stabyourself.net/rimshot/"; - }; - -} diff --git a/third_party/nixpkgs/pkgs/games/tennix/default.nix b/third_party/nixpkgs/pkgs/games/tennix/default.nix index f81ddb7edf..809ed7a146 100644 --- a/third_party/nixpkgs/pkgs/games/tennix/default.nix +++ b/third_party/nixpkgs/pkgs/games/tennix/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : +{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : stdenv.mkDerivation rec { pname = "tennix"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; - buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; patches = [ ./fix_FTBFS.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/tlauncher/default.nix b/third_party/nixpkgs/pkgs/games/tlauncher/default.nix deleted file mode 100644 index 48cfac1f58..0000000000 --- a/third_party/nixpkgs/pkgs/games/tlauncher/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, openjdk8 -, buildFHSUserEnv -, fetchzip -, fetchurl -, copyDesktopItems -, makeDesktopItem -}: -let - version = "2.839"; - src = stdenv.mkDerivation { - pname = "tlauncher"; - inherit version; - src = fetchzip { - name = "tlauncher.zip"; - url = "https://dl2.tlauncher.org/f.php?f=files%2FTLauncher-${version}.zip"; - sha256 = "sha256-KphpNuTucpuJhXspKxqDyYQN6vbpY0XCB3GAd5YCGbc="; - stripRoot = false; - }; - installPhase = '' - cp $src/*.jar $out - ''; - }; - fhs = buildFHSUserEnv { - name = "tlauncher"; - runScript = '' - ${openjdk8}/bin/java -jar "${src}" "$@" - ''; - targetPkgs = pkgs: with pkgs; [ - alsa-lib - cpio - cups - file - fontconfig - freetype - giflib - glib - gnome2.GConf - gnome2.gnome_vfs - gtk2 - libjpeg - libGL - openjdk8-bootstrap - perl - which - xorg.libICE - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.xrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXtst - xorg.libXxf86vm - zip - zlib - ]; - }; - desktopItem = makeDesktopItem { - name = "tlauncher"; - exec = "tlauncher"; - icon = fetchurl { - url = "https://styles.redditmedia.com/t5_2o8oax/styles/communityIcon_gu5r5v8eaiq51.png"; - sha256 = "sha256-ma8zxaUxdAw5VYfOK8i8s1kjwMgs80Eomq43Cb0HZWw="; - }; - comment = "Minecraft launcher"; - desktopName = "TLauncher"; - categories = "Game;"; - }; -in stdenv.mkDerivation { - pname = "tlauncher-wrapper"; - inherit version; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir $out/{bin,share/applications} -p - install ${fhs}/bin/tlauncher $out/bin - - runHook postInstall - ''; - - nativeBuildInputs = [ copyDesktopItems ]; - desktopItems = [ desktopItem ]; - - meta = with lib; { - description = "Minecraft launcher that already deal with forge, optifine and mods"; - homepage = "https://tlauncher.org/"; - maintainers = with maintainers; [ lucasew ]; - license = licenses.unfree; - platforms = openjdk8.meta.platforms; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/vapor/default.nix b/third_party/nixpkgs/pkgs/games/vapor/default.nix deleted file mode 100644 index 2fa7ca1892..0000000000 --- a/third_party/nixpkgs/pkgs/games/vapor/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: - -let - pname = "vapor"; - version = "0.2.3"; - commitid = "dbf509f"; - - icon = fetchurl { - url = "http://vapor.love2d.org/sites/default/files/vapT240x90.png"; - sha256 = "1xlra74lpm1y54z6zm6is0gldkswp3wdw09m6a306ch0xjf3f87f"; - }; - - desktopItem = makeDesktopItem { - name = "Vapor"; - exec = pname; - icon = icon; - comment = "LÖVE Distribution Client"; - desktopName = "Vapor"; - genericName = "vapor"; - categories = "Game;"; - }; - -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = - "https://github.com/josefnpat/${pname}/releases/download/${version}/${pname}_${commitid}.love"; - sha256 = "0w2qkrrkzfy4h4jld18apypmbi8a8r89y2l11axlv808i2rg68fk"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lua love ]; - - dontUnpack = true; - - installPhase = - '' - mkdir -p $out/bin - mkdir -p $out/share - - cp -v $src $out/share/${pname}.love - - makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - ''; - - meta = with lib; { - description = "LÖVE Distribution Client allowing access to many games"; - platforms = platforms.linux; - license = licenses.zlib; - maintainers = with maintainers; [ leenaars ]; - downloadPage = "http://vapor.love2d.org/"; - }; - -} diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index 1a08fbb4dd..fc32607ada 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.5.8"; + version = "3.6.1"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-IJ3p7+0fs/2dCbE1BOb2580upR9W/1R2/e3xmkAsJ+M="; + sha256 = "sha256-elcSwm7KvDpGVBF7Gs6GFreQPyVwWBxYN0NO1N6JWDM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/xconq/default.nix b/third_party/nixpkgs/pkgs/games/xconq/default.nix index 8f4366fbcb..10a959a676 100644 --- a/third_party/nixpkgs/pkgs/games/xconq/default.nix +++ b/third_party/nixpkgs/pkgs/games/xconq/default.nix @@ -2,12 +2,11 @@ , libXext, fontconfig, makeWrapper }: stdenv.mkDerivation rec { - name = "${baseName}-${version}"; - baseName = "xconq"; + pname = "xconq"; version = "7.5.0-0pre.0.20050612"; src = fetchurl { - url = "mirror://sourceforge/project/${baseName}/${baseName}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/xconq/xconq/xconq-${version}/xconq-${version}.tar.gz"; sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca"; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fceux/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fceux/default.nix index 73426401ec..3552a4a8d0 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/fceux/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { - owner = "TASVideos"; + owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-k9GkG+HLscSv9Ar58gdj4+WvXRchGqeDcvgiKyxEMHs="; + sha256 = "sha256-LlGM6sOjcpyHApUvSr5etKIqwDoheuiW53DSHs19W6Q="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retrofe/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/retrofe/default.nix index 558b5ca633..dc1a23f33b 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retrofe/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell +, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config python ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ]; buildInputs = [ glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 86716ed5d5..49a1c190b5 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,7 +1,7 @@ { lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems , libX11, libgdiplus, ffmpeg , SDL2_mixer, openal, libsoundio, sndio, pulseaudio -, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook +, gtk3, gdk-pixbuf, wrapGAppsHook }: buildDotnetModule rec { @@ -27,7 +27,10 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems wrapGAppsHook - gobject-introspection + ]; + + buildInputs = [ + gtk3 gdk-pixbuf ]; @@ -78,6 +81,7 @@ buildDotnetModule rec { changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog"; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; + mainProgram = "Ryujinx"; }; passthru.updateScript = ./updater.sh; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix index 3b24584f7e..c09a83b92e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL +{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ]; + buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ]; preConfigure = '' tar xf ${mupen64plus.src} diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix index 6908429e21..ffb9d0da85 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { pname = "xtrlock-pam"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python xlibsWrapper pam ]; + buildInputs = [ python2 xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 1f210717c0..b8ab2f4331 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -10,7 +10,7 @@ , substituteAll # Language dependencies -, python +, python2 , python3 , rustPlatform @@ -184,7 +184,7 @@ self: super: { }); ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { - buildInputs = [ python ]; + buildInputs = [ python2 ]; buildPhase = '' patchShebangs . ./install.sh @@ -862,7 +862,7 @@ self: super: { vim-isort = super.vim-isort.overrideAttrs (old: { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' + --replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")' ''; }); @@ -871,7 +871,7 @@ self: super: { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "1cvnjsw5dd02wrm1q5xi8b033rsn44f7fkmw5j7lhskv5j286zrh"; + cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1"; }; in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { @@ -916,7 +916,7 @@ self: super: { }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { - buildInputs = [ python ]; + buildInputs = [ python2 ]; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 954af1706f..d4a8f57914 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -367,6 +367,22 @@ let chenglou92.rescript-vscode = callPackage ./rescript { }; + christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "path-intellisense"; + publisher = "christian-kohler"; + version = "2.6.1"; + sha256 = "sha256-ol98g3pliBlyEQ+n7cR4O04J/0QB9U8+fvf+FC0j0Fc="; + }; + meta = with lib; { + description = "Visual Studio Code plugin that autocompletes filenames"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; + homepage = "https://github.com/ChristianKohler/PathIntellisense"; + license = licenses.mit; + maintainers = with maintainers; [ imgabe ]; + }; + }; + cmschuetz12.wal = buildVscodeMarketplaceExtension { mktplcRef = { name = "wal"; @@ -931,8 +947,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.214"; - sha256 = "0rwxjnrl44rnhx3183037k6435xs4772p58a37azl5cahsyav1hk"; + version = "0.0.215"; + sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM="; }; meta = with lib; { license = licenses.mit; @@ -1064,6 +1080,22 @@ let }; }; + jdinhlife.gruvbox = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gruvbox"; + publisher = "jdinhlife"; + version = "1.5.1"; + sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + }; + meta = with lib; { + description = "Gruvbox Theme"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jdinhlife.gruvbox"; + homepage = "https://github.com/jdinhify/vscode-theme-gruvbox"; + license = licenses.mit; + maintainers = with maintainers; [ imgabe ]; + }; + }; + jnoortheen.nix-ide = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-ide"; @@ -1242,14 +1274,16 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.18.0"; - sha256 = "0hhlhx3xy7x31xx2v3srvk67immajs6dm9h0wi49ii1rwx61zxah"; + version = "1.19.0"; + sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE="; }; meta = { license = lib.licenses.mit; }; }; + ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs + ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { @@ -1343,8 +1377,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "0.76.0"; - sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y"; + version = "1.2.0"; + sha256 = "sha256-YmR3FWhPZSU2gE6NIVoA1HZBzaYaTNYFXC/uNwbDEdQ="; }; buildInputs = [ jdk ]; meta = { @@ -1357,8 +1391,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.2.2"; - sha256 = "06n4fxqr3lqmiyns9jdk3rdnanamcpzhrivllai8z9d997xmwcx6"; + version = "1.3.0"; + sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60="; }; meta = { license = lib.licenses.mit; @@ -1472,8 +1506,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.11.0"; - sha256 = "0a4agm0g16cxhvhvsmbsvvicfsjr53330rsab5xdi7gcpx9a1dff"; + version = "1.12.0"; + sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44"; }; meta = { license = lib.licenses.asl20; @@ -1574,8 +1608,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.15.4"; - sha256 = "sha256-yuXyClvhGsonvddYHDMkLSvwEsD21vOeE54Gs9BRpeg="; + version = "1.16.0"; + sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; @@ -1591,8 +1625,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.0.14"; - sha256 = "sha256-mwcssQvaztrnUuSoo8AWK3FXT4qKmPTRCGVYkAjgfXg="; + version = "2.1.4"; + sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/language-packs.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/language-packs.nix new file mode 100644 index 0000000000..f97727d6c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/language-packs.nix @@ -0,0 +1,89 @@ +{ lib, vscode-utils }: + +with vscode-utils; + +let + + buildVscodeLanguagePack = { language, sha256 }: + buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-language-pack-${language}"; + publisher = "MS-CEINTL"; + version = "1.64.3"; + inherit sha256; + }; + meta = { + license = lib.licenses.mit; + }; + }; + +in + +# See list of core language packs at https://github.com/Microsoft/vscode-loc +{ + # French + vscode-language-pack-fr = buildVscodeLanguagePack { + language = "fr"; + sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA="; + }; + # Italian + vscode-language-pack-it = buildVscodeLanguagePack { + language = "it"; + sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg="; + }; + # German + vscode-language-pack-de = buildVscodeLanguagePack { + language = "de"; + sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U="; + }; + # Spanish + vscode-language-pack-es = buildVscodeLanguagePack { + language = "es"; + sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA="; + }; + # Russian + vscode-language-pack-ru = buildVscodeLanguagePack { + language = "ru"; + sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ="; + }; + # Chinese (Simplified) + vscode-language-pack-zh-hans = buildVscodeLanguagePack { + language = "zh-hans"; + sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4="; + }; + # Chinese (Traditional) + vscode-language-pack-zh-hant = buildVscodeLanguagePack { + language = "zh-hant"; + sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs="; + }; + # Japanese + vscode-language-pack-ja = buildVscodeLanguagePack { + language = "ja"; + sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg="; + }; + # Korean + vscode-language-pack-ko = buildVscodeLanguagePack { + language = "ko"; + sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4="; + }; + # Czech + vscode-language-pack-cs = buildVscodeLanguagePack { + language = "cs"; + sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q="; + }; + # Portuguese (Brazil) + vscode-language-pack-pt-br = buildVscodeLanguagePack { + language = "pt-BR"; + sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I="; + }; + # Turkish + vscode-language-pack-tr = buildVscodeLanguagePack { + language = "tr"; + sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA"; + }; + # Pseudo Language + vscode-language-pack-qps-ploc = buildVscodeLanguagePack { + language = "qps-ploc"; + sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0="; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix index da3630f97c..49b730361a 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -16,7 +16,7 @@ let '', dontPatchELF ? true, dontStrip ? true, - buildInputs ? [], + nativeBuildInputs ? [], ... }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { @@ -28,7 +28,7 @@ let installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - buildInputs = [ unzip ] ++ buildInputs; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix index ecf1b5e2b3..cbea00ae18 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fbterm/default.nix @@ -1,24 +1,17 @@ { stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }: -let - s = # Generated upstream information - { - version = "1.7.0"; - pname = "fbterm"; - hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; - sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - }; - buildInputs = [ gpm freetype fontconfig ncurses ] - ++ lib.optional stdenv.hostPlatform.isx86 libx86; -in -stdenv.mkDerivation { - inherit (s) pname version; + +stdenv.mkDerivation rec { + version = "1.7.0"; + pname = "fbterm"; + src = fetchurl { - inherit (s) url sha256; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-${version}.tar.gz"; + sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; nativeBuildInputs = [ pkg-config ncurses ]; - inherit buildInputs; + buildInputs = [ gpm freetype fontconfig ncurses ] + ++ lib.optional stdenv.hostPlatform.isx86 libx86; preConfigure = '' sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp @@ -51,10 +44,9 @@ stdenv.mkDerivation { ]; meta = with lib; { - inherit (s) version; description = "Framebuffer terminal emulator"; homepage = "https://code.google.com/archive/p/fbterm/"; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 47fce3df53..348be83056 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, which, xdg-dbus-proxy, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, libapparmor +, which +, xdg-dbus-proxy +, nixosTests +}: stdenv.mkDerivation rec { pname = "firejail"; @@ -11,7 +20,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-oKstTiGt0r4wePaZ9u1o78GZ1XWJ27aS0BdLxmfYk9Q="; }; - buildInputs = [ which ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libapparmor + which + ]; + + configureFlags = [ + "--enable-apparmor" + ]; patches = [ # Adds the /nix directory when using an overlay. @@ -26,11 +46,6 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # Allow whitelisting ~/.nix-profile - substituteInPlace etc/firejail.config --replace \ - '# follow-symlink-as-user yes' \ - 'follow-symlink-as-user no' - # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file substituteInPlace src/include/common.h \ --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy' @@ -62,7 +77,7 @@ stdenv.mkDerivation rec { # See https://github.com/netblue30/firejail/blob/e4cb6b42743ad18bd11d07fd32b51e8576239318/src/firejail/profile.c#L68-L83 # for the profile file lookup implementation. postInstall = '' - for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*.profile | awk '{print $2}' | sort | uniq) + for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*{.inc,.profile} | awk '{print $2}' | sort | uniq) do echo "include /etc/firejail/$local" >$out/etc/firejail/$local done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix index 268e178aad..8124da489a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; - version = "2.9"; + version = "2.10"; src = fetchurl { url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; - sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"; + sha256 = "sha256-IG58eZtnhXLC49EgMCOHhLxKn4IyOwFWtMlGbxSYkV0="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,38 +16,8 @@ stdenv.mkDerivation rec { (fetchurl { # Note: fetchurl seems to be unhappy with openwrt git # server's URLs containing semicolons. Using the github mirror instead. - url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; - sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; - }) - # AP mode PMF disconnection protection bypass (CVE.2019-16275), can be removed >= 2.10 - # https://w1.fi/security/2019-7/ - (fetchurl { - name = "CVE-2019-16275.patch"; - url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; - sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; - }) - # Fixes for UPnP SUBSCRIBE misbehavior in hostapd WPS AP (CVE-2020-12695), can be removed >= 2.10 - # https://w1.fi/security/2020-1/ - (fetchurl { - name = "CVE-2020-12695_0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"; - url = "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"; - sha256 = "1mrbhicqb34jlw1nid5hk2vnjbvfhvp7r5iblaj4l6vgc6fmp6id"; - }) - (fetchurl { - name = "CVE-2020-12695_0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"; - url = "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"; - sha256 = "1pk08b06b24is50bis3rr56xjd3b5kxdcdk8bx39n9vna9db7zj9"; - }) - (fetchurl { - name = "CVE-2020-12695_0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; - url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; - sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8"; - }) - # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. - (fetchpatch { - name = "CVE-2021-30004.patch"; - url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; - sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; + url = "https://raw.githubusercontent.com/openwrt/openwrt/eefed841b05c3cd4c65a78b50ce0934d879e6acf/package/network/services/hostapd/patches/300-noscan.patch"; + sha256 = "08p5frxhpq1rp2nczkscapwwl8g9nc4fazhjpxic5bcbssc3sb00"; }) ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 14afc85aa7..012833a538 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -462,6 +462,9 @@ let SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; + # The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes. + # This does not have any effect if a program does not support it + SECURITY_LANDLOCK = whenAtLeast "5.13" yes; DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem USER_NS = yes; # Support for user namespaces @@ -539,6 +542,7 @@ let UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";}; UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";}; BPF_SYSCALL = whenAtLeast "4.4" yes; + BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.15" yes; BPF_EVENTS = whenAtLeast "4.4" yes; FUNCTION_PROFILER = yes; RING_BUFFER_BENCHMARK = no; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 94cbf548cf..9d90c0cf02 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.261-hardened1.patch", - "sha256": "0m5bb9lpaxw1kq01s9hqsxkmmsyj4ag8s5swrgdca1cf6q84r7bb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.261-hardened1/linux-hardened-4.14.261-hardened1.patch" + "name": "linux-hardened-4.14.262-hardened1.patch", + "sha256": "0z2vdqbsqngdm1w7dh65c1ir25x6vrpmyrjx3c8vgzql67c5xb4b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.262-hardened1/linux-hardened-4.14.262-hardened1.patch" }, - "sha256": "08s7idxpsjb29ccj0gkrj87xhbdqj9nc417qc7gd2kmbjd6amymz", - "version": "4.14.261" + "sha256": "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac", + "version": "4.14.262" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.224-hardened1.patch", - "sha256": "0sma7hwznyf8h3fr7r63nbfb85120nz8xq95ynp6m0lxayj5alxs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.224-hardened1/linux-hardened-4.19.224-hardened1.patch" + "name": "linux-hardened-4.19.225-hardened1.patch", + "sha256": "0wqwgsk0giwcp0kwp39nkv5bdqk4s2np7gsjymaqimq9187cnkvv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.225-hardened1/linux-hardened-4.19.225-hardened1.patch" }, - "sha256": "0c8h457n52qzpw4kgr16ndhsl35si99amc6fadb31fy32csgrk01", - "version": "4.19.224" + "sha256": "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb", + "version": "4.19.225" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.89-hardened1.patch", - "sha256": "0gpfyykm66h4hdazqw1xkg514cglin6zmd754xala924kj6x0k8b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.89-hardened1/linux-hardened-5.10.89-hardened1.patch" + "name": "linux-hardened-5.10.92-hardened1.patch", + "sha256": "08vhk7vzwd9r76mphyphc5n718kdpg3l2i0smrr92w5mx19pvs8g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.92-hardened1/linux-hardened-5.10.92-hardened1.patch" }, - "sha256": "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj", - "version": "5.10.89" + "sha256": "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm", + "version": "5.10.92" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.12-hardened1.patch", - "sha256": "1xxyh87pbk7961zc5554f3gwr65n5msaxyxbi1kpd4q19gcw86xz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.12-hardened1/linux-hardened-5.15.12-hardened1.patch" + "name": "linux-hardened-5.15.15-hardened1.patch", + "sha256": "0js9fz2xx8gshxb5dc6ycmgycmcfqpxdkbpbmx92d397qdnj0460", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.15-hardened1/linux-hardened-5.15.15-hardened1.patch" }, - "sha256": "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx", - "version": "5.15.12" + "sha256": "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x", + "version": "5.15.15" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.170-hardened1.patch", - "sha256": "0sy1114vw8lrbf4a1p3skg67am1f9bvl15d81mplx2bd98cpx0y8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.170-hardened1/linux-hardened-5.4.170-hardened1.patch" + "name": "linux-hardened-5.4.172-hardened1.patch", + "sha256": "124l2b3km1278dc4lgm35f50jfxnbdia1127j27w3b3dhs37baw9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.172-hardened1/linux-hardened-5.4.172-hardened1.patch" }, - "sha256": "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh", - "version": "5.4.170" + "sha256": "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi", + "version": "5.4.172" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index d29c5b408d..f18f31062b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.91"; + version = "5.10.92"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1lcmhp6njj4ypwkq471mdjapbqvcn6jfqx7z422h8fn6q62gpkk2"; + sha256 = "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 1de3117f94..6a7bf518fa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.14"; + version = "5.15.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0kbayz4k72hx9b0l9yz2mbgb2xpnpm13snms06r2absv3gkv9wid"; + sha256 = "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix index 9a7b5208d4..bf1be1d58a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16"; + version = "5.16.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; + sha256 = "0i9mfapsyf9lp8j0g329lgwf6kyi61a00al0hdrfd8bf3hikdgy7"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8147f55409..d546d91f59 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.171"; + version = "5.4.172"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0n29bd1kv4rk3ji05vkvxkrzyzq50dxk0zsnk7r5lj45gpnwig5g"; + sha256 = "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 0d827ad653..ce99b70ce6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.161-rt67"; # updated by ./update-rt.sh + version = "5.4.170-rt68"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i"; + sha256 = "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1xn3i1m0n4zcsnw5k52iyrd994zxmrla4rkjmdr71ra7csbrvkbx"; + sha256 = "0wzvyybrawn9y3ccgafj6jcmh31vwwq2n5rrlidn80736466a3ba"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix index 045f80ce9a..6d1763a0d0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,8 @@ with lib; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { - name = "perf-linux-${kernel.version}"; + pname = "perf-linux"; + version = kernel.version; inherit (kernel) src; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix index 522a74dea0..6efcb01cc5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE="; + sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 23d323f84b..15f7251f99 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "kmod-debian-aliases-${version}.conf"; + pname = "kmod-debian-aliases.conf"; version = "22-1.1"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix index 84bdb3a72b..ed9c58d262 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }: stdenv.mkDerivation rec { pname = "kvmfr"; @@ -9,6 +9,13 @@ 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; + }); + makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" @@ -28,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ j-brn ]; platforms = [ "x86_64-linux" ]; - broken = kernel.kernelOlder "5.3" || kernel.kernelAtLeast "5.16"; + broken = kernel.kernelOlder "5.3"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix index 2417ef6da9..4998ee3e6b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { - name = "libevdevc"; + pname = "libevdevc"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix index bface8118b..1454c0c78a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libgestures/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { - name = "libgestures-${version}"; + pname = "libgestures"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index f8bb7c67d8..1f5fd88957 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix b/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix index 577b7c2531..b4ce59a7c6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,7 +1,7 @@ { lib, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { - name = "net-tools-mptcp"; + pname = "net-tools-mptcp"; version = "0.95"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index e335c7740a..250ebbb59f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -30,10 +30,10 @@ rec { production = legacy_470; beta = generic { - version = "495.29.05"; - sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4="; - settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0="; - persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8="; + version = "510.39.01"; + sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs="; + settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw="; + persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI="; }; # Vulkan developer beta driver diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix index 8411c4fdbf..0091accd57 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, python2Packages, writeScript, runtimeShell }: let @@ -29,7 +29,7 @@ let pmountBin = useSetUID pmount "/bin/pmount"; pumountBin = useSetUID pmount "/bin/pumount"; - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix index 92294b58e4..ba525c1a38 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, wafHook }: +{ lib, stdenv, fetchFromGitHub, python2, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python ]; + buildInputs = [ python2 ]; meta = { description = "Lightweight process containers for Linux"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix index 0797656f65..e86658ccb0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pommed-light/default.nix @@ -10,13 +10,12 @@ }: stdenv.mkDerivation rec { - pkgname = "pommed-light"; + pname = "pommed-light"; version = "1.51lw"; - name = "${pkgname}-${version}"; src = fetchFromGitHub { owner = "bytbox"; - repo = pkgname; + repo = "pommed-light"; rev = "v${version}"; sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index 710a74d67d..02321d8435 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "38.0"; + version = "38.1"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1z9yrkqdknzidg4g1g5rqrs7i0325nmzzw0nf2ki1nzlfwqxy9qv"; + sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7"; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix index e50cb7e8d5..cdc2425ae4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "182l9nchlpl4yr568n86086glkr607rif92wnwc7v3aym62ch6ld"; + sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix new file mode 100644 index 0000000000..c54eda19d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, lib +, perl +, sgx-sdk +, which +, debug ? false +}: +let + sgxVersion = sgx-sdk.versionTag; + opensslVersion = "1.1.1l"; +in +stdenv.mkDerivation rec { + pname = "sgx-ssl" + lib.optionalString debug "-debug"; + version = "lin_${sgxVersion}_${opensslVersion}"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "intel-sgx-ssl"; + rev = version; + hash = "sha256-ibPXs90ni2fkxJ09fNO6wWVpfCFdko6MjBFkEsyIih8="; + }; + + postUnpack = + let + opensslSourceArchive = fetchurl { + url = "https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz"; + hash = "sha256-C3o+XlnDSCf+DDp0t+yLrvMCuY+oAIjX+RU6oW+na9E="; + }; + in + '' + ln -s ${opensslSourceArchive} $sourceRoot/openssl_source/openssl-${opensslVersion}.tar.gz + ''; + + patches = [ + # https://github.com/intel/intel-sgx-ssl/pull/111 + ./intel-sgx-ssl-pr-111.patch + ]; + + postPatch = '' + patchShebangs Linux/build_openssl.sh + + # Run the test in the `installCheckPhase`, not the `buildPhase` + substituteInPlace Linux/sgx/Makefile \ + --replace '$(MAKE) -C $(TEST_DIR) all' \ + 'bash -c "true"' + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + perl + sgx-sdk + stdenv.glibc + which + ]; + + makeFlags = [ + "-C Linux" + ] ++ lib.optionals debug [ + "DEBUG=1" + ]; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + # Build the test app + # + # Running the test app is currently only supported on Intel CPUs + # and will fail on non-Intel CPUs even in SGX simulation mode. + # Therefore, we only build the test app without running it until + # upstream resolves the issue: https://github.com/intel/intel-sgx-ssl/issues/113 + doInstallCheck = true; + installCheckTarget = "all"; + installCheckFlags = [ + "SGX_MODE=SIM" + "-C sgx/test_app" + "-j 1" # Makefile doesn't support multiple jobs + ]; + preInstallCheck = '' + # Expects the enclave file in the current working dir + ln -s sgx/test_app/TestEnclave.signed.so . + ''; + + meta = with lib; { + description = "Cryptographic library for Intel SGX enclave applications based on OpenSSL"; + homepage = "https://github.com/intel/intel-sgx-ssl"; + maintainers = with maintainers; [ trundle veehaitch ]; + platforms = [ "x86_64-linux" ]; + license = with licenses; [ bsd3 openssl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/intel-sgx-ssl-pr-111.patch b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/intel-sgx-ssl-pr-111.patch new file mode 100644 index 0000000000..6ef06d7e23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/intel-sgx-ssl-pr-111.patch @@ -0,0 +1,99 @@ +From 1683c336e11b3cbe2b48c1be1c9460a661523c71 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sat, 8 Jan 2022 17:22:31 +0100 +Subject: [PATCH 1/3] Linux: fix Nix detection + +Detect the `OS_ID` of Nix by probing for the presence of the `NIX_STORE` +environment variable instead of `NIX_PATH`. The latter is only set in a +`nix-shell` session but isn't when building a derivation through +`nix-build`. In contrast, the `NIX_STORE` environment variable is set in +both cases. + +Signed-off-by: Vincent Haupert +--- + Linux/sgx/buildenv.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Linux/sgx/buildenv.mk b/Linux/sgx/buildenv.mk +index cd8818e..dac23c7 100644 +--- a/Linux/sgx/buildenv.mk ++++ b/Linux/sgx/buildenv.mk +@@ -65,7 +65,7 @@ $(shell mkdir -p $(PACKAGE_LIB)) + UBUNTU_CONFNAME:=/usr/include/x86_64-linux-gnu/bits/confname.h + ifneq ("$(wildcard $(UBUNTU_CONFNAME))","") + OS_ID=1 +-else ifeq ($(origin NIX_PATH),environment) ++else ifeq ($(origin NIX_STORE),environment) + OS_ID=3 + else + OS_ID=2 + +From f493525face589d759223bfa45bb802c31ddce4f Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sat, 8 Jan 2022 17:33:22 +0100 +Subject: [PATCH 2/3] Linux: call binaries relative to PATH + +Using an absolute path to call binaries is incompatible with +distributions which do not follow the Filesystem Hierachy Standard; +Nix is an example. Also, it is inconsistent with the rest of the code +base, let alone superfluous. + +Signed-off-by: Vincent Haupert +--- + Linux/build_openssl.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Linux/build_openssl.sh b/Linux/build_openssl.sh +index 7d77b79..e8b59a1 100755 +--- a/Linux/build_openssl.sh ++++ b/Linux/build_openssl.sh +@@ -38,7 +38,7 @@ SGXSSL_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + echo $SGXSSL_ROOT + + OPENSSL_INSTALL_DIR="$SGXSSL_ROOT/../openssl_source/OpenSSL_install_dir_tmp" +-OPENSSL_VERSION=`/bin/ls $SGXSSL_ROOT/../openssl_source/*1.1.1*.tar.gz | /usr/bin/head -1 | /bin/grep -o '[^/]*$' | /bin/sed -s -- 's/\.tar\.gz//'` ++OPENSSL_VERSION=`ls $SGXSSL_ROOT/../openssl_source/*1.1.1*.tar.gz | head -1 | grep -o '[^/]*$' | sed -s -- 's/\.tar\.gz//'` + if [ "$OPENSSL_VERSION" == "" ] + then + echo "In order to run this script, OpenSSL tar.gz package must be located in openssl_source/ directory." + +From fdb883d30fff72b5cfb8c61a2288d3d948f64224 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Tue, 11 Jan 2022 10:56:39 +0100 +Subject: [PATCH 3/3] Linux: properly extract GCC major version + +Calling `gcc -dumpversion` yields the full version string, e.g., +`10.3.0`. The `build_openssl.sh` bash script uses the `-ge` number +comparison operator to check if the returned version is at least +8. This results in an error if the returned GCC version includes a patch +version; "10.3.0" isn't a valid number. + +This commit fixes the version detection by only extracting the relevant +major version of GCC. + +Signed-off-by: Vincent Haupert +--- + Linux/build_openssl.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Linux/build_openssl.sh b/Linux/build_openssl.sh +index e8b59a1..6e4046f 100755 +--- a/Linux/build_openssl.sh ++++ b/Linux/build_openssl.sh +@@ -82,6 +82,7 @@ fi + MITIGATION_OPT="" + MITIGATION_FLAGS="" + CC_VERSION=`gcc -dumpversion` ++CC_VERSION_MAJOR=`echo "$CC_VERSION" | cut -f1 -d.` + for arg in "$@" + do + case $arg in +@@ -99,7 +100,7 @@ do + ;; + -mfunction-return=thunk-extern) + MITIGATION_FLAGS+=" $arg" +- if [[ $CC_VERSION -ge 8 ]] ; then ++ if [[ "$CC_VERSION_MAJOR" -ge 8 ]] ; then + MITIGATION_FLAGS+=" -fcf-protection=none" + fi + shift diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sinit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sinit/default.nix index f88eca9b48..a412461bfd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sinit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sinit/default.nix @@ -1,36 +1,29 @@ -{lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: -let - s = # Generated upstream information - rec { - baseName="sinit"; - version="1.1"; - name="${baseName}-${version}"; - url="https://git.suckless.org/sinit/"; - sha256="sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw="; +{ lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null }: + +stdenv.mkDerivation rec { + pname = "sinit"; + version = "1.1"; + + src = fetchgit { + url = "https://git.suckless.org/sinit/"; + sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw="; rev = "refs/tags/v${version}"; }; buildInputs = [ (lib.getOutput "static" stdenv.cc.libc) ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchgit { - inherit (s) url sha256 rev; - }; - makeFlags = ["PREFIX=$(out)"]; + makeFlags = [ "PREFIX=$(out)" ]; preConfigure = "" + (lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') + (lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') + (lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') - ; - meta = { - inherit (s) version; + ; + + meta = with lib; { description = "A very minimal Linux init implementation from suckless.org"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix index cace3e22ae..b2636382ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/smem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "smem"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; - buildInputs = [ python ]; + buildInputs = [ python2 ]; makeFlags = [ "smemcap" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix index 2801334688..2802fddf8c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "speedometer"; version = "2.8"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; }; - propagatedBuildInputs = [ pythonPackages.urwid ]; + propagatedBuildInputs = [ python2Packages.urwid ]; postPatch = '' sed -i "/'entry_points': {/d" setup.py diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix index 5afb399fc1..eefd95d115 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/statifier/default.nix @@ -1,8 +1,8 @@ { lib, multiStdenv, fetchurl }: -let version = "1.7.4"; in -multiStdenv.mkDerivation { - name = "statifier-${version}"; +multiStdenv.mkDerivation rec { + pname = "statifier"; + version = "1.7.4"; src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index e22b8f877b..3c11c03dfd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -614,6 +614,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli kloenk ]; + maintainers = with maintainers; [ eelco flokli kloenk ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix index 5f4f6069bc..091584a93c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, withoutInitTools ? false }: -let version = "3.01"; in - -stdenv.mkDerivation { - name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; +stdenv.mkDerivation rec { + pname = if withoutInitTools then "sysvtools" else "sysvinit"; + version = "3.01"; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tmon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tmon/default.nix index 5a14d3d2ee..3a2697e0a7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tmon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tmon/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, kernel, ncurses }: stdenv.mkDerivation { - name = "tmon-${kernel.version}"; + pname = "tmon"; + version = kernel.version; inherit (kernel) src; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix index a0b748be21..1d4166e408 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { - name = "uclibc-ng-${version}"; + pname = "uclibc-ng"; inherit version; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix index 7d839f8acd..7856456a3c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }: stdenv.mkDerivation rec { - name = "unstick"; + pname = "unstick"; version = "0.1.0"; src = fetchFromGitHub { owner = "kwohlfahrt"; - repo = name; + repo = "unstick"; rev = "effee9aa242ca12dc94cc6e96bc073f4cc9e8657"; sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 656fa47776..e48dce4f31 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl +{ lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests , withDbus ? true, dbus , withReadline ? true, readline @@ -8,45 +8,16 @@ with lib; stdenv.mkDerivation rec { - version = "2.9"; + version = "2.10"; pname = "wpa_supplicant"; src = fetchurl { url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; - sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw"; + sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8="; }; patches = [ - (fetchurl { - name = "CVE-2019-16275.patch"; - url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; - sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; - }) - (fetchpatch { - # Expose OWE key management capability over DBus, remove >= 2.10 - name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch"; - url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737"; - sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8"; - }) - # P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/) - (fetchurl { - name = "CVE-2021-0326.patch"; - url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch"; - sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4"; - }) - # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/) - (fetchurl { - name = "CVE-2021-27803.patch"; - url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch"; - sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z"; - }) - # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. - (fetchpatch { - name = "CVE-2021-30004.patch"; - url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; - sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; - }) ] ++ lib.optionals readOnlyModeSSIDs [ # Allow read-only networks ./0001-Implement-read-only-mode-for-ssids.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix index dbda35670f..e842b59651 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/x86info/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pciutils, python}: +{lib, stdenv, fetchurl, pciutils, python2}: stdenv.mkDerivation rec { version = "1.30"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i 's/-Werror -Wall//' Makefile ''; - buildInputs = [ pciutils python ]; + buildInputs = [ pciutils python2 ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 9940decc0b..dcf397ed4b 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip }: +{ lib, stdenv, fetchurl, fetchzip, nixosTests }: stdenv.mkDerivation rec { pname = "adguardhome"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; + tests.adguardhome = nixosTests.adguardhome; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/alps/default.nix b/third_party/nixpkgs/pkgs/servers/alps/default.nix new file mode 100644 index 0000000000..f367dc5940 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/alps/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromSourcehut }: + +buildGoModule rec { + pname = "alps"; + version = "2021-09-29"; + + src = fetchFromSourcehut { + owner = "~migadu"; + repo = "alps"; + rev = "d4c35f3c3157bece8e50fd95f2ee1081be30d7ae"; + sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; + }; + + vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA="; + + proxyVendor = true; + + meta = with lib; { + description = "A simple and extensible webmail."; + homepage = "https://git.sr.ht/~migadu/alps"; + license = licenses.mit; + maintainers = with maintainers; [ gordias ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index a8b837c8b3..a5b36ad5c4 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -3,7 +3,7 @@ , fetchurl , erlang , elixir -, python +, python2 , libxml2 , libxslt , xmlto @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; - buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ] + buildInputs = [ erlang elixir python2 libxml2 libxslt glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix index d6e39f8cdb..4a8d19687f 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, cacert, zip, rsync, pkg-config, yarn, python3 -, esbuild, nodejs-14_x, libsecret, xorg, ripgrep -, AppKit, Cocoa, Security, cctools }: +, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 +, esbuild, nodejs-14_x, node-gyp, libsecret, xorg, ripgrep +, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild }: let system = stdenv.hostPlatform.system; @@ -11,16 +11,24 @@ let yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + # replaces esbuild's download script with a binary from nixpkgs + patchEsbuild = path : version : '' + mkdir -p ${path}/node_modules/esbuild/bin + jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json + sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ''; + in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.12.0"; - commit = "798dc0baf284416dbbf951e4ef596beeab6cb6c4"; + version = "4.0.1"; + commit = "7fe23daf009e5234eaa54a1ea5ff26df384c47ac"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "17v3sz0wjrmikmzyh9xswr4kf1vcj9njlibqb4wwj0pq0d72wdvl"; + sha256 = "1s3dcmzlkyh7qfs3ai1p7dlp45iys0ax1fbxxz17p395pw9anrrl"; }; cloudAgent = buildGoModule rec { @@ -63,27 +71,16 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; # to get hash values use nix-build -A code-server.prefetchYarnCache - outputHash = { - x86_64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - aarch64-linux = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - x86_64-darwin = "1clfdl9hy5j2dj6jj6a9vgq0wzllfj0h2hbb73959k3w85y4ad2w"; - }.${system} or (throw "Unsupported system ${system}"); + outputHash = "0qmfsirld1qfl2s26rxbpmvxsyj2pvzkgk8w89zlrgbhgc5fj8p9"; }; - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - nativeBuildInputs = [ - nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils + nodejs yarn' python pkg-config makeWrapper git rsync jq moreutils ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile ]) ++ lib.optionals stdenv.isDarwin [ - AppKit Cocoa Security cctools + AppKit Cocoa CoreServices Security cctools xcbuild ]; patches = [ @@ -119,9 +116,17 @@ in stdenv.mkDerivation rec { # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - '' + lib.optionalString stdenv.isLinux '' - # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" + + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js ''; buildPhase = '' @@ -169,6 +174,9 @@ in stdenv.mkDerivation rec { # sw_vers before that variable is checked. patch -p1 -i ${./playwright.patch} + # Patch out remote download of nodejs from build script + patch -p1 -i ${./remove-node-download.patch} + # Replicate install vscode dependencies without running script for all vscode packages # that require patching for postinstall scripts to succeed find ./vendor/modules/code-oss-dev -path "*node_modules" -prune -o \ @@ -176,21 +184,21 @@ in stdenv.mkDerivation rec { xargs -I {} yarn --cwd {} \ --frozen-lockfile --offline --ignore-scripts --ignore-engines + # patch shebangs of everything to allow binary packages to build patchShebangs . - # patch build esbuild - mkdir -p vendor/modules/code-oss-dev/build/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/build/node_modules/esbuild/package.json - sed -i 's/0.12.6/${esbuild.version}/g' vendor/modules/code-oss-dev/build/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/build/node_modules/esbuild/bin/esbuild - - # patch extensions esbuild - mkdir -p vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json | sponge vendor/modules/code-oss-dev/extensions/node_modules/esbuild/package.json - sed -i 's/0.11.12/${esbuild.version}/g' vendor/modules/code-oss-dev/extensions/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild vendor/modules/code-oss-dev/extensions/node_modules/esbuild/bin/esbuild - + ${patchEsbuild "./vendor/modules/code-oss-dev/build" "0.12.6"} + ${patchEsbuild "./vendor/modules/code-oss-dev/extensions" "0.11.23"} + '' + lib.optionalString stdenv.isDarwin '' + # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ + # (see issue #101229) + pushd ./vendor/modules/code-oss-dev/remote/node_modules/@parcel/watcher + mkdir -p ./build/Release + mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node + jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json + popd + '' + '' # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts diff --git a/third_party/nixpkgs/pkgs/servers/code-server/playwright.patch b/third_party/nixpkgs/pkgs/servers/code-server/playwright.patch index e03d7f8218..95a7474818 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/playwright.patch +++ b/third_party/nixpkgs/pkgs/servers/code-server/playwright.patch @@ -4,7 +4,7 @@ * limitations under the License. */ --const { installBrowsersWithProgressBar } = require('./lib/install/installer'); +-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); - --installBrowsersWithProgressBar(); +-installDefaultBrowsersForNpmInstall(); +process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/third_party/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch b/third_party/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch index dd8f6fccb5..0b16e16aec 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch +++ b/third_party/nixpkgs/pkgs/servers/code-server/remove-cloud-agent-download.patch @@ -1,10 +1,11 @@ --- ./ci/build/npm-postinstall.sh +++ ./ci/build/npm-postinstall.sh -@@ -56,13 +56,6 @@ - ;; - esac - -- OS="$(uname | tr '[:upper:]' '[:lower:]')" +@@ -58,14 +58,6 @@ + + OS="$(uname | tr '[:upper:]' '[:lower:]')" + +- mkdir -p ./lib +- - if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then - chmod +x ./lib/coder-cloud-agent - else diff --git a/third_party/nixpkgs/pkgs/servers/code-server/remove-node-download.patch b/third_party/nixpkgs/pkgs/servers/code-server/remove-node-download.patch new file mode 100644 index 0000000000..282d716752 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/code-server/remove-node-download.patch @@ -0,0 +1,27 @@ +--- ./vendor/modules/code-oss-dev/build/gulpfile.reh.js ++++ ./vendor/modules/code-oss-dev/build/gulpfile.reh.js +@@ -277,8 +277,6 @@ + .pipe(util.stripSourceMappingURL()) + .pipe(jsFilter.restore); + +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; +- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); + + let web = []; + if (type === 'reh-web') { +@@ -296,7 +294,6 @@ + license, + sources, + deps, +- node, + ...web + ); + +@@ -376,7 +373,6 @@ + const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + + const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( +- gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`), + util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), + packageTask(type, platform, arch, sourceFolderName, destinationFolderName) + )); diff --git a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix index 146db2ea5d..cf6427c860 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, zip, unzip -, jdk, python +, jdk, python2 , confFile ? "" , extraLibraryPaths ? [] , extraJars ? [] @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { fixupPhase = '' # Fix python reference sed -i \ - -e '19iPYTHON=${python}/bin/python' \ - -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ + -e '19iPYTHON=${python2}/bin/python' \ + -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ $out/bin/storm sed -i \ - -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ + -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ $out/bin/storm.py diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index 0424880c08..3188533dad 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix @@ -1,19 +1,26 @@ { lib, stdenv, fetchurl, pkg-config, systemd , boost, libsodium, libedit, re2 , net-snmp, lua, protobuf, openssl, zlib, h2o +, nghttp2, nixosTests }: stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.5.2"; + version = "1.7.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k="; + sha256 = "sha256-eMxyywzPf7Xz8vrgnHntplpSVjdNoJu1Qbc16mho/GQ="; }; + patches = [ + # Disable tests requiring networking: + # "Error connecting to new server with address 192.0.2.1:53: connecting socket to 192.0.2.1:53: Network is unreachable" + ./disable-network-tests.patch + ]; + nativeBuildInputs = [ pkg-config protobuf ]; - buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ]; + buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o nghttp2 ]; configureFlags = [ "--with-libsodium" @@ -32,10 +39,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) dnsdist; + }; + meta = with lib; { description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; license = licenses.gpl2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ jojosch ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/disable-network-tests.patch new file mode 100644 index 0000000000..fd0fdfbc4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/disable-network-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test-dnsdisttcp_cc.cc b/test-dnsdisttcp_cc.cc +index 1fbb00e..dc04137 100644 +--- a/test-dnsdisttcp_cc.cc ++++ b/test-dnsdisttcp_cc.cc +@@ -848,6 +848,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionWithProxyProtocol_SelfAnswered) + + BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) + { ++ return; + auto local = getBackendAddress("1", 80); + ClientState localCS(local, true, false, false, "", {}); + auto tlsCtx = std::make_shared(); +@@ -1711,6 +1712,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) + + BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) + { ++ return; + auto local = getBackendAddress("1", 80); + ClientState localCS(local, true, false, false, "", {}); + /* enable out-of-order on the front side */ +@@ -3677,6 +3679,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) + + BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendNotOOOR) + { ++ return; + auto local = getBackendAddress("1", 80); + ClientState localCS(local, true, false, false, "", {}); + /* enable out-of-order on the front side */ diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 0bc7bdb0bd..c38ff94726 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,44 +1,28 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: - -let - python = python3.override { - packageOverrides = self: super: { - mautrix_0_13 = self.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.13.3"; - src = oldAttrs.src.override { - inherit (oldAttrs) pname; - inherit version; - sha256 = "1e4a292469f3e200c182aaa5bf693a5c3834b2a0cfb3d29e4c9a1559db7740e3"; - }; - }); - }; - }; -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.8.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "v${version}"; - sha256 = "173prcd56rwlxjxlw67arnm12k1l317xi5s6m7jhmp8zbbrj5vwr"; + sha256 = "sha256-rQBmg1CBourj/dDJ7P108gGMRdXWp6nwvHIBiQbJLQ0="; }; postPatch = '' echo "${version}" > heisenbridge/version.txt ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp irc - mautrix_0_13 + mautrix python-socks pyyaml ]; - checkInputs = with python.pkgs; [ + checkInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 59939f411f..2169c5c7b9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.12.8"; + version = "2021.12.10"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -589,7 +589,7 @@ "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; - "nut" = ps: with ps; [ ]; # missing inputs: pynut2 + "nut" = ps: with ps; [ pynut2 ]; "nws" = ps: with ps; [ pynws ]; "nx584" = ps: with ps; [ pynx584 ]; "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi @@ -725,7 +725,7 @@ "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio - "rpi_power" = ps: with ps; [ ]; # missing inputs: rpi-bad-power + "rpi_power" = ps: with ps; [ rpi-bad-power ]; "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; @@ -1018,4 +1018,570 @@ "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; }; + # components listed in tests/components for which all dependencies are packaged + supportedComponentsWithTests = [ + "abode" + "accuweather" + "acmeda" + "adax" + "adguard" + "advantage_air" + "aemet" + "agent_dvr" + "air_quality" + "airly" + "airnow" + "airthings" + "airtouch4" + "airvisual" + "alarm_control_panel" + "alarmdecoder" + "alert" + "alexa" + "almond" + "ambee" + "amberelectric" + "ambiclimate" + "ambient_station" + "analytics" + "androidtv" + "apache_kafka" + "api" + "apple_tv" + "apprise" + "aprs" + "arcam_fmj" + "arlo" + "asuswrt" + "atag" + "august" + "aurora" + "auth" + "automation" + "awair" + "aws" + "axis" + "azure_devops" + "azure_event_hub" + "balboa" + "bayesian" + "binary_sensor" + "blackbird" + "blebox" + "blink" + "blueprint" + "bluetooth_le_tracker" + "bmw_connected_drive" + "bond" + "bosch_shc" + "braviatv" + "broadlink" + "brother" + "bsblan" + "buienradar" + "button" + "caldav" + "calendar" + "camera" + "canary" + "cast" + "cert_expiry" + "climacell" + "climate" + "cloud" + "cloudflare" + "color_extractor" + "comfoconnect" + "command_line" + "compensation" + "config" + "configurator" + "control4" + "conversation" + "coolmaster" + "coronavirus" + "counter" + "cover" + "crownstone" + "daikin" + "darksky" + "datadog" + "debugpy" + "deconz" + "default_config" + "demo" + "denonavr" + "derivative" + "device_automation" + "device_sun_light_trigger" + "device_tracker" + "devolo_home_control" + "devolo_home_network" + "dexcom" + "dhcp" + "dialogflow" + "directv" + "discovery" + "dlna_dmr" + "doorbird" + "dsmr" + "dte_energy_bridge" + "duckdns" + "dunehd" + "eafm" + "ecobee" + "econet" + "efergy" + "elgato" + "elkm1" + "emonitor" + "emulated_hue" + "emulated_kasa" + "emulated_roku" + "energy" + "enocean" + "enphase_envoy" + "environment_canada" + "epson" + "esphome" + "everlights" + "evil_genius_labs" + "ezviz" + "faa_delays" + "facebook" + "facebox" + "fail2ban" + "fan" + "feedreader" + "ffmpeg" + "fido" + "file" + "filesize" + "filter" + "fireservicerota" + "firmata" + "fjaraskupan" + "flick_electric" + "flipr" + "flo" + "flume" + "flunearyou" + "flux" + "flux_led" + "folder" + "folder_watcher" + "foobot" + "forecast_solar" + "foscam" + "freebox" + "freedns" + "freedompro" + "fritz" + "fritzbox" + "fritzbox_callmonitor" + "fronius" + "frontend" + "garages_amsterdam" + "gdacs" + "generic" + "generic_hygrostat" + "generic_thermostat" + "geo_json_events" + "geo_location" + "geo_rss_events" + "geofency" + "geonetnz_quakes" + "geonetnz_volcano" + "gios" + "glances" + "goalzero" + "gogogate2" + "google" + "google_assistant" + "google_domains" + "google_pubsub" + "google_translate" + "google_travel_time" + "google_wifi" + "gpslogger" + "graphite" + "gree" + "group" + "growatt_server" + "guardian" + "habitica" + "hangouts" + "harmony" + "hassio" + "hddtemp" + "heos" + "here_travel_time" + "hisense_aehw4a1" + "history" + "history_stats" + "hive" + "hlk_sw16" + "home_connect" + "home_plus_control" + "homeassistant" + "homekit" + "homekit_controller" + "homematic" + "homematicip_cloud" + "honeywell" + "html5" + "http" + "huawei_lte" + "hue" + "huisbaasje" + "humidifier" + "hunterdouglas_powerview" + "hvv_departures" + "hyperion" + "ialarm" + "iaqualink" + "icloud" + "ifttt" + "ign_sismologia" + "image" + "image_processing" + "imap_email_content" + "influxdb" + "input_boolean" + "input_datetime" + "input_number" + "input_select" + "input_text" + "insteon" + "integration" + "intent" + "intent_script" + "ios" + "iotawatt" + "ipma" + "ipp" + "iqvia" + "islamic_prayer_times" + "isy994" + "izone" + "jellyfin" + "jewish_calendar" + "juicenet" + "keenetic_ndms2" + "kira" + "kmtronic" + "knx" + "kodi" + "konnected" + "kraken" + "kulersky" + "lastfm" + "lcn" + "light" + "litterrobot" + "local_file" + "local_ip" + "locative" + "lock" + "logbook" + "logentries" + "logger" + "london_air" + "lookin" + "lovelace" + "luftdaten" + "lutron_caseta" + "lyric" + "mailbox" + "manual" + "manual_mqtt" + "maxcube" + "mazda" + "media_player" + "media_source" + "melcloud" + "meraki" + "met" + "met_eireann" + "meteoclimatic" + "mhz19" + "microsoft_face" + "microsoft_face_detect" + "microsoft_face_identify" + "mikrotik" + "mill" + "min_max" + "minecraft_server" + "minio" + "mobile_app" + "modbus" + "modem_callerid" + "modern_forms" + "mold_indicator" + "moon" + "motion_blinds" + "motioneye" + "mqtt" + "mqtt_eventstream" + "mqtt_json" + "mqtt_room" + "mqtt_statestream" + "mullvad" + "mutesync" + "my" + "myq" + "mysensors" + "mythicbeastsdns" + "nam" + "namecheapdns" + "nanoleaf" + "neato" + "ness_alarm" + "nest" + "netatmo" + "network" + "nexia" + "nightscout" + "no_ip" + "notify" + "notion" + "nsw_rural_fire_service_feed" + "nuki" + "number" + "nut" + "nws" + "nx584" + "octoprint" + "omnilogic" + "onboarding" + "ondilo_ico" + "openalpr_cloud" + "openalpr_local" + "openerz" + "opengarage" + "openhardwaremonitor" + "opentherm_gw" + "openuv" + "openweathermap" + "opnsense" + "ovo_energy" + "owntracks" + "ozw" + "p1_monitor" + "panel_custom" + "panel_iframe" + "persistent_notification" + "person" + "philips_js" + "pi_hole" + "picnic" + "ping" + "plaato" + "plant" + "plex" + "plugwise" + "point" + "poolsense" + "profiler" + "prometheus" + "prosegur" + "proximity" + "push" + "pushbullet" + "pvpc_hourly_pricing" + "python_script" + "qld_bushfire" + "rachio" + "radarr" + "rainforest_eagle" + "rainmachine" + "random" + "rdw" + "recollect_waste" + "recorder" + "reddit" + "remote" + "renault" + "rest" + "rest_command" + "rflink" + "rfxtrx" + "ridwell" + "ring" + "risco" + "rituals_perfume_genie" + "rmvtransport" + "roku" + "roomba" + "roon" + "rpi_power" + "rss_feed_template" + "ruckus_unleashed" + "safe_mode" + "samsungtv" + "scene" + "screenlogic" + "script" + "search" + "season" + "select" + "sense" + "sensor" + "sentry" + "seventeentrack" + "sharkiq" + "shell_command" + "shelly" + "shopping_list" + "sia" + "sigfox" + "sighthound" + "simplisafe" + "simulated" + "siren" + "slack" + "sleepiq" + "sma" + "smappee" + "smart_meter_texas" + "smarthab" + "smartthings" + "smarttub" + "smhi" + "smtp" + "snips" + "solaredge" + "solarlog" + "soma" + "somfy" + "somfy_mylink" + "sonarr" + "songpal" + "sonos" + "soundtouch" + "spaceapi" + "spc" + "speedtestdotnet" + "spider" + "spotify" + "sql" + "squeezebox" + "srp_energy" + "ssdp" + "starline" + "startca" + "statistics" + "statsd" + "stream" + "stt" + "subaru" + "sun" + "surepetcare" + "switch" + "switchbot" + "switcher_kis" + "syncthing" + "syncthru" + "synology_dsm" + "system_bridge" + "system_health" + "system_log" + "tado" + "tag" + "tailscale" + "tasmota" + "tcp" + "telegram" + "tellduslive" + "template" + "tesla_wall_connector" + "threshold" + "tibber" + "tile" + "time_date" + "timer" + "tod" + "tolo" + "tomato" + "toon" + "totalconnect" + "tplink" + "traccar" + "trace" + "tractive" + "tradfri" + "trafikverket_weatherstation" + "transmission" + "transport_nsw" + "trend" + "tts" + "tuya" + "twentemilieu" + "twilio" + "twinkly" + "twitch" + "uk_transport" + "unifi" + "unifi_direct" + "universal" + "upb" + "upcloud" + "updater" + "upnp" + "uptime" + "uptimerobot" + "usb" + "usgs_earthquakes_feed" + "utility_meter" + "uvc" + "vacuum" + "velbus" + "venstar" + "vera" + "verisure" + "version" + "vesync" + "vicare" + "vilfo" + "vizio" + "vlc_telnet" + "voicerss" + "volumio" + "vultr" + "wake_on_lan" + "wallbox" + "water_heater" + "watttime" + "waze_travel_time" + "weather" + "webhook" + "webostv" + "websocket_api" + "wemo" + "whirlpool" + "wiffi" + "wilight" + "wled" + "workday" + "worldclock" + "wsdot" + "xbox" + "xiaomi" + "xiaomi_aqara" + "xiaomi_miio" + "yale_smart_alarm" + "yamaha" + "yamaha_musiccast" + "yandex_transport" + "yandextts" + "yeelight" + "youless" + "zeroconf" + "zerproc" + "zha" + "zodiac" + "zone" + "zwave" + "zwave_js" + ]; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 1556ffbd9c..0cb5e13fbd 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, callPackage , fetchFromGitHub , fetchpatch , python3 @@ -40,87 +41,6 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") - (self: super: { - httpcore = super.httpcore.overridePythonAttrs (oldAttrs: rec { - version = "0.14.3"; - src = fetchFromGitHub { - owner = "encode"; - repo = "httpcore"; - rev = version; - sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; - }; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.certifi ]; - doCheck = false; - }); - }) - - (self: super: { - httpx = super.httpx.overridePythonAttrs (oldAttrs: rec { - version = "0.21.1"; - src = fetchFromGitHub { - owner = "encode"; - repo = "httpx"; - rev = version; - sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; - }; - doCheck = false; - }); - }) - - (self: super: { - pytest-httpx = super.pytest-httpx.overridePythonAttrs (oldAttrs: rec { - version = "0.15.0"; - src = fetchFromGitHub { - owner = "Colin-bin"; - repo = "pytest_httpx"; - rev = "v${version}"; - sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg"; - }; - }); - }) - - (self: super: { - respx = super.respx.overridePythonAttrs (oldAttrs: rec { - version = "0.19.0"; - src = fetchFromGitHub { - owner = "lundberg"; - repo = "respx"; - rev = version; - sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; - }; - }); - }) - - (self: super: { - envoy-reader = super.envoy-reader.overridePythonAttrs (oldAttrs: rec { - patches = [ - # Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82 - (fetchpatch { - name = "support-later-httpx.patch"; - url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch"; - sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272"; - }) - ]; - }); - }) - - (self: super: { - sanic = super.sanic.overridePythonAttrs (oldAttrs: rec { - version = "21.9.3"; - src = fetchFromGitHub { - owner = "sanic-org"; - repo = "sanic"; - rev = "v${version}"; - sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; - }; - disabledTests = oldAttrs.disabledTests ++ [ - "test_redirect" - "test_chained_redirect" - "test_unix_connection" - ]; - }); - }) - (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; @@ -193,6 +113,9 @@ let # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + # Requirements for recorder not found: ['sqlalchemy==1.4.27']. + (mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") + # Pinned due to API changes in 0.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -219,46 +142,6 @@ let }); }) - # Remove with 2021.12.6 as the requirement will be 1.1.16 (at least) - (self: super: { - yalexs = super.yalexs.overridePythonAttrs (oldAttrs: rec { - version = "1.1.13"; - src = fetchFromGitHub { - owner = "bdraco"; - repo = "yalexs"; - rev = "v${version}"; - sha256 = "sha256-lnx8+VyDyO7Wg+QW+CC0FUg77Ndfjar6PLsDYwEpaCQ="; - }; - }); - }) - - # Remove as soon the dependency is updated and pytest-httpx > 0.15 - (self: super: { - luftdaten = super.luftdaten.overridePythonAttrs (oldAttrs: rec { - version = "0.7.1"; - src = fetchFromGitHub { - owner = "home-assistant-ecosystem"; - repo = "python-luftdaten"; - rev = version; - sha256 = "sha256-76Y5TJet0WtzYXuK8Og0rmpsUIlXK7b37oesh+MliU8="; - }; - }); - }) - - # Remove as soon the dependency is updated and pytest-httpx > 0.15 - (self: super: { - pyrmvtransport = super.pyrmvtransport.overridePythonAttrs (oldAttrs: rec { - version = "0.3.3"; - src = fetchFromGitHub { - owner = "cgtobi"; - repo = "pyrmvtransport"; - rev = "v${version}"; - sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; - }; - doCheck = false; - }); - }) - # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -275,7 +158,7 @@ let }); }; - py = python3.override { + python = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; @@ -284,22 +167,24 @@ let availableComponents = builtins.attrNames componentPackages.components; - getPackages = component: builtins.getAttr component componentPackages.components; + inherit (componentPackages) supportedComponentsWithTests; - componentBuildInputs = lib.concatMap (component: getPackages component py.pkgs) extraComponents; + getPackages = component: componentPackages.components.${component}; + + componentBuildInputs = lib.concatMap (component: getPackages component python.pkgs) extraComponents; # Ensure that we are using a consistent package set - extraBuildInputs = extraPackages py.pkgs; + extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.8"; + hassVersion = "2021.12.10"; -in with py.pkgs; buildPythonApplication rec { +in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); hassVersion; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = pythonOlder "3.8"; + disabled = python.pythonOlder "3.8"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -309,7 +194,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:HxSEXaqNHh2hSr1fmu3xpC212PXhzvnD4CwR1Ulw9ok="; + hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -335,7 +220,7 @@ in with py.pkgs; buildPythonApplication rec { substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ # Only packages required in setup.py aiohttp astral @@ -371,9 +256,10 @@ in with py.pkgs; buildPythonApplication rec { # upstream only tests on Linux, so do we. doCheck = stdenv.isLinux; - checkInputs = [ + checkInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) freezegun + jsonpickle pytest-aiohttp pytest-freezegun pytest-mock @@ -382,541 +268,15 @@ in with py.pkgs; buildPythonApplication rec { pytest-xdist pytestCheckHook requests-mock - stdlib-list - jsonpickle respx + stdlib-list + tqdm # required by tests/auth/mfa_modules pyotp - ] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests; - - # We can reasonably test components that don't communicate with any network - # services. Before adding new components to this list make sure we have all - # its dependencies packaged and listed in ./component-packages.nix. - componentTests = [ - "abode" - "accuweather" - "acmeda" - "adguard" - "advantage_air" - "aemet" - "agent_dvr" - "air_quality" - "airly" - "airnow" - "airthings" - "airvisual" - "alarm_control_panel" - "alarmdecoder" - "alert" - "alexa" - "almond" - "ambiclimate" - "ambient_station" - "analytics" - "androidtv" - "apache_kafka" - "api" - "apple_tv" - "apprise" - "aprs" - "arcam_fmj" - "arlo" - "asuswrt" - "atag" - "august" - "aurora" - "auth" - "automation" - "awair" - "aws" - "axis" - "azure_devops" - "azure_event_hub" - "bayesian" - "binary_sensor" - "blackbird" - "blebox" - "blink" - "blueprint" - "bluetooth_le_tracker" - "bmw_connected_drive" - "bond" - "bosch_shc" - "braviatv" - "broadlink" - "brother" - "bsblan" - "buienradar" - "caldav" - "calendar" - "camera" - "canary" - "cast" - "cert_expiry" - "climacell" - "climate" - "cloud" - "cloudflare" - "color_extractor" - "comfoconnect" - "command_line" - "compensation" - "config" - "configurator" - "control4" - "conversation" - "coolmaster" - "coronavirus" - "counter" - "cover" - "daikin" - "darksky" - "datadog" - "deconz" + ] ++ lib.concatMap (component: getPackages component python.pkgs) [ + # some components are needed even if tests in tests/components are disabled "default_config" - "demo" - "denonavr" - "derivative" - "device_automation" - "device_sun_light_trigger" - "device_tracker" - "devolo_home_control" - "dexcom" - "dhcp" - "dialogflow" - "directv" - "discovery" - "doorbird" - "dsmr" - "dte_energy_bridge" - "duckdns" - "dunehd" - "eafm" - "ecobee" - "econet" - "efergy" - "elgato" - "elkm1" - "emonitor" - "emulated_hue" - "emulated_kasa" - "emulated_roku" - "enocean" - "enphase_envoy" - "epson" - "esphome" - "everlights" - "ezviz" - "faa_delays" - "facebook" - "facebox" - "fail2ban" - "fan" - "feedreader" - "ffmpeg" - "fido" - "file" - "filesize" - "filter" - "fireservicerota" - "firmata" - "fjaraskupan" - "flick_electric" - "flipr" - "flo" - "flume" - "flunearyou" - "flux" - "folder" - "folder_watcher" - "foobot" - "foscam" - "freebox" - "freedns" - "fritz" - "fritzbox" - "fritzbox_callmonitor" - "frontend" - "garages_amsterdam" - "gdacs" - "generic" - "generic_thermostat" - "geo_json_events" - "geo_location" - "geo_rss_events" - "geofency" - "geonetnz_quakes" - "geonetnz_volcano" - "gios" - # updated to incompatible version and overriding is annoying because of async_timeout<4 pin - # "glances" - "goalzero" - "gogogate2" - "google" - "google_assistant" - "google_domains" - "google_pubsub" - "google_translate" - "google_travel_time" - "google_wifi" - "gpslogger" - "graphite" - "gree" - "group" - "growatt_server" - "guardian" - "habitica" - "hangouts" - "harmony" - "hassio" - "hddtemp" - "heos" - "here_travel_time" - "hisense_aehw4a1" - "history" - "history_stats" - "hive" - "hlk_sw16" - "home_connect" - "home_plus_control" - "homeassistant" - # disable homekit tests because they fail in the network component - #"homekit" - "homekit_controller" - "homematic" - "homematicip_cloud" - "honeywell" - "html5" - "http" - "huawei_lte" "hue" - "huisbaasje" - "humidifier" - "hunterdouglas_powerview" - "hvv_departures" - "hyperion" - "ialarm" - "iaqualink" - "icloud" - "ifttt" - "ign_sismologia" - "image" - "image_processing" - "imap_email_content" - "influxdb" - "input_boolean" - "input_datetime" - "input_number" - "input_select" - "input_text" - "insteon" - "integration" - "intent" - "intent_script" - "ios" - "ipma" - "ipp" - "iqvia" - "islamic_prayer_times" - "isy994" - "izone" - "jewish_calendar" - "juicenet" - "keenetic_ndms2" - "kira" - "kmtronic" - "knx" - "kodi" - "konnected" - "kraken" - "kulersky" - "lastfm" - "lcn" - "light" - "litterrobot" - "local_file" - "local_ip" - "locative" - "lock" - "logbook" - "logentries" - "logger" - "london_air" - "lovelace" - "luftdaten" - "lutron_caseta" - "lyric" - "mailbox" - "manual" - "manual_mqtt" - "maxcube" - "mazda" - "media_player" - "media_source" - "melcloud" - "meraki" - "met" - "met_eireann" - "meteoclimatic" - "mhz19" - "microsoft_face" - "microsoft_face_detect" - "microsoft_face_identify" - "mikrotik" - "mill" - "min_max" - "minecraft_server" - "minio" - "mobile_app" - "modbus" - "mold_indicator" - "moon" - "motion_blinds" - "motioneye" - "mqtt" - "mqtt_eventstream" - "mqtt_json" - "mqtt_room" - "mqtt_statestream" - "mullvad" - "mutesync" - "my" - "myq" - "mysensors" - "mythicbeastsdns" - "nam" - "namecheapdns" - "neato" - "ness_alarm" - # python-nest has an unfree license, this prevents builds through ofborg - # "nest" - "netatmo" - "nexia" - "nightscout" - "no_ip" - "notify" - "notion" - "nsw_rural_fire_service_feed" - "nuki" - "number" - "nws" - "nx584" - "octoprint" - "omnilogic" - "onboarding" - "ondilo_ico" - "openalpr_cloud" - "openalpr_local" - "openerz" - "openhardwaremonitor" - "opentherm_gw" - "openuv" - "openweathermap" - "opnsense" - "ovo_energy" - "owntracks" - "ozw" - "p1_monitor" - "panel_custom" - "panel_iframe" - "persistent_notification" - "person" - "philips_js" - "pi_hole" - "picnic" - "ping" - "plaato" - "plant" - "plex" - "plugwise" - "point" - "poolsense" - "profiler" - "prometheus" - "proximity" - "push" - "pushbullet" - "pvpc_hourly_pricing" - "python_script" - "qld_bushfire" - "rachio" - "radarr" - "rainmachine" - "random" - "recollect_waste" - "recorder" - "reddit" - "remote" - "renault" - "rest" - "rest_command" - "rflink" - "rfxtrx" - "ring" - "risco" - "rituals_perfume_genie" - "rmvtransport" - "roku" - "roomba" - "roon" - "rss_feed_template" - "ruckus_unleashed" - "safe_mode" - "samsungtv" - "scene" - "screenlogic" - "script" - "search" - "season" - "sense" - "sensor" - "sentry" - "sharkiq" - "shell_command" - "shelly" - "shopping_list" - "sia" - "sigfox" - "sighthound" - "simplisafe" - "simulated" - "slack" - "sleepiq" - "sma" - "smappee" - "smart_meter_texas" - "smarthab" - "smartthings" - "smarttub" - "smhi" - "smtp" - "snips" - "solaredge" - "soma" - "somfy" - "somfy_mylink" - "sonarr" - "songpal" - # disable sonos components test because they rely on ssdp, which doesn't work in our sandbox - # "sonos" - "soundtouch" - "spaceapi" - "spc" - "speedtestdotnet" - "spider" - "spotify" - "sql" - "squeezebox" - "srp_energy" - "ssdp" - "starline" - "startca" - "statistics" - "statsd" - "stream" - "stt" - "subaru" - "sun" - "surepetcare" - "switch" - "switcher_kis" - "syncthing" - "syncthru" - "synology_dsm" - "system_health" - "system_log" - "tado" - "tag" - "tasmota" - "tcp" - "telegram" - "tellduslive" - "template" - "threshold" - "tibber" - "tile" - "time_date" - "timer" - "tod" - "tomato" - "toon" - "totalconnect" - "tplink" - "traccar" - "trace" - "tradfri" - "transmission" - "transport_nsw" - "trend" - "tts" - "tuya" - "twentemilieu" - "twilio" - "twinkly" - "twitch" - "uk_transport" - "unifi" - "unifi_direct" - "universal" - "upb" - "upcloud" - "updater" - # disabled, because it tries to join a multicast group and fails to find a usable network interface - # "upnp" - "uptime" - "uptimerobot" - "usgs_earthquakes_feed" - "utility_meter" - "uvc" - "vacuum" - "velbus" - # disabled, because it includes onewire component tests, for which we lack p1wire dependency - # "venstar" - "vera" - "verisure" - "version" - "vesync" - "vilfo" - "vizio" - "vlc_telnet" - "voicerss" - "volumio" - "vultr" - "wake_on_lan" - "wallbox" - "water_heater" - "waze_travel_time" - "weather" - "webhook" - "webostv" - "websocket_api" - "wemo" - "wiffi" - "wilight" - "wled" - "workday" - "worldclock" - "wsdot" - "xbox" - "xiaomi" - "xiaomi_aqara" - # disabled, because we require cryptography>=35.0 for the miio package - # "xiaomi_miio" - "yamaha" - "yandex_transport" - "yandextts" - "yeelight" - "youless" - # disabled, because it tries to join a multicast group and fails to find a usable network interface - # "zeroconf" - "zerproc" - "zha" - "zodiac" - "zone" - "zwave" - "zwave_js" - ] ++ lib.optionals (builtins.any (s: s == stdenv.hostPlatform.system) debugpy.meta.platforms) [ - "debugpy" ]; pytestFlagsArray = [ @@ -929,120 +289,46 @@ in with py.pkgs; buildPythonApplication rec { "--only-rerun RuntimeError" # enable full variable printing on error "--showlocals" - # here_travel_time/test_sensor.py: Tries to access HERE API: herepy.error.HEREError: Error occured on __get - "--deselect tests/components/here_travel_time/test_sensor.py::test_invalid_credentials" - # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts - "--deselect tests/components/screenlogic/test_config_flow.py::test_form_cannot_connect" - # abode/test_camera.py: Race condition in pickle file creationg - "--deselect tests/components/abode/test_camera.py::test_camera_off" - # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error - "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" - # shelly/test_config_flow.py: Tries to join multicast group - "--deselect tests/components/shelly/test_config_flow.py::test_form" - "--deselect tests/components/shelly/test_config_flow.py::test_title_without_name" - "--deselect tests/components/shelly/test_config_flow.py::test_form_auth" - "--deselect tests/components/shelly/test_config_flow.py::test_form_errors_test_connection" - "--deselect tests/components/shelly/test_config_flow.py::test_user_setup_ignored_device" - "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" - "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" - "--deselect tests/components/shelly/test_config_flow.py::test_form_auth_errors_test_connection" - "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf" - "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device" - "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" - "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" - "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth" - # prometheus/test_init.py: Spurious AssertionError regarding humidifier_target_humidity_percent metric - "--deselect tests/components/prometheus/test_init.py::test_view" - # smhi/test_init.py: Tries to fetch data from the network: socket.gaierror: [Errno -2] Name or service not known - "--deselect tests/components/smhi/test_init.py::test_remove_entry" - # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known - "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" - "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" - # default_config/test_init.py: Tries to check for updates and fails ungracefully without network access - "--deselect tests/components/default_config/test_init.py::test_setup" - # local_ip/test_{init,config_flow}.py: tries to lookup a route towards a multicast address and fails - "--deselect tests/components/local_ip/test_init.py::test_basic_setup" - "--deselect tests/components/local_ip/test_config_flow.py::test_config_flow" - # netatmo/test_select.py: NoneType object has no attribute state - "--deselect tests/components/netatmo/test_select.py::test_select_schedule_thermostats" - # wemo/test_sensor.py: KeyError for various power attributes - "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" - "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ "tests" - # dynamically add packages required for component tests - ] ++ map (component: "tests/components/" + component) componentTests; + ]; disabledTestPaths = [ # don't bulk test all components "tests/components" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "tests/auth/mfa_modules/test_notify.py" - # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address - "tests/components/emulated_hue/test_upnp.py" - # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com - "tests/components/tado/test_climate.py" - "tests/components/tado/test_water_heater.py" ]; disabledTests = [ # AssertionError: assert 1 == 0 - "test_error_posted_as_event" "test_merge" - # ModuleNotFoundError: No module named 'pyqwikswitch' - "test_merge_id_schema" - # keyring.errors.NoKeyringError: No recommended backend was available. - "test_secrets_from_unrelated_fails" - "test_secrets_credstash" - # generic/test_camera.py: AssertionError: 500 == 200 - "test_fetching_without_verify_ssl" - "test_fetching_url_with_verify_ssl" - # util/test_package.py: AssertionError on package.is_installed('homeassistant>=999.999.999') - "test_check_package_version_does_not_match" - # homeassistant/util/thread.py:51: SystemError - "test_executor_shutdown_can_interrupt_threads" - # {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} - "test_webhook_handle_get_config" - # onboarding tests rpi_power component, for which we are lacking rpi_bad_power library - "test_onboarding_core_sets_up_rpi_power" - "test_onboarding_core_no_rpi_power" - # hue/test_sensor_base.py: Race condition when counting events - "test_hue_events" - # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on' - "test_lock_update_via_pubnub" - "test_door_sense_update_via_pubnub" # Tests are flaky "test_config_platform_valid" - "test_hls_stream" ]; preCheck = '' export HOME="$TEMPDIR" - patch -p1 < ${./patches/tests-mock-source-ip.patch} - # the tests require the existance of a media dir mkdir /build/media # put ping binary into PATH, e.g. for wake_on_lan tests export PATH=${inetutils}/bin:$PATH - - # error out when component test directory is missing, otherwise hidden by xdist execution :( - for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do - test -d "tests/components/$component" || { - >2& echo "ERROR: Tests for component '$component' were enabled, but they do not exist!" - exit 1 - } - done ''; passthru = { - inherit availableComponents extraComponents; - python = py; + inherit + availableComponents + extraComponents + getPackages + python + supportedComponentsWithTests; tests = { - inherit (nixosTests) home-assistant; + nixos = nixosTests.home-assistant; + components = callPackage ./tests.nix { }; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index a3ca2c07cd..cdb60172fa 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ 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 = "20211229.0"; + version = "20211229.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2hACC2542jz1DID7nV28keVVDDBOLW1QDYTLM4S1ZJ0="; + sha256 = "sha256-glVjJ9iOmhAIGD65PHQu9l7Wc/lr5XRya2mi20/UVgs="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 4a2c42ff37..fbe46b2377 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -62,6 +62,7 @@ def get_version(): def parse_components(version: str = "master"): components = {} + components_with_tests = [] with tempfile.TemporaryDirectory() as tmp: with urlopen( f"https://github.com/home-assistant/home-assistant/archive/{version}.tar.gz" @@ -69,9 +70,13 @@ def parse_components(version: str = "master"): tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp) # Use part of a script from the Home Assistant codebase core_path = os.path.join(tmp, f"core-{version}") + + for entry in os.scandir(os.path.join(core_path, "tests/components")): + if entry.is_dir(): + components_with_tests.append(entry.name) + sys.path.append(core_path) from script.hassfest.model import Integration - integrations = Integration.load_dir( pathlib.Path( os.path.join(core_path, "homeassistant/components") @@ -81,7 +86,8 @@ def parse_components(version: str = "master"): integration = integrations[domain] if not integration.disabled: components[domain] = integration.manifest - return components + + return components, components_with_tests # Recursively get the requirements of a component and its dependencies @@ -162,7 +168,7 @@ def main() -> None: packages = dump_packages() version = get_version() print("Generating component-packages.nix for version {}".format(version)) - components = parse_components(version=version) + components, components_with_tests = parse_components(version=version) build_inputs = {} outdated = {} for component in sorted(components.keys()): @@ -205,6 +211,13 @@ def main() -> None: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") f.write(" };\n") + f.write(" # components listed in tests/components for which all dependencies are packaged\n") + f.write(" supportedComponentsWithTests = [\n") + for component, deps in build_inputs.items(): + available, missing = deps + if len(missing) == 0 and component in components_with_tests: + f.write(f' "{component}"' + "\n") + f.write(" ];\n") f.write("}\n") supported_components = reduce(lambda n, c: n + (build_inputs[c][1] == []), diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch index 4094d08ee7..6812ee1915 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch @@ -1,8 +1,8 @@ diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py -index 7cc864727d..69333a5454 100644 +index b3ef88e7ab..b7a8471e1a 100644 --- a/homeassistant/components/network/__init__.py +++ b/homeassistant/components/network/__init__.py -@@ -26,7 +26,7 @@ async def async_get_source_ip( +@@ -30,7 +30,7 @@ async def async_get_source_ip( ) -> str: """Get the source ip for a target ip.""" adapters = await async_get_adapters(hass) diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix new file mode 100644 index 0000000000..8e552ed15e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -0,0 +1,69 @@ +{ lib +, home-assistant +}: + +let + # some components' tests have additional dependencies + extraCheckInputs = with home-assistant.python.pkgs; { + alexa = [ ha-av ]; + camera = [ ha-av ]; + cloud = [ mutagen ]; + config = [ pydispatcher ]; + generic = [ ha-av ]; + google_translate = [ mutagen ]; + nest = [ ha-av ]; + onboarding = [ pymetno rpi-bad-power ]; + voicerss = [ mutagen ]; + yandextts = [ mutagen ]; + zha = [ pydeconz ]; + zwave_js = [ homeassistant-pyozw ]; + }; + + extraDisabledTestPaths = { + tado = [ + # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com + "tests/components/tado/test_climate.py" + "tests/components/tado/test_water_heater.py" + ]; + }; + + extraPytestFlagsArray = { + asuswrt = [ + # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error + "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" + ]; + }; +in lib.listToAttrs (map (component: lib.nameValuePair component ( + home-assistant.overridePythonAttrs (old: { + pname = "homeassistant-test-${component}"; + + dontBuild = true; + dontInstall = true; + + checkInputs = old.checkInputs + ++ home-assistant.getPackages component home-assistant.python.pkgs + ++ extraCheckInputs.${component} or [ ]; + + disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; + + pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray + ++ extraPytestFlagsArray.${component} or [ ] + ++ [ "tests/components/${component}" ]; + + preCheck = old.preCheck + lib.optionalString (component != "network") '' + patch -p1 < ${./patches/tests-mock-source-ip.patch} + ''; + + meta = old.meta // { + broken = lib.elem component [ + "airtouch4" + "glances" + "ridwell" + "venstar" + "yamaha_musiccast" + ]; + # upstream only tests on Linux, so do we. + platforms = lib.platforms.linux; + }; + }) +)) home-assistant.supportedComponentsWithTests) diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index 4f98e3c7da..356b21d354 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -9,21 +9,34 @@ , enableWebDAV ? false, sqlite, libuuid , enableExtendedAttrs ? false, attr , perl +, fetchpatch }: stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.59"; + version = "1.4.63"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU="; + sha256 = "1fgasvif13gvzz4rf5mjpy28cbw9fs4ymhx18494mxgb080pzvra"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-22707.patch"; + url = "https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664.patch"; + sha256 = "0zm2khgllsd1ivh9m7sisfsyrdfz45zsmiwl963wf0gn8m100gzk"; + }) + ]; + postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm + # it's difficult to prevent this test from trying to use /var/tmp (which + # the sandbox doesn't have) so until libredirect has support for mkstemp + # calls it's easiest to disable it + sed -i '/test_mod_ssi/d' src/t/test_mod.c ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix b/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix new file mode 100644 index 0000000000..1aa5f5158a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix @@ -0,0 +1,26 @@ +{ buildGo117Module, fetchFromGitHub, lib, nixosTests }: + +buildGo117Module rec { + pname = "ergo"; + version = "2.9.1"; + + src = fetchFromGitHub { + owner = "ergochat"; + repo = "ergo"; + rev = "v${version}"; + sha256 = "sha256-RxsmkTfHymferS/FRW0sLnstKfvGXkW6cEb/JbeS4lc="; + }; + + vendorSha256 = null; + + passthru.tests.ergochat = nixosTests.ergochat; + + meta = { + changelog = "https://github.com/ergochat/ergo/blob/v${version}/CHANGELOG.md"; + description = "A modern IRC server (daemon/ircd) written in Go"; + homepage = "https://github.com/ergochat/ergo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lassulus tv ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index ef168272fe..9d8a2b31bf 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.1.0"; + version = "16.1.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "0s8nvp1ca30569k1a7glbn2zvvchz35s2r8d08fbs5zjngnz3276"; + sha256 = "sha256-QVFu3f+mwafoNUttLEVMdoZHMJjjH/TpZAGV7ZvIvh0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mapserver/default.nix b/third_party/nixpkgs/pkgs/servers/mapserver/default.nix index 4735264f0a..f8b0d8196f 100644 --- a/third_party/nixpkgs/pkgs/servers/mapserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mapserver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib -, withPython ? true, swig, python +, withPython ? true, swig, python2 }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { proj protobufc zlib - ] ++ lib.optional withPython python; + ] ++ lib.optional withPython python2; cmakeFlags = [ "-DWITH_KML=ON" diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index dbb6fbc84f..e8a887fa93 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.49.2"; + version = "1.50.1"; src = fetchPypi { inherit pname version; - sha256 = "7b795ecfc36e3f57eb7cffbc5ef9da1745b777536416c31509b3e6220c39ca4d"; + sha256 = "sha256-fdO+HJ1+fk+s65jLkPDiG+Ei89x5Fbkh9BUUFQ3NJ3M="; }; buildInputs = [ openssl ]; @@ -31,6 +31,7 @@ buildPythonApplication rec { jinja2 jsonschema lxml + matrix-common msgpack netaddr phonenumbers diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index fc8a299d25..2630bb4d56 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -10,7 +10,7 @@ , storePathAsBuildHash ? false }: let - version = "6.2.1"; + version = "6.3.0"; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -22,7 +22,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "WjBsbW7aEI+MX2I1LrEJh8JgNQ4Do7PpeshXgaQAk1s="; + sha256 = "y3VTDl01UrMpgoN06lf98C+uTu2N9u0EAWYADPpOI3w="; }; ldflags = [ @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "pV/MwMCK8vMzASXuM1+ePcarIgrcNAkFLEdmPya911E="; + sha256 = "PqinkPC7J6Ng1fjTrcAa6ZqiyB2JKkGRdvJ6h2wNS5w="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix index b3fdef8698..33df669aaa 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.3.2"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "v${version}"; - sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f"; + rev = "eebfbe49fc699806e1d71becf261ba0995c91f60"; + hash = "sha256-zfsuoPySIRAAmsSL0NUUVH7k+xV7rZOHOkIvBQdVe0A="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -30,9 +30,13 @@ python3.pkgs.buildPythonPackage rec { ruamel-yaml unpaddedbase64 yarl + zstandard ] ++ lib.optional enableSystemd systemd; - doCheck = false; + postPatch = '' + # Drop version limiting so that every dependency update doesn't break this package. + sed -i -e 's/,<.*//' requirements.txt + ''; postInstall = '' mkdir -p $out/bin @@ -44,6 +48,10 @@ python3.pkgs.buildPythonPackage rec { chmod +x $out/bin/mautrix-facebook ''; + checkPhase = '' + $out/bin/mautrix-facebook --help + ''; + meta = with lib; { homepage = "https://github.com/mautrix/facebook"; description = "A Matrix-Facebook Messenger puppeting bridge"; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index 6b11b38642..7bdb29b08e 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "unstable-2021-11-12"; + version = "unstable-2022-01-13"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; - rev = "2e57810e964c1701df2e69273c2f8cebbe021464"; - sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8="; + rev = "e015852a9969ac169e215c80872199ba3f3d838f"; + sha256 = "sha256-7+0JubSGmQDMr7n1PK6i7homR1WknMz9ikC4164XmMo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index d0d11f0937..7579db1c09 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGo117Module rec { pname = "mautrix-whatsapp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw="; + sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-maGnlnxyhrvW0NkHmHWEvNge5c/HxLDm8NuWR6zcdYg="; + vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index 6a63292301..bc047f6552 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -2,57 +2,37 @@ , fetchFromGitHub , fetchpatch , srt -, ffmpeg_3_4 , bc , pkg-config , perl -, openssl +, openssl_3_0 , zlib , ffmpeg , libvpx , libopus +, libuuid , srtp , jemalloc , pcre2 }: -let - ffmpeg = ffmpeg_3_4.overrideAttrs (super: { - pname = "${super.pname}-ovenmediaengine"; - src = fetchFromGitHub { - owner = "Airensoft"; - repo = "FFmpeg"; - rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4 - sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11"; - }; - }); -in stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.10.9-hotfix"; + version = "0.12.9"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am"; + sha256 = "0d3ymw747frl40w5d6r33lf1s72v7fiv742yjr1m6la2phb9h834"; }; - patches = [ - (fetchpatch { - # Needed to fix compilation under GCC 10. - url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch"; - sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw"; - stripLen = 1; - }) - ]; - sourceRoot = "source/src"; makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; + buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; preBuild = '' patchShebangs core/colorg++ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index 05e7654bf5..791c323775 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-9xbtZeufDhci3yTsxAcPcYtnEhOg9k/K8a44SXXiAY0="; + sha256 = "sha256-GJwNJRH7Ib4b3ZP0JHDMZD6h/AZvpRpIaZUDtnLFVoc="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 96879c3408..0a460e335b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.4.1"; + version = "2.4.2"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-QLHhGAeTtXe/76uMombWBORXGvfaUQMGCgkeGCnI0Ag="; + sha256 = "sha256-HSEdN3PN4wQQ3A7bICNIAgdwhwD/PIUeOdW9ZgwmbCw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index eba2347333..ed6afbcd25 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, file +, openssl +, makeWrapper +, which +, curl +}: stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "1.80.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "1jkwii45hynil1jail9gmz4bak066rdi8zfcczicjsa6npbz50w4"; + sha256 = "sha256-HNvchmP975k971EYpDFCqxx8w1Oq/IIEy+r1il0PjmQ="; }; - patches = [ - # https://github.com/matteocorti/check_ssl_cert/pull/114 - (fetchpatch { - url = "https://github.com/matteocorti/check_ssl_cert/commit/2b7aad583d507a70605dd44d918739a65b267bfd.patch"; - sha256 = "1jk872jgm6k3qc1ks1h3v6p804spjlnxcj2wc8v0hkmwfwiwd2k4"; - }) + nativeBuildInputs = [ + makeWrapper ]; - nativeBuildInputs = [ makeWrapper ]; - - makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; + makeFlags = [ + "DESTDIR=$(out)/bin" + "MANDIR=$(out)/share/man" + ]; postInstall = '' wrapProgram $out/bin/check_ssl_cert \ @@ -29,8 +34,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A Nagios plugin to check the CA and validity of an X.509 certificate"; - license = licenses.gpl3; + description = "Nagios plugin to check the CA and validity of an X.509 certificate"; + homepage = "https://github.com/matteocorti/check_ssl_cert"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 47bb3027af..226294e5f4 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.6.3"; + version = "2.7.0"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,13 +12,13 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-7srDyTsIyac4AYwTFpDji4Czg6rRK9evb4W25CqQgGk="; + sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; }; meta = { description = "High-Performance server for NATS"; license = licenses.asl20; - maintainers = [ maintainers.swdunlop ]; + maintainers = with maintainers; [ swdunlop derekcollison ]; homepage = "https://nats.io/"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index 3de95b4f11..4d6fdbda63 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.22.1"; + version = "0.23.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-VdYyui0fyoNf1q3M1xTg/UMlxIFABqAbqQaD0bLpKCY="; + sha256 = "sha256-Uol1A4+0V4dUQ7Qw0qRUWHzFBugVDYSulDGTJZ4a+ts="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 099920b284..32bc4449e1 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -1,38 +1,27 @@ -{lib, stdenv, fetchurl, java, makeWrapper}: -let - s = # Generated upstream information - rec { - baseName="apache-jena"; - version = "4.3.2"; - name="${baseName}-${version}"; - url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; +{ lib, stdenv, fetchurl, java, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "apache-jena"; + version = "4.3.2"; + src = fetchurl { + url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y="; }; buildInputs = [ makeWrapper ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; installPhase = '' cp -r . "$out" for i in "$out"/bin/*; do wrapProgram "$i" --prefix "PATH" : "${java}/bin/" done ''; - meta = { - inherit (s) version; + meta = with lib; { description = "RDF database"; - license = lib.licenses.asl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "https://jena.apache.org"; downloadPage = "https://archive.apache.org/dist/jena/binaries/"; - updateWalker = true; - downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 65a9dff341..d7c53bc7aa 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -1,23 +1,15 @@ -{lib, stdenv, fetchurl, java, makeWrapper}: -let - s = # Generated upstream information - rec { - baseName="apache-jena-fuseki"; - version = "4.3.1"; - name="${baseName}-${version}"; - url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; +{ lib, stdenv, fetchurl, java, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "apache-jena-fuseki"; + version = "4.3.1"; + src = fetchurl { + url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx"; }; buildInputs = [ makeWrapper ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; installPhase = '' cp -r . "$out" chmod +x $out/fuseki @@ -29,14 +21,12 @@ stdenv.mkDerivation { ; done ''; - meta = { - inherit (s) version; + meta = with lib; { description = "SPARQL server"; - license = lib.licenses.asl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "https://jena.apache.org"; downloadPage = "https://archive.apache.org/dist/jena/binaries/"; - downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/ombi/default.nix b/third_party/nixpkgs/pkgs/servers/ombi/default.nix index 0be7a3f009..1e63b44450 100644 --- a/third_party/nixpkgs/pkgs/servers/ombi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-4kvcBRMMH4AnTKSES5Cpst/omTRXVRq1V1y/z5njKJI="; - arm64-linux_hash = "sha256-NLsf0ldvlKSrHJyAXv5Ar2zIetoga6iZPOGTxFOqoQQ="; - x64-osx_hash = "sha256-tjvGuShz/fv3qUknFVKJ+tE/bVtIyPZ7dr4JfTEcDJY="; + x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ="; + arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ="; + x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.0.1468"; + version = "4.3.3"; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/ombi/update.sh b/third_party/nixpkgs/pkgs/servers/ombi/update.sh index 1503edde99..a549a9f173 100755 --- a/third_party/nixpkgs/pkgs/servers/ombi/update.sh +++ b/third_party/nixpkgs/pkgs/servers/ombi/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix to-sri --type sha256 $hash)" + sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 980e645771..b2a1b78e85 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.25.2.5319-c43dc0277"; + version = "1.25.3.5409-f11334058"; 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 = "09kkkyli5fygyvlzqd46jzi0y4jp0a24d92ayvfm95gm3fcxl73x"; + hash = "sha256-Q0768UxZXSuUm26Ro2XIrw8qoQEWCU23P7EBtbiIa0c="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "17whd724sjblqxz6d79jb6hrqvkgg5mbh3bh1lr9b8sswa3pxb07"; + hash = "sha256-TaOvXVeo385vqtv/dYvmQQx8c1K/EMw4MTDucg511Cs="; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index d55888066a..df2e9fe03a 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.11"; + version = "0.25.24"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-0/Ez10IWvh84G//1vCZMLiu4+Y2+XcVLw9Gm9X+DY0s="; + sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index eb04a473d2..ca1b1249ce 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M/kvfGhB2s8TvmpL7KihorVTOfwp7HmKka4IAgnIQ6M="; + sha256 = "sha256-T6bg+yeG/xtpqJqZnR5Dt/3P/O6Mv7nkSc3wYAftmIk="; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix index 6f5411340e..eaf9c389e9 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -1,6 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql }: +{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql +# For test +, runCommand, coreutils, gnugrep }: -stdenv.mkDerivation rec { +let self = stdenv.mkDerivation rec { pname = "plv8"; version = "3.0.0"; @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' + # We build V8 as a monolith, so this is unnecessary. + substituteInPlace Makefile.shared --replace "-lv8_libplatform" "" patchShebangs ./generate_upgrade.sh substituteInPlace generate_upgrade.sh \ --replace " 2.3.10)" " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15)" @@ -42,10 +46,36 @@ stdenv.mkDerivation rec { rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" ''; - # Without this, PostgreSQL will crash at runtime. - # The flags are only included in Makefile, not Makefile.shared. - # https://github.com/plv8/plv8/pull/469 - NIX_CFLAGS_COMPILE = "-DJSONB_DIRECT_CONVERSION -DV8_COMPRESS_POINTERS=1 -DV8_31BIT_SMIS_ON_64BIT_ARCH=1"; + NIX_CFLAGS_COMPILE = [ + # V8 depends on C++14. + "-std=c++14" + # Without this, PostgreSQL will crash at runtime. + # The flags are only included in Makefile, not Makefile.shared. + # https://github.com/plv8/plv8/pull/469 + "-DJSONB_DIRECT_CONVERSION" "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" + ]; + + passthru.tests.smoke = runCommand "${pname}-test" {} '' + export PATH=${lib.makeBinPath [ (postgresql.withPackages (_: [self])) coreutils gnugrep ]} + db="$PWD/testdb" + initdb "$db" + postgres -k "$db" -D "$db" & + pid="$!" + + for i in $(seq 1 100); do + if psql -h "$db" -d postgres -c "" 2>/dev/null; then + break + elif ! kill -0 "$pid"; then + exit 1 + else + sleep 0.1 + fi + done + + psql -h "$db" -d postgres -c 'CREATE EXTENSION plv8; DO $$ plv8.elog(NOTICE, plv8.version); $$ LANGUAGE plv8;' 2> "$out" + grep -q "${version}" "$out" + kill -0 "$pid" + ''; meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; @@ -54,4 +84,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = licenses.postgresql; }; -} +}; in self diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index e751ae621f..f3df8a99ca 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -26,7 +26,9 @@ self: super: { plr = super.callPackage ./ext/plr.nix { }; - plv8 = super.callPackage ./ext/plv8.nix { }; + plv8 = super.callPackage ./ext/plv8.nix { + v8 = self.v8_8_x; + }; pgjwt = super.callPackage ./ext/pgjwt.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index 078ebfb7b6..142dfe29fa 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -25,7 +25,7 @@ , pcre , perl , prometheus-cpp -, python +, python2 , re2 , zlib }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { cmake libtool perl - python + python2 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/t-rex/default.nix b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix index 48903b9130..8475d5df4d 100644 --- a/third_party/nixpkgs/pkgs/servers/t-rex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "t-rex"; - version = "0.14.2"; + version = "0.14.3-beta4"; src = fetchFromGitHub { owner = "t-rex-tileserver"; repo = pname; rev = "v${version}"; - hash = "sha256-QNowkQzEYLOgJ2h0yq+gShmW5WgqPF3iiSejqwrOrHo="; + hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE="; + }; - cargoHash = "sha256-k10DjLJCJLqjmtEED5pwQDt3mOiey89UYC36lG+3AmM="; + cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 28eabf543d..2149f77243 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.18.2"; + version = "1.20.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-8leFG2gYXw+orN/2NfjTvgRqSZSdso7OHIgECEJrO9k="; + sha256 = "sha256-n+94ipR1w63NS2tzMsJWY4oxeTBEWrp8e2gF+CTpvrI="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k="; + vendorSha256 = "sha256-ZbOxC8J843B8BMS/ZgfSZqU1YCUoWhPqbABzWZy3DMI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/timetagger/default.nix b/third_party/nixpkgs/pkgs/servers/timetagger/default.nix new file mode 100644 index 0000000000..5e4629f455 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/timetagger/default.nix @@ -0,0 +1,39 @@ +{ lib +, pkgs +, python3Packages +, fetchFromGitHub + +, addr ? "127.0.0.1" +, port ? 8082 +}: + +# +# Timetagger itself is a library that a user must write a "run.py" script for +# We provide a basic "run.py" script with this package, which simply starts +# timetagger. +# + +let + tt = python3Packages.timetagger; +in +python3Packages.buildPythonPackage rec { + pname = tt.name; + version = tt.version; + src = tt.src; + meta = tt.meta; + + propagatedBuildInputs = [ tt ] + ++ (with python3Packages; [ + setuptools + ]); + + format = "custom"; + installPhase = '' + mkdir -p $out/bin + echo "#!${pkgs.python3}/bin/python3" >> $out/bin/timetagger + cat run.py >> $out/bin/timetagger + sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger + chmod +x $out/bin/timetagger + ''; +} + diff --git a/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix b/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix index 6c853b1ccc..64e8d423d9 100644 --- a/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2 , v4l-utils, which, zlib }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2 which zlib ]; diff --git a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix b/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix index 9498000c3f..b969902b25 100644 --- a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "unifiedpush-common-proxies"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "unifiedpush"; repo = "common-proxies"; rev = "v${version}"; - sha256 = "sha256-V6LTEwdnVkxc2wm8anlYeYJpk/mMQEsKrq69H8okHBg="; + sha256 = "0wf6kmj8m2c06864qiphf91j5rpaj3bvjrafdk6lqli14p5gmma2"; }; - vendorSha256 = "sha256-s0uN6PzIaAHLvRb9T07Xvb6mMAuvKHQ4oFJtl5hsvY4="; + vendorSha256 = "13mxdjc9fvajl0w78a5g1cqadgmxsx74zz8npp5h2s68zkl8sjxk"; meta = with lib; { description = "A set of rewrite proxies and gateways for UnifiedPush"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json index 5007b55d48..bb7dc863d5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.14.0", + "version": "0.15.1", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -17,13 +17,14 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.4.0", + "@typescript-eslint/parser": "^5.6.0", "autosize": "^5.0.1", "check-password-strength": "^2.0.3", - "choices.js": "^9.0.1", + "choices.js": "^10.0.0", + "classnames": "^2.3.1", "emoji-short-name": "^1.0.0", "express": "~4.17.1", - "i18next": "^21.5.0", + "i18next": "^21.5.4", "inferno": "^7.4.11", "inferno-create-element": "^7.4.11", "inferno-helmet": "^5.2.1", @@ -39,46 +40,45 @@ "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", "moment": "^2.29.1", - "reconnecting-websocket": "^4.4.0", "register-service-worker": "^1.7.2", "rxjs": "^7.4.0", + "sass": "^1.47.0", "serialize-javascript": "^6.0.0", "tippy.js": "^6.3.7", "toastify-js": "^1.11.2", "tributejs": "^5.1.3", - "ws": "^8.2.3" + "websocket-ts": "^1.1.1" }, "devDependencies": { "@babel/core": "^7.16.0", - "@babel/plugin-transform-runtime": "^7.16.0", + "@babel/plugin-transform-runtime": "^7.16.4", "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.0", + "@babel/preset-env": "7.16.8", "@babel/preset-typescript": "^7.16.0", "@babel/runtime": "^7.16.3", "@types/autosize": "^4.0.0", "@types/express": "^4.17.13", - "@types/node": "^16.11.7", + "@types/node": "^17.0.8", "@types/node-fetch": "^2.5.11", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/eslint-plugin": "^5.6.0", "babel-loader": "^8.2.3", "babel-plugin-inferno": "^6.3.0", "bootstrap": "^5.1.3", "bootswatch": "^5.1.3", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^9.1.0", + "copy-webpack-plugin": "^10.0.0", "css-loader": "^6.5.1", - "eslint": "^8.2.0", + "eslint": "^8.4.0", "eslint-plugin-prettier": "^4.0.0", "husky": "^7.0.4", "import-sort-style-module": "^6.0.0", "iso-639-1": "^2.1.10", - "lemmy-js-client": "0.14.0-rc.1", - "lint-staged": "^11.2.6", - "mini-css-extract-plugin": "^2.4.4", + "lemmy-js-client": "0.15.0", + "lint-staged": "^12.1.2", + "mini-css-extract-plugin": "^2.4.5", "node-fetch": "^2.6.1", - "node-sass": "^6.0.1", - "prettier": "^2.4.1", + "prettier": "^2.5.1", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^2.3.4", "prettier-plugin-packagejson": "^2.2.15", @@ -88,10 +88,10 @@ "sortpack": "^2.2.0", "style-loader": "^3.3.1", "terser": "^5.10.0", - "typescript": "^4.4.4", - "webpack": "5.64.1", + "typescript": "^4.5.2", + "webpack": "5.66.0", "webpack-cli": "^4.9.1", - "webpack-dev-server": "4.5.0", + "webpack-dev-server": "4.7.3", "webpack-node-externals": "^3.0.0" }, "engines": { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json index 399fa68c8d..9a588b54da 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.14.0", - "serverSha256": "sha256-rrLOWoy4GkVtfIPpyR0Zwvnqq39CoZRDaVPNSpeJpkA=", - "serverCargoSha256": "sha256-6HrsMwzcmNw8udsCdvn8zgIWN0N3Vvsn9bFk+5tBOds=", - "uiSha256": "sha256-e+ajyUc2P5eK1dH7qQsC9BmZgT3NCGLbbzbUE3i2rXY=", - "uiYarnDepsSha256": "sha256-g3jCc98ftFyvZGD2bESY1eIsLZyQxZpDxgHdRGu78vs=" + "version": "0.15.1", + "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", + "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", + "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", + "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix index 558cbb9ee7..b58851f990 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix @@ -6,6 +6,7 @@ , postgresql , libiconv , Security +, protobuf }: let pinData = lib.importJSON ./pin.json; @@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec { OPENSSL_LIB_DIR = "${openssl.out}/lib"; OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + nativeBuildInputs = [ protobuf ]; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index 085048ae68..932372d2b3 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -1344,6 +1344,21 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja }: stdenv.mkDerivation { + pname = "libxcvt"; + version = "0.1.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz"; + sha256 = "0acc7vrj5kfb19zvyl7f29rnsvx383dvwc19k70r8prm1lccxsr7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) {}; + # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { pname = "libxkbfile"; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 62873ceda4..bd81f7fa51 100755 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -23,7 +23,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" ); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja" ); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -229,6 +229,7 @@ while (<>) { push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/; push @requires, "libxslt" if $pkg =~ /libxcb/; + push @nativeRequires, "meson", "ninja" if $pkg =~ /libxcvt/; push @nativeRequires, "m4" if $pkg =~ /xcbutil/; push @requires, "gperf", "xorgproto" if $pkg =~ /xcbutil/; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 75503b3a73..96a5ac712f 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -181,6 +181,7 @@ mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libxcb-1.14.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 773632328a..1e60f43058 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -20,7 +20,7 @@ let ); in stdenv.mkDerivation rec { - version = "0.11.10"; # also update communityModules + version = "0.11.12"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"; + sha256 = "03an206bl3h2lqcgv1wfvc2bqjq6m9vjb2idw0vyvczm43c55kan"; }; # A note to all those merging automated updates: Please also update this @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "64fafbeba14d"; - sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; + rev = "bd0a1f917d98"; + sha256 = "0figx0b0y5zfk5anf16h20y4crjmpb6bkg30vl7p0m594qnyqjcx"; }; nativeBuildInputs = [ makeWrapper ]; @@ -86,7 +86,6 @@ stdenv.mkDerivation rec { communityModules = withCommunityModules; tests = { main = nixosTests.prosody; - mysql = nixosTests.prosodyMysql; }; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix index 7fb2d78619..6af5fe7cc6 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -25,7 +25,7 @@ # installed. # { fetchFromGitHub -, python +, python2 , git , lib , haskellPackages @@ -45,7 +45,7 @@ haskellPackages.callPackage prePatch = '' substituteInPlace zshrc.sh \ --replace ':-"python"' ':-"haskell"' \ - --replace 'python ' '${python.interpreter} ' \ + --replace 'python ' '${python2.interpreter} ' \ --replace 'git ' '${git}/bin/git ' ''; preCompileBuildDriver = "cd src"; diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 3d7183c786..7cfec7aaff 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.5.3.3"; + version = "0.6.0.2"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "sha256-k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI="; + sha256 = "sha256-qPlya5f12Cc1yAK8dliWelA7drAoeeIkFXOD+aDeToo="; }; debPkg = fetchurl { @@ -33,10 +33,10 @@ buildDotnetModule rec { sha256 = "sha256-LJqH3+JckPF7S/1uBE2X81jxWg0MF9ff92Ei8WPEA2w="; }; - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; - dotnetInstallFlags = [ "--framework=net5" ]; + dotnetInstallFlags = [ "--framework=net6.0" ]; projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ]; nugetDeps = ./deps.nix; @@ -62,19 +62,30 @@ buildDotnetModule rec { doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; - # Require networking disabledTests = [ + # Require networking "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarballFork" "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarball" + # Require networking & unused in Linux build + "OpenTabletDriver.Tests.UpdaterTests.UpdaterBase_ProperlyChecks_Version_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_PreventsUpdate_WhenAlreadyUpToDate_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_AllowsReupdate_WhenInstallFailed_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_During_UpdateInstall_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_After_UpdateInstall_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_Prevents_ConcurrentAndConsecutive_Updates_Async" + "OpenTabletDriver.Tests.UpdaterTests.Updater_ProperlyBackups_BinAndAppDataDirectory_Async" + # Intended only to be run in continuous integration, unnecessary for functionality + "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting" + # Depends on processor load + "OpenTabletDriver.Tests.TimerTests.TimerAccuracy" ]; - postInstall = '' + postFixup = '' # Give a more "*nix" name to the binaries mv $out/bin/OpenTabletDriver.Console $out/bin/otd mv $out/bin/OpenTabletDriver.Daemon $out/bin/otd-daemon mv $out/bin/OpenTabletDriver.UX.Gtk $out/bin/otd-gui - cp -r ./OpenTabletDriver/Configurations $out/lib/${pname} install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix index f1fc303d8c..1cfb58299a 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/deps.nix @@ -1,7 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "3.0.3"; sha256 = "1igcqqr2kh6w9qx0h89y6c2zg4g2h7g8kc2lv5pz3xk6nd8iv7pw"; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "3.0.2"; sha256 = "1xf6z6izmsl4g8w3z1wbp4pa8f8qsf6sil4mf1c9fb22hq8c5hkg"; }) (fetchNuGet { pname = "Eto.Forms"; version = "2.5.10"; sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) (fetchNuGet { pname = "Eto.Forms"; version = "2.5.11"; sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; }) (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.5.11"; sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; }) @@ -12,29 +13,33 @@ (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { pname = "MessagePack"; version = "2.1.194"; sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.194"; sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; }) (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 = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.2"; sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.2"; sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z"; }) + (fetchNuGet { pname = "Moq"; version = "4.16.1"; sha256 = "1m2gwbx0gsy84rl9c3hgdaw9gz8d08ffg19nwg0idsdqmmiq887l"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.77"; sha256 = "13dnfwxa8syx7vfjmd5pcrqz31k0q8y3mmh6yz6bmljhjri65q5c"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (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 = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "Octokit"; version = "0.50.0"; sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; }) @@ -74,18 +79,23 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.20253.1"; sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) @@ -135,6 +145,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) @@ -172,5 +183,14 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "WaylandNET"; version = "0.2.0"; sha256 = "1qjpvra08vdqdw4j1gamz6451x5sd5r1j86lsvrl8akq4nymfr8k"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) ] diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh index 20820eb69d..1524a99501 100755 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6 dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 728fcf6eec..6f6e06db2a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.30.0"; + version = "2.32.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-b4hNacraNomhiFGEiHcMweqbEq3vTHus+xbFPv5X5HQ="; + sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM="; }; # put packages that needs to be overriden in the py package scope diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 6e7504e5ab..a917112cc5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -68,7 +68,6 @@ let postPatch = '' substituteInPlace setup.py \ - --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -145,17 +144,17 @@ let azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "3.0.0" "zip" - "sha256-GZJIayjd1tT1l/0wBCF80sr09NyKDOcSJrWudnrOOhg="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "4.0.0" "zip" + "a848ac1d99c935e61dfb91ca3e1577904a3eff5820fce179eb6937df8e1019ec"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip" - "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "20.0.0" "zip" + "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" - "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip" + "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM="; @@ -181,17 +180,17 @@ let azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip" "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" - "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" + "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.3.0" "zip" - "sha256-0Bt3JfP2jFpv8CGEqb3ajHdYiK9mN43YMUkD0KRuMrk="; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip" + "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0b1" "zip" - "sha256-WEF5HuiaUTnka/2w0cVX/VwRt8/GD0+5fqGkn1BVx4I="; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip" + "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -200,16 +199,16 @@ let "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" - "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a4a"; + "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip" - "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip" + "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.1.0" "zip" - "sha256-Yu9/6LqY5WQStDTJw13HVbPF5GnywBu+0s4NEpc6BEs="; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip" + "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; @@ -238,8 +237,8 @@ let azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; - azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.0.0" "zip" - "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.1.0" "zip" + "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179"; azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -271,8 +270,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "9.1.0" "zip" "0ba9f10e1e8d03247a316e777d6f27fabf268d596dda2af56ac079fcdf5e7afe"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.2.0" "zip" - "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.3.0" "zip" + "54156422e618b686d52232a7989594b240bd18afd0fa381e12e4772ed4ab5ea8"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; @@ -280,8 +279,8 @@ let azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.2.0" "zip" "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" - "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "3.0.0" "zip" + "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; @@ -348,11 +347,11 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.8.0"; + version = "0.10.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-PU/f0L1maYT3vce8DHpgGMNaXUaoGjLdGTsHwDtSi3I="; + sha256 = "sha256-P3gsm1kLiuQ2eMbgA9+MqMymdYMgOdJwsLdDf/AVV/0="; extension = "zip"; }; }); @@ -492,12 +491,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.2"; + version = "0.9.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-TqpQocXnnRxcjl4XBbZhchsLg6CJaV5Z4inMJsZJY7k="; + sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f"; }; }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 988bd3ec2b..9bb3ef46d9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.21.0"; + version = "3.22.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-x64.tar.gz"; - sha256 = "110ab7i3ynkjhbk10q150p7301prffk4xqma79rk28cxxvxf4kk3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-x64.tar.gz"; + sha256 = "0yxjlkvyxap4c7ny5x0ch0j4d5360qapb670f6im7vnaqhc00by0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-amd64.tar.gz"; sha256 = "02k3ars9i8pfby3070rnnldfcb5hbh32kd5xnbmgd0202yg5y3pd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-linux-amd64.tar.gz"; - sha256 = "13i6jmy2nyv80d0ab29yw489qwnf7i0yjrns1d124gijdd30zh0l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-amd64.tar.gz"; + sha256 = "0c61m2q7944a29dkcqcv5fv9jn2bz8mdfhnd33z8qaybhw2804rd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-linux-amd64.tar.gz"; - sha256 = "1g0v7vqrf5237vv0ki74j6zb18zas8i3ii5w9fvy4mg9x4k37d4k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-amd64.tar.gz"; + sha256 = "0k5bpg6lmhj3cxsg43dkyw9jlwyllwwdhml3brkyfgb307cypl9b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-amd64.tar.gz"; @@ -45,12 +45,12 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-linux-amd64.tar.gz"; - sha256 = "0s9k26yw4lw8rlaz0zcim234bz4sz94x3y4sjh56sn3cd80zcp8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-amd64.tar.gz"; + sha256 = "074ihk1c3g580grbipy0acryjsmaz8n65siyc7yz4gcgcwqwb5mj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-linux-amd64.tar.gz"; - sha256 = "1zvxqxvdi0szsy3bgyhqbwxbcrgq5zpqcawfq80h55g5bvvmjwk7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-amd64.tar.gz"; + sha256 = "0ffbsnpgr6wz9xj5yq6m55xj4mqji7hir6dylyjcpdkrxnigyiss"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-linux-amd64.tar.gz"; - sha256 = "0lhxz3420ghjkny7r3gqfcf84mxm2j86npiwgg2lkgmsb2kmafj7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-amd64.tar.gz"; + sha256 = "02xgkwfsfkqv38cjyc62rlsldbdd5j801gmlh9pf3qjdjj5d1fl3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz"; @@ -103,20 +103,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-x64.tar.gz"; - sha256 = "0pd6jlrw2cc4g33kkl2dfqks5xicmc2bnbrf0cd2ymx9mdnkdaq8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-x64.tar.gz"; + sha256 = "0b68pfrd83x02rs2saybxycpkirjciilp4a94ps3788y1plinyih"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-amd64.tar.gz"; sha256 = "02s2lyd8rlz86rjraxk5g3g55qhih38kmvq0k2gwkdb2d11npf6r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-darwin-amd64.tar.gz"; - sha256 = "1nkg7ybi8n60ypw69w0psap1k3m7pdk4z4vyfciv7lv3qc30nlfa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-amd64.tar.gz"; + sha256 = "1a26schi28ci0zbm85yx4hlhwlwx0j0kk6d6nk9x1zldc3qzhw4y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-darwin-amd64.tar.gz"; - sha256 = "1nabijlwgp6jfhs9pjv5h4bg5s4nwiaqqa315q30ykna8dd7nl5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-amd64.tar.gz"; + sha256 = "04sblbjnxvxhxvzvsgjm83p6qahswwb2mvlylfpgq74ay86l6hki"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-amd64.tar.gz"; @@ -143,12 +143,12 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-darwin-amd64.tar.gz"; - sha256 = "12527gic3sf6ch1773yrwi1g5pp1iyc50q6nhdwwc7vq3sf1ngx9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-amd64.tar.gz"; + sha256 = "046j20xl3ibfyqkcra242a5rpix14n4w3h9w9x618fbznk24bcxb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "0y5c4ifi4jr7nb33c35axmfwyq0c5si28mq0dvwppq0ffz0lifgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-amd64.tar.gz"; + sha256 = "100rqkz0g1w0fhvgvgys9r6a7bqphzizn28lg7pbbkrwjh7s0bxq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-amd64.tar.gz"; @@ -159,8 +159,8 @@ sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-darwin-amd64.tar.gz"; - sha256 = "113xcf5zg7h90r4w50ss3yjivn3vlq4icff76abhphi5m99b50f5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "1dpr4h35zby8say0kcvin5y5k4yryx06p3qcx16zrlsjaz6lj84k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz"; @@ -201,20 +201,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-arm64.tar.gz"; - sha256 = "0484hpbf25kfxac72r74h5rfp5r59hlkhzqib9vma3l1cz9icmyx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-arm64.tar.gz"; + sha256 = "0551zp5n77jzh8k3jbqq75zj734faryxxdd2fvw881cxf95v39aj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-arm64.tar.gz"; sha256 = "0rlbcxympplq1gwikxalz3c686kpy2vrsc2phfnm45vvrkl22k8j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-linux-arm64.tar.gz"; - sha256 = "00gps0dmidkvbxcljwwxlrh6i9ci4lzgnycc4f2vibm2yfx38d4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-arm64.tar.gz"; + sha256 = "0639dl0hj2l33mc4vqbcyywpkfn30fikmiw10zjikcdg1jxzj4nd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-linux-arm64.tar.gz"; - sha256 = "0zg7g4m9rvm24njn90m9ppfprzl08cmm0min0p467h617pyxlii2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-arm64.tar.gz"; + sha256 = "15lxfilkgh9ansy9n2yv693fms3x718lrxz0g2nxi32hz9hq0ysl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-arm64.tar.gz"; @@ -241,12 +241,12 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-linux-arm64.tar.gz"; - sha256 = "0s07gqviacygag8k4q8zbwwp127zsk0kiiqpz4y0gc95pg872bi1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-arm64.tar.gz"; + sha256 = "0r53qwf1w68bnqii20b44q1xlgxggsisnlr46463nxm0jb0wwyn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-linux-arm64.tar.gz"; - sha256 = "1c2g5kzyi0vcah1inpa3a974kcsgdlw0a6gyiij23ryaa5vppk1l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-arm64.tar.gz"; + sha256 = "1zr9vcr6qiql90bysapmrlafl7xmlv49bgp197w4w2290i5q7f6n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-arm64.tar.gz"; @@ -257,8 +257,8 @@ sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-linux-arm64.tar.gz"; - sha256 = "02hd6bkhvg27pnn0ph6vb0ns90m8kllfiv1xglsr9yxib25g3bci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-arm64.tar.gz"; + sha256 = "12lnh8hk02w1n28v6i46kxxpkzw1j9zp84ha5p6bnarza6g4wxnk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz"; @@ -296,20 +296,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-arm64.tar.gz"; - sha256 = "01446r5q9a684k0z5b6d2a7gdjszy2816v09jdxkc54cg37fhmlz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-arm64.tar.gz"; + sha256 = "00jzqrnw6khbw5hsaqwi73hx9h3yxdhy2n3jn3h76az27wfjkhkz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-arm64.tar.gz"; sha256 = "116f1psg3wdl81apxlhgz6w1ykhlqxwqk6ahp82mca1h2qc7bg0h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-darwin-arm64.tar.gz"; - sha256 = "0b67z5ikmplnjcb3gghcmzkdj8sgv6kd0b1a4f9dbv22dds6qbih"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-arm64.tar.gz"; + sha256 = "1rzds5wrq51mzs7sgzwna016qcay3dzp5ys25cxmr47025kyv84p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-darwin-arm64.tar.gz"; - sha256 = "12rx7cma3mi8a6w09qzz138dns93y5rdgm5l9z422vjynhs0jpm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-arm64.tar.gz"; + sha256 = "1lqmjkqqq3rlsixv2kam50d5m95c81mn23y3dblbkh8d6qpwkfdp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-arm64.tar.gz"; @@ -336,12 +336,12 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-darwin-arm64.tar.gz"; - sha256 = "1hswpbzzp18gzz8ggmyfs5ccbhnnk0w9064mvrbpj29baa1brhim"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-arm64.tar.gz"; + sha256 = "1w5nhmc6bzfw0ihv5mwn316sj7w27psknnyffqm1pyw6drp0z58v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-darwin-arm64.tar.gz"; - sha256 = "1znrkq3ch28xdgy6vbx91rb2s2nvm12ihpq945x76swya6z7dvcn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-arm64.tar.gz"; + sha256 = "13w91xxma00zi7llk0hnqi10m90a5b2zhb08j6l0dn7x5a33dqay"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-arm64.tar.gz"; @@ -352,8 +352,8 @@ sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-darwin-arm64.tar.gz"; - sha256 = "11mhabl8sk4q85hvg41l5s82hkw8rccjiw748wsl43wb3qmx66zx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "1rq2wxw0kch7xrk0sr1l6fyz1sslyvk44l3jilzbm7mgi0d77w23"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index 9a185646a7..c2b0818e5b 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -1,86 +1,117 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gh +# shellcheck shell=bash # Bash 3 compatible for Darwin -# For getting the latest version of plugins automatically -API_URL="https://api.github.com/repos/pulumi" +if [ -z "${GITHUB_TOKEN}" ]; then + echo >&2 "usage: GITHUB_TOKEN=… ./update.sh" + exit 1 +fi # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.21.0" +VERSION="3.22.1" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. +declare -a pulumi_repos pulumi_repos=( - "auth0" - "aws" - "azure" - "cloudflare" - "consul" - "datadog" - "digitalocean" - "docker" - "equinix-metal" - "gcp" - "github" - "gitlab" - "hcloud" - "kubernetes" - "linode" - "mailgun" - "mysql" - "openstack" - "packet" - "postgresql" - "random" - "vault" - "vsphere" + "auth0" + "aws" + "azure" + "cloudflare" + "consul" + "datadog" + "digitalocean" + "docker" + "equinix-metal" + "gcp" + "github" + "gitlab" + "hcloud" + "kubernetes" + "linode" + "mailgun" + "mysql" + "openstack" + "packet" + "postgresql" + "random" + "vault" + "vsphere" ) # Contains latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases -# Dynamically builds the plugin array, using the API for getting the +# Dynamically builds the plugin array, using the GitHub API for getting the # latest version. +plugin_num=1 plugins=() for key in "${pulumi_repos[@]}"; do - repo="pulumi-${key}" - plugins+=("${key}=$(curl -s ${API_URL}/${repo}/releases/latest | jq -M -r .tag_name | sed 's/v//g')") - sleep 1 + plugin="${key}=$(gh api "repos/pulumi/pulumi-${key}/releases/latest" --jq '.tag_name | sub("^v"; "")')" + printf "%20s: %s of %s\r" "${plugin}" "${plugin_num}" "${#pulumi_repos[@]}" + plugins+=("${plugin}") + sleep 1 + ((++plugin_num)) done +printf "\n" function genMainSrc() { - local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz" - local sha256 - sha256=$(nix-prefetch-url "$url") - echo " {" - echo " url = \"${url}\";" - echo " sha256 = \"$sha256\";" - echo " }" + local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz" + local sha256 + sha256=$(nix-prefetch-url "$url") + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"$sha256\";" + echo " }" +} + +function genSrc() { + local url="${1}" + local plug="${2}" + local tmpdir="${3}" + + local sha256 + sha256=$(nix-prefetch-url "$url") + + { + if [ -n "$sha256" ]; then # file exists + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"$sha256\";" + echo " }" + else + echo " # pulumi-resource-${plug} skipped (does not exist on remote)" + fi + } > "${tmpdir}/${plug}.nix" } function genSrcs() { - for plugVers in "${plugins[@]}"; do - local plug=${plugVers%=*} - local version=${plugVers#*=} - # url as defined here - # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197 - local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz" - local sha256 - sha256=$(nix-prefetch-url "$url") - if [ "$sha256" ]; then # file exists - echo " {" - echo " url = \"${url}\";" - echo " sha256 = \"$sha256\";" - echo " }" - else - echo " # pulumi-resource-${plug} skipped (does not exist on remote)" - fi - done + local tmpdir + tmpdir="$(mktemp -d)" + + local i=0 + + for plugVers in "${plugins[@]}"; do + local plug=${plugVers%=*} + local version=${plugVers#*=} + # url as defined here + # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197 + local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz" + genSrc "${url}" "${plug}" "${tmpdir}" & + ((++i)) + done + + wait + + find "${tmpdir}" -name '*.nix' -print0 | sort -z | xargs -r0 cat + rm -r "${tmpdir}" } { - cat < $testFile - $out/bin/lsd --classic --blocks "size,name" -l $testFile | grep "4 B $testFile" - $out/bin/lsd --version | grep "${version}" - rm $testFile - - runHook postInstallCheck - ''; + passthru.tests.version = testVersion { + package = lsd; + }; meta = with lib; { homepage = "https://github.com/Peltoche/lsd"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix index d8e09e72f7..46e0ce9280 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "mimeo"; - version = "2021.2"; + version = "2021.11"; src = fetchurl { - url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; - sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf"; + url = "https://xyne.dev/projects/mimeo/src/${pname}-${version}.tar.xz"; + sha256 = "1fi8svn4hg2hmvv28j026sks1hc0v8wh974g7ixcwfcg2xda6c4p"; }; buildInputs = [ file desktop-file-utils ]; @@ -23,9 +23,14 @@ python3Packages.buildPythonApplication rec { installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/mimeo --help > /dev/null + ''; + meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = "https://xyne.archlinux.ca/projects/mimeo/"; + homepage = "https://xyne.dev/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix index 8470837278..9024ddb643 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.0.2"; + version = "8.1.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-hMb7bAdk3xFcUe5CTu9LnIR3VSJDUKbMSE86s8d5udM="; + sha256 = "sha256-d3U233dedtZrBWRdb0QElNOd/L1+Ut4CWvkZo5TPU+w="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index bc7baa55fe..bffcd5e1dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python, git +, python2, git }: let jdk = jdk8; jre = jdk8.jre; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf automake curl jdk nettools python git ]; + buildInputs = [ autoconf automake curl jdk nettools python2 git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix index 5c88ea2349..76df2a6882 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb"; + sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix index c5fb8c124f..f65941e784 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pipectl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-wa/SKKNXkl8XxE7XORodoAlrMc2QNGXGPE+/yya209Y="; + hash = "sha256-+o5hIDtDAh4r+AKCUhueQ3GBYf2sZtMATGX73Qg+tbo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index bfc2ce2c0e..4dd19a7f39 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -29,7 +29,7 @@ , bubblewrap , pcre , check -, python +, python2 , json_c , zchunk , libmodulemd @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { librepo pcre check - python + python2 # libdnf # vendored unstable branch # required by vendored libdnf diff --git a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix index 37361abf2b..80d9e191c8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, util-linux, json_c, nixosTests +, lvm2, pam, python2, util-linux, json_c, nixosTests , ncurses }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python util-linux json_c ncurses + lvm2 pam python2 util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 165ed45d7b..770be03243 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rr0HCr/uJDsBQiKJIPdEL3WOaLgMY2Nq2JGOq4dEUxQ="; + sha256 = "sha256-5MJA8eHo1enOHlLpAOF1iDvOHCS/Nw0sc84VWu9nApE="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-UT6t1GbyON/wrIF/oXXhsT3Z61LFjggSPWKpSDHp+PI="; + cargoSha256 = "sha256-DTQQFxj6stzlVzSdmv4J4Nsf8X/VMlwvfIumnuK0YDo="; preCheck = '' HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index fe121c2d51..9d2036b97f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ]; + # workaround https://github.com/NixOS/nixpkgs/issues/155458 + preBuild = lib.optionalString stdenv.cc.isClang '' + rm version + ''; + enableParallelBuilding = true; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 31d5712e5b..9f974c6751 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210917"; + version = "20211213"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk="; + sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix index 597592b4d7..d52a6d4fc7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 7724d2d89f..96a999e277 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , gflags @@ -10,32 +11,46 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.1.9"; + version = "6.1.11"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0kpabxpy779ppkaqaigq0x34ymz1jcwpsa78rm6nr55mdap2xxv6"; + hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo="; }; - cmakeFlags= [ + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gflags + libsodium + openssl + protobuf + zlib + ]; + + cmakeFlags = [ "-DDISABLE_VCPKG=TRUE" "-DDISABLE_SENTRY=TRUE" "-DDISABLE_CRASH_LOG=TRUE" ]; - CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17"; - LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs"; + CXXFLAGS = lib.optional stdenv.cc.isClang [ + "-std=c++17" + ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ gflags openssl zlib libsodium protobuf ]; + LDFLAGS = lib.optional stdenv.cc.isClang [ + "-lc++fs" + ]; meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; - license = licenses.asl20; homepage = "https://eternalterminal.dev/"; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; maintainers = with maintainers; [ dezgeg pingiun ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix deleted file mode 100644 index fc06ba0363..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "getmail"; - version = "5.14"; - - src = fetchurl { - url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "1hcrd9h4g12f5gvl1djsbchcjry02ghq4icdr897s8v48pkrzagk"; - }; - - doCheck = false; - - postPatch = '' - # getmail spends a lot of effort to build an absolute path for - # documentation installation; too bad it is counterproductive now - sed -e '/datadir or prefix,/d' -i setup.py - ''; - - meta = { - description = "A program for retrieving mail"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - - homepage = "http://pyropus.ca/software/getmail/"; - updateWalker = true; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix index 766a1030fd..6062b1ecff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7"; + sha256 = "1zsnsfx18pf5dy1p4jva2sfl0bdfx5y9ls54f9bp70m64r46yf96"; }; strictDeps = true; @@ -70,11 +70,14 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isLinux libselinux; prePatch = '' - # Correct iproute2 path - sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \ - -e 's|"/sbin/iptables"|"${iptables}/bin/iptables"|' \ + # Correct iproute2 and iptables path + sed -e 's|/sbin/ip|${iproute2}/bin/ip|' \ + -e 's|/sbin/\(ip6\?tables\)|${iptables}/bin/\1|' \ -i initsystems/systemd/ipsec.service.in \ + programs/barf/barf.in \ programs/verify/verify.in + sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \ + -i programs/verify/verify.in # Prevent the makefile from trying to # reload the systemd daemon or create tmpfiles diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix index e112b8c1df..3c6eff4d60 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , pkg-config, makeWrapper, autoreconfHook -, openldap, python, pam +, openldap, python2, pam }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; - buildInputs = [ openldap pam python ]; + buildInputs = [ openldap pam python2 ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 46375b60fe..e2805f0ccf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -24,7 +24,7 @@ let generic = { version, sha256 }: let - withIpRoute = stdenv.isLinux && (versionOlder version "2.5"); + withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4"); in stdenv.mkDerivation rec { @@ -83,7 +83,7 @@ in }; openvpn = generic { - version = "2.5.2"; - sha256 = "sha256-sSdDg2kB82Xvr4KrJJOWfhshwh60POmo2hACoXycHcg="; + version = "2.5.5"; + sha256 = "sha256-EZvWn6AhCDj2zaonNpbcc476IA9FTb4R6237dd+2ADs="; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix b/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix index 60bd2f8cc7..dc447f3a86 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "philter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,share/philter} cp .philterrc "$out"/share/philter/philterrc - sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py + sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py cp src/philter.py "$out"/bin/philter chmod +x "$out"/bin/philter ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix index cc1cc9daf6..6a131af031 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { @@ -14,11 +15,20 @@ stdenv.mkDerivation rec { sha256 = "128d502y8pn7q2ls6glx9bvibwzfh321sah5r5li6b6iywh2zqlc"; }; + patches = [ + # Fix build on aarch64-darwin, should be removed in v4.16 + # https://github.com/rofl0r/proxychains-ng/issues/400 + (fetchpatch { + url = "https://github.com/rofl0r/proxychains-ng/commit/7de7dd0de1ff387a627620ac3482b4cd9b3fba95.patch?full_index=1"; + sha256 = "sha256-m3a4Jal8L7w+xA0OJTPU68ILTaKgiITgsM1WVxuMce0="; + }) + ]; + meta = with lib; { description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; homepage = "https://github.com/rofl0r/proxychains-ng"; license = licenses.gpl2Plus; maintainers = with maintainers; [ zenithal ]; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix index a17701644c..1d7d006f53 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pssh/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, python2Packages, openssh, rsync }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "pssh"; version = "2.3.1"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix index 7a27740028..8f5958193d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/py-wmi-client/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "py-wmi-client"; version = "unstable-20160601"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; }; - propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; + propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ]; # no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix index 499b829b43..19768cdc1a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.31"; + version = "3.0.32"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-GZJLS+gy23FcSS2twF4fnRf5QkVEpx23UaN7pdJIudM="; + sha256 = "sha256-FPSBnM2MLmYVb0A27UhDp5D3oWJlrjZlMYDEr3qwmDY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 9a2e1b4bbc..7b61dcf746 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.4.6"; + version = "2.4.9"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; + sha256 = "sha256-cGG357Z0OI+aXGHWJaOPkkKUm1KcsYBvhHxNlIYlL+0="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; + vendorSha256 = "sha256-DzAxqSiWag9mOgPznjhMCQJhtJZo7hsezhwJBidsvJQ="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/weighttp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/weighttp/default.nix index 7c3d23c0d1..7a26ffdeb4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/weighttp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, libev, wafHook }: +{ lib, stdenv, fetchgit, python2, libev, wafHook }: stdenv.mkDerivation rec { pname = "weighttp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wafHook ]; - buildInputs = [ python libev ]; + buildInputs = [ python2 libev ]; meta = with lib; { description = "Lightweight and simple webserver benchmarking tool"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix index 0caa0af061..3d742a2a90 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/third_party/nixpkgs/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.10"; + version = "5.5.11"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "179hgmh9yqk8jq26ybik4cr3lgryd5p6kdwccc3r7mfssk3yp8lz"; + sha256 = "sha256-+fNld+stSniuQV2zx+Qd4s2ZSwNLmnve/tXg36MC2nM="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix index dffe16242a..49864ad508 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.18.6"; + version = "0.19.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-4ZXur3Hja5nlJ2GLGei9r7ZPz+bvw41rm9xzaIo68gw="; + sha256 = "sha256-u1XXkenMIflbXACxOeeq7Mg5ubel4oFXpL/uy6McQf0="; }; - cargoSha256 = "sha256-vBr3RYBFoeCJquS8ugVpl29J7CUraN/HuxtKv8Dqi/k="; + cargoSha256 = "sha256-7QOaSEaX2JXtTQQo3RXbMpZg6V2wzfoQbId9QOD9sCA="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index 8fb66ebcb3..cc1eaf8265 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.103.3"; + version = "0.103.5"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "sha256-n249GESfPRo5kncdaWaFJJ36EnNv4rKSmFjyx9gnauk="; + sha256 = "sha256-HnSx4dKoqQVkScMT9Ippg7nVug1vte8LK+atPIQaVCY="; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 27b44ce604..50196c1565 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.36.2"; + version = "3.37.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-T8WqQTB3ogxGiImkyZUUbKcXTdSgGM0Vb4OkckslzYE="; + sha256 = "sha256-GrrjfuDor92535yzoxAudlI4vUrCittsdQeXxuUwNww="; }; vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E="; diff --git a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix index 6c12667325..6bdac96811 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; homepage = "https://github.com/tcatm/ecdsautils/"; license = with licenses; [ mit bsd2 ]; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index f41a229339..e50be528e5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-01-11"; + version = "2022-01-14"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-uvjn/n+w5Zv/RwvQmE7bl4PFXdN2OO6FrrEVKdGNsgo="; + sha256 = "sha256-/Id3cAz+upJPHzNcTnbO02AehS6R9YTz9Ff+1fc7NJs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix new file mode 100644 index 0000000000..3ca0774e22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +, nss +, wrapPython +}: + +stdenvNoCC.mkDerivation rec { + pname = "firefox_decrypt"; + version = "unstable-2021-12-29"; + + src = fetchFromGitHub { + owner = "unode"; + repo = pname; + rev = "a3daadc09603a6cf8c4b7e49a59776340bc885e7"; + sha256 = "0g219zqbdnhh9j09d9a0b81vr6j44zzk13ckl5fzkr10gqndiscc"; + }; + + nativeBuildInputs = [ wrapPython ]; + + buildInputs = [ nss ]; + + installPhase = '' + runHook preInstall + + install -Dm 0755 firefox_decrypt.py "$out/bin/firefox_decrypt" + + runHook postInstall + ''; + + makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ]; + + postFixup = '' + wrapPythonPrograms + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://github.com/unode/firefox_decrypt"; + description = "A tool to extract passwords from profiles of Mozilla Firefox and derivates"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ schnusch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/update.sh b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/update.sh new file mode 100755 index 0000000000..a56807f0ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/update.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git +git_url='https://github.com/unode/firefox_decrypt.git' +git_branch='master' +git_dir='/var/tmp/firefox_decrypt.git' +nix_file="$(dirname "${BASH_SOURCE[0]}")/default.nix" +pkg='firefox_decrypt' + +set -euo pipefail + +info() { + if [ -t 2 ]; then + set -- '\033[32m%s\033[39m\n' "$@" + else + set -- '%s\n' "$@" + fi + printf "$@" >&2 +} + +old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r) +old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r) +today=$(LANG=C date -u +'%Y-%m-%d') + +info "fetching $git_url..." +if [ ! -d "$git_dir" ]; then + git init --initial-branch="$git_branch" "$git_dir" + git -C "$git_dir" remote add origin "$git_url" +fi +git -C "$git_dir" fetch origin "$git_branch" + +# use latest commit before today, we should not call the version *today* +# because there might still be commits coming +# use the day of the latest commit we picked as version +new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch") +new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")" +info "latest commit before $today: $new_rev" + +if [ "$new_rev" = "$old_rev" ]; then + info "$pkg is up-to-date." + exit +fi + +new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256) +update-source-version "$pkg" \ + "$new_version" \ + "$new_sha256" \ + --rev="$new_rev" +git add "$nix_file" +git commit --verbose --message "$pkg: $old_version -> $new_version" diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix index 95d5f228c8..d744b8b5da 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.0.6"; + version = "2.0.8"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d9Cfd2KD+ymGnzOjlVQkSm3XBamoJIUKQLnRZzSDBtk="; + sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; }; vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/third_party/nixpkgs/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch new file mode 100644 index 0000000000..b3106802bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -0,0 +1,130 @@ +From 913e74b8682f77da94ed7b7d459482b9b23a5d88 Mon Sep 17 00:00:00 2001 +From: roblabla +Date: Tue, 28 Dec 2021 14:20:30 +0100 +Subject: [PATCH] Use protobuf gradle plugin + +--- + Ghidra/Debug/Debugger-gadp/build.gradle | 76 +++---------------------- + build.gradle | 6 ++ + 2 files changed, 15 insertions(+), 67 deletions(-) + +diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle +index 1b4922f66..3d2ef8856 100644 +--- a/Ghidra/Debug/Debugger-gadp/build.gradle ++++ b/Ghidra/Debug/Debugger-gadp/build.gradle +@@ -23,42 +23,19 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" + apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" + + apply plugin: 'eclipse' +-eclipse.project.name = 'Debug Debugger-gadp' ++apply plugin: 'com.google.protobuf' + +-configurations { +- allProtocArtifacts +- protocArtifact +-} ++eclipse.project.name = 'Debug Debugger-gadp' + + def platform = getCurrentPlatformName() + +-dependencies { +- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' +- +- if (isCurrentWindows()) { +- protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' +- } +- if (isCurrentLinux()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' +- } +- } +- if (isCurrentMac()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' +- } +- } ++buildscript { ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' ++ } ++} + ++dependencies { + api 'com.google.protobuf:protobuf-java:3.17.3' + api project(':Framework-AsyncComm') + api project(':Framework-Debugging') +@@ -68,43 +45,8 @@ dependencies { + testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts') + } + +-/*protobuf { ++protobuf { + protoc { + artifact = 'com.google.protobuf:protoc:3.17.3' + } +-}*/ +- +-task generateProto { +- ext.srcdir = file("src/main/proto") +- ext.src = fileTree(srcdir) { +- include "**/*.proto" +- } +- ext.outdir = file("build/generated/source/proto/main/java") +- outputs.dir(outdir) +- inputs.files(src) +- dependsOn(configurations.protocArtifact) +- doLast { +- def exe = configurations.protocArtifact.first() +- if (!isCurrentWindows()) { +- exe.setExecutable(true) +- } +- exec { +- commandLine exe, "--java_out=$outdir", "-I$srcdir" +- args src +- } +- } + } +- +-tasks.compileJava.dependsOn(tasks.generateProto) +-tasks.eclipse.dependsOn(tasks.generateProto) +-rootProject.tasks.prepDev.dependsOn(tasks.generateProto) +- +-sourceSets { +- main { +- java { +- srcDir tasks.generateProto.outdir +- } +- } +-} +-zipSourceSubproject.dependsOn generateProto +- +diff --git a/build.gradle b/build.gradle +index dce3a5149..7a2e637ce 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -76,6 +76,12 @@ if (flatRepo.isDirectory()) { + jcenter() + flatDir name: "flat", dirs:["$flatRepo"] + } ++ buildscript { ++ repositories { ++ mavenLocal() ++ mavenCentral() ++ } ++ } + } + } + else { +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix new file mode 100644 index 0000000000..2e5311696d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -0,0 +1,177 @@ +{ stdenv +, fetchzip +, fetchurl +, fetchFromGitHub +, lib +, gradle +, perl +, makeWrapper +, openjdk11 +, unzip +, makeDesktopItem +, autoPatchelfHook +, icoutils +, xcbuild +, protobuf3_17 +, libredirect +}: + +let + pkg_path = "$out/lib/ghidra"; + pname = "ghidra"; + version = "10.1.1"; + + src = fetchFromGitHub { + owner = "NationalSecurityAgency"; + repo = "Ghidra"; + rev = "Ghidra_${version}_build"; + sha256 = "sha256-0hj9IVvTxgStCbfnTzqeKD+Q5GnGowDsIkMvk2GqJqY="; + }; + + desktopItem = makeDesktopItem { + name = "ghidra"; + exec = "ghidra"; + icon = "ghidra"; + desktopName = "Ghidra"; + genericName = "Ghidra Software Reverse Engineering Suite"; + categories = "Development;"; + }; + + # postPatch scripts. + # Tells ghidra to use our own protoc binary instead of the prebuilt one. + fixProtoc = '' + cat >>Ghidra/Debug/Debugger-gadp/build.gradle <>build.gradle < + subProject.buildscript.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") + } + subProject.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "config \''${configuration.name}") + } + } + } +} +void resolveConfiguration(subProject, configuration, name) { + if (configuration.canBeResolved) { + logger.info("Resolving project {} {}", subProject.name, name) + configuration.resolve() + } +} +HERE + ''; + + # fake build to pre-download deps into fixed-output derivation + # Taken from mindustry derivation. + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src; + + patches = [ ./0001-Use-protobuf-gradle-plugin.patch ]; + postPatch = fixProtoc + addResolveStep; + + nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + + # First, fetch the static dependencies. + gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk11} -I gradle/support/fetchDependencies.gradle init + + # Then, fetch the maven dependencies. + gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk11} resolveDependencies + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/maven/$x/$3/$4/$5" #e' \ + | sh + cp -r dependencies $out/dependencies + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-Yxf6g908+fRRUh40PrwNUCTvxzlvSmwzE8R+3ZkRIvs="; + }; + +in stdenv.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ + gradle unzip makeWrapper icoutils + ] ++ lib.optional stdenv.isDarwin xcbuild; + + dontStrip = true; + + patches = [ ./0001-Use-protobuf-gradle-plugin.patch ]; + postPatch = fixProtoc; + + buildPhase = (lib.optionalString stdenv.isDarwin '' + export HOME=$(mktemp -d) + + # construct a dummy /etc/passwd file - something attempts to determine + # the user's "real" home using this + DUMMY_PASSWD=$(realpath ../dummy-passwd) + cat > $DUMMY_PASSWD < "$out/bin/txt2tags" + sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags" chmod +x "$out/bin/txt2tags" gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" cp doc/userguide.pdf "$out/share/doc" diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 1e6826ae85..5757db1e87 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4A0UrXSJhV330W6phNDfqd/iNWYmKuzYUwr4gfTndQw="; + sha256 = "sha256-hEP7Oe1CNLEvSfUIXoXwRJUG4kIkb2f1549cZRXK+NY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 7b4cde33f5..8303e46e46 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.13.0"; + version = "2.14.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-I1hrmlNZUDhjWTsOzmp8xIc8rv2gTGRx2/yiAmCy9IY="; + sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw="; }; vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; diff --git a/third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index 921437c257..85ea3cd360 100644 --- a/third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "yaml-merge"; - version = "unstable-2016-02-16"; + version = "unstable-2022-01-12"; src = fetchFromGitHub { owner = "abbradar"; repo = "yaml-merge"; - rev = "4eef7b68632d79dec369b4eff5a8c63f995f81dc"; - sha256 = "0mwda2shk43i6f22l379fcdchmb07fm7nf4i2ii7fk3ihkhb8dgp"; + rev = "2f0174fe92fc283dd38063a3a14f7fe71db4d9ec"; + sha256 = "sha256-S2eZw+FOZvOn0XupZDRNcolUPd4PhvU1ziu+kx2AwnY="; }; pythonPath = with python3Packages; [ pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix index 85dcece956..252167fcea 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, libreoffice }: +{ lib, fetchFromGitHub, python2Packages, libreoffice }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "odpdown"; version = "0.4.1"; @@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4="; }; - propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; + propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ]; - checkInputs = with pythonPackages; [ + checkInputs = with python2Packages; [ nose ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 9aa2cde0f3..2827f80867 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -104,7 +104,7 @@ core = stdenv.mkDerivation rec { # TODO: perhaps improve texmf.cnf search locations postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' - PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + PATH="$out/bin:$PATH" ${texlinks}/bin/texlinks --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" @@ -136,6 +136,8 @@ core = stdenv.mkDerivation rec { + /* doc location identical with individual TeX pkgs */ '' mkdir -p "$doc/doc" mv "$out"/share/{man,info} "$doc"/doc + '' + /* remove manpages for utils that live in texlive.texlive-scripts to avoid a conflict in buildEnv */ '' + (cd "$doc"/doc/man/man1; rm {fmtutil-sys.1,fmtutil.1,mktexfmt.1,mktexmf.1,mktexpk.1,mktextfm.1,texhash.1,updmap-sys.1,updmap.1}) '' + cleanBrokenLinks; setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) @@ -360,7 +362,7 @@ pygmentex = python3Packages.buildPythonApplication rec { texlinks = stdenv.mkDerivation rec { - name = "texlinks.sh"; + name = "texlinks"; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); @@ -373,7 +375,7 @@ texlinks = stdenv.mkDerivation rec { # Patch texlinks.sh back to 2015 version; # otherwise some bin/ links break, e.g. xe(la)tex. patch --verbose -R scripts/texlive-extra/texlinks.sh < '${./texlinks.diff}' - install -Dm555 scripts/texlive-extra/texlinks.sh "$out" + install -Dm555 scripts/texlive-extra/texlinks.sh "$out"/bin/texlinks runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index 9569ec8885..d4c9d0cde8 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -223,17 +223,17 @@ in (buildEnv { sed "1s|$| -I $out/share/texmf/scripts/texlive|" -i "$out/bin/fmtutil" ln -sf fmtutil "$out/bin/mktexfmt" - perl `type -P mktexlsr.pl` ./share/texmf - ${bin.texlinks} "$out/bin" && wrapBin + perl `type -P mktexlsr.pl` --sort ./share/texmf + ${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose - #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links? + #${bin.texlinks}/bin/texlinks "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force # Regenerate the map files (this is optional) perl `type -P updmap.pl` --sys --force - perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure + perl `type -P mktexlsr.pl` --sort ./share/texmf-* # to make sure '' + # install (wrappers for) scripts, based on a list from upstream texlive '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 4851a346c0..c153085609 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -125,8 +125,8 @@ let snapshot = { year = "2021"; - month = "04"; - day = "08"; + month = "12"; + day = "27"; }; tlpdb = fetchurl { @@ -136,7 +136,7 @@ let #"ftp://tug.org/texlive/historic/2019/tlnet-final/tlpkg/texlive.tlpdb.xz" "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz" ]; - sha512 = "1dsj4bza84g2f2z0w31yil3iwcnggcyg9f1xxwmp6ljk5xlzyr39cb556prx9691zbwpbrwbb5hnbqxqlnwsivgk0pmbl9mbjbk9cz0"; + hash = "sha512-PcXTctrO0aL5C7Ci1J2Z5fa5WqKONhOK2q0FnSbT5+iP9WWSCljyQiHE8C4LYMMHii48y6AJVRkjVIukI3+rUQ=="; }; # create a derivation that contains an unpacked upstream TL package diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index 22e6daacb2..0967ef424b 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -1,9095 +1 @@ -{ -"amsfonts-3.04"="0l3ypclhv5qdpcpy29xwda2m3cjfn5l996agas6yhpdr2m58q211"; -"amsfonts.doc-3.04"="1v7chx5rvvqmcf7j35qi55wxwxkbfkbv34b15yrgn6bflniziicm"; -"amsfonts.source-3.04"="064gndy9lnmsq2srw5hh97sbdk8gk0qv9zzki00ms3c6rzhd9sjl"; -"bibtex-0.99d"="1w7vpf0kw6vi3hgmlmk0dpzk82kns7a77appx8yg76xcip2xid51"; -"bibtex.doc-0.99d"="13xh14d3v8a9ik4z5kn0y3qff9j6zb83671411in78v46dh3d75y"; -"kpathsea-58622"="0jgwbbcbazam4c0hspbi15j2ndjzvxzirgbk0zpp8ffma0xhhcjx"; -"kpathsea.doc-58622"="121f7nv9zq4dsy0krd1wkq5yjpbynjav6asafpq5idp1l5haw67h"; -"cm-57963"="1i70pxbx7bp7lzpd4skdymv1a7h8njsr42v8l8jvh4bs3gkmlbgi"; -"cm.doc-57963"="1s5jagrajx29zmpdbqc6qpbcpwgp7g4c3d59ilg4sgcqgd9n5v1j"; -"colorprofiles-20181105"="05nf7y425f8ric57c3afq7ymc7ndxcdahbx9n32jnaz9j3qq2ypl"; -"colorprofiles.doc-20181105"="152vrbm5km4ymj5h41x8cjyypj06g4xq3vyvmgakai9qz270dvyz"; -"dvipdfmx-58645"="1zgddb27zzdd3ycvmdfzph4khlcjlfdbp3a0nwhjf2682kf9hryl"; -"dvipdfmx.doc-58645"="09mi9lfp4sj8jv6h3rzh1dzfryfixsppan9pavj4w6drkf25rd4m"; -"glyphlist-54074"="12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja"; -"dvips-57972"="0k89qqz9zx5zh13azpjndfzszgl85hq4513kaayf4k3spy9fn5yw"; -"dvips.doc-57972"="1j0k0sg0j5zhcw2k8aznp9kflmmvw06qhwwlmbhsj1ii3847vxsh"; -"ec-1.0"="0l9zf4zs8yw84x5rnyzaggz4idl4kmvj40c03jyxbsxsx6bi8jks"; -"ec.doc-1.0"="013w8hdsln91k13c3ilv36p4vp1263knkxf4m3hh6vaaqcr55aw9"; -"enctex-34957"="02a26lzlkkw3dabxci7w77117n2bagsdk5rlcn4cps45xdbjqikj"; -"enctex.doc-34957"="068qh474lirr3yzh8ggpavqsmzdv5yvlc1i93f5cx49cd9j7dm0w"; -"etex-56291"="1zk4dp55r1yjwy1bpigyzbfm9nh3np544hfmzzfhdg4i4yps87k8"; -"etex.doc-56291"="1nsh69hzpk33ljng9g6drrrb5c59cm58a058damk3s3gzfy7a8a1"; -"etex-pkg-2.7"="01aa6bn8d46ql8aw8kg9k2c3x611jpd5hx3h6g2fqb2lvjqnr1zp"; -"etex-pkg.doc-2.7"="1hcir648vyypvqa8r710mj9qldir9yp2lq7biv3s9w1vl2ssw18d"; -"graphics-def-58539"="11slfvdq8p0i5kfvakqpdq7vrpda1d03mzav69fwia32g9rhpjan"; -"graphics-def.doc-58539"="1hdg052zf2nbnjmc3lfpn7lr7ndjwsp9wsqs38as94caggy6adqp"; -"hyph-utf8-58619"="14jj24fr6v74vj8wi2a9k9zk9vnrvmy1ni4zn24dl5fdfw75n5ik"; -"hyph-utf8.doc-58619"="11n1blnx9i7q2dlhyhf1dxs2vnldc9r8f3k6diix0i1np8hpz05q"; -"hyph-utf8.source-58619"="1cff5ijmpxc752n6cmpfzn1a10ihrkz7n9l55gz2k2q0a00m2ssh"; -"hyphen-base-58630"="1sagn9aybs34m1s6m3zwya5g5kbiwfnw8ifcgxssygmzzs88dgjp"; -"hyphenex-57387"="08f915yqpx6qhc2dzbicbv9cijzpgcl4jpifydqcc0x68y51qrzi"; -"hyphenex.source-57387"="0lqn354bskaa6g0bn9g1r3lbb1hj9si5n1ki38awayzp1yj8a3q0"; -"ifplatform-0.4a"="0abhpfw3w1mvpg52xaw3cngl55sszk5ji9a38yab8vhknh3d3jby"; -"ifplatform.doc-0.4a"="1b41nzn666askfc1kkm1lwf05ggf2ml8gz3rrki4yw6ch52sl2sc"; -"ifplatform.source-0.4a"="0g0qvbvv4j87rxps9yypair00z6il5hfjczkrmf4fkycw714sdqa"; -"iftex-1.0d"="1jcwlnm5wzzwr3r67v6d873c0619bhll93qd7f342xw503vqwlsy"; -"iftex.doc-1.0d"="136jnij0z3xk2kp2ldglg6g1qyp66rzzibmm5rpdk24rkrrakg1f"; -"knuth-lib-57963"="0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca"; -"knuth-local-57963"="02cf32f57fr6bngiv9xiw8bh4sq53p9br034ap74s80h3bgcmn1f"; -"lua-alt-getopt-0.7.0"="17czrz46xlbj3xkh4jwdq269mqaq7165kpkhhqa498hrkcgdgaak"; -"lua-alt-getopt.doc-0.7.0"="1zfwvs979c7s16vpv2k9l81mcmm9y4qdjk46l8ik3123dalchv6f"; -"luahbtex.doc-57972"="0w4hfjmjgiw42bpz1b59cla8v4s6kik54q6wdhmdjy6jp91rfl2i"; -"luatex-58702"="0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg"; -"luatex.doc-58702"="14bz6h1jrnf4azwb17ny8aj5i8vjm0pxrm3p2g2ai7iscmcibsi7"; -"plain-3.141592653"="1mn5cfiaj7wrjij4y0g2mipc6v8dk7l7nc25s1gmgvvyfqwd3byv"; -"tex-ini-files-40533"="0q1g62jg0qiqslm93ycvm30bw8ydmssjdshzsnzl7n2vpd62qfi2"; -"tex-ini-files.doc-40533"="198f4y0bjw9azzck8rz6ml0rpq7g67r37rw8825y8crhpykchp6n"; -"unicode-data-1.14"="023gy5ldjs0pc4a6ffdjrk5y245sxsqn51g21is5cicj9xihysmk"; -"unicode-data.doc-1.14"="1dmjrfqs0gnrqh8dj765j0dlv46jg9z3rbqk7c278njmr7nx87wm"; -"makeindex-52851"="0lpqnw6nr19p08pf52rcx1xvvsywkpf1rqrkjdsgrv55d1afsd36"; -"makeindex.doc-52851"="1zzi53l4sp5zs57bcmylj7ydv3h2638y46g5dfxkhhzpl6zkhvxm"; -"mflogo-2.0"="0swy70pm0pyqzy1i5wf5hc6cbzn91ihw8hwh9kavdfawb4qzjxxw"; -"mflogo.doc-2.0"="1xqk3nwpi3drkzrnr172i660yx541lxxw3wps0jqbqficqn4fiw4"; -"mflogo.source-2.0"="145hmbxr5x5pj2whra9yify9lyx0ak1az31gvwr3gp5klcmna8p0"; -"mfware-57972"="0kcz1gy17819w77sf0l9m5f6rw8dcapkdbvwaknnrmy50v0jfs1n"; -"mfware.doc-57972"="08bx2bl2xm1bqkrs1b80inzdf4q5djwa8nn0fhbir80z1a3cbf0f"; -"modes-4.2"="0xg6jpyxni3r3fl6r7iq1vz97pp1w3gh8ccp7w5k51igs3dpvcvv"; -"modes.doc-4.2"="1lgmgg6hhq5h3zgpc9vrbb6j0pif03cjs6gwj20df8md69hzr184"; -"pdftex-57973"="079pv90lpakdn10p2vddzdvi9z5grx3c9yrjfg4k3iii7zdjagx4"; -"pdftex.doc-57973"="0v47bnyd6r2i4z3gy9as7nvl3gylsniikp55ywbr9p13q1s4pwkn"; -"dehyph-48599"="0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g"; -"tex.doc-3.141592653"="0njmxc6l84j44k48qh7d79n3qznzriz2pf8lkj09i7mkkj9fw9lf"; -"texlive-common.doc-58055"="1k8ssl78b6jkjvzr0s6nihkyri0xan65pwn8p00sw6iilg058jk8"; -"texlive-docindex.doc-58780"="0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; -"texlive-en.doc-58572"="1r6ikz0lga85lw7dk4wh5mzvpjgs9lfi0yyiaij876zvrciziczv"; -"texlive-scripts-58791"="0cmq2d033pm7hydi0k35f9asfaqkid1z3i5fdil90gfnsknpqgzk"; -"texlive-scripts.doc-58791"="12b4bmzsfvscp3badkd77xpk9znjww30c5h2rq7n20dmbg3b8j4v"; -"tlshell-58792"="00vyz5kkvbdivgaiy5yyllpi9q9rv1i3f90ypyxd6nfdcmjdjfw7"; -"tlshell.doc-58792"="1h5mk09sakbmgsppl9fnry28xnzqya3bmp3r1nkzg44cv7kl98vz"; -"aaai-named-52470"="1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6"; -"aichej-15878"="1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf"; -"ajl-34016"="1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs"; -"amsrefs-2.14"="015spycf9ycxav8r046yn7lrc892nhkkrf1say1yy9karsji6dnw"; -"amsrefs.doc-2.14"="11fc87kbdm440v4qyhxnv654mh0m6rpz42zji38qspcqj19rck71"; -"amsrefs.source-2.14"="02q2x8zpwxkyrh9v7xqw35vdjx0b4fzz95xcv6vfjmynm8cpklxf"; -"annotate-52824"="12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm"; -"apacite-6.03"="013769hi9alyizx08a0v1hbl03h5vkwi6a6ar3ghw8m6l445xb8m"; -"apacite.doc-6.03"="0d49bmdiiriklmh99kavvm48zh29bgiw7zr5jbcwk5bw42qarlqa"; -"apacite.source-6.03"="0hsrhw50sb8lphxib4jmjgplfrmy95m56a1phiac4kwxphlj9di2"; -"apalike2-54080"="0mn84ahwjg8gvw5lifvcrnch11q79d4bgw3nmhrh4v8slwgip5l7"; -"archaeologie-2.4.5"="1g0r3y1s7759lx75fhmc2v38ks4mgbldpjkkxnk7rq0ljdqy38x9"; -"archaeologie.doc-2.4.5"="1hccakjvh7ldyja2nfi68926yn175fhawiwc76qk5fksggj568rg"; -"archaeologie.source-2.4.5"="1gv9495g29hqc0g6in438g8sdkaxwwn2vvp8f41mz033dzfln5bs"; -"authordate-52564"="0caz9s2ra7qqlzdnahhv50z050iyp62ypyrfpbj1p9ih7zmcdg23"; -"authordate.doc-52564"="14wxjyrighkhg51m9jpdyjdwz2ipz4zr1rfgmdnxbpg31rbg2x7s"; -"beebe-58697"="0v87mxm1qj1ffz6d6sdcw3m318d3kib7bi1dz27grcmvj8hih3hx"; -"besjournals-45662"="1jpp3ayblhwwqzndss91rcns3axr60b8zzxdd6f4qqifhaqczk3l"; -"besjournals.doc-45662"="02s7qd7vvdr6wf00cm7026984s6vphp88iaqhnhk0iiafpr3lk3i"; -"bestpapers-1.0"="00ig29wqb4fn6qw7szmwmv92s19nc2wpapv4pgv8nwsby8nplyrm"; -"bestpapers.doc-1.0"="08yv29s2cx89nq0lvykx8z6szs72d2ph97g75bqni3l7b4n0wng7"; -"bib2gls-2.7"="09v0k5ldpyhwmzspidnfz34p4m7vmjkinbvrzs304crb2p9xb0wc"; -"bib2gls.doc-2.7"="01f2ll1pjzwjyj51ngijm4vaq06l1hgbw1ajdyaq7anach1z242m"; -"bib2gls.source-2.7"="01d40yrhncjh1jg743av8drmbycmdsfxf3bfpzq89di5hyaj821r"; -"bibarts-2.2"="1zwb8ras2mqv0yn880php3wizs79y1y6fwvjd09jwc9a0j62p1pa"; -"bibarts.doc-2.2"="0p2fn08wz1ng9jgwmvxp93kkb86wnwzh9snbcm1vhf09b8l1klxk"; -"bibarts.source-2.2"="009gysrkfaiwisb5ac89q9n7rhmdvcy4lc1jr5pgka21qp3rhwb9"; -"biber.doc-2.16"="11507rlq3rcvag1xxf8cn55rnnxdaag03hfd6mq42mnki5w54zjh"; -"biber.source-2.16"="1lsvh76vskf50aij9i2vgysnnc75qdc9c0vyb7m4y46zhrx0lvrn"; -"bibexport-3.03"="1zbsilzaz68zvmbf2xw7jqw4l66clcplz3l46ggxw95gns8mgqlg"; -"bibexport.doc-3.03"="17a5w095vkpp7j54h8m7f74l7vycsqbv6zzschdb3dd34scq1s5w"; -"bibexport.source-3.03"="1pqs7j4xdhx3pqsc8i0wqnz9jkyg891dzl7g3cv19a6wv82k0xjv"; -"bibhtml-2.0.2"="1sg9x0jrgh2jng9b1pd08i0f8kzhy94sq0mf33as91gr43dzws88"; -"bibhtml.doc-2.0.2"="0is3q2m1xg52h5s9n9403c85yfmpjaqqbh8lgyfqfwhl5qqmgrf9"; -"biblatex-3.16"="1yhh1h1ir9g1p2njcqqnkkzadpl8hphakv17n6igkwmjpdxwycy2"; -"biblatex.doc-3.16"="0h2i50a483ipbvc8wnhqp5sar1kwvhj0na7cgzf0yhxs8r7rfl76"; -"etoolbox-2.5k"="1g944zizyl05qz6lq1k13hv9952r97gc1i7is9s5fckz664075jl"; -"etoolbox.doc-2.5k"="05c3kvfwvbg4bxf3wza5rdvh98mnxadf818rsklxa5g2lz44jm76"; -"kvoptions-3.14"="10rv33msjbxkxyvxckxbwzf7y011cgdqgpfqh724m9554s6rlqkl"; -"kvoptions.doc-3.14"="1j9jszxr3cbpjgdr2z42zf4yi33bbqs2yga6nrdjykpfi6n8i9wq"; -"kvoptions.source-3.14"="06z7r2100z6k2cgp4slynr7w5vardb3jm2wpxd0zm68b1p9spzq2"; -"logreq-1.0"="1zj1vn0yfklngvfvcr0p8hchar220lwfrznsq73jbw9zzjx47v4f"; -"logreq.doc-1.0"="143b5bb1jkc9j1gd46c28q4zq8jlh9wrngjw8q4prw5dkfnf1s8m"; -"pdftexcmds-0.33"="1fpijk36lx5czl6bpbawlm8f34zp264l1fli095wha41fil25hks"; -"pdftexcmds.doc-0.33"="00xzyvl66fds400dm5zryrv3m5s42mv6658zx7fnx2wbd0jxs738"; -"pdftexcmds.source-0.33"="11516wkglckyrz41pz9cqj0xa2bd6v2l234k28ynnmfjsg56vph9"; -"url-3.4"="189lixyamvrcpds2i7nlh4w83mk5lnk73158kcw3qjanpncnnn1f"; -"url.doc-3.4"="1xragd7gak0vzj14f7dcx5hxg8plh47ncqdb1m5liaibrdlhgpql"; -"biblatex-abnt-3.4"="1dn2929wlyzwb96iq5lj8x9zr2fi1c4qk1rldc0vrr5s3cxfn3x7"; -"biblatex-abnt.doc-3.4"="000akwyh992yxzn51jlvnc20g12ypq2zmffvnbwxjy3cyq0aggq8"; -"biblatex-ajc2020unofficial-0.2.0"="1csx7vad5svflb76ssdkvd8y3r2n9agqqynw88wvzhzj61fkd2cr"; -"biblatex-ajc2020unofficial.doc-0.2.0"="03wzlpr5v6y67syy0bx87z123ark524fm6kqjw83v0sa4y4kwq7l"; -"biblatex-anonymous-2.6.2"="02fssl0l50s94y6x7rv2rm0227ivgr7kfnim435j4k1l0av4gb3n"; -"biblatex-anonymous.doc-2.6.2"="0dffdxp04shrh7fsl4dilqcsnnxbjpbayy9r87hxmq3yk605lvki"; -"biblatex-apa-9.14"="08sldd3qp9d5riz038s5bn8mqhpvws449fk7q86fvfn9hwy5igxw"; -"biblatex-apa.doc-9.14"="1xnfsi2nk33dmqmbl46qaqiv71yxhxq31pf3srdidxn0ymfa6g2h"; -"biblatex-apa6-8.5"="1a1kynyy1gdmsfnwlnxws74hwyqc6sq29wv6ybalpipdzn7dg73i"; -"biblatex-apa6.doc-8.5"="1qvn9bnzvx88qbmbdgds53q08v7ml42mbqbcn7bzzq6mnz9ra2mx"; -"biblatex-archaeology-2.2"="1kf5aqc8mv28k0aiipwm6yc1vkgzyikp0bsmpmgdhy5acz3whfxc"; -"biblatex-archaeology.doc-2.2"="022l37hplzmvkcpnr06n4fz509w8wm24py0c05qljs6jz7smyhh6"; -"biblatex-archaeology.source-2.2"="0shn0bacflcaayajxpdiv9ik994aizpdmlc010shm3fzjdlay79c"; -"biblatex-arthistory-bonn-1.2"="1j0wy272dkzcb96i74qh54ap2hs5wdhmln8akh749fyydsazr43h"; -"biblatex-arthistory-bonn.doc-1.2"="094s5c55lfc7ssmz3mzj61zkxpnn1haj2vh582apzffppgd3fd0m"; -"biblatex-bath-4.0"="1vlkj2gvrki82mg77h1kyk4ngg2r9yfbrr887kvypn4wl32hm372"; -"biblatex-bath.doc-4.0"="0y0j1hdk7kj236civ1ngb03sf24hxd5dxgv4af6xdll6r2ljikpd"; -"biblatex-bath.source-4.0"="119vi9nxizn2l04ghiajp8kpzrvkgrn4yl4qn9brq99drn6hnlr9"; -"biblatex-bookinarticle-1.3.1a"="1gas58hi5ycchbpamm0z9mn5jc2hbry682i4wmba242wm55digyq"; -"biblatex-bookinarticle.doc-1.3.1a"="1s39gixpryiqf44riq5bk3hnp6nc8pdqbdylh594k9xk3770p77z"; -"biblatex-bookinother-2.3.3"="1vb9m88z3cck9gi8d41lsv4ckqli4wjdgwkklfds2z189vbncc4k"; -"biblatex-bookinother.doc-2.3.3"="0zzmlsikzv5zxvd5xh12fzynmkl0bzzvl2s2y2r4kfn6s08xncja"; -"biblatex-bwl-0.02"="1ii8jacddlj15sm45g5rnk7yqbsd7i8c6a1pxy34vpb6bgsfb69m"; -"biblatex-bwl.doc-0.02"="11cspr9i8q1da0x23bplsy88nfmn1x87zvrqdc28gbk4ybi6fc4s"; -"biblatex-caspervector-0.3.5"="158ba1fhzfaqq056wzs6af6hx92h7yscliddmz1y1dlm1as8x1hz"; -"biblatex-caspervector.doc-0.3.5"="123l0nk56vs2i153q9bwplqb2jyg66bl7b6xm60dz7k16l81w3ky"; -"biblatex-chem-1.1z"="0kv44yng5wff1xkgw8nya64jizfcf1ipxrgnf46pd1dak5vlsiq0"; -"biblatex-chem.doc-1.1z"="0amx09qlk78kw6iam8b83xx0kw12k5p7q6wn267imr2rsibbs3l7"; -"biblatex-chicago-2.1"="04qcxjvvfdsfib5cwh4vk6s5rkpalk3vzz9gldgl3xych1k5dg8a"; -"biblatex-chicago.doc-2.1"="081fs68vjvzmbwj6y2vb7782q5w1kvgbnfsnh6hngx04m0f5sazc"; -"biblatex-claves-1.2.1"="0saj8s7q9lzjnydjh3x2hcnhj0wfm2p4rvxk5n6hi2ccfw78d3c1"; -"biblatex-claves.doc-1.2.1"="0g4x5jblj664ngppqpbks3d0ahn818ck871q2aqir6jgkrd13cpw"; -"biblatex-dw-1.7"="17d0mayflv3hwf9ik3z7vjpgp2cv1iyva5iy1nrlf8j7008azmka"; -"biblatex-dw.doc-1.7"="1879390m7ivmb49fkvkhl7233a33q89hpb2pnyvsscz5km3vv4w0"; -"biblatex-enc-1.0"="0kvya1xzxpcmvwgacb726jqzmgr944y9ljai45f0gdkw855ylmb8"; -"biblatex-enc.doc-1.0"="0mmc5sd1jjnj42aa2q1g1zaps1hla6yayl769i4bya6i1w9r99yf"; -"biblatex-ext-0.12"="12x0018lzqvszw17i0id8g8k5dv9lhxj2g8fvw82x503fbll51ag"; -"biblatex-ext.doc-0.12"="1ira281yxvsnqba46avnxign9fbfxl0v4ddxhp3wvx3p7q4axjzq"; -"biblatex-fiwi-1.7"="16grb6hqmrhvzryijg6p4q4vf47a0lxa8bw59avlib5j7mqpg0wc"; -"biblatex-fiwi.doc-1.7"="10skq20bmpqymbgxs47z8ac0q5nckyph7s4xwqmpfd7pi2sksb4a"; -"biblatex-gb7714-2015-1.0x"="06fcpl6q4sa0a848bsglq5qiaxm2jig7mhpxw8wfikrxkp09hipl"; -"biblatex-gb7714-2015.doc-1.0x"="07n042g8ch0xc513mphmxn8ys56mxlgr1aav530fk03fs139a2z5"; -"biblatex-german-legal-002"="1x7x5vpicvxdjbbx17s8va3j0m9mig9ilwim2sp674yxjhfdpw48"; -"biblatex-german-legal.doc-002"="0jgkxjcx6z9nc0c6ms1cn1j7h94d2frxmj9i5rd3h37cj5rax25y"; -"biblatex-gost-1.21"="0v399j9kxdjx5z22mj3zn3cjj48a9f4qjhcx6dkm393a7v63ysb2"; -"biblatex-gost.doc-1.21"="1b0av4hfbh17kp768cyll3cb63gw688rvsimyidvssni0cn27s81"; -"biblatex-historian-0.4"="14p27qb8rdx479pj7zdvl00ir1zg8f0bzp107zfwv61ypq8zrvbl"; -"biblatex-historian.doc-0.4"="0hcghqxbjah4lyjzlrkixs6iqbkjx4d8r3hv16lgnddkndbgq663"; -"biblatex-ieee-1.3e"="00hzyr8c444gplwpjm1rzi613zdxpc839xkbbf13mcli150jk66r"; -"biblatex-ieee.doc-1.3e"="1257hkmzixhsqsax1i5ngj541vn9cixj1flaflkrnxs895l6j95h"; -"biblatex-ijsra-0.1"="0gnm3h0918lvbqwnzk9wkdcafpzz5q3cln2z1sjaylr3mgypykdw"; -"biblatex-ijsra.doc-0.1"="0jl8mr3ai1ybc3lmp7x477znv59az94hlbzaqmvix54rxf6k8f4k"; -"biblatex-iso690-0.4"="0ap3l1j8l45f0wlar9gp537v5dzlhc9b805bp3ijm700csclj0hv"; -"biblatex-iso690.doc-0.4"="1ng5dqk0ch57yrz8macbmm3djm55r4jkrq82bi065a5mxdll1cag"; -"biblatex-jura2-0.4"="1wwhlys3s1zb1zp675ikgydpwzkzgpk51phwd67nx9zphdd9h55q"; -"biblatex-jura2.doc-0.4"="14rpa74dq13g4wjd5b28pwivf7frz5w4712p0mld15z9cvlsi5hn"; -"biblatex-juradiss-0.23"="0zi9b67y0p9zdz2n4j1lr5qgd54p3l13c132wjz749mlrv6njfx3"; -"biblatex-juradiss.doc-0.23"="0a6d7awx49cy86ndwfkfq280dwh846ssjkkkrgbq4vxlbmbh2zpx"; -"biblatex-license-0.1"="1fg16xc32kbg493y91sjxjnxpi6jb7kki7yvy3d796w7vy86ljfn"; -"biblatex-license.doc-0.1"="0iy8ad7k9j5x5wnnk196dwsyc5hhz8fl88wq56x80cgfdkg20jrh"; -"biblatex-lni-0.5"="1dg4xa0xkblf3iy9hipjp4wwk46zwq5yhwfsmiwxa63bkjavpzg6"; -"biblatex-lni.doc-0.5"="0d0cx0jvgy2shly976ypmr0k1rrpmiiqc01m2sb9scj558vrf3fn"; -"biblatex-luh-ipw-0.3"="13hh4x8p8hxnyz6cr22lb3djl5advrl5c9dyx6f491d2mjz7vibs"; -"biblatex-luh-ipw.doc-0.3"="0xb2wmg5psd0wi21j1vmn1y8sy8gw78350fqbmpgd6l4xw7bb4gn"; -"biblatex-manuscripts-philology-2.1.2"="0wrhgwkbi468nzh41278mxh1ljsycz0vvch583jaksf26cxi6cpd"; -"biblatex-manuscripts-philology.doc-2.1.2"="1ybl7drbymw9sr019w8jyxir0827kbr8w9swvz64shjzhblkcdzg"; -"biblatex-mla-1.9"="1r6bx64w9j70wkjbfq1gm7hzr1xlzai3ynfb25kgwcm9bzxb4kwb"; -"biblatex-mla.doc-1.9"="0xpak1x5yzsax39dyr2kwm2lkcgp6fj18jdmndmh0kzxwdmxqbi3"; -"biblatex-morenames-1.3.1"="1imryzaywyvdr67qcspys9r3mhl5k94vhqjsl16pmz86klq1bs1w"; -"biblatex-morenames.doc-1.3.1"="03p7154s44ga7rlf8ya69qvbwkb6gsiwz8j2wycgzljj0z3plnjh"; -"biblatex-multiple-dm-1.0.1"="11rl82yv0bfy69cmij15np3wc15jss82ghf965r0b1py37vsj0s4"; -"biblatex-multiple-dm.doc-1.0.1"="1jypgpaid18g09xxryriaj4n1ql0759jfv4jshjbkbk5fgf4c2yi"; -"biblatex-musuos-1.0"="0zs2dwsid3xhcl01a2hqrr0mdfr1q9j0zga4rjlarfzkgznkqrwc"; -"biblatex-musuos.doc-1.0"="172kvn0rpmk331yvpf3zbyisv1qlykz8icxgr1xkq5z9bxn9qmkc"; -"biblatex-nature-1.3d"="0pfpm5am4dwj04fwdjrw30dx8qrmfx56s7gkl9h9qyj2qadsx533"; -"biblatex-nature.doc-1.3d"="1mga7yx3radxwqhfmxzh2hmsyvx9qmal394cv31mlb3yd5ww1sv4"; -"biblatex-nejm-0.5.0"="02v8bfdxslcgilfsnw0g516zl2rfqx0d87hjb0dbm4md5qbry0km"; -"biblatex-nejm.doc-0.5.0"="1znfnxizc22dgpp3bkl1iim2ksi3w9klw4jam84103bpbl3vwxgr"; -"biblatex-nejm.source-0.5.0"="02q97wss9bm6xj9lvr8vx8jvp8bszkxgk4ayxk5zc4lrnjzw2i51"; -"biblatex-nottsclassic-0.1"="00valazq56srfggfw1mq8h7285lrx8iyk44kb8bhqr1q7nhl6pzi"; -"biblatex-nottsclassic.doc-0.1"="1c5634p7knwv8zrpqh39zlpglbdbx9a5y5gw54gj37x3r1ij769x"; -"biblatex-opcit-booktitle-1.9.0"="1xciw0zxkp2034lccvhr6irkr333s0qqqacxqx20v51vjjg8ywkg"; -"biblatex-opcit-booktitle.doc-1.9.0"="1rbswdipirzv68ckh69cc29k908ifpkzp3vxgd2j0bjl3qvbwcyq"; -"biblatex-oxref-2.2"="02071anv1xni90hi5lzkmsrnkm8m57n1svkslghljy33yxabzfv3"; -"biblatex-oxref.doc-2.2"="1ih3hia7x5ghs10g2gg75d9mhvr4fkmncwi6sp0q4zpl6zz6sg9q"; -"biblatex-oxref.source-2.2"="0qhgzzz69bndzxhy3z7mj1yafxz5r9ihhx90phn4lwcrg5db8lcy"; -"biblatex-philosophy-1.9.8c"="00ad8xawypgdzjj45lfr3w6na8f0rbma5svq3cycb86fr2vwnv2k"; -"biblatex-philosophy.doc-1.9.8c"="0di059liq7v435kcwhf7a5nyp8v6m2czapz18xjr810pblhgqvqr"; -"biblatex-philosophy.source-1.9.8c"="13xrj5izz0qr4p37c6ffdph2k23jqvn3zywsh1qijwrj09w9s0kp"; -"biblatex-phys-1.1b"="1vj1rrhzh7ncvi2dap2cjk88vdj0dmlpakjiz953rvb7szx0h40r"; -"biblatex-phys.doc-1.1b"="0z3y7gmcmp2p5g25jha6kwkd7ma4pzgqybxra4402p6aid823fws"; -"biblatex-publist-1.21"="0z20z9j59w7i8gx95div23jrqdpz5yjb8ndc7y74xx1msrqbd7w1"; -"biblatex-publist.doc-1.21"="0iqqsshqgfz4yxqb8xxbavf1fg3fzs0w4v9swwgffj9cawa4yzsq"; -"biblatex-realauthor-2.7.1a"="1xv65ic8ywf18fdb246sr8pvq60hv4wmg7ris1glr5104g5yhg7p"; -"biblatex-realauthor.doc-2.7.1a"="06nvybm142cd1shgpcabddbrfyvzcc3yxk9zyq9hr3rfhzcqf05q"; -"biblatex-sbl-0.12"="16r9sh92qbbx2caxrzwspqlskwpznlx1b0ni8xfrxq08cdr2m548"; -"biblatex-sbl.doc-0.12"="0fqldbd4n43md8jilf179r1a64r8idw95n14179xrgr585x5wic6"; -"biblatex-science-1.2"="0llhz0jmncjp8c2r255mxh09rvff1s0kx1lacxvy7svwj7fl6qgq"; -"biblatex-science.doc-1.2"="0daq39wcjryhcapsx7n216yr591scjcwg7z4cihpb10igx15kbkb"; -"biblatex-shortfields-1.0.1"="1766zipaps96ks920y5zggc0zhk8vkclqh2c3zc2y8x7jdbah1vj"; -"biblatex-shortfields.doc-1.0.1"="1fs56vf86wwpaz1ik846r83zd9bpidrzzwv4l6jhxss8hgww6y0w"; -"biblatex-socialscienceshuberlin-0.0.1"="0fj2l2wxawps79v81s74jr4d8wz4pf45mmpry1pflm2zcica3ajd"; -"biblatex-socialscienceshuberlin.doc-0.0.1"="09sf6k9qghwll84bj6m7v0xw6zm040y6n878x0ywiq64jc33h0np"; -"biblatex-software-1.2-3"="146mr457mnvjsycsy10842mvn0gd81ij2wglkyqf5rvbx4dwra3z"; -"biblatex-software.doc-1.2-3"="176vrl0vw1f9jgln390y2554kbpmdyw87zsv7i7mc99y311sz3j1"; -"biblatex-software.source-1.2-3"="0jig20hy40f90iq3ywp1cf7ms7xcm5ccw90f17iayz8g2hrn2nrf"; -"biblatex-source-division-2.4.2"="09wsi1nj7hcf5nswkd6syn63xhk2ghaxikz5xb5sfyci0lmnqgxc"; -"biblatex-source-division.doc-2.4.2"="1mfz2bxfwx24a2652n4jrdw1mhrm1y7i5vq54rs7sp5a1xfg2d9q"; -"biblatex-subseries-1.2.0"="1c92azsgrp1cmq82ga3cvnca5s4j902hcncp64g9psgl9fm74nwx"; -"biblatex-subseries.doc-1.2.0"="0ri6vvzcpcm2hz73dkam0fgbnfm7i650x983qcngkr0jqa43xr41"; -"biblatex-swiss-legal-1.1.2a"="1sqskc93a3vdxvycmdz494kddxvzpf6rgw6l184lizwnrz9mr8v0"; -"biblatex-swiss-legal.doc-1.1.2a"="1k0xgd5gi421zvh8bvyvq5naapb6v7216k2sn5aqhca93sifgvqm"; -"biblatex-trad-0.5"="1000rdnm9jqk89snffsf4ldl47wry8k5akm75aqhd9r7qbn73car"; -"biblatex-trad.doc-0.5"="1m32xykdgms8i4aqny35w0happr6vbkkra9m4nasxp1vzykf0n63"; -"biblatex-true-citepages-omit-2.0.0"="1lqs1swmdmnhard0589k0r8gz3hp9bd88dz5z0kd0586vl7z2l82"; -"biblatex-true-citepages-omit.doc-2.0.0"="0madnjxwjlz9hs6jzgaady4sv0878v7fyjs3sn1bcnzyw4krfxgx"; -"biblatex-unified-1.00"="094ddmm1g0lq4dblgp8a87y8gyiab9flcca98fwnyh6jw2nmgk08"; -"biblatex-unified.doc-1.00"="1iip60hifs3xcrpv9zp9d7p3wn4iw8bfjiwqw3z7rhfk02fqn8yw"; -"biblatex-vancouver-0.1"="19ymkk94c4l5sav1lb66f2lxjyfzzi1s78qd2a8drjp9q1c6i0j8"; -"biblatex-vancouver.doc-0.1"="0wn26kl4nli220lfs663rdqmv49xgi76kjgnlwh99yljx7v47n09"; -"biblatex2bibitem-0.2.0"="1fbvrdldp9w6ll568960c4jvpjq7dhwny0ca6mka6vn2r1p4rp1z"; -"biblatex2bibitem.doc-0.2.0"="0mksck3h53zmisabmk06qnbn3p5vk74g1r2p8p0iz6sifa2hqx2n"; -"biblist-17116"="0z69a5x3czy0hb59c93jrkmmg6i66vc7rw6szvchsbsj1c6gwjfb"; -"biblist.doc-17116"="0wp7x8qj7bh1pgcy01jmq35r2i1f8yvrv6bcr8p68d70sr1jqspn"; -"bibtexperllibs-1.6"="0c083hg8hczwc28q0c9gw4z1bwj5w3krhrs5zg15h0s808ji32xq"; -"bibtexperllibs.source-1.6"="1pb46v09ik8cd5kbhl79qfnj9p2wl19g9vpjkdxqvzsb04i7lf0f"; -"bibtopic-1.1a"="0rzz1c1c6vgjm2r0gv65rwvbcv0asc5049agv75yyvqihvn51018"; -"bibtopic.doc-1.1a"="0hzy6353n1rzirfdjd8dgjhnp496i14b0z0n2x7gnisf3qksr0wx"; -"bibtopic.source-1.1a"="0abpdz3ir7l9dvc6vy5zi9ay103ga7i92vg3z69agd758xnz0v3y"; -"bibtopicprefix-1.10"="0vy9cah5mmr1vf4sm16212h36wz4623s07cagjqnmyprgm44sz66"; -"bibtopicprefix.doc-1.10"="070shh1cg3hdk097v9jr37f06q0qaaxji3vjdv8v24a1rg3rrpdr"; -"bibtopicprefix.source-1.10"="1v35hawmsgm12sv80wq2ld0rzz5l4shvky44l8wkxxh7i7vy43sx"; -"bibunits-2.2"="0znv09kqrwvmsjsw3lx9d3mp6fm8444zbn317q5yn5hzg2dyj61f"; -"bibunits.doc-2.2"="1zgj4jpl0fpmsrcp3h4qlkilflmy8zqhjamghidwzkkg1i9jsfz1"; -"bibunits.source-2.2"="04lswyalfivh01hp1wj3fq1q8960dmsvnbi8k856v3dhz0pv0whz"; -"biolett-bst-42217"="1ap5arz0s65bqqfllzwxisp3wa327kgivw1jh1gkc4wljq7v4jq1"; -"biolett-bst.doc-42217"="03hj647j6b7y43djqvb28rkjixpr0y7i02420piskp3cg90hn5dj"; -"bookdb-0.2"="1qky1ccqyni9x3dgjn6s36qyqdqzkj65m2glzzqdc4qs2h1hqr0q"; -"bookdb.doc-0.2"="00fr2fid8yg3ww2gmgadxx90y032vrgicjh23ia41r159clg7fqp"; -"breakcites-21014"="0f3zhwrk0wapckz83304anlp2ssii7nvzjdakbxfdj51cd6schpg"; -"breakcites.doc-21014"="1f8x16qy5v27asch2jhbgh080vmv7mza4z5w63h31gdglbkwdp11"; -"cell-42428"="1y2bxxx73r1h9rhsyar81r4s9nhgqjlvs5rwnkpk148rwwar7l56"; -"cell.doc-42428"="1ri21dk1wgfaay1hblmn8akmq8ccxpbp5lrfnprkqqrvkxnmaylg"; -"chbibref-1.0"="01gyfwsfrjy7fs160zxvzhr517wwbsgh381hk626kvf87wssz2nv"; -"chbibref.doc-1.0"="0h5vlzfw5lfg7chqfmbisqydmjn513rjrvw8pax4xlm75c0p6drv"; -"chembst-0.2.5"="1dg8dasw0r96rnv4pnmm2k96rxmsdfhvkbxc5m358x3i5i4pcpm0"; -"chembst.doc-0.2.5"="1zmqlm8vr2f1mga0b33wikv1wn9lx3lpx4y7pjhgdqk84lhfqyh2"; -"chembst.source-0.2.5"="11qxmd7b1h7fwam9sclazzjhmzf5fiw5ykw6ry553xm1jp7vhvhb"; -"chicago-15878"="0mwrphf2g7v5yc0qij76dkzalgm3fhcm8zs7akgaypyk98cvxw8k"; -"chicago-annote-15878"="1fz95s0d48qb1pzmwy7cdnccvadwsqj3pyvx02bkip5l0mg54kgg"; -"chicago-annote.doc-15878"="1lwrlb5axxqzrj1azyw6bsy9f3lq2n5acwnzmx8z7aw5sj19ls07"; -"chicagoa-52567"="1za4fqlpirbr3qs894abnlwmrhsqbahniyyimy1dxal0cp61cfil"; -"chscite-2.9999"="0db7nrmm5r4b2cvcyjfra1fmskjaspbgymjsl4vvif9j3kwaa0ba"; -"chscite.doc-2.9999"="1q5s4qj508nqy74cdcg8380vjbhs4v70a4jkr9wdirqcxjxs6yfn"; -"chscite.source-2.9999"="009a8y3lxpxjhkd05fcf308k3fihl95pcn7r2bgy57jr4nalmixx"; -"citeall-1.4"="05nb6pywcrhqi1c9xfzkv46j2fq9y1lqmqawi75v3z56h2v6c136"; -"citeall.doc-1.4"="1p54cr0khq72z396r3vl0p9qqn2k82pmx4pjaszlzhni5v54hbdr"; -"citeref-1.1"="05bxlkylmilyzvbl99nsw16saqjsqb4bcaa68qkz8m59wz1ji4rj"; -"citeref.doc-1.1"="064c9zg2rhnym0wy2kxj0617mwb3mxpc1rr13lqpwb1f1qhghm6f"; -"ae-1.4"="1nbhlv1qp7z8j9bhfrljmpjlcrl346z1r7f4hdxijdql0wxs6a8z"; -"ae.doc-1.4"="1qgq32xw5micjri99zmznmq8gsli6y9fqdi2l7sv530ri9i7kgxk"; -"ae.source-1.4"="1ljkgb4qj0wa6yxddx4w8w15z0nw5vnyh0cpzc4vwkc0m03xbrm4"; -"amscls-2.20.6"="0k3di45cn0g6v5j7ccgl0nys6ni1h17dkhmkz5b5lsz4zzbi05fi"; -"amscls.doc-2.20.6"="1lb1q967zwgqn21ix4gxbzw8a8649p9hky4ckd61l0bxxil3mhjd"; -"amscls.source-2.20.6"="0g1i4nj0y32sihf7hnb8jwyh3d3qmff394xgw8v8x5jp8q0rh2bh"; -"amsmath-56514"="0hvfxm97szbj5mll7vmz1gv6h6x6hqpk8z4kn51yamda61bvgmfj"; -"amsmath.doc-56514"="15j4p7jh5xd9281vpagvwcx7v25b1y5b5rrx4rg5gklkvf7j3j5h"; -"amsmath.source-56514"="1sancw41dcbzfkgax8ygbc3s07gr9j3c3a3d1clipw5dpbp0jh8d"; -"atbegshi-1.19"="00r3ayn5qa2p2j4hyxbp2mm1aqhbkjpwk15gan1b4szmm2wk54h5"; -"atbegshi.doc-1.19"="1pjfmnrssaw20sdq801x9jb9qh7s8l2mnhcvla4bxglckgwz2na9"; -"atbegshi.source-1.19"="0b0sxs3jpc6a9pw1z44iv2bwvyxm02yfl8j0mc5qw0asdp773vrg"; -"atveryend-1.11"="06q5b28q5m9i29yqqx1l1y0vjc20i0n6p2k47z66jf3s6abrqnrj"; -"atveryend.doc-1.11"="1nn08cfh3n63xd45rkmzvdmf5580lm7kfd08z9gawgaibh6nii80"; -"atveryend.source-1.11"="0fgzxwc6jlijf0mzjh7pm2afd85np1rwy4xziz26s0gi6i5pdmvp"; -"auxhook-1.6"="0c92za082vzi47m5dlwq8bss4jjgfzmbbaaz5j1yb4ngli9qj08y"; -"auxhook.doc-1.6"="0l6xga3hr1lvhgli259ma78rq394jplnkn5j8fgrfapvzrhsh2kp"; -"auxhook.source-1.6"="18q0lawz00fbv9mgcbp21zk6fm1hsprmrkvhnl34ac1qj1rx6x3p"; -"babel-3.56"="1a9kylk1xjahqiyq9lwqcxgndgmbvcp9sjp8z5nkyrbf2b74jyry"; -"babel.doc-3.56"="0qd33vywp9hvlxzwznf3y7xcshspq214ywa5y7b61frww2r0vchq"; -"babel.source-3.56"="18kf6znikvrysyngk129jim9irgkd14idi5w1l3m3qxf0b56l7ac"; -"babel-english-3.3r"="1nb3c0yikcfhlpfsqgx2c6549ra7wcbcjs614d7gvk5fyh0cds8y"; -"babel-english.doc-3.3r"="0jfjdsiqkg0sfy326nz6rncq9sk1ssjzb0w2frybkp348gif3rv4"; -"babel-english.source-3.3r"="1q9bgs6mdgjlg3pv2ddrwbnfb628dr6rhdsgkf7rnwm5m6ncxkxh"; -"babelbib-1.34"="1ka976ag8w02yrbbgldzlqa5852ag04i39w9wv9bhprn84xy5cl8"; -"babelbib.doc-1.34"="16iznzd8hk1hxxp08zcifn9v5bvh3dy70nyas804z8av306s1h0z"; -"bigintcalc-1.5"="01vz3qrhxb28v86np3a0spq9yxxc7faav32m136nax2vkm5ff8f3"; -"bigintcalc.doc-1.5"="1wa6750qyggvx7nlwq9n7s1rfdm1h6i5hv91y1aq6mn26sw68l1s"; -"bigintcalc.source-1.5"="00gnanfnw66bfrd5gk072z9rn6nhmqnjwf2dwnamvy3dpxgg86jn"; -"bitset-1.3"="0ynyw8fyb5cidlz00f42cf21gakm2ir9ilddaaz12s7qq99lhj65"; -"bitset.doc-1.3"="135dcx0b51br6lf9dxd66jq2xa21bpb1mi4y4kk5z6ngsd1imdag"; -"bitset.source-1.3"="0yds3rhgq52sxvwn5kc32iizapbs5g21cw6avbppiip0s5x0b538"; -"bookmark-1.29"="1vari4mh0ijss50sa103ppz9a7mhbn72gl7sfgs6y9fm0rw2b457"; -"bookmark.doc-1.29"="1habxdliv4vw5xsm3ki8m43fbqxkvpj4wfm2j7nkg01nsl8q2zm4"; -"bookmark.source-1.29"="0ygfyjpz90vpavg4ifalbnw2fl06j6v93906ragk48g711dzhyvp"; -"carlisle-56753"="0pwd4yqhwi3nmp19zyv69pg46xlk7s2n6m001v312vri5f9k40ir"; -"carlisle.doc-56753"="10vxpk4dxf055s1ffpviav8sh56b36znr63npf40c9gbaxp9gcmh"; -"carlisle.source-56753"="1j685lwam6pgkmv0bwsym7a1w01bgraqk5iymv678ax5m0a7f5bn"; -"colortbl-1.0e"="0i2i6rfhbllc5imdaghm4jkfq0yxc6zszm02l49aikg7qi6zmmyl"; -"colortbl.doc-1.0e"="0i8bsb0q3ga7p8mr1wg3l64x9rq7qlg9f16m7x6a7ys4ppd8qhn5"; -"colortbl.source-1.0e"="0s5c1qr1bi835g9a89x08wxsg9y3837xqfkj0dnpg6rs2qz302q9"; -"epstopdf-pkg-2.11"="1bd7bkkk5hbp0bfzrvjpmfrrvil9i2pzmzl7aaa324q7w4f1w67k"; -"epstopdf-pkg.doc-2.11"="1lwv6av0b4v4vzzk3i27diw42hcdqzgvis1fk4fclkyqz7w0ai4d"; -"epstopdf-pkg.source-2.11"="1qmvc299bzgfrf31sa4027rgkq3yjg57318mbx4gl4cwznxr7zh0"; -"etexcmds-1.7"="0m0kf57wcmy50qcca2v5jb8z4h7z82pja82igmf6gsm7fksm3wrb"; -"etexcmds.doc-1.7"="0grl3svqzjh5bdg4jwzmqaxz7chkqka0vn0hnjwpyvm52ngmckyk"; -"etexcmds.source-1.7"="1s7avnnlr4g8xjdfmkm82aanz0k0cnhv2dyar30439x2indyw68c"; -"fancyhdr-4.0.1"="1xcw1bkfh3xh1yysqp8syvl2pnfm6wvam5j44vp31rsa38pyk8yp"; -"fancyhdr.doc-4.0.1"="1bjxd9gvzy4yz5mld4vdc5ik3f049il8046s7kqsz4pb1278y09z"; -"fancyhdr.source-4.0.1"="0rw0lq99kvj5lkkjp7k67q7sxksdx3yyqhpv09l1g21r7f0rw86l"; -"firstaid-1.0j"="1kxd6wg4v9fsngr94cqswn6a73ccf63gkxc313z7vzfqcllgclj6"; -"firstaid.doc-1.0j"="0b81kjvisimw7c07lfvyasi7jspywmm2l7bagxyx8r2k234pcr1w"; -"firstaid.source-1.0j"="0zx37rrl978ip4pmnmccdjvr45aq5q4ri8xlwfwagd3k2n8a9ihk"; -"fix2col-0.04"="14n020dmfn2s54h5xvc9lrynijcwnj3d2w4kg2w52v0kf037hmln"; -"fix2col.doc-0.04"="089pdfpk0bi23yb7grjv4w1agkssfczwvv2vhk3piy43qpk9h09v"; -"fix2col.source-0.04"="0wi711gb3bc5pc2kb7q2hz8y09g4phjxggrqjbl6i432z42fc061"; -"geometry-5.9"="0wv4c77fvaz8qg1ffjg3y06r3q4xjfxkh3m7a5s9ynwmfchcirgi"; -"geometry.doc-5.9"="1npbvp9g9b4mp8w768gzx1vxsdsi9zlrlfgc65xmb0rqx7z19zvy"; -"geometry.source-5.9"="0dm5zakrp71rxfa8xgj7ks0gfvmrm93sqi6f8m4hw7ls7yqm3y9f"; -"graphics-56514"="0ig3v1wcxv21lw3fyfadbnj13bnx36njssc4cdyyhrcljamq6l9i"; -"graphics.doc-56514"="1aqrxbaz3hj5b06vklgb3p02211rvqdzc04cx762636zrkh9l6fd"; -"graphics.source-56514"="0pjal4akvbk5axlrw1sndfpf7c9n7r1z1ipx1mr03hs4pg0s5xmj"; -"graphics-cfg-41448"="09yifx2ww4jjjhl5k8b5vz78711289755mw0r1rcshk596qvn9r5"; -"graphics-cfg.doc-41448"="0rfjgc83ryg3s5q01xnkk8bzw7rx7m96hfxq85xjjn5qxsgy8yqy"; -"gettitlestring-1.6"="0kg2p7ys50ms0li3vnrabywnrjjgllpyr8sf9cz3rnv8zsab4b68"; -"gettitlestring.doc-1.6"="0xkk16ncsyv2s3klv316fprld0d5aqaldh3g10p5gcicmccd9061"; -"gettitlestring.source-1.6"="153bkg899ikkg5zhfw1nc48nzk3c0x5iycxspxcrrj52dpgq22kx"; -"grfext-1.3"="03ff5n3yc3fxrayhyapm9qhd665r15v57vri6ajb5xb4m18rkfqw"; -"grfext.doc-1.3"="1f5kvnnv604qllqim8qv40cfpx0xaxanigqnqwmjfwf0n44akcfp"; -"grfext.source-1.3"="0i5pkqrc4jm3cgwzyhw1r3kh6b0b7sb352bnzid7h8msiwx32y8k"; -"hopatch-1.4"="05v819zywc2g1155yvrzql7i7c99605kxnkgaq0mm62if6a0rsda"; -"hopatch.doc-1.4"="0jc2amxm8c1j6mwcn64x7rpjl61yxvsk4fchyl2pxrn4wa69z5mv"; -"hopatch.source-1.4"="02pr8bd87ri7x0w2bgzd2vlzrq3b42r3l7na4vq7lnikr1p3x550"; -"hycolor-1.10"="1dfd149g2k8cq3lw95z6r4knyq1mgirdqnk9c4lmd7ip4rcs0vi5"; -"hycolor.doc-1.10"="1pc12vbn1yak6l6c1fgpnj0s88fg94nagj4b95mvclad6b546g71"; -"hycolor.source-1.10"="1f5jv91vsib5vk4byr0481a8j5pvbwmhfqz2qd14ck2vw8laz4ap"; -"hyperref-7.00k"="0jyb5s1ry6fw8wlmvsxhgw9gjxc8x92jcqx4rr7h792jbpdxn2ih"; -"hyperref.doc-7.00k"="02fqchjah6997g2d3qj3ly0cxykjb4wzfvmz7xbqj73l1c18rs54"; -"hyperref.source-7.00k"="1mplajf3p3ybhx63dsdlhl80y1sgf6m5vi8mh80a58krp6p4bw6x"; -"intcalc-1.3"="0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l"; -"intcalc.doc-1.3"="1vav25plm639410p59bi7bsihsyys9yaddz0bcawxn72zi9b96r4"; -"intcalc.source-1.3"="059pqs3f821javya7brxvl9v2mifdyw1vg18hr1zgzhj7bmlxh14"; -"kvdefinekeys-1.6"="12nn74skhwiszbdhawqds31caz6d59a5pjmwar0r8lmk4f1jr3xh"; -"kvdefinekeys.doc-1.6"="0x3h28xqgsmngs51m666mvxb8jg9vwk0wyhijcw84v1szyd0m7d6"; -"kvdefinekeys.source-1.6"="13cb0xvqhz5w1hv6hamr7rh1q1cp6abqfsdqzd0xw0my9mxvwk97"; -"kvsetkeys-1.18"="149vpmv4vms269dzq4sghlngg380sasvxnb3sx9rfs7d9j0finvi"; -"kvsetkeys.doc-1.18"="0fw9qrf2cnyiqkpfgs3p3v6ghb4jvckwr4ils2syk8hm6flk3rya"; -"kvsetkeys.source-1.18"="0inw89igbpvpiyhyj5jrgv2n7gs11flkx1bf39aakkcw5lb0pwr5"; -"letltxmacro-1.6"="0p16zmxngzzp9hbg7bxrh087gxj7hg4avf4a9akjkg56834hna5h"; -"letltxmacro.doc-1.6"="1gxldiflxvhy6ca87f8z3a3zzisrwz6f9vrx2r9gsfw72jyfa99y"; -"letltxmacro.source-1.6"="00ykjx412119jxwf1zaz5bismfr0i52psf5fagdiybbshs5ac88x"; -"ltxcmds-1.25"="1lr77yai2qivlx26s5094czpfxmg96bhxps5wbm8xn7cpsw0zbd9"; -"ltxcmds.doc-1.25"="1hxclaafsgj1wiw1hrqzn6p227x22wp679z5sm8507wlys53v49h"; -"ltxcmds.source-1.25"="1k1kwmyn2k11bn5dp3cx8wjdiqrnb0f84rbv8xbsba199k51ws86"; -"pdfescape-1.15"="1vbdjmm9bi9ngzz2z1b8jnf6nzf9xsaj5pvyswg13y4dr00mnz6n"; -"pdfescape.doc-1.15"="1v81nw121acyv6mvpykgrcdvsgqmby8acpby5lj75ih4zya9gs4d"; -"pdfescape.source-1.15"="0jk7rnf3z1hlrqlrcx0bzic46v57d8vpm4w5fn4c37q1f4v5zmpi"; -"refcount-3.6"="1r4lv6yhybqb8wkqyaysimb79kbdgvv393kn7dkjqr46b5w4fzcf"; -"refcount.doc-3.6"="10vn481rkdwv63z4n67gch55w8x44v125kf3v7299j92fm8fdznk"; -"refcount.source-3.6"="1rf8yk9xc1qhiiq30jhvjqmg5773g5d33fpcpih4i9c1l7kad3sy"; -"rerunfilecheck-1.9"="1c8x5cp12axkkb65b0xfwgachflngj2kxah47alslzjxwzh85fv2"; -"rerunfilecheck.doc-1.9"="0pn3fmjhf3mxx3f42zg34ibfnr1dlxhbddssg4si2y1f67yfi24p"; -"rerunfilecheck.source-1.9"="1m3p6zcl37xyvszf61yv7vrhm7a81g34vjj55161zfwypqba57sg"; -"uniquecounter-1.4"="1g7ix0pnd52dsykq5na5d4kfi49zm8gmampf5yn281mn901p3wjc"; -"uniquecounter.doc-1.4"="099clvqs76hiwl8i2gqj2hdmj2m77v03pc82sls2xpwvrs1dqd4s"; -"uniquecounter.source-1.4"="0cgpfgv4yybrq1ryhjrzwfwf97805dw6if2s1qivhry94lb96vn2"; -"stringenc-1.12"="01xnfg0mcp94dh33rfzphk50kjb68bw76kf7jnbsnjwlqf2cr5pq"; -"stringenc.doc-1.12"="00hbmjwhas4fpcx1yg016ggqv324hdc2aklr2nx5m5x0i68xq6qa"; -"stringenc.source-1.12"="1ir6041286fiz8c5zpsbl4cq62gzdrdpj50aqv5p6b1lqd8bsfp6"; -"zapfding-31835"="17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn"; -"l3backend-58509"="1k3xfwlpjcsa6lk5b5b1k1dih8vn915nhy9jprfxjdsr6jha072j"; -"l3backend.doc-58509"="1jn5a4brv3y0nnalvd42p45n32mzm8a3kvw1y13kz73ksfhy08qm"; -"l3backend.source-58509"="071mb9g9wid2jlmzrjg09vjcii170gmxq632mpj9ffb54fp36sgi"; -"l3kernel-57789"="0kg9v51jxw5bdy84klkydsiyyibkyxb8fdw1q9pk22i6nasx8xx0"; -"l3kernel.doc-57789"="0lpcda0dh1igb5irlfk7swf9kghazlazc03k5f8x6qjh6c2vhzsv"; -"l3kernel.source-57789"="0v6w15xka4k8fmh94vf876az2r9zfzh9fx65d5d0xbzjwjf6wb7r"; -"l3packages-58296"="005nlbw61qqj9aqbh50jyygfdf306jx52d66ssrmwfsfppcyv2my"; -"l3packages.doc-58296"="1bw620alsjsva2i0wjv1264vx1vcsm1i89lkfgabvjw00ap9rp0v"; -"l3packages.source-58296"="1c7vgyvq1y656payk1mkwsdx5w4n4r3v865aivlmjbzxaqk34az1"; -"latex-2020-10-01-PL4"="1mrlnxah6sw35zrgjplzyqji6pwkbxv3whd89kz409ncfin7zkda"; -"latex.doc-2020-10-01-PL4"="1psh86s3gf8rps8m3l4168xsd6lwy76196iganrbqlcw1yvlabdz"; -"latex.source-2020-10-01-PL4"="1xig50ldj7pfyg689q4qs2d9b5rnapl856lg7xwr6qh723vxc47m"; -"latex-fonts-28888"="0dh4kgy4mfarlsrgqw4dm5zgfhcfg9qzh8s2wjk6w2g0jfc8rf3v"; -"latex-fonts.doc-28888"="0243qbrs2w7qh17nh8m4ivj35gfgxsnqxza281cvhh7g2fv47f5l"; -"latexconfig-53525"="10ynmd8b9b9l1wl1mva23yz4zir53p6r5z31s39wmxz19pj12qvx"; -"latex-bin.doc-57972"="1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi"; -"everyshi-4.00"="0y738zcqy85ww3mhwgrj1qh0vgpwfh2ib676wlr514xglvmp9l3n"; -"everyshi.doc-4.00"="0ynjq4ibx6rr0qh5lajb5n9skqa3j4zyi533mxc10axp5zpxsjkx"; -"everyshi.source-4.00"="0iqxf73n3l1jf32x571rw5wqwvz7nj3bvyqzgizvfpbnavqhrxfb"; -"lm-2.005"="1b4lc6ipij5iws4rgpv3sjjwrdbaxnwiqdbyyj62jzc3yk999m4y"; -"lm.doc-2.005"="053xga559cmqggdifabingd1f7q1lfad1pkk9nmkximclq5igg2d"; -"luaotfload-3.17"="01b2d8zsxga3f68h4dpkvyh2c72s8yrv1ff5nchipi8ka6bv5h2r"; -"luaotfload.doc-3.17"="1qsvd1d1257gnq2jjj7ifa8a4k33zjynk9c0vvhahdgkggyzhlrj"; -"luaotfload.source-3.17"="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c"; -"lualibs-2.73"="04fdy6p2cm134vs0s0ahzl5rpyh7akwzwil0r0y74r2lckqxmn0h"; -"lualibs.doc-2.73"="0bmnyk1i4cxvqdvgwwd0qzwzav64zh43lzfqjn5mqimmqwb85zdb"; -"lualibs.source-2.73"="081kcsvnzm0fj46aihixahyg0vpn6jiv068y7bxq1y2brinbq5rj"; -"ltxmisc-21927"="14llkpla8gpx7q6a53sd8a0a42wgk93fg4mbl6pc0v7v1kjblr5m"; -"mfnfss-46036"="1m0yza8nw5r3ph8k5nihgf93vf54cb0cnw4c5gkqy0rsd23hk4dd"; -"mfnfss.doc-46036"="1ppjjma5dc5i9ly5y7h91647nw9c2y9w65k0dn1ks92xsvnzf1mv"; -"mfnfss.source-46036"="0qjz8dz76abwqspab89z3a50nndh6gflanr8hn31z5fra3kzfp90"; -"mptopdf-57347"="1r7m71i3cnyf3q5nlg6c3ialw6vmch48sgf0flmd63y6n21zjsi9"; -"mptopdf.doc-57347"="0hw66p8gbd91ddpiifgm4qbd4vv2dbc149k299nb6xxp93hh44yp"; -"natbib-8.31b"="1wxpcyr1b6k1rzizbz2g452klrmr6xh98csqr6pawlnx2zy3sx5x"; -"natbib.doc-8.31b"="1hai95c7ah61rqrsvzvn0ppvr7pn10830dp7wn7fc0j678z9r3js"; -"natbib.source-8.31b"="1qaxwivq95pf014w39igh070cnbs7n0k5am4waxvdwkzql1fafpy"; -"oberdiek-56291"="0qz842nvhzpiiwqgrn4hjbb5hb2k37nfpxrhgjhbnm2d5pi96qb5"; -"oberdiek.doc-56291"="0bmpz28w3pbwh7p12mhx47k0w6wyppj2bgcw917ajvddigla86aj"; -"oberdiek.source-56291"="0h70q3xd2i8fa94ai30vzhpzb91h99xrq273cp1fln03wwiix5rs"; -"grffile-2.1"="02cmm9q14h87dv5h5ci7ny7v4plrry54mz15jddx1zkfx4myykww"; -"grffile.doc-2.1"="119xqz1n57mghhp7db19ffrv1cdk1fgpznlyrn3qgvg2926mx104"; -"grffile.source-2.1"="0pmg9140plqv27mp936ca0193ihggd243mmprj3l0d6rf5dajm8j"; -"infwarerr-1.5"="19nlrbfmqbkjrrx9x75s9nd6crg1lzimb2fr3hfblaivj6lx8p4r"; -"infwarerr.doc-1.5"="0p1s0v6p7ygkvz5f3vgarcrl85clfrj3ivzrka62djqyzn4bb3yb"; -"infwarerr.source-1.5"="1x2mkqyx7gz0bz31na6mcdyrlj11mxpjlzc6gb9pk51sdqjj0bbv"; -"pagesel-1.10"="1j6rg25mhaiamlff4j4lw8pbp6x3mcg00biqz2apsbi6kmbiljw8"; -"pagesel.doc-1.10"="09s7r6dzv95689ysdw442gyqsd2jpdyr8hkrigmn9c4sx32alq5n"; -"pagesel.source-1.10"="177j2s6chsdhhw63q9g6ryc06vn6rsi29n4prrn2w14fgr3wnhcc"; -"pslatex-1.3"="1wfk27qb4x8aafph0lgnkq3bkz5fy4cmaiivd924mk92l1wfg6dp"; -"pslatex.source-1.3"="0qg1055zpy3pi3hljrrhzixhzi19rca2jchg0q04xi0vq3vslpcz"; -"psnfss-9.3"="0ng5pkk6m2l8yqd58wggbakbs4hp4400r4ihyi9akf8j4kmq2s5y"; -"psnfss.doc-9.3"="0vfv9x1qsivwi6c6hi23vw0jcjz9dclx0vxnifslyzlrh7592dzc"; -"psnfss.source-9.3"="0cqpzra8jwdn9d6w4mhmfrfw2zia2nbpyxjfrcz8m1disd10lhsf"; -"symbol-31835"="1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs"; -"pspicture-15878"="0i41lg0nw9xya0gfiwjd3xgbk0w723g90gnsvnfg764s2dl371b8"; -"pspicture.doc-15878"="1p27zx0svlcm4p12xjq35g2lgj1j485c3x363gciqb4aswmlsl65"; -"pspicture.source-15878"="1f8lhyhfcywn5y78354r37bgalyq57bm1fill5vzny3l7cyqxxn4"; -"tools-56514"="0lw5s1g7rjnfn3a9cmfc2q60dl9mn1m67inv71zr32nh3cq2kkdn"; -"tools.doc-56514"="0aa2wmj8hlkm7iafjbh9caa5r0vbc382x6vzhwyfsz16jszzhhfm"; -"tools.source-56514"="19ic4fc3bvkpl9wxivv3i6vfv8bw8rgydqpmzlvn28cygi958vj7"; -"collref-2.0c"="0q1g0x0bm0qjh568fp45b1ljy3w3jgy6s09ji1d1m5yrbs4dm7qn"; -"collref.doc-2.0c"="0vcfrdg9mqrfv2jlxh88g0nhpsrfwgdg9wjdn0l9b4c5h8zq030c"; -"collref.source-2.0c"="156gdfrd09kyxjiplcm38s3zj8v6bygwlpr9g952m0r72q7cq54v"; -"compactbib-15878"="077l73vb0rcxy1n51r3wmcb7gma6nn3xrl543a67n96lpp5xvnnk"; -"crossrefware-47861"="16c50pw2cgr9zldfhwhhvgvs896d8rl26s2frjxb7mfgzmby23ca"; -"crossrefware.doc-47861"="17i45ivhsmnhsmj594hxkzcm27mciri6xkrnzxk8lx1fs28vnxmp"; -"custom-bib-4.33"="1m25bdq11g8jin9qfib12h77sg8lb87p5680d5dkqzsf5y3iq7vl"; -"custom-bib.doc-4.33"="1ydbi1r0jvl936ziypnjqw4fsr7gvc1gksaqr05wj1bchh28cyaj"; -"custom-bib.source-4.33"="0sjpwz9zhr0kd4qn454nm1s4rw4a6n4qnackkrq4qkriwzv9asha"; -"din1505-19441"="1ki5xzdxgvy34pg345f1577cj93ps4mgcakjgqra8jshnnfrfqs6"; -"din1505.doc-19441"="0wh1zkzzm3d9s5gvff6j847jsqpr436sw7ysvrlv0r5s3fb10xl9"; -"dk-bib-0.6"="0b0ypkq5c3bvbz6633csljj2zqibcm0nqj4dkskikzv0dzqkilh7"; -"dk-bib.doc-0.6"="034zpjn14wia2zl5flgndr1p89b8jg0w91wzqhw5zfzmdh4k3pn5"; -"dk-bib.source-0.6"="1aj8d2r3myp74x71jkgi8ckzcr6ngsqfqqpv5id43awrffxicsjw"; -"doipubmed-1.01"="05zcv1db1bbxp6qnw4ni3qjx6yhflad1syqabqbdccrfk5xim20n"; -"doipubmed.doc-1.01"="07pd08qaggy6q58as1aqfnbk77mc2b4kavbzqk4v11f5vp5v0bdq"; -"doipubmed.source-1.01"="1hzv0iaj8rxblqxiak3n855yw8gqmxz7l8jwf98qnbpb9cm01f0i"; -"ecobiblatex-1.0"="0mrrb3bm54d6rpwg8i534wmwkh7v6qzysvd020pi5pph967lqp54"; -"ecobiblatex.doc-1.0"="0mhwspy6k7ixjjxk5frwklasm0xzwbwk2lx684ikv195nrpb6y8b"; -"econ-bst-2.8"="0wqkkd4ylv71x5qqaq8hqxs71c63gffdnks6xhdhhbhj6b4vsjzl"; -"econ-bst.doc-2.8"="16qmwd8w8ggjn8slq1dp5gjmcq27m5bi7qxfp3rf4nyh51zlh0p5"; -"economic-32639"="0jyw807d23b22md2ib7xkgi2jh4mr50pczjbsylh2gdgsplxgaw9"; -"economic.doc-32639"="18jn833w1chbi0qamdxbrrp39945drslxd2jkzi2g8wcca7l5b71"; -"fbs-15878"="18h6n8azrnk2qabv30kpa8gmj2ljkvx0nqs8qb9r8dxxnhng78ch"; -"figbib-19388"="1lxg05j9c56rrinl5gc4y7sc4r9gc5gyq59d3yxq4ggmq9q9l3dw"; -"figbib.doc-19388"="16qbipciqc6vv5hg1fm9rda4kk7x827nlmzha8c9i3dz7gy0cnan"; -"footbib-2.0.7"="1vr72sl8q1ccql2p42v3a9qw01a50v1c1rxpgmz39pp65w4z8s1n"; -"footbib.doc-2.0.7"="1xyq88jcg6p7lc44n2ky7538r23d4n0nhfkq25q7xg0dh8whbm34"; -"footbib.source-2.0.7"="0ps56l6ah0i398f38bxy4yg2i1p0ajcwczxq222hl5176g2z28jb"; -"francais-bst-1.1"="1jpqkxaplcjrvc8647rj4xh9kyaqrk3yj7r3nrkyf4r7b0vwq2sd"; -"francais-bst.doc-1.1"="0v2828gxvwhljsf578a06pbk1fr3dfl15s9xchy5gpb3cmv2xg1n"; -"gbt7714-2.1"="12jq5g2hhx4138px12c9bxs98jfqvnvpsk2y7lh6f4dwg0l1qikh"; -"gbt7714.doc-2.1"="0xa6jbpxalvygvd447gmkgkcr1k00appaapzb8k8rgdw9gfbg8v9"; -"gbt7714.source-2.1"="0b8n05n7ibikmjb3kjkdgaq4din5s5ckwzng2k8agf0jjvy9f3ps"; -"geschichtsfrkl-1.4"="0vnxskd0vlslm3jhvpvb4ihzlssdrz5bywrxxysk6c391vyq3w0q"; -"geschichtsfrkl.doc-1.4"="182m0m7lfz5wz017kb6kk2jn5vkmsll3js0sd4pqmr6gb8av44m9"; -"geschichtsfrkl.source-1.4"="0hdq1lkgmcpjk7f8pl2q3c6rin97hdzwhfwacc43m1l3c8zbmqfr"; -"harvard-2.0.5"="0jpxqyrw9skg7jpw2d46f8nrh7jaa3r9lviv848nfnn6h35vs61n"; -"harvard.doc-2.0.5"="10vxj1cna040i520wj7c0flbk0d4hr22jyxqrv88616xqqkg3b6g"; -"harvard.source-2.0.5"="1j754jjwdil45pr032xjmwhf1i2phspv2swnjbyxgnssl6i370r7"; -"harvmac-15878"="1ky0vc92z3i7l64hkdm4jrlaz3acna747lfd2w3b0ybdsz8514wl"; -"harvmac.doc-15878"="19sfcgshwcvn4z3cih6ha2kgdbb5282zgf244678rl1gkmqjblj3"; -"historische-zeitschrift-1.2"="1zh8jhsmn4klaqn18zxbk3ajxvr99djavz4cww5wjm8lh5sv473g"; -"historische-zeitschrift.doc-1.2"="1gfymz7b2khfnn94qkd3dawb7ppqll9qg7nsx3qac8pqba539pv8"; -"icite-1.3a"="1aszs6kbmwx7k322a2yzk4l8d2gdb84aq7f9sk4bpiljgi9gpclr"; -"icite.doc-1.3a"="0bc1r733c6g8y8r2kam7in3p3cb9y8frph85s26kcgdxqw7j069i"; -"icite.source-1.3a"="0l3gx6sm1inyzyb6z2rb1zrhrnyg0i3xim0dn80360fkxxsz7739"; -"ietfbibs.doc-1.0.0"="18ypa96z1gclq4amka28sv26pm7lycak68zf4b3sf1bx4ldnzmxq"; -"ijqc-1.2"="0h67131gbqr971hln3imf3dljh5jaqmdp23hb60zxnlxllf6msjs"; -"ijqc.doc-1.2"="0l0pvaiqgyxk5fv2carjhvp6f45clrnah5sla7rdslf134d8ciza"; -"inlinebib-22018"="0v37ifnjpvsrcbrjd57yk3qqq195jqvr1cgvfz2fsrjrd2ima822"; -"inlinebib.doc-22018"="0w4j64dxh11fysqpkldksv2qg816shz0dj16jqgbksxkjsig1i16"; -"iopart-num-2.1"="1fx5sw6xzsamlrnm7nl965xrgmgffq85kkxr7ayka1w578p6f8jz"; -"iopart-num.doc-2.1"="06hrw0c3arhssabm3l6fhb1kh8bg4vp5hpafqlbyz064a60m1p9y"; -"is-bst-2.03"="1acvwcg568iv9lskld9hjnyvqvlsmgnbg2akrd59kmh8mmbkydk9"; -"is-bst.doc-2.03"="1hlprbjkamq1w3f1n2dzayy9v14kxj8f1nr6d3z99c7v7kg19m75"; -"jbact-1.30"="0z0x6jrxaayp3w441r1zwlqirvv23g0b8h9xgy6r3ppi71glzqvp"; -"jmb-1.21"="1a5nz825jppq3pl1263w2sbm0a48kmmndppfpp7vi69n5j2248dy"; -"jneurosci-1.00"="0ywl1nlysc5fk7v5cdmy5g5hylz4ll20nnqxsvymsxnayjm4civ7"; -"jneurosci.doc-1.00"="0a8almw0x4b7v3dsdi9cjv8vzg518fl90zyyxn24p614w3zr01sj"; -"jurabib-0.6"="18s5jsi5wp0cac968ysqajwrway4sv1scf6m1g2l86jkp8gl6jm8"; -"jurabib.doc-0.6"="0klv7f8rbcw9qlqgpylyh64ir0zayf5ralpjd26g85w1pyi1c8m6"; -"jurabib.source-0.6"="07s3z6lxhkizgv0wrz0iiv1443dfyz29x9wssxa6y5lg72w279fj"; -"ksfh_nat-1.1"="1qzn0n19lslf2qg8fvm844xx5k7s8a275a77z2ynbb0vs1w4prpw"; -"listbib-2.2"="09rs3zkymlnn9fgsclnfpn1mrmxnqy8kd5pmdiphlga1iwfj5z11"; -"listbib.doc-2.2"="1nz6p8z4yvh91hvk02y184xl6fd8pyjlpjmlv5zpmcjillv176yj"; -"listbib.source-2.2"="14jrkykx2myp5fghh9qj66i5g291azm6cihi12c53bv1ijcyl1ik"; -"ltb2bib-0.01"="0glj7g6zyvm08paszjk45kp65aac6i3f8spf6zn12idf1h0b76j2"; -"ltb2bib.doc-0.01"="0j1p6bcwwgz00n3wyv3vm02z295sj9xf93v946k1xrv5jc6pg6lf"; -"ltb2bib.source-0.01"="0g05r6b662jx2s2kal26b3lv0dd6r54fb8m09yv5d021y1fm2nqg"; -"luabibentry-0.1a"="19rvhs12gw5vdq2vvcdzbz4qd3y87qjvl9x4bcqbncqcvwg82cyk"; -"luabibentry.doc-0.1a"="1raq564ad633c0xbwx6r9hhwmx1r7vis283rfh67lixq3prl0nfl"; -"luabibentry.source-0.1a"="0gqbmg1c4wm57ga8gx9g00dfbczfvhqsyl13q0ba451d3kmh6klg"; -"margbib-1.0c"="114ifix2wa74ix9zz1ml9bpyd0pqzj2983h29n3h425yq98aiqs8"; -"margbib.doc-1.0c"="01zam8vg63igvhdzf3gwgm3gjrnd23i8ra2cwdj4w44lcvapdlss"; -"margbib.source-1.0c"="0qjpbhs7g4qdhna3kmlv4pg5fk0b3xwpwagyvnl91gn3q4aml4s6"; -"multibib-1.4"="0ma2fwy3p9b6ijf727iw2xqsadk1jvh1g27snqvyrzhz7702b6xd"; -"multibib.doc-1.4"="1mwl9yziadzflq29nwv7bnbdb07d8bsxl16agj7ydmiw59ykv1xg"; -"multibib.source-1.4"="1g4d3hf8s1df57yhpw04j6bgc8n7hc16dc6qz8jcyj264vfv6fgp"; -"multibibliography-1.03"="1pmvlk1rvr98ig2zj2mgq91a61l0hib9aaly2irfzl28m092r3fg"; -"multibibliography.doc-1.03"="067wp2cmmrcgwkaxy2ngmhkfbiykr1lr0zii3i6xyyd6z2aidrfg"; -"multibibliography.source-1.03"="1p25yixvajkyksrbl8zax1jrb292prpjm97b6vh74v478bk21kgv"; -"munich-15878"="1dns8n2xybkf1m3j82adid2nr8ngvg5nnlxr5ky8ha706bmz1lra"; -"munich.doc-15878"="0dzwmrv636nca34b39mpxyhh99sr3s5k2rkj7jwms2knlfn81djm"; -"nar-3.19"="1nwk71qirapkg3h6jwlv53fm6zwb2vq0fvmc4xcanf19sm3331mk"; -"nmbib-1.04"="0kmrgd4w63x0f5j5l624j53mhivc7wllzi346c3ny7by6h7mh8in"; -"nmbib.doc-1.04"="0fzg9jm7hd3zx5naf487xxfyg2yg0w9wmc60265av5v97qkghirx"; -"nmbib.source-1.04"="1m3pnml7wdk0p6vqiyxssqi7rz0vkcvbd2z63wqy28r78w9js34x"; -"notes2bib-2.0m"="02iwnpiq918izkssa8j7fiz2jbfjn87xdjh9spwys98q2cvvxd53"; -"notes2bib.doc-2.0m"="1md7zvcnlb2sf8zw0vlnsnia1l22gr69jgksy5yg30jis3zm2gjp"; -"notes2bib.source-2.0m"="1fb70w9y6gj1a0y4w3zd7yfmk5gygx10y8xjmdj06ky7k0r87qlx"; -"notex-bst-42361"="14r3q4z35k5n0rl2igjs4lj5ic4yd14xksg1qam5klb6raaf1jkh"; -"oscola-1.7"="06jgk12q9hmbqcmwb837n8l96f3bafc7mgnv4v9amnh4ajlg6i5x"; -"oscola.doc-1.7"="0qzn7d70vl0lxyql152pzzhi72ivdslmxvfwr70186lh6fjxr4nb"; -"perception-48861"="1dqr68wkf70aj11g4ywr56si8g82bxi2xc9zdnw0nm0wbimy5zv3"; -"perception.doc-48861"="00g96wswsnpd0smv1s23hqiq4lg407m80nybmig4ibcrafjkrqrf"; -"plainyr-52783"="09py8psdqqnxmq2nkczxz092668zscvf9hbr6fcvrnj0blvz3wxy"; -"pnas2009-1.0"="0yl475rlfhlnd9d0pyzm1gj2gixrdzyn6858j1ndvkhr8vc055ns"; -"rsc-3.1f"="1ljdc1qyy9ziqsq2z6p13jlspjpalbkk9i5xmqrjwhbqz88fa1d9"; -"rsc.doc-3.1f"="0ckvfgw88jhfr91ii6zahrziigwsxfaz4f9rmc7ca2a5vk5yqc90"; -"rsc.source-3.1f"="01v5zc947vqa8xpsam5pyg8vxm4yygphyv5hji0r5dmplak0q5gx"; -"showtags-1.05"="04m7f6i3992p93xz9rlfa0vnil6h9dyk7gy1v7ih47f1m2awjak8"; -"showtags.doc-1.05"="0i0iaz4hlgf52g68znl5a3q366hd8ygad2khjs3y7hk1fwqpz45h"; -"sort-by-letters-27128"="0gjmbx6bk2c3nygcbvwn3wfsdj1lscpnqzfl6w8li26hws1ravii"; -"sort-by-letters.doc-27128"="1p0dfvh0l4z4bd86wcvph1fcjip2rvsm22j890y607lfbqhc72kv"; -"splitbib-1.17"="0z2vnb51ksqp3i11903mvgaknvxl1azwqsch5aaq14y7fp9kcrah"; -"splitbib.doc-1.17"="1vb7snjy518hcv3x0cvr40bzlxr0nqb1ssqagqncyzzpg55nv9gl"; -"splitbib.source-1.17"="1sgl95vwqrp6k4y355d9mwkqm6zpw0g69p87hnsmdbd9bqkjvsv4"; -"turabian-formatting-58561"="0bfl9fgj0adpcm405a9b1819463nrzqplzzdlvwy6yanyqfqcp3i"; -"turabian-formatting.doc-58561"="1dam5fm94hdyzi4ai0wq03pkarb6lbrykych3ixcsz8r2z04g7nx"; -"uni-wtal-ger-0.2"="1jyba7g6qmngn4lx7mrmk0j190zkjv8lw775w13hxr2yky31cf1z"; -"uni-wtal-ger.doc-0.2"="0kncfbrs663qcpc0nsfhf0asjri8103laj9zpaayk3by612lfgj4"; -"uni-wtal-lin-0.2"="1rc0dc1g1fwhz8qa550ykc8azzc4i748jh37a8ppgrf4x2lgxzjq"; -"uni-wtal-lin.doc-0.2"="1ja9a6fjrlh1lbjkcsal7ahw24w1gs1mzma6jiiw5p5kbmc4zpz1"; -"urlbst-0.8"="1l34pkg2m14k8qck4mrgwkgcci51b3ar6kld5rsh26qqdw7yfcav"; -"urlbst.doc-0.8"="10bckc81yrjg2cilm7d72l8bz5ds02hb41fi0pcj657345rsv7sf"; -"urlbst.source-0.8"="1wsf4q095mb7lqsvj5gx0vh54bvm4jlmabdp3nmx2xy4nl5f80fm"; -"usebib-1.0a"="1q38qzz87nh2hbmml3b0a4919dgk6d5rn0z5bhrc4ip27dscvw07"; -"usebib.doc-1.0a"="0byl3xhiz3b4hqqmq2wi5fdbshh5prvqfnhjcgjk619bn99cijxm"; -"usebib.source-1.0a"="0asby43xsd35aazh2sncg639x91f91shs25f6f1127rskx5fd7vp"; -"vak-23431"="122crp1ipxwmxp6pd0x04dxnaf3hb822znbx8v9gh93x8db4khf2"; -"vak.doc-23431"="1jxbijc1kn7mx1p167zd5rdczayz5xxxfdd2pwbsmav8zql32aqp"; -"windycity-57577"="07bcpb8v1i3d1pijc8y3dcq239m7l5x25kg45wkz2h0m1cwbyh17"; -"windycity.doc-57577"="0qz90nmpy6lig06i9qn8qpl1lyr1znw71kfkfwq9xjna2jjq1lz8"; -"xcite-16383.99998"="0zsfyaxs0w2xy6fa1s6hlrcnzw1q9n4n676bv6j80cwp5cw7nnhg"; -"xcite.doc-16383.99998"="1sfziwn05dii3gviiahvmg67kb04hzhz4cd1cwjsrrvnjii0dqb5"; -"xcite.source-16383.99998"="0j5blcycs86vgmi54z0b06il06zzyjp4v15lmdwfnx0amb9y8jr9"; -"zootaxa-bst-1.0"="0lwin7dfd3nk0r3drznmhkqd7fhfvizxqy3z2xv616spg1jh9sgj"; -"zootaxa-bst.doc-1.0"="1s4v9azi1pvvh1fizp2azkbwh35xvqh8qcnnn1xwi0g1xhcp38pa"; -"a2ping-2.84p"="1h9i49m7v83ppifkcr4cncjfkrpx0hs8b11qyjn9s9y4mi8ra0w0"; -"a2ping.doc-2.84p"="0yxs2va1v4s6picfqkq2k9l7295np46lc35yx1dcmddy2667k3kl"; -"adhocfilelist-29349"="08fnrvnbrp7534b56hn8w0nm8pbgjli62v34mkalp4qkfb559kh7"; -"adhocfilelist.doc-29349"="1n7nah8vr691k56z0jkgyav4lc8w45rlg8k9shhqhnnpqi8zxv1m"; -"adhocfilelist.source-29349"="1xl0f33yhmbsrnmy9pby092js83vxcdaq2gfny08pjlq57arphr4"; -"arara-6.1.0"="0lfy3sp7zlglsgyrckmlj535sm0wvy9g98kszrvcaw64vfqswsa9"; -"arara.doc-6.1.0"="0xyiirkan7snj78qv5q7841nfb9kbcjj8j9fa252qlg1sx04pf3w"; -"arara.source-6.1.0"="10qr2izmzchpq1p8aw301da3483d89d1bvkph7a8ppk35952g49p"; -"asymptote-2.70"="1a9m3rkmsw5msfj289931x4f6j5lbz711avx956vi0kn01ppcrs2"; -"asymptote.doc-2.70"="0cbcr51gl3s2g2aqh60jsp6jicvvkdl0hya88wkkjanyw3dzbv3z"; -"bibtex8-3.71"="1hi24b8mmpnz17cfj0p40ipyvzqhgkkhhgh7qkcgr1bz9k82q7sk"; -"bibtex8.doc-3.71"="1acay8y0l6gnczznxprl4h3bx7jaxdqrczyvdgin5z8yqhx0q13q"; -"bibtexu.doc-52851"="1h0kh81vf5z752v1s46zs0qvlqhqqzq8ip427317xhq186i71ymw"; -"bundledoc-3.4"="1x5jh8qi3xd4mja7grsyy1qd1vd389dzikxk9b806b5lhmzhlcd1"; -"bundledoc.doc-3.4"="19a297ijq3cw2k7b9xc2f0rmaz05ygi50r3c3q9pj55yfrsysfi2"; -"checklistings-1.0"="0hs740rpar4jckxc2p8wwd8x39v8bghgc2jjrbca9m5zbr0prvpg"; -"checklistings.doc-1.0"="1riyj6x57jb28sjswnnfyqf80jnkvyr2cvckav29j9ni8l970qp5"; -"checklistings.source-1.0"="1ghb0pv2zmznyg12zqgljwd2pc5lbajgdnzr6zf2rrmvlrsgr38w"; -"chklref-3.1.2"="1045jsyhp39js54xmyr1wxh7qp3z5hzasyqi33nvrc4g7rb9126j"; -"chklref.doc-3.1.2"="0pmgdkdn930lzyn8j3diwwam8c7ikm4fga3fh1vpigqddykj7hqy"; -"chktex-1.7.6"="0ij96wg5j3grphp71f3casa8nlkfia7hz34njvi007pzy00kgvr8"; -"chktex.doc-1.7.6"="0ln3in6f2j0bbk1n2lha7s6mv31cqjchbg1ck0cq10aabhvx9fz9"; -"clojure-pamphlet-1.3"="15q1hx198bxr5ip9ssfyf9wbccqrgwknijcbnqsm9mp082d0vc1x"; -"clojure-pamphlet.doc-1.3"="04740xhx1gd88x7qxry0vw186dzqf8p44kss4z4q6bx7dyc79v97"; -"clojure-pamphlet.source-1.3"="096whv58b2g15m6mzg689d0mp6p9yvj8z83w431zbg204h0kx0w5"; -"cluttex-0.5"="1khiy9ih2ij4rb6mpgnpvbkg93fy9h333j5sfmbmfz0q6jj7cpzj"; -"cluttex.doc-0.5"="0zjcdmz6x8g2c5q5kds9hbs4x4a8fmr4z3j3mily8lqzqfnvkz9v"; -"ctan-o-mat-1.2"="1iya9r04n18i8jdzqkn2i1rxfxxmpzcpga03rp0i6ykjj65v4q4r"; -"ctan-o-mat.doc-1.2"="1j053gvvcznrk0fhg21ddyx1b1m1xj743b3w8z01lpjihihzq0l8"; -"ctan_chk.doc-1.0"="09ngqgs08q8bld334jrzhnd558lv7fajfppmfrkp4kv9hc5iyz9a"; -"ctanbib-0.1d"="0skwvk7khk4w4sb17a47zffp5bhd0fy9lqhfhd4ki1dxzz94kgs7"; -"ctanbib.doc-0.1d"="1gk91x395bh4ylhg1vm67w37a66v7xwj4cgzrffm4ld91sd35dlw"; -"ctanify-1.9.1"="159jchim2b5idpzj5fxxc9hvrbddm6n00rpqsqffzdiijvp9jbif"; -"ctanify.doc-1.9.1"="0wnyp4rl4cg2wgaq83xwm0vzm1b5xlgbrjchg4s3glh2zzl4mpg5"; -"ctanupload-1.2c"="1dvqr96ir3gakxrf4fk0dka80inl6aj3kydcf0128vlq168zgvsg"; -"ctanupload.doc-1.2c"="1gzfib72lfbgzcp5r8130k1n2d00v2kds0x8zdkqnikn22fq4jxm"; -"ctie.doc-1.1"="1xz0b4ja9vmx42d6391zdvrfvvnn82qb3xdjhpyly6b9j02bbq3c"; -"cweb-57972"="0ds2kanfw343zlyc28sfmshp4g1gvdvnhqlil45azjaqyz3603w1"; -"cweb.doc-57972"="1qhszwv7lqxxg3v5ddsa50xdda2cs9dlx8h0i46pisnik4sg71jb"; -"de-macro-1.4"="1zlmrrb1x4sm0y6igxxcgh7drf7c6rqfgm8pk1a7bfv5fdmv4fln"; -"de-macro.doc-1.4"="02zxl4xpbyjs5vwg5cskgfh3w2ls2bxlyn50smh0kcqas46vn9a4"; -"detex.doc-57972"="05hgi700kd7072h4x96bc7lx2p4cbwlfgfkmng0jdssiygkwrmyh"; -"dtl.doc-0.6.1"="1fjk69m1dyzhc8arygk26kwqv1p1yac2l9pca0x7xg3awc8nhgp9"; -"dtxgen-1.08"="19c9w97wjyrq6g1j8n8qgaclx141lv2j6z6l5h13gmkmyw08vwhh"; -"dtxgen.doc-1.08"="04z9dy0aada8zsp8ckz3agqcsm29dnlx770xyl51rsvk2qwsxgka"; -"dvi2tty.doc-6.0.0"="17lfphwzjcfpdkxcri20xks7z4j2xd7gm6kwshsc29xw4bw2l4wc"; -"dviasm-56373"="1j8cbyzchrjcflcs9z0208s4wi415i8iycxzag0bpd3h0zl5ppb4"; -"dviasm.doc-56373"="08czd7rm2rksx3xay7hrxsqcm133dqr9jj8nqw33a2bpnz0mrx7m"; -"dvicopy.doc-1.5"="1s4ia6034mdzif2lq9jwwcd4ai5il41yyv7h0cv9cxdbmra8ck4n"; -"dvidvi.doc-52851"="1w153rqm7nlmcf6162glxz282nbb6b6hjf5h0p7mbzr0j1357sxj"; -"dviinfox-1.04"="0c2gv6lgh4r57z955zdgganifr6q3z0gsgdcnvfpbrnqawydan74"; -"dviinfox.doc-1.04"="029y7pm218w83gq9srswb1hkdw8a2bi1837rvxa3cnsmsl5rkqri"; -"dviljk.doc-52851"="15l05cggcnawyqg38a1hpyng88qh9gck4jvl78n1rdk4qdcgp891"; -"dviout-util.doc-52851"="0niv5zy6vksm2qqqz3bjd417ylq46bxz6sra3abp9k4c2bpr0pz9"; -"dvipng.doc-1.17"="0clgfwglxqs4xgzh2d9jjb91dfm0awigg0mv1r4sbyr4l21vciaj"; -"dvipos.doc-52851"="0izv95mvzky166xpalw897z3lgl3424ixbabz5pikrhn6i2q6zmf"; -"dvisvgm.doc-2.11"="1qc8sd9y1zj2wq5lxqr4z8ybr137vi8ihs6n3cyyhbll8zsfqh32"; -"findhyph-3.4"="0b7qqz0p0l70r6dl4jhx086dxywb0vlln3r166pj0yl5jfjzhpna"; -"findhyph.doc-3.4"="0n7cpjxz3adj4bcmc1vd548lggcchhqfahdcvn4w9invw296hhlc"; -"fragmaster-1.6"="1d59sjzlvygwq9b02gbrfra4cnvmygza80b5rkghhhpa0n3xnx9p"; -"fragmaster.doc-1.6"="0j1a2d4ssj3y42f0rsyhd7yl3pak9cz12fy16k2h8v02cvc96529"; -"git-latexdiff-1.6.0"="0b7hafll82widr8vibaqqavwwzi7m488ypm5wx14y6jncfl8py9y"; -"git-latexdiff.doc-1.6.0"="1cbny4qkr8dg8vnxjnjawq9cjb0h3816ad66q8b5652rpxn3zqcl"; -"gsftopk-1.19.2"="0n6nnfn3fwi5dz9vdqk4mv97hwnyybj3wsv3bipqfsxl31yjp51j"; -"gsftopk.doc-1.19.2"="0xdb0h557sgi56gik24izsr5xlbmlfya1w93yih61a5422rv198c"; -"hook-pre-commit-pkg.doc-1.1.2"="0mikg4p9wxb28vgwh1acgdhwa2fqnc8rw3jg355d6s137m40awc6"; -"installfont-1.7"="0lszqj128c3f4wbcrvzzlvj25jl5rm0n5qfj8rsn65ycxvymbf91"; -"installfont.doc-1.7"="15x8jzcd7bwvbjid0hr56h7dw39n2rg6wbfz4b02y7shp1pn7hgp"; -"ketcindy-20191225.0"="0v3sz01qwd2pnnqbf4v8g0xwhs3zqxc9qihfa13df43rw644m65v"; -"ketcindy.doc-20191225.0"="0ch1zjmg04pdz96dhyl2iy380hyjqcscxn0kafj94aldin20256w"; -"lacheck.doc-54070"="16xahphvhdl2xmvicr73lcswm5rdmxqaf5xj4gsdv2wjfqjrp4fk"; -"latex-git-log-1.0.0"="015f1jrfnwr7i7jn6g0cfl3zs73xw30h14fr2pyjhn9pr8kd3mgi"; -"latex-git-log.doc-1.0.0"="0pj2834ax404f0nnlfbg75f2h80wvnz23s8nr9vxr24vr745xpf6"; -"latex-papersize-1.63"="0axx2lkwi1xq3qdaazhb6i7dssx8q2k0nm5vf4b9p5ldl1ky0dzl"; -"latex-papersize.doc-1.63"="1dkra9b0wv8s4f7xn36j1x1p849ziwlm4chf5mrayp0wmx8qshc0"; -"latex2man-1.29"="04m5ccx6z8nvp6z8dm7dqhqyf8h9snmaz4cvd8i8fcwfba9znf9c"; -"latex2man.doc-1.29"="11nl9ldkw3f90iz8r23jbgxaa6yq5p61f1db344nfhy0wimx15si"; -"latex2nemeth-1.0.2"="1r2nwwfjpja96ix7r2qckqh0ix1jnaackkanp0w12k9syn5ggy6l"; -"latex2nemeth.doc-1.0.2"="11x97kfriq9xwj1lnw2q3km4qg9bixg9ik03nghg4h9pdl513b4h"; -"latexdiff-1.3.1.1"="1ipi5laj8r0k72l89dymyrpw8lv89c1lkcz73innqncqahfji3yd"; -"latexdiff.doc-1.3.1.1"="15724mm377xma69cvr18dkk9q0v2fis5bim6671pw098naniksds"; -"latexfileversion-0.3"="1yy159skv29hp0qxpghmq5zmay9yi0ndkgz7lbllj1ymkgxs5138"; -"latexfileversion.doc-0.3"="0k20c2kw0xarjlkdhjyx9h9kvjm2f3rd98lz097xj8xvk0fs0zp6"; -"latexindent-3.9.2"="1j0llil09scga949f6h0xxqp1rm7pm83c5lgsmr6mplh94lhpj6m"; -"latexindent.doc-3.9.2"="0gvwbx9hr2nawmabkydn70dcr48336c8f3vz0rwy9kq3bsjnamjy"; -"latexmk-4.70b"="0gc91rlxs4jhbx0cnjr3np6pqz2myybc99bfdjnnnxpadra2xc6i"; -"latexmk.doc-4.70b"="1fraqhxv3b7jmijc66mils33jhd79m3zc6rva01vkb126qscjz5m"; -"latexmk.source-4.70b"="0v9l5qad73mnv76ccp6fnlwc7cqyq4f55syc52s9yyxs6i7jcxxw"; -"latexpand-1.6"="0n8gjx86fxr03i4pg6dwxr48f12q2s2v32pszg8qc2rw8gkvniy2"; -"latexpand.doc-1.6"="1j7s8f3iw2y8g8inm2f7a5lm1bxfv10l4zmhnfay66xi01py2cbc"; -"light-latex-make-0.2.0"="0cq5gjii0af6kpi7prajh6l6bjz8a48rbck9as3200yrnzzps36r"; -"light-latex-make.doc-0.2.0"="0y9w00qfqaa60iml5h4mqyg6452cf6h4700vqbshm0kajrwcygj1"; -"listings-ext-67"="1r5nq62k8rwllcpxwpkh2z0gcb1rlydp9nry8wx7r0h93hbmm2z7"; -"listings-ext.doc-67"="0jyk8z0nsdx2yljly8nd4g8wnw7ggi6mdjw0wb7y0mb5wq47sbpp"; -"listings-ext.source-67"="0hd117168f5s1cb2iim6y198lnh05ph4ib7p666yxvv48wr0mfpc"; -"ltxfileinfo-2.04"="0f11qjq1a3s5nxd7z9k19yhbl5219nn4fr1vfcqq1zs8pwnsgqzx"; -"ltxfileinfo.doc-2.04"="1qjs959a28cqjigdml0jgyhllyxd5kj276akz93hdbcd6gzs9ss5"; -"ltximg-2.0"="0aifhzn6gmmbmdlf7kv8dcvjdn7xs8sc4cjv6hpnzfrjy290na3m"; -"ltximg.doc-2.0"="102zvry2wj1hq47k22ss3i29m0f06cdcsjysnvq0cpm5225mgf32"; -"luajittex.doc-57972"="1nqhgkh91g3sdsdysb768vw01ikbjviwlmhm4j2a2cdwxp81hffd"; -"make4ht-0.3g"="089vcp6pfqzf9agghvr70v1qiq1zmqqmzgbln8a3dn5b7b5fv09y"; -"make4ht.doc-0.3g"="1qjdq862mlaqkjqx36nvid8ph126i4fmvb9xin4qszk9j5av6b82"; -"match_parens-1.43"="0b0vq9lgr9xxwvzvlhlky7fg66r2y1qhikiywddkd06rmw71yvi1"; -"match_parens.doc-1.43"="0i8dnjn5kfqhp51i255s3q2cd6jwzqy4rfdrhaxl15dhj4il9k7h"; -"mflua-54074"="0ngbhdh8hgpjfqnrjlnp27x3qziks3yf2zp1qq7r4bjfa5jx9gr6"; -"metafont-2.71828182"="1kw37drhnk7qajmivvjwdrh5awns571wclv8b354zk71axf6cr35"; -"metafont.doc-2.71828182"="1aw460fzh0c8kwfsn9f2afpmaymb2krjjr67wzx28w56f6slarl7"; -"mkjobtexmf-0.8"="19nxq3k9jf4bypk2al38n6igpca369lxqcn3da8cm8c3m511nsmm"; -"mkjobtexmf.doc-0.8"="042a29h6sq9mpy6chfkl6893zcpb3gd3gsl60xfwglivib706qwz"; -"mkjobtexmf.source-0.8"="0q2i2xgpnjcx8qdkk47q7v0lmjdv88jjvl7zcybnhcaa9km8f9na"; -"patgen.doc-2.4"="1nc7m02ygwyphfy3d1ifpfdcdfmvzl6g75nh2ydgxjw0xhck8c4w"; -"pdfbook2-1.4"="027mgmbd3gnnc6gqk8vjnz8j52cvx71z5y6flrc4zd7g0syivdad"; -"pdfbook2.doc-1.4"="0al7sc4rxwd7g1cmyh8v4qhmlngz19f0f08x8n3wbfnvk2f8n33x"; -"pdfcrop-1.40"="1pmh9zjxn4xplnwzl5rcb6g7lkqm19kzd1dfm08992c719clx38q"; -"pdfcrop.doc-1.40"="0qayjkyn9sb9r5cvznpml0gd7vwpip0kf1b9r4jrd4vyfqkk6qqn"; -"pdfjam-3.03"="09h4s1kz13migq0slimh805pvnbfaazv9y6w1q5bcplyw0vibn1p"; -"pdfjam.doc-3.03"="0zpj2wzkx4mzrsmr7j0qx3zmq04ayxmdgj05a57pyc7gj7kwmb4q"; -"pdflatexpicscale-0.32"="1z19y34c0x05yp49jqn0z8i3ghv0sz8zm0arb576rz7mskpivjqz"; -"pdflatexpicscale.doc-0.32"="0d1zzym0mgsbicp92qf60fq8l2sdbdx47517k9pj3v8g91svxlpw"; -"pdftex-quiet-1.1.0"="00df842vapzylgavkk2c0j8yg562n2jawwznvyf3qq6dznwf1chn"; -"pdftex-quiet.doc-1.1.0"="0sa2gs440h3jd5i51hhbfvpqjpfwvzz5m32x3ld5q9k6zi88b395"; -"pdftosrc.doc-57972"="0jw910h146s9fzr5z1jbc6kgylprqfwl3ab4pv27p3p86rnrz6p6"; -"pdfxup-2.00"="0shz9ivcifvg12y7pvq7iv1d5d97i0n5xw0kkjapmgfcvf3f1kng"; -"pdfxup.doc-2.00"="07d7vnbgbz7yldlmz7hsbfsfnggbfgwryrhh6gq6l7i2hjjis60j"; -"pfarrei-r36"="1b3jbb5ahwr0sgbgckmrfwbk3ir1g41n6j4mybc78iisxnqrx0br"; -"pfarrei.doc-r36"="1jrg8k3n0mfc157nmv2n1d4b8aijvgr4av90ds0g2m7px65yd92z"; -"pfarrei.source-r36"="1jgrhv8xgai1y81ddnqcrifk8wz47asvr3mh615wgsis38y6k2ny"; -"pkfix-1.7"="1sgss755cf1zrpv3x74x5qnqc6w81cvr1x0w7875ijh4c1xxkn9v"; -"pkfix.doc-1.7"="0bxijxbbj9v4c5p1rg4gkqnm75rq516vxln6s6174ph7abqrhvys"; -"pkfix-helper-1.6"="0hf9hnjw7ws0mx9w5s6ik17zlq27fyc3p9bgya1wxbh8lcvrygn2"; -"pkfix-helper.doc-1.6"="0fh59nzzl58fgpkkfzvi603sfsfnqrj8s39k4nn97567gpv4a22a"; -"purifyeps-1.1"="125dn66xsrnv4acvk2mbwfl26sy42jw7fngm3p8qmzya93sp0vwl"; -"purifyeps.doc-1.1"="0lzw7ajxkx78v5dhlsddb0ahq6a9975f4mzmsgp23qczmz28878w"; -"pythontex-0.17"="1hahcx7k67bzakifbavqclcy1wdl5w5h68insbg736jxbfz98wvf"; -"pythontex.doc-0.17"="04xpslmv41chz7g0nxkz2gjpg67s0jlc33jy9mnwl789xi4k7832"; -"pythontex.source-0.17"="04a5809sx2qq56c394g36fw6ygf3wi3khmqp56lw2yrwhqmhph0a"; -"seetexk.doc-57972"="1bhv5xgv8jpam5apdybd0cggnvcizk2r6zs7lim1hmhzafpqqlcx"; -"spix-1.1.0"="0gqvjc05sl4hrgflb3xx8ly2pmj7r7cv86diwpz65gvdvdq0iyzx"; -"spix.doc-1.1.0"="1mggb1nirihvcqqxfjnsc5jck6qwqz0n1vzgnlyfxqgja6flad8g"; -"srcredact-1.0"="1rqmgpxcvvcmzxdj6k15v8z4i4iq4wv95whddpi93l3n0zv2ihmq"; -"srcredact.doc-1.0"="082ff60lfnapb570ps3g6vjy2xn0gjjih6y4nm3ry9i0k1isbk0w"; -"sty2dtx-2.3"="0l948m9xwn6pkxkwfcay98vapqa1p77rkjijyv6wqkbxr7zxh1i3"; -"sty2dtx.doc-2.3"="0ngfnvbznd1gyiljapflbgw9iq91jrcvjxxvaqcgfh6dilbpy2gk"; -"synctex.doc-54074"="13fc91avs09za1y5rrn50wfr2bf1csnf3p4dn0r3mkny46bdfw7c"; -"tex4ebook-0.3c"="0dgai37h4ssmblk1cg3g0js14mghivxbrp54ffzg5vznhi3b7s9i"; -"tex4ebook.doc-0.3c"="1x4x7b8rp04x0g0dcrnn1lx3w868y2nfya9y7r1aacq2kmxw6axh"; -"texcount-3.1.1"="1bi484kbrcfx3hyflr4f2w0plhz58p2206rz4r1wjllhhhwzc7pl"; -"texcount.doc-3.1.1"="12a3j0sk7nysd3bd7mwnbifyrcvjjkfjy3b8f1caf6k0pf1mz8b0"; -"texdef-1.9"="0wi60appvgs0h5690h8qqvcmsq2r6fcxais2jqps92ryy41s2v68"; -"texdef.doc-1.9"="124azfh1332lq18g40d291gczx2agh2b1cxq07ldmizi8pmvjaza"; -"texdef.source-1.9"="0hanvqdj2dgpgl3wa6sz3qa542882h3mv9709spl8q2glmyip5b1"; -"texdiff-0.4"="1jjzd4grr3ip6gd8xmhlawhdcjfj1sqfsa06rxrpziklwirw6bq4"; -"texdiff.doc-0.4"="0f7q7cszy6ca6fmwzi7fn6p72szgzyj9fldvzz1rk3ywkhsnpakr"; -"texdirflatten-1.3"="0q2m138gpk9cvfp19jvsw746mkxa613c2204qfxw1bxw8b454d7m"; -"texdirflatten.doc-1.3"="19iiznql82a34d2yhzqcp339zszbhfz9fh0h4mb11696mj8rx3v7"; -"texdoc-3.3"="1l46wg9pp0aw5qrx0vh022n5xx269cpr5ms2qqkkcihfh8dln0jb"; -"texdoc.doc-3.3"="164a6fvh75six3bmssq84ax781l9zy9nz6y2fhzcd1jy5hqvvspd"; -"texdoctk-0.6.0"="1k0gl06da0v60hsp2saphkmr2ma5yf1g6azwdl33ddbw4r8ssk10"; -"texdoctk.doc-0.6.0"="1k41z2lbfjsar5rl47xnk1adbcnnb4w97bzbgf2rnjhimd1gn9hq"; -"texfot-1.40"="1005cj268ciihv5942wrn4yqizrkq8vcyn9cqb1wzn228dzjqhjp"; -"texfot.doc-1.40"="119a8l3yah2vnp22x3r0d87plhi93f9c0mmgpa1zdzzlghnf8s69"; -"texlive-scripts-extra-54744"="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj"; -"texlive-scripts-extra.doc-54744"="1svrpyy75ksx0777k6mn6a3c54kcqlf92fnfn10x8wkvv7fkghd3"; -"texliveonfly-55777"="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3"; -"texliveonfly.doc-55777"="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx"; -"texloganalyser-0.11"="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r"; -"texloganalyser.doc-0.11"="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0"; -"texosquery-1.7"="0jszy2f076hrc29kk8qcr9616hyk2cvys3kg2qfhvblxf07ziw62"; -"texosquery.doc-1.7"="11rz21m720pp97vb457pxaq5yxf3j4v8vfcd77w0bjpc632lh1xx"; -"texosquery.source-1.7"="1q7spgr1xk2lnx2xqksjh979n7r2v1n1441fkrc479zyi69ncn33"; -"texplate-1.0.3"="1javijzp7v9dyjvgfb3prshryiw7446mpzdn08hd8czp7f6c9x8q"; -"texplate.doc-1.0.3"="03wg5ckb3zjdghh52f0i7cjwx7rrgwxw9av7xsa8zi0qsyh5wgcx"; -"texplate.source-1.0.3"="1pmx38grc50fszsgkbpb3p7jxy0d1hfpr5m4czvkzjyzgapqfi2c"; -"texware.doc-57972"="1zv8m1y6gvnk7nbqmzkvg83iq1pgncg1qvxg572pxnqlm0lf779y"; -"tie.doc-2.4"="0lfjracp8ifkaj0pyg4i5lccqwybsrgxn11ji3p1g6kfxcy5hmgn"; -"tlcockpit-1.2"="0sm882jxczx8q4dvqaxnyb2wzlpxd249ayv77gj9vgq4lx9v0l27"; -"tlcockpit.doc-1.2"="0zd8hx3f6jhm5rklhr5dxb84y17p4rbgwa7wh95ab5f6n8i5pgwb"; -"tlcockpit.source-1.2"="0kldzbbyjvj0n60jgff8y6y27nxnzihjyq10gnx2gi62qn9bia7i"; -"tpic2pdftex.doc-52851"="02nf2fg4xzh8lbbddvm44qyvcvfn5b7kzcyg729a58l29gd88pbs"; -"typeoutfileinfo-0.31"="0w48qf9d7qh57s7b1745z6d5abc8rlgcjpmf402gqxv636589dcr"; -"typeoutfileinfo.doc-0.31"="1pffnydxqlkjixa71g09f7754ay0gnyphay51dys9gvvmwzv5npq"; -"web.doc-4.5"="0ssyalwg7jb01pmbr309n656paxcd4dhrr1m0m1iwc70ml70k5sp"; -"xindex-0.28"="02srw8v22x4gcm1j306agd9cgpv5mp6bjdx5jvsirq7914fqvfxp"; -"xindex.doc-0.28"="1rqb81xnswipw6qakzm4mhniqvk0iqyzw8y25fs26p64k9ch09rw"; -"xindy-2.5.1"="0rn0s6m6zl0j5vak7rrzm114kb7cr82rcln0rq9faby48isxpynq"; -"xindy.doc-2.5.1"="119lq9mqczsh1np0876fz4gdfyq1rxmc0ghaqyriwl4fzj6lka1n"; -"xpdfopen.doc-0.86"="130wvaypfrg9sav0pdcdy1g10fll8pqcsqsy70fxlzzr937glsh1"; -"context-58167"="16ba0cbqz8w513yijaf8ka9zinzakgvbkpibhilnvmlcsxzcqsk3"; -"context.doc-58167"="0r15aa12cm049ly148sd48vaigqh1z9mbasjf8xc21ravq08jq16"; -"lm-math-1.959"="0vsmzr71d5iqhr9bwjnp7khzlg939mvfnbg846854cxk8wfm9hzn"; -"lm-math.doc-1.959"="1j6jcki1hxdr17njy8sfpb82mxh6bpllccf3hnjvylvpjf45nxm3"; -"manfnt-font-45777"="1cdd2a3xj00bwsby9z5iz5f2iy2iwsjl35gcack9q83hacbf3ssb"; -"metapost-57972"="1sk771ll9kv7sdrgg1xp8bmr1c0yd8g2g796pzyksfrjzbvs6fdn"; -"metapost.doc-57972"="0y7wfxi4l8dbmfmr570x3gx268nav4zhhlg83qv7blh9p8x6h822"; -"mflogo-font-1.002"="1dx834zwbrwgp2v61fagf5m4zmxf2qkhib4mkpw6iadcgfqv6x7f"; -"mflogo-font.doc-1.002"="03b3qg42axqhs1lvm3pz69m4jmhd1385gzg1sw8bqyajlrdnydyh"; -"stmaryrd-22027"="1vvnhyk7fq6kh1jb2zd19r6qq1j8zzp14gyrqvw7yqm5amjff7fp"; -"stmaryrd.doc-22027"="0dvcn4yw7qlb7gh3b3z9vk4rx12b1086glkk0x21cks87kphdxib"; -"stmaryrd.source-22027"="1wmn7bwahn28lwipkpsla74wn3a018808rmh7yvxdkbxfbzcwqcz"; -"xetex-57972"="08l3cyxr61pcr1791d0x93qzd9pifgy842ij3pf3sing6qp3irz1"; -"xetex.doc-57972"="02f44pj53aq3wc6i398sa5a64c53i6gc9h0k14alr6qmdbkzw1ad"; -"xetexconfig-45845"="1253njshiwdayzq0xir9cmbi8syhjb3sc4pyrw9p6kzyqvckkcxm"; -"context-account-47085"="1j1rvgcznn8c637dayxpdagpwjq6fbn52sjmrb0wn4gd4b4q3nk8"; -"context-account.doc-47085"="0lfx6aa235jx7sz27qh0328n68ra3z2bw3dsh5p2wzkg1wxbaa6g"; -"context-algorithmic-47085"="10rj0ac7gqzqmqndvapnhn0jnm2538r5bzmhnfqia259qs2p0qj8"; -"context-algorithmic.doc-47085"="1s84vb55yhxlw6dvzrs4y6bf2cvwp6pp0mhy778k5zyzh2kcfzqy"; -"context-animation-47085"="1cy0jc6wk9kfxahndf82wwns4dhn1nbrxqx8v5bfb57m23id8vff"; -"context-animation.doc-47085"="03mdp7233r9snsz5g43h3axyhcf4vgpivfhfv4fy3vh1ya5fx8fy"; -"context-annotation-47085"="1c2jgc8r9b0inqa5cslmxhrqzh23jkdn9s9xq1q3v5qvlh4vcn73"; -"context-annotation.doc-47085"="1a9ba8l6jl7hjaiv5mmf5jvsvxxj0y6j2s222qaqa62crcbqc9g1"; -"context-bnf-47085"="1g8gdrqaq2iyc2aj4a3a6abs3vkcbkh44y6mnbjq55pl45ja8wp8"; -"context-bnf.doc-47085"="015wnsmz8fyshyrva3n31iz6hbifszi6cxgixlq17nxkpcnc5899"; -"context-chromato-47085"="1qf3a4p63zs4sr5acrfnmxdagf3x04l7rfd9d7pfcmq261fqsy3z"; -"context-chromato.doc-47085"="1w807zh4s7bbsx16v3h5gqc1wg9v92dkg9anysbsh1m9rc6hnhri"; -"context-cmscbf-47085"="1l8c4jcrwmsacr712zql2rp1sirjn0dwbn2r0w83v4fhrpyfifl9"; -"context-cmscbf.doc-47085"="0nim43d7b7bv8xmarilzhm4al3lngvlf7cwazhkwpg80zqzavb4c"; -"context-cmttbf-47085"="1pr47vcz2ix9s3nvmi015bh2w52gayf8962c025vhh9brinxdzsz"; -"context-cmttbf.doc-47085"="0m71dv1rj1dji5skq2pyvlkq0sz3w9lyhn076nnmvjkq8vh9gkpk"; -"context-construction-plan-47085"="0q97h6lz072gfbnlv99r570kkba82qyx493flln24rrs7js5szmj"; -"context-construction-plan.doc-47085"="0pmvwb3dax78wa6v8amadxr36fs68wf3rq5k54sfczxf6k93sbhw"; -"context-cyrillicnumbers-47085"="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2"; -"context-cyrillicnumbers.doc-47085"="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73"; -"context-degrade-47085"="0r7bgy2fliqhywgqc1blcabmhjz3g0ys1rfk8mggkh7908lvvlmp"; -"context-degrade.doc-47085"="0d0fy68hk20az7vh2z87h76hc8x1hmgfl1r5saxg54l20a31a96j"; -"context-fancybreak-47085"="00zdyzfb70fvgrdna9z4958pxhmjv85jxl5vhfryprqkrbw05pr4"; -"context-fancybreak.doc-47085"="15igbqj52g2ybpykqzkzm8b9gqayccip5p6srv30458zmxhci9jw"; -"context-filter-55718"="1apna9ll4acvg8c1rhgp2fzrfjrr1zx65x865f12mgkh68m0ng4b"; -"context-filter.doc-55718"="1p6iah7wk7nk50bhiqssd1vwyvm8y224a4dlxjplpv05ksjskwb8"; -"context-french-54215"="1wdn7ajvmfj413x51v0zcnbibr4378s1sla7f097xllak9iyd9yy"; -"context-french.doc-54215"="1lyi3hwijhc0jl93ygldpjm44fbiw4c7zky2ydrm4s56l3di2sil"; -"context-fullpage-47085"="0i7cwd0q9fcdnh58w6hgdbnxxwv8g01nk33j7naqwc0f087az7qn"; -"context-fullpage.doc-47085"="0pyhpp94adp1rfn7pl7fwa03n119jp455y1brmsww9wfpniz60di"; -"context-gantt-47085"="1x3glv3nanxic9p0xi2dqz6k5awwbhxzzfnj0d9sqwkcr5gfa8h0"; -"context-gantt.doc-47085"="12wbzw4j11fsx412qjjy0g36hq6db7f61937s8k8qrqpgpfjaz4n"; -"hatching-0.11"="11sdpa2fbxqz8diiwyjvx5fwfycby0rdav6941pgfbzsbqd3ys62"; -"hatching.doc-0.11"="1fq1wkq7q5f8jbhx7p49jnpnfprb4z2wmawyjbvcnrnmr8jbrdny"; -"context-gnuplot-47085"="1pahxhbliz6fsj2va5pgwcs55b3rhsmfnjb9qjxkz3gqzrzdkfdp"; -"context-gnuplot.doc-47085"="0l0qp9c0yvdrf8398wyac98ghrdc86lxgzr5l327gmgnk8572gxn"; -"context-handlecsv-51306"="1xx7jq1lqzgnm4jicc270g884qrnsaxg2cc86r2zh5ar584qv9yd"; -"context-handlecsv.doc-51306"="1frlxxqd93p2dipsvg1gi1g3l4b57wgwz9j5r2f31vn9p6dxh06v"; -"context-inifile-47085"="0qakf92qk90nnqnvvada10z6r49dsjyq25mcyd1742b3m64blvd7"; -"context-inifile.doc-47085"="11ds2hvs2mx7xzanzpj9il4piiqwhqj6gc00r8g618m0s2fvkp5b"; -"context-layout-47085"="0j7f5krz8n3192z8iysr7cc8hz0v1zw2gidd9ag0l3ifxl570hn8"; -"context-layout.doc-47085"="16ava246cbx60q43brkfgbfw1vbyszqv42x3k027hlzk3hv4vahr"; -"context-letter-56073"="0sxndnc2sbb10k2s81nkmfpvs0zim508fvh4rdakkcsnp824gpcy"; -"context-letter.doc-56073"="189knf3ng7wpilr8dzl5ahbw6bazfnpmksjgpdbn60ij4v00ckfn"; -"context-lettrine-47085"="1ab6hwgnl4s1524li669sgn06gsvgc6vdlxajnbxj7gby4qh9fr2"; -"context-lettrine.doc-47085"="1x2plp67i8ayw7v3nxf9njlj6fpwy0vvp5cd3k3vp9y0qf6is6cf"; -"context-mathsets-47085"="11r30c6lpcvkx7awgm70cb5darl90fvpnf37hj2mb7h69d281hv6"; -"context-mathsets.doc-47085"="16qckniq5v52m36m05bpnqypfz2jn4430n5x5zazx54j8makv827"; -"context-notes-zh-cn.doc-23171"="16f2ax1vwz0cihiyl9cg0hsgl1la6mgh6lavw7zx1x0kljz3ajl2"; -"context-rst-47085"="1lcxad4kjhdgqny5qcvwdd968wkls96qjmi7m8yrla0nmr44y5gp"; -"context-rst.doc-47085"="1k31vj6wk18ccrnrhw46j98i19iprjk6h770a2y9w6710zlw3pdl"; -"context-ruby-47085"="176si5c7a44r7j23kp5sdg9h7yd5dpf1pp7rzivbhhgiwqinx7r3"; -"context-ruby.doc-47085"="1mnzdbcaccdylxc47s88wpq25xj867j2p4rziw5w4pbvk88h8a02"; -"context-simplefonts-47085"="1kfn5dl43qg64f2nx319xgxyl71wsxq1mvfxr20a9f2w0hvkvwpp"; -"context-simplefonts.doc-47085"="1wy9qncb4swqxhgi263pv1d6f62zsbvfl9lajf0jljvkb1888167"; -"context-simpleslides-47085"="1zzrbypanrckbfnxv70bdn6ypkai213acq1ksa1jq5mfb53r50g9"; -"context-simpleslides.doc-47085"="03lhmixdn1wrfdw8a1ayw4rd7gfy03m4v33ch9i59zzz2w3v2s6c"; -"context-title-47085"="1vpr86mkdd8ib5vvdak3kn19fi8vxz1023ld6axhwq4x0cxzb0ll"; -"context-title.doc-47085"="03higvjmk1b400flddaxdmk5pkfq6vz6445q53qw86px82g17may"; -"context-transliterator-47085"="1hwbj8csxmfm9ih0cz1aqjmg0967irfrlw9xff2nggwmzkcjf92d"; -"context-transliterator.doc-47085"="0l2yrn7jq9641j3bj49w8axlvh7n2wsjy3hgg0v0h9afj8nyc1qp"; -"context-typearea-47085"="1m33wbnajm4s9x098a72xsg38sil61slpp1kk25f9w29vjrs18aj"; -"context-typearea.doc-47085"="1sblwx44pardqrp265xzg5hjpiflgic7k5xfai0q9nga9qi56n0l"; -"context-typescripts-47085"="0bpm824hbmfrwx2svq486nqwk15h1fkh3wgvq526h2pqi3x82g5w"; -"context-typescripts.doc-47085"="0pfvlba9bgrcsz6nqwmwfn1pq7j9qm8hc7dqbk8ax1c0gxbbh8dp"; -"context-vim-58082"="1xzym5nwazvwmgjx36vdgrlkiw9vmzgj6fz6qj1662f29i6zdbfw"; -"context-vim.doc-58082"="1vrb35hq2x5r1cncwsdvrxlnpqs1j7lgrfqi9pmi4kdna7x9k5ax"; -"context-visualcounter-47085"="0n20r8315py52ghivwy9kh7g7yj4ixakmkn97phw1fxgz21jk6qg"; -"context-visualcounter.doc-47085"="18ncq5d4chmnmxmhazbjh9ypsm4c3577vgcmnx0y1pmzgb2g8pn9"; -"context-visualcounter.source-47085"="18yyv9974cxzpw45rzw6ia2jamrb07bzw6gqchdprdjs0xmhz308"; -"jmn-45751"="0iq5ky3llx50smw80lpylv11jmqc51m5yrhlslz3sakmgdqgg1yi"; -"npp-for-context.doc-0.98"="11bzcxi27yia87ia7ych62gi2y59jx379fz63avc4qyq4m9686ag"; -"Asana-Math-000.958"="1ydx3x568dw336nhv7nkl99y10hplvf79jxbpj02607pgz81nd0q"; -"Asana-Math.doc-000.958"="1dpx3w4kxmdwlscck08m9s0samiwkm08mlg46v7nlwqab3mbw8pr"; -"academicons-1.9.0"="19k93f7nyfni9jkg2pwfzsnwwfwydrkqivwskzjmsn0dih3ss8l6"; -"academicons.doc-1.9.0"="19jp1r3h8irg6fzl6n4rr5pxsn5na2b3g1x5vmsfd4hxdz5c01q6"; -"accanthis-32089"="1vwz3c8xgd4arx0c41b4d0pzh00ds7y1npwlq4rz8rqyabg0ix55"; -"accanthis.doc-32089"="0za0ja43vv6yn7wmw7m0f7xmjkcly1ml7f9d3352i8lk3gj8i7r9"; -"adforn-1.1b"="1cb6w50xb9wkl6x384dhldrhpjbk5l73x5gzpbm8za4gmh1pc94v"; -"adforn.doc-1.1b"="0a1f1rrii1zvd58h2slk2zj032vjqpi480d38rgi2k2j9wlbbyyg"; -"adfsymbols-1.2b"="19rr3zdgqlmnrvd61g9bjiqiyn2gpn82fhj4219gqb1l06nqa0ka"; -"adfsymbols.doc-1.2b"="059fjvdmd1jgr1flv5181ac3wvby93hyykfshcmr1j06zs8j9kyx"; -"aesupp-1"="10yd16v85zbkzkxb17gr4kf4li28ims33i1zrkpygbdf10nclxcm"; -"aesupp.doc-1"="1dydcjdz57kn3gwb3pfm4yp6hr69pyqhy5lhm9pnlcrycvqsn8qr"; -"aesupp.source-1"="1s41gd7ansh80z6mmwwha7pypaxwxxvrz3sdfj24pa5b2agprq68"; -"alegreya-54512"="14zxpvvbvax65njqsh762x68ixlsn10990lib4a1dy84507jvfkr"; -"alegreya.doc-54512"="1cpxgdl6wqppg3f44v9bg1856db0zph3vx0jyisaajfixgjv7d8r"; -"alfaslabone-0.0.1"="11va28ww6qk97wx8fh0iqbm8b5s14vf923ydpglx4gann4w9bkiz"; -"alfaslabone.doc-0.0.1"="0wfhd5pi1p5xnkq8lgpp3fhqn8y76h5jp3h5qhlaqygal70fw9kw"; -"algolrevived-1.052"="0qsxy2az8d0sr07mz7yxca17gl1y3kaqmvlckjdckvwq1idh7h0v"; -"algolrevived.doc-1.052"="10m3rgczhnkalf2f945jwrpwvv9szxh3v4wggl1rdxj12ng0svlq"; -"allrunes-2.1.1"="0xgh3y7h57lkzxrhddn5wll339b4zih4nb6a36ymx38a6md7b8ph"; -"allrunes.doc-2.1.1"="0dki14g1607a432549kly1wcy1p6j63lrxfd3m5nyz868kg3hjmc"; -"allrunes.source-2.1.1"="1d49w7lybkn7sfig7i27mfwaccr9vjs7ab2ds27jmhp5wjl7w02w"; -"almendra-56035"="14v5sbjsnvihyaan3jclsaa1kg39c5s3rssclrmvr5a2jzn38pzm"; -"almendra.doc-56035"="1g32m3b6nhydxw0siwc7bw59da6cwav2xrypj636i16hvlck9kg6"; -"almfixed-0.92"="0qrai75pdkf4py7nhggvwzaarv4jlh04dqsy1b593jabq7ngaap1"; -"almfixed.doc-0.92"="0arhvv7z8yf8kcikzybhbsgsj6m9zy4is5ryr6hcf6a6incnkp1d"; -"anonymouspro-2.2"="1qk10w52722yzlyvk2k733sp1h2vic3rjcswkhx8j21a2g9xgmjh"; -"anonymouspro.doc-2.2"="0ijsn9cbkg1f29x0pj6a4p5d4q14rqrh2mjid57cb9qjhvgvqrm8"; -"anonymouspro.source-2.2"="0fl9sd9adhjx49hja3k4iy9pcx3hal0wjzxg10kjmi4j6qvz829s"; -"antiqua-001.003"="16pb6v297iqx09lb6w6zfcyzhwidd1cln14rqc3fblbmdaggpays"; -"antiqua.doc-001.003"="0pwyp1j02zh51crp46rlhbdnwc2m0blcrg0yk43yfc687q3jx91y"; -"antt-2.08"="1clzmvpglsirsvm8nsc3m4dkz2va90877gmsrm7jfkhm62xv9mpi"; -"antt.doc-2.08"="0kpiba7awkrjr2rdgxilni1yi8p4ycmqyy09c1p9j1ld82idsjcm"; -"archaic-38005"="030a281kl48ixl4vh378bf0341lrrpvh73ws5pjxyhvs6cvyxp7i"; -"archaic.doc-38005"="0m64lsmx3sryzdmbsmz7biwmndpn66x9is8apqn7w64y4b1jjcpk"; -"archaic.source-38005"="1231mqascj96yi4jj11p4zcxgkpzxi3p0zxnjq8x5fpajz386kq5"; -"archivo-0.0.2"="19hr6vc7x9csjjd3i6mz9z27cyq4pz1qvhmiwbql2xhvmbcd871q"; -"archivo.doc-0.0.2"="00cs206zp27vpw06wqg7adwj73124zbp8zwfvgqsh9n544npvfmg"; -"arev-15878"="1nx33blp0nfqfmv2akj7w79qg1rhds40k7b58v5yvyrkx0hpn0hm"; -"arev.doc-15878"="1vscwahxzdcb6879pbrxdlfpgapc0bia2fl3jwilrm1has0ffjz3"; -"arev.source-15878"="1k524nfr5zb0nmhhq8dfaha4kv9f2ika192scllnn1bywhbpn2x5"; -"arimo-42880"="0ngpcv1824bwipjpx8qbx4lj1kyb81xw9dj0nqmpfq12a6q01nvj"; -"arimo.doc-42880"="06la48idihifm1n8yzn4b85x1y5y7qssq8d36fwvyr54kl5prh0r"; -"arvo-57213"="0i9x668hjr2b6brdysl35rxgjji1zdsn6wbf21ql0xmn53frk4ic"; -"arvo.doc-57213"="0g4lpx8mra2qk9c1qwijilscq48n5n252m6s0hxfraj5rshrhc1j"; -"asapsym-1.0"="1m4ky7x5pavf8kpyqrjqa5ara2iwzqc3aglvbsjblny7n2az3dr4"; -"asapsym.doc-1.0"="07n000aa7yjvx74vspqq1rrqw444z3f9pkwk3hdmmqm3p1rrw912"; -"asapsym.source-1.0"="0cacvd85rh2j0j6d1zjrisffwyzh0pphzsgb5bxfq3dzycsww0iw"; -"ascii-font-2.0"="190ma5qhshn71vhsjzjb2gxb54qjabili5m9v98vwj173sdj9cjv"; -"ascii-font.doc-2.0"="0nrnfvrcgwmv46x8f9ybk1gv6vgv8jgzhc8480fl7y17dii3jl9a"; -"ascii-font.source-2.0"="0xcv04inym8230k2ljb16g4ajj73gggg13w6zkxxq8a1fa9lwrw7"; -"aspectratio-2.0"="17y22131b9nzzq1skfdyr7cfcq823nqn3ssqrbc3bglggdfibf2p"; -"aspectratio.doc-2.0"="0mw7v1m9afyk462rjcimvwwikdpj0f4gjw5pbw2g9c60vbjhz61j"; -"astro-2.20"="0cjf53gbin9z10g63x2kingsclgnwr6idc4x0m473hf4fvakk34x"; -"astro.doc-2.20"="07kad1fzv7p6inh7nkrq6b34c1792h4v49rxaaxqyldmf4pwjr84"; -"atkinson-57624"="1c1z9cj1vs4jczjcg9vaq52qy6y77217153i1ivd00v73bsfsmc6"; -"atkinson.doc-57624"="1hx779qjjabgsmg5a0halwxd074qdkh0c3qp47yb4ahjsys38c15"; -"augie-18948"="08m2n7wqqj1pvvrw6q8j514mgr1168brckm1dl44yp78afgm6vra"; -"augie.doc-18948"="0ygmvlk1h6n071lq8jnlpdqaxhcxvwrzf1kgvacj78kijaqd0lix"; -"auncial-new-2.0"="0nqz71wdm0w34xdg5p34ph6na12jlvxz7v1bfigjm2v87pbn5lwz"; -"auncial-new.doc-2.0"="1dw0gbhk3hwfapdzysf12kz5g3dfsr5pxpnga9s1ksqicck26b5w"; -"auncial-new.source-2.0"="1gyilj1ldx6c5lfn8vrzsbss4gl77grr2mw4v6xhimv2vsyp29a1"; -"aurical-1.5"="1ffl7fji5r74k80hl3d62qj7f0h439jb7zmsv4f21w7b6cfyj74i"; -"aurical.doc-1.5"="0l19hfh5g2dc3digkbjvrh90h3vwx6zsbadjl7zzzlnhsaq44nlf"; -"b1encoding-1.0"="104n1g3qnx2dj91zylj5byz7yaai6dw6v0pl9240mgk1h8i0xr2p"; -"b1encoding.doc-1.0"="0sdr25vv9svm3r6yqyalqza4awr8k26g7fmh8078bbxkddycchkm"; -"b1encoding.source-1.0"="0mbzrasvppl17965dmkp2f9cbi03539p83989d40kl5p11ih6dgy"; -"barcodes-15878"="12gzzkj2nkkzw4q6jw0nvzil67f83myhwas37s71dnpqm5n1yqdp"; -"barcodes.doc-15878"="0yzqllbvdmymqv61mc740hwjz76m7sncw4mkvpld1i9kv48f0nvn"; -"barcodes.source-15878"="1m9mifdmxc07rmlg9pav8mx856jg1g2jk48hyxkd1zs6b8za6ani"; -"baskervald-1.016"="1wvdsq2qngbrm2nibvmssk62kqvjkk50cxi2d7lx3nb6jgmj33c0"; -"baskervald.doc-1.016"="0zj9xj7y1srb58lr9brmi2m7nw63n798m7mmzibjvn50kfw3qc8i"; -"baskervald.source-1.016"="185jgbk6rg6vkdwhwb8i0inb32qr3rgsdi3xhgj4vj0iah9mdkbn"; -"baskervaldx-1.076"="0nnqkki5ff5jn9bi8xddqpf5r1cj0r6rjgb83ab8x49di3y5qjsy"; -"baskervaldx.doc-1.076"="1q8yv0725j3sfnqgznnjjbkm57hxq5n9xvga1f7kf5c0jkp52742"; -"baskervillef-1.051"="108yndp9v2awi5vw29zbin82bcvx2fzkkhypg7f4dcl9lziwdbg1"; -"baskervillef.doc-1.051"="0divl9d4bgpjvc6yy2yawcrigkvv7pwdnxy1gvf8mypwhkp17anc"; -"bbding-1.01"="17na9lw0yaqn7i5dnlvbfg2yn74j8kr4w526z10bzp4kpynnpnlp"; -"bbding.doc-1.01"="0pg135sdbs1zbsyv1cp69akk7kazr5937ysik38dyhhc8f7vj49d"; -"bbding.source-1.01"="1kgz94yy0gm19x59vh24f9zv95gy53ayc1906r28s067mknmc46q"; -"bbm-15878"="1l1yyiqy3izbzbrpz55dgd46szkj55g8wkjr5xh7g3jc59y5kq13"; -"bbm.doc-15878"="053jc17hvq8vphm6jqr929hf45xkb3rk7yplq4i55x57vkf8bvdq"; -"bbm-macros-17224"="0h1qqr82ihqn7i8r6pk2mrxkpf4cnil1dj1a0y4y3ydph174v4l9"; -"bbm-macros.doc-17224"="0pxrzpbwpfzk9jhb544zmya41vzdzyn0s5dcyynajnf8lii3kivr"; -"bbm-macros.source-17224"="0wc6wf1qi6kxbd5a30n926gkagyjsk7mji9g9nzv3jwrshqihspw"; -"bbold-1.01"="14dz70qh8kawzlb1h8lrm0a4dpqkn9b03czd51s74z01a3cdmn7z"; -"bbold.doc-1.01"="0pfrhps4yirpg244lcpf10ilz53714ic1fvpk3nkp2ihjbaxbzy1"; -"bbold.source-1.01"="0qhfqg6kynfq6jzx93mili9kpgikq39wmlhgiav3bdzqhp6v0q3a"; -"bbold-type1-33143"="0zvkzp43awkf5vbnrvhibkw185zg7h1rcfqav38z720cls2vgd7w"; -"bbold-type1.doc-33143"="1dj0vqnhmk8n383y426ma1y89r8y69y1lc2vkg58gaffjfrpxwxs"; -"belleek-18651"="16vq207gnh24axsmh2nnh8lgy1lz2dn2kfn1sx51cbl28qv3wy2b"; -"belleek.doc-18651"="064l5x679az55jb808yq36n28qhf0gv0xm21iz8rnz4qxymwsx0f"; -"belleek.source-18651"="1w1jbq0l49qd2wwc0xmravrid4rfba52yw29z5ki7p46j51dw7i8"; -"bera-20031"="1i3mahkkb858i6a3wyrilcbswdp8mhclvixdxgc0wpkqvxa6qwya"; -"bera.doc-20031"="0llhr464l0akf2dx1avnm3d7adzcz7ml3x95glafpk0nfgb98qgd"; -"berenisadf-1.004"="05ibwmiklbdkffb1d85w9097sv215afgbr63fka2iqzcnm5lzbk4"; -"berenisadf.doc-1.004"="18awb9xgra9qmrsrm9l090c5lsx14xp7dh034k1fq1g1767w68ms"; -"beuron-1.3"="0zfkx9iiiz7h501ls3z1fxk2ga8kjhi21vpmlng6vvw4v3dd1xhy"; -"beuron.doc-1.3"="0d0mll620s40695kikaykj4w3ngm6rcb4xzrgk3apl43pcf7mss5"; -"bguq-0.4"="1spl6qnixrb6vcdgaaxx0fk740kkxv7y73xamlkprdnrsmqrswwm"; -"bguq.doc-0.4"="10za9hbwigcbxyjwyy5cd760hqabyyj3g74w355akhfpyd20m55v"; -"bguq.source-0.4"="1vaw8sa12c94ia6fknnpbj7xxng3q3lj3h61akm590riffklw2kv"; -"bitter-56026"="1xl5174fppijqlfi1qqdhr251flx8jngnmc3sk4i4vv4d7gfanaq"; -"bitter.doc-56026"="01j95jkb334yf4rwkljfw4sa2dwg43fjln35rm6c7h62cis4vi0p"; -"blacklettert1-15878"="1gvdw5gwjzgxa332ih2rp4whdcx1rdn5mig5q9cyiy28zvm1zrp2"; -"blacklettert1.doc-15878"="1m6qp3bkwl77khvanw498bfrydmyvf1qx5a9sp66x7l7xgjnndlc"; -"blacklettert1.source-15878"="1c38hmva1ffzani4mjg7zad0mr6lphncspn57m55n28hwfq7x8i5"; -"boisik-0.5"="0xqr3sgmzklqsvd26f2800ifs674lf0a4kgr44na2l0lf5msww2c"; -"boisik.doc-0.5"="0l0hi4n5cfm1zdkr68c6ks3gxkda5bgwlnf62y7x96q5jkscdyxg"; -"bookhands-46480"="08nsfgwhlyv9whaipx74hr4w6dhpdlvwcd6kxzcznxc66mlrnpk5"; -"bookhands.doc-46480"="1z0rir98r4fm8vhx26hw7l22p2z7swj5b2i3jdfy3c6cj0pi4g0g"; -"bookhands.source-46480"="17clfn8g2f48v944jlvwl3jsz9ixkw7x1xjxqkpaqnng0wsm6fyj"; -"boondox-1.02d"="1x8xd0q0yg1w1y06gx9fq25jakf7s3nz5lf2vryh5zlan2fz0ic9"; -"boondox.doc-1.02d"="1sc5bwpvgz28q2ym65vccyr5pdg8fn680kd83zgcbcwd85n8nhrf"; -"braille-20655"="0cy4bxpg284blfpmpgh1v9vyh5bczdyz9zdsc1almc51nv6c6zgf"; -"braille.doc-20655"="1ygyzvyz4am70n57hs8xhrkdd8hpn2mvg7hg3rdr5b6dvis2ibj7"; -"brushscr-28363"="04vpb4yvbazm9lb7k2rbv4wr372k3l6brx37fx5283fpzj3wvhxv"; -"brushscr.doc-28363"="0dv19f5hfzwnw6fd32glqc71rbjwi1y66p5fl1r17pxsj16nlyc4"; -"cabin-55907"="179j2kjh2lil2ahp67pd8hj8j5w7khfnfaahn1za8bp59f18xb5b"; -"cabin.doc-55907"="0xxs274z4wk1n3a11ybsp3im81wp0a9rk5ppnrwnxm2hgfwsyk87"; -"caladea-34991"="0cxvzpygsf5p619fd7z2wpi2bahiaqs3yly83n4ma88gac3m4plz"; -"caladea.doc-34991"="0v14bqll7iqx9czwamyw4wzl4grf2vc5y08n787p98856vaqdy5k"; -"calligra-15878"="0x3wvp6crh6rg2sxzwil3jr13h73sjgbf7ar4y35na5ksgz1z2j7"; -"calligra.doc-15878"="0pp4i750ga99x72kzy818062jvldylyfanjaf8nxgkglbyiw3l7r"; -"calligra-type1-001.000"="0liaz2jv1ad3xvmaxdp3vd2b3wvyg0wm1jlrrhxljzazsxzs5d3p"; -"calligra-type1.doc-001.000"="085bcvvz7269v68r8a153cgwgs18bgpqrd40k5xy7k7f5wy7d0c5"; -"cantarell-3.2"="1p5idl8vqp84g7vw3q6ybwnddv8q7a0ijy6vny8jfd6583bjx6pb"; -"cantarell.doc-3.2"="1r6mlr4qq61cclliz4h86bc86zkb5kr5r9bixwnj88pbvbalayff"; -"carlito-35002"="17qyhmp24afg30z3b377n1dcihxvs3x7gvykxc7g43z8cm9ins8i"; -"carlito.doc-35002"="0ixh7s656l5hdl07gcckxh2q40gjmh9kkirkc5sn36ynyd17zldw"; -"carolmin-ps-15878"="1wq22k55696jbawhlcqxj839vx1kla2xsik32pv5i2371dsn7211"; -"carolmin-ps.doc-15878"="1kai31i0pvrvp44y06hl3mj20hwjzj2mav6zs36afz81b491aw79"; -"cascadia-code-0.0.1"="1dld0cvrpdky97ycnci27z4pk2adfflbgp5r43fxkwbh3l45am9n"; -"cascadia-code.doc-0.0.1"="0i5ancv04gr9ryc6kmrm197n6kkhq7m2gs7bj3kmfza0r8725sd8"; -"ccicons-1.6"="0xqq8dk5czaazzjlf601fs4d2z81yn02ama07js7wrxb21vvjz2r"; -"ccicons.doc-1.6"="15hlqk9rir37m45ajfwfpw2w2ngsc6nfyh8g76vmbc6j48zmc4mg"; -"ccicons.source-1.6"="091ayhgprp5w5g59c0zfy51lhas4gf3spya77k9fbr9gxp3phl4c"; -"cfr-initials-1.01"="1wf5lcqh3jysn0fbzpmh429gmicqhh1kvz26jfl37f1z53g07shs"; -"cfr-initials.doc-1.01"="1akblgsix6a59as4z5z6hhsncnsfxqh78s8gw0m3xqv6wrbv417k"; -"cfr-lm-1.5"="1inzb3q94b42n1g3hchqld687qhs33m2zxvxvgyciwqnwfn3h968"; -"cfr-lm.doc-1.5"="1ska7y1xg6qq86kccplwxjd70bdbiw492d9y9n17d7hryg2nxw66"; -"cfr-lm.source-1.5"="10layppddcanvyzjbgn6grgba9ff47kn7fqdxmwfkwnpw0qlw5k4"; -"charissil-5.0"="0nxrcgi0w17p7wwn09nfcx3v9b7ddsw9sp5224hbax0g5h0r9569"; -"charissil.doc-5.0"="13mpl0w0nvr6gqbjgicqcqwwrd5vlc26lc06gzq1s73lrpbjz5sg"; -"cherokee-21046"="1h8q9ysfnwdc29kfc6yj4545xk8cyncl9ns5a465kh6li01zw5i0"; -"cherokee.doc-21046"="0ijq61im5wsv64qibwcllc2mi69d72915c5qjk0dcnsn7k823si5"; -"chivo-2.1"="1nva1995nzxs9mqahqhsqr5ipfg7swi9mms2gy0ir4miv17fpi1h"; -"chivo.doc-2.1"="01p4s3psbi5900cma2xxpsq42f3r6j4a21nsrb17lqx7hhrxq0by"; -"chivo.source-2.1"="1s60n5whsv9b10zlmdr6cpi81giyzh36s9y3b9bxphja0hm7zhnd"; -"cinzel-54512"="18bgd13ly5sb87wixcp3n2403m400xngl20vxa9pfg2xykda1haa"; -"cinzel.doc-54512"="0mad5alznwa0ix3nkbpiivalfyblywl0f7gkjbhmhssvq5z6dyp3"; -"clara-54512"="19g2vpxwjjc3y88ghw8yv0abkm69x6lnjj4p1cqbdjiyy4n83677"; -"clara.doc-54512"="0dkqqps72wws7dhynan243wf86gxn4chn1v5iiishkar33xvvlzp"; -"clearsans-54512"="15f5x2kn3sfzd84gg14f85bh52i9ca93m9hcvfw9nvna1wbz02q4"; -"clearsans.doc-54512"="1h87j7b7r8zvcm1zyn7y3s9432ll6k6a14kz2vvwmy5rf0p4vcij"; -"cm-lgc-0.5"="126k3nr39xvgbzjws9x9xs01rj738lvgpy9r2wjvalxqvd2sahw5"; -"cm-lgc.doc-0.5"="1xffcgb60kvbg07hsw3dc6kzjqh907fj97qrrj2586b66asna5il"; -"cm-mf-extra-bold-54512"="1l1cm32z8wcpj0cl7czqkhnwil3ail7a2bbzn70dnswpj0ka8k9n"; -"cm-unicode-0.7.0"="1y71gdk369hs2yzbfnj5i6yy2xjzv4n65vcfb8z7x596kpjm5jz7"; -"cm-unicode.doc-0.7.0"="0zc7fv9p1m7dgi3vwkra2d8x18c4gkqzkd06gp9c18jgf0m6ahm5"; -"cmathbb-1.0"="03da7ak8q3qyvwnk52mn2a79q2mfbfk0bfrkvmjpqnlagw35qmbi"; -"cmathbb.doc-1.0"="1i54xpnvygfmwbvdnj5wwd2fwfl1y4f99afvs283lz1ki2857aj0"; -"cmbright-8.1"="1ypjv6wfj1nm6wj6laniv304zri75q9gaik95sxbz0wh5cxzwgr8"; -"cmbright.doc-8.1"="05cwyxmh6mqj0xf4awhif1vvms0j1lmadd1fgil7b14l46mcd99c"; -"cmbright.source-8.1"="1y5is2678czhhkw4y5nrg05qqfi3n7fbric9m6pszfkh4iw0ml6c"; -"cmexb-54074"="1hfslkscqr01dkgnckfcr8c04s053s6f8z5xk35lcgbqj1l7ygag"; -"cmexb.doc-54074"="1f6nrlnnq3c8mwsxz58pk05ginjkdjpgpnnw2alky20s78cc5kyq"; -"cmll-17964"="1mv2npq85fmm8ff3n2czs1mfjqcqpy5rx6dwy9c5ra1nybx0a5ak"; -"cmll.doc-17964"="0ps62xbzac6k9hk0s7wlk14iq70h922sxgagy5m8an9vqp94mjzi"; -"cmll.source-17964"="1vhh0ds96n1yy3nby8np7v4i747cana8acvcnik1zz9h4xnf4brj"; -"cmpica-15878"="1j8jsl3g76wxdpzsj8w68ln2i386cjzclcvvj1nl7z9k5bxf4s34"; -"cmpica.doc-15878"="1rj4g0kzy0ci440bjkh7b7lyh52xx6v737chzhps9w8q1b07wvca"; -"cmsrb-4.0"="077f185vcrklhnchlw694113fpgaxy8paxms37rp2br8mbhczy00"; -"cmsrb.doc-4.0"="13nd3vhxim71kcl2n02fcrm5vwakkrn0f5nfw8irl9i9r9bgy6ll"; -"cmtiup-2.1"="16wg8nw15f1pfcrm49xnna6finbvl0jr0wyapqg9i2jh39c1gizw"; -"cmtiup.doc-2.1"="0rr69cqg5pblx5h8xyw1zkap1fj3pmdznycplxx0kd4wqzbdd47z"; -"cmupint-1.1"="0y3pf2mbhxhn67skzy89850fhn17xr0b0ghcxn1ayq19qr66yrj7"; -"cmupint.doc-1.1"="0v180y0j3md4iyx54fvjr7g00mavmkw6b99bsm07nncfq0anajms"; -"cochineal-1.066"="191c7l30cs859xy9vy4pn5281c2v860d77fp0hn4yx1nq7fhvyym"; -"cochineal.doc-1.066"="1vxsa2cffypkibx7sl0b6k79kax07li4zp2qr6v4554gj3fca581"; -"coelacanth-0.005"="1flbg98xil54zvjdcig4allc9pqlliz43a681kx3wacn8c48nqp6"; -"coelacanth.doc-0.005"="1py3h3hx20jfpjxy3mylzz31vrxf4fs851ffprymf6rs9c5n6hm8"; -"comfortaa-3.2"="1kfxl806y2g6axx8csnd7njyd0skxx1gpw7fm3paz8yrzvyyw89g"; -"comfortaa.doc-3.2"="0irfhf9qw81m9x03nybk7br1nrsk4gx1dccd8ay7wd3sgw00kg0a"; -"comicneue-1.2"="0w2jbwfzfhbm5375852zv9rqih3p7grvi0s79sxr6gpzh7iyvlxr"; -"comicneue.doc-1.2"="0wr71zjk337h9p38nm67ga8js60vqyqfslwn7dqvzg06p0741bfk"; -"concmath-fonts-17218"="061kfzds7clbxyq62ilxwcrdkfghi2lx8afik7vi9gg0hysbki7y"; -"concmath-fonts.doc-17218"="1x6wb92k4da01sv8b35p3bly9hj46hh8k9wr22m7lj3rxnndnpcq"; -"cookingsymbols-1.1"="0kz8aaf7bp0y2ph0iia5lkrxnxch9r63iy7y4zpqcawh1ajl10ji"; -"cookingsymbols.doc-1.1"="0dws0sdcg13jpz23zvkw6vfnc34qc1s464nm2nbdybhjwc9gdbdl"; -"cookingsymbols.source-1.1"="1l1jkd6mcxdldvjyk9myig4jsi89mg6n4ab6ymq5lqf25d260h0j"; -"cormorantgaramond-3.601"="16fwq3iwv3alp5frk7hzn4j7bdax8zfvrmkn7sh9hqn8w18gmw0l"; -"cormorantgaramond.doc-3.601"="110f56v8mb2yjyfpdqa82905h0fmra1k5895bl8f9b1va9p89b5h"; -"countriesofeurope-0.23"="0387czqiyawxcjqh22czyd8f7y55kcrscxmp28rcm8wqqdh2ra0z"; -"countriesofeurope.doc-0.23"="0h06f5rpizsdqddqdvvvh5p3nhm4y5aixjnxl8s0b90wpcldwrpg"; -"courier-scaled-24940"="0gfqc90fq1nk7w5rvy3fqd5799aaxh48ia4wxcf01bhs4l7nrl1i"; -"courier-scaled.doc-24940"="17zr8bdv5dv8hybbjfvkrn1skn6xpl41yfrb4q1nq491nwbppb14"; -"courierten-55436"="1maxj7wsjqh2ni75pjpzsbwh1f9abndka1ilaiwik1c21kgb44g6"; -"courierten.doc-55436"="1lq4clwd38f8l4722khgnldjfk11mn1m4m82ppb1qk04qyh1v8sp"; -"crimson-54512"="0aicj6z25yvrnsn15xyn4920z8k5kbxlzrfk7x914rdq9s9s5i8h"; -"crimson.doc-54512"="1sz0f737kkqlx5d1pn5007y78y3xkblibsrkw61pp8aa1cl1mmjl"; -"crimsonpro-54512"="0d3jpr2hkkp9yhznnx0ijxi2pc18fszzcdqxkyri8na15laflbfq"; -"crimsonpro.doc-54512"="115w24lpx8xv6gkyvjmxyjlv2kd8z90036726nfci4wc2d1fr3fw"; -"cryst-15878"="1jd8ny0a0mlhjdbigkkkkz1xn51s3l8w3dpcx5kwg10m29b3vwc6"; -"cryst.doc-15878"="1rdclk91d2hps0xiqj4p0i4najjz9llq0nr9qvlj57h7ipyrahcj"; -"cuprum-49909"="0gqrwdh2gpxgc74zq97zm728ykadkrl066v77hjllmw7x6cjxrng"; -"cuprum.doc-49909"="1126yz6ks0rk92jcsbg2m3ibvv64xznrii9kxf6ss36hm1qwkgbi"; -"cyklop-0.915"="1krjgk4a920bpgb7c6qw6jx5b7gv97raxpaby1vx1lh5zvbybfn0"; -"cyklop.doc-0.915"="1fnsd0p8wp58imrn22zbswk8bdjgp0w9v4hcv8f7x5ks1czcas8x"; -"dancers-13293"="0nni21f6y9gynx1lsymb3pmh6w761q21idq60fib90hvv9jjd85q"; -"dantelogo-0.03"="03a5l0hdlr69knnp6q464x9610mwjkcl3cw3i2q10nfm5ywr7nsx"; -"dantelogo.doc-0.03"="19y2vbi5wwia1lg16rbwzkfd2chi9vw3m3xig48h0bsyy5y9pgbh"; -"dejavu-2.34"="1pxcrv98xgy9hkqhclyp0q5dgpgc80bvjzs378f0dqzc1037lghn"; -"dejavu.doc-2.34"="1f42z94n6dpdq481n5wmsx5hx000klmbklghz77x8pc9shgvlka8"; -"dejavu-otf-0.04"="06cdqjqj0vcxrr2nlqs2qszssiibzr0pbimhvqjpqfdv2hhdxd0d"; -"dejavu-otf.doc-0.04"="0x9j42zm6dagn4wv8hz34x7cgybi6bb86whxvmmwx5slsbb6yqfy"; -"dice-28501"="12j86mgn8zph5w1gd1lmmz0dcka36b187vld6r2srnj9f398h7ac"; -"dice.doc-28501"="068pzhi6a4mnq8bj5xvg4pdgqb4kvdggybs16hpk8jla03ny18zp"; -"dictsym-20031"="1ipmlwgma06nd1rk4y38r40y01csq1myqavmpd1f3c53k1n0v42s"; -"dictsym.doc-20031"="0rljzx70rbvlcirxr2kf0fmrks6g04zc1mz5hzfkjcn6xivpawh3"; -"dingbat-1.0"="18yzigyd9s0c7qs34x1km0am9ii7xywvyd9miicbdr6s4bjrjdz2"; -"dingbat.doc-1.0"="0fxbmx6nz2ib6qfka1qsb9ky9r3xw5hvss532hn89yx40gb6qx5r"; -"dingbat.source-1.0"="130qj3fs12j3sj93xlnqxch9lgywgwk3qchlil72dgmh24kg6ij8"; -"domitian-1.0.1"="0rcyfp46ar0qd2jiir3vmwqmkcj8zrhnrivr0xsi7nf9xbl0xj1v"; -"domitian.doc-1.0.1"="0q7lbpc0lh2i6jw6dwr26d9kxpwqxcrv6szsqfk73h8bpv123ghz"; -"doublestroke-1.111"="1nfbbh7kid345jkcqdhh72q3fg2fh39fzchcbhfkvisvqmqs3cgp"; -"doublestroke.doc-1.111"="1vs6gkv9bzya3hnclqbwx44nf5s8vir0hs499dsya2q64qrmcp2p"; -"doulossil-0.1"="1lajwxs0i5971bvc2jmdi1ljpp3545hq9ckyrr93lrk0ghdv65qy"; -"doulossil.doc-0.1"="1wv1718k51wpbzrlxy8qm169q7brbx0gy7x0mil18a8ik53r7c6c"; -"dozenal-7.2"="10ghknq4nnyvly55mwcisb64cadb0afmsqjh8z026izs684rbsjr"; -"dozenal.doc-7.2"="01m1ljwbzmzq0hcj6p95rl4rrgnjrxlxnf72f49f725xhfsn57pb"; -"dozenal.source-7.2"="016lxqwf1cm7a7ny5znkgibpna1r13zw0cmzs3wk49zhqhkqmzvp"; -"drm-4.4"="0j0r5b2b6js88gy04d12w8wp14g7z9xcgc43y0ysn2xglcsja3fj"; -"drm.doc-4.4"="04i8mw2lsirvzf3n8xgddd2jr2s45fbg6m6wiwjdz4d2i1pi98cs"; -"drm.source-4.4"="0l3j52ypvsc8ma06a2z2dkqsa3vd7afqkmyrd6b3z6w3dgjlnz3v"; -"droid-3.2"="1fmm1k3sxdn2h6v56hqdn0l84rz1cgxmj586wd4ff41vfzbdnn5z"; -"droid.doc-3.2"="14inm79ljwnr36dz97356iz4257vbvkwmbbaq7wdza1yf07gijs6"; -"dsserif-1.01"="1ps8rvv1i9qn8ka8idfhbsb0frnrl35cp8kdimdwzk9hp86s1anv"; -"dsserif.doc-1.01"="0px6acw5p19sn1s69864lpdlciyr4p6bbd9r69kykq2xfb94dfgm"; -"dsserif.source-1.01"="0znglnigrb3fhxd3w7bb4b13hd3yycx4lj7w645j20c89hfnqx96"; -"duerer-20741"="1v6ja2q8bi0w0jkyl3j960gkvv2m5b7n9lg6ql9rxz7sfjcxa3ih"; -"duerer.doc-20741"="020q5ln31smf228xx27gbbw0xdcx9f5zh6qjriakxa9mhixksjjb"; -"duerer-latex-1.1"="1f23mz3nd7icknkz4dircn38y1k2k0pwq3r79ja4h85si6i13ynx"; -"duerer-latex.doc-1.1"="1arjf6dzzkvql0jhxg09f4yq9vgx7ag9l69csrindj8sksvj18f2"; -"dutchcal-1.0"="0j49mha6lif07hnfn2wdfl949kfal4hbmzg6zal4w5rgw366szrm"; -"dutchcal.doc-1.0"="110rbvidl53naa31ndgh6nx19i3rkawbipz9rpxyasqk61kvv6mi"; -"ean-20851"="19w54ch23s75mhn94hxf4nphl5dcz2w1jx138kr0phfzpc6fri36"; -"ean.doc-20851"="1rylr9m7jrv0qq6pzigpm73z34p9n80fg5rf7andmvv0fcpmggk7"; -"ebgaramond-54721"="1q2cshrq5lsm0vmhb30yg3pyc0dkpjxgl44ylxmp2b9ilak471nr"; -"ebgaramond.doc-54721"="173b7f7pbv3liwa22v29r122ckyhqms6zhklg2hna9ld61nnmf6a"; -"ebgaramond-maths-1.2"="1n8xfa9qmxsrpy78h98x95wks24fck3mykq5n8x0qasi4fabclnx"; -"ebgaramond-maths.doc-1.2"="1x4l9mi2cc1fx3qbis2ibshh5wlfn3sypxcrbcr9cwwhpkg07sqb"; -"ecc-15878"="0sa6f5dbq3p0nskxwy8namy7hckd9ihz4j440v06fyfk6wd2dxn8"; -"ecc.doc-15878"="0v95nvyv5ygfrwwr2mnaja7vxng3d5byglikkirympgqpkc59rv4"; -"eco-1.3"="0vp39dva31kjs4ckqdy49smhicq4599mqly7y9d9xfz6gly6z9zh"; -"eco.doc-1.3"="1wb866ilp8hmxndqys1lpw6zb3l1nyl583z06vh8nfys1hp0x0m7"; -"eco.source-1.3"="1j3ik11vjxc1dahd0p7jdcjjqq9i89fnd9514s1lq5499h8jg159"; -"eczar-0.1"="1hpwjxsr5n7f6zdc3ap00d9l4346yvavsy4wjicj41b1g7wl46v5"; -"eczar.doc-0.1"="1hvw36i6szhia91xq2y2jzkngy0aawxw5azpa77026byqm8mrs2i"; -"eiad-15878"="15l4wi5hfbx8lp91jddxwg073z0r42qf93kvrqv7bwhqisk36x2g"; -"eiad.doc-15878"="074iirkf7fzdxik5yq4jjk2p8c5k9jj8a6n178aw767j18h4n2n1"; -"eiad-ltx-1.0"="1ifiigww9nk6hw342qj1rxzl2b94f54cm4vvrpffxy9qggwkd2zx"; -"eiad-ltx.doc-1.0"="1h4cm5b0mllqflsgfcjdh97zn3nn3d9gwa55w5kyimmxgz516mng"; -"eiad-ltx.source-1.0"="1bpy6f6d81n95x81rgpz2r1vzg9gw04309shnx8a9jsx17fnm4nk"; -"ektype-tanka-0.2"="0qnkc2i6zxhx0i5mqx57qf7792ffg246yxcm14g1fa1nlryhdqwd"; -"ektype-tanka.doc-0.2"="1cmsd75pzv0bfr9y868cbpxx39ixs64pc2i8dsi6k90wfzq2bq55"; -"electrum-1.005-b"="0ckfb8xq10bx44zfdjy1p1hfcw18mlfli8zgjks81kfsgv7hzfxj"; -"electrum.doc-1.005-b"="12mq0mn56xi4h8dwnfnlhg0bn7qn6b6wxx20nqd73qgm0p1h945s"; -"electrum.source-1.005-b"="12ys4fdn1kyml62rcwpb424l86kspnzb5xq850ppbb82ng4146js"; -"elvish-15878"="0hz3cfydpm0sq6s2xp8q44k81xxhqm5mmrx5aqn5wzm0kr52pmsy"; -"elvish.doc-15878"="1zzzqgs30gbhy8ja13zq9b2s6mf1m47ms5rp33jc5xp70w5cjp45"; -"epigrafica-1.01"="1kawqgy9kbr535q1v84kk29q2fwhg6yzmgjd5i7dyg06cy0g6rci"; -"epigrafica.doc-1.01"="06ichmfivx1v2y67f5nxx02v75wzci6m3hhg87kc4qik61yp8lgw"; -"epsdice-2.1"="02i2fv7c0kxg9d96k8gwcvm56vd4rjkndc68k1x2wa19f1ymsmi4"; -"epsdice.doc-2.1"="1cxrwbnrfg161ddc707msjya678fvvmvgsrrigdzmqrngpi7vh61"; -"epsdice.source-2.1"="0nj3d8nqc8x41lmqmicqf67wc4wirg0q0djzi0nbk77g2m1qjs0l"; -"erewhon-1.115"="0fq96r0ka5dj0phvp4i3f0sjag9fzv51hp28mc0pslvgna9cna3x"; -"erewhon.doc-1.115"="1gg99y6lpr7xxi88jn6mgzkgdnyj96ka00pz725hspxrfj9460ns"; -"erewhon-math-0.45"="1bjqllw4nk2h2qv9mmc5va93mp356n9ibj06l114f6la81k1h7aw"; -"erewhon-math.doc-0.45"="1mxx4g97m1r4jn2j0315ajncvydly0sj9fwkdsxhnjcyh7jvbx8r"; -"esrelation-37236"="1gjwrnd63bb66vy7f74alxshcr5pqz8g8q178wkgyrm37xql6kni"; -"esrelation.doc-37236"="1nnwpgjy0mzc2h7sp2igqwain2nz6374qn4mjvj6g8x02lkc1hsa"; -"esrelation.source-37236"="0aqb63mzvx5hl178kmy6aawyv5ri8favficfjjmkpq3d4hgnrwl8"; -"esstix-1.0"="1qqs88wpabdx0y92md1w8klmk7ncbpm2jqmi0j5sj1c2cn82mp1a"; -"esstix.doc-1.0"="1zzbwvv8lbd27cxafj6qc5sml4r44ymrdvaqn2h966alzga9ify2"; -"esvect-1.3"="0fgcy91ypllj3i706znwwzri36ja2ca2inx838q08zbs8gqq4zah"; -"esvect.doc-1.3"="00xpfzzhyrh5p563faa7ks0vrrc08ndcpn72a72jmlhk8y8bn7sb"; -"esvect.source-1.3"="1han75c642d3qmr47ppn11f7q1lnz8lcwj3q39nh1f81vi2w6li8"; -"etbb-1.051"="0lblwfavj6awhbw75sn571gbjkmg91xrnf27xaizqlqgf4jj84js"; -"etbb.doc-1.051"="0chxvmpzkxgvik87dbw51lhd2cfq9wikny53sc2jcb4l7xr2bbzk"; -"eulervm-4.0"="1x0zgqw15r5z9mf4pcpnf1bdbwbpwbc49ij7gjrhf9jzzlkwraf8"; -"eulervm.doc-4.0"="1bbd7f4dz3xp7ylgpi2wh9jf8nz4z6i2cvphfx53xvg555ln5v1m"; -"eulervm.source-4.0"="1if22m5h8ma3bvrlp4jzzhjm410r5r7r2ij17prycj3cpj4r2nl7"; -"euxm-54074"="10dqknqlqrga9m2lgd74zx5hk4qcbkfvlzjgr304p94w3k7pclqc"; -"fbb-1.16"="101yfs3np0mlwgfhiz74jh2jngxnb395wkcm9fvpmrs4rp7wxx4l"; -"fbb.doc-1.16"="0b48vqwyhmygv70gsbiknmmysd8pz8m27pfj52zqzzb0kphibynl"; -"fdsymbol-0.8"="19kqkmjsi5kw5s6kkgf4y7nrwjhyd9pgq02y3f43wfdml9jwlvx1"; -"fdsymbol.doc-0.8"="0ddy5d074fjmkvl3pm4akqfq7d3f57y09cfmrs5wfgvvb51gfcvp"; -"fdsymbol.source-0.8"="18hiwralhdsp8sj8yr0c5pj4xmjaiyyha1y36sgca2xlacpw8ah3"; -"fetamont-43812"="08c8xjgam1fx3aa4ikx62jfh3f4bws0ngk428bqzbrd8q445c3jz"; -"fetamont.doc-43812"="1zlhg0wgchgkk6j8v23wd29hklpzb8q4p690pfswg3zakc0dcbgp"; -"fetamont.source-43812"="024bwgb36iz2ylwsfzz4wfgsyr9djdd0p23phadzmc8qzxqsslph"; -"feyn-0.4.1"="0pmj7cz0bdfrkx50mkndiidwcabndkvx6kr38yjwwamagi9mpjx1"; -"feyn.doc-0.4.1"="0hjnn0w34gv04xr4lg11699qiz3fj1m0lq3yn5688dnn8bxkdsgx"; -"feyn.source-0.4.1"="1azybd7v6jml6afrgzfmn6iac5hlx9d286hmkw4cw711id9qki2x"; -"fge-1.25"="1f6ibw87kbhpf3qxjh17jr1lsh9kk9ynf1rngzyjwbq2rk2id94f"; -"fge.doc-1.25"="1c8nnpdvkxcm6218mrs18ipjf9mrl1cqyvv3p31x41ii8wxkvjm3"; -"fge.source-1.25"="119d70668gw3za0mksr93wcq9gpzjn4gyv8vmizlabi0ip1ycgy8"; -"fira-4.3"="0g0ncn5f5r7l2z5qqbddawkdbgxhs0y8p73ai26608736hvdcgqk"; -"fira.doc-4.3"="01h0m3s6dywhx6pbbi1cckbcccz0d5lzy8pwyy67c8blzw5bj94w"; -"firamath-0.3.4"="1d9l5nsx0qswn1hcalzsrxkvc7mvpdqk3h72bfk50h91lfm2i567"; -"firamath.doc-0.3.4"="1w6zlskvs54x192nyxa83qnlqhvq98g64k5fv6ch406nkivifmgz"; -"firamath-otf-0.02a"="1mr9s4cmjflvvglq48nwxrnn4mnh27mh4j5y0sjyjhz5bwcs87pk"; -"firamath-otf.doc-0.02a"="05b5xzbcnb2g0sx5nzydvf0x29yiz5ssbzv178iz1ri74sk55lnf"; -"foekfont-15878"="1vb2j10j6ra47gyp5a7fpv3868b1rgk2w54w0cd8iczvshbzva88"; -"foekfont.doc-15878"="0yr9xzq9pxgaw14r6494162acj4yavyd7r123fabwf4dgj1xf46c"; -"fonetika-21326"="0fmhazwrjh427g0hz8br5b05ccxv523n1ar5ib9hp3ndqh6svpgs"; -"fonetika.doc-21326"="06mbkp04rwpb2jg6kbq2bxdsagbwl3vajzh0nbq5bfg9lgdv14l0"; -"fontawesome-4.6.3.2"="1s1lkmpmb9fj4qmdhll2mn1hz8xk89z9rwga5zqpjb9was4vrg1y"; -"fontawesome.doc-4.6.3.2"="19xjkzn9vgx2sgv5sypwcmwyx9f7rg4q58f913rjwrh8gvncv07m"; -"fontawesome5-5.13.0"="1hya456zi238bm0srhw9c6kkvxbav90w2nh7y2qq84b1fm702ljg"; -"fontawesome5.doc-5.13.0"="1864y6kn1f96fadjbwikf0wl3wqplczknj67gvnkcl7l3g61fmcj"; -"fontmfizz-43546"="1ccfywcywrrim1hk7g0kg0bljq034fh27qrr8w8ypcyjdnafkhxg"; -"fontmfizz.doc-43546"="1fcsrwbn8kiyw4032kkjg2668ax0kfcb6g4kzgp6bjcmqzy6q1zc"; -"fonts-churchslavonic-2.2"="1rqsbwbqfkd53yaxnmp17vygxd049livqj71c2cszzzqq8fsxpif"; -"fonts-churchslavonic.doc-2.2"="1zjd1v8kq1v1sf4wfqb13x8jz12wpkpydmvldjn8l1i5rn0d7d4k"; -"forum-56025"="1kjzmzjnxwmcrgbcs23kn8p4z2izp1sp7xjv7ya6kl0wbza6fsbb"; -"forum.doc-56025"="0x8z7k4xbi1skzz6nw2r4lsmv28aih3hm98bhpgv50q97dyzx3rk"; -"fourier-2.2"="1f5pj59r1wa4fsx2nnbx8dn9gi1hsjpcyxwbfb6mzrcji2lzqhpz"; -"fourier.doc-2.2"="0fjhgfg23g79rfhcwnvi3k2nsiqqr14mzdw497ppxbcmnlknj8ks"; -"fouriernc-29646"="1vv4whd3axfacbmm8nksdc37d5zras4gwa6ykgw1svplqgg3zjk3"; -"fouriernc.doc-29646"="128n1cnv9h1hr4s6bp3xs1v9p7skhxlfy8afslpay2bm0ixf0cs3"; -"frcursive-24559"="063909r7iga0cirxq8qx538407qly4p2a440xq7c603fmgcb8n6k"; -"frcursive.doc-24559"="147sa2wcixanwrhdh3ns8fg447zh5f42z8x0aw41xhk7pxncqrml"; -"frederika2016-1.000_2016_initial_release"="1pi2bhbxw9xg78w6d6k4l6p1qnm4nh6m8k3bn76kv4ascydc9hfg"; -"frederika2016.doc-1.000_2016_initial_release"="1vyy278j376swl2sjwxygqm6mi6s51aa6qypgpw3w2g5kpsqqxqb"; -"frimurer-1"="0d2534172sqpzg4zj2fz0k1qa2m627jzqdnpgcak4fxighvx1733"; -"frimurer.doc-1"="15g0293xz99w400l3rj99849va3swi2j8hcj522qiyzfcx5j7k74"; -"frimurer.source-1"="0qxpdybwz0rp748rqfs026jvps026sffq3c7zi7bdy8a34mqmgsb"; -"garamond-libre-1.4"="01q3jymj6npbip8n20ql4icr26ws8hz3nnd6mkcr5r5l5z0yd3bs"; -"garamond-libre.doc-1.4"="1lcpnra1rabi8xyvw7khky3fkdc6vq6i1ccjy3v7pl829q0fabhq"; -"garamond-math-52820"="14cfrwk0xqrs5ij0fkg0nb9lx6g5z8lbmacjw4h68s4zm2nhas6r"; -"garamond-math.doc-52820"="1bipgq1vh2si94hsylckq1jcmdn3j7c9pnf2ig7fpi41lylpc4kl"; -"genealogy-25112"="0w15jrd6aycdjh8qznvm549kzwl15v2zvs7awgk96380nzcsmhqf"; -"genealogy.doc-25112"="08fxhib7wydjbd3bf24kw6zbbz2sv6fhgmg4q2c1lgxddmm8mpzy"; -"gentium-tug-1.1.1"="1i6qxccddl61vlrfm1lvqaxy3yahqh9qd3zkinn93dmwdll4axgz"; -"gentium-tug.doc-1.1.1"="0b2xqhfl684k501ghwsk1pv328ywvxi4hzgg8lzysj1f4qx9vkb3"; -"gentium-tug.source-1.1.1"="1wwwjxi58yc1wfirvfhrpn1qaswz6w09ay2rnrx5x1q0xph5l5an"; -"gfsartemisia-1.0"="0b200snkvdkrywgn3j613zxyx16prqczw106hfh7pzpr7w717lyr"; -"gfsartemisia.doc-1.0"="03gi2v0vfcdar6qsp7xff9s5pd023i3kh4b8asxh9lah998qm3z7"; -"gfsbodoni-1.01"="00r9b46m6h4vac788vfz6jixrd4wbmscblhqi1pxhg76id33xdgd"; -"gfsbodoni.doc-1.01"="1s0lq3ac01zcaqyvswn12fxhvqarq2b3lni1xza3yyk2p6y95g1s"; -"gfscomplutum-1.0"="02c0zs2xl2hy5wrrj25w22q1fj6q8w4qjbvlpx05pzzh3y63n3ip"; -"gfscomplutum.doc-1.0"="0h9i4v3sag4fmvlnkk0wjxmgsq4kbiikzv0rzfrhzfwaifpznkcf"; -"gfsdidot-54080"="1ks352cxsapibfm3y4rnw3k7izkjzpdc5fd2faq314qh5cpjhyy5"; -"gfsdidot.doc-54080"="0nhjndir8y8s9lpnad05h2crc41la5hqg8ml1rm0j5mn6jwgznwl"; -"gfsdidotclassic-001.001"="03p2w06s9kca35jdby74q4x8if5gs39gb387rjgqbv3vdn7zxi4s"; -"gfsdidotclassic.doc-001.001"="0qnkxqr8r9spg3xl2ifr2sb32hbvmka979c4f8aw4z1i810bs0kx"; -"gfsneohellenic-54080"="1374w2w8vjhyd6ya2jws86fbvzs3wz4v7nyfhj28lijf9d5y86gg"; -"gfsneohellenic.doc-54080"="1pi2k0yks1f15y17hx7q3w36y4z93pwv071ibmgmqmnmk16ymd4b"; -"gfsneohellenicmath-1.0.1"="1f3pls8cpix7yzc9r6fi8kha26mq89sm6wmiamm4r238srwrwhi7"; -"gfsneohellenicmath.doc-1.0.1"="13v53xs4znh9zhywh443rlmi56596yrw665032lp7kh03rmd8sf1"; -"gfssolomos-1.0"="1hn8k9majggqcis32nw2krnqpqdgy3y0dk777i8fqn28517ygxcx"; -"gfssolomos.doc-1.0"="01cw6sq180cjjzwgi7p2qr9pf6rq0r5zmnb39bch2g0n0rjxqwgl"; -"gillcm-1.1"="11aph8kbrsjl4ax5hbpirsgc4aznj0nkk76v1ax6d52f8bxjsgjx"; -"gillcm.doc-1.1"="1qbhq72bip77lsa5pk05g676c08wc0y1ix3c2iw1h5g5fk20i5y9"; -"gillius-32068"="1i2awm02frznjssniqjplhy6wp0jaw8f6y58a5hwyz2gh754hsw6"; -"gillius.doc-32068"="0x8qr4lw81qlyz0w14hc8s88ihm8ax13cw1av53gl1vkax421mrg"; -"gnu-freefont-29349"="1gq5dcbc92cxvlqddspc9m8v5biyafgvjc1k7fy8z31vll6wnfzi"; -"gnu-freefont.doc-29349"="0czpqlipbwnqsh5hp6yaq4ypqzipm0xfsvrfc36pri0d2hb77clb"; -"gnu-freefont.source-29349"="1cmd2p7krwhkg1f8xf0y4z2ik9g0pjc0qgi3c5van9zva0bn84k2"; -"gofonts-54512"="0sashibrwwfhd4f103qhc5w0z9bz0q3cqm22cvqp7mjqp4jrs1nj"; -"gofonts.doc-54512"="0j5ncdvzg0dr0jpqx9m3iyx14jdjazwn7xb1in5ivcd20s2bn4l2"; -"gothic-49869"="0kgzx9qh17hcm33bx8r6wh3c9j6d8v0xs4fhi3w5vwmmlmyv9dni"; -"gothic.doc-49869"="111pz7iz7zckzsdjaxz6p7chp98144727vh9b3y8v2yqfz06vzid"; -"gothic.source-49869"="1r61rnird0n9iz9kg5ky4b602wmvsyg1y94h6az314ax7zdccm23"; -"greenpoint-15878"="0l27vvxzyiar7y1x1a3hk0sswfazi356wsbnx86dp8l766qcc3d6"; -"greenpoint.doc-15878"="0zlrfv2y5ixhyqyr5hxycalg6bygvw1f6bfaxqdpakwiz7k3zabd"; -"grotesq-35859"="0f3nmf0flj20xaxz8g73zp0qcm78yvqx1idyawrarpz3q7zdvqfq"; -"grotesq.doc-35859"="05fy8hg21wq7z2zfsbyjszamif7ixk8aj5bbjsjinyxzfkdack3m"; -"gudea-0.0.1"="00565sv65b64h18cib0hbxh73ylg07lk7wxl9l9gvdczdz7a4xk6"; -"gudea.doc-0.0.1"="0rk9g6kcb8wjhf6is5wcbrr95hv7ahwl9xa9vqnfq6m1yy1bah13"; -"hacm-0.1"="05layzjb8ngwmqvg49abdi55j9gl1l74sm5baipm0yi0k1kr8xy0"; -"hacm.doc-0.1"="1d1znq8r384b4xpc9f81023asq6yrkbvyif70wjn7h64x1wpnnn0"; -"hands-13293"="0x0vdn7hq6k7wr7yxn8pnkvjhjq3mfl781ijrs2mpvjqygqffzag"; -"heuristica-1.092"="1sxpr7f4s5a1q2r76r7rj43drsmljmd32wxwgwj1x97a5k7x3jxf"; -"heuristica.doc-1.092"="1ws9r2hhcqdgcdplhgvwhhl7c834i4rkk0xrsf14c3gwxg0x1ip6"; -"hfbright-29349"="0qwwr02q170q29rlq7fw61888k1pm867vgj70ijckivibl0j2snp"; -"hfbright.doc-29349"="19zdznha8bfwqfyrhq18ad7ri8nd240hjs9kslswg70xfrync877"; -"hfoldsty-1.15"="0ar4swzfczqafanfzhwyw7kx765w743r1davbypc7lglcxwjw5y4"; -"hfoldsty.doc-1.15"="0f9gcdi8wqq5g3camccbdzfyjppyqbvvv0z10grazq463lv83jq7"; -"hfoldsty.source-1.15"="1prpbq8833njsmqanxzf25136g46i2yb4bqpvlps52294pjh0l0s"; -"hindmadurai-0.0.1"="1z3590pi02n90hwsjmihxk957hcqgc3kry3cdwpwaci43hxcvp2m"; -"hindmadurai.doc-0.0.1"="0zws4bzz6fkhxnpsjxj15wwnvbd6rhxqilabzzvm43lv0y21hvlx"; -"ibarra-55820"="0swgfxfgbqxv6vjan8dgh3v3n9164xn144wprblhy6ka00xd3h0i"; -"ibarra.doc-55820"="0ca0p2r4rhk4yqpw68fjs8ci3r31qxnv930jr89xv6ly05b7vs5j"; -"ifsym-24868"="1bs3974l1jdv0b2wwa94861hnb05kb69bsyhvsgh6k9xgmgwfrla"; -"ifsym.doc-24868"="11k9jfqrfmshwpmni6bm0324zj7c939k6shvi2l69k4w0kx6phlb"; -"imfellenglish-38547"="08x5z9s9mc2zq6la6dls3g37b2wn24ihplzhpz6207sczg1cz6vd"; -"imfellenglish.doc-38547"="0s6vzdh5amsyb0anw7m61m3wlan8skglh84a678ha5h7rs0qfqfr"; -"inconsolata-1.121"="1mbf4m3ll3r4nhxnmd3ridq7kdqlcjcm3g2q2s6qxgn4b6j9ikvn"; -"inconsolata.doc-1.121"="1rh7kisvs33v91r19lnqgma705dc3gari0g153ws8bd1px3ivsdm"; -"initials-54080"="13d5pvc2q6xc0i8nbjpifn5xyn7wzln7gng98nnpjxhk5y67bcz9"; -"initials.doc-54080"="0676gq5dx4pqs6c0z7i48gi53mlapplmms8s66qwpdq1aksswdcq"; -"inriafonts-1.0"="0kbf9rvrml10qk5pckz21ag217wimqhdxjfk35ll0a17hc9yzj68"; -"inriafonts.doc-1.0"="1hbhfhmnjya1cmj1wzhvbny7maw9m2dr7sv74g2ka6gnl1n4rx1x"; -"inter-57213"="03fjlav3f0ydw3hy01mwg67klxlny2cj7746vh456v8hx8py0zi6"; -"inter.doc-57213"="051bvp87905b9764q9wv42lfpkn8pgsygkgxzyrx3p34dvi0r4ix"; -"ipaex-type1-0.5"="094z08ygcklbk7nzklfmdz3lfmicrr40i0wzxmia93v1vpsjb4gh"; -"ipaex-type1.doc-0.5"="0946rj1bh2hi0779ss6d003wi4xcb79i9p432jkry07xkr3fpy7d"; -"iwona-0.995b"="1gf8kmpmp2cjz5sg0lx8j0kr67a5xshjkghpiy70jnaz7k8fbrgb"; -"iwona.doc-0.995b"="1skk4p2pblh8h37rz2pjx18h8pgbagvr9w8h9d83299byvjggpi3"; -"jablantile-16364"="07f298cfha42q2d12xihaqkga2iv1id2wa5ph8a61z6ckhchzz69"; -"jablantile.doc-16364"="1lp90rbrji8nld0wzry2nn0m2zb2nrqnqyy85p9sh9rmrplhj8f5"; -"jamtimes-1.12"="1sn588j6v6gxfgk31r861s7cpfk2ir7ip75hm31rxi8s8hv8s7s7"; -"jamtimes.doc-1.12"="1n91f0b0bjwbkm1rq5w2vwy6wlaizlp7qb8pxm2wn08b5a825hvs"; -"josefin-57152"="01l57ps37gpy0zriq62b0z897hxwajfvxc0c9npk3i0y5sqa0j6m"; -"josefin.doc-57152"="1k3g8ani121fbr6n9ql2gbrym3a5k7vhac2zz21kf5rxwdyvk19v"; -"junicode-1.0.2"="05prh0zpnp9llpd1hgpisdad2na8q4qpvsbxg3lcldvs3s61ndnr"; -"junicode.doc-1.0.2"="17z7wdsyrc3pxjqpl361ijfp9zj50g3j66q4sjddg21p1dmcqmi4"; -"kixfont-18488"="02zwdm6zja38n41pvzay09f38cam28rr9ag6yy1m5kmw8421xp11"; -"kixfont.doc-18488"="1dvv4hdgkzmdn7waq4djsgdd8p1cwq3j0bddgxq2y94pq64maq0q"; -"kpfonts-3.33"="08fid7im3qbhcn3lshcm439xbh7m39ic30s9xgh3x46a5rvfxn4g"; -"kpfonts.doc-3.33"="17byn04jy585vy3l61r8xfxcz5y7c3qf90z4kpp8fadbjy8ax7a7"; -"kpfonts.source-3.33"="0agjd63ryjbrhq9iq9k0avqjfm98c6p3ds8j6bc7mv69sd57vxh4"; -"kpfonts-otf-0.35"="0b3g68jhdh4387z00klr613hhp6wzxhihn4q4mi9khkpq9gh4yq2"; -"kpfonts-otf.doc-0.35"="0ixaiwdkc7yj2r1s5s6606lrr1kkicqnxva66562lmyw1w4cmxfh"; -"kurier-0.995b"="0x9270xgsk28i5dxp29r0awf72l5p0786mbx7gb5d4vppkf0v9gx"; -"kurier.doc-0.995b"="1d3lfxixhcrkk94m7ljfcb90yvdwjbp2axjnpr2bbh32xv9zzsnk"; -"lato-3.3"="1w70dgmvcwm9jff2ap7s78qgqs9ip4a6dx5wz8iyd7hn2mwf1v80"; -"lato.doc-3.3"="1fj4n1y16x7hxyd63myk902iwm6lr074rkdybv03qwxl12p9ykxs"; -"lexend-1.1.0.70"="1lqqn007dpp24jcgpn9fdf7ysb99lgrz9zxjw27qm2439wrzhc1w"; -"lexend.doc-1.1.0.70"="1h7s17x7grhdb1hxxg6wql3pwy1w08iywpynymrqn8748s93yy4m"; -"lfb-1.0"="080305sym5mppkmgvpxw3ddn51c7gh07b5b9vs2qsikv616077ml"; -"lfb.doc-1.0"="1a5y79xx9fw1mcinbkj7wv4gmvb2gmlm7sbnxc07603dc0lrhjww"; -"libertine-5.3.0"="0gq2gg3xw6k47s0gcl6gv3kdw98d87k85k8qimpvr8zg7crkrzr7"; -"libertine.doc-5.3.0"="0pqkaz9izdmc22q83ldm637bi4g02s70di8wm7cg15z64cd7aq53"; -"fontaxes-1.0e"="1xm9a33imgfsj1r6ky6c02ir857ccv5llqgjyfh2rlvk9xprmcjx"; -"fontaxes.doc-1.0e"="135xhw9vda8l3cc76ja8akfj33wfmmys9wf2f1j5n1p742zj0g3s"; -"fontaxes.source-1.0e"="0mq9rmi02p8lnkg0a8s1bi7rn34dg82n9cqr14sjrhqfvpl3hzr3"; -"mweights-53520"="1i4jp9yy9yy1miyzcq25nwm4zqd3936v4mi2acv4g1rgzvai86vs"; -"mweights.doc-53520"="11114i98f0qscg9796df1vwkf2m6ycbaimk4qfwv47mrxhvwq5qg"; -"xkeyval-2.8"="09db1yisjxlw2ck3ypjzilgc1g2qlrfk99wkgfagx4k1cb1fn1r9"; -"xkeyval.doc-2.8"="167wjc2qmna55lca5gsbbnagdm5g8f15hn6kf39vxk9h0i7jvl56"; -"xkeyval.source-2.8"="1qs4lnkiafxm7likx3pxrfxkdgi6cz8pqlv7b2rwvyrz4kbixj2z"; -"libertinegc-1.01"="14fdpxgsmq9dhgl2065rdsp0fnh9h0xcr0jzg4k5gka9irazxrzx"; -"libertinegc.doc-1.01"="0isvl0ghjji427p1fd1w0yy04c6zjmp058k5gkpsa3xkhq3ijvv0"; -"libertinus-0.02"="00f4wjqqz4hqh2ic8g162mnn95s0p2v1qshbm0zrnzjy2gr51hi6"; -"libertinus.doc-0.02"="0zkv3fgkirq6jcz7ywb1sjnnw8vfwfgd3y41lm4ds547ra8zp2q6"; -"libertinus-fonts-7.040"="0izp1qihx1arqkgbdp18ks0xz7jlyd5cc4r3d5nhdnpph1nry9r7"; -"libertinus-fonts.doc-7.040"="1zn6nlpr95syxmijr7w0cljq21qfv09b2rp8j6n0rvyzm50gc4fg"; -"libertinus-otf-0.28"="1wh5wwf0p2halvh4vyg4iqrxnz9z8zfm08pa3pn9iv0m0g9yv7zl"; -"libertinus-otf.doc-0.28"="1r52ijg0rvhk15hd3i74csdmmclid4hj6v6a0436g84510879jfh"; -"libertinus-type1-57754"="1xy94cck1rhid4a06n3kygy047xwlw5l17mj40n92dg188azfxkc"; -"libertinus-type1.doc-57754"="0fkn8p60m8761mcm3wa3nggag4h9rq0df1bdndafqazwvwnfc9m1"; -"libertinust1math-1.2.2"="12ghc0ap5n6yfb9jj8lsx93khc0ry4c87frpv2n2qs5vz1qddk03"; -"libertinust1math.doc-1.2.2"="0y0vnjhw0a8xwhgmrp917wf3r8b4vm4s59nldmnmjqj8l0yar6rw"; -"librebaskerville-56018"="1xv6f8bw0ygvwjlxcr0pciz6gamw8xvaqrryj87jqhl9phm12y33"; -"librebaskerville.doc-56018"="1331px6bv7zz8ijq8l368r6jml3rm4f81mrpw0hj93x90asa2fhy"; -"librebodoni-39375"="143ccap2ah0akw3gznf99bcw8dri83vrh1fsgzwmw3qdvqg73ynk"; -"librebodoni.doc-39375"="1wigr8r4z4a0cy8m2psz79fdm4dxpj4ara1am8zdvi5rb0nga4as"; -"librecaslon-56003"="1rla3bnpr548phkcq98h57bj57pk6x59dhpjcadrybhjg02hgx79"; -"librecaslon.doc-56003"="1y1rkqwpjbd7kq14zm8n6z9f37ybvy2g51axfkfx5q1cqc4cx8ml"; -"librefranklin-54512"="1p5nc0vbrrv4ak42hm6h8wi8nn4m9sfrbppxyry5dsx7bpilkndy"; -"librefranklin.doc-54512"="1wkvgzymak63ldng757vibkylzvg10jv0gs6qyzcv83psxwch4xs"; -"libris-1.007"="0nprmwx67zbq7xhjbb4xiw5da3i0k958zvb3z32s71jdd6psnphr"; -"libris.doc-1.007"="1vg5jgllfxh3rdqjvgmzn6ak887ar7a4kc1k5cwwwgmgdsfam1zl"; -"libris.source-1.007"="1dfm4q73p8q8bgn33z025sgna1jq428d5dvmfagjjwc7sjd93ncb"; -"linearA-15878"="18dvv5vnzbpl9aavz6z9ybwds2plr6k5s57z9xiqw14482bdv1ih"; -"linearA.doc-15878"="1lksqvncx3n3bab7hhk47fxnwy1bgfbz998j1v1zf1zq0lb3dnh3"; -"linearA.source-15878"="0ayv5d7sb8ilc7si05a4bdwv06fkc4s80dsr7lggg47n4dvl75fr"; -"linguisticspro-54512"="1xqjb65ny71bq6i3vv7xarm8i7mnmfxkzjd1dnl5sxlfcrlfq3zg"; -"linguisticspro.doc-54512"="1y0fy78msvgkssbp612gmcdaz8mb11nv87hgwg0iqp2wpc4jrh99"; -"lobster2-56019"="01a5kxpnqkr9zghg3pybm4nzhqyhpw5qj566viqj7hz2cwyx7rw1"; -"lobster2.doc-56019"="066zv0ln2288smhmcgj66mdl86a2apmx4l6sdz8ag2z920y2bh3f"; -"logix-1.08"="0yyc9rir63lnnfppgw688rpvw0z4sf9nmm9blvv1praks83cnhzj"; -"logix.doc-1.08"="0ivym2xs8725sm2w65ryf0ymk37l3j2q6sm8slv9af7s5plkj4db"; -"lxfonts-2.0b"="1hl703cxwldq4ams7044m02bmnvm8vkym7xyz9cb8xkaqfyqp8cp"; -"lxfonts.doc-2.0b"="1lfrcfpn9a260bx47nw6msvksjzqjqms5d31nprc800wk2vb8sf6"; -"lxfonts.source-2.0b"="17j1kys5hrvkymba91kp8f1kq5vshc8blv5pm0m6yk6p4kdnfkyh"; -"ly1-47848"="00c2i2adn86dlgmi94ar26nba8kjrsclgzmf7hdmgr01y6hr8mp9"; -"ly1.doc-47848"="1lmy309am46cc0ryx6yr5jri9sqn364czgpjwzrcg06ykjwsx9y5"; -"magra-0.0.1"="02zwkxc94lzi5wf29wws8ia863ljq9bq9swkh8k8318v5z4dv5ig"; -"magra.doc-0.0.1"="0q6ss5ff86ckqyv8l2iy6mrrigzz7yavizqcy3w5s6jhjadz5v69"; -"marcellus-56016"="06xn7rc0qx13g188jp2y7wb9jr69x9k52y8ljxrqidfc1bxsyh30"; -"marcellus.doc-56016"="129f6m3nxszvgpg10p6qyxir9y1wyj0y4q6p6848dnhm8bjqqhsz"; -"mathabx-15878"="0x0amwdxr6mh6j1m1q6wawljzjf1683xp1fxfqyxmsk0spx032mn"; -"mathabx.doc-15878"="107fimmxvfmdjdi1rlk0h0m88q1dbc9q1qwqhx1fwfjwdn62kvsi"; -"mathabx-type1-21129"="026pnrn2y7zrl8qfhjv504bjk114z6kd6ich2ic97l5f3lhl9nj2"; -"mathabx-type1.doc-21129"="172dhvsqql6fk2hfqcw19bxsqwqjfd7376a5wwzcvdgvx44s294v"; -"mathdesign-2.31"="0jd7xfwavfn4dsss35splcxrqj6qwk18jw7qgkwshpifp7m79l2v"; -"mathdesign.doc-2.31"="02fsi2hinjfcf4pb0r1d0r82s50734srpkk0i9c566zx3m52v2vf"; -"mdputu-1.2"="1ihwhdcmk3gd081yn4wimg7yadvxkygybr3bypqrvllwa92lay3j"; -"mdputu.doc-1.2"="1hsd74svpxxmjps3fng679hq7dm35mz9glcwwhk1carzafmm2ppm"; -"mdsymbol-0.5"="1rckczggrdd977n7dr223zfvp7dl683p7d6wfija8ln4d1ll3lz8"; -"mdsymbol.doc-0.5"="0v8d92kpka138yzy4a8hg5yf6zrz267hhsakpm2f0bamdzqkp4kc"; -"mdsymbol.source-0.5"="0xh9d4xpdyacmb3kxmqh71qfx0b5qbrgxrw3fj2nh2rzh35smsy8"; -"merriweather-56365"="1rligpcik7vjvzwv5m9j6ws28f6bh1nxmbsc96f5hrh3b9fmw33h"; -"merriweather.doc-56365"="177al50mr35l1i9fqr0wivjkhd3idqsh4wqkpwkgj1q44v4vq7af"; -"miama-1.1"="0138r1yrv1880nmcpgcgb80nzd29xchm09s8wxb53j71q0vvdswh"; -"miama.doc-1.1"="0dd32q8clxgkd7cdk0699fzplnib4waydx9y9i33lxxwjkfnfsbl"; -"miama.source-1.1"="14d7ryxz6q17jn94wlj5vf2hzif6i08yjbxh5z7pdcgrnl035gxj"; -"mintspirit-32069"="1qapq7j9vf8pmnhdn16c51r5spcssx1vchlfqffcqapbja6fx5vl"; -"mintspirit.doc-32069"="1qqcw9zq18y5pgnrc8mks78s2qws9dz39wixj1hf7c55ryhd6aak"; -"missaali-2.0"="13y2dm6phd9c77j3rajvz4qma2h2k4nwhb520j3mm98bgmbkphf7"; -"missaali.doc-2.0"="16487s0ijkk6va22rhhyhxdqik863n1i25p0f67gcb8xp1s5l1wk"; -"mlmodern-1.2"="16f5cpczawzx4p44svpzy205l9m9g06w8r0554cgdpqdbwr139fx"; -"mlmodern.doc-1.2"="1rqb0g16wj7jg65xm0rk68cfz9r00zwy4r73wbkn0fqrchg08yn8"; -"mnsymbol-1.4"="08b0ypa29zkbch5isk39bbakg76yp5g7w4caahphdljkqy4k27zd"; -"mnsymbol.doc-1.4"="0pv7717qcjd5ps6vnlmxk1bqvkhi9lx6j92i6ggnak8i1izd75fw"; -"mnsymbol.source-1.4"="15ksx2lxxyklg4dcckm82hysin9r2v7pa3v8gjns4wabj4hx7v4m"; -"montserrat-1.03"="1blgdkfjjjhzk41myfp7bb7x5wf3arwapas4mm1770d46nab1wwr"; -"montserrat.doc-1.03"="0blk6jxz1xrascrdalssqd9pdrvpai3k9bqbvgkyngqhp4rzndv9"; -"mpfonts-54512"="1z5ws1kr5s07xwcs39w049yvhfwadybjxb32kf9qd8818pgd4zkc"; -"mpfonts.doc-54512"="1hjy2jqm8mlrwiipl4f1rp10nya3zcy2vsyibhs7f280h4zhdwxz"; -"newcomputermodern-3.02"="1vwbvr7ywbc1fjj9wmjva1h8fxaixklzwcks5d9fzpd2825i3mpq"; -"newcomputermodern.doc-3.02"="0x94jcrwvg0jj8mi4j4xms2jgig651kk0yj9r1gpkwbwyhkwqkf2"; -"newpx-1.414"="1l8l65fdc474xdphldqvllcx1w0a22fsbgpnjvliyjwwh4xb233f"; -"newpx.doc-1.414"="1b6pm2ngc3a47sa4xwjmvf911562sdsmkr0j569rr1kl7d0xkz26"; -"newtx-1.642"="16d93k8xzvkam7apcbq2fpxccym5pgnjm1kjz7d7khwc221jh48w"; -"newtx.doc-1.642"="0gk3zhiga878qc6gf9p61d8fli7hh9mrrdmbf70fc7rzxy72s6yw"; -"kastrup-15878"="139ynj6jr5iniwg4ry57b61bpalchwmk2lvxpzi6rzhp42ifv1j1"; -"kastrup.doc-15878"="1bzjky4plcl24fg5rwbjizixwfn7nkbzb6wwydxd7s2053zba07a"; -"kastrup.source-15878"="1c4ijjifc4lwimzrhp7ym5804fz5afmccn4bnfayypmjqpc8x6jw"; -"newtxsf-1.053"="1dw182jxwcmbg2qzv49w27lm5d639iiv0ms2qxigjiwakw714yz0"; -"newtxsf.doc-1.053"="1xk4n0hwg7hgzqzh03as1bayqx58rs2sa7d58xn0wd514blz71lm"; -"newtxtt-1.056"="1rydma1iqcb7k8ihyhpgdbrq4vpsy2dwyij2pr5p3bbmsc60kc42"; -"newtxtt.doc-1.056"="12mvwqmpb1hyn3l98z74qhyqzkinzw4q4f4q0mx1z586238q4klj"; -"niceframe-type1-44671"="0lcah795iqxkmdkr46gk76fypawz1mwiw3nxvgvbx9wrsdfccxy0"; -"niceframe-type1.doc-44671"="0prjzgj1fg71kf38asq8622l6yjvn1pn6am1nxkwrpfmn3bmn76n"; -"nimbus15-1.013"="0w94j8wh65aprww4vsk4q56g6ra8rhbhbpdw5zhhs24i4vrgl1x1"; -"nimbus15.doc-1.013"="0b96wcvh8kgiyxlhzdgpwrh59hmxkmhkpjgiwwxi9f251cp0iq5r"; -"fontools-58747"="1wjf1zjlk33avhvh3mlws1ni3kfq80hkvlclj0w2qc432hy5b0wv"; -"fontools.doc-58747"="003yajraa1bpvxqy0n09hy1rfjn6an01jl05alabkglra2hqwcrx"; -"nkarta-0.2"="0mhi640hsr7dy7jbvkqq2yl224i9ialf01jkcma0cq527nvrnm3f"; -"nkarta.doc-0.2"="0bqix170zf7lgiv11v4mqyq3iva707zv91z154bi71cvnlknbkns"; -"nkarta.source-0.2"="0f6m2wz1cd99s4nxppzdq9jm1hg02xzswgm85dmi18jffgrd2chp"; -"noto-54512"="176cz2x9aizx2wf70zzbb1b9im0xvmkm42zi7n4h2l7kknlig743"; -"noto.doc-54512"="148kbjzwhmkghdlqzj2vww02z73rbr5rpbcr3yryggn3nlf6y3wq"; -"noto-emoji-2019-11-19-unicode12"="08wv3k0gkhd9mb8b3l2p4ag0wvjj0f8iraf1wnfc6i1757h40i14"; -"noto-emoji.doc-2019-11-19-unicode12"="19iwbi47c1vr3jhffqvdsg5ymq2w9ks1n52lap78bp32akipjpaq"; -"notomath-1.02"="1ky2wk10mpbhjpqcsagm6sydkb5n8czpryfs32xf6w64nzy5hivh"; -"notomath.doc-1.02"="1wjnrksgn1qmalqq1c11wdlpwq34hw8zx07cyi2jw26qvyh9fpdf"; -"nunito-0.0.1"="08hnxivx7ixmvp7l6kxfr0vxy7c78i9jqkam0xxg5mkxs9ip481k"; -"nunito.doc-0.0.1"="0xhv3rws4kp5s4q4c10ykkf3yyl9i9ndxjavjx9xxxwm1iap9m3f"; -"obnov-0.11"="14cz2rqp4sf4f880d49yhvqjkzm5aw91cdijmqwf283cqgzhdmlf"; -"obnov.doc-0.11"="0k20zh42vcm449dh662frdmspmycx0mi81ml8qkvnncy8h40jxr8"; -"ocherokee-25689"="1xhb9y2m6sahkqlng98f9rqi94hrj66594zqdd2sv82902vfgl9p"; -"ocherokee.doc-25689"="1fqjs1zwf9rgdzzc0wk39y3jcn150ssh6yvda4jfyqg3sv17wwgg"; -"ocr-b-20852"="0y62xmxbw7573fwvfr69r7bhfcywvhcb4mg7am5c3j96ipq5vqzh"; -"ocr-b.doc-20852"="13r2chskacbnfawlc9xwskrl8lqj3dx8gzzpyjjk09rx1g5q9gc1"; -"ocr-b-outline-20969"="11lv3dba2g8mrnfh1y6agg8ipivhnppd3s7gqljlpdbdbk40zbyn"; -"ocr-b-outline.doc-20969"="0017l87j9g42cjy1ki2xksh6xq0hl3rsxcrdyrddvvxp520p02x4"; -"ocr-b-outline.source-20969"="0yn2mcwj73mazk503f13qmfy2bqkq0gz264ckr33bc88f1i1518b"; -"ogham-24876"="0hl3xjmd2bagcn2wnmr2rs1hzmgvm421rkdaimplzdnwj0r64j49"; -"ogham.doc-24876"="0phm6xdxl1a6nh6g17nyz6p7f2ymll39k42588dzw45z7zwan40i"; -"oinuit-28668"="1wr3r06hbxrc0v9cwyp7ad6jimw05x3yn6vqpnzchk5l0ixnlkaf"; -"oinuit.doc-28668"="1919kmp5sxd9q49m6dd8zrnjx0cqgav1i87gag1rffd5hz9w4fys"; -"oinuit.source-28668"="1mymvxv4721nhmfdlbl9bgc76dainzykggf93jx6xfwlld0krgis"; -"old-arrows-2.0"="1immbai327l7vkq67nz6mcnyqmx3ajg3blrhbmffkbl92482bv4d"; -"old-arrows.doc-2.0"="01kdfgiqp5n74lipiviv2alzallba37gyzfp1sqrvwwvrp3a3z63"; -"oldlatin-1.00"="0cxpm5qvbn0a643x2h4dc0pf00kqqk1z540j6dp7mbiwv48qqzdb"; -"oldlatin.doc-1.00"="1my5h8wq241dm3d6czb1spznrxmrclwgn8i391pwmc11z2ijqgjk"; -"oldstandard-2.6"="0pzn7g28sgidxiaapd4zl8pb8brr6djvvs70vhbi7902pbvc0bf5"; -"oldstandard.doc-2.6"="1cy73ycz7dbmbl8c6m8hs5nigvi30dkjz0nwwkqqqwa6gyjz6dw3"; -"opensans-2.2"="0xj7v9lv1ni7mq175l29a039a2ifmdsy1wnv1h0gfni5c34knm1w"; -"opensans.doc-2.2"="178pa2kjvp15la857iblh9qc195z3byd1wxxyn7c5bzmndvypgxn"; -"orkhun-15878"="0x78b5d70cxy7binl5iq2jwgsjh9rzs87wc8ib18jxscqick5jgk"; -"orkhun.doc-15878"="0q9hwwf80hq6wffyvd26kq2053vs5czly9zlsclh93hsmzg3vj9g"; -"oswald-57253"="1nl8lrvxxjwhmavycz25znzff1qsv4br83w661fplzp5nqy2xmh1"; -"oswald.doc-57253"="03jhmikwzb86xrm01vsx1an0bcrkpcy8m0ivy1nkc5gjq94zilzr"; -"overlock-56079"="1p0r7sviizbc2kraq4a0k92hrzyjq5qijacfddpj3fhf0sx340ij"; -"overlock.doc-56079"="0zg9lqn4853sd5829v4wf8c8n3nyac0l9xsd4bg6mx6zwm4jbw7z"; -"pacioli-24947"="1fc15ygzkdbv5mykgrmzb6filkl3aipk7i9k1syh2ssr37ldxcjz"; -"pacioli.doc-24947"="0pknnd02q244pxyc2vapdx04adz7gwf41swda2xi3039x82pm8fd"; -"pacioli.source-24947"="0zl6l5yc7v5w1xjd83prvfmy8jf3jyblallphyglgb4vkqq6mxxr"; -"paratype-32859"="1cwcw13xdarisjslsp8aayb984fk4qhx1ihg887fzli0wn7kpvvr"; -"paratype.doc-32859"="0kz4nzz3v6a4qk2svgqyx02j0pni92qpm5agb6k0vwylmvx6yyzi"; -"phaistos-1.0"="064gh7pwrsp37dxvjfiar9bl1i30a1kngirgywndss8xmrvqin9m"; -"phaistos.doc-1.0"="01wd0636h2xs465rypc5q7saxhind14krmk9dp9rqc9129k7rc0q"; -"phaistos.source-1.0"="0l6nmd3v9x3j8if5aryak2kh42zza0g73plwv6im6hpxkhhb21jf"; -"phonetic-56468"="1cd8x4qajx3896a1bzyhnrhkg8j73lffri0fzks5h8s27jlnl6al"; -"phonetic.doc-56468"="01hnb97dwbd7g4lflb9kz3w0vhnk5nzni31sfiqbg35lypa0pbwl"; -"pigpen-0.2"="0zd90dp5bx1l5d5ka8lzx83yprl1anh7r4qc0laa455dix3swfq7"; -"pigpen.doc-0.2"="0z0a78akxkigpw7289692sr3z8g2vnyc6hwcznn2963vmsrayv6c"; -"playfair-56005"="1zsvd8mczjg8az9gp7srpq6nwr3gkr1v2xl9d9zjdnczwhjmyqjx"; -"playfair.doc-56005"="0wjzinx1akf83i60ayj8riw2isara4319pikj52naq8d155npj3a"; -"plex-54512"="1c932nw4v39wnzdxjlvicg5pllyjxgwpdg44kc9dw7jv313ph2c0"; -"plex.doc-54512"="1f6vdcqbxmpz5kzkxnj75g4jjhgizqrjzcz2g1j1z1yd78k0bh2v"; -"plex-otf-0.07a"="1xlckvvrv9j03gzg7b4jw2ff8zpp8qi1996xlm6ixxj6kiipk9c9"; -"plex-otf.doc-0.07a"="16yr6amxalcsjnkphfwyn140k7q1lgbnch6w5iv1b106q2wqxx69"; -"plimsoll-1"="0x39p7fhfyxnz95g44ci8xdiwiq0w2n7z3vq2vm26l9ia9q9m6d6"; -"plimsoll.doc-1"="0rjjk5l0zvqmj32m1xcyrawzzllbs11bzb4i4cvzmnakzlwkwcrr"; -"plimsoll.source-1"="1b703r0ssg8q021z9dc8n7p1w7hk5b548icc269gjrpad622acmk"; -"poiretone-56070"="0wxqymp27c173h3qs7if47mwmfa11d52z07fl0pxlxk1fiy3vwrd"; -"poiretone.doc-56070"="0w3ypjqybh9i711c7zhf6iq30xc2xfp4ppxh83fgp71wzb0qqyx2"; -"poltawski-1.101"="018iqwz4apkj8pwc3ws7k00zldnz4k02h1hv0ry9d83z34xswfsn"; -"poltawski.doc-1.101"="1kx83mgwkxd0sv2xjzvn6wdsbdng6skw71z2xc3xk16lk356q8hc"; -"prodint-21893"="06s9qbfy0rkfby9ff3dylykl81yb3fxpwxrwa8hn1aa2gd9bj2n9"; -"prodint.doc-21893"="0z8ibz668zjjjypcn0kiy488wzgwzxqackz5z996r3sq5x5zzgh5"; -"punk-27388"="0jywh76pckajz8m9c9li6vvybjwljyzhk7hsn437mswbfdd5f2yz"; -"punk.doc-27388"="0lbly72hl8a5996dkjr5ssnzklbshbypxymp4zgdvb0i033pd0r0"; -"punk-latex-1.1"="1wfs3li3h0fv6dmpvfjvf0bhq72iy82gpjbxhp3ssm7sj41y07cf"; -"punk-latex.doc-1.1"="1agngq3shcszz054gmikza54ny6zki30rsww8mp7h9ab5nmm6wsf"; -"punknova-1.003"="19qc4ypax7jlr0hw7aim6p0afy9a2qz1ifasx9dh5rnqhjf0q5hl"; -"punknova.doc-1.003"="1x432js1hj43nrxg2bvp4wrrmgpi6p44ckrfic1gk7ki8wzcx4s4"; -"pxtxalfa-1"="07i7xk5v73r30bn2nmyk730pib1d9gwgpg0kqchp2pz27vfjc0f4"; -"pxtxalfa.doc-1"="0jvw6sj4dw08cmifddba2fdq300a4x6vkczj0b1qirrq5vx87iij"; -"qualitype-54512"="1r59cbk6rmdy0zhljcfqxksf101rkzib8ll20ak0sshc3f1jj64y"; -"qualitype.doc-54512"="1jxcqd48v11b74drv0lh2gv65aqsjv5zziph2s9g5ldd1733fgl5"; -"quattrocento-56020"="0z5497g9msnfv3rmydr5aa217vbpqpd4x26q1qy71wllpa08gmk5"; -"quattrocento.doc-56020"="0jfykx42rcfzqnafz6497dpfwh0g05sivfi7lkwrnlbjz5zyslb8"; -"raleway-1.4"="1d8zv0x1j2c996ql8g7zc38s7fpc61ibk5zdixhj7kbfrz5cbc1b"; -"raleway.doc-1.4"="1i8hja5817kzy894j25hy5cjnw31y4kcahcymx5hrbi0aplhizx0"; -"recycle-15878"="0pj6xvdd30b4y1fa01vmhczinw48d6psfd8iy0rpzpaq89rbjrvq"; -"recycle.doc-15878"="0sylgv7viy4qgl0krhsf8q1gkxiz91wpn0l5jyq5y1zg92x8jk1b"; -"roboto-54512"="0gckp6jfkl7lfhff9300nr4zx1wdp4v49a4341hiapc8151jrfry"; -"roboto.doc-54512"="0lmi8yig397zs56v5s834plz50l27rm9ml5qfa1w2zcrims59zcc"; -"romande-1.008-v7-sc"="1bmqvxmlv2065ifn6bdy8i3mj1g6pkg44dhjrfr4sj5g8dihhqq0"; -"romande.doc-1.008-v7-sc"="0fgbq36nzkvfw56rvqajvz8krfd84msx8iykkjizn1m5zkqb4iv5"; -"romande.source-1.008-v7-sc"="1v8360kqvxidzkq8sgcg8k2cqhl59q7bmrk3gvf9vg0shrbvdr39"; -"rosario-2.1"="1jqgz4cxiq3md1dldlil6pslxxrp7brr9hl28qcf6akymnfxx37f"; -"rosario.doc-2.1"="050yna9vb9cz026cyi44f1qc596svxvf6fgyxlby2isl1jqy89zx"; -"rosario.source-2.1"="1bzcpxygwsmcg91nxx8lxc9skm5cr8hbz47qmydwznkkzldkdbh6"; -"rsfso-1.02"="1h1hzsf74jll793qs51pq03b2l9szbqagn2p03bcg0f3lgx0cxx2"; -"rsfso.doc-1.02"="0ibld15imrqmrs36ch31d5a4kdaspjk03vbb667r045ds43q8a5v"; -"sansmathaccent-53628"="0653qd7c2lb63lbgjrbac7kwl2lzygz694li1clwxlkrf0bnv1q7"; -"sansmathaccent.doc-53628"="1r7dqwn7vxgg51jlsgx82kv79fxskcdz6cyhkdbwgd2f3rmkcm5x"; -"sansmathfonts-51356"="1w8sv0jaxgr5pjz0mnllmkd9gpbrg220flr2j5lnz4vlcyvlskw7"; -"sansmathfonts.doc-51356"="18ag0933q07w5l7li369j0a8lz69hf1i6paa30470pf41i1gyxvr"; -"sauter-2.4"="037skfr46198y0vczwcy6dzq9ry8w5imj1ih9nfy9mrb0hmj8caq"; -"sauterfonts-15878"="0x2j4rz8n2v5qw1j71h2yasjv2yh5g503svjrcy70n27njcic2dy"; -"sauterfonts.doc-15878"="0r3xc4128x9nz9wqqs9y7a45lfgll99l7n6k87cb2zkyckr0kk6f"; -"sauterfonts.source-15878"="1k5fix44afwcx3rihmipji2zalc2zhz8m0rcpybpz76mzqsrc1fi"; -"scholax-1.030"="1znmi5l96dis86x5b5ff9yr2ghvnylrl7gn0x02qj8s0j52w07gj"; -"scholax.doc-1.030"="1f110d56spi8gjsniimxjpcnbklxqlck9nqnc8fm3r4h7rrm715x"; -"schulschriften-4"="19nh81mzd8bddd921h5qjn0jrkggy67s1crsjz16pi0l7nmai1qv"; -"schulschriften.doc-4"="0jkgsphbmyy82vxpp0a4a9i2pyn9plxpng6ygpgnipr98v5vf8ra"; -"semaphor-18651"="1fk3qdnkpv28zc8q172w9yn1aq8ff9ag6ql2ghh8aa64j9gygdsc"; -"semaphor.doc-18651"="1bq53xa67jshwlynsbqhf73jgy6pcd8hhdc5dbh83cgma804fyyh"; -"shobhika-1.05"="128p64d6bc0m65nwdrjr35b7rxlx21c025vj8bk6n1frfg4k4lzx"; -"shobhika.doc-1.05"="1zxg9rxsdf15jn0hn81p20j0dbq1095vqrmh7d5mzhlhnybkr1kg"; -"skull-0.1"="0v3kvrk5aqsfna30z920k237jql1byy12qkb5i8zlr73z4cy1ll3"; -"skull.source-0.1"="17iby2rcnqakykglv9k1q5zmcj0h4gj4h2vadihvyyz6m6bvcx0c"; -"sourcecodepro-2.7"="0vzs79a6bhvxap9xw9nm4csqm8x6m83nmsxffqckihkrbcbwnkz5"; -"sourcecodepro.doc-2.7"="04g53xmi3afzv76dn4pg9vjsd903rl0hbzqw32gr7hhgh60xwb8d"; -"sourcesanspro-2.8"="0j0qgb04yvwf265hwiiv581fy39cpr6i9f21k38xdgdi0dl7ghzl"; -"sourcesanspro.doc-2.8"="1lg7jxxcymnvbrhgdf6ddj0nahbr6g5vnz7ahav8v8zfyfw87z6z"; -"sourceserifpro-1.4"="1zwvz4yqvs5pcqwsig4sjkp4chsc089j0dl9mn8ah047nhr2d7z1"; -"sourceserifpro.doc-1.4"="11q4ppkw8m56bpn8s08w0zkiilfz6s5jv0rkqjnqbzn47nm3dqij"; -"spectral-57296"="0rgn8svjcimqm7ji3ga28gmz8dk2frhgnhs99wlsi3qch8ds9pwq"; -"spectral.doc-57296"="14jxmfi62ddhxj9551m13r54k97ms2dd2wqbdsfn3v171c7va1j6"; -"starfont-1.2"="1bf89j0qqyzih5w9ban03k85v8ih0d16sil1sf7smzmqk3nhmrz8"; -"starfont.doc-1.2"="0rjx4wj021ri26zxdlhkh71q3d0ygf3hvcqghq9fwkbi0gnig1r1"; -"staves-15878"="0pb7cghd2p1f7y5x19x3zyvaz63k3nmrwd04g0yqrl3774fvnh1r"; -"staves.doc-15878"="11i1rcc30lnm8fqmnpmk1hgz2fmm54hgf23ich279aqfsk2pm8iq"; -"staves.source-15878"="1y87sw1qrmvgvayzwz2i6qjzvx952h68123fhhv67ga0kpxf9fwi"; -"step-2.0.5"="1r2mf2qlcksllpaakrycmcrpxfq9c4g7n18ip13ykp92fmrbcz4h"; -"step.doc-2.0.5"="0f0hph5cjwhwdn2yyfzvn1jbkh8xm71jw10zagbncapfqfgx5h62"; -"stepgreek-3.0b1"="04xldk3dzcr1vg1xld4hhwx5xzi2pr0v7gn526xr8ca3m3x5mwnd"; -"stepgreek.doc-3.0b1"="179zz295nxpp21p6xhrn1r9ka68i3l9l8bphrb2833a2x6qgmil3"; -"stickstoo-1.034"="0di39yfsk63bhvx7aiicc2m11yjr3l79cb7fzxh2yxlz56xw6x7z"; -"stickstoo.doc-1.034"="0n5p7311vckk3w7d0ffg7hbr1ljlj07z6f3qvaic4z73gr3qv7xn"; -"stix-1.1.3"="1jqrvkx444hvfh7246g22k02jm00m2cnc6ffj36k8qdi1s5m9dkj"; -"stix.doc-1.1.3"="0vmiariam5zd37zq2ni9560kjgia89p52cm1phxqp6gp7avfyl7q"; -"stix.source-1.1.3"="0jjxifyrkdwgbv6xvgpk9ji6qwn4wr91lkdprcdjpmw9b2mwflj2"; -"stix2-otf-2.12"="03ilzmkskp2fj3jwyvlwz8b2ryvb1rfj08ciqhkhi9ddygzjk8xx"; -"stix2-otf.doc-2.12"="18cqnpabka16kfq09rspzgwmyh0fva77i8676myf4wg805953zgh"; -"stix2-type1-2.0.2"="0xrpb3y7wbpxdc627gn9h6s3sjymczbhxqqi0dbicrcrd4065kp7"; -"stix2-type1.doc-2.0.2"="0kqh52jkqgsfdwj83wks80h9v326hxz1zqh2ls346kc6gz0r2p9n"; -"stix2-type1.source-2.0.2"="0ajs9ri4v4jw3hp64hflxwqd9sw75sk2a56lv57qjzzjzkc51243"; -"superiors-1.06"="056i8jrpfs79g2n4fb3kabkkbqbpyii1g0z63mciqyfbs0wvpasm"; -"superiors.doc-1.06"="1459za0bj73lgz7nqv0ys0zimfw1nmmzzcyhydi9km7mjv5sf5r3"; -"svrsymbols-2.0b"="00wr6lyncnpvw806ff8s49w239sqpc8c5zg1776qyhjcpypkfgym"; -"svrsymbols.doc-2.0b"="03jdqja9hm58w65vp6mf2q4dd2i1n6gq7yr9p2qrzjm33dxycjx8"; -"svrsymbols.source-2.0b"="1dsw2z368hj4sixfy733r19yvnx0mi2qzff8647i6faj70lrj6ry"; -"tapir-0.2"="0ad1qkbvvswq7msx9889sz8n7wf8iszigd0vmk2yycykbf0axzii"; -"tapir.doc-0.2"="1m5g6bsijqris8r7z2dw3cj74ajcny2wjysq8ql26531z61hj9ss"; -"tempora-1.05"="025smp68d941hqdxqsd4qpaxvk4z8ybg14xwc47i36k04244rarh"; -"tempora.doc-1.05"="14k350dyiqjcfg5fx09i2i9cqsdw4mh1qcrv8cglf1gf2d0b3jl8"; -"tengwarscript-1.3.1"="0v6mpqkyp7fr1nb5myjs4alz8f7y56rnd1vlsgvp0m2shvnvhy2f"; -"tengwarscript.doc-1.3.1"="0225gpdqbbmcpgxmpjcj2blbpzxcnr7vmm38jkkpyan3gfw52n2w"; -"tengwarscript.source-1.3.1"="0jzzn01c5gwkc8n6naaddm793sm8vs67vsjd30lj4ls7djpnixkc"; -"tfrupee-1.02"="1q0z0as8gd9qb3p10rf5kwzljg5z790cgmxi5dbz1piy0lcnj4hn"; -"tfrupee.doc-1.02"="04zmcfp1xqq53wl41rw199yj47nf7l396qcnsp8dsrvf7d0n0pfc"; -"tfrupee.source-1.02"="19bgxgg9cdgfdvdr4kzmp4na0n6p28dq0iq4nqi849j4ij5lwmnj"; -"theanodidot-54512"="0i3z98npv4f0gmvkfshr26bnj0wj80r6ffdj8s2qdpdfq0m2227n"; -"theanodidot.doc-54512"="041dib8a3y9y5jn32rm5kvfp5vzs20z8kalki5jgr83l07ib734c"; -"theanomodern-54512"="05xc05nsas25sn8f3ra0jaw09zr0kjxzjmx2fdlwdyr2xipdpmga"; -"theanomodern.doc-54512"="1wcvbv2jicvfcr4f6hkh35p6gg3hfb67sphzh29ysvy8mdm3l663"; -"theanooldstyle-54512"="1nzn0j53nl62f03m47k8dwk7qiz9zh8x2mpj804496qd307cmsl4"; -"theanooldstyle.doc-54512"="10vvf59wggqfbq3svc852s9qicwxhh2hbv03vv55fyl8jg9dqxrc"; -"tinos-42882"="16w7c1a7nsm2i6riwgcl39l2r0kz8cp6xydr7xqzxpfxkzhav42m"; -"tinos.doc-42882"="0aq2wyh5cvmi6gnvwwgm8ch6r17ncwihb9f5vjclsj94almpp4gb"; -"tpslifonts-0.6"="14cpw6n2j16mq1742lyjb09zynyjhq1wcljhpbb4c6brwnqvb05q"; -"tpslifonts.doc-0.6"="1wwmxwb2y6zyp1h5hskl7b6bb58ydasv3gq2bj0jcnqhdphgii9l"; -"tpslifonts.source-0.6"="158innbi79r298sj1r4qk9c0g4gv1wzdkcmxf511sdb8ipar6xk5"; -"trajan-1.1"="1hnk1qb46hihc3ga6klxghqf7yvn6zschp6w36a08mz1hfsdb8sj"; -"trajan.doc-1.1"="017v3bmngyh8wydjl7hmxqh2rz61dg2imcl0gabsfs98l8fnwsfb"; -"trajan.source-1.1"="01qgax96y0sklbbb8mdfv5yc0i2k90i23yg75vhjmb7xlwx60q7k"; -"twemoji-colr-0.5.1"="1009mh8kw7ch8gr80pcc9xhdjvsj3062vyzjy0bn8cb3qvhr3k2j"; -"twemoji-colr.doc-0.5.1"="126na3n7zbzngx4zpimq8lr32anwixl571yp0cj0c7clkqa3c6ky"; -"txfontsb-1.1.1"="0g2hjxcqhgynzmvj44q9d1wpxwpwy52a6rbl3nhnq06w2v1lh637"; -"txfontsb.doc-1.1.1"="1yls8kb1bglfqa7yiqidanyjgj3xb1isc7z99ybw2j2kbmvvcjbn"; -"txfontsb.source-1.1.1"="07bapd1i9rwf3946pj54s0m0841ximmj60ic266mcmj5gipw2q1q"; -"txuprcal-1.00"="1l1khap1kpgjsjrbsa3d9hgd61lw4x7pi771mchszkaklqx8qarn"; -"txuprcal.doc-1.00"="1j2y6scl5pa25yk00zf64nqgngrvvb4hbig3qi50rzf5kpq56pxp"; -"typicons-2.0.7"="0acmp2zpg1734c6719jpmcccyq4325h2023bc87xmj7jxqq0xlp6"; -"typicons.doc-2.0.7"="1r9wabmkqvzdj6dcxl9syymp0rzz8kj0lfmqn9j4njghclndkfdf"; -"umtypewriter-001.002"="02b53ljrirn1248ycpagrwg7fw5n96kg3m9y4gh94d36v4bnc870"; -"universa-2.1"="1r8rh4jbx3lxciszf93klg3zwv06qqgnzikhp11c2qmrjrk9gznh"; -"universa.doc-2.1"="0acfyvdbqagda11730d5bmr5qlfq7hiqw7dajq143i54k9ln8mvi"; -"universa.source-2.1"="1ydba7wjiqnjc8drv5j8skv5q8hjrliwd38s6xj2jd12i0zp3gyc"; -"universalis-33860"="1xig6xi179vm2rnp6qimrjy5y4kigyl1r1f6b62jiqlvj7ii31wg"; -"universalis.doc-33860"="15j9fv12ch2vpzmjyaiq3hqx4cg6xlkvn3d0wn7v75y4si86lcaa"; -"uppunctlm-0.1"="1a71nsc5dnaa8gb4xmnlhvdsvid2h9gwmxr0xa8blh4xd0vwi2d9"; -"uppunctlm.doc-0.1"="0d1qs7krblmnf9r2afvzx5ir94aqgxv8p2d9sf9p18nlz9f5h06q"; -"urwchancal-1"="0hlaimb12imiv0h7khcaar4xi5dma11bqcrb2b6imd4srgg9b50g"; -"urwchancal.doc-1"="1mzfmfwny5mzag8wf1h3k4xbmbzphwqv6r74sql8wyqw53s337jf"; -"venturisadf-1.005"="0a80pz2ng6grjj97hgk277d25ijgc7swjjsr4rjbd1ljnfjdvf51"; -"venturisadf.doc-1.005"="1b50h04xl2nwlpclfxl7m1wnyl1ysf9d7p8jbahglnxaxxn8ib3r"; -"venturisadf.source-1.005"="07isrwhzw538w4asc5baw6wbfydzdrflrp3pk1qilq3a5wcj1n00"; -"wsuipa-25469"="1grz4s0zi7dlgbks7rx0h0rkjvchilhjabs59h81f92f835lafm4"; -"wsuipa.doc-25469"="1zw7ibbqc75k4hplbvqpdmnqg5ks9bw75mrwcg14q1rb1807sp8w"; -"xcharter-1.216"="1rfry7xnl1byh6f3r949xbvq00cmijmlblihhgsyy3bv5r4pvy4q"; -"xcharter.doc-1.216"="0q5yl9fqqh00jijmsrfh2bkrslz0qji02fxaxipsmsf4h5lm80g0"; -"xits-1.302"="0hnjyncrb0r9ssp6aj9lih23b0z031fjhc7fjjsjc89igbxb8v58"; -"xits.doc-1.302"="0iv1bs2i1fn0pr3gkz07xaqsdfw9idcyfdd6bzqjryynas25aia2"; -"yfonts-1.4"="1k7b78fr6x8kp6354viqfni3k77d96qmx9r76249m5j140hi6fk1"; -"yfonts.doc-1.4"="0a7fy4z790fr6q4z5qnzv578x48kqs128wl5znd5bn3mbg0n0cq0"; -"yfonts.source-1.4"="1ph8vc09vg0zxc9x1xydrm9wn6q5vml2bc3wln15v69p8nm52d7z"; -"yfonts-t1-1.0"="08fbdd97n2h649kvks6q03zrsjvb1f7qwys3955g6iznf4y8pyv6"; -"yfonts-t1.doc-1.0"="0h0gi1j5fcn1nkvf0abf2aimj2q3h6bw4rx7kzg5xra735fqpl4n"; -"yinit-otf-1.0"="1yjz72nixv6di0ifsimbnc34wlw6s8nqkwflkag2p75q0jw52qrg"; -"yinit-otf.doc-1.0"="15yjqa1s4zrpz8cj199ak9dgriys76q8iccspw3909g2ci4xyyfv"; -"zlmtt-1.02"="0ka4hx95138c3aarinsivmz13jfkbm4lyqcgza96cmwx3r3hs076"; -"zlmtt.doc-1.02"="034fjal61sy3f87cj0wx4z1qgiivdr1h84yn0s6ygfpdvxrrqd20"; -"avantgar-31835"="0zqa5rz9rzczpnifcq4rwj6ybvpl365371jnz65wvaq0l5zgnlip"; -"bookman-31835"="12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9"; -"charter-15878"="1z9145ri2g732bs4fb8i74gc0ymak33k7sclahln2bhdpxi286fm"; -"charter.doc-15878"="0gm9pwanxvzv0zmxq6pf54ygxaxvg56kh1ym6f5ij9akwvhf6nwb"; -"cm-super-15878"="0vpxkin8zvanasm0n6zzgmy7wssca6bm5yia2mjdi7nxzqyawlwr"; -"cm-super.doc-15878"="1ygbv3gwijyaaj8yzwxzsjqsfjdf52m3lm3f7rp1503d2wvq2qzx"; -"cmextra-57866"="00my52lh3cn8bn211fpn7373b7khaylx4fgkrd2m72xgaymil308"; -"courier-35058"="08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r"; -"euro-1.1"="02kkwf4psrmp7n5mqyrc3745kj82p3nxswad9x8rw1hd7a278y3n"; -"euro.doc-1.1"="1ajqx7axgqpmbq4kl2gmk97ibwbijqsq6z8ln71qla61j0mkgj32"; -"euro.source-1.1"="1hkzjy4vmvh06pk8bhkpz09ln5jygvyhwzyznqkrzffay3i89cll"; -"euro-ce-3.0b"="00ypq57ri9vkmc85c5l5qzq098has90qllm9lnv4jd73l1my7pmc"; -"euro-ce.doc-3.0b"="03pcwrjrjp74s2xl7pahpr76dls17x76xvhck9izgsr29j6kny4d"; -"eurosym-1.4-subrfix"="1bf4vwygyakr999k95ki53fykknizakz9npz2i1h3r5ci805l7z4"; -"eurosym.doc-1.4-subrfix"="0vmh23f3ksc3b3hym7iv7m8rsddk8vdbqr5ib49bjqylppvxrsnz"; -"fpl-1.003"="1jpbgs674zkjayx5xbg4ymnmygxcc15ysvr4cpz3abp333cqzjb4"; -"fpl.doc-1.003"="1860bzvxbajy3r5gpz6hwy0vib632fkdig2zcb51yy2qgg3vbal8"; -"fpl.source-1.003"="1fr7ydvn8ql0jhplkwxzrl5cppxbklg97nqb2rjigvmqqidjk0i3"; -"helvetic-31835"="0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl"; -"marvosym-2.2a"="14i2alqxpz0imgdlx03gyg2nn56wrhlc0rziyx93h4ya9nz6xzbl"; -"marvosym.doc-2.2a"="0qyfyz8qfcchnf78r71fp5p16hmsrq6xf54g5mnwjb4p5ipbd9np"; -"marvosym.source-2.2a"="0vbiq807pazw2c1ck799w8sy3q8wcpb6smmq5qqw4nqcxzwsxk78"; -"mathpazo-1.003"="05j5qgq8fralghp5wkx6bha1cm59vha29ppq96nllq2k2nqhpi3d"; -"mathpazo.doc-1.003"="1z76cb473nb6r0vjjxjwiymnk9wsf7pnycc3ad3ba4vd3yl1827g"; -"mathpazo.source-1.003"="0lmyc1q7jswlhlzz4fd6ia407jj4pzi7wvmrcgfyw20j2nghfcgp"; -"palatino-31835"="12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22"; -"ncntrsbk-31835"="0i6a48zbn9lg4pwbw8ya2wjjgppwac816fnbpmahm67kknx4d7ij"; -"pxfonts-15878"="0vkhx82ywv17rflmq119jxs3ib08rfw6lkjgr3mp9vf6vplgqzki"; -"pxfonts.doc-15878"="1afcy7c1n63zi5czbpnajrrgwfp9xdymkgwf5h9865adjbb3lm82"; -"rsfs-15878"="0q1iqlkq6swy905jh73y42ya9zb55xvg9w991x7lsmdxc0bzdf8z"; -"rsfs.doc-15878"="069cpd747d6bk7jmmn1im7jvfb00bd597l34p87vdjcwbk3bzfvh"; -"tex-gyre-2.501"="08578kyph2grc2ca9bdg6271iqpjyjg1qcrivfk5r27sq5c8cwf0"; -"tex-gyre.doc-2.501"="1i6383n8w3h7rjhdzhj0zc8xfd7ngmbqyvzcm0xibqpsdmzis4yy"; -"tex-gyre.source-2.501"="0f9gzhlawkpn4cg284n2sad05aary5pwyczi1qdgnvk9v8sbjax3"; -"tex-gyre-math-41264"="0vqg04im4s6k1sjfclrn855liilgayh5kca774aicifzjgsigs1d"; -"tex-gyre-math.doc-41264"="0s6s2bs6q2ar4y53fyckz104y8rbvz3msjvyb4sv2p4j6x0kwz4g"; -"tex-gyre-math.source-41264"="0vl9ggi62bn1cpnjmqanx62b6an5294375jg68gskg8fwi8j6gir"; -"times-35058"="13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0"; -"tipa-1.3"="1vax0padc42ks1b4rvl0ikfqmb5i04ii27k1711vfdbzmg87j217"; -"tipa.doc-1.3"="0wwnbarpvjcq8ibbn8sr0zqrlg3clplc9nyh46r5gsr06qgd1prf"; -"txfonts-15878"="1dfrd8dzrzj9y5qnz9c554xn2g9931slhj9ylan2i71k5asxmkiv"; -"txfonts.doc-15878"="13v5hhk0nzj38nfgyz9ijmz9gb9703izrgb617z274d744qwqx73"; -"utopia-15878"="1hsvl3la37nbb0b2q9995w1hlgvrc0gkyjkgqbsp99rk0ry392v6"; -"utopia.doc-15878"="0yyxzyg38z6kip43gxlj3j55rdabqjrzl33yp1z043rblfw5b9mc"; -"wasy-2.5"="1gvk9gdx32sm4q2f2k4i6yj45c6zyf0hjkq7r6ysygmd2zsvf9lh"; -"wasy.doc-2.5"="1ah93bb5gr4di1jbq316cm4d5iaijj4f06vcjj4x44jajirlaq6m"; -"wasy-type1-001.002"="1zkhqyh72q1w6lr94a7164myp5qfmj119qim58cal1h48n3wypcw"; -"wasy-type1.doc-001.002"="0rhkbkmn7xg044aw1cm44vbwiqfpcixpdpcdvz8yq6in8kmgs0lv"; -"wasysym-2.4"="1i8pvf5yfw5j0rkcpy6v8czvr85p1yk18c8h18iljgsdvfj786h7"; -"wasysym.doc-2.4"="07lhw9ss609gjlhv9f0bbyv3z327v3jqblfwhcspwg2sjvazzx8l"; -"wasysym.source-2.4"="1i7y0si6mbd6kxbbyvcfak46hrcf95xv8x6nc29nc6adqjbygkiw"; -"zapfchan-31835"="1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn"; -"accfonts-0.25"="10z7c7cgwm62dyzxfnj0jiy328zj3wccqjick37lz641vqifrd4v"; -"accfonts.doc-0.25"="17mbr2ydbkc4md6zd34km3d4s2vjmqzfwb2l01n4y30vjz2lzsn1"; -"afm2pl-54074"="1nbb9lcxqxj2aary7a65fai3hgj4nwzm690iy0xv62v580krdbck"; -"afm2pl.doc-54074"="0cp8il19l9sz997v9lcxkl6r94mnlnbj2lzdrffwd1fv63gkxc6x"; -"albatross-0.3.0"="1krqfxy24n96xzzrdq512mc78va4isi2xvhmvrzp3hisdvysbdk0"; -"albatross.doc-0.3.0"="0xvfa182yi2hjfxs80z6kmsn7lbg6nxqnc947y8p0kcbikzqbwc3"; -"albatross.source-0.3.0"="1599i51cdzqgcmshvghacflivqbxj1gxnbl9sr373nz60jsqj8sl"; -"dosepsbin-1.2"="0qknrackr7m0s431vrygphzrk99wkrgdp6kl04q7f4lsffq12k9r"; -"dosepsbin.doc-1.2"="1lhrlgyn9sg88052ib0jkwd88zvjpzqnz0ac5whl5gpr5zw2y2c3"; -"dosepsbin.source-1.2"="0lqmcndd5m4hxslvpq4r9g1bal12vfdsncfcii71glv45c2hl2x2"; -"dvipsconfig-1.6"="02vgk91y80ch4pkj83vbiz1b2ccigf152hm83p607y4n4qn2xzsf"; -"epstopdf-2.28"="11xw0f2hl64scpd14iicdq9z1gm3s1q16y6mbm6n9v07zhz4pv82"; -"epstopdf.doc-2.28"="1gjb9xl4kwqwcb26200xdz3gl5ghsdmv70cwzw1zd3aakhba00rl"; -"fontinst-1.933"="1jqhfib1ml33wq292x9ff03shyjrn2b3grw44cxzxndg4vq7mn1l"; -"fontinst.doc-1.933"="1ff19m49rawz7jlqi85nly05d9k8940ld94six21c1ik0v7cxn74"; -"fontinst.source-1.933"="133myqzr4xlp4a3pw8ld815mpl7l9y6rhz620ja77sv4fmci76v0"; -"fontware.doc-57972"="06n3am526l1g44db1pyjj0y3jj7792z4z0xd9crc8w7khqc0jmna"; -"lcdftypetools.doc-52851"="0yjbc6rsf8c62qa1lyi9kjyjy2p0xlps19llnvly3xyhla08j76f"; -"metatype1.source-0.56"="1nhbsn33w6zbzbvi3a32ng6ib5dbh0vll9g2c5ssiv1ysxqrg6yq"; -"mf2pt1-2.6"="0gqs7xg46iwnwsx4shsdl2zsac604nzi05gn3fnh978wi409kvrz"; -"mf2pt1.doc-2.6"="0sh0pkdi95yrg0s624dahn51ljli2aszh8np544alzzkdivhwr9a"; -"ps2eps-1.68"="0aifwqbw8r3i4db5pfj51nfjgbz6d8qjz4l2nc3zkl67g0kmhrf2"; -"ps2eps.doc-1.68"="1k731khcjkavaqfrh8pqyzc82b4x355rxri1s2m4ilnvizbwifx7"; -"ps2pk.doc-52851"="11jchhii2z34ikw0jaddg6kni13linnar4bwdrp6k9kl8zm0h2hq"; -"psutils-p17"="04xwjilc64d5zpbngcsr6c6gvm3857wf2hsyag32v8bk1pjag97f"; -"psutils.doc-p17"="0hb0bjnk53i2q5wkkcn4rkjbpvyv90d41ynxbgsk8hp2gli8b0zj"; -"t1utils.doc-57972"="0hdk57179nn57wnmvr3jasjavkvmrn6ryph6jvjhsfqprn7bhf1y"; -"ttfutils-57972"="188gcwglfgl7yi4026n9l3zkpgwx034vfr4damxpfr6n630rixw1"; -"ttfutils.doc-57972"="1y86pg5lxz5qk2bd2zhknxip1jwj9d3y84xmvg7ydxkbp8kimf5s"; -"aleph.doc-57972"="1ba94ifw2vny6d5cyvh71g98r01v1wswzn44mrjnh6d3q4vp02il"; -"lambda-45756"="1ajx5g5cd5s9jqr4b196689k7zmlxmhhksly88qps31s7lzaprvn"; -"antomega-0.8"="08if5plzpj7g8m1afhq8ci6m4yba4nnsgglngq94ka3ga8czfk6g"; -"antomega.doc-0.8"="1mrr1vqkyic5nyzyxkw7zq67yz4njx9x68cqr3vjd9d77qv85i00"; -"antomega.source-0.8"="0s0dzmb00hqbp71nhl94w0ns1dqj5fmfqw63z789iihqznyxkii0"; -"omega-33046"="047w29bij6g9k9fl7ymap4arhdmm9kvjfsikvjkf9nd7shd6k4kl"; -"omega.doc-33046"="0r686ck7z6vxcajrjihp4a4mh3z23xr8ic34dv9yp039dh0kbm71"; -"edmac-3.17"="0cvxirrcf7qxa1a6r4fzklqrmala7pdj9i8wywapy0anak8lpd9d"; -"edmac.doc-3.17"="1s33bml7f2lsfrj3fprpazjgjiyiblfcjr554fwq8aadsvgz2xxy"; -"edmac.source-3.17"="0hywrvvxaqb52hd29r0dkixj9fcczhr8b1rj6wxj3wcgdcbfhlm0"; -"eplain-3.11"="0gxqyf4v9d18qk1bgg8g0gajkwz9wx0pj7a627lgbgack0wk4ghv"; -"eplain.doc-3.11"="0mgrscj49zqq97xkg0yqis9afhcagra0vsmdycwp2fbz6fhizxfl"; -"eplain.source-3.11"="0y86s9spkyqqidwjs55q1vwhkmxb7zgnfpqri0rwdyl6rln7ckfi"; -"jadetex-3.13"="0gsmhql8p421dyyv1b021sv0hsnl2y4m8wj3vkcabhpiql76yfyf"; -"jadetex.doc-3.13"="18ljn0p607hm9655v6z6xs2apkai20l2mlxwyb2asqa72s6x79yb"; -"jadetex.source-3.13"="0vrqpjn64qlyszf7d2vwkbd1y2lj5lld6w9zz1jqz1f0arhq33lj"; -"cyrillic-47350"="0p9fbfxgkb0pcxs0rp6bcj6j51m820a772b199w5zcg2w1dfn4a4"; -"cyrillic.doc-47350"="0k8sz5blks5l6xbffw69kg0dql04jya14q0q9kkrkjb2ccp5dj8m"; -"cyrillic.source-47350"="1fy9cyi79z4naijng1pccxa4wrrgrfsvfinmy9hflcz9c40fk6am"; -"cyrillic-bin-53559"="1m8ci739229igk1mgx2n5dqywijfs2dxafjxsmlpdyafj2vbryaw"; -"cyrillic-bin.doc-53559"="1clxm22f85q7qqkcdbij2kihiifin6wis4b71ba53xlbx2x89b81"; -"passivetex-15878"="1h49v6sqbm27isfwwcql9dzxn4vmcn2algkqh7f1pzj860xw3ygn"; -"ulem-53365"="0v6p4hj3hij0qvq7vpsbnk11rhwwlx80p3g575jy4sn2vfw5zzsm"; -"ulem.doc-53365"="18ny9kfv3w2ag97czcj2gaqqy1gj2f7rd8r72vd7wsdihgqd5wzb"; -"lollipop-1.07"="170q59wqy0x5zhziaycmfglv1wnc5kf252ni1r4vgrrs3rlwiirr"; -"lollipop.doc-1.07"="1wj858kqp27amx3jpndsqma152r40agfymh9ah8s42pn6kfl4dkq"; -"mltex-2.2"="0j5282big4df396xvk2xaasl7cwnjn2sa14xj22xgzvrz3hr4dvj"; -"mltex.doc-2.2"="13c7a99jl0y75nkciir5zqdiz8dgjl8znbyrb485xrwlkzm6ygq2"; -"mxedruli-3.3c"="0xyp3zxzd55h0m201a189rj9h7js6ky3vzikb4yaa7z8hwsad7hz"; -"mxedruli.doc-3.3c"="0ydh0292i72lb9vcglwq0pl734qgrh9sqdy7qvdds6a84jwc5w7a"; -"omegaware.doc-57972"="1wjxih538kp4pdj770pw590041xrnbb1vwsyh93rm8fbc2kqr19d"; -"otibet-45777"="0fg3gc7614r1b304g78ipq6d84bml2q4mvl2yc49jjnz13nr05js"; -"otibet.doc-45777"="07l6475b8z98pkmn5labv4i4q6g92lh5bdsdqcwd28v5y1jizhmy"; -"otibet.source-45777"="0lfwadx3a1ni2k91dpzsdh297j3viq5dazaz78acb879lgz61ik5"; -"psizzl-0.35"="0pzbip08246id09mm0chi0gjjgdc7yzj0bd7q8qh5yfdbhjn8yc8"; -"psizzl.doc-0.35"="03slfkyrb0pil00n55n6yp5vxxxl8adjbxxmg1c2zl261lci107v"; -"psizzl.source-0.35"="1h2hrjxc3ck75cigh82rmi3558dmpliwxzzsaabb178bh76m2n3a"; -"startex-1.04"="1d6c54hm9jdi882srj87drkcxm7lldb4g60lbic9wwzn9kpa0ynk"; -"startex.doc-1.04"="0ikmb30ndmj0yhzxy9mba3kqxdc5f8i66sji51ihjcrlplj3jk73"; -"startex.source-1.04"="0304dzv4nzlcqi5k1gbfnx823xaxq84ja4gwh7qg941q152y7w9n"; -"texsis-2.18"="08sn35x8wab41mdv67ra3hahrsf4v4brp9n5z0l4bk3k27rl4q0m"; -"texsis.doc-2.18"="1bgngwqj3kkr196sp8i59yrkqpambijr4a54jfrgxb6595hiadsj"; -"xmltex-0.8"="06rhg0mgxsv4061w8k6parag7fkhrja81aj900mi65bdwmxqxxql"; -"xmltex.doc-0.8"="0zjaf8nvsid88nrvzgprwjcm6nirs6glyy25xws57fa9yhza8di2"; -"xmltexconfig-45845"="0drgvmn27snq43kjkpg5k4igkcdi56p1q3fwkrv3ivsiqfp6cdz3"; -"bartel-chess-fonts-20619"="0xd51ighrn01kwb4n20dsvrjhh7a0y31py2mfl1dq34v8l6yvn9l"; -"bartel-chess-fonts.doc-20619"="1sjwli00iffizzwaiszwyd42aya7c4vz5as8k21lmk054x9afjpc"; -"chess-1.2"="0r1danvrc979bbpcka5fdbnmxwiv54inxyd4rcsjkz6z03srbwvg"; -"chess.doc-1.2"="0h6zcs8g6gg4fq0sp2s6gihbyrs9kkvrbqr6pdpb7j3fkb2jr9m2"; -"chess-problem-diagrams-1.15"="19zdm4wzwcvsxqldvjhydk6fxh6gh4iycvwnvnlx72wqzn602z1r"; -"chess-problem-diagrams.doc-1.15"="0aldvbjgjs1i55lmnhgh03i266cwlh82w1h9aynw7m8aa6k1pc23"; -"chess-problem-diagrams.source-1.15"="03r2s0y6rlj3inq07jmgwsf7ylv1h7i6ynjikp20rwl7ngch85j4"; -"chessboard-1.9"="119dsa2mjv5kjw15349bjjz2xacnd82szwdb4m1hjqb3pkc8053c"; -"chessboard.doc-1.9"="0gny7vq5cm7ibvw8fjnpbysqs81bf2s8nvjhs56qq3j7yg7ljapk"; -"chessboard.source-1.9"="05wcy7c9arj8w9zsflr3byy31p0nl8g6i78bbkvw38rl9azpj20l"; -"chessfss-1.2a"="1bi0lzxr3lr8nbrxj8189ycadm16l66isgslqjh1mfqyggz65gkz"; -"chessfss.doc-1.2a"="1xrdlw5z6dal81pdkhx8lwg18fzyfy1v4agq93bw09i94045cvih"; -"chessfss.source-1.2a"="0ryd536x30rv71pqvji805f9fm8ix6g6b5jravshrrksk9q8qw9j"; -"crossword-1.10"="1dk5c9x2nriphmnps7srd8my1g6103japkbdvfi2afkic5q4ird9"; -"crossword.doc-1.10"="0y4vxlyf9dk86kfrqwgvdh7diwkgi2jhbq9cwyhv1vvxd5rl8ipx"; -"crossword.source-1.10"="0ygclxr774akkp6601vxs0pbqq4yiclvwmxj653bjcgn4ib057lg"; -"crosswrd-3.0"="1c85733q3x56s1fvag4kw39r6lnx4hr1wmhsrjs0jnyf5j6lf38w"; -"crosswrd.doc-3.0"="1abqbdfk7c7cx1ij56q8dhz87bc8ppb3hkfmc2z5r6zv94l34n2i"; -"crosswrd.source-3.0"="16didvmnjfbd103skc6i9qbim4kav9vw76954yfqijz1q74c880s"; -"egameps-1.1"="0y6naagmi9qii1k4qcp4svczxy5vbramd9wg1ixr8xckp806kn58"; -"egameps.doc-1.1"="0i36znlwls01ch6kns5ikw90nbq68pn71gpvfizf0x9ipymqwisl"; -"gamebook-1.0"="0ccsyi63paf40lxphmb60k5xciw8v7vd1hqllgq84mry7igzb9np"; -"gamebook.doc-1.0"="1c2m4009fralq8ahhczwfxhh1cmsdh0c5072yrirda46khd5wy91"; -"gamebook.source-1.0"="1dk3fpg5038jv5bs7c2f82vll0bdd7c1jrajwhlfk1v16p2f5i1c"; -"go-28628"="0lqgz9r0vxjbq1nyg77zjfsglwbd44zdpwz56smalb6lp2ra3r5z"; -"go.doc-28628"="1mf49wywa32chr8q4c0s4fdkmzd88a1fj3hxcf3zx7bnsi5r4gl9"; -"go.source-28628"="0vslzmpj94qlh5g2jirwj8b4w93vx33j8xdadyc32s6b9rrdwnyl"; -"hanoi-20120101"="09a7cv76naxzdach5507wdqnjp12amvlia7kw0jh224ydmkzfx9x"; -"havannah-36348"="0zdbwl36d8a374yhaqfb4f3561ncch10v0vh7nxj22f267lgl2n3"; -"havannah.doc-36348"="1pkkslz2f66j606j44rq32dp9qhfqcr959wrp8j9xgkw76i9lprh"; -"havannah.source-36348"="0gyndaw2g2j2j22njn32839mihqx3pl7sij35vhsyahyamnipk2h"; -"hexgame-1.0"="0s68961p0dsaila2a3symqswvgdhh4ah08aphqjfs7licn50yy4d"; -"hexgame.doc-1.0"="1bfrm8mz98l8nrxgnvp8q54pr09ixm81wy1ds1ww4syczpw7jypm"; -"hmtrump-1.2a"="13pq5h9pwnp8hynsc35ib8wzblh3y4gx2lmrrvd0big80wwsdhsm"; -"hmtrump.doc-1.2a"="1bzgqgrjlpskqydqdj26lsn55pkznmbbiq0w4ybr9r0djdmqbn1a"; -"horoscop-1.01"="02kazmk5sa40x0a4zb30gk9lkky0ak825gczbr5z8wchwpy4i1ac"; -"horoscop.doc-1.01"="0w9sgk2j1fzkcfzn76zpygrlyi9fnimp92mygsq2z6rpblzd1qyv"; -"horoscop.source-1.01"="0c6zkcb2057y9x7mz4q3nwin8h8ax71yaam21m91gk6ad9k8l4ij"; -"jigsaw-0.1a"="1ikkihqdpcsxca0hr57jsa9kwbf3b28w4zpgf12dj3achv4jshrn"; -"jigsaw.doc-0.1a"="1vr3qhzvl4hs9jz36lx5n3a5wx2vdhkj83y232jf7vg3i622mjr6"; -"labyrinth-1.0"="1r5za0nrvcpmx7bbnvvxf4l78pv4ciq83ck9k9qh32pawv5jn8sp"; -"labyrinth.doc-1.0"="14405x5dcm2k4m74jjhwd3f1836d79qz3w9m1zfj3gnvzx2kij9w"; -"logicpuzzle-2.5"="0zsg11lw5x28sik6ifj2v1zjvm3pcv4vf7w2pfxcr395vmw33qm9"; -"logicpuzzle.doc-2.5"="08vgi2s2cy09dhqdmvmq1ijlw83dgjd7xjfdhj28vm9ny16zmydz"; -"musikui-1"="0z2ya761bf0n7l45dqkc626s9d66qwr810fnwf34lr1876y3sfyi"; -"musikui.doc-1"="09sdb98m3j5wkl4p7hdpdrnrr0l25ni46nlhkhg1g54hdggcpjb9"; -"nimsticks-1.1"="090gx9753q9cc9kr973yjsbq3g1bli0qigsw4k2n0a3wb9392frm"; -"nimsticks.doc-1.1"="0s36pkz37qwjrmfw1sykwz9nf7z91jdmfvllgzaymz745ssh42bz"; -"nimsticks.source-1.1"="12xvmydh6p79xjfyv67bnkiqi0qcgk2xwby6ysw06nrn6r4y37qh"; -"onedown-1.4"="1arb5vsppgnfv1802m0iqv5y5vwljg8pfwr1pxmgkaff0vc34m2r"; -"onedown.doc-1.4"="0xgkcmllgxbncd49yl956pah6cl8rbbn74870rpnvxg6h36n0f90"; -"onedown.source-1.4"="114h8a0hfv9awf1l5lan5nkbiipvhkwhxpyf3jxsis47frma4wrb"; -"othello-15878"="17y68qzxifgnh8k1q6qfn97ka7703ac8nqk62ridn1wbxc6fb80r"; -"othello.doc-15878"="022pv02lvlphl8168rrcdzk6w7d9wd52riybfvvy537ifwp7kqr9"; -"othelloboard-1.2"="00cybd6dg10bwl2k87i2lj9jq1nmq4jc9v4qhjwqij5zv0l5yz4v"; -"othelloboard.doc-1.2"="0g5k2q33r726xyj1mp08qmyb4xdihiyzsm52mgbdn95iz08b2989"; -"pas-crosswords-1.03"="0nq8wqxrsgpdnmi2yqcs45mb93gp2lad6p0b6ifqr744hycq4njm"; -"pas-crosswords.doc-1.03"="154ifvbrx2z4ig8k00agjsgpsplrjlf8glcxipbgai9wqf82i2k5"; -"psgo-0.17"="18h614dasdg19jnwwl5swih2dxp4wis66fkscq8jjmpvjnckpck2"; -"psgo.doc-0.17"="0naza2kxcgm9wdcyibs36qnwwgwpsbj2m9qkk3l9d54kml3wiznp"; -"realtranspose-1.1"="1m3gmj9bay3a1b7fidjs6rs2077m7csaszz11g6y5i2sjpjyx2aa"; -"realtranspose.doc-1.1"="08w4ad33pycaaiwhrnmx3sfx2c6kv417ijhqgxdsja1mrhcp0nxw"; -"realtranspose.source-1.1"="0s4lbg2jg5fa4x8f9cnp5zcb4yi92g4981dwdksqsilcd0in4ksh"; -"reverxii.doc-24976"="15bfdyvyzh5ynnx16bwr401bw6dbsl60rh40f8l1wgnbh93cdpy3"; -"rubik-5.0"="03qnnbqas5qrf6jmj90kgdn9kkliq8ap70z2b9jyr4rzq8m19ryw"; -"rubik.doc-5.0"="16jzhkbh8m8v8cb0jyifhz6dcdn0sxzi898dcyjrvf245zfwk618"; -"rubik.source-5.0"="1cnkay6vn88p5l5jzhf5lzzfd39p7pbmz9psc814jvlpqlzx90fy"; -"schwalbe-chess-2.7"="08fgxr8f37hl9773m3920876nys1xdp6b84kbmsqhrbw35g49f50"; -"schwalbe-chess.doc-2.7"="18vqhcicndhyaxgndd098h9imwcz16wc6yj6jjn9mg4xip36p94b"; -"schwalbe-chess.source-2.7"="130d6m37x08fphq4qf3jjnsad43jrr3s8735n71gm4ivazas8px6"; -"sgame-2.15"="1axbv7ss7nh6nj6dzs4v0g6lqccm8vyvpc4qfv2aqij37qlyv23y"; -"sgame.doc-2.15"="0nj8n049lmin4j90an75p9bqillwx7wgpvxdm0jb1janfip4r5qj"; -"skak-1.5.3"="1lh97kc1hmz3ybb67zr7vr74z1zngwl2cppkhmp9cagm48j24am1"; -"skak.doc-1.5.3"="0abiardppn7hx6l5h4zh92b9m2yf3w16y15rcvsspv1cb9sf4lfw"; -"skaknew-20031"="14j42hifh60p6glfp24c2f5k9k34vcm0l3alqfqhvv68l31i05rx"; -"skaknew.doc-20031"="0i144akq7sgs6kwayl8c2yir0kc7czjs49vj6l5lwdcwbyryhh21"; -"soup-1.0.2"="00glliinyi7m5m6gkr0szzsp5drgnqww4k50yfb6p3qv1mlkqgvi"; -"soup.doc-1.0.2"="0470i396sk8a6lnx189zcazns280qgyw3yvwiyxc1gs2wd812qr1"; -"soup.source-1.0.2"="09db050wsnmpqxmba7w23h3g92xyzg0sqv57yhns5nwxb2cmbr2g"; -"sudoku-1.0"="1nyh5rv8fgs0lgmsjgkfx24s3lh8pph6jcp7dx8nb8q2ij8ia4pi"; -"sudoku.doc-1.0"="0hdvzb1vcrlbis4xsgzdnbidapqp7kdaqdskdha5szjw53xz77ys"; -"sudoku.source-1.0"="1rwwqpqvmwvq26ycj2glk0k4m1vlbjrxjp0l20qnh5vad98a1x7p"; -"sudokubundle-1.0a"="18y4x1g050ircqh3nd95m45scb8zgjzi03cj3n7whn207dvapsdw"; -"sudokubundle.doc-1.0a"="17mdxysiwjp3ii1qhknrxw07dcds57qbm986583xh69bhq08c4sr"; -"sudokubundle.source-1.0a"="17g96rhis66gvgbm1857ck4ri8nz3isdlqshfx9rdbpgs8x58i0h"; -"xq-0.4"="165zyviwxybpgfx9ycngv9nml482faz766q1skgmligx05qzkhyl"; -"xq.doc-0.4"="01yhk07lrcbl7ppkqvks5j7wjpwyy0zc69q46wh42gbp65vp24a4"; -"xskak-1.5"="1hirv11b76xl7jx4swpa7imhjncfn81i9qc118qfrn26n890dgr4"; -"xskak.doc-1.5"="0hzyv8gy91avmpf2fgjwpqfkkbi8255gy86xzn5cz3y948l3m5vl"; -"xskak.source-1.5"="1gw6xqbpcsgdi5s7d239j0ds18w674z4zfibsvbgqjb70lixnyv6"; -"adtrees-1.1"="1j38apxxk3klabxrm9kpdf6zbmiqb17is5yqgg1a4576n8paqg4y"; -"adtrees.doc-1.1"="1851rqb9gs1wf8wl8f7pqbnxgpikzxzw1n5mg5w0kcwd889g17yc"; -"bibleref-1.25"="0ds1a91dm11y93dy46gflzgdx5rgzzm8j50q2aghbhfiqmb4vx83"; -"bibleref.doc-1.25"="18zif1ciynp47z8hbhc2p6r8jiqisj46as052scb5q6p49fc1ibb"; -"bibleref.source-1.25"="11brqv3pgzzk3j09z6ps6ggwsqm89y82s3cl6xldnyvx2ngc5ym8"; -"bibleref-lds-1.0"="18x44jyar9dnfmw4a5ijhfipscydqj2hybl79ngw1b88k9iq2wxb"; -"bibleref-lds.doc-1.0"="0yr2kwzbfbak1c5x202w8jpgr3y6fq63vkjngb0k2y5ivmjs636p"; -"bibleref-lds.source-1.0"="008hvab2f0xw9bg4ry74g19bfsrhp5ync4ilpya2h79smrwp5xra"; -"bibleref-mouth-1.0"="11x3ldyg77xzpx8yl27sxn6x5gb3jdngd5hgm42p8ac0x57x7ymz"; -"bibleref-mouth.doc-1.0"="0vrpyl0s13sw0hi9s14qamzk69c2vxwjy0zzafzmlfd0pzxhmx28"; -"bibleref-mouth.source-1.0"="1mdhq4qchr8gvdalf3rgns43b2lhniyp9d5lm3c9dnnlaim59hsv"; -"bibleref-parse-1.1"="0xa6nkbydiczmhphdi3rpipiva94x2pwmqgqcwmr6a66y1gk0d1x"; -"bibleref-parse.doc-1.1"="1mn4hyfyialzmzm0syizq1vps07z4zxd853v3aljn6zwqcwfpkxs"; -"covington-2.5"="0vad21mlpf4r0hn3010fg2bmvrhambkrlkiww0cc7n2wby4l9bnf"; -"covington.doc-2.5"="0kpxk5kgpg03bj5f8jpnfzpbkczffq9l7z1pfzw5q14sd2bbl8bp"; -"diadia-1.1"="0gygfg9vs4gbp3r0h9v6dqc18np331c0hjfmc5rbh29i74jcm8jh"; -"diadia.doc-1.1"="0bm0sb3fjj73mcdmrsvan9pdla2ki7j1wwpjpc4kpfc116a9lzy2"; -"dramatist-1.2e"="0zrkdhvx7f1261r5b2d08bd6a3pzldvpi69iym5k6f79ziz0602q"; -"dramatist.doc-1.2e"="0vwk6zfvf89773bwcxnpsd8crbkmq4lr6hksp4dn0hn6rf4smyyf"; -"dramatist.source-1.2e"="1xy8fm9h9qgjna6z5gz28rj0cq65wpxpxcs4vsfr4vr1p3vmig05"; -"dvgloss-0.1"="0fgc0i7cn0kd4f682xny0968l220ypam3z33mwac6ifqaaqbiy9d"; -"dvgloss.doc-0.1"="0l467jcanablvj95l0sbdib6dblc6ns2jcbg41kv0nxpah2i5ms8"; -"dvgloss.source-0.1"="0b106p2a8xr3c0vxwx3j0qmxh2z842h5x1z22509jabry3sf1y98"; -"ecltree-1.1a"="170bf0i0g2fnmmv9qh0jrdv7xn2xd5xmsw8dpvw8rbxfmn94l52b"; -"ecltree.doc-1.1a"="016hlxjhfzn2pgcpxi7hw0wnfd25idp70jvig7p8614pvkv3bsby"; -"edfnotes-0.6b"="0aljhm0wiks5v2s9qkwbp0ma8p6230ahsyr38w9akwy4j9ziiq75"; -"edfnotes.doc-0.6b"="1260dir3aba5wv12a4xidx6ld0vizl7n9m7agwrkmbanpzcqscf4"; -"edfnotes.source-0.6b"="0wm2hynpa4xk464rl5ikxdh5p71mp2cwzac2xl582q8fik7vjx0s"; -"ednotes-1.3a"="1kk0n2hdbi9cz8ag0v3g0a4w70ccjwlmgj2sqjmpv8yr8j9i7zz5"; -"ednotes.doc-1.3a"="1z0wpmq9rxx3zp0m5i934cpkcfipr0qx8iyk4gj8cb67ind1kxh2"; -"ncctools-3.5.3"="14wam15z6jdl97dxibf789ji0mk59mn96fn5x0vns63d8y65fh6y"; -"ncctools.doc-3.5.3"="1j5j6zsawp9i62kwb8xxzxsvh0qczx6qd1ppq38nlha3cj8k2rfw"; -"ncctools.source-3.5.3"="15anl5wwds08h2msz7m0a11xlcqdqgqpihvcrmy41kdzgnzgc56b"; -"eledform-1.1a"="04sd6m6ay9iav3scf72i6id726gn12qgv19hbaav7dvbkx73s10c"; -"eledform.doc-1.1a"="0f8inf12l7f8cg51adr269qs9zc0imsk9g08zh793aarvrpfh4gm"; -"eledform.source-1.1a"="13phf594kj5a9ql14wvd7pzi3vcrwg61lmc4fb7079j2xpx7drmk"; -"eledmac-1.24.12"="01is22hyay4xl1bp58g08kn99478fz5l22xdlbaqyr5yg0k4rgmc"; -"eledmac.doc-1.24.12"="0x2h38mlixff4yacqrvz7k4q57cwigal3x10f3k4qdr91q9frd24"; -"eledmac.source-1.24.12"="00pkybywz4j1qcki9gv9mfxqvm6q3m60b4lj2ms44c4mric77wk7"; -"expex-5.1b"="1vdbsxn85gkg24rx3qhkwcc658zjyhkymfspysxkxmmb8rn42y8n"; -"expex.doc-5.1b"="1mgq1knfx1lf0vr32wa2r6v0sr49m0xjnsdy0y42zngfi1mizp20"; -"gb4e-19216"="1mi8nwxa418wqp9w64ya1i0ag0pdm4cx08fkmaa302bkhym92bal"; -"gb4e.doc-19216"="0nzmhjqdhl0x29c70iqb8b96pjnx2vm94nk3xgid942pmx44skxb"; -"gmverse-0.73"="06v5fxz15byps13vm1afrpx365nfmq57200gspqpdch2sji2n4k2"; -"gmverse.doc-0.73"="1f8hccasv9f1wbjn7cjkwa2z9rwn8lwkv657i8n533ccjk6s5xvy"; -"jura-4.3"="1mmdx5zjrsrvh90kkdgigddvb4ih3cflygv70al0jy0mpm6iwha5"; -"jura.doc-4.3"="0zy4rafc7lhdb4gig1y53fsmk6faa2zh3s7b1la7z7qdw7s2gyai"; -"jura.source-4.3"="036ac5chvg67hdj8g82nra7p5jickwq041jixbprf080i0mywvdp"; -"juraabbrev-15878"="1rla1p46nb04flc2grrh1j0wvwk84cd2h1v767xzg2rdsinaxw68"; -"juraabbrev.doc-15878"="1708lfrryhlj2d3in4gvhfl8c6yvhhgi0lb3yz63h0n7flsb4a6m"; -"juraabbrev.source-15878"="0i5xhmx4j6ry4plcgdn8sc9vvbai9vzk9jr0mc54dhqaby2slyxa"; -"juramisc-0.91"="00dkagnyz7xrkn1kdzb7612qsdc00h2mkkhfv2xnw1fhrcsy11gf"; -"juramisc.doc-0.91"="02prrfg5vvy5d9y45hjx877438r8syymjj9q8465c3y3jn4ka9fc"; -"jurarsp-0.52"="0ylww99b12splqpkci2hps4zzi4myfy0agxzz4m3s8q74h4bqj32"; -"jurarsp.doc-0.52"="08bvr93ax4p00lmjkhy09bfm403lmzhq729gjjw6skla4wbvkmci"; -"jurarsp.source-0.52"="0fdxnj42qk4cywsxj8x40bfrkp0yqm7qh54jp3qf79gkj4hj6yp7"; -"ledmac-0.19.4"="0ipf7h58bylrfwg8yzarqvpkl0kr4k3z9hl6cjzxwlh16s5fs76i"; -"ledmac.doc-0.19.4"="0pgkv08nsq0rmcpck9vq1hfb4gnfqh274hclq4grk182fpn4ggiv"; -"ledmac.source-0.19.4"="07fl3lypnxz7sa4kjf3xllwqakhrwgx8z8r7l6x8id96n48zri9n"; -"lexikon-1.0c"="0ql4hzzf94v0pxr0jma4bnkgh73napz4np2zd1jhfsf55sm3axzd"; -"lexikon.doc-1.0c"="0fbz7v6a5pw20p22vyx1mjdr4z39wgf902ph9f9nwawxwsl24v9a"; -"lexref-1.1a"="1whic6s54279zypip228xyw7da5iq8p7lw090z71d8nywjsgllqm"; -"lexref.doc-1.1a"="1vqygg7hqn64d3dxj1sj4nj37k3w7y8r23d8l8x0lb909y285jpl"; -"ling-macros-42268"="1qr7bpa2wcp1hqx3ckid8h41lp8idhqqnnbdv42j2nhcy6f409wf"; -"ling-macros.doc-42268"="0lk4whkamzsf9mriiz06ynpp962w5473ppf4n36q3bb13amyp5vk"; -"linguex-4.3"="16rqzqipzng4xd7yz3i6416231cfphqbwq8n6pfal83awzd660jk"; -"linguex.doc-4.3"="1l0m6k9adq0zr88zbqrj4jl286mwarr6fiy4181bwxm9w9kkxs04"; -"liturg-1.0"="11l8ccpq2mcnpsfxry6zzjihj3s7s76p9plh7afprd7j2nnq1a79"; -"liturg.doc-1.0"="0rhyz3162nzh43nrxwkynr45i4w5pqb5ip53x5j2k2a4cb4k1z86"; -"liturg.source-1.0"="1hn89rf3xi66bfc3kzwbvllfzrxr62gx60ywbh8gkrw813n18lll"; -"metrix-1.5"="11hcw66f3r4rvxy8h0znwgrdvlfvibc6j73pcdb3bvyywb3774gz"; -"metrix.doc-1.5"="0hx74wi8vf57ly8yrzdq6x5qm8l5gi9km4v0ma66i5v40i9jwgcf"; -"metrix.source-1.5"="0i0xzmhqbs91qpznbanlhrnqvgxc45llk0wwb4mfcvmj622d47bp"; -"nnext-0.0"="0vf53wnrjday1q3hrplqklfp5kg57ibyjiijqw0jc074gzhyw0z7"; -"nnext.doc-0.0"="1rxxrnm8vb274c9l6lki1bxd6pij92klryigd40wwwwxzh8fc10r"; -"nnext.source-0.0"="1w3p9ig1jivwyy9rlbzfgcy82h3wlj2ig3rdlaq9k9fx8vd6znah"; -"parallel-15878"="0hja3k53n8v8qzj1vym1j2b4pj7hqszda82s83kw1v5av6kcy4da"; -"parallel.doc-15878"="1i0ls71ib0l3igd52cgn5z0cjz0j17hsj0qc5y4sqg2nvivvw7gy"; -"parallel.source-15878"="1slmdxldvxrvf61aa1b7m09cxpv6jsaw5lvbgqsby6jvgfp4r4g8"; -"parrun-15878"="08cbzlfy5cfkxpgr4igv3282k1dx9bsvsjfdi8b5dhl2gacg4i7a"; -"parrun.doc-15878"="0wvbmjzi8jwx5gdg8zgb4p3gz8v8rfp2hw67q0rm5f9rkza1a3ds"; -"parrun.source-15878"="0d79vvc4j1sysbpy1qdqwd27fai14820z0hqkkd6hrxzq39x6xza"; -"phonrule-1.3.2"="0xv49vfvlfjad65gngbk5022vcdi0w86mzqk60nbz3i8npvncplf"; -"phonrule.doc-1.3.2"="15bgpzfxjm22f4vqq9nbjhldvxzflrpayv51g383nr41j3k4m3xx"; -"plari-15878"="0jybi5dvl6ksjpgfqfrdnx5q25gl5xgqhwax4dk1shf6rbafkgyg"; -"plari.doc-15878"="1js29imppwx2jny1hcvjbkz7cc9qrafgniy9qd11bvjyp3n1vly8"; -"plari.source-15878"="0br0vm2ncrdyqgazdr2p1kvgl6lq124b8h82245jc8yz7mnrz2nw"; -"play-15878"="0gs6iibb9jkmynhvwldwrh8rvalayv8vk8ziyx9qyqsdsgh53bz1"; -"play.doc-15878"="1dvi29x0fdnb83bkqfsv6l2jp9rvvnqpf1paznx9pli8gvgwa1rz"; -"play.source-15878"="0nlyi6ra8v3pgk5lhhvar848mcd5zqbnc6mbqnbxsj409jczd0rw"; -"poemscol-3.1415926"="1k1vq2hki8jq70d0lmw9sbzwhp7mi5sx735wkrz9046xd0qmhq7w"; -"poemscol.doc-3.1415926"="1cdbv1ls20p764vkllgw710fm4v8nbkw8ryw2546lqa21v9ki4sx"; -"poemscol.source-3.1415926"="1l6zsi6x6akb4z37iyllg99schd90bny8r3pz8vddqjyacnf1j7q"; -"poetry-2.2"="1z36zzm75zidsb8zixmsdgngvg1gyasxdz4lcw4ikdwvjmswqzqr"; -"poetry.doc-2.2"="03cal4780m1r6i1g86d2gil5h6n0h8dkiv8phfjcp890y9vdw2y3"; -"poetry.source-2.2"="0y93c9fvjhfs70qvnk9ff7hwq7zyq8hw8h65bwgr3f26b6skfxyj"; -"poetrytex-3.0.1"="06h9aqwryssmzkagr5af598ic2rr5j0m5h5mwaw3ssrxwry86mxz"; -"poetrytex.doc-3.0.1"="07jkb5z8sdc8gp3j2fls8hcqrh5g67wimb0nfmmz5287why1br3w"; -"poetrytex.source-3.0.1"="02x9gadfnianaq3hjrhllrql20p1aa81jv8lc033qj47wml9fajd"; -"qobitree-15878"="0irdc2w96ad7mkgm6jqwia7lk1x4557fm60l98mc6kpd3a9djzgc"; -"qobitree.doc-15878"="001w9a4kxbrx11298gnvjamx8c6plag1gp5b7x9vq35s25kdy0i8"; -"qtree-3.1b"="10a9v90yspc1pq3ja9bzixdq6wxl6q4jxz5na7x9yw9g44z3xaf3"; -"qtree.doc-3.1b"="0ja3xpng871h96q220nrlq2iypk2spjs4qr5vpmri89b5nvngf6m"; -"reledmac-2.37.2"="0lvyd8kag3qmwpvf4ya6np2j71mjl11a3plavcpvsj9zgcmdmpy4"; -"reledmac.doc-2.37.2"="16d2brl9dqv9v88x81xc3lx0a9g84222xz4vayjggppcv2cydm3c"; -"reledmac.source-2.37.2"="1y2i6sn1hjjdw997axbcf5w5368hrc6nc9hrc9macgc5bpal1kki"; -"rrgtrees-1.1"="0jihs23929pzbgpgnb2v9i16fcil9kxkggdv1dvg6xq9f2fh21md"; -"rrgtrees.doc-1.1"="1skw79hvvh0xkjff4bfl0nqdd8znwhhwpdx33v8ns43xxamzmnwy"; -"rrgtrees.source-1.1"="1q7y5mbvnrykrp87kljcxw7zdglh08cqz92iahdsaac4xffnz6bc"; -"rtklage-15878"="0wrvj1d1dmdff3kqph59jbyg22gvz3bhpnyvjd7ih7vzfi4b8861"; -"rtklage.doc-15878"="0nc926q2arbszwsq88dd96spaj5xzkrfng34m84x0l8wbiidbvlh"; -"screenplay-1.6"="14p99gph5jvm0h9x8irh0c4mxb7q4208j5q0d8pd1dpmlvxvzsh8"; -"screenplay.doc-1.6"="18i460n3p05mx325nh7br1fl3i1lfviy7jgl24yc5hwqyx3wwdpk"; -"screenplay.source-1.6"="1fdw0bpf4q294yqnc4svbpyiza9bq7x2m0x5rc0x709c1wylqsyr"; -"screenplay-pkg-1.1"="1xzwvnf16djzsif7ff8b51dq98h2844nzkj2f9y6c75g6rhnyls1"; -"screenplay-pkg.doc-1.1"="0hkxa7gz3sammjdvglvafwczn54m6vcywz6rwqng8qa2hlvb2c3k"; -"sides-15878"="11anl2mfkzkdv5qb0rfw7940z7hy5i43d8hh9nsvzgwfsw0x1qkr"; -"sides.doc-15878"="0gsqb1hzhy1qk29lhq57arzivkwxw1achz08ms1q8q9vxwcsf0sz"; -"stage-1.01"="0i2nq4mxbwlp474iglwyixxs8aac6wwxzaa16i698vy5v0840bz4"; -"stage.doc-1.01"="18v7j7likkwkhwsccvarp9sjg8y7insgpngy765w56zdzw2r5m66"; -"stage.source-1.01"="10ln9mp7rf8z7xg0f7hrssns6kb5psf59r5vbb05xxn68h90j9cy"; -"textglos-1.0"="08932gszahdc5q6pckg9q8bdxs39gacjw9cljjlvghs8vn7jjwjj"; -"textglos.doc-1.0"="1c88my4j07b7ihn07bcii9xxckdv04g3c6jycm0ffhjffw4p7609"; -"textglos.source-1.0"="19hc7lalmbr85pbz3pd3dm696fsbdl7y8v9g1c4l2k7b0i5mc8zf"; -"thalie-0.10b"="0v12fsh5hf77x6r105n2cvjv26hzsn26yc5gwjmcl3gy5b74x38a"; -"thalie.doc-0.10b"="1n082iqbynx9sq563b1d9kkjh19wvbmrhcnfr3h314gfgdmw6fkx"; -"thalie.source-0.10b"="15qb05nv0ac34vjk6b9y2l4ag6sa25wj3vnq3gkrzbvvfy929kad"; -"theatre.doc-0.1"="1nhm56spqvryhmhwmzly939mzv5yv3398lh2lyfhf40rr02mzgi5"; -"tree-dvips-.91"="1l7vgcgbh31hdaaqb9kqi9jmvbyr5429wchyjg5pjjgpffj599qv"; -"tree-dvips.doc-.91"="17l7mmvb03zi7am3nnp60ychx224kn5i3bdl2yv2v1dywbsnl7yw"; -"verse-2.4b"="19yp18fl88zcph3r53ajbnwcr8lbvgahs2kfdg733l5zw3k5pj16"; -"verse.doc-2.4b"="063lkcis5m4zs509hn4z1zg1faz1lsxvjak6c574xasspm45v559"; -"verse.source-2.4b"="1r9pn4dqpr42ng4xk899kxph5sci82dkdx834lyrhi8lsj32g9b4"; -"xyling-1.1"="0gixafnkq15xgkqm2y8qxljfpy1n5nq4ll0lq19sb9635czak427"; -"xyling.doc-1.1"="0s38yqc0xfhf6ap8jc60s24vvmsqhn6f4dsslsdk8i4nq1dmsw92"; -"alkalami-1.000"="1llldpmc485zxlw1k996g3gfffb0ixx72afz3zkj83i78dpx180j"; -"alkalami.doc-1.000"="1315idl4yricb06bh689hhdf9jkc0ckmdygacsx3ywzxj1zcrcch"; -"alpha-persian-1.3"="0673i0l6vq1h37g9jqcp7am5kl4dfbcrfqp42c7cr6a10zhvfqyr"; -"alpha-persian.doc-1.3"="0cfl47cqpwxn1k87h19a0ggayf6c52sl60sdrmpa7sfydhg9w4qg"; -"amiri-0.113"="0s6ri9lsbzym1q6rhqqacypmlad0npxjrr9wf0dc4cnrciz56a4i"; -"amiri.doc-0.113"="0ygizd5qywk8fzpx5cnjrykav75p217aybhdsfhr70l6bcsqhy0w"; -"arabi-1.1"="0jmx0xsb3hz5i25mmqnxgg3bikyr1w26i3364cqrp50x9sqvkgfm"; -"arabi.doc-1.1"="1yipdaiai9fbmrxkacqwnbibdiaa5vskzj40d1hxv6wnkxvj2qkw"; -"arabi-add-1.0"="1ylvj2w98dly6blpk2aicz206rfg5xzqbcjx00j3jnmw7g847kxh"; -"arabi-add.doc-1.0"="1d1wngc0179p7ij7ibnyvq3cxb954sqywxyv5k7a3dg5np9zlg7j"; -"arabluatex-1.20"="1s66v0qns84vhpwvb9if07b9s7957jmxxd643g1mddg36z6pkqfj"; -"arabluatex.doc-1.20"="1rfwl55la33ag9plqwssjvgq47mab2h7ljrw5w6l96vq965c2csa"; -"arabluatex.source-1.20"="1g84xxm5fvp6dzdrkyxcjn4wlih0iydrdyxn93dffx1a9n1c3yyg"; -"arabtex-3.17"="12vl66hn2lhc825fp5z6sv1gxlmcivzh8v0qksjmnlkgrbvj7f66"; -"arabtex.doc-3.17"="15ajpzcyxn55f3knzm5zyqnkd32dbylp6zgg98wphvrxmggcjh1a"; -"bidi-36.3"="1nyd4zz12gxlk5n1bg6vinkm4isy1zi0iq9d6vfk2p6w3qwy9dm2"; -"bidi.doc-36.3"="0wx2bpygghmjxz938qs4gb8739accp7hnwlinrbids3pc38mxhl0"; -"bidi.source-36.3"="08apy9pwz55b1r2ab706slvjnmyc8ik0qz451jyrvlb48gf3g89i"; -"bidihl-0.1c"="09wrzqlldxy3lcxp21rdqi9bnjzza9wvdgssqynynjdmfggahd34"; -"bidihl.doc-0.1c"="1k67d2zd16ash4krnkwvmwx4wl668r0pdg720vr9xq6q3b139y9d"; -"dad-1.2"="1sj53bp0fp8d2d3qnwvl0lm7c6pzbvv8ds9ww3x6qhrna630iwaw"; -"dad.doc-1.2"="1yykrywq662s311l9daq9wpxdcr8l6qifi5bzbnv0vx2372hhhw9"; -"ghab-0.5"="0skiyyxr8l6a6n34lic42lf0rnv4jm5rpmzm08gv0qqq4ha67zki"; -"ghab.doc-0.5"="15vpkpbpnj1w3nlc5wzy2k4fh8jw1a21asc24lj0j6dpb4mzja1n"; -"hvarabic-0.01"="1h8y4wg07bhjcn42z5bgiw8nkgfsb08h80mhsyg0mg3dqrkpx93v"; -"hvarabic.doc-0.01"="04ngis91nsdrlb2cq0hn9vada37ciqsydwaknbjynb5s1a5p172w"; -"imsproc-0.1"="0pkhmc596xrmfwp90w7brrzbjn5rzn70kdpnjlxbyf2j85dr7gz3"; -"imsproc.doc-0.1"="04qasn12qqg69k6isnv2qjpcnfs1nd27vvdpqqdb23z97k38x2xn"; -"kurdishlipsum-1.1"="0b5x438l4m396pmd427zcnl7jyy5ag5c004gyn0n1zzwbz5lcnfk"; -"kurdishlipsum.doc-1.1"="0kw9664fm4gzv7cspj2psczyn7m09qz95agn4j953q39l0qyz6ls"; -"lshort-persian.doc-5.01"="0b1b45nh2d3d3zv735dymgyllj6m8i57icbihjkl1im0nghrzklk"; -"luabidi-0.5"="0flk2g56wfdsc8330grmpgxxmik0sgq9vbw2r51mlzj00dl4wz7a"; -"luabidi.doc-0.5"="0qdbn058p7xlr7s7ivaz4pf0rw4w2lywfxh4nkrr8lxjlszbqsmz"; -"na-box-1.0"="08xixk2hl5w876x6hmp6h044spi0qw1qbgrqklwrmkxkgpa27i3s"; -"na-box.doc-1.0"="0i1p5f2nchl9hyrkc6s3hsqcvmyxsi4dbwyr0mph8slhw2rzl711"; -"persian-bib-0.9"="1yzbap8fwmlz46ngqcy6hwjw98z1cxlprpzk6vg2qw7wvs57b143"; -"persian-bib.doc-0.9"="1rn6p3zbfx6vxdjzxavvbf9405cxk1kv56971n6i2bysb5h22w0y"; -"quran-1.81"="1cgig3cq5057q0mrs0h5mz8l9zpp5xjjzw42kv1v88556wxc564c"; -"quran.doc-1.81"="1n20l8366iisgnn9zdzfcwhqrlg5zz84w30ddm1zjhwnjsycin17"; -"sexam-1"="007lxpvam03cvldnq9q8l2p60iymfijs2yc30cgj7i1lx44630va"; -"sexam.doc-1"="17rn2wf68f16zsr8p1dk3klqapw251zpqc2a7z3b7lgl4164q57w"; -"simurgh-0.01b"="1nhdmdi6qbvx1nd92hxl8vkly82a9nxi7ghj0zpm31c15z5pb7rq"; -"simurgh.doc-0.01b"="1cw434sxnbgq5dbaidn3zn8i9az4q35blcx9lr6yf3m0yy2rl8by"; -"texnegar-0.1e"="0qrnysss751vsbgd794gwh8lwrq6gq09p55qkkfngc5ly29icx9c"; -"texnegar.doc-0.1e"="0jidhqlklr8yd48san5iyy3i5pxg8lygf4xi0gcp3ps7xcb0m5g1"; -"texnegar.source-0.1e"="1bayaa5vffnkmvdmg64q5rsnh69grr8qirwd41mlfi9symh9gm2j"; -"tram-0.2"="1bk233y9pin9r76vsbkg5j2wadp3c6p2x3mgqchnmlz2ip54x336"; -"tram.doc-0.2"="17b0vw6r2ijgxs3dix1ff9r342vkz1gsa603mxixxxik62j5crk5"; -"xepersian-23.1"="0y3r7hy2sxwim38msy87rd338hncygc920140i8bs9ii9qyxddwx"; -"xepersian.doc-23.1"="0g9n3pkd5zj705iyyw6rp4k88mnqc8kl4ng0jvcma1wj48xjzl83"; -"xepersian.source-23.1"="0yj8z89hhf083fzw4kr2475zl7q0zg5frh04hkj617a3cylc3r12"; -"xepersian-hm-1.1a"="0qj98xrbnh9bam0a6c6vy7ffaia3iqsx5s71bjlmbnyl6y2h8lwp"; -"xepersian-hm.doc-1.1a"="16f5x8jv8mqf5a32gvrzqwh1xz4s5nxwqsq4q8sg1za6micqniyg"; -"xepersian-hm.source-1.1a"="0zcq75xzkr0bgpf1xdsphrkcv70q17vs8jkhzxvjrfzilh9h3iqr"; -"arphic-15878"="04a15kip51zp4bhrbpiv4m5pm587xbia792ckj17gj281ysd4817"; -"arphic.doc-15878"="1z1z7nnncp4dpb91bajxf3li47k011jn5jbxzgdaspa5mjvw32k8"; -"arphic-ttf-42675"="1z8fa90baasp8j8539a4kzilah602lik012az7i3pc0dnm4m2w1h"; -"arphic-ttf.doc-42675"="0nfbjnprd71dwp2dxmkmdggfipa36w4qbps82czn506xpzh07lav"; -"asymptote-by-example-zh-cn.doc-15878"="0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff"; -"asymptote-faq-zh-cn.doc-15878"="0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb"; -"asymptote-manual-zh-cn.doc-15878"="047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb"; -"cns-4.2.0"="1b9hs7svh6zm22vw5zv6nqmdnmw453xv15gl5bgm4n3f1pz757wv"; -"cns.doc-4.2.0"="0zdjgg2njgcf35jvbhkfgiv3b9cccf7ds8d50ga3v1ia9i4h9xq3"; -"adobemapping-51787"="0xarfk18da0rl44i2w9acvnivdbm1sj04v1arc40yywdy6pyb8sg"; -"c90-54074"="0dwi568dsqyc7qw1k59f6i6dp8d22130zgppzqpm4xwp1x11r4f0"; -"c90.doc-54074"="08mnypp4hgyq62wrir0fma2gaw9c57nibc54hkzknvzkkc02slxg"; -"c90.source-54074"="12bn9sy8dcji52jnzicjrwdp0j1m6c6pl6fk7i505djgrxs000ab"; -"cjk-4.8.4"="189r8lxgrdl710k6cvnnsazhmp767da75qn2xax59mcfg5nq3z32"; -"cjk.doc-4.8.4"="1kbchcf6i4svr0ilhh8h0q31js77hkprx8wjz0grc0j35rsclgp5"; -"cjk.source-4.8.4"="08lx49bj7jy5yki8zkynssi8k03z5c27782ajr49chw9slyrs49d"; -"garuda-c90-37677"="1yz7zpwdvvhzcsfcz4dc40nnaagwrsxvskc5bymmdxv1zf6m3npf"; -"garuda-c90.source-37677"="1ngmq35xjs1ipr9y9agxxj3kzncbz3f8wbrkhpml45r52jds2vnf"; -"fonts-tlwg-0.7.2"="15npkl9qypfrvsjwwqi9awl56di7wpr200pi4p0rsr2bx1117mlf"; -"fonts-tlwg.doc-0.7.2"="1rv1dy6phfx807df03d1fbhydcddqpdply2a270gsqh4agax69f8"; -"fonts-tlwg.source-0.7.2"="15b8j3fbhdgz3lksra822igy4hwy5gyynpl5wzbs5zh1yhzr517w"; -"norasi-c90-37675"="1bsx31al77ci58p1zavp5q9dl8msdjqilb19fglnkhgg8bjbqh7d"; -"norasi-c90.source-37675"="19zfqq52ky4m5hcgzyy830jr1bgpbrhc43ygdvqyb28pdfgm6sd1"; -"uhc-16791"="1xvkp384p0xcba1lbi3b2najk6d2w1s78yi6vgppmcjrd5limif2"; -"uhc.doc-16791"="0q1wxcn2zclpj4bsn47jgd78xmp82a6x8w068j4ihza9pfvbqacm"; -"wadalab-42428"="01lf8nlga2nycr23xpzl6xas2nlgajjmia4lk4zvjdgcxqnipfrq"; -"wadalab.doc-42428"="0m8x6plkry0p3jabvhgkccb2rvlsz941di4ihfc8schkq7iyjlxq"; -"cjk-gs-integrate-20201206.0"="00rdlkwkaclzwawnsqzyf07l2lvxl1drfw4qvq2lg25ld3xni1b2"; -"cjk-gs-integrate.doc-20201206.0"="0x1q9kgl7y2nc6pq3a7bzb9na6i6kw629g544k8a5rgfhkzk9g4p"; -"cjk-gs-integrate.source-20201206.0"="1h788aq405c44alpj85lyhmlnvdslc21n6h89vx5dggdfypbq18r"; -"cjkpunct-4.8.4"="0wvqmf60gjm5m7fcc2qqz14lfzxcrqci3lrla96hxkqnqraiyb84"; -"cjkpunct.doc-4.8.4"="1ja16xaqfg5158155flfvayr39k7grij13r1r89g59va53mpsgrk"; -"cjkpunct.source-4.8.4"="1pn85n7n4fp2p5pq3w66kb5zlnjk1bdz7fz4xsa6z31d5216j39b"; -"cjkutils-4.8.4"="0wl33vh7pcrbyvxy6bfcjfv0xnawp4gb76cmq2304n9mp2w8dg2h"; -"cjkutils.doc-4.8.4"="1gvbw4yc0knc86rydscpwclirg0mbvl3yk4fphwx0wwr4vzi3my6"; -"dnp-54074"="0jlvb0nps1ij4sgbg3clgbk34p80la1fhh9zihn9fhl9nrqk637r"; -"fixjfm-0.8"="1v4gn6bwlb294sxrqgy6j9vx2dp7plbagkvmw7vbvp6wk8dkza72"; -"fixjfm.doc-0.8"="0wiihlpjzvmh8dynf0nbhmn8raxflqxmzpk97s1qv7kkvpc79sy9"; -"jfmutil-1.3.1"="0mgx44gr6dm8mp35k2z766lcmc4pmkb7jwbpamvz3x6zv0f925n7"; -"jfmutil.doc-1.3.1"="0y4hfngr23gf5spzjjfj9c6f863x2hvjrf5v7m80zjpr1r9x4p1a"; -"pxtatescale-0.4"="15swkjxfxznb101hvlqcxpplxngfaf0nbpkw7j2fgccyqjs5fhfn"; -"pxtatescale.doc-0.4"="1j6yrpyfhn75qkv03bnwj9i3s4lmsh47sw696y13cflvdmsgs8n6"; -"xcjk2uni-1.0"="1x77gmg738r2zbyd0mc7q079hz5wbvabyszmwizfdj6vflm86w3y"; -"xcjk2uni.doc-1.0"="0xig1w251dsn2qd9iywcdc20plibadiw8hl1iwygpzfa3187djjf"; -"xcjk2uni.source-1.0"="12hbjjdypk0s5k5iaac80n2n4z1zlkg5lp59y58dwnn4y1dx6m6z"; -"zxjafont-1.2"="1blq826xrv3wqkpdndd21wmd5v4gp1b45yw9rkb1g2ypsighmbwg"; -"zxjafont.doc-1.2"="1vaavdxhjq72ri2aw5qnsf8jiijwn1y36fhgnpb1x0dhkhwz8076"; -"ctex-2.5.6"="0ckxf94x3117m4fwrjyzww0diwwfsx1hg1wpmh2l2zc3pdg69r5h"; -"ctex.doc-2.5.6"="0p1xx2zpj5nzklsx063j51yh7pfr14iicsv99aa4lpjvdad55rkc"; -"ctex.source-2.5.6"="0nzs5bllvbf8mki5j79cqq1wbybgdxf1y66k870llvp851w0can6"; -"beamer-3.62"="1jl89gvk3ka810d0jxk8c30rw2xkv92jikhdz9150xkw9slk5rq4"; -"beamer.doc-3.62"="1n3i17rm82s2is8csh467y69f2n0s9kwi82m3l81l7a78xivzgkq"; -"pgf-3.1.8b"="0llrxra7574cli878z67rvm5wab8ny595sl6m3k79gzv1zlp8k10"; -"pgf.doc-3.1.8b"="0ky0rk0mx66m2124b4jjrcjb3w05rsjw2sfrnrz3kj21vyiijlb5"; -"pgf.source-3.1.8b"="0g81wcsn7dx21q44b29jscikxayw1pa5vqclwxvd54p1x5f98ch0"; -"fp-2.1d"="07qzdfrk2y499cz9jbpnj024r43japqdngbxg4mbapw9cp8066d3"; -"fp.doc-2.1d"="1y1xwqf6mskg10h31ws2pvn5y6g9asflc7l9r24fp2fi4254mvhq"; -"ms-57473"="0km07va23z5vzx87ndrv9mj0fq4yw0kv7qygd59smhm4q71yspkl"; -"ms.doc-57473"="122xwapvjzv9qyh3p1884bzdpalvqzzkmzd18gqr3q3r4cmk2q20"; -"ms.source-57473"="1myxaybppzkdl14h4g12xcp57zqjzkzijryv9nd6hy6ggl9y8i99"; -"xcolor-2.12"="0jaiwkqynbi9f7j4kacvhzcahndmzvrb063r9524p2imv3gia8c7"; -"xcolor.doc-2.12"="024avysbkx4h1z1l451pfy9hdwny2bks5c34m14qlsb97qhi1smw"; -"xcolor.source-2.12"="0jjdrs6q191dmnk941di50pby0mifriz247g0dflf1a78il2j4sq"; -"translator-1.12c"="07lw6zy3gwv3w5v8qpjd6fyzlz1qp6rk4qf70lrsd567ybw0vmzl"; -"translator.doc-1.12c"="0icgx47gy6m3b92q7knvqjb4pdxikj3i8lj35kw9irhzrg9yvndr"; -"everyhook-1.2"="11r4932kly5zmksmicapqxndqw4cdq1sg2x9hgffms6v8m5cwkfs"; -"everyhook.doc-1.2"="1g9p36ki26vqdfiwnr77jxk1bna7733dml5k4s8nxq1drsklwqwn"; -"everyhook.source-1.2"="0hv04cn2j7sf6032jxv18py368zbpp4ya15wv18qymbk6yv5najs"; -"fandol-0.3"="1l6h2brl2d6bnam6p6j0p1d2s13jnva5zkr1xr4sarzzxj6zlz2r"; -"fandol.doc-0.3"="01ax7za7wcr644ncpv3rpfvl2ndqlppqnjzbjp8y2d0hawc3k5m0"; -"fontspec-2.7i"="14fl3r5zvx2va4wl3jikvlkan9w8cc1g6ri7rm2rizlksi0dad53"; -"fontspec.doc-2.7i"="0bwfq45mx5cdxjpwjdhdjxyw400933ns0zynxkijcvkvzhjx4pha"; -"fontspec.source-2.7i"="062mm06inkgmpv58c2rqc9cpbr5fkg7bznabdvyq8rvvy4qiwd5n"; -"euenc-0.1h"="0lh0k5g6icbbzl1xzzcj4sw7vjhqpn59y9xbc6cn58klpww8ywdh"; -"euenc.doc-0.1h"="0likhzn8afsq302aiyjk6adhjimz0naqffjrj2s06c6681z2inh1"; -"euenc.source-0.1h"="0bwr4cabh3w4jbx476ygxv6afxj6sblszr47awr2nixx0m018ndj"; -"xunicode-0.981"="1h8ixz9zy9izv5j7555094jiwfp5js5y8mp4bh993gn9xn1rb6b2"; -"xunicode.doc-0.981"="0jrxnpas07np9a30cybk6jqv4ng96vjqpyyadbl55szkiylzwwfi"; -"luatexja-20210319.0"="016glnf76gbbhb7japvk3p8x37i31pw8hz58qvn610cg88w2r755"; -"luatexja.doc-20210319.0"="04zjjfm3yd3kkscspfjcplbflv9nsv6iyain3fyv2z4lk97i8169"; -"luatexja.source-20210319.0"="1ld91sfhyavw0v6zs77df97mnkfip4alyr7a66qgzrgn1vpp920q"; -"luatexbase-1.3"="1zrwz661gilr4iizcfsxwmfr9dgx7v28lypaslmvp3zaf52zl2q1"; -"luatexbase.doc-1.3"="118azb2x20gyaj42r5w0749dx8rzhhri1nz3szy9vv64h0fig603"; -"luatexbase.source-1.3"="0vsg8q5k8l66sy3d0bskr6cv1f95lnhap3b9yl754x7ynv272xcd"; -"ctablestack-1.0"="0b739h1ndkisr49d8y4q0vnbl9j3diqwl9r1ah8wk2za1ww2mi54"; -"ctablestack.doc-1.0"="0qmshnvbyfjhi8bb989hbffwn3447r91jp46z1yhhmcbjpr7clk9"; -"ctablestack.source-1.0"="0133xxb7470lyfssi1kp81yr1zsz4d8ai3qjy72wki0p7ijkypw9"; -"platex-tools-57729"="1vzhnp93lpvv59qlj3kd90lb5blyxfq32k1x6g8301yqmqpxf4q3"; -"platex-tools.doc-57729"="1rk37vwds2qhvlj8r9gz6x7vzsp8zjbwr560adjh5981a03d0rib"; -"svn-prov-3.1862"="0r4s76i89wh1fjrmf9imf6y2sf96xznznyjfcivi3sp8dvf5ln5v"; -"svn-prov.doc-3.1862"="1al7qiwd5ajjpvs2f90p7frlkd389p1ama019yl0nnxc1l45m067"; -"svn-prov.source-3.1862"="0cg7qwgv20jvvw6bibkskj3p8jc5l2mhgzwq6x0wzy1ds7x1f6b7"; -"uplatex-57972"="0l8vw2fcsvrq0zjixwizijib9v7yz9fh6ac5hs76bjm3r4xvj870"; -"uplatex.doc-57972"="0386xnw7fazkax5zp929mqmwqzhanysip8zycflg5n9gl3p9rmfm"; -"uplatex.source-57972"="1fzr3vh98nnkr3f4xh6cs3i5fkqqh08530kx8rr70325714mrjkg"; -"latex-base-dev-2021-05-01_pre-release_2"="15z8vjz6a6ymkmkxma5p16gjvr9nsqx6wkxbgq95ljpp74hg3j72"; -"latex-base-dev.doc-2021-05-01_pre-release_2"="1s94lk12cyrnkfb3wjvjhzxg4dwfic17pmsqbnyladc6qx3r10ys"; -"latex-base-dev.source-2021-05-01_pre-release_2"="0zbnz9j2qzmkw7j4wimflg04lh14jxhzvssimgxqvc352zhh62pd"; -"platex-57972"="1nfkv6g4193wlyq4r1wa70k4ilvkkgi0iv6ka59s2c7avr9ji0j9"; -"platex.doc-57972"="0w6kqw1xdw9wgn4890lspskm4cvznr6d1cbi8nqgv8dfwxvkl0wa"; -"platex.source-57972"="0q1hnnkjchx1c6pkpwr6fqp2lyhyiz9izs9x2m5g68p0764zvk0d"; -"ptex.doc-57972"="0c4gyjrwcxhiim557m13kfnlbp9hc6781z78nhabgg6zd7qb7m6m"; -"ptex-base-56487"="09j5xw5j57zv733n9r6ac54fn8aiv18xdvhbphzpgry98kh0clwk"; -"ptex-base.doc-56487"="0nkk67k9h8iiiplg5jcvb1gh8j1flnzdg40kdq475zlhigima33c"; -"ptex-fonts-46940"="1vvgb6kxl4py4knh9jqnwjy5a9xf0r0yr8n6rihpxmmw3lymwrip"; -"ptex-fonts.doc-46940"="1fys51jjzzmcxrkkc2iq6yx5p68mspqnhm3gap292f7qbh2n9jp7"; -"uptex.doc-57972"="1w0wvd77mvba1qszvz8j6kpbrsyjx413ldpi7bz87al8qcqhj9p3"; -"uptex-base-56832"="1sp3jqkxhylcqxm5hlc0gvgzs7h6xfirclppzhdwm7g4v1ckf0ni"; -"uptex-base.doc-56832"="0d82xasqjq2mmmlcn833jjqrpb7cab2d36rnw02ivbrf07m8i1hy"; -"uptex-fonts-54045"="0q4rn470yg1d892mb6g9z1y8y3w1rw7a66ag5gal6j0ndxllgghc"; -"uptex-fonts.doc-54045"="1nc9fmaq2vyp6387k7rdpvpzclabr2g30cpng5ry17k3qmliiaqz"; -"xecjk-3.8.6"="0whcqadziv4xdilgcl59dgfdd9m79944wjk73j3ynl6djvihxiwj"; -"xecjk.doc-3.8.6"="0w8vq96qg7z6brf5q3ckqdxwczc5cgl19jakn9i70p27nxci6dny"; -"xecjk.source-3.8.6"="0wwymwnkdfhmmc0c6zb5r3nbiznka0kykcm404hyjixjqqcri3mp"; -"xpinyin-2.9"="107l74kvfwhk3r325hpvvs9p92s07mxq46qlvdvaq4yr6gjvlh6s"; -"xpinyin.doc-2.9"="0w5pwgw1hd8bpl4j8nm6qmv4jdj25rdv549dfhkwncxwb10ds5xq"; -"xpinyin.source-2.9"="1qi4paa3bvwhny0xysq8a88czzdn736mm7fg7cvxlclfn5v9r0xx"; -"zhmetrics-r206"="094afdf0mwb6f5jvg7z7cs5xinia71cnlaixcihliai37kdn1qss"; -"zhmetrics.doc-r206"="0achyp4i8dfhrkr9jddp7qzdifcqsf28qaqdnyb76525mvgkip5y"; -"zhmetrics.source-r206"="0hic8n6kq4sx2dc8vb34fhyjrbbxp50lllyj5sh2ld9s5fwgm3yk"; -"zhmetrics-uptex-1.0"="06g61qm3ryy6mvvaq4whk7084hjp544dig57mwcxlgp6cfs0fq8l"; -"zhmetrics-uptex.doc-1.0"="0ybijj2hjm4byli3yh8q9lgb40bdpq16d9273nrmiyy8szxa20qc"; -"zhnumber-2.8"="0ijvfd7pkg9hqxl0s3h5yj9zqw6p5kinbang8v14h6bbb0nzvhxs"; -"zhnumber.doc-2.8"="1qvqm1plnxjv4ag7japic9kzf27c69hdsy92dqad6n66q3v22kn3"; -"zhnumber.source-2.8"="11ydch2nd0l1w62c78v9i64zcl16crvx7r1gq2lj5zjfa5wc9bg8"; -"ctex-faq.doc-15878"="15c0g0x8w7vm3hyn6lk60jf66akyfcq6x8jc2lnbjx8ydwgb26br"; -"fduthesis-0.7e"="1dcvn1ydpqf01vgfbnyx83bwcf8yq0p1v7b0hx7bd47ssj9kn6xq"; -"fduthesis.doc-0.7e"="13n0f40hfg9h9yplhwv00ggxb3633inx4k8w9yx7ffzf74gjf7d6"; -"fduthesis.source-0.7e"="0816bas2p5n3x6601b3sin7kiaxm40a549gr4xydxh1ijdxxn52a"; -"hyphen-chinese-58652"="08sbasjp9b4wl15zmx0diayqfa9i7pf65nnsa98lbc9rpyydvhn3"; -"impatient-cn.doc-2020"="1pc20pb0las3slam1d9hmqigipmr6r98wwif12m33mm750vmq65i"; -"install-latex-guide-zh-cn.doc-2021.2.1"="06lz1mrziimfgng5sls31i8z0g06zsvmbmjvng42ra34ybmy1xvw"; -"latex-notes-zh-cn.doc-1.20"="0w9rmd7b5fnfvix653n9vbnn1k8yxlaaak79ipvm8p53dx75xfxd"; -"lshort-chinese.doc-6.02"="1lmj130hybwidxp1kba2684vm4bqvzd1ylnnj80w2wc60j8d1xkd"; -"nanicolle-2.03y"="1sk2frvlsxzrl5cv1c1azqpxbpfr4b06ssli54j0p5aikf0rls1f"; -"nanicolle.doc-2.03y"="14zsfxcyw2ckdsi3fg5qwxfy6d0yja310ycxsi3xrdyxyia9nrd5"; -"njurepo-1.1.2"="070jmqsm9caidgc0n1cmcj2v0x8dlxxwv54hcqkrisaf4nlkyyk1"; -"njurepo.doc-1.1.2"="04hg7gxg0nplqpmmagqynnddxv12qadamjy3rj1sxhwxgjma9c5f"; -"njurepo.source-1.1.2"="08fan5igmdc43s82s1adq7ymxpvahnp08f90p3p4qlqanj41yh65"; -"pgfornament-han-54191"="097i0gyxxvnajwfbblr52s8qw2y5ld52i4rybg4lk130qggx2v5g"; -"pgfornament-han.doc-54191"="12vayalf8hjaapdfdnhr6jnc2x14l0kxak3qwi7xsn3cafrsfm1i"; -"qyxf-book-3.1.0"="08v4n8lc3qcxjzfvwqypnky9zhia7ylwq5f31arxgdf0wq4gyhia"; -"qyxf-book.doc-3.1.0"="0i6g7v0xdy26rdy1kap0b4pnsz8xjm1h90dwby8y0bqlxjhd509w"; -"texlive-zh-cn.doc-54490"="1r8n9k1cy7798g1rg1hyj6g945j9649c5hhqf8hm7a7abzx7w6ll"; -"texproposal.doc-1.4"="1yxb3yagljsdp4s07fzd6498889i7cscch68fb77jbfc2z4srvsy"; -"upzhkinsoku-0.5"="13fm9r3s01003n8ykbq8plx3xzj7p9bz958ylkl9f10kd9favr57"; -"upzhkinsoku.doc-0.5"="0hd55x231kpcl1rmds601a2k1yzvhvfks7sg0424gzw7wirhns75"; -"xtuthesis-1.0"="1d68hx38gwwscshdm07rcg75zjbsvk5kyliy5rx6z5jp75k0fra4"; -"xtuthesis.doc-1.0"="1fdr5k60zxjb75vv4m6mj1kalka1kg7cw3k5j9a53n01m2w7q6r5"; -"zhlineskip-1.0e"="1j3wkvd57kdwhhny0dzw0hqqnv2ghx1mdjgyzrhfj8gf3fifdaym"; -"zhlineskip.doc-1.0e"="0hy14njxpzffcnyciyc4zbil6372b640bshfw9jq4wyskwk3i45h"; -"zhlipsum-1.2.0"="0rvwbnqzgbdihdavscn8mcc7hy6yjdzj2fc2h3xs3i77lfa5140d"; -"zhlipsum.doc-1.2.0"="177l81c3zbgdvjgr861jn917ps174zg8bab824f7dx2gj5mhdzgf"; -"zhlipsum.source-1.2.0"="098fqbcr9fdv6f6hjaczm3q28dpx0g8xqjykg5hyx7nfp7nh6yjk"; -"zhspacing-41145"="0h588z408lggk7370l9kcssz2hn9lz19bnakadygrklsyhqh9pzh"; -"zhspacing.doc-41145"="0s5qyrsi5nw0vppgx90lzz3ra121jgm9hgzg3z791imlxgjn8pzr"; -"babel-belarusian-1.5"="1jad77cas2x8nlkh72rkxi3bqdlqzichqkxd3bdxk9bsqfhvj80s"; -"babel-belarusian.doc-1.5"="08lb1909wm2r4psppcbn1sf3zg4a8qp5y4i0b6kksfp0n7v1nckn"; -"babel-belarusian.source-1.5"="018jayyq2mzb89l60h7f9vzx2zgy2skklbqqx9zs3krg23xy2i6g"; -"babel-bulgarian-1.2g"="1lflnrgn8si78aj9ms8lh9lb07maghvqlnrc7i3lmgn1qjrlvzqx"; -"babel-bulgarian.doc-1.2g"="1lb0kxx7bxrllyb7sqs1gjkqv7414jvs2kl06cnrdwsrfbr1g0kz"; -"babel-bulgarian.source-1.2g"="1wck40na2vczwni0kk1a8c1naczrcwx8sql7j0la1b4c5dcikgxd"; -"babel-russian-1.3m"="02zvg65m1g15a1fbin635gvx2mxw2ljv4srd0wjjfcpdyfg53sl6"; -"babel-russian.doc-1.3m"="1bs2q9xxqyjvpqxr3zfbmk0lkf58jg1ksi5a9mp07vznzplz01i2"; -"babel-russian.source-1.3m"="12ik2dwkih2g0gqpbg83j0kcfwsb5grccx27grgi0wjazk0nicq6"; -"babel-serbian-2.0a"="1bpk4v943cc349clqlrqk3z4qgys9hcy6i8f0dih5sf3m4rkz33g"; -"babel-serbian.doc-2.0a"="098v5c5ncjbbihz2anzpnxv0agvyvp2i2zp4n95madqwjwj9hy9w"; -"babel-serbian.source-2.0a"="1pzmq241c4ra9ms9q0w8rfjihszz84yh34wg0lbn1w2f82zmvmp4"; -"babel-serbianc-3.0a"="1i691hb5pjis0g9vahxi6f4dbi1rxjl8wd497hnwq6ca4qv68yq0"; -"babel-serbianc.doc-3.0a"="10bdkiq26h6ack65g0xfn7s8vbbj2chdbcdphzhb5s7w8wa3217v"; -"babel-serbianc.source-3.0a"="1dn73rsdf2mrzcd5ggz33fbqfmd7rqvwbsm4var8s7zlgfw386ir"; -"babel-ukrainian-1.4e"="0fm0sbr6i1lx2zg90w3mlwlyg0j0f11ya6as2n1w4gbm1inmc62w"; -"babel-ukrainian.doc-1.4e"="1h3ag9pybhzysb65xg3m217jll1h02ks04icrlhkp97sx3gs9wqn"; -"babel-ukrainian.source-1.4e"="1v7w99b86iclp16qxdjfqsxnh2p9zg669pwdlman1467y2z13p8s"; -"churchslavonic-0.2.1"="0f405qij680p4jjacjryjgqvb6ysra52qmydqk5zgqyljrm9h6hh"; -"churchslavonic.doc-0.2.1"="1k7imx74l512fwd97bsqy1k8jkbkf2b97lr1iy4pp8jibam534rm"; -"hyphen-churchslavonic-58609"="0yh63znzx0bqqqr6x70c7laikxx82ph85jw48i0jh9ziv0n5gq8s"; -"cmcyr-39273"="1fdsd6ks48rvbvg44ac01z89rbd4w887lg2f9wqca1byx142jg3h"; -"cmcyr.doc-39273"="12bg7k2gf206gwlg89mqwfadsyznpwl2nbzcz2vrnvrh21z81s1c"; -"cyrplain-45692"="1wdcibxs0g53warxs6vz39s3chldzh05p7v1ksskppghg5qzgh8z"; -"disser-1.5.0"="0kksdx0m0lgb7f45g21yzfh90id3pzq17bhff8x7az0djb6n7zk1"; -"disser.doc-1.5.0"="1pb4gzw1yx3kx6yxabm4wj99gmnwmx9vw30m3l21304axdxgk7w4"; -"disser.source-1.5.0"="02awlfmhyi2cahd0dkhxkfiqqg6jwmkksv6134lyms798j0akv0z"; -"eskd-15878"="0cpaix3x3qw5mgaim5574pc39hypi42kmk7yvnbvf3qj5bv7jkyz"; -"eskd.doc-15878"="1zwpxmr721b3ij4b4zvkncddy85d9s9ma7llajp36qh4vl0bc0cf"; -"eskd.source-15878"="1kfyrzs1swin4ph70ifm1mnsm77dprd96rsw228liq1cybn5bgii"; -"eskdx-0.98"="0h11378qh1y4c4ac3vd9pcl93a09kpsh0vyqcg7mfn01dgmqfam1"; -"eskdx.doc-0.98"="19bcl4szagigbd2jrlz60vhhphm86667chciwlk05k6hkflg595w"; -"gost-1.2l"="0b495h3wwvwzn7dilj2am4h934y7b4fm3g3j85bb6i8fpqxbpikp"; -"gost.doc-1.2l"="1as0a9pc9bv0aya47ir77vlwv2hqaapl1ks70gslfqj57082whwa"; -"gost.source-1.2l"="07jn8ji4fa68mlq381lcmvk5qcamiczain2jlmpqcc9cfxd31s3z"; -"hyphen-belarusian-58652"="1n5md9kf7iiwqm236bkdsl4fb4vd6a03b6q1arvfa4l4yh8jvr13"; -"hyphen-bulgarian-58685"="19h61n6ip8ja8kn8p1fb79lfv15pfzdhhzih0hg15cp1891nzlql"; -"hyphen-mongolian-58652"="1mdgs6gcvzly6y2i5rlxajk2qxjac0m91ayqb079mz8yxwvmq6xp"; -"hyphen-russian-58609"="0vlnw1xn92ncl31yh6i7k386n0hp6vx90lgb1kxs0a3zrxcds0wa"; -"ruhyphen-1.6"="0pizl8szphgyq12sbpgsw25x88svj6vmf8j7ry23hvc9bvjibck7"; -"ruhyphen.source-1.6"="1s0wscvjg6hj9f8arjsp7b9m7nqszqxh2wyjrx9i2qb60n2kaaac"; -"hyphen-serbian-1.0a"="1v0v281ws9dyivqd1nrb5ms106vlvmsrvka5jmnzl1wnpw34z92c"; -"hyphen-ukrainian-58652"="1jpi7argypmrx4yvc23dx777r157c7kxgwpsix7cjjihakmx1s6k"; -"ukrhyph-21081"="1fnh98jcbn9l09mi952qrdw0dq0pjykwgwi35zz2lz8h8r750ihw"; -"ukrhyph.doc-21081"="0bbj125zb494g9x160n3lsivims28w0drhfmp0c2920cwhk4m0xh"; -"lcyw-1.1"="1c0js52z8mgfbr3lgbvnhc646ggvsvgr7w1mq83lyx0pvnlqm3aq"; -"lcyw.doc-1.1"="02h21pl11ax04q5psazgxpm6xpb8lljm4b08bbmivpwbm0z1namn"; -"lcyw.source-1.1"="0zf06l74fzlici5dzm3ggvz3h66dx3yjxmb7qz8xlsk5fppyhcb4"; -"lh-3.5g"="1k2nn4zpxdgj3b10xdqzldcdbw56ws9735wp0yajkhxl72ms0705"; -"lh.doc-3.5g"="0zvcl1zfbn7qv9069hff2a2r2d33xmqr31l4di24y4p33y3ylprf"; -"lh.source-3.5g"="040n2hbkaypam4fhyb82ncy1sfyvg7fdhykw9fnvy42mlzxv1p3y"; -"lhcyr-31795"="0civwbn156gky4k51189s9lpqcs06wjr32pviwb1gzsfr6rc7vws"; -"lhcyr.source-31795"="1pwlcsilza9f2f73qsvbr2xxxbs2dcms08jxjlnpk8fxcpiy8j6z"; -"lshort-bulgarian.doc-15878"="0qg23asq2i5mqhp9xblv5hm3qxmd5886d5x0gq1fkdbyy9gsawi3"; -"lshort-mongol.doc-4.26"="153k4dzia30fpx847wli7i5p407a808gmj3p7jifq5bpx479qg1g"; -"lshort-russian.doc-55643"="02abh69xl43p56fcciyan4j0z4mqq2j7ynwazq1nywhz37d6zn7y"; -"lshort-ukr.doc-4.00"="1nsah1h3z3sy96a9x0mfdwby7pvvjwq7zxfv2s8nvsbvnn1al17s"; -"mongolian-babel-1.2"="0qv413sx05pz5ri4p9znb020nhb8m2ybapcdgnxvkdamgbfvi17s"; -"mongolian-babel.doc-1.2"="1zprq4x55rbd667ll7a1rcscbqvg3i4wafmxnv4bksdm8p512w5z"; -"mongolian-babel.source-1.2"="0qf83v7iphfavxh7kh1zav95r6q3k0aiilzwnc0mm607bkjzc2x5"; -"montex-IVu.04.092"="0rgf1rflrf98jayyhj1gxz0mkw74qhd88b4i2ccf3mm0kzwlvw0a"; -"montex.doc-IVu.04.092"="0w9izkjmb90d4x5j1azhlskhgfmxh67jq1awsdv2s52psgscpfm9"; -"cbfonts-54080"="06641hiw3yahh28yq3bnz3dc6d25als1d8kbjh1ldab55gb3vz6i"; -"cbfonts.doc-54080"="1vlhqfx3y85ym7xaqzr7bxkzm3am8806s6bkp50mv58r914xmlz3"; -"cbfonts-fd-1.2"="0gaw2v82im1k7addx320xhwwq28mcm2xkz4z90pw09r848s9fsyx"; -"cbfonts-fd.doc-1.2"="1arnjpk1n9mkva1f9gsh5834kjb7m9rd49kgn3jf6acmdac67rv7"; -"cbfonts-fd.source-1.2"="056b2x1fv2gvy7ldi9v1kgsla7jzhvl3lsd5wl1v0sb2rqr2jngv"; -"mpman-ru.doc-1.004"="1x3drpi21zcmkhkscvl4l7805wskqa4zskydb33i0asss5p62396"; -"numnameru-44895"="151c13r8arj094jw3zaymz6i7invgpyqr95p0qnwhj22z418pj1m"; -"numnameru.doc-44895"="1rrargznsmgq1h6a2ixxr9bg57zcrs9zwhxgz0ssbscdyvjqik8n"; -"pst-eucl-translation-bg.doc-1.3.2"="06c9ajnfl01sl81z5r8a5lzmaygq9rdmgym2v40y7xp7z033gwwv"; -"russ-25209"="0jr0x81xc1zi9vhgvqy0hcga48nhkj9z2n4rd5303b8h68n92yfd"; -"russ.doc-25209"="02dl5mh45z9n2b59clcqnaj9fsv79jw46ph3303mlx7plyvdqj8z"; -"serbian-apostrophe-23799"="0anhf0xj3pm516sxiby2j3pbh0cp50ipch2s5dh037h8bfmjgsbv"; -"serbian-apostrophe.doc-23799"="1r7fsgsggbr8gf973a8nzpq4rjjpmzbcqnwc8qrlynfiscwc2mjf"; -"serbian-date-lat-23446"="1766dw6c8skacjbbcd0d2lvy1s57vjl84c12xf1w2q8kh6p4lqk2"; -"serbian-date-lat.doc-23446"="1k8lnnhb010rq872yc9d4m8s3vd1my93qydv7x8l80xyp64sq203"; -"serbian-def-cyr-23734"="1zxl15y1j964sp4iys1rl4gyaqs13hi5ms9rhc7944p36rdf32p4"; -"serbian-def-cyr.doc-23734"="0nwfxr85nf19ddk9b7hhin84jpimsx2hm45nzh136qr5jnr1g3hz"; -"serbian-lig-53127"="004bfyajczp11w6bpb7zfyjwfpqwlwzian0m68qhmb3j95vrs3nv"; -"serbian-lig.doc-53127"="1yrwmr8mjhqnizsgvar8s4xaaw1f70x6zij5z394a86ygx1gx06r"; -"t2-47870"="0s6zn41dp7vzilfyk92yy5mbb74lcrpnmhrwl9xcj1dbadi97nm6"; -"t2.doc-47870"="0wfm1gy3dyhfv2xzjfsky2fvdhki5r2ndgvzliq2n0kvfxf1sgna"; -"texlive-ru.doc-58426"="0c77yyfj87fajran8jppj0x8krk6b5195iscpn8z2n94spz2fcc9"; -"texlive-sr.doc-54594"="0icavs9jkcr5b5cx5kv202k95j0ydgby9lqrw8wm9h936mbn9bkj"; -"xecyrmongolian-1.0"="1m20p5x1s92cwhsixaz3s0y00r8n0j6172bi8vpyzcpf8mc886br"; -"xecyrmongolian.doc-1.0"="0kiyjcqlajmpj80n8wkk0ziri83811ivl380i3cyz7rxmsh1hqhg"; -"xecyrmongolian.source-1.0"="0dj2191iqcm9qpi45h45r3cp4nz5gdviw6xf9iz261b3pn515prp"; -"babel-czech-3.1a"="1qk6k4y1rkay2fcn39i99pxsip4k68xac4axznl07pbgx46v3h64"; -"babel-czech.doc-3.1a"="1hvp785ly718fd1f0ig092rldcqglpb3mrygarww5bnl6fpp2ffm"; -"babel-czech.source-3.1a"="1274pzgdya7gkvxjmdm3v5rb7hc0sj6mqn9pd8y9418yx5449spg"; -"babel-slovak-3.1a"="0724h8hnc4z0l0kkafjczzc69rh6h825wn0srfpy1zmqimybvaff"; -"babel-slovak.doc-3.1a"="15v2hdmpbivcdwrm3mlyb3bb3p1298swq7vwxqb9b5ylv8907sd9"; -"babel-slovak.source-3.1a"="1k4w34wq8n06ck9z81wa490fy52a1dcgi98pcvdmfggkalwr7ml2"; -"cnbwp-32550"="1xn9s2scd7x714c178p3p8bmv5bjdqzpbyz75nmn50d8irjg1zk6"; -"cnbwp.doc-32550"="0cs6jp079acnjj0292xba0gjkykva6grviwnm36vhxy93732cls8"; -"cs-41553"="0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3"; -"csbulletin-54433"="002dpnpxvppdrx5g523n17fj4f7jdyhfam85zvrf3qbqiahij3n4"; -"csbulletin.doc-54433"="0p2wbn2ndsmzrwry79408qfmfaipnkg4cjsd9phifpz1hygc0a96"; -"cslatex-57972"="1qdcnf755fak3kppl02yi2q9ghb17kxr2cyxc2y80idaafqgr9sf"; -"cslatex.doc-57972"="0b2a9hrbqzhd7k4ac9sqphs6zvj1hc03acgm5afyijy2mkx865v0"; -"cslatex.source-57972"="0ig4a8nksmsm7pb1hxfy6gksfv27bgayqx60ygiaphcz0ir73546"; -"csplain-Mar._2021"="068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f"; -"luatex85-1.4"="0ss7c5x0x7sx6lsn1iq6lyyp6w0xb1iy01s1f7zf7mlb9n1yzffi"; -"luatex85.doc-1.4"="126y3priwz6anp8sj0296bnxd53lz20nchpxw74zphfpwrv4hzih"; -"luatex85.source-1.4"="15bc8g0pgrkqpb8q2dhb6zml2d4jwrripih9898mmalsjixy62x7"; -"cstex.doc-58354"="0j3ifcz9myixr875rf71nh4ly2mxa5yz7cs3w8waapif82yybj3x"; -"hyphen-czech-58609"="050b4vmp8n9nwqzagpw7mq1ciin9rwgdicmbk1ajl9gvci7q1q8b"; -"hyphen-slovak-58609"="1vn6i784fdz35dcbxdcv85886mbg8vbjvx0w6sx230gjjxs1s571"; -"lshort-czech.doc-4.27"="0ar9qa0cg0mjv6ydgx1phaa1qpiy25s3jciznbylgi5xprvnnfa9"; -"lshort-slovak.doc-15878"="0b5gn95i32dyn8r7v2cdcz759fllp3b0zwx17adjs282n06vfymq"; -"texlive-cz.doc-54496"="1m442mx60ksmrani152rfj05mara20jjd4hba06qyk69716gqli6"; -"vlna.doc-54074"="0g6x2m8c5mjwjfrbqcndjj45alslin7a0vqasc1j7rhfmqr3issd"; -"MemoirChapStyles.doc-1.7e"="04m56f629sh38khc771jc50q5fv1fmbyqkww1p6cr617626m2f4x"; -"Type1fonts.doc-2.14"="0a4fq8sx73nbgb5lmbsbxsjv3n4ax5x7l284yw8qzqha9l0sqni3"; -"amiweb2c-guide.doc-1.0"="0cxwsx49p3c162ysv0ydyxdncfg8ij9sx2x7c4pvzb0yidvad01c"; -"amscls-doc.doc-46110"="0allim05cp20zhn480df2mivd3p9gnc069d7hbjlzv660bw7mapx"; -"amslatex-primer.doc-2.3"="1kzayyh1bycmq43s2xn81jf05r18azidbk3gv6igf2vaq37fmxil"; -"around-the-bend.doc-15878"="00nc6kx4ylz9g6vmjlgyjvmy1ls86pjblbcpm5z40wh5xl7l184f"; -"ascii-chart.doc-20536"="1m2x7iwz80plq6hbhp9xia6bp8wbi03iifs0pkr7ji3gn8hqgh1r"; -"biblatex-cheatsheet.doc-44685"="0y2ry2q1kvpy8dqglqdfq3rc849hmbni0k78wr1xnjbpd102l3k9"; -"components-of-TeX.doc-15878"="05wq82pa2m1hdpjxx2bhj61nkwcyynjn3fprbnngf2llv8yzb9ag"; -"comprehensive.doc-13.0"="130s89hkcr2im2k282crcpgx892dciw8b2cblpgw0fh7akr5c05h"; -"dickimaw.doc-32925"="1mxjqn4lblnpbmad3jk453lyx1qzcmrddis59j3jsgc5sp929w4k"; -"docsurvey.doc-57362"="11qir5haz6k0caa7c3gf1iads9z5nwqli7gvblzclxv6g97n9374"; -"dtxtut.doc-2.1"="1szg0xvwm0jbzs8waillijzrff4kv04a73gsqh9c12ap427xfryr"; -"first-latex-doc.doc-15878"="13ngk5pia5vbrbb4jrrlq1lmyja08m7cy4ydcjasxha8kns001ss"; -"forest-quickstart.doc-55688"="1bjy0bfkb90nv2dbdw8hdrm3dvm1v0r0m7a0l44ckw48vnc6amvk"; -"gentle.doc-15878"="1l5fyfdbkpqlgpgi1hrnn2sz8hchlnp7z5s5584czafvs10jg6vx"; -"guide-to-latex.doc-45712"="1wc5pclv27af2zr6kjjahjzxxlab31d8970jvxr9lxiqllvkxyab"; -"happy4th.doc-20120102"="1x950scxbvcgwycpakflpklc775pknjab620g099dnsfrpb76f4a"; -"hyphen-english-58609"="13h2gli0pfjg797i4i86dihmnrpp52fjr1apj71fgjiq2453zsdq"; -"impatient.doc-2020"="03cjl3lg7k7p4h8drw7vcbw6ymgmm2clv6sgfs3hdixs8dmab1b2"; -"intro-scientific.doc-5th_edition"="0bzgi3zg0lm6zwjnac90ihaqwcvhindfdphjijv7mh11ii0qxlmf"; -"knuth-errata.doc-58682"="0rcyw7dqcwlnf9q421k017hrx5c0d9rra6rcr3n6wqmhxmdy5mn9"; -"knuth-pdf.doc-1.1"="0x2m2q8bjjfn8i05nn68pia1v5gsf4zcxgymymmd840xfziih838"; -"l2tabu-english.doc-1.8.5.7"="0dqmdr3lffhiaq7pg5pn6ia46miwq4nh5vimhd0qbf936amiv1mm"; -"latex-brochure.doc-40612"="0xba20sy8q10ac9hxwnz9axh853hrj06vp7mfn12ajax31miznmy"; -"latex-course.doc-2"="0z6q95l2vvxrspc04ki9wnrzhz76nynb5ai6969pgw6ihl68384f"; -"latex-doc-ptr.doc-57311"="0mamlfnxzi4lwh5cpss8zcfr64jdnf6vnj9fp48accrqdj2rpfs2"; -"latex-graphics-companion.doc-29235"="01zs32gck1sl9zlbhghyjmjwxyvw0jha5vl2hd10knyrb3z4dhxc"; -"latex-refsheet.doc-1.2"="169h1syday30qiw032k14fhxikdwszggvqz8b9ga4i9wwxf1vh4m"; -"latex-veryshortguide.doc-0.7"="17i8zmr7mjfrx911psdy9cbn05c5inn4ixqmnjkpr9sbgsninyc4"; -"latex-web-companion.doc-29349"="0v018lwf88z3qmzyqpyvfql7dbwk5a9r0wj3jfjc9cp2ksl8zf8f"; -"latex2e-help-texinfo.doc-57213"="1blnnx7bnabb8yqpx3sv62n8xygibyxva9d9s7iw8w7rr74w7650"; -"latex4wp.doc-1.0.10"="0xyk6w8jmmcsccbd9q4ikblfq6nacjjyrmf58ddjxkb6v0lzndph"; -"latexcheat.doc-1.13"="1383rsi21ma0291asi779bjr33m7fii019di8gv8kxwgci692fz0"; -"latexcourse-rug.doc-1.1"="027siznmshk60flxgra7dgzvwbmgwvckwb6r257b91x3rm77anv5"; -"latexfileinfo-pkgs-0.22"="0lf6pkxjqdilg10i3fwmlb1nvvag6c5bm6pbcd50jjbd1q39iih0"; -"latexfileinfo-pkgs.doc-0.22"="0qh84r86pszscg96gri652y6p5xx245lfzvx50qvzw77xn4iv6ra"; -"latexfileinfo-pkgs.source-0.22"="1x1sj91sd5bb0jihvp0qg52q8ybak4flvijj5hdq84jf0bw3gryi"; -"lshort-english.doc-6.4"="0pzqdbzynlwvpamd69cmfpa8jdcvq96qjr9k1fy3dxpzi2mapvhd"; -"macros2e-0.4a"="186qfgd6p825fjnwivvzvvpx1ydiiw4k4lkvs9gqvm5gmas7kcv1"; -"macros2e.doc-0.4a"="0faj1gxhrc1fsqniy56c35jjzmxbpgyc27ai6xipbdp8sjdqm6pa"; -"math-into-latex-4.doc-44131"="0k11j92h9hpxnyciczknhl83b05avc0rqdnwn82ssqi1k3qixibd"; -"maths-symbols.doc-3.4"="0z83qf1rz84cr0b1zvwlacf24pc5r8dn1cxiiyl0xrqncl3279ka"; -"memdesign.doc-48664"="0aij1b7l1kb2x44qn33m39k0kbhdrclmr25nmvzfn6yw42lh9fz7"; -"metafont-beginners.doc-29803"="12hhvlnvh8dj1396242m6yi0341cina7sxrv7pwzqxzzahwdvmgm"; -"metapost-examples.doc-15878"="1rslyjnw27b5br17cbf6mjjkcgyr49yav4kw12spm3vdwyzb7gxr"; -"patgen2-tutorial.doc-16490"="12b78p7jsrfi88rr2hf4118x3myxbiq741k2kdasrs40fzvfjz5s"; -"pictexsum.doc-24965"="00yd0945qiss5jizkxncg8a9bdsld7mkhaipi92bbn1ghqicsw5a"; -"plain-doc.doc-28424"="062d6hg4npy57307avvyd2sdxnmyrh5ia2rdb17p6cx555k8zxwq"; -"short-math-guide.doc-2.0"="1wjcjgw0xk4zx57f364cpl57qpxj3lq4lahlkbk6iiin1h9v2prf"; -"simplified-latex.doc-20620"="1cgf1p7p2ikda1nb0c2vhhx7ai6rd973pz6a00pr9yanxsvghp6d"; -"startlatex2e.doc-56809"="1nn9mcazsmhlb7gdw06qcyf3grf8sbgqll9j8825p64ahy35al6q"; -"svg-inkscape.doc-32199"="1gw3jp7wph0ys6372z2rgjwlpmmawdax7xpgrp4hzg5hxz748pn5"; -"tamethebeast.doc-1.4"="13shw7hcimckn7pp8pj0cr1zsi1wq6r400x1v6akpmwwjxkw09g5"; -"tds.doc-1.1"="10j98fv34p0mwgsgjps8mfpn81kbzghfchz9nr7r5bwz93s3ycsz"; -"tex-font-errors-cheatsheet.doc-0.1"="0pfd5qphmizhxb2p4gg6809xcx1rlfkwqa6vs4f74457chcwljwn"; -"tex-nutshell.doc-0.6"="1yv4l3il5wpfijr9h4k2wfvrvk5g472p6p94kcb6azfmrnxda6h2"; -"tex-overview.doc-0.2"="1agfya9rwvyjvip0alvibimz75jivpf19hp4jvlv7z0n9m26m9jd"; -"tex-refs.doc-0.4.8"="1w7hcd3qsdhmb2siakjg2hm3h6kxa90ncsaif9spr4xkxs03ib6l"; -"texbytopic.doc-15878"="0pnh1hsd6k434c8i1xdjq3ywrwylmryrsl86d6h7i1cnmzz4pwlx"; -"texonly.doc-2"="0h40f8hj03ha0ilpj2fx5kzzvdv0yplmr4528s2rmmy62l9kgdkd"; -"titlepages.doc-19457"="17ib7rpb2dhb2m724x66fdzddv8cqd808wxy5kkvx0vb3rl27hyh"; -"tlc2.doc-26096"="1ysb233rjb8gpl9s35qql1dny5rj6fn8ssy2dqdqsn5xj9pdasyy"; -"tlmgrbasics.doc-56221"="0sgbmlrzr0v9d09h04z9mpqxcidv9ggdfi1ibv83y85f5blwqirq"; -"undergradmath.doc-57286"="1z8my3fwqc8rfc1843j7lcmfka2023z9k0js4ygh1m8kilc2nrr7"; -"visualfaq.doc-38647"="168agj8vspwb6496rxx6gh5prdwx64ihc34rw74hwdr67nxh7ihm"; -"webguide.doc-25813"="0wid2sxrif3mm3lrs0s6pil949byviq4d7924yzvmf9hkrs5f03v"; -"xetexref.doc-56291"="15gb91s8zmqh1zwar2r3yca3ywp1lz654h8ha6xg52lg83vjzr2v"; -"armtex-3.0-beta3"="0m8z77lvwkrmk6zdlbxy1gcic8sgn3xwcnkgv9nfwxrjnxxmbhyr"; -"armtex.doc-3.0-beta3"="03inlslwgi0zgnndz4p23r40rdwpl4lxbxpc1w683c673b258hnc"; -"babel-albanian-1.0d"="170mxpwnnsc1g9s7qnlhjcryw79cy72d8c4m8bhr36i5c78my0zg"; -"babel-albanian.doc-1.0d"="0x5z4gfi6m9h5gml6wxq3531i1k0sfqrd4hxrzbz68ijzyjnzk5j"; -"babel-albanian.source-1.0d"="1w8bassqn35bxyhpw6cg65ya64x1dn9h35p4fxclcjjhmv53xgg8"; -"babel-bosnian-1.1"="1q9nplgxfyv877y5q5hm4g6i5dla5c3a9s5cax27pr1riccgh5dh"; -"babel-bosnian.doc-1.1"="127g44ww87gaizsak6lbmbr9yhjhy8k32zkah3189yi21w7ncs4q"; -"babel-bosnian.source-1.1"="0mlllv7k35vyqpa9r4yz6y23cgfarqbyk47blfc5b3dill1imx6b"; -"babel-breton-1.0h"="1qqayklpx89qmva8j6l6rhwinr0jik9lq1sgr6av9w0qzy9y1ifd"; -"babel-breton.doc-1.0h"="1q5xlc5cm91wa5lpg5wysqyhiq71ghf6sb8b3syxsqzxdicqwqrl"; -"babel-breton.source-1.0h"="19rafbvhd4fp6vb1pbgvaxrmiw1miw4j2n0dsi8fnmn1554zb25f"; -"babel-croatian-1.3l"="1d6xi12v3qr7gsknkfcb77q0wx5hyqpp0cyqq1spq44yf507nnlk"; -"babel-croatian.doc-1.3l"="1h15dzgmm5230ypaznk44607naj611n0mrhp9mjabjdqbsb71qdb"; -"babel-croatian.source-1.3l"="05zhbrvq0iwg7vbccq59rx2yfbaznixgr5nfh37k3584iwaqipwi"; -"babel-danish-1.3s"="1q5gl9dxl5qky0g263yfa4gwb992ngd7vwsb24cw9fd513j50b9h"; -"babel-danish.doc-1.3s"="1xmp93khcz4my2i1wrnzcb13bnxd9mnjm50s2jhbh8qaiywls7m7"; -"babel-danish.source-1.3s"="00dryb078fqckqjnxa2riq478j6d5i28j5cclv4bw7dn5naa3lz7"; -"babel-dutch-3.8j"="1hiv1r65zvn3hqql6pglm209nq9qhh5iidbm9x8ikl3q272f8y2v"; -"babel-dutch.doc-3.8j"="1pbg8gfc3z0k5caixlz5vfybhfxy8wbc0xls9kjld53ia9mvyy4r"; -"babel-dutch.source-3.8j"="1a40rz6rznawgarnhk0wh751sln2x9js4420i0758y2clf4rlhg9"; -"babel-estonian-1.1a"="0j7z04mcvjk72cad5l3np0x862nvgh7jxha8mll55cf18k9aj64j"; -"babel-estonian.doc-1.1a"="1nmjvvms0zijpc15rs0fkzli3pmidc4v4kzfp9sswvh43622p1b1"; -"babel-estonian.source-1.1a"="0x2a379m1b1ll16dr62dg5ai353p362dw9js4n0dn3x2wjbndmzg"; -"babel-finnish-1.3s"="1z49ix8w96walkq5p915amii7n73ahzhy4ijxa1b2bb0wzz4b1l7"; -"babel-finnish.doc-1.3s"="00aij1bdybgcg69995mjrdddzlr3hqbhmg8q9nq86cd29y1gx029"; -"babel-finnish.source-1.3s"="1930zxk4l6k5q4wcbvpvijv4s0gxp2mkxvblczn4gcbar10vfd4x"; -"babel-friulan-1.3"="0gfq4gyi720kp45vcbial0yrn9i2jyx1lzh39lci0ga77y01j3mp"; -"babel-friulan.doc-1.3"="0hnj5scfsvisf9k6iwh4awzqccm96apxrbwzlknpxn7x3zv93l0k"; -"babel-friulan.source-1.3"="09bzwmc1jnal4ikxciwas8y342rix0xksd7qcp39nwajyg8njdmc"; -"babel-hungarian-1.5c"="18hc7z7gki6jyglywmljlf37aff3cndszywa32kmprbn2qlfc87k"; -"babel-hungarian.doc-1.5c"="1imn8zlk18fcs2nsy4ml20xzkhpmv5lzzh28i2c2zv6klm1kmfba"; -"babel-icelandic-1.3"="12v78k2l9vmc07mx0wy8g0mjwryp1jf6ij06502h7jr55my6y5s5"; -"babel-icelandic.doc-1.3"="1mbgan8gv7hld0jym7qks13yph9lz0clkgpb199x3cdxmbvawpb7"; -"babel-icelandic.source-1.3"="09wz6pfk3vb4c0az1lgq35vmzf8v49iz9cd1ys7rhdssbcz6flv3"; -"babel-irish-1.0h"="0ih96jfa66jn1s8c3dpr0631pa17r9sch1lv1qqwpmsridp8dl8q"; -"babel-irish.doc-1.0h"="19k6gps25d8i28vcpbp59k47mxdzjn9d89amccr5si5hvg1c2qnp"; -"babel-irish.source-1.0h"="043ias6pyv22g8ywv5krlzj5ma98wpi0r44lmi4gfpqllkay5g1a"; -"babel-kurmanji-1.1"="0jp1aivn0pzn8yq1q79gvzwdlcz871apjg6yxx9x4wf8yqr8q1g8"; -"babel-kurmanji.doc-1.1"="054b2pj4iv2mnaffw1a6zqihp18765rdx6d56k6vj9kxf2gqrz1n"; -"babel-kurmanji.source-1.1"="0v6nh14816ai72rqc7nxd8k16bi75dvx2kbvnaavknxyr53pjwb3"; -"babel-latin-3.5"="15hnxn0660dbds675xrd0zsak4bjvlcw43bs6g87c4m6dqkcg8c0"; -"babel-latin.doc-3.5"="077jr35smbzmarsjl9qqjlbq2q6x4s65r82s42ds9nzfbgjmg0za"; -"babel-latin.source-3.5"="17xc21mb70aaks09cgpwg8qdqz1ll3gksah6fpz337qfmd1v4z9v"; -"babel-latvian-2.0b"="127649mzw9jp35mq1yqpavlvkvcvxvp61sn0yl4nvhn30d0dws68"; -"babel-latvian.doc-2.0b"="1dvcwyqvx5xw4fl58accykkmd9ksbg5a3yqalb6x86hdv2fgsnq8"; -"babel-latvian.source-2.0b"="1w8w1ayk1ixwsixlsar5nmhv70fqahx06ydraiyz543gm3vrk6br"; -"babel-macedonian-39587"="11wiv5aw0k77rvqwcgh4xdiwcr67q42rwq0mq5vcpfz2hb0v8i6n"; -"babel-macedonian.doc-39587"="0nsvnmjx8397xb02h2l00nd7ynz11f9qiqrpim2f18r55qmr0hb3"; -"babel-macedonian.source-39587"="08z4ca7kja5kb2azf3whgh0w7fabxs3jcijihm0vnzhb1809napi"; -"babel-norsk-2.0i"="0n173mskrn15pz6pnxyysavwc93w5cz57wywdnn2xvb574ka8jhf"; -"babel-norsk.doc-2.0i"="0a3ka4hfvjv7w2s90y7rk2vb4jsaqz85sfbnlmkfxlhamr937c0d"; -"babel-norsk.source-2.0i"="1d5h7zm7d3d58lmkn3qy8aazx4a93fxmziz68cckrxa7izni7s1f"; -"babel-occitan-0.2"="0s13mw7w48zq91kcx3pk5rzfg7d9dcjr8n8bvqsk5dvs0k4hk1dk"; -"babel-occitan.doc-0.2"="132kk66ya2j6d7cwzd3p21qvjqm96dvb83ny4yj5q7vjqiflkn0z"; -"babel-occitan.source-0.2"="1slny81jf77g32nxkvbwr429yi51gfpia6d1qllni978ivc9lagx"; -"babel-piedmontese-1.0"="0kcb4h1xsm8qcgqmqpgkqqxii5xvzpa2dvx6l41g3025ybbp558w"; -"babel-piedmontese.doc-1.0"="0c6ql4g2i43zxx2ffnvg2rwac5hshvwngj7999g371fndhfzs31n"; -"babel-piedmontese.source-1.0"="1xqfd8s659plyijsc13014zjhd9ndpi82jwgd597lw5d9jzwxf6a"; -"babel-romanian-1.2m"="0pmjpy2p30299a10njvnpl954kdazir149b3aggcljaq0j4zdnzz"; -"babel-romanian.doc-1.2m"="1wgimmy2vwg66kjm0kx0lcx3zvvhdczxc19nnwqfbwchbpfhflyb"; -"babel-romanian.source-1.2m"="1qq1j0hb6vp8cdiigc425m6k8wpf7rxzdcgq14p064xlxnmqrbp1"; -"babel-romansh-30286"="1hh4ashx2fban828gj37y46rm0q7w2j18785in1fwpir3cjcab8b"; -"babel-romansh.doc-30286"="0w4x7c9vws6k799ilw2w1p5d4qv2z9wb3bkaixb0p4gxmp6khamb"; -"babel-romansh.source-30286"="08v3db9g43pviw7fi87gcgj5xb5b2f07sll1slcvy94ffnmwlpww"; -"babel-samin-1.0c"="07h531h0n7lyi8jhc3v9clcn66nwg8x50k2absmqzlq4adpgdqmc"; -"babel-samin.doc-1.0c"="0rjzia85w9jz8hj6d6kvapcm1y74gq5wxirrlyqqs7ar7i11yp2l"; -"babel-samin.source-1.0c"="1p6br0ki7xpzrs4cpsak9n4mn39fzxja93dxb6dl00rv8f9snj3f"; -"babel-scottish-1.0g"="0qkki9838204xy9ac4rm5v72615iz63wclgpw49srwwzf698z3nj"; -"babel-scottish.doc-1.0g"="0vag7zmwsmp6pc6xd4p7i55na39nhmmkcg2mlg4xp81hgladi3rq"; -"babel-scottish.source-1.0g"="0k3dj8awj55azynbdbray872pigjs8m9l86imdx5hj7dvl6svdjj"; -"babel-slovenian-1.2n"="1zpw0zp4f5wggaqb5wb9r3hjsxx8b4f892z5w7wirazqwgmxzn2j"; -"babel-slovenian.doc-1.2n"="1lmjr0cs0j48d0l2qflg8hxcaqfbqfxlqsl5fj4g5icpha4nji96"; -"babel-slovenian.source-1.2n"="1brwg8sr19048wgn0fdbi2y1rn5ls99kij8i71i789qf32hb1jvh"; -"babel-swedish-2.3e"="0h6p32rjvsqzy8kdhr0f1zi301xnrsvb8l9k7g6gfwv26fpdcnzr"; -"babel-swedish.doc-2.3e"="11kshqcqn2187q8h1hc7ifjnf8cz774wdnd9m2ncfvhf52h2l6mj"; -"babel-swedish.source-2.3e"="03rp4n9wkqyckman765r8v8j2pg5fg9frbfxsnhq0i2mr0yhbr6v"; -"babel-turkish-1.4"="013k4sv2xj0ky344frgbkl2h836dzjl72hacgb6rcdlkzwyh5sqa"; -"babel-turkish.doc-1.4"="0qdcg64lykk0g0gr3y4sc9zml58spq2y4yvlhc3md20mp6l3ji8b"; -"babel-turkish.source-1.4"="0xk8c1l61vs547x7586m60x2hfqil8zq3ikpsj9733ykayfclifl"; -"babel-welsh-1.1a"="1778pckqmd6fwd3xh3yk1dzhxbaqnffbk9arhm9qy9qxass1nnf4"; -"babel-welsh.doc-1.1a"="1p27zrk4dacj67lfim236mpv2s08j1n5w1wdpyziz60hxv5phmaw"; -"babel-welsh.source-1.1a"="1gkryz7dng4919w9wn73bvc5cfcly4g7dcwh1ilci0pbr55k1x4b"; -"finbib-15878"="1dr1ivhfb83ky3q82dzzv5vvc8bl84iq7am0p1rc8fjlbj95i4wm"; -"gloss-occitan.doc-0.1"="1q00j5r6d2y3gf8rbh7f7rdfjg3mg1c3rrfqd69rxyam9n92h41r"; -"gloss-occitan.source-0.1"="1cb92fpzv7cqqxxa0img0la6hrgxw6azb6j2rslszk9hjghbcjdg"; -"hrlatex-0.23"="0klc0pb2b2dcixaqhgxinhy18rp0lwck7129zi5qnpygzfslpdws"; -"hrlatex.doc-0.23"="1dlxj4rv9gaxd6i4ns4zmhykhxwsacw6m3m2jmk2lkc3sw68hsyh"; -"hrlatex.source-0.23"="14cw35brx8mqv05zbgrvfmmjhxyryx7dmj8dk0fkimqbyvhvv9sj"; -"hulipsum-1.1"="1wfcsaff7rja3n0151ddzbfl9b3gkfkwq0vp35zcrd80xsqlw935"; -"hulipsum.doc-1.1"="0994kin6fvbk4j9rp53vjp6ci050zxsf6z3qi7zdfxifd269fhx5"; -"hulipsum.source-1.1"="1a5mkkl36dk60baffj3an2sa382p39j2sdrgadczj5r9pm9q0am2"; -"hyphen-croatian-58652"="0fqwf7val8hfdcqww828cfq3706wi0w0ypmvwkkllsx1nv2mqiia"; -"hyphen-danish-58652"="142jxvssj44xh1p8d0b298l0ri33blvac5syvqgx71cvsbwpc6lb"; -"hyphen-dutch-1.1"="1hxwpb67c2hzzfk6jchhzbj2mfxzywz4zqm3z1hz9r2ywahram59"; -"hyphen-estonian-58652"="1x8by00sb45acj1rkd5az408i0i2wjdabd992p4d599sf8b9dk05"; -"hyphen-finnish-58652"="06c9r6dfihycr4vb4bvnf08d3p94h5n5g0ayjpha6gl08ab6wmv6"; -"hyphen-friulan-58652"="102sxp8901hln47nj7wng556bmrn0hqsljlf0v0ll8lsngf85h33"; -"hyphen-hungarian-58652"="0d0bg0h78ij9b9anmdlwrlddd1xg09c2k5ganwnydbpj81c4z425"; -"hyphen-hungarian.doc-58652"="1r10gjxyk8bkqjiiz7pij7zy4cvspvhnimkszl2sv0zgrkgayw68"; -"hyphen-icelandic-58652"="00lnbm193g0zv7c1m47yz90gik1bd80718y8cmz5jhxz9ny1l271"; -"hyphen-irish-58609"="0kaf1as4jrs8kc7rr2jg3cjkxr0x4fxn88gqjxdjdac6xhlvg0w1"; -"hyphen-kurmanji-58652"="164q51fkcfslh1vdz19ilwjbrs0v96a4pn45d6n0cvv9vw6gi791"; -"hyphen-latin-3.1"="0l7lsp9igylrk4cvjff8lx8jk5biisss3wkcil26cca4hb1612aj"; -"hyphen-latvian-58652"="1p5kaf7pb5qxj6h3bglgnsqx9rys35i02piswwvayf4bdmv9sqx7"; -"hyphen-lithuanian-58652"="09a4636b77fc2rmgc2b4jxl174bjc4ji69xply0yls4b69727i1x"; -"hyphen-macedonian-58652"="006fg0snc4h98fzdzwdhk6ibhyrvqhs502wn2c1dnizlry05fdv6"; -"hyphen-norwegian-58609"="1sp47h5syhcb12nik26iy6xs5dyxrj5a53vzr0scbc0s746qi4gw"; -"hyphen-occitan-58652"="0v0yivzx0xl48isjlnxfzvlrx9gslg6srids1aywfqmybffmfw95"; -"hyphen-piedmontese-58652"="04sva2d6dxaick0j30izd7z71vpw8q7xx0xvihcvcgb62gb5bc7a"; -"hyphen-romanian-58652"="1720vcpvmm086k0ndlbp0rkzmz7f7mnmb4wn67jm53357iamkchr"; -"hyphen-romansh-58652"="0dxcw56bkl7ddqj9fahmghwsdkmi7ncr5j319hgcgnlbp1717rkc"; -"hyphen-slovenian-58652"="0fyzw8r6v07p04m44ky3n4vkkq1dmfkl58xyx65pcpj9399bdjy3"; -"hyphen-swedish-58652"="19rdzs7w80gf7q2xdkp1z2zc2hgq7mklfkrfdwzch2i50zzfxy6l"; -"hyphen-turkish-58652"="0zqizvrri9r9bldqds768bslyipqrs06hx96b0nn9k6wm1y8pvsf"; -"hyphen-turkish.source-58652"="0rjwv5b0jwnwhlp6ifzd6p8iid59zylp2wbfk5crfjnknrl48qn9"; -"hyphen-uppersorbian-58609"="0rvb1k16rs9hvb9xgf3yv79mh2gkndvk85blmjjsq49awwgkd8y5"; -"hyphen-welsh-58652"="1klj6ir4b918cx96jd772ps9fl2fljh8kwkakdwaqqi8szzr65d5"; -"lithuanian-46039"="09dncv4i7jqc2c28k992qm94iqg3x3nbnw5wqiva3xn3jiwx0fg5"; -"lithuanian.doc-46039"="17kac4d54nvd0bh0kqz00j7bm26vi4gnkbl5il1zb12g76r5afv6"; -"lshort-dutch.doc-1.3"="160r060gmw6f6lgbnyvfxafjpqvyr4jwd56ddkjfm3ir2bfl973d"; -"lshort-estonian.doc-5.05"="0dfwp7kkynpskb345i3yz7h5pvc8iljqg3q6l546vrwla0bmb95c"; -"lshort-finnish.doc-15878"="06madlm869kmwxprmy2c78ma4s8zk8mclzmd4xdl0r4mlhk4vdsl"; -"lshort-slovenian.doc-4.20"="0cwjg0z5vr4x93bz1khwl27rk8k7kpjm978iyzn6w7gx3wi87zr0"; -"lshort-turkish.doc-4.20"="00r6pv4z4933jw072djdasd2wp5j05wghln62ga4g6y6jblf6zks"; -"nevelok-1.03"="0c4zij8ihx3mz615jr4z150d61mj4ln88zrdbsjx9hlnandqkij1"; -"nevelok.doc-1.03"="1x7jwmp32f1wph9k03q6ly9nbmdpsrkhyvn5j83n1fj6nj6hmzqf"; -"nevelok.source-1.03"="15di74y4h7qgjh7gmmaingbg71jrlaiz1qxf960589k2xshslbi4"; -"rojud-1.2"="1cmpg4w2pqwvr624kc4rv7kvnf45c2ffqrryh0i7kbqgc22xly08"; -"rojud.doc-1.2"="12y4cph62b8rag4dxajpzy7y29kvnb3n0z99s2vcq1hfscyijn12"; -"swebib-15878"="1y5rrhrhcvjzz17lsl2y9h5qz0zl9gn34xwwprnns7503d1d2nfy"; -"swebib.doc-15878"="1w3fl5qg5hng8gsnykb9q86ddz48jdbyghizf5x31rjwiim53q6l"; -"turkmen-0.2"="0jhg6nd47y8igsn10m3bcsn61zydlwk3g1qfqpy8snz80rkyn9d7"; -"turkmen.doc-0.2"="1rs4jmqy5zrgk2awvvw8lsvdkzjwbfq65bm3m9c02158q63bw2i9"; -"turkmen.source-0.2"="1kz5qhyjax82mv74qxhsiwj83jijnfhgijdl2w8ic8lwc31q5ihl"; -"aeguill-15878"="1klri7b3isxwa9lpc2j857y8r9n9x1av865jm93ha6nrwlzqk7a3"; -"aeguill.doc-15878"="09lcp9in9v7vxck9kaql008qmcvba3g8glbm6rr5iag7nn2vbvj6"; -"annee-scolaire-1.6"="0lwc36v09a4ji5fz3pq9939jm39729k0k7hha4kkk20jc3j4jnds"; -"annee-scolaire.doc-1.6"="1f0qc5qvsrnjddp1kyrcigd8is2y9nsxc9x8a215p5xds2z5gc30"; -"annee-scolaire.source-1.6"="01mga2nif61mpkf7ifzhsj5pq7wzm2imlljap4c6wcrzb9zlhfx1"; -"apprendre-a-programmer-en-tex.doc-57179"="05779lk9v849k712wfjv0mhyzahwpl4n892ydamfdc5yg05bsnyv"; -"apprends-latex.doc-4.02"="1xzy7svb2xz6bdfg0f1r3whwda118pl7qdwygx1l7h4d1vqm2rcq"; -"babel-basque-1.0f"="11a26db60bwfhbx6zj42yrzzvf8nn8a96nq5mpw29xhxlpbhrcp0"; -"babel-basque.doc-1.0f"="04jf1brw3ljipdyxv3d001slc0iggjmq6hkr4b5jsa3z8gcivzvw"; -"babel-basque.source-1.0f"="17mz3bqi50ayia4nb2ikf60vgpnwl3i90gfbaq4692y354yvlnfy"; -"babel-french-3.5l"="1g2zhhkh0gl7d46fykrrwznl91g2wav93kmsw2gnlp1izwdsyb6l"; -"babel-french.doc-3.5l"="0hhrhspwbpcqkal88g55iakc5gn9jwlnm8xq4lvgq9qai98y9fcw"; -"babel-french.source-3.5l"="1cf9vnz87qxran7mpzhgjbk7wpb8wv2wsfd3xippxfkvrqh1a0n8"; -"basque-book-1.20"="03jh24rrjczpgj9d4w5fy9fv8w29wbqylx5s9n14jwdsf6f588ip"; -"basque-book.doc-1.20"="0sza7d2qx89saj6rx591ys15b8gvrnalrbrkk2wcjln1x2cb95jn"; -"basque-book.source-1.20"="15lgh24zyqlmqkw7wdigwvvkv6qwlpv4zrm2zqwgxj93bffa4fs6"; -"basque-date-1.05"="1hikrfz1z6y294zg00arnnc6any1iyn0gkhmv9j9wsnlvylcbnxk"; -"basque-date.doc-1.05"="0gifh2wlhxl5s2p816w06w5h51pg6gn2mdskhpgkq16shaj4xqcq"; -"basque-date.source-1.05"="1vjq5pqkan433wisv0d437m6hbmfqyds27dzwkyd233zq73fpjxb"; -"bib-fr-1.5"="0csd9a4j3hvgyczgnfnhp8n49j4baym7nw8sck38m86r3kn8n7ar"; -"bib-fr.doc-1.5"="1inpqvmf6c5zb091q5fxg0r2w87kacvg1yy1lyai7wq3ll0axvp7"; -"bibleref-french-2.3.3"="1r12767ayfh073559p6pdrfs9fs9g2dxcliyx06j7r8lyfab8d83"; -"bibleref-french.doc-2.3.3"="0kiijl5jhd024znr80g3xqdhz3jyg4vm4kyf1rcpa7dis4ffazpn"; -"bibleref-french.source-2.3.3"="17xih976gi8my8mdr8n1nfvq6hacicdk8a01s23a0sarj4qwxz0q"; -"booktabs-fr.doc-1.00"="1xkqh6r2q835xaa92b24fzf61jsm85280570hivvwnch96i4fnh3"; -"droit-fr-1.2"="1wz883z4a7g4na18z50vd0156gj6zpkkl49h4k0dhxwgqibh13mk"; -"droit-fr.doc-1.2"="1ss2j5jsr4h96rqcqmm89mprnr6w98zbsxy87jlmqavjjc8k8jq8"; -"e-french-6.11"="1pm1k7qb1a3h2b8kay9jwby382jxp3866b9m890rj9gfqdmwbfd2"; -"e-french.doc-6.11"="14719qp1qjcx4wjwcarirj7iz6qmjgwb95b308zqdr197y1cvymc"; -"epslatex-fr.doc-19440"="1xs9977g9g3i6sipkf7i9jdl8sdm69ci3161a4p7k66qbizi7zvb"; -"expose-expl3-dunkerque-2019.doc-1.2"="0xij1ycxnc3hfzkl0bfs03s0zzzv6xsj3myvykb6n836j1g66g2y"; -"facture-1.2.2"="1x0jqxq6jn2y5lzbk2y576g2wgaaqwlb11kpq16avvhxybgiywwg"; -"facture.doc-1.2.2"="1kcnzmssdnzfp8szs4c3psnxaih36clifln5kpdkgwd3hnkizl60"; -"facture.source-1.2.2"="0h2274fc7h8si7rzrinz94hddzfn073yvkv9hnvd9zlq35cyxif2"; -"formation-latex-ul.doc-2020.10"="1g964xll3y7llhcq1xih2zk916ikhx5jkq60il65z89fsb6v5jj9"; -"formation-latex-ul.source-2020.10"="184d2dnzcvx0f9di67433jw6b505mh3iv9g5fh30gq0344lfivx8"; -"frenchmath-1.5"="1fla63xk7qv8mx6lrmmqlwfkfz3z2gnym1vbyr2idaa7zpwn5y6h"; -"frenchmath.doc-1.5"="15ijjp0r7s3c32rr92cjc04rn871786wszsdbr6v0f42qic7jy7n"; -"frenchmath.source-1.5"="1p6c0ff81w671rp0cglvvsz29km4lxrxbhjv8wbq25ml09fn8vn6"; -"frletter-15878"="11gxmdwwzwwdlrmycdxi0y123hfikhp9jv1jjmhgsmsmmxsx13ly"; -"frletter.doc-15878"="1pzpz0q1hplni18m6wkwrhknw15h555qfdxfnnfrnrmsa7n2q2bl"; -"frpseudocode-0.3.0"="0ypiw6sfap27hpflbk0drnd412ylv9r307jbkkbhnm5lsmwaax2l"; -"frpseudocode.doc-0.3.0"="1cf6424l655rykyfvca2yl0lwdifgj5kgvl0fvw9ikayf02wh3qg"; -"hyphen-basque-58652"="1dy9fgbh4i3d9ar8wazwjvhhwzyhbys68icz3zjvk7gk9nvbm9aj"; -"hyphen-basque.source-58652"="1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l"; -"hyphen-french-58652"="0j41s8jl6449lys7zvjy9psynxlxlbcf23qh9sxf81rk5srzwkdq"; -"impatient-fr.doc-2020"="1qwdllmi0ci304smf4yl6g8ah083jrch9clkyav7r5qsxnhwxbxh"; -"impnattypo-1.5"="0kmyjdasybcvr77jrirp3s1i8jwvhk7j04wz6blawihidz55myvq"; -"impnattypo.doc-1.5"="1cgk3wk3flpmlw3wa4sg1s9ry6bz9vjanzw8kpyhj3d8yl7cnzbn"; -"impnattypo.source-1.5"="0qc5wz5a4rgvrzv361gq3i6h4hp3v176klgn6fhiwshk84zqccn4"; -"l2tabu-french.doc-2.3"="0c6fbmgwv2adlxbhl1shvpa1w6xd36gmrwvkjgdp9xc3q999l4dj"; -"latex2e-help-texinfo-fr.doc-57275"="1kbp36h6nlnw1h1lbi783jmwsznvi6xmv7szlvdc3fkc96qn5cgn"; -"lshort-french.doc-5.01fr-0"="1hdl0w7b1ablx7qfcvgniz7dcbgazb49b8wfw7c08hlb38gxfqh7"; -"mafr-1.0"="117qd3a06lpiqimizj12lxd0vba82lsc211b46ags0mwgrqhcyz9"; -"mafr.doc-1.0"="1m6y9mpsp4w9cnbln8pv1pn86vqj9piki4kg2q2rq5m9q0g57vsd"; -"matapli-1.1"="0hjrcjkihb29z0z2xspvkbmq8qj18z3yww3lgifxlc9ydp7bppd3"; -"matapli.doc-1.1"="1r0szrdmmdwjjmhhy97bdyxkbcx0xy1c6papnh58hllx45lbznk7"; -"profcollege-0.98"="0zacshfs8fdacplknwmsq9yckvlrfvn06azf71i0m6fjp7vxf14h"; -"profcollege.doc-0.98"="0pc8kghlnm3imch7kqds8rkxvf8ln4wgjgwfgc79bblz2bqkbgqb"; -"tabvar-1.7"="0350mqq0hnqcx7afgy2phs4zl1x8ipzkmkmg7lkabrhhwq2haa6g"; -"tabvar.doc-1.7"="1qrr3j2b86shaka288mhz4hdbfm0kz4fkjfyz2xf90cpgl0ly5ql"; -"tabvar.source-1.7"="1v39fas0k1wmjjzkyii54j5ycafm5kwcriq65j26vzkwz4ykb0px"; -"tdsfrmath-1.3"="18qqjmdh4hgzar37imn811i7nbk93zx5w7f7agwnzbxgy1kx2plb"; -"tdsfrmath.doc-1.3"="1vvbsq5aql1f5q0q6v5z1xm16bmb20w2jnn0d0rc64dw4dxnwpxw"; -"tdsfrmath.source-1.3"="03r9f335gb31zb2frpv6hk50c01sz6rwlqw9vdxf4ch2np90fd9z"; -"texlive-fr.doc-58579"="0ccpwl4wpp2py5x5sp240mbgdv33fhs1avc41lmwzgv7m4z5b2f9"; -"translation-array-fr.doc-24344"="128k8isyn4s0v496sykn22fqn0gfwyyk19kcrmxnc6clgxxfbdy6"; -"translation-dcolumn-fr.doc-24345"="0xakssrkxb2wc6xyy1yvx4mm398x3yq032b7vapqxl82h992fjll"; -"translation-natbib-fr.doc-25105"="0f0r1n8q3jkxsdcddabsgz9h9ndq4yffdpxdqxvqjmhfafhzwgkg"; -"translation-tabbing-fr.doc-24228"="1cih442gp6zf8nwb2lbgjn7a64aglyrcw3aciqy5pkdw09pwn0an"; -"variations-0.3"="0cij0zdvlv3icymqxsfn6mfzdmb3jrxnfa3lz2kz0xx3x8yn0sx7"; -"variations.doc-0.3"="0dwsw8j2bhk5cdw61xlcvlg152z6k6306zpbap2gjlfhf0z57syj"; -"visualtikz.doc-0.65"="1q0a1mhc330z8cnhghp2p46bxsmzz8cdba8hcvssglz0gsq5z5fc"; -"apalike-german-54080"="143ipz8vajbakcbr3rr4kwdh4xl939q0gxwyq0kajvkdgzax9yw6"; -"apalike-german.doc-54080"="0i1wiibv0v3c4r94mq95wv8q6yb8mil0pr6cmj66gab5np8m8x1i"; -"babel-german-2.13"="120912c0nk3zdvnrxp7pv78vnywbw68d0xc9iv8x2cwdl2hfwzrj"; -"babel-german.doc-2.13"="0nkblrxgckb1kxrxvj02v0mx18f3cmv905xpd56i3lsp7rhi2wjm"; -"babel-german.source-2.13"="05nwdy9ly2cdl2aayf573hc8v380avxlw568np9kfvf7nag3p7al"; -"bibleref-german-1.0a"="1vki9hg39xhn8xzbd4wq6vn6zk3x9gl9bm9n3wr214c5n5mpxkq2"; -"bibleref-german.doc-1.0a"="0q69vfak1yrv564qcw3nrklhq4sf62hi6l7z8w2hcj3c325kii56"; -"booktabs-de.doc-1.61803"="1ld7zdr88xjhnnl2x734rxr7h0fz84awapmv50p1kzn6fczrwyam"; -"csquotes-de.doc-1.01"="087c08c44811vd8p00l1xrkg5w6fsl8as64jq83m6gf1hfan9w4c"; -"dehyph-exptl-0.7"="00h4zwp6pdpxiwdck11vyglnhymkmlahzvk2pk6nvqafsmwz5rzp"; -"dehyph-exptl.doc-0.7"="1niraycxd0myvxh3p6dn90j21mzdrd2hrdvh8nxm7rn3npm1kl4s"; -"dhua-0.11"="16gq48zlsfk9llafs8379797v908khv954q8lw2dvzk0v69d0qki"; -"dhua.doc-0.11"="16l76rvba4fz3vfw8mzkmks7b7206h2dva5dgw3m0j30ds8d6vm2"; -"dhua.source-0.11"="06vws91qfar1h87d57c9f9cw04isjk0szhg2aiw7sc8ligs0v907"; -"dtk-bibliography.doc-2021-01"="1fhvvq3kan1zg5m4qh4ckhx2r05bz95fa7pbdm8l0jx9r5qhbmfq"; -"etdipa.doc-2.6"="1jp35apalaa1lh44dbn1zayavv1n3wkm0v69hgy8vdz73yp5yvhz"; -"etoolbox-de.doc-1"="1vchha7ymvj51jfnvl76rxv466lzfpxr6xcvwafxhi78w4bk9yry"; -"fifinddo-info.doc-1.1b"="15zp4xvszy07cy1b5r3k5x256lbalr5acrrdj1gx33llfmvm469a"; -"fifinddo-info.source-1.1b"="02pmj7a9hx4xnfjbhwg273a3wx4449542rs7rxkii4hk78xs5lwr"; -"german-2.5e"="0w1s582hpvmri7im4jsi75xjz8iij7yxs3n6nad2png1xaxxq3ic"; -"german.doc-2.5e"="0hclzvfgrc4ii80ywgjb8z1byn2ccqckvgk26fzdvcgg5j7v9x9a"; -"german.source-2.5e"="1a5svzkxqqnqzva8nb1r3z1rfhjyl5w4sgkfwj7by83df7fwgnhh"; -"germbib-15878"="1nrmmmq9j52yjasjjsxx40gjdbz617j66kwsiv7qzpkh9p2jy9sc"; -"germbib.doc-15878"="1sbvvjxls934s1rxk0aq46glzvrn46cdznh26mhpa3i28c8xv3hy"; -"germkorr-1.0"="1bqzh9zklr0y1fj7lh6izbzsswsx00wlwgkg9wl8dxvxmzhrj6y2"; -"germkorr.doc-1.0"="0fx39c00hmwv2wvngf3agz3gl1qs5jhcbfc377nxd0v44kbl6wga"; -"hausarbeit-jura-2.1.0"="09nf6pz7xqhzs0n7nafmmkpsy5ksvqvnwha80yv6rxasnazd940b"; -"hausarbeit-jura.doc-2.1.0"="1na417f6avcar3dmgk5wrggj99mpskc1j7fj4qkh33rii7yw6f4g"; -"hausarbeit-jura.source-2.1.0"="05f4qr5cz06k7hnjranx6sbqniv4h77dy0rrm6bg4dd6hrk474q6"; -"hyphen-german-58652"="12x6z459lmns56s7h15lhz0fvz4dw1v51l1a4akynlbs3wh1adiv"; -"koma-script-examples.doc-47523"="1s95a3vgjxrn34cpcinkyr1yw2rj8s2973np71yxrwzi9dqdjpn1"; -"l2picfaq.doc-1.50"="0mk8d082gcqlxw2x7d2w85sm6i51928pijybzbsh9fy2rfcv99xz"; -"l2tabu.doc-2.4"="1jl0n43bqbys0c9v0xb4sjql0gvk4r14ldzp2rbwzjsk8a39q8v8"; -"latexcheat-de.doc-35702"="1cpqcvqkkyb2bf87yjvc2migxawnacx5mva8dapma7hmwx0z7rhm"; -"lshort-german.doc-3.0c"="073v7zvk8xri0f05mr0ad770p81akl9b9cnia1q4hcma9fk89k10"; -"lualatex-doc-de.doc-1.0"="0vnmgs475bzbqi14m9sm45cwjfsbvbk45wkb8m73j1bnk7wg7hh4"; -"microtype-de.doc-2.4"="069d2f0jcg9m4fv8dli2dr9ags9gz6mkwy6fzz37ns4jzrqfsvwi"; -"milog-1.0"="0v5rxsa182n28dzd3l3y4qdsz6rinv3r6p94iy73r26j7jgsqd5d"; -"milog.doc-1.0"="04z8ya5gba7f5q86ch57zqbiz81s62hpdbn7b8jmkyy953g5l8vb"; -"quran-de-0.2"="1a9dqgrdh6vw6zpygslfq9d9z8qws9n614b5adr7pkjcdwm8zsaf"; -"quran-de.doc-0.2"="0fq3yd3grj31wyjvac4qkvs38hjjnlsygiihrxw22ddhsa4cl2jv"; -"r_und_s-1.3i"="04icw2n2vz98bk48kbqybb6x3wgzz8fr045133vinybx49nk8xxa"; -"r_und_s.doc-1.3i"="16ksw9wid0sr9gjhjkxk3696fcy19gky3cp9ia6rsfh20f9f2yw2"; -"schulmathematik-1.1"="175z2363f6bb0cqhcjrfc0cwbkcwpgxf1rwanx9hsjip0qc3v73p"; -"schulmathematik.doc-1.1"="1rhn4rh3dpb15xx7s862acppslj7qsliyr0fz137g1mbclhqxg3a"; -"templates-fenn.doc-15878"="1s91swqsysva49cjrb9khgik5mvhxcb3wr2wz4l2683gdgxlbgkf"; -"templates-sommer.doc-15878"="0z75xhawsmcxv4f24cqcvfi0r22gavjpg4si6nwrgc8sg82x24m6"; -"termcal-de-2.0"="13a79lp2lp0r1r1j5nc94adbir463rhprdlc9p6rk3qa7lh445pf"; -"termcal-de.doc-2.0"="0krnv111d82razivjks8ip9m6z1bllqhx47yzjw6b5af9ps1k6a5"; -"termcal-de.source-2.0"="0nn9vgxv5awzqx1zndl7zvgd5nhllw7kp8zj7snd1nqvz3wgc5n6"; -"texlive-de.doc-58648"="1wq56zn8i9kc9a4yawgb3rawnc59x5rdgf971wwjf0rm3l9iy6ph"; -"tipa-de.doc-1.3"="16gwc0dpdls6s2vdl3hmd6307d88gfzsa3kbw3vhl0z5iawvwj4h"; -"translation-arsclassica-de.doc-23803"="1ix5lafy3ay2bc9zkkbqw2rrw6ng3izb8d9p6rki6h2j7n0qj47s"; -"translation-biblatex-de.doc-3.15a"="12wmiwhrjw6m01jh6qy0qdsvh4n5rx52q5h4qs0nmzryqsgn1yac"; -"translation-chemsym-de.doc-23804"="01liazqafs3lh9ppipw6i6sljcjzr31nq70r83qgknqmb9j0yfl0"; -"translation-ecv-de.doc-24754"="06b4vhsgdphi6kdh5x4a2kl74b64z3y5qzxcpkn0hj40038z1av7"; -"translation-enumitem-de.doc-24196"="121raikamd33gabvbgwygrc8hyi3qhvx4hhv4h8wq2chrglj37dq"; -"translation-europecv-de.doc-23840"="0n3x8g6k3qq3f4drkhzygz4khxyw6isgxmz963xqp91s0y667gws"; -"translation-filecontents-de.doc-24010"="0d2ds8kc98yd1can0gzcngm7gsn2gwhriaxnnds5kz3z3al71gkc"; -"translation-moreverb-de.doc-23957"="1jbpmvcm9q73kh09mhrbsb2wlycwwm4n8il342hz4jd15gwhmy8f"; -"udesoftec-1.7.1"="1lq0n05v6q0p78jnq1wf67pgzh214lllcas4jxlpz8hrwk9n9v1h"; -"udesoftec.doc-1.7.1"="1gd4qhdr4wxgjalxgqp0d404w65x7r3ipdkdq82lfcyclqyab8fh"; -"udesoftec.source-1.7.1"="16fgvdzlxrcaxbbk9m9yxviv8v3qhki2s5kq8j065xx88zd181aw"; -"uhrzeit-0.2c"="11ysijqpnm3b4z7pnyg7m7kpzp6fiw42dc36gxk1aq55wsv7kk7g"; -"uhrzeit.doc-0.2c"="0rln5amx6vkny0pm4yhgvnmmr9akwcrd93db7bifxdp07hjbvj83"; -"umlaute-2.1"="0k1pjakg7x49lyvpabjaspwa73z659gj4qvgysm3rd1smkar6vy5"; -"umlaute.doc-2.1"="1x9l84zk5jnfasgqc4d35g10a5la79z5q6q55f364chc7bibyzis"; -"umlaute.source-2.1"="0ajdnhbdw7b0d8qxnbalv3867p5lrk4mk6xl9skmvmkzpbf4s9an"; -"voss-mathcol.doc-0.1"="1c7kzk2m2i8f6vqywnzfvcmv11ckanhcjxf72p4rgivw8f0lbwjm"; -"babel-greek-1.10"="1jp0a1pr0zasii7xzhrdin7m628xihaj3bf1w75y35qhq4lb19q7"; -"babel-greek.doc-1.10"="1463n58g9c0y1vcxc7p1q08kdqhkqzvb8l557xk8cmn3j8wcafrm"; -"babel-greek.source-1.10"="1sgwqxzsybx3l2hlj5cdc61z26cqxmjz8kfsbiavzfwa94mka2d1"; -"begingreek-1.5"="0mwcgc16dkm7r082ng69babnjzdhh60hwsryvxl17prj03l861zl"; -"begingreek.doc-1.5"="1dzgzpdrpkkn928kkzdxj2wdc99wmq720vakb8v2ssj4vabn2s3w"; -"begingreek.source-1.5"="1v6gb2jp2fkczrqzgwqyhlxyc6s5yps7zqqvb9ph68hvn85bngki"; -"betababel-0.5"="0m2m3m59a2ma30zkyqjc3h076dp74m4igks0dvrlpgx4sfqg90zb"; -"betababel.doc-0.5"="1zi2yxvxhyazjncfjv6dv8c733hb0g5sxr9x7wqqrkxlxgp549wz"; -"gfsbaskerville-1.0"="0n68mfx7026ymxlyhdyg9ppylh5g4bkwj95c9bfmp5bmym0q6dfi"; -"gfsbaskerville.doc-1.0"="0v0widjs2w65ppvzm04wzinrcyp8hcicgxp6brydjmx9d32yrzcq"; -"gfsporson-1.01"="0h2zy85jalpx2vyjszw0kkrav82zv549c82qik9iylgfwfk1amx8"; -"gfsporson.doc-1.01"="1zy50pqr9bzfncs03fg98ws41v0v5c9y36rnjm5d9i7q2zljapy9"; -"greek-fontenc-2.0"="14qib531ac429szahk2q1y6dk452s7c0fqs84k21al6yczvk0si7"; -"greek-fontenc.doc-2.0"="1ly26mysxxr3jfp6fn3zypb3b1fywmfzxz9h7j624fhx5ajxjlsc"; -"greek-fontenc.source-2.0"="1w6afry8y3yfps6as8xd55lwprqavi8xn1s1pm5g3mqkh2m99rqz"; -"greek-inputenc-1.7"="11pi613m7ny46l7v5c0sy55dyh7jw26bpy06h8arxgimnvms8gnp"; -"greek-inputenc.doc-1.7"="0zg48vvgdi9ad1p5iiiqi3pbhvn6fsk8148dc33sl8f70b72fpfw"; -"greekdates-1.0"="0g8cgyrw6lacr9cjig3q1g7rvjdwb0p40b41rsqg6lj6y7m25ya8"; -"greekdates.doc-1.0"="1sh4dgxfn55gg9vp163qj9nd6kbp03cb3nkg3hqlf6b1az486nh5"; -"greekdates.source-1.0"="0k8vyyxvi1i6kqnanfm1nfhbwllgn22ik57r2p357y69hfj3bs4f"; -"greektex-28327"="1v39z550xynw4kkqjqcj7izj2cghkk1g2swsy9x9c71sz95r2bw6"; -"greektex.doc-28327"="0g4m7sb6ppjj0nxgv7pwwvc5p07jdkablcqasdmj8p44ikg9vp59"; -"greektonoi-39419"="1dhbslqclyk5d8a9v9s4af4gxdy39b35zbbr3k5m53gsd0kcs5w9"; -"greektonoi.doc-39419"="0hmxx4pcirm2v5xpl3zyij8r1zm45f373dv18vxj4xr3sn6b7p14"; -"hyphen-ancientgreek-58652"="0lhy1zrg27748mrx8yz5qxpxl3nl460l5l6impiz3lbrgnld487n"; -"hyphen-greek-5"="0yknyhys5j5d34hlzw5wqdm1gw74p6bvx4dfx5kylvwjahj6ys5x"; -"hyphen-greek.doc-5"="16ikyzvd161hn95mi1swg0a390liwz1cq9534i5nvzh1vkyy4wrx"; -"ibycus-babel-3.0"="0az75laq5fxnvn12348c3985148isz4n7nv6hd0d8amanm80h779"; -"ibycus-babel.doc-3.0"="1256n1qa6zpq509rk02llcixw3qh3sgi9f649pv1hjk6xdy7nxfl"; -"ibycus-babel.source-3.0"="08x3knpkwifgi2zxv78bnfn10ix7l6rf5nhfqi6w5xck09l7fiaj"; -"ibygrk-4.5"="0krpzjn96r70z8rwsq52j0v1x7ppd766ngvf6xhny2kd7mshl9ka"; -"ibygrk.doc-4.5"="0prn5b6cjc9ljxdnd1ckfgzqwlc5vv4w435zvyz75r3f1dvbhh9m"; -"kerkis-1.11"="0hcaw35viqpsbpy82knib5lbf3ngvmmkga96d48v5s1zd6m7fwdk"; -"kerkis.doc-1.11"="079i5x6liqgnkc3ii65ka44r9pfpf7k2gxhkbklsb3hm51zs06ld"; -"levy-21750"="184jkjwm17ms75j86njpkr17ipcamca3r5l1fcg8vfv00ffj9fp0"; -"levy.doc-21750"="1wbxdyfxm80w3h8bq8z5yavdwdbgccvhf4hm697ss5yshp7l8gfs"; -"lgreek-21818"="0ry70b47s9bn8ixcjzsj0qvyvlbava2dn2jpmp5nrqqycihb6jvp"; -"lgreek.doc-21818"="0r86kjbayji1cha84dg37ajn1hnlidyw3cf4byq3x63vyvx0ag3c"; -"mkgrkindex-2.0"="01db35xmg9583hkr9bpflr6rj8bmvidaqahpvkr38bks21466sxz"; -"mkgrkindex.doc-2.0"="04p2xaycwszq5dp8s2h6gdm36l800ipvigblkm8m58bgycm553fw"; -"teubner-5.4"="19a788wm84k5gb1k7fn9sm53b5h3hwj45316di0gy3m4h8bafpby"; -"teubner.doc-5.4"="1hsq7x9g26b6rs9796n411dpm6hvylyr4vsryr0sbk67cnf30spd"; -"teubner.source-5.4"="114jgsrdvs5klrq2vd51mvwy2v7j9mhsmsq6fxamanm2asgvzxs7"; -"xgreek-3.0.1"="0xrk16l7mbkdm3mfi2qlx6pyqg23209nkzbpxiah04j1prchzdws"; -"xgreek.doc-3.0.1"="16fdvfzg0aly82svna22iryq9n5raiqgr5mshgl3ic104sy4z4g4"; -"xgreek.source-3.0.1"="0i9ca29dglp7cy0p7nnmp0zi9cm80bnrbdqqcskv3bfmdkqb8c3g"; -"yannisgr-22613"="0h61qn97l6k97zbgk0ghqgr4bf8fhbrb037gdskg2sgxb7zsl5wl"; -"yannisgr.doc-22613"="1vw8p9xk3aj3lfsq8a2qv7qd00aqx22fs3427j31wnl1iymwycag"; -"amsldoc-it.doc-45662"="0d4hwb7hywy56d6934448lcr6fdx7qchkfzs806dr7wfzfy36yix"; -"amsmath-it.doc-22930"="0xcwsk8q9q3nsz8wbklgpbw0vzjw7iw0chffzcbp2zsk6rypqf7w"; -"amsthdoc-it.doc-45662"="0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz"; -"antanilipsum-0.8.1"="0xz42icnw36dvkxlh31g8hvy37mrbafgihm7l3ivh1z4hg6gabrh"; -"antanilipsum.doc-0.8.1"="1rfx3aqdvl4gvcrpsqzjh9dglk34ll6qc1a889yz0np93psnwmkh"; -"antanilipsum.source-0.8.1"="02qpjks29b4fmma6qm43p3w1k8h28wv1blpwjnnsfq4ii6xrkn5s"; -"babel-italian-1.4.04"="15c2ii2pyg054jyn8miyqrbd02gazc9kz6hpdjgqz1mi4agpdm75"; -"babel-italian.doc-1.4.04"="1sjwk67gsqzn3b3q348k25a5gfgzdq84c5mcrmlr401h5knv9d93"; -"babel-italian.source-1.4.04"="0y5ixa44561h29lfqhb372by8zlpn85l9dssg3rlx5qz5n7bvssf"; -"codicefiscaleitaliano-1.2"="0im75yz3sw89ky5lcrcjhg6k6j4sgkjfn6v4srmqzcfdmn2qyx7m"; -"codicefiscaleitaliano.doc-1.2"="068234c0shvblzkcgl67a9s9whcbyjy3mjw60i8ljhs5z5wjrnc2"; -"codicefiscaleitaliano.source-1.2"="1vsb7dk4mlaacl9ls17lm4xdw27xzdgvng02gkfjvja1ja3cq4zr"; -"fancyhdr-it.doc-21912"="117826hd9zl15i8qf6d1pz2qz57l68a9nxqldxyk21acc29ifalr"; -"fixltxhyph-0.4"="1lvr7r5adw566q0hbvmmvmh7igcm8asl0ispd3lflik886ycmmlr"; -"fixltxhyph.doc-0.4"="0yfa6a6dvzx2jjy1jcw7phps4wxz3ysfhk5mxc65qss9kmc94mwq"; -"fixltxhyph.source-0.4"="0ksb42pc0bm64pgszgph6g0rnksd9fhb48z97bnd9jcsg5rhzi12"; -"frontespizio-1.4a"="1rdgh6wvxk0rhkadcrb1f3ymgxn81vbx489z16k88wkk1p0r4749"; -"frontespizio.doc-1.4a"="0mwdqry0h2f65vrki3kvqpjnf1nm5n9v3ljmn77nlvkarqp2kb57"; -"frontespizio.source-1.4a"="1p2c8sdrm0ay9nz0dqrcjigzsjki15fry6mmhqcm3gqrcscsk5x2"; -"hyphen-italian-4.8g"="0xxlpfvcy4frkvxjgx85nz86z0n9cwhgsdfmhgzi66w8c9c2r9fs"; -"itnumpar-1.0"="09cv6x74vs8m10fhk5ka6i1c6gzbs5qaqbk7i7mf2zsdg5w447r4"; -"itnumpar.doc-1.0"="14273y8zl42gkqm915271n15pc6srsjvfbnc3jhp5xcjcqnq3yfk"; -"itnumpar.source-1.0"="1wg714a0ipv9g81wgmjdrm4l4yar0z2nqxr5khiwihk9nrg26yc2"; -"l2tabu-italian.doc-2.3"="0bgfmn5v80rdhs9wmjj6mki29p28ip1d29rmgbw4jh4z6gd4sf22"; -"latex4wp-it.doc-1.0.10"="14r86fwhb9zafmyv05pqfi9962dpxj7wq94acm43gv8m2rsjp52k"; -"layaureo-0.2"="0ggab1drpspvqwkijlj2d7k1iwacd8bihgrj9qvrmsvdlswdjsd1"; -"layaureo.doc-0.2"="0vxa87pk0fq67zlnbzbpnig221isp1fy6qp30fphk7igvnjw8v70"; -"layaureo.source-0.2"="0mdibdz7hawfmc6bzvk3qfhs22pnmsnvkvvag31p3b4n25zshmry"; -"lshort-italian.doc-6.2"="085ydria5q7s648r7frl54sa1y4kyr569zvqjjkancfd83h873cg"; -"psfrag-italian.doc-15878"="0ssx8rw7fwln02zzscywivnhizgrb6w05awscvv9gf9n1qj6avsf"; -"texlive-it.doc-58653"="0vmwn6n8bxpzcfrzic5qg5k2vklbm6rhl9861zxsli0rd9396qn6"; -"verifica-1.3"="0i5bh8j5yjvql6mywfs617mh3pywnqd7z1m6158r3jpwyn6ki25g"; -"verifica.doc-1.3"="0sinc5ha8k3nk307q0piqwj56r2bh4pbxxyww29ygalfqjr755bb"; -"verifica.source-1.3"="1zn10fr9kv131w4id0djycy7492ch7gis27gbr5r02ydwm7nny1c"; -"ascmac-2.1"="18hw5yyqbr8ji39y39293z7a70czipzw00fzfsqcrhgdlid79sc0"; -"ascmac.doc-2.1"="0xzwc7kw7hqpcmisw5wm3n508n4zr4s207pizdhfm2q9mjij0jvr"; -"ascmac.source-2.1"="1rd5qmy9miximwv1n96h6djjmd3mdgn4b0955marf2k457bb71d2"; -"babel-japanese-57733"="079bhnmpcgaml555dgrmiigack6qfqx20fy85c75p4fsn2c93bmw"; -"babel-japanese.doc-57733"="0a479m8rq8l02q1w73d6lpfpi0gs5qdqfbl132483f2wwzznvnrl"; -"babel-japanese.source-57733"="0kjv78h69422dj1jh7s74pkdr3qrdxxbzk3czzfsc5rax71x9jhm"; -"bxbase-1.2"="1jbhxfaqpmjakvda2knxvgwli8crkwlhqa1i29mkzaal74f03i96"; -"bxbase.doc-1.2"="0ny2xzg6z92fpw4s012pf2h90a77d96csi4x0cqdlvzv1f7bqhiq"; -"bxcjkjatype-0.3"="1b2srzs5pwaind8pjsghkbq6hwf42ipx4bmcim2zbfxmzyb1ga44"; -"bxcjkjatype.doc-0.3"="163farvip06haph6dhwf123dk12rnls1mgvdsyvvszgyy9m96bgp"; -"bxghost-0.3.0"="0xkc69hq51qgdmjqnlyrgaird7p5lfd4mf84mkb726nnm1hhgq49"; -"bxghost.doc-0.3.0"="1b4sja3wz9782cny96lfbi6r41mfzmybc95b0dnd2vv09w96d00j"; -"bxjaholiday-1.1.0"="1y3rfdwf969381vn3i0si5268j298bjrn7b8wpcj0zp178scjv2y"; -"bxjaholiday.doc-1.1.0"="19qm278v8d1kvk3fbvs07bdwv0n5waxd7pvkspbw3yfsg0yy4ws4"; -"bxjalipsum-0.3a"="1j43iihid2akjgd9npyqmg14g0m57izzp8lnrpqz2ybbp3mbh0r0"; -"bxjalipsum.doc-0.3a"="06w601s7x4c6cc0wyrgmkz1vj19aynsq9l66h0hbi4hp52bh1ka4"; -"bxjaprnind-0.3b"="1q29bkdjw19iimdggy4s0h8h5vl2s9zm40q965r99b86r6nwf3fs"; -"bxjaprnind.doc-0.3b"="0f5lb2z10p9ayk5nka8bngzvr2qxpfwnh5b1wfdq00ra1khssqqn"; -"bxjatoucs-0.2"="19n1wr7i1mfrabmrsgnmvk5wgdqhbc9lfpz3s5qhnsqsz69rzi00"; -"bxjatoucs.doc-0.2"="0icd5zj0cabkvwjgncsjmqwx79d2rqsm7ddp54ahczfl6mfg7fwj"; -"bxjscls-2.5"="0hamg91pckfjm6222rgcdjvjh14z5sjv0h25hncivgciw0j6ci5f"; -"bxjscls.doc-2.5"="019bmkhv0cmzajq73nhc4gv7yv7c959dann36436y97znzgvryqw"; -"bxjscls.source-2.5"="0wh3b5cg5zvja5fxdy8bpdch777491i60xl9jj7v4rkd9sg9hsm0"; -"bxorigcapt-0.3"="0z4yyfrw0ga1gd8xmdj0npd40zrnhw1g4anfyswypkdnh4l87jxy"; -"bxorigcapt.doc-0.3"="16hzvpff790qsaxnwrxbv773pcr06gbavqirac8021g2sgn6h2h5"; -"bxwareki-0.6"="0b0n3yhq6y4dq13nwm40zyw6hn1jz5r3bawsrnaw691amvfb2blh"; -"bxwareki.doc-0.6"="0ay0rsjnvpi1g7iyn6dvwc4awfswd48n379qqys5xhzd19bncs0j"; -"convbkmk-0.30"="1hb4ahbgihnzqmcszxlq67bsiqprrxa9vf25q8yz31j70sg7s18r"; -"convbkmk.doc-0.30"="1h1iqcc1rjcvwg9p7xg5zq6sj5bi68s2cknsbwr6dbkx25ihwi4i"; -"endnotesj-3.0"="1rjraz5m7zqyj1j7c640ngxv7i73d03xh5wsmcaakc10h36n3pyr"; -"endnotesj.doc-3.0"="1sss0shcnz2knzghjqw41s17v0bs7dfcmg6x566fdwdm4mdg4dkv"; -"gckanbun-1.2"="0bf42j8ismm450431pqvqgwzd04xsr7qlhb9di867qdyiy6hbrpv"; -"gckanbun.doc-1.2"="1rpgm6jclifxzs4k5ybkn9pxsl60vl167jjhffg6d319g3miy7al"; -"gentombow-56665"="0pzvwd6qpp5r7is7iwahpjgqyc3ikgq1jy248kbn4g2kq38hffhh"; -"gentombow.doc-56665"="19sqdvw9fazb8aw8ss9v9sxc185dqcvw8pnimm0bkzkmz9jnp5ws"; -"haranoaji-20210130"="0r11mqkhdcvmv44z919w91qm27l8l48ra8014c6594lvwkwv3pba"; -"haranoaji.doc-20210130"="15b0v3p3dgb0008cjk811lwxbwqzxn73dm6zcqs3bdyq9xcdv6x4"; -"haranoaji-extra-20210130"="1n0wa9kkcx7d8jbczii8v8pnpgdj1hgnx73pi0m7ni10mm2sfn1z"; -"haranoaji-extra.doc-20210130"="1qmxiz95sivgkwy3y61fpki0vaq6fzl4w8brdzq48grb7mqbj6n7"; -"ifptex-2.0"="1skabihim6l8c3iifzk45pdsid1kkd24kdqvjmnba1qr40ywgda0"; -"ifptex.doc-2.0"="09nh0bkvbam80vsm13p2f6y30bjxai6p7n87xz04r9bgi6sdpbcj"; -"ifxptex-0.2"="1wb1laq1nn02klvjgwvjgansi4anmjaik04fl0lylr7x5996qa9k"; -"ifxptex.doc-0.2"="0bh8bqly3zzzzgs21cb51a06023l9xfig5qjfzrlyvfqms7wj19z"; -"ipaex-52032"="12rd8b6kbnn2hvsimmfirfq3nj436h2ckg5129qxnfnqfqr9pkl6"; -"ipaex.doc-52032"="1g2z2ichh3wdjmn9jjd48jic1b2xw5sb8sksqv0hm043hk5makaw"; -"japanese-otf-1.7b8"="1c0xz9mwgl1ywfks446647gndkwifh5kc0132a1g2p226mzs8hhh"; -"japanese-otf.doc-1.7b8"="016v8wnhxk8l57fcxh7p6hpvqlrwn93dsrxr736xkz4kvrzznjqq"; -"japanese-otf.source-1.7b8"="0pdsmlcy1h76nfvh19pibxywnmm50474g9yk9rj05p1amapnpkja"; -"japanese-otf-uptex-0.26"="0y0bv7m11g1nh11il7b74v65vfzh8fh3lzvv1ssbika8w83zjw6y"; -"japanese-otf-uptex.doc-0.26"="1qgkfqx1fbnsnyjgxg5iwcax1gz64nzq2sjlz38pi55h5gka4nrx"; -"japanese-otf-uptex.source-0.26"="1pn7k97px1b97lsydw5dwxkx3r8a2aa8cjrm2ffxijgdslb1nys8"; -"jlreq-58472"="1l63k8d3iwj5sf44cirmi4sy412ha54gs77mw6slzbxh2lg0z52d"; -"jlreq.doc-58472"="06r0k89qxx7hsvadah9xis2v858kz6imbn5w1jcwmb05skjmq19q"; -"jlreq.source-58472"="0g4689j7ica7vxkmhxyvlxwmn7k75bvgdzcb382s8ippp2c4vq99"; -"jlreq-deluxe-0.4.0"="0v27w13xymviphq1168x3kvc9anw1z1sa5l237nffj2cv7spg8gk"; -"jlreq-deluxe.doc-0.4.0"="11n5l1f3y8b7ak6yy3z0iy8cqslii7w9v52bnryi68yhn58kgyv6"; -"jsclasses-56608"="1m0nm7fh8i31qap9l95v919kj6kx13mgw3gpzvan0sh1fcby2dkz"; -"jsclasses.doc-56608"="12ncwpjgmiyy1rkmz3q0hvhykinlsnscjn3idhixf8s4qrji1qvw"; -"jsclasses.source-56608"="07imccrb44yv0lzcls2fvxkah419yqfp51dwzfj2if5jgh9kb3cm"; -"lshort-japanese.doc-36207"="0mfxig980jyzhay1i83d69p294hgbr92v3kk2a4z8ca3fwzy8w74"; -"mendex-doc.doc-50268"="0xgg4iwg8dvsl8i2dm4pxkpwylhk8m901nqfyw5q84hslfb92agx"; -"mendex-doc.source-50268"="117lm6mvjpfz36irl2j1i96lc9hfcjv18bryk6nw41sv4y6n26if"; -"morisawa-46946"="19b8nzkwdnqk61p1fc7yygjlrdimawmbam18akphcm70qx2h01dj"; -"morisawa.doc-46946"="1y218bablhn06njs5zqmsl6jvvsgyihm4il1x9722pqvvyxxf9q0"; -"morisawa.source-46946"="1flrf2c2jxpq33g26i0m2h63yd5jfy9bdh80idpx1m6bi6hhq7ac"; -"pbibtex-base-40986"="0h5yi27rmh7ajih3ww4wn3z746mkdwrvz1pn44kklrz9nqryqwhl"; -"pbibtex-base.doc-40986"="0980gdzdygb1frw0drf2pkk27xv4qq238syxpsbcf5rp78855byi"; -"platexcheat.doc-3.1"="04hvm19x4z7vq2md3p3r2wwa7iqkgkxnvvj1xx3s9145m6fjib5a"; -"plautopatch-0.9n"="19pd0p9g5bg7ycix2h0a8q3riwq69jb82bnc2i12ip0cy3nzjimv"; -"plautopatch.doc-0.9n"="0zr69jihpnd49cfr5s18p0av79ghxj36ppfjfjzwhgw4yfd4imy9"; -"ptex-fontmaps-20201227.0"="1ppzlsi0bv0nhx8lfx8hkg047vyrzm6jr5syhl5pwrifjq1wdwxw"; -"ptex-fontmaps.doc-20201227.0"="1b96r79zv61skxn4x1wp3jcvbz72syz02g4yq5f8bgsjarkgsbcr"; -"ptex-fontmaps.source-20201227.0"="046jbs402n7g7dyd1akqwx382rkn9m7cs6qr6nz1cpd7c56kfb9n"; -"ptex-manual.doc-57128"="0hh4g8v0j1dk4saga9wkpjjmw7vnfknzrbmap7fla5y06dzadfix"; -"ptex2pdf-20200520.0"="0s4b60gc0wg4wgxczzr2h1xlic0rk23a9wvfy76vysqzlsfmh0xl"; -"ptex2pdf.doc-20200520.0"="0ky2zh6a5d6w2aq8k9wg7p3cvp8l4wihfjlz3sir3ggj1rx2x6j4"; -"pxbase-1.1b"="1ppl310g2l5k318a23zdj7n7yadbv1zjrrr42fszwj7xri0zrwvw"; -"pxbase.doc-1.1b"="0lkgyn6l1xkfk5578i7wq2arp3wrlf4kvrmr88z86si915clqzbs"; -"pxchfon-1.7e"="02x4y5jl3gzgyyjkzd0dbhzb5k91a5vyvzb1i3n71dhmghqjw578"; -"pxchfon.doc-1.7e"="1dqwykwymgnlslmwh4m5bm1hlhczvi1f7nq974by8ipq8l3djc4h"; -"pxcjkcat-1.1"="03rci00d4p56ibg7yn18jn86mji3yj5mnq89niwiaixzb9x2s9g9"; -"pxcjkcat.doc-1.1"="0lj0s8q357gw05i0xfldzm7wgwc6x2b4jka2hjpayqshh1zm01wa"; -"pxjahyper-0.7b"="1hknk5s9z8ygrymhdgrzwx14b5pj1l82q1ia9pp6rm70x5d03s6r"; -"pxjahyper.doc-0.7b"="1icb67qaznbhwn84hjg9mks42calxk61lyybnj4459vhzjr8gmyz"; -"pxjodel-0.3"="0gywpypmv9c6bqyygyz336v7dn6bnx5ibz2p6f38paamk6bqbyf4"; -"pxjodel.doc-0.3"="16nf7za81mq77irbdqkxw2iwxgi3jpy5vh1fijp67bq3lx0az7is"; -"pxrubrica-1.3d"="1xz98vzi6cng9f2gj1xqbsvk3cw1h98q3yn1ijq2xkphkjv1sfhi"; -"pxrubrica.doc-1.3d"="0m7y1m7prfgcg20f8bmhqxpslxycw7qg7si4wr3pvcmmgv2skd09"; -"pxrubrica.source-1.3d"="1grr42aixxrxccjq1119ir0d0yialj89svd8yl0lzz852pp2jycg"; -"pxufont-0.6"="19d5bm980iqx0m54fdybllq1f842hmp7976zc6v5w7dbfhndybgj"; -"pxufont.doc-0.6"="0vnvdvpdwkwjqds23bif51h9myq4bzgj2k9xmzqzvan8xj446jxf"; -"texlive-ja.doc-58581"="0vbxdm3kai3qfxdvdsji2fnqx3wkis4yb49072mla26q4xf81jwf"; -"zxjafbfont-0.2"="1zcyvwsqn2w9x9w79lvi736r2zwrsk2xdk6nrrmkiaq3cakd81p9"; -"zxjafbfont.doc-0.2"="0dfh592niw8s6zxmxj1sf8h02s2vz8s2ywd291946bb72xidb4gq"; -"zxjatype-0.7"="1ap4f0yq4cmkz5djy7mpgp32l24jr7xbxd9zc0nv1fvnywxpxfcq"; -"zxjatype.doc-0.7"="005rr69f433bllggj997rhbwlbmsglaywi55az5j02x0036aj2dd"; -"baekmuk-2.2.1"="0gfj79zhyg7p300bw27akxzgimvqmagk7y6b4nd7jq5wvrv4g5y0"; -"baekmuk.doc-2.2.1"="00y0iglv170b8pz79xjc0kz3yjphbb6a9alk5gg6hsdwvc6gf1by"; -"cjk-ko-1.9"="00mnybbajapn25gmgk2m49skfmd0vi6j198sqmvjspz38b4z44sg"; -"cjk-ko.doc-1.9"="0lnldm3zarq2php9k1a3kdsw6iy3znldbcws7zwq7dinfhvbbjc0"; -"kotex-oblivoir-3.0.1"="0f0cgjjjg0ipka5c08qac3zb5mgwds9blska2rh6ps9i9ahknsbj"; -"kotex-oblivoir.doc-3.0.1"="0bkh1yyrlia2v606kw6hzbg7f6547rzpsgb5px31fg0jab05alay"; -"kotex-utf-2.1.2"="12klbs9as0immwm6v75ibjdhq7g5ybv276ab1ffd5a6nx0nksxas"; -"kotex-utf.doc-2.1.2"="0ppqzzzhkf9cqa6sqd5ys6m146xdnsz5v326g7d7m2b9104z9k62"; -"memoir-3.7o"="1gaz197gaqkr0207sxkfk84h5fzdsc90bapiqfinfbj5scman3ps"; -"memoir.doc-3.7o"="0vghqh2aywj3x197hr9m9rs6v9431anql5kg9f8qckg5lhrv472v"; -"memoir.source-3.7o"="0330h0xndrbsc7cxw3c2fzal0i1p7j4a5z4dq9qvl9byqprqlwjf"; -"kotex-plain-2.1.1a"="02y214iy349yz9x2l541ynhypwc0rlq3y97sk35dzhdy3cnvsmrp"; -"kotex-plain.doc-2.1.1a"="0hj3mbh74nzk1s2sff2sv1k7b2mrcs3bg8vn7kka89q8yf56gwmq"; -"kotex-utils-2.1.0"="021hgi7iw47b3c637mk0g4v52h5ygx5w1060bpcknjlbg0qb09aw"; -"kotex-utils.doc-2.1.0"="0l7dby446xxjwk7vl1h3w4xsid4dqd8zdspj1f457jy4qwjaqf88"; -"lshort-korean.doc-58468"="07660lrss97hswmis7rgc419h05mgrvsfrrwmnrwk5yn97flhhqd"; -"nanumtype1-3.0"="1izx9cjsd46ydhrl0ixsjz23nbk7mfv3swfk5ada0d4adcm7b73h"; -"nanumtype1.doc-3.0"="1sxap924dzf17vslp3n71r4mj4f98m9cmchq603c7ara1cyjk2mp"; -"pmhanguljamo-0.3.4"="0lvpdxn17n64ihznkkwrzj3qzqg8b7l9mr17f26a7slly5fjh93s"; -"pmhanguljamo.doc-0.3.4"="1aqbgy84q490br3r3660ggjm9bw1lvdvkgqzm0g6hfcvi0p4lf89"; -"unfonts-core-56291"="0pyrnydswlqhxacwqpbc1m3bzm8v4gcl3ka7w2mppp77l8a70drl"; -"unfonts-core.doc-56291"="0225vsqaj8l0g1igc4h8m94cfk6wv17vlnappdgxwws1fknz0x5m"; -"unfonts-extra-56291"="1i7skyjqlprf6m1pnz5l2hn67f1cix4n3pai6v1a8adrrx7vcfdx"; -"unfonts-extra.doc-56291"="0d3cxfm110lg12n3c9hc88lqmx77rcsil1s6yph384scxadlg3bn"; -"aalok-0.2"="039x5s8x01srm6z34wjcg9snhvkf3m4msbapacjgz8j35anvr5l1"; -"aalok.doc-0.2"="10wsnqdg3q7wjwpsrq9pakzzl7pc0y95vd8mnbdsgazcla2c08br"; -"aalok.source-0.2"="13g7d2jpx9sgm9f4q0js1ivg567nl9d000n648jr60fsg55jxms3"; -"akshar-0.2"="0g1pbihbpl3b7k7c19qiq7lcgx3zrfn15065dyan85bs8h85c2cw"; -"akshar.doc-0.2"="11a18b7a592sx3wha1lpy659hgh1wnka16zf8m0cbc99f867xfln"; -"akshar.source-0.2"="0g8j0015dm3mhphg06ma9dkgc28ywlihr6pcbi254qaxgk7kdn9g"; -"amsldoc-vn.doc-2.0"="1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x"; -"aramaic-serto-1.0"="0j1i5snrgj579zx3cn7z7dhi9rrq0ssl392r2vxykcxalcc8cmg2"; -"aramaic-serto.doc-1.0"="025nkiqh91laaj3yx2qkl5z0jcm2w0qwgqm545dd98i5y1a78lfx"; -"babel-azerbaijani-1.0a"="15siklcjg7wmpzgy059d8r6ivg6cib5by9a4l6n31c9pxncj7xka"; -"babel-azerbaijani.doc-1.0a"="0dncpgvjqqa41rk80n6wif8nzdqw7vkxp2056l6sblzxgh87fvz0"; -"babel-azerbaijani.source-1.0a"="176r483598gd2dfmfc2qhmknj913n3k6rk58mpfq69af72jq5rjw"; -"babel-esperanto-1.4t"="0p11qa0d496xb6hpj6qc2lisr3xk3k1rbnj7b88wcivfjwf5ypmp"; -"babel-esperanto.doc-1.4t"="0ra2iyai9vyjksfsdcv5b9ifvqmhlc4aikyzf3wq073sh9crhxh7"; -"babel-esperanto.source-1.4t"="0i1hzj701rii0hbp05h25633vs2cbmqgyc113m3g78i24vh2rkbx"; -"babel-georgian-2.2"="1mdsi9mq6ka6ahrgnasik0sxkhq97qa223q5iy4fkfccan30kb07"; -"babel-georgian.doc-2.2"="1iw1hbn5i0c7xhvcmap4hgiaar9rznr76h2mrgya8xj0czppxwv0"; -"babel-hebrew-2.3h"="1mzjkrjasm6i7qp8pvl9l0dwd4597hnhsnjljfqn2mf39836i6s6"; -"babel-hebrew.doc-2.3h"="1w45vylwaiy2bn457fcc8c4fv33lnjbznsk69z3ky8r6sgxra63y"; -"babel-hebrew.source-2.3h"="0cy281g25mn3pcm5m3d340rp9l82472zyqk09xdi05mxz2hwvnxh"; -"babel-indonesian-1.0m"="1nmz2vl80cs7d58hl22y9m2hlf4xzdw2brl2z9k56w2mk6rg510k"; -"babel-indonesian.doc-1.0m"="1bd7v0wrp85bchni7sbn4b7manybq1by8sb4bhzcmbw4b9dnc3yz"; -"babel-indonesian.source-1.0m"="0p89lrfyqfhmnvijf9mdhmjsr8wzb4hxr40rf33wn50ak3m8gm7l"; -"babel-interlingua-1.6"="0zbyfhfs222i1wdsfbik33m1asdaa71rg700s9vfbvfdvjcikciv"; -"babel-interlingua.doc-1.6"="1z7j47zmp5y3406da831kwxqq30mgxh2wwxsrkdjycnsswsywgv7"; -"babel-interlingua.source-1.6"="1y3xsscz9zxaih3752sk6jhh77ljnllmikiwgqb3xsvzj7b5fs8v"; -"babel-malay-1.0m"="1h4n9m38s560iw86cr88xzflizkd37nhgyl51xvniyvkz6nkhrxr"; -"babel-malay.doc-1.0m"="0c0jriwwkrll6sknd1c90bhipcjr3inc7vdn6cd2szlbx72ir12a"; -"babel-malay.source-1.0m"="0r1gzyi40yx8ikxkrdqa1hg33vciz1qbvibd8dv3qbia7mm11hqv"; -"babel-sorbian-1.0i"="11vbl2ybqkiq133xsl44waj9y718g1snv3k2jf640gxihpzkqj5a"; -"babel-sorbian.doc-1.0i"="0jv1p1k7wlq5i87isj0lhxcj3wxrz13wvjqnlfg2sksxa0pay56g"; -"babel-sorbian.source-1.0i"="09xk5fhfh9mgrlmma4w1z5d3w2fshdpvg5hg2ffyzz0w7jvpvsma"; -"babel-thai-1.0.0"="02n0zl8xa4y7r2n8zb1870b95inclcdmwq0llcspl54vjgds2yig"; -"babel-thai.doc-1.0.0"="157r19z20gn3fy9si8mn0c4zhgf1kpkz6jv8ag6y26qjp1c5g4kc"; -"babel-thai.source-1.0.0"="04x6d8q4glkb4w8ic5qcywxi009zy0f7dcczp2fibs0prhw1kmi4"; -"babel-vietnamese-1.4"="0xb8w1dm525xrvpsxy6y4n6m8rr6g895hysxbjcvv5x8bjvl2vx6"; -"babel-vietnamese.doc-1.4"="12cj6335qj5igap6hff1qrfz4ms4s94xv7vlwdcv1hs5gabqylaw"; -"babel-vietnamese.source-1.4"="1xdkjigwmmkbihczgd0hawszzmnn3j7fypsv3sx634ham8j02zzx"; -"bangtex-55475"="0gbjmkkidm8xk6hpkd0i0b778my5xf7hfwq3fdq2v7ca39bii0d5"; -"bangtex.doc-55475"="1xizgjqmwafjvcf0j25xh2gzcqzcipymhmhh0r56lwv02fd34b4b"; -"bengali-55475"="1rqwjn1vim77r30nmdmw5v50phpsfzdcx8nlxhxlvqsca3yqzsvz"; -"bengali.doc-55475"="1zxczyil1izzj9pnz9c6my76mggg8maxdign07qn4kzf8c0fq8jp"; -"bengali.source-55475"="0b4v7jrngga8znbfiafazxq6z333wa98prp7hwzzhpv3nxj6kbl8"; -"burmese-25185"="109492p6k58bdgs4y0nb1hfnk63pdpf0x4b7az8frfff4wg2jvb1"; -"burmese.doc-25185"="1lwgifmixkyxscy6ichwmc8lv26dwmcvy2nm68z2wq0cz7cihjli"; -"burmese.source-25185"="1iwnsjnacafq1w3n6asj93n7nfxxyslf69jj0rfrl05fai0iq458"; -"chhaya-0.2"="0vnq4i5sz147db3nvld8rqmyvni3dwzmzxwy94a9d5x7dm1b6819"; -"chhaya.doc-0.2"="1c0j4izh7y4ss79aipg7206q1m0fjjj0x3myc5xyfz8a2nnvh6k1"; -"chhaya.source-0.2"="0bppya8cng8mqjbchbgnbjp15clkcd6rfzwrk6z6rn060jwk0d41"; -"cjhebrew-0.2a"="0my3jp6pi5lbbhn24jn07gx95laq2p7fqk88pwic7wwyji097vxw"; -"cjhebrew.doc-0.2a"="09ldma056ipsamrd558z24k63p187ziw2bh8qgy4na20pp22wj0g"; -"ctib-15878"="0vm3aw2havsabkrr8sx4m6px9hi189vgsmqy0s922dlm479d8bcy"; -"ctib.doc-15878"="0q7jss1ai1jjr66yk5927psyvvmp1dwbr54llvwyc4z131g7qrnb"; -"ctib.source-15878"="1im0zhrw1lvzp9j26d9nh4m1mjhs5by6nai0dh2mrmdjw1i2222k"; -"ebong-55475"="1khaz8whw26znba0il6cam65q5sq9fb69clsk0s8qh26hp9xmlnw"; -"ebong.doc-55475"="0fa0kdipnn5hgfpjh8rz3l9zz97i94v45xmsxjgjn40xqnai3v27"; -"ethiop-0.7"="0h1h286nq6f2bplxxkpdg8mr70ip92c7mkj9lakxzcwacsj849xy"; -"ethiop.doc-0.7"="1aqgl8hvapg3p0f3knpirlgnifpkpw4jb22zncp1s26jqjc9wdcr"; -"ethiop.source-0.7"="1cc66b7ad2kfs4whzbnqdzfswn32y8h19bj3ad20ia24dggir5mv"; -"ethiop-t1-15878"="1xbkh7xx71d19ghwfq8bhjnf7jmapm13hp2gr6ggzavcmzf12ffz"; -"ethiop-t1.doc-15878"="1lafizx606kv455bhf125hl2xqhndd5mblkd0zyvqgyir9bawcd9"; -"fc-1.4"="0bw8ifh6sxgii5s3vx9d87m4rdfmifdvw70wmj2kwqzrij1ri568"; -"fc.doc-1.4"="19p5r28fzw0i7kmvvv93hiw7cm3lkcsn2hdn90k8m7jwy758qrdd"; -"hindawi-latex-template.doc-1.0"="0q35drybrlcfcrhrd5691m66nd17b0m6hkcsqazpb1ck227zih61"; -"hyphen-afrikaans-58609"="1kn57mzrbk0qhz69b1ysdqjv8xirsb40yz61jx146kqc4p1y96lf"; -"hyphen-armenian-58652"="02x9p12zc78w1x7k2kz019as42d5kn6gxfl4s72rd6dyrqii7bc1"; -"hyphen-armenian.source-58652"="0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c"; -"hyphen-coptic-58652"="1ry5srs6qr7z1xj1km0jsc3z278iylrfq79ji31kxmf1qs7rwpnd"; -"hyphen-esperanto-58652"="1vfrf4wby1gmw5gm8h4qkyqa3hsx00nwj2qs05m1kn119k0sg70m"; -"hyphen-ethiopic-58652"="08dyf72ygqh24h15na2ssl2f4w9jlffh4vhy6lvrw2y6kss1xr8r"; -"hyphen-ethiopic.source-58652"="0j55k0sh4dc53wbngadz4wy86k046bsi4l5a329044hk24v4ydm0"; -"hyphen-georgian-58652"="1ja7skdhwwdy3idgjf508dbhbpyl3a7cj9mx8x1rswywy924liqf"; -"hyphen-indic-58652"="02xnj4lrkvy7gs4vlnsvili90p6p6byh659mzci1ad4x36z4362k"; -"hyphen-indonesian-58609"="047j1835ny6l0ris6j5haw41m9id38r854mx384kfm48sa70bs9x"; -"hyphen-interlingua-58609"="1gc3c86zbjv6j1kw353xwhzrqrmq41rbw2ah1xrl7rxvksmzmsnr"; -"hyphen-sanskrit-58652"="1svx84qj9vr2s6pyxn8zz587ph37g615hi3g1m4q6glw9hgzsmkr"; -"hyphen-sanskrit.doc-58652"="1k6vsa9xakzwmjma4f2vm685cyb28rjjj5qmpb7l0fpqpmvndp1d"; -"hyphen-thai-58652"="0k35mjibmsrahiv71dbl82r9v978gwkm42xjnp3zb4kgc0h79kc8"; -"hyphen-turkmen-58652"="17bhr58r8sl4fw8w3gqsb8lvpw48vdijr16bdk7n6ma0183vd1bv"; -"hyphen-turkmen.source-58652"="1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw"; -"latex-mr.doc-1.0"="1zd948d9y63js7980g2bvxpf67hshh2xa3n2ihbzwhpw6l9cbh1w"; -"latexbangla-0.2"="0jh2x97r6j8lrl5kq5m4bvk139229fwf7r8g8xq7n0qywnfdr9zh"; -"latexbangla.doc-0.2"="0hgcqd8vqq67zzdn7mq4bps3q56ad3nmaq71mkcyricgrkn5xxmb"; -"latino-sine-flexione-1.2"="1k8inj0rl7mhsjyzc39w789jlafqshh9sgy99szxqbs0jilgfb78"; -"latino-sine-flexione.doc-1.2"="1wccb0ksrrysqjp68l3wnf6l4n3s64ny3cvxiqgalrf0mlfipxmi"; -"lshort-thai.doc-1.32"="16r9gx902a342q2mj570y269yw97yaj6hrbqrk4h49ihm695z30i"; -"lshort-vietnamese.doc-4.00"="094lfry6cqvpk02c3acss6581mgb7j30fnja1b3qwzxmyxjdblwa"; -"marathi-1.6.2"="0b1s7nhsmvia6sy4m3lj4iijacp4x40dp8ssp29cpr1hajb9cpxy"; -"marathi.doc-1.6.2"="158j3rxmy6n3j2hljwqqra1797d3b5j5ny5kgamkn2ffbhnfwmi8"; -"marathi.source-1.6.2"="0n15j37016xzq6yyik97h0kwawmwvhzs2nxg9whk0sjwbcj956ns"; -"ntheorem-vn.doc-1.203"="13lkgb4qjiblbfm4jcxgkxsf08zk90lqz02bxrmim1n8gvyihwcc"; -"padauk-3.002"="1yjqxzqsvk2mdsk837bgwqf3nfm9gh873bnir19wj5kj622zfh4d"; -"padauk.doc-3.002"="0331w1z1b5x15yb3xyxv008l95idv5yq9xb87da5r9p5fzfh1z0y"; -"quran-bn-0.1"="0dlwf4jnm9jmxa0q3fpcnq496zqn2z66jrmsch520xyxf3bsgk49"; -"quran-bn.doc-0.1"="00466c408q27rz6yw4wkiqarbf0z5rk2cxs2ahhnhxzgw6pi7va6"; -"quran-ur-0.21"="02r06www7n8mb8z7cx0wgvhawnskchnq28mdqmnyk4a7f59gl1yp"; -"quran-ur.doc-0.21"="1d86p5dkj9l2g8y1lq48bs92by5925w3zgh94mcl59i156jywlcz"; -"sanskrit-2.2.1"="1w2qni1pgzj2mafglzyvwfk11csfwz83gbcq1ihqabxsy3wqvpqw"; -"sanskrit.doc-2.2.1"="0i62fzaa6qy05qgb8p4vpv37lrivqnshhiy42zc75kldacbjivy1"; -"sanskrit.source-2.2.1"="1xzsgbx5z3z6zi7q9s4gjkq7xxvngifkrbqyva8m15nc0rz38hl0"; -"sanskrit-t1-55475"="17mqm0iapkf04z5wlj3qpk9qlz8nnq50bfbibikacdanv3852m8i"; -"sanskrit-t1.doc-55475"="14g53969gw2azpn7z81kdwc1m1hz8mafrz15kzrfiw9w6hh7s6jk"; -"thaienum-0.2"="16awnv395nhgm8s3n7w1x7x0h32033258bb0jp81v5nrnmn344wi"; -"thaienum.doc-0.2"="0jvggbnxinc81bn8glmyli746asqcpclgmvyl8gzbdarrnabij3b"; -"thaispec-2021.03.01"="1inic6cpbf1kf1hi6brhq5fj3fkwn95cvgjqwh7bxk9dxk1rzsh8"; -"thaispec.doc-2021.03.01"="0ki2jl9spv70f5hkzr762nkcylplb9z70c8gdp97whqg9l9mb8bs"; -"thaispec.source-2021.03.01"="0j69dwrn3qk82xgnwabq30ab1pf4xs3sfnxgnrksgmhd0ly4lpjv"; -"unicode-alphabets-54236"="1lmjf3yyr0zyg2b4bdx0n97vqfbnzyd929ginqrjxsgk7imi6l9p"; -"unicode-alphabets.doc-54236"="1sygp8b5191llj96lr24w58hvxsacsddah8a5w43a8g1cdqi0dgv"; -"velthuis-2.17.1"="1ki27wimj82h2dgw6c1f6hs93yg794j711x1w3vmgiwz3mdqkzdf"; -"velthuis.doc-2.17.1"="133f9scdzjncbvqqf9c5nj6vjszp1f235vrapg2pjlg018hlhv9x"; -"xetex-devanagari-0.5"="0i6hkzl2jbiixzrw2gvngnyzqkz0lfdilj1zz5xi6ypffi4vyihx"; -"xetex-devanagari.doc-0.5"="0ahcawr9872lipz33jrv870lj2601j593fwfqcn5x0jhas93ch6c"; -"vntex-3.2"="1hvpvfndmhbv0d25a26syp36a1035kv5wbbb7pq7ljnbaf4a9qfh"; -"vntex.doc-3.2"="0ssdvddzj738m6z86861dfnh1xvg3blfj7vb2z8iq1md01zvk005"; -"vntex.source-3.2"="1slib4ha6avplxfhmnvv7k7dbamlr8m8q6aijx9b83fy6vxjvmf2"; -"wnri-22459"="16hcapjdb5dx48gbcvk2bkpnp1w9knswni2vs8v1l9shxz03nnxa"; -"wnri.doc-22459"="0wpf06is1vkaw4ivhrz4hfii3qrgs71cawgn1fnm8fdzalgb2frc"; -"wnri-latex-1.0b"="06m6xwvm1pxz2bjf2xa7k3x6m70p1f5866wn5imipmhw4wjs2jp2"; -"wnri-latex.doc-1.0b"="15d9mcvdhs1jd574gm6a9ppxyy7avclvq54ikcmlf4vn20lygidx"; -"wnri-latex.source-1.0b"="02x8fdavhkxfnxhvr891adpn93yhqccs31w05h8f9hyg34jlnb30"; -"babel-polish-1.2l"="07b286ssppna5gvv5l9gg9lwprrzh9wn28jnr65ixr9w817kphml"; -"babel-polish.doc-1.2l"="1ssr8wgk8csj7fkjr0d4s9szm8mvap2ps8vbf4lr72z34bb6zmf8"; -"babel-polish.source-1.2l"="1jymxl98mwxmq0yq90mhrr7bq7c613rh1rnhl7l3bih36af55rwr"; -"bredzenie-1.0"="1mcl52mlbbw0yxbs53x9a7kh3xlaka9c7nszfajlhpvj4s3jr1pd"; -"bredzenie.doc-1.0"="1zgmhhyqf2bwlf0mi509nrnzqqa5g4qxr3zj46rsa8jz0giaig44"; -"cc-pl-1.02.3"="0cvyi72p74qx82qqw6cwn6kdrrsfw83ngwwkjrgywqr08q65v1an"; -"cc-pl.doc-1.02.3"="07s3lnrl1n7pjbm81bqg6n6q6lnv5r04df0xjc6v6dqbdq08s51d"; -"gustlib-54074"="1kqlqxwlx12hyyhsxyn470rgpzg6xw25ix1v5j4sski6nwspvn9c"; -"gustlib.doc-54074"="13yx3bzmbm1b1p5rbjdfsdlwxdpzdhhmm2xd05hi79wdfxbbby7p"; -"gustprog.doc-54074"="07qx4xvyqb4p0cx0macjgyg0pcxgcmdxmzfsx9ah5s0dqvminwrc"; -"hyphen-polish-3.0b"="121aayyqidlz8kprwkb4ydzqakw1m7a5ysz9zvw7clb65z5yd69i"; -"lshort-polish.doc-55643"="1d6q7xjplyhynicd599cqa44qhncpxyqca4d7lfbjq2p6rgx5if5"; -"mex-1.05a"="1azsp6n01qhph2my75r05sby7r3lsafydsxv8f5532dkb9r86p5a"; -"mex.doc-1.05a"="1nkr92d761c7yfb9aysni3ihidzw334w4180d6r15k1iwinrn2al"; -"mex.source-1.05a"="1nd7p7ssh79rrpv5i0z4246cv4wmjgy3by66bbrv7w2xhmh5819k"; -"pl-1.09a"="1j2a3vz3wabv3ai0k9xvf8brwljr5r2bi57nk0bba476vkvxbrbd"; -"pl.doc-1.09a"="08qkn286bx6akfrxrlbj52xylbvv00bvmmpin1sbpy342ij57lrq"; -"utf8mex-15878"="0inwvyrizq3mr4c78l036ib15d6v2bnrakm08hvxx6ck753kn1hj"; -"utf8mex.doc-15878"="1nj94nn4s662jh2wykvrwkiiv2xzg6v8q4iax18d20p75yfcn3v6"; -"mwcls-0.75"="13a1vldimwdjq9lna63gy6gcc9gnwirb2zrm8m4g170q9r2b01rw"; -"mwcls.doc-0.75"="10nc7ai9brm36hqhf1czs1vvhp9nqvbk4h8r9l02jsdjbf4rrml3"; -"mwcls.source-0.75"="1fdg5j1jrsdaavg20sai9ffrq4qyffkkpkij5czab5zkbmiz8kv9"; -"polski-1.3.4"="0p94rbih64pnfx7mnsqh8girkvx35p5d2jimi9q0dax8d28g6jav"; -"polski.doc-1.3.4"="01j8yak6swkwkf1pnk948si7ymc4hifd092236nv59l1vv4c77b7"; -"polski.source-1.3.4"="1svpvdcvb89l8i90sf2kdc9x0jc9a7969a36mcg3ckhxxhjji516"; -"przechlewski-book-23552"="0qn5agid0s57a8bdlha8y9m99xpcvlqknq473r6995qkdsrrdxl6"; -"przechlewski-book.doc-23552"="1bp9yqs9y28nbzwb183yf8h5862pm3iw1jsi8c6qzhsrcwr2b2jn"; -"qpxqtx-45797"="123dfaqzpl8h5ia08swjmj4h05ncz3ishsh6rbcm5px35ccrgjld"; -"qpxqtx.doc-45797"="0ng1h0yhclki35v1w08r2di3dvf9rp78r43dfa752zr8agrfd713"; -"tap-0.77"="1ci65i2k6n0h9lklgk41sdq4acp5655mps77j9gcb65yk4mdl6c5"; -"tap.doc-0.77"="0r8y4jzri83qypvnmgchnhrd0yi7j0k753zmnwhzxqg4bvki10gp"; -"tex-virtual-academy-pl.doc-34177"="1kb86nn5vp1b0sy21aw9wlla1dwlaijppzq7728bmfs5nk1dnbjv"; -"texlive-pl.doc-58649"="0wwyap4jnj80adj1a6b1gp5l0a0nzkdyi11am5dpviy1ij3wbw0y"; -"babel-portuges-1.2s"="05vvgp1vblxr50hxgv7sl4dy3pvvhlagjgxsg1nrhsapw0j3vgm3"; -"babel-portuges.doc-1.2s"="1pksfsiv020dikrj49l70annfc4vjxmaykj800bsaklnsvb2j1mv"; -"babel-portuges.source-1.2s"="1k4kmkdcrrrxf51rhs7wrv6irhyfv0vaxiwps0k17cxr7qsm5a3y"; -"beamer-tut-pt.doc-15878"="0ayh3kbh11l4nyyzp2kcwzn0phqhzawppy044iyl1wwwc2v3zx5b"; -"cursolatex.doc-24139"="048s5fg8c19s3zbl2dkmh8ffkicb8fd9n46m0iqrc39i0wrh7p12"; -"feupphdteses-4.0"="0sgg5wi5iylsz0y2495cajqdp8nzlsps3x7lzalx0qpjid91lij3"; -"feupphdteses.doc-4.0"="0ish03jv00i0crfzhjh2l32cspk2r5ifysz5prd6fwhdrmwmvm93"; -"hyphen-portuguese-58609"="06dxp3qddbh26wv1wpwml41vpbm4y6386vgd4xn2107shhbvhqpy"; -"latex-via-exemplos.doc-0.5.6"="0d5c0bvg71nw6zasl70sdq62xhimc4acsq7vi7mlkjx3q8x7s6q6"; -"latexcheat-ptbr.doc-1.13"="0m636j9gdfpm4j1b679z5qw5ygbm6jp8xl9dzy6v5zzy695fcgaf"; -"lshort-portuguese.doc-5.01.0"="0wg51rjcayiizkz0vvjkirrx19q8fbnfrwilgh13prlbpams1hsh"; -"numberpt-1.0"="1f4hmqlkfzqm8c4q9cbcqsh9pkchnylfv6gfzafgn9v3rdksg2dj"; -"numberpt.doc-1.0"="04hdl6zrzw4zm8cihvfidlnjirfj7zlmh9mb7nzzq68cyxn30256"; -"numberpt.source-1.0"="0ha3v5lgn8sycfxs6hlbdf7n0b8mcl2mny2kx37s1bib0h8i0bxg"; -"ordinalpt-2.1"="0nia32ms50727kn080xm2v0kjzws5sj6jdy7kglp8wkipvc6nw82"; -"ordinalpt.doc-2.1"="1nwfz0q6csg7rg3hqgddjbiz8f1nfcgghiqvj2wxqf0cfjh8zb95"; -"ordinalpt.source-2.1"="0rzlbngvszl1sjrigpn55i7a8rwnj9sy76c7gwb43d4im1ybd14d"; -"xypic-tut-pt.doc-15878"="0d9ivdz5jnhnh3pg8qb2jn7qfxad06hxff65scyhdd6wbsfaizi9"; -"babel-catalan-2.2p"="0brmmav2iwsw46p9bhbq5nc09w8wxfbsnpb6nrbx7zx76h599fwl"; -"babel-catalan.doc-2.2p"="06lb6gkmidlps7vs7ihqg94jqnpxyih2dkypbr0j46whs5nb80cv"; -"babel-catalan.source-2.2p"="0l4c6wxszawd0a7dd7fpljkngmmh1p7i7imyhgfsjyli6fpxmah0"; -"babel-galician-4.3c"="0mk67w9lhp4nfbhrzyb1ngm3rmdknvv8nlqb8601hrglj4hzmrda"; -"babel-galician.doc-4.3c"="0pzpk8d8hhvgsjssy67hpgvjb6sh3lfbn6f5cbpqbhxrgllhpgva"; -"babel-galician.source-4.3c"="1awy39dlr086hc807zc57l7xk6zqbkwrayvzfv8ch1mqnl0d3a6c"; -"babel-spanish-5.0p"="0r21656nzsxsacspkc7bf6hfq49l7cv2in2icd7z274dj75b9a15"; -"babel-spanish.doc-5.0p"="1jgdkprm15mfcbc2dbds5nprir4vhzsqd8gfk42ga2ayiw9yn6sh"; -"babel-spanish.source-5.0p"="189rzw1f7d9scw16ryp5hplbg27rhhp427wqh9c8bg70mam81pcb"; -"es-tex-faq.doc-1.97"="0wp5jx1qs4yp3y4qpwqhpw7rnilw3vb2z5xb4lzwph6zw27jf6sd"; -"hyphen-catalan-58609"="1aqn66448bbiycmjyhbxikr4l5pvjvl5vm8gpzjinngiw82v9j98"; -"hyphen-galician-58652"="1l0z14m9j9w1c9kkm61r1s4q9fvbblhdbrqhg8gcddfh0b85qllq"; -"hyphen-galician.source-58652"="1979y5x7b1x8j9v4ifc7k24zb6pxd00z0c6j9knndcaj428mf135"; -"hyphen-spanish-5.0"="17gq675kb397kqd87qg4x03wj2b5zkjy8ynzpq2h1flh1lf2zfwp"; -"hyphen-spanish.doc-5.0"="13kmgf0lwxm54gs39lm8vgg2hhajvqwviql1chhv2l7d66mxrcrm"; -"hyphen-spanish.source-5.0"="05r3c2m5xfs6yl52ms6kc95v3x82zbs4py9ip6xznshfs5xakb85"; -"l2tabu-spanish.doc-1.1"="1p83xflgv8x7nq9mylh468zn3hz5pv3zxprc63q51fwx0ylxfdbk"; -"latex2e-help-texinfo-spanish.doc-57213"="19rxbwk1xqhsp7wkgrx50q984n77lqx9zxy5s4741wfma69p7g9i"; -"latexcheat-esmx.doc-2.00"="1d6nk9p9adlhgr28mnnizrxzzqlk20zw2clcddqlaa8pn73dqhcm"; -"lshort-spanish.doc-0.5"="0ls50syrg3dl5dl5a3fi33cr9j990l2xr6pribn1vqglsqrh191l"; -"texlive-es.doc-58221"="025q4pn9x88qb4jxlczwxhw94fz780cxkyf19z6c06wbvwgv9cy1"; -"2up-1.3a"="1phamhfskhhyg5s3ab00mv3wsz3wg18j1dskq3x1mpkc5ys9a022"; -"2up.doc-1.3a"="0ijr2gsi7ywp72ydpyj0cyxwv06vc612cpm1inkx8rhnn6hjxbw6"; -"ESIEEcv-15878"="1zg2i7xl2fkbf01a9h9wsmajj56m2vif7sl63f9008i9k3nw1774"; -"ESIEEcv.doc-15878"="0vr6jmxwx8jhn1zcnry5qlm952dvvac52a1ms7xxgcrhphl157m9"; -"ESIEEcv.source-15878"="0yp924d13y4prbn1sqlbbazlfy09n5r4rbha4fhrsav7x1iyf9p0"; -"GS1-22"="0l3dyhv7mab9c91bl2zzcwgjzqhjw9v5xz7riy5066xw0w9zf382"; -"GS1.doc-22"="1cal802485nr6hydaf5irbn91wrcqg3d5j6n4pinwmapcrw9kjpr"; -"GS1.source-22"="0dsy733m8lyk9b0rybxvs6iacn25c8gjyyllx9wxjacxkyzcsjll"; -"HA-prosper-4.21"="13kia2sxxlfmlwawkzb11ypcqjllcz61sw5hlqwh0wq938hbkjwn"; -"HA-prosper.doc-4.21"="09jpdzznzyy3w8gzh8yls94y89il06jy0wl263xs9px38000ifik"; -"HA-prosper.source-4.21"="1rcihawsrxakxdh56by0p1vd8hzz1np654r8jsj6m10l4gcmvwd0"; -"Tabbing-17022"="0rf6prndsh7wqkkl97qnkq3i7791rysrnvgzq7ir3bnpighdnxk5"; -"Tabbing.doc-17022"="0ic0ksmgf39sw7312j6frl58iw75kbf0fi1f63z5q30yl94hbm8f"; -"Tabbing.source-17022"="1fx1lklvdzl39bb85vgdlvcrjvs0ph05qazslv8k4sb7ad4lmd5l"; -"a0poster-1.22b"="026ia95qflhgfbd9c32yagm1f08lnr9iyh1l2sd2b0hf5z27z4g8"; -"a0poster.doc-1.22b"="029mw747qln0xcnwalw2mw8iz5zzarv9qghcwsx9jzhqijmcspg5"; -"a4wide-20943"="0jw1d021vrr4f2sv94mw1jk7ma72m84idmq62imwqy23x8nfccy1"; -"a4wide.doc-20943"="03g0vwfdcczgkpbrri3wfhfbrq6r6iljpz5j9rllr2z5svlrjf4d"; -"a5comb-4"="00801lhrnv2qkg6ly949csp4ign89cpsbd70fcyb7r7zkd8lxczi"; -"a5comb.doc-4"="0bz9x4297mpvv082d0qjfvynflrcgj6rn9jikwikpvq8wlhz0fph"; -"abraces-2.0"="03283ybi97v520l84jwrn75lf0f5f1mjfnc8j6rnqmpghphynrkf"; -"abraces.doc-2.0"="10n4252lliivzxf1zi487jiaamabmlx29p2r2qr9y0z6bgkr2ahk"; -"abstract-1.2a"="173bimxd0923191xfjjk7x29j8xs5kxy7ih55l1k6dbj0iwlb9g7"; -"abstract.doc-1.2a"="166lhh2vi36qbhc5gm3xx96sigksslzb17bpzncycf0zgkh7j0gi"; -"abstract.source-1.2a"="14f2s393nd8q5kb909rj8r15apf48rg6na8yc45z2hl9ksfwx172"; -"accessibility-2.0.3"="0d7xrsdanx7wnnmc983rfy00r4290rigwx5ils6pfm0br2g5kfsr"; -"accessibility.doc-2.0.3"="17gxz1lm39wh2a235wk0s03jc7jxd4bl0iqj04v02m994gz43y3x"; -"accessibility.source-2.0.3"="14av24zcjqxq8v92yni6aj66cblnfzb1f07hbcd3ljbycw14ii44"; -"accsupp-0.6"="156yax2q84naj394xzr8m7hfyl1j7pziw8d6rzkrjjgxs9p9az1j"; -"accsupp.doc-0.6"="1ak7xv0hhghgbwmcviirhh1x5y9pb4is8h0a32kdd4hdxjdm7c92"; -"accsupp.source-0.6"="0spz8640bdzmirlnc3rwynzvgy5fi58vfs802jzbqxb0ypdg14s7"; -"achemso-3.13c"="08m9sl0smkn6nm4693pwmd33aqrxnz9yg95pg6w1v1c8m5y7pw55"; -"achemso.doc-3.13c"="0f34lgxfjgd37qzmkymm34kjipw42l7dhfcqjc4wg15zhdbr7654"; -"achemso.source-3.13c"="154d6siflvq22gz5dyvcxp601zr4wjr6as0as1iwy7w8yrhpd8lq"; -"acro-3.5"="0cpajq4ifx584qd6wrmpv0ga4g069hw8387sa6gda4kmzck9l387"; -"acro.doc-3.5"="196gs8x2hsdvrz9l99fdwwkjg5pa4payqga1yhvk7176rjxqln84"; -"acronym-1.47"="1gq7j83gjzlfbnrnz1cl0lihpdalsn6ww6hqxdfxikm28vynk88g"; -"acronym.doc-1.47"="0zscjwg22s81awq27lhqs14davwbhf5y4zsl9dsq2135rppmmyvv"; -"acronym.source-1.47"="16dds23mj3ha1b64fxz2dnxk7wsrcmhpmpz0zgqda46vaab9qiw9"; -"acroterm-0.1"="0snnpamdf0qqqf3nabl2f4pnabpjxjn949s44lb8wb4lifndyj8d"; -"acroterm.doc-0.1"="1ybgfy3x0a3dz5p2gac2w4ai2yc84i28vi6x0bq61ff3v74iqdhc"; -"acroterm.source-0.1"="1gja9j0a0v22qqdqy5f3ivrwablrz550gp7nf20054cirjzgr6f2"; -"actuarialangle-2.1"="1cb333pky7vq83gfriza8afy17ag9lm81zr2f3nbjz4vrk7sidqd"; -"actuarialangle.doc-2.1"="0bwyj15r2bf3bqc7y0dbz03bwccwlh9ygcv1frnq6bc758rfksb1"; -"actuarialangle.source-2.1"="169m5msyy0braf61jz721isba94fx5wxinzfsr2yz9hs6ic62dg7"; -"actuarialsymbol-1.1"="0g8vm5wynrlj0764w7l9wfx2zw6ir0hik8nv8djlc96qlp8cm80r"; -"actuarialsymbol.doc-1.1"="1kqfn2c7rws75yk01962nx2ra94vfh2j8rnfqk7qkip45x7ya172"; -"actuarialsymbol.source-1.1"="02s6fiv0i0a1jzx4jkbv18rbmnld4gzhv2dfa1gijvzwzr1rpvp2"; -"addfont-1.1"="05a413mb0ksviwbl0y1a14j8y3np5ra5sgjcnbrslrvavf4q2spw"; -"addfont.doc-1.1"="069vk1d1ig38r6a5a87fblq4m429crp79xqccrsk48ixswxafj95"; -"addlines-0.3"="1rkcpk1c8in0g6dgyc1m6pyz01jbx19gv98jmaiybxgvsa3z11jc"; -"addlines.doc-0.3"="1gaf9ljzkdhwjg460hl79hlwdwi0mrvgs51si8k8gvialng8b1fv"; -"addlines.source-0.3"="1m3l2s1l671n9j7jdsxfljjhrsvh81bayw40v81dm0f68g5hslnf"; -"adjmulticol-1.2"="141whgxnp67y4wnhxp4a947rqfyxw2vy57mk60dn1cpx28f07fyn"; -"adjmulticol.doc-1.2"="1akcng99rg1sl6k4kqkivaikl7sjx9ilslnakgz68vc7jqyarfan"; -"adjmulticol.source-1.2"="0py3ygz3s723r2d1w31zlwjnp6ilshyr7jcx2hxnqqms61lsk34i"; -"adjustbox-1.3"="0pjwhzgfg0lzvsd7iisjvhq96yh5ip7bzwzvl7z63dyq276z2rk7"; -"adjustbox.doc-1.3"="0afbqxq4ni9wfcsbimmpwk89f1gikxvd7vj48pz0j2pzwn5249yb"; -"adjustbox.source-1.3"="14f4abqmbxyv07lfmig1daq3199dnvd1divii8di2b4wdaxzgksl"; -"adrconv-1.4"="1wx9a00jky9v8xmjhrjlhbl3kcdxh1n9yybpsr74g2vw4bwdyr70"; -"adrconv.doc-1.4"="1ny594a3dvx3jba0lf72kjny60ix6hnnw8gj479ccfj3gw2wv0mp"; -"adrconv.source-1.4"="1cndbrbw5hss1qi7z9mgymqrcmvlhj8hxw16qjjzch85xw1nrwzg"; -"advdate-20538"="0wgr84y3k10g6622sm11c4m4wxj73vpklf5i5gnp14yamwi19cn8"; -"advdate.doc-20538"="0hyq7kn10ajqabmz2r363wfpdi71a9zkv6yr30s9lda0vy5vz4k8"; -"akktex-0.3.2"="1npcfjjg9nwrb392g8pa4yq6i76aq4ys67zil4qgkf4jyzrixln9"; -"akktex.doc-0.3.2"="10ma4ic5bazlmizxvwks6w3qqxbbir0rrhzj1yw2j68p0600nmvn"; -"akletter-1.5i"="0gigzlxkqmiqz4nwpxj98rcrxmi6yfipf5bifg1mywchnw7a1f2h"; -"akletter.doc-1.5i"="0ngj7d4vdnvh99inw2vggqdgx6h2hv5z77glxjcpx8kmxf8h47sv"; -"alertmessage-1.1"="1mj3wiz4fff3ry5q4dk3k0kcx4bcqfwdvgaa9x3vczs746q57dcg"; -"alertmessage.doc-1.1"="1ga46r20zyb1bq7pvhq4348d2prdshy5m3yx6d00v5zzis1dmx1r"; -"alertmessage.source-1.1"="0n36cfjgh1byik8zn997lmyz2w4wmz48f5bzqrhcps7bg3kmp4zz"; -"alnumsec-0.03"="08i891g4b3k1qqicbsgd3h3sy98cpk6g1cfn17g9ysws8k20a0sy"; -"alnumsec.doc-0.03"="0fanq66cm0r2dgpdrblrhqkchxpy2dxykq1g8zrk5ddx27v6r9pd"; -"alnumsec.source-0.03"="1ssw0pi7hn3s7pqcqkm36jjgmd5g2x5rqyf2khhdscfwrsjh07a7"; -"alphalph-2.6"="10gkh6nnhsrlqx8b6k3dylings3q97ky4qsv03nk7hn41zkqsyq0"; -"alphalph.doc-2.6"="0v36l765s4lc5r2xfi8a3i7vxf79yxy29xy52cbhx4ps0av4dxpi"; -"alphalph.source-2.6"="08yagdxgqvhvq50cc7rvb2629g4n2qjga86dpa43x2vjnmmz08vm"; -"altfont-1.1"="1nrcjmf59r672gmqks8spqwz3vn4jrwc272zvx7ncylphsjmip70"; -"altfont.doc-1.1"="0c5hz0zjcar69w489zz2a04rbnc3j2lp8yccw9zv41ninzl94ifv"; -"altfont.source-1.1"="144m2ph835fl9x3ypc7wfc444719rv4clfdar3bk73gvf53rmjr6"; -"amsaddr-1.1"="1f5w9dhlmni4qp1snqb7l8c6h2ffhicpq74dhb79q18b00dlfi8x"; -"amsaddr.doc-1.1"="04rq59d00gqyzg6a6v17ifmcn45y01r6f426izkgbq50gky9xlxd"; -"amsaddr.source-1.1"="15v1xh051j16qgpm7s33d8hsz73pxv4qq58i6kxwq63mkrnwgac5"; -"animate-56583"="0rqhhw61bmp5r5j2fz0k15lbi4877k1jgyffnsf8qzz261dr1xjp"; -"animate.doc-56583"="1pmk280p1z2d6z3cxx4v0mfhy206h450y5rprrdjbldak99631a6"; -"animate.source-56583"="1fqlk70b71x2zjysk77hfp7xhf3bi4s813vjhkq04b2yfqr835jp"; -"anonchap-1.1a"="0nz53v74sigvlb4dhgk5qcalw7nrc1vafbjx754j3gfyp2ilaf1j"; -"anonchap.doc-1.1a"="06khbq6p3drxsbjwgkm1sd163f7nl8hc52pjsm55g2vknib5caa9"; -"answers-2.16"="18s0c7hdk5qnj3svni93m9lpj81dhla9v7nsmcgh0jabhwy8n3v2"; -"answers.doc-2.16"="02pfg28dz10w21ap4pi2csvy32pcvmp0baiciavp354ky4avjbdd"; -"answers.source-2.16"="0mcczai8da24jvmakc7glr2c56yhq2jv58y1xqv6ny9hg4ph8v61"; -"anyfontsize-17050"="08dnpzjajn0k6hrf12l1p3ncsqjiwafzssa205k2zgsz61m3sis6"; -"anyfontsize.doc-17050"="0zmiklc2adbx5klyyjdivicd5j19i35b51ddm3nhfrcqrfvjrxwg"; -"appendix-1.2c"="1xcnin7414mb1jvgs7f1x27zkl73sabmqb31i79n88gi245bp5lz"; -"appendix.doc-1.2c"="144hblxkrfp8g040yiw1k7nr3anqb80pd9c2g15m88gbb1xzyay7"; -"appendix.source-1.2c"="10gnkpwvm08zqwi83s4xiqshp93v5ai0qg22n7zcwgaq86mzs44w"; -"appendixnumberbeamer-1.2"="198sc0fmnx7b31j2mgzjbjyjjfsn0imw2j8pkg8m0r2rlphqx72x"; -"appendixnumberbeamer.doc-1.2"="1b1rwcxrs8cm3zfadi9jpxgzcgai36rlnfragc9l5wcbdsaw1qp2"; -"apptools-1.0"="0b6yzpk2d79qg2irgfhns0w05i54z5z22ik5yyx4w6wg45v0j389"; -"apptools.doc-1.0"="1n8ak9cw66780zkk384vpjkxm9j8f9dzlqzshy48q7hhprsg4p9a"; -"apptools.source-1.0"="1ba08rixibjcpi420blw8a0v4c4zi2byll7dqlvwb7azqr6dz720"; -"arabicfront-1.1"="16426cyvrk461z9jb728w6glfm0ahss82kkq6fqkhajjc0cflhwi"; -"arabicfront.doc-1.1"="0ck7nl7v6kvibiahh3szf3nbibwajg2pjwrbcz06frpfwhizsnp4"; -"arcs-1"="0qahab6a041wn6s6isnjn93yrs6zk82g90x5aqpv742b2y8cj5ix"; -"arcs.doc-1"="05wgq5pkzxg3vj9anlzjq1jvwj7b6wvsp7a02syca6n4qvy1v5a7"; -"arcs.source-1"="0jnvkhhcqv7qgs4knwx1kz38x305a19kh13wn47zqlqn65991bpp"; -"arraycols-1.1"="0i7vm2znai3wgc3h44vhwd3wrrw0az86b3g3ndhy8yyyl17jk3hg"; -"arraycols.doc-1.1"="0gq5ss2rq7qgj4zqvf6n9a45j1kqsh0k9myphfjhdrf0s1sq8w9x"; -"arraycols.source-1.1"="08vfglpdhjc0b33b5r8x0mqpjamciq4g83m49gxwn1dd71hvwqiz"; -"arrayjobx-1.04"="1ry1gix4nz11kyrfpbhy160c8dir2y68jbmnds64qcdafhfv4b9m"; -"arrayjobx.doc-1.04"="1hqjhkjh5ryhjpi98hyi92raffmish9n9193ry75mgfx1p2b2w0g"; -"arraysort-1.0"="00wbmciwdnafwknxxrnprxj4xvs24xxwdwmn5y5xh1c8c3q8rn09"; -"arraysort.doc-1.0"="1yn9kbq8icd5gxix4kzp0qszhg1xy59s4m8p66a88h3cwcs7fjba"; -"arraysort.source-1.0"="08gbn5s8c7a8klg605kalr2mdpijy73pxvfsndaw9jdnr9ipc5my"; -"arydshln-1.76"="1f2y02l7fkhrc005ib1s94z0yxgql2m515zy3mlx6ba4mqadh9c8"; -"arydshln.doc-1.76"="0xw13bdw67n2nsahi85bvh5p1xrd8fpb1aj79vss9zgdslzb6j4s"; -"arydshln.source-1.76"="1xhnh7jw0sxy6vkw31gcxyxg06dm7bgw0njsfkailbxgndwcp6zs"; -"asciilist-2.2b"="0ni7182xwr3ns1dk8i75kf1cw9wpfagrf1y7w20hk8fpfymx2669"; -"asciilist.doc-2.2b"="11gyi8mcqvfpn07f4cypv05f77vhzr44zn6y1idlbz4mgzjw3kp6"; -"asciilist.source-2.2b"="07k13s9y5nvbp7w1ylyj3mlpn80682yhxgf27hz9aayk3hs77d58"; -"askinclude-2.7"="0s1938harm9sgna3cggllpa1g85yl9jv2wy4b4c5v6fksiivxzs1"; -"askinclude.doc-2.7"="0gkbk6j2wv05kgfbjd4mqx5k7rc22bmqn47vk7pvr5z60dr4nay5"; -"askinclude.source-2.7"="067dpl3v0ipspfm5f2fmcmg5cb6lhqg6n8216id9j1blir1ys3mg"; -"assignment-20431"="1nxgpadadzf3d30ydc9rndwm4v53s4v10a6sbqf6yfqds7ry13vz"; -"assignment.doc-20431"="1wyyvay22r68hfspaqv0a43s9icg8a3pj8wii3snn90svbsjfajn"; -"assoccnt-0.8"="0im3x8im6kkjmvibh57hkn8nljcfc4mzp0hpimiqn29ys1yrhj98"; -"assoccnt.doc-0.8"="11p081b0b6mcigqsmvgf6kc9ik2480c74madjli19rw9i5nzf0vf"; -"association-matrix-1.0"="0i3rfbmdh0hmnng19jzl1z6mhxpq3d0y1kdgwa80hwpzvl1chbg0"; -"association-matrix.doc-1.0"="1bkx5pydr88zy386malg4vza9syqhqrz6f5js9dwpvxmy4igjr12"; -"atenddvi-1.5"="1lw42kgkviwh5gl0fnc4kp8x578bss6fj4d3jqp3jh0iqj53wwf4"; -"atenddvi.doc-1.5"="1f4210s4llsbgnnf6s91j7gpdajclscnqlkrmrsmiphhvgjihcws"; -"atenddvi.source-1.5"="11sxy0c5vmbf17w1h46dc033lisp4aa8sjqfi1zdzlp7ha4c6rr3"; -"attachfile-1.9"="0akvm9al5rz67b81bsl0k92gjqwxjrd6dwxj9qmwrb9c6pd311n8"; -"attachfile.doc-1.9"="169kh9zrf5ykal633zn8n3i41dqbyv7jdrm905a7q47icvd4ar03"; -"attachfile.source-1.9"="1b9s69vvclpvdm02gi9x7zv5mf77q68xv7zd784cldns8h1a553l"; -"aurl-41853"="0dxsldgnijrjrm97a0k33cliqpl09b70xf2dccigyzyyps82h0d9"; -"aurl.doc-41853"="0rw2vhp4r9sb6pliqc3xxjc5hsznz4j7i2w3qk227ibg92qx4a8z"; -"authoraftertitle-1.0"="1gikfjhxkz21qb32hrhyrdymkn29x7bjcsml5clsw4cgi4b67fcq"; -"authoraftertitle.doc-1.0"="105sk016n6sh7llhk3fjcz63hbwms50l7906qxdddjq67qpgrvgn"; -"authorarchive-1.1.1"="0da6hacxksxy3f4ag9bv408hlvq3m811k2824dc3phzr972sfwba"; -"authorarchive.doc-1.1.1"="1r2kzr0h9mrhlz6kj5a3r331ikh76ppjbdqipl5i5xvibbfzhfmn"; -"authorindex-51757"="0dhdd84hdf4iz67acyarzf0asb7c8dmp09s286rq0ylgn7lb9xx6"; -"authorindex.doc-51757"="0hhffkmldhhm46xi8d1bvjp5v15cg5kid383g7s1dbjxqyd9vbvd"; -"autofancyhdr-0.1"="091dwnql2fy1zfkr92ww01hjylx6in8ay56gq7ywjlwb84r6sbm2"; -"autofancyhdr.doc-0.1"="04fjrbsa9nqf5rj0gqgm96c8wg3dl8cpfzyilqrfqmim26rviskp"; -"autonum-0.3.11"="0y1x4j7fyssmhlqf9974yprqxvplxihbs879qiwa13x0zmwhnp55"; -"autonum.doc-0.3.11"="1a73xg2csfq051lnjnxkplnpfvl9vhfm05qvgxz4i79qmgs7a3b6"; -"autonum.source-0.3.11"="1q58d514bdm0mbqkmyngxh0nzzg7kxxc0z7bllnlkqb99h3x3xb4"; -"autopdf-1.1"="0fd1dw6h409ffn2prcsmq4rsgjshhs9if0igsz3ibxb6wkngbphv"; -"autopdf.doc-1.1"="1rf0l15pp475f41si7qkx9rw7n6938jj2k1wybx4ck7pf6hs7i9l"; -"autopdf.source-1.1"="1vw58d9g41ra5j2av1vdkzqhh7g5nrprr27qgdrn8nlirvwzbx9m"; -"avremu-0.1"="1j7mg5in2jhpb07jpky76qriyb4m0qq0rlkacs6amrhh57299prx"; -"avremu.doc-0.1"="1p7z2vj25fnx23rl6m76h82q8kli8nfl2vail4mpkx0brimn4j7l"; -"avremu.source-0.1"="1zz9b5d08i3sjj74q609k5kyi9nr7yyczk00i3dqfz5x3rlyljsm"; -"axessibility-3.0"="001z3ra1zgsrvhlnvg9lmvc56s72b3kip71c1cnpl6qzqcc2y6s1"; -"axessibility.doc-3.0"="0s77mr42dli8vfc9h6gslq5g103rp5vk94hx9cw3w3shxazib73r"; -"axessibility.source-3.0"="1bh92wig3grw2bkkdd3fxwlky7rrfabzis1rwwdzgk3bmmrl9554"; -"background-2.1"="0rxb5vdfgxxadgd3isbghsmycdh4ia9yjx66mc48n396b4psbrcy"; -"background.doc-2.1"="0a1zxpw8wjq1mc87glp7kwdvkrg618ybwyagdkg7xnp8r7wisnjr"; -"background.source-2.1"="1mb6radqhhaw7k0ay4i0mrj4bm4n0v4lj6dwbk8h898ypnmdirx1"; -"bankstatement-0.9.2"="0r9yfjq0m55bd973gqvjpy3qfdhwglwm8zki37ppj1dvca7rzrbc"; -"bankstatement.doc-0.9.2"="1qyrb00m7rlqkn77hw6sb3r9b8aap2qj13ni3bwy4qv2s12sfmyy"; -"bashful-0.93"="0cp0lvqb88myspsbp7s3xd0rrkr1jlqcqq846mk8p7r6r4apl1ca"; -"bashful.doc-0.93"="19dbyg9njh2lwckmqnmy52gllsdwv2nvcp20marsjv5hps80946r"; -"basicarith-1.1"="10cjfm3v6b7rkzc0wngg635xbyfmrnzs5y6f3sn0akdfxj0d3x28"; -"basicarith.doc-1.1"="0qm4qnxp3n42zvkxyzanl4psiph9z9dxz5b2i32fpn7p3jhn2qh4"; -"basicarith.source-1.1"="1my6sp0mvbmpn2bakr93qwasqh7rwmzy8lhl608lssnxk33h8x8j"; -"bchart-0.1.3"="0knv4byfxfalyhmsqiq4wjcin0q0hyj9gs7f167cddjyzcg4z23i"; -"bchart.doc-0.1.3"="0zyiw3f37i3shf8ihhzxagvzwnsdaymbkpcizdm2ryziglahh1jy"; -"beamer-rl-1.4b"="0ah2skzc5kd7dxaj30q1bmjk6r6c3qzswjf59h3mn3fy0w081knh"; -"beamer-rl.doc-1.4b"="1kdrhcx16xlkqfx0m8kz6qc55nginrhr7kxcr6cv2zmw6h747771"; -"beamer2thesis-2.2"="1rz02mxmvrq0x06xbrdqvfgs21nhkcislcnpdwx9gvrdmwpcyccq"; -"beamer2thesis.doc-2.2"="1ialsnm6qc9bwry5575b8l9ifgymidrsvy2dc786ixndc0fzn84h"; -"beamerappendixnote-1.2.0"="1mqx0wwb38h1aaxc4xzzq6430xhrxb70qcdqs5yj1sa7k9638ags"; -"beamerappendixnote.doc-1.2.0"="0nvf6m7d6v8mbpnpz8bdam9bz4h9d84nsf17s1k13zv846rsp34w"; -"beamerappendixnote.source-1.2.0"="01lkwbk5vpnpbrmjdarnz137n5sbaxw0xaich2jvcjlin46vfly0"; -"beameraudience-0.1"="1p3bpgkdbm3dlh7pj5w6yvgr0iqjshn6kchdpx86zicywwd2hqpg"; -"beameraudience.doc-0.1"="1qs882ypjg9cp19mrpr3nl54h1zry3pawjfwx8si2b6bsngz3wk9"; -"beamerauxtheme-1.02a"="1a8q3a0z2wckyr3694nnkry0waqzqsgp3cmaf8ijcrfs42khxjcf"; -"beamerauxtheme.doc-1.02a"="19r7vjma15p3vw0nr3w51ghy7hq4pv6x92iway5rxmlx97dw4piw"; -"beamercolorthemeowl-0.1.1"="0kb2pvj9caszn40njgq99779ynp5kdq8ynqa0q6vhrh9l0r7d1i0"; -"beamercolorthemeowl.doc-0.1.1"="1crml0lvdyk56zf1ylk8d4441237kfpnn7v9sah98w8s7rlk37r1"; -"beamercolorthemeowl.source-0.1.1"="0l171ahdzizwpq8lq4rai2naj0h66q16p69nwhlwabynjkmfhhzv"; -"beamerdarkthemes-0.5.1"="07zg346brdpckcfr1vnmvqcahjmp87cb2sizvyx4jvxv19qqwpkb"; -"beamerdarkthemes.doc-0.5.1"="08zkfvjvrjh8wffv7qjqmv6p0997kriz6lxz06dnsp7l5j3p675j"; -"beamerposter-1.13"="19h0zh583chawpzm59xv7243vzkz597df68yy0zmn3r6ha8k0qz7"; -"beamerposter.doc-1.13"="0xspyywk813ndrd5xps7fxwggkmdl078fmn1cvxfx3cxpnmdf822"; -"beamersubframe-0.2"="06csqdbh272jbh3zpi0f8zblbmi0sp5iiz1r1qa9qc0lw81mdh7m"; -"beamersubframe.doc-0.2"="1g29xay21yr8aap2fzklkg8q3ybz0xmz22xx5cd9md93c8k9kg7l"; -"beamersubframe.source-0.2"="1zb42dsisab4234s79xvva74rlicd1gg4pbh867rxd15ajgy14k5"; -"beamertheme-cuerna-42161"="1r6c3ar29s06b0yfn85wssxccayxn2706y9jxdx2pxsr85ndc4js"; -"beamertheme-cuerna.doc-42161"="0a8mmg184chg2lljv1k7ffydg4sgcjpjbnfjzqcg43cqd01v5dmx"; -"beamertheme-cuerna.source-42161"="1avywir51zks1hygqypsfi6lkrba9ld6x5mkr8lln7b2s4ijnysw"; -"beamertheme-detlevcm-1.02"="149ya5raar4xfkb910lk85pqpm6mrc5n5ghh6350knbmaa6bdwg3"; -"beamertheme-detlevcm.doc-1.02"="1wfq3wc7b3516s81sbp6md6mx9szbzq5ycqvsr50y3s2wfvvj2lv"; -"beamertheme-epyt-1.0"="07pjgzgkjmr4hdf16m7kx2cf1448253jwgc522akfvvnmx9fi26p"; -"beamertheme-epyt.doc-1.0"="1a987h1cg48bw05zjh79ga23qb37s82dkqhhgvp7gsnwz10pax2j"; -"beamertheme-focus-2.8.1"="0xfn2xl9bbghw0kcbgjv7x3cl99bscwsfkfva48l94j4zhn3b8ji"; -"beamertheme-focus.doc-2.8.1"="11x05d09j14r1ax4as2q6qs0kd3xcc9q3if7srhjwpvkjrw5a7rp"; -"beamertheme-light-1.0"="133mvm4cayp49l8xvh33q0jp4qzhmvd3q2kq2aij3sh6i0bzh5aj"; -"beamertheme-light.doc-1.0"="15s2s3b10w0czq513mm2y7qrczm7y91qhghd0zsfvmy129mwfarv"; -"beamertheme-metropolis-1.2"="1pmvcyjn04pgcmvanj369hxqjha0s7lh1z4b6fbhaj2aj32l52r7"; -"beamertheme-metropolis.doc-1.2"="195jhmhzr4gbi04zmss5nl0lm9rkg8spynwz5vqlgbci1xc2cw15"; -"beamertheme-metropolis.source-1.2"="1smxiqwdvz4bj5rk9cmsqmy3kwa722ab5fhns67jllvzrkzy8zcd"; -"beamertheme-npbt-4.1"="0m1mpavq8p4pswibgfhsbnvg59kn4sxz0m4p2w6zjkmy80s3naq2"; -"beamertheme-npbt.doc-4.1"="15kc24d21d1r34hd07zr65rp1k55fwrxr59h0ayiiwgc9fkjjsd9"; -"beamertheme-phnompenh-1.0"="1smqwy1f7jz012x5hmsknvarykalz58iysnwf3px7kwg83fr8mb3"; -"beamertheme-phnompenh.doc-1.0"="1pg8242n3z6x1n4kp8my2nfllriijxwmwfn7d9hccfnsvjj25gdl"; -"beamertheme-pure-minimalistic-2.0.0"="1z283v6ipp7c7h1qhm043g0sdfcq2dwzk9l0lyy5951y1kj965bc"; -"beamertheme-pure-minimalistic.doc-2.0.0"="1chzf3lgd4sx26nbmacb7dadpk1m1rm913dj01648vbd2bz9y4zb"; -"beamertheme-saintpetersburg-45877"="1d48158ladllzj6a1np20irl0r0syksb3wnisxbbwv3kwzr7fgj3"; -"beamertheme-saintpetersburg.doc-45877"="1qkzpbc29587lmckjkl3lx08f2j0q3aaidqz22r6bg896j8q8pr4"; -"beamertheme-saintpetersburg.source-45877"="1r4cw99zffqsvppc9l7z9k8l93sfk1nk8pzj50nm2bmkrdbfk32x"; -"beamertheme-upenn-bc-1.0"="09a7da5ghgf5q4qp0djp3pya35zsm45wkiy5srz8p9q8pwg04bdx"; -"beamertheme-upenn-bc.doc-1.0"="1m1bc9mxdwfdm0v2lb0i3pfxgf5as1lpm8a05icrm7bdvii0vsiv"; -"beamerthemejltree-1.1"="02ccd8qqyjkvqqyxr94p1gc6qjryl83vpa72wcm5ywr8gmxci0pi"; -"beamerthemelalic-1.0"="10wv3820avgviic0mcxn38yycyxqfvmf7qhb5ybz1x84jrw8k9hm"; -"beamerthemelalic.doc-1.0"="1wz984il1z42ck69xn6rnxww3x4xx127syyx37wdy246i1ji75vw"; -"beamerthemenirma-0.1"="0ivhbhybc99hacnrfw1fb9412f6614an1955rglkcbwxwkji6nyn"; -"beamerthemenirma.doc-0.1"="04155wbw6ix7an8sblw4a8q9hbn7vzwffady4vc23vzccc2i2f4a"; -"beamerthemenord-0.2.0"="1kb3485dv7kcj04bkgz8cv15kv7jmdjy0jcilvi5zc1vn690cyba"; -"beamerthemenord.doc-0.2.0"="0ls5ivdcgayz9pqm6j1wd5f45s063kfknzxf594rdipz1jnmvj4q"; -"bearwear-0.2"="1xaq0bmv8jv1zss6lwx2ccx8inrmyw1r9bjv3sbqfhp2x4d5xjrl"; -"bearwear.doc-0.2"="0vm9lm6389jnmcgzx0ffmay2bw4d0h1wfmsfbj3x1s1vrfl62r8j"; -"bearwear.source-0.2"="0dzmlcrc4izb63862dcafshzsaglq5m88z3cxmwivmwpikhh0gb5"; -"beaulivre-58503"="0ik54162qvk6chijfxlwdgyabxaq7d5yr0kp3p1g7jkl99zhpiqb"; -"beaulivre.doc-58503"="1p8zdsrm8ha1d2nm22n7h7p046x72zl4h6gay4habfiw8ax5kcyx"; -"colorist-58434"="1yhhpyvxwlv95grqsnpb2y9ndsp3r6z4f37yr6j0xlbb9khbrwzf"; -"colorist.doc-58434"="0x71nwnla6wpi2jxgxs17c2ikipg027ivdm3x0pnnbzwnnp9kqb4"; -"beton-15878"="1rjj64wnd9xvh940rl9scidhv9ridqz38n8ndzs35hyjm8n2lx5f"; -"beton.doc-15878"="0i8lg2iyjkzpxjzz9ym61v4zkqczkhvs6qjb7zf5xw557l2i55gw"; -"beton.source-15878"="1l82y1fz86qsnv58gjq9rm58zf3ki80xmcqkwlmgfp334j9jqz8y"; -"bewerbung-1.2"="1gqj9cxjx8sn94rqlmhg6f4a8a4wnjccf6cjc4kbi9p3p27s8smz"; -"bewerbung.doc-1.2"="1g2nkv66926yh9fcnv4yhmrbs220cidw6bilcz50f6jyv6zj6lr6"; -"bewerbung.source-1.2"="1678hss1pfp9bijrsn1ll7fh3y3vxjm6d80x6lnqjm51igczl7a2"; -"bez123-1.1b"="13l8qvnhfq575pg1nvcpbrwyv5wvq3bhpkmh2306mds784hvcib2"; -"bez123.doc-1.1b"="0qrskibmq7sv07g60gzd5cp34p21ragr6yn9g6384gib8vx60nqf"; -"bez123.source-1.1b"="0ab153h8i8nmc6v5g9xwvpymjvpp605mbj9dmxdyl3ic49cpnl08"; -"bhcexam-0.4"="01amhwjvy2w4738kn71ananprbgg025l1ciwnbx8nymp8w97byc9"; -"bhcexam.doc-0.4"="0lnrnwjilkm4xiwpj23r5c003ddm8zxsr96hsdry9inhi7pqih1k"; -"bhcexam.source-0.4"="0jaq63yy6rwp79sk34cx5pknk5l3lppqrzvca79s08jgi9aw2c58"; -"bibletext-0.1.2"="1p2cz95815vkvvc9fsa1qm3sc5grkxzdsyw30qkilff1nivb3cd9"; -"bibletext.doc-0.1.2"="0czz3l0m314a25i242kixy9f9spcj72h3bibfdib55gg05iw102c"; -"bigfoot-2.1"="1md91jivqvgf5kvwizc30wns9y9krk5pzvaihxkn9qs41j907wx8"; -"bigfoot.doc-2.1"="1lj6lv7iizbsaj00hvrcrdk9w0iak3wmx6mdpfb77jkzgp9dgg1d"; -"bigfoot.source-2.1"="112kj1669xl7qd2vrpgbi19cw00rkhj64ik6rrr885qr7bq5w79v"; -"bigints-29803"="10lsfqfzg0klg59s9zkrrxv4qjhnk74x90rkk2w5pi8zn83k6xac"; -"bigints.doc-29803"="0xj6vnqfd5rb8ahxbjaqz7jd5kpvihr4dx88avrfvdfr0qhg3zlm"; -"biochemistry-colors-1.00"="0d4bbm1p3j6q28ckkl7ilkywrjx6iqvmx0qb27rpldw3jabf1lp4"; -"biochemistry-colors.doc-1.00"="10pa8jwpxr37hs0wcywzsq14x1jgjx1cqg94lpghi505mlrikcg1"; -"bithesis-1.0.1"="1vx34f7qfrw9wnq5r5n7kd1234a6dfvm8l0ah6f05x2hs5xs4jrb"; -"bithesis.doc-1.0.1"="0fi84nykn22jsc37z1h15zcqy5asj91jgxbwsgd6z0svhilrxmpy"; -"bithesis.source-1.0.1"="0vpzsjzzin5rfavidfl3ak278ibmp8l8fn1hqqqjyblib6y83x3g"; -"bizcard-1.1"="0s6c3s99hid9pkilskd8ssc4hv5d5yg5lvw6kqz9szyii4rb6a18"; -"bizcard.doc-1.1"="0ic6c43nng4lxsznkpj7w86ampdzjrqqcsdsm1f758rfds7wbnf3"; -"bizcard.source-1.1"="0ywip83r43a721yfzrfnkfms0saly4p2ihagyp6259h2kji3vdjs"; -"blindtext-2.0"="0nwxq33ffivn2ywxwx2w4y7ny5nv4af9p5cwn6c21jadrdj1rysp"; -"blindtext.doc-2.0"="0gg45ayj3bibxvlghnz3vs0yj29zyr50bf6la0m26ma8ff0pw40c"; -"blindtext.source-2.0"="09ppqs9mdkmax1s20m43hdi6yfcnpy0ylwdi9h9lw676gr65cn0m"; -"blkarray-0.07"="096mlldfyi6hxsnp3flkr1gfqhvhxm2vzk81zw6dl64xihkvl6aa"; -"blkarray.doc-0.07"="1km35jnmh1iwya05s3ilhikzvz5yspxf18jh3f4v6iv5g8rxf9gd"; -"block-17209"="146ava8k2z6mlr2aq5vydax1i2sy6spn4avshcblgr5ph49iirp4"; -"block.doc-17209"="1nwb1z6df3y0anzrl6b45fs2k069i42bcmx0i4p9z9fsbgqqfw1j"; -"blowup-1.0"="0ynw0n297iy02597g6pp9ghwdbn8aw1xmyjr0dwdzn3r79aad336"; -"blowup.doc-1.0"="0b9zb3kq41brzsfqrhyn7h52x8salaq2kmsyc4457v2mnvbg8pf5"; -"blowup.source-1.0"="124cy91k3m7vc15jvn5y9nhiz7pd8g41d8qxjcbqys9d2qmcdjr0"; -"bnumexpr-1.2d"="11ishmbzhcvfxj2y7q0z6z5lwfb4qndyw0fwzm2acxv9v8wra7xs"; -"bnumexpr.doc-1.2d"="0l77jkgqvcnd2flxdbjiyk3wga3a1awgfxar5gcj1v9khkbs2gl3"; -"bnumexpr.source-1.2d"="011qy8vbk5jwr3snfwmklkhja8hmr0iw8wfvp2cnjxx0hn5g33s7"; -"boites-1.1"="1176j9ikh36s0cgvsflayik1xp0zycbp8m9hg0c7jmzkm5haqw41"; -"boites.doc-1.1"="0visqy0qg18sa4mxszdl601yy0ilfgglv872dhzy8bnqqs8x7zzp"; -"boites.source-1.1"="1zirqghkw8kk8fa3xahd27dh60phxg3blp98iavh6bdhj0rm7iar"; -"bold-extra-0.1"="0samckbdgi91y5ay98h6jcaywcqfbmzcdb90kksjxv160nsvf5ca"; -"bold-extra.doc-0.1"="1101922s78y5d9rjf5immfir46vf0i1ig20wp360zcal571csgjl"; -"bookcover-3.3"="0bna2navb27gzc30bcmgc5hjg6g6njcnq96s8s60b2lhbjigldpz"; -"bookcover.doc-3.3"="11wyk4r1z6m47j3a2yncjwq9vgz6vj752px33pc46qsm2xfllb0l"; -"bookcover.source-3.3"="0rp0fbv1hhaijb0mc077dg9g34dial6l7ldfxnpg8px4b33iwy67"; -"bookest-1.1"="1n6n322vb157fz11djcnfz07ykarin7n8mdr7v04wlsj2gfvv5hi"; -"bookest.doc-1.1"="1n94n8pv5s0w12w7yiws7sv8vwg06r245b7lka3g1j74p3xyc5g0"; -"booklet-0.7b"="093kp4ryfp8q1hg8ddmvaxxsw75wplgz4rrmmwmzcj3hcgyynr1f"; -"booklet.doc-0.7b"="0cd1mvkv29r2aqdy4bs02m3ck90rdv0nz01cq2x5xvqk0i8j5dhx"; -"booklet.source-0.7b"="1c67lj35yh0w9bfgiba9ank6wk9zqq3l3vvgwn8f3v6kygyqha63"; -"bookshelf-0.5"="10sjmi94cc4ix3a2c0qpavs1sc0mqfqfbbw4qygf9w1wdivrijfz"; -"bookshelf.doc-0.5"="0j0lqi7bjlivivvrvswlw89vav6fx8wg95bn18amlwy5l8d7kyiw"; -"bookshelf.source-0.5"="0jx8dfl4j4k2av1syngad6narkdjksqcr71q92h3090rf58njgj3"; -"boolexpr-3.14"="1jd298qazp3q0r9dwn7m35yrzvkl988c41l0r0vdq4g3nv4ppv79"; -"boolexpr.doc-3.14"="1cwj9473nazkz0acz4x7j1xp50139xs1ifqck40f2vb1gvhasly1"; -"boolexpr.source-3.14"="03kaz41353m40rbmars31pkbrrj6zwiajbv6fkabq0gsd9gy7bq0"; -"bophook-0.02"="02wgw8462aaqknrnfsv1y8l6q7b9qvscnarysg2hw51l9g349idb"; -"bophook.doc-0.02"="1j5xyh11h3wsidfjnpw2wr8pc5xazf5wbbzi04r3wkw3v0haar2p"; -"bophook.source-0.02"="0mansjz0a6g02k9n7ijyami0gppkha80mnyaf9sqqzl6ppqygvn0"; -"boxedminipage-1.1"="1sn8liypm113jvmxsb0bl07cprrvdgq4rhbnp85lb5671djr63gr"; -"boxedminipage.doc-1.1"="06wan6b11z6g2nbw73z5l27mb42cd417bq2vmmmxla2fyksjqqa3"; -"boxedminipage.source-1.1"="17lk6ns0zl83nhdi8g6sgij4ajghksblqx2aac1gx6fmq60p7pn6"; -"boxhandler-1.30"="0ab7kp5xpsvn0i796xbsvnz8lc1ka1wqayva54sfbsv9bg9n0xg9"; -"boxhandler.doc-1.30"="0wsl8ivnyxf38rj2xv11jzyiqd5pgcpjnb3nnabl8a3ijdynzsci"; -"boxhandler.source-1.30"="1l875jplpql2bq0h55nl9ddmia31069chxc4w86pzh4acqn2c60k"; -"bracketkey-1.0"="03mq7rfgkgv06m25hkvlhaw1mqw3xr0ghfjj2jb4nlpkwn6945nq"; -"bracketkey.doc-1.0"="0kr9il6ac79kvqdds4rn4g98qxy7nvas62364sv75zv0hb6wl0kw"; -"braket-17127"="1ml5xz6pyj66kc2jby0bg02m79vfv9z3r91da808n1zb22mmnjkf"; -"braket.doc-17127"="09vqvl0v1qkrhv65bh9ym1zm254iigl21d4c98df8ayvffjf6bx8"; -"breakurl-1.40"="0a3np519c1knm8i60z1d6rmmzdhfl340gkf6c4m1yss68didq0cn"; -"breakurl.doc-1.40"="0dk4hgl3411q0k9dz9f9p5f7r5a59rpjcicz9h7ynpc4g3nhn019"; -"breakurl.source-1.40"="1hx73iw3n5wgvaz2niqargiw36p068pjl8x65cajn081831syzfc"; -"bubblesort-1.0"="1qs3y6vs5z5m988cj6dl9n74m0j5d4hsmnrz6xfbpw2cs9g86jj5"; -"bubblesort.doc-1.0"="0pcbzg1p1wpw00h7h1va4j6iivz1ky31k8aq1jw4z9s5rwz64p9h"; -"bubblesort.source-1.0"="11g2brc46977w61sk0q9j2wmn5q9x9s3mv6fcgj8ywql3g4r85pv"; -"bullcntr-0.04"="0djfn002j12nb84svd414zng3rnjp79ssrdhfb6j62mx0p9j2hk7"; -"bullcntr.doc-0.04"="0c88in90fy65pd9shbf09bl5dm6yd3z7g535ni5js251bqa9wijh"; -"bullcntr.source-0.04"="00pdz4i2pkn1fbihaz16vbhsnwaybpcavvmndg7nj47jlcfplhfq"; -"bxcalc-1.1"="1lgk3zfraip1jx7hpkkxwzril5sqc1hn00km3ybicsvi53z1q19f"; -"bxcalc.doc-1.1"="09x2b2cdxgf7lil1vlw4bmmjn2kl84cgxd75w2js2y1znsfgsivz"; -"bxdpx-beamer-0.3"="05zpcwq6syy612w8jw10fqym4w4b4qxrd2i4n4hqwxv2sqgsw4n2"; -"bxdpx-beamer.doc-0.3"="0g0ld901kdq3558ngzy6mf2f2vgjjcngiig2pbjb8xakcq933jj6"; -"bxdvidriver-0.2a"="06rw5wwp5ky30s31f23gl4hpyzakn5b3vvgna8iw2iyy6rw5cl7a"; -"bxdvidriver.doc-0.2a"="1qwxy88fnfsx9na6c8r56n6zhs13d8apkjq7hhydsfs7qy54q4vn"; -"bxenclose-0.2"="1mii9n7x232y5398zl9xysg81hflamrj3dflrngs94mm4akmcv2d"; -"bxenclose.doc-0.2"="19nmr2ripjifpjw8xrr5dhll392llqbfqjd2vj2zdgkvqj4bar4j"; -"bxnewfont-0.2b"="0mc8akfajlyl6vfh620h8rcyfv02gdg4ycqx18lhb9vfivi3j4py"; -"bxnewfont.doc-0.2b"="18na6f8nqlagfszk9miy5bbx2bylgspck3pgglbkqb9cgkdf4qq7"; -"bxpapersize-0.5"="1l086n38f6c5sf33fckl02zcbdsmcy96yl0vi06vacb81g958k9w"; -"bxpapersize.doc-0.5"="0c1ga0v995k92z3bdnrldbp27h2w4mxvwchyjwbgiy86dknaz9wj"; -"bxpdfver-0.5a"="167xwjk3rchf7z9sh53i89lnkmixlaq4n52zd2drvf392pwir8zy"; -"bxpdfver.doc-0.5a"="1wnmdzwm5qan70i2hcll06hnhrqhk9adbj0hmsxy0y9jdjypsfbq"; -"bxtexlogo-0.4"="0s3dv2vadhqm54nssazwp419lm7k9030ggb09bxs1rjlpw7j3cfv"; -"bxtexlogo.doc-0.4"="1ym41dys4yzj6l9fqmssdxx8qxi4yvkhy1z8069639pi0xkjibfs"; -"calcage-0.90"="18rp330i29cw8pkfv4gzlr4lz5rlcvc4k0l8mvsvs0xa767fd3h3"; -"calcage.doc-0.90"="01xp6i814bnzgbcghdpyzb9f0zx3fwmqd3p97rk4qlf3g378l8y8"; -"calcage.source-0.90"="05lcg7mix6z6cw85bpzcqgxlgb1vzb3irhljlfcvq08lrdfjy71x"; -"calctab-0.6.1"="0rs028w20fcg5jmmnhwhvasb701j763pk4bwv09lj3g78769k25l"; -"calctab.doc-0.6.1"="07fxrnpnzn23lb3lrlvil6a8624vcvam1lq6sf8nrgs52fzl2grh"; -"calculator-2.0"="0zzir6kp8bkj9w8jyrh16w8bdgzk6scrdqljxvq2fpvw87fdxrcm"; -"calculator.doc-2.0"="10a961z9llgnrbsny9ia0yi5ikzqi6d3vrpd5dc1x6swxmfayv3i"; -"calculator.source-2.0"="0bgg0hyp0vj8b9d9rl19qr4nqi43rmslvg7fva1wh5ywm9x6ax3h"; -"calrsfs-17125"="12b13dhwdxr5dc37l7imlhn4sparyrnz0d3vagjxlsiinm7hakf9"; -"calrsfs.doc-17125"="1295qb7s41y2abs2ip87ipcvq15pzza0bwvj6pwpwxkxq5yrr83q"; -"cals-2.4.2"="03100nskddcxi7z48iwm7vnwlrdkxj7xh8wgbb8bx3vfcrz731jr"; -"cals.doc-2.4.2"="08y10p0i7y0jndknkwrwdws6ja78sz1qf8vxvhhhcpivxc7a5gl5"; -"cals.source-2.4.2"="19sh899dbk4z728h9v72xrf54cij8jhnb4k4a035xfb7ijc0jcrq"; -"calxxxx-yyyy-20.21a"="0zlz35ni88p5zb0318mr6hl432d30mjkz0c10nr04bsl930w9hjg"; -"calxxxx-yyyy.doc-20.21a"="1kd2kxrhv602pb0d82h00dl3hj87wdcxpajb6s9f1866g9b70qqx"; -"cancel-2.2"="18bkqkdf888nd6j187kd39g0vgfhfh118bky8r5wwzy2aq843061"; -"cancel.doc-2.2"="1x6dhr2xyx66i8qwk98li3vp40rlalfrf5lk8ah4gq03ndhmygfk"; -"canoniclayout-0.5"="0smvc9bmcqybim01h2r6lx6xdr6y7218lfl7hhjrl0w25hiszaa4"; -"canoniclayout.doc-0.5"="0yh37kqxksann7gjvc1kfwnnkv1lqhx2aj52b2skv960visx5m4q"; -"canoniclayout.source-0.5"="15iyr0bcymylnbdfqvavjiazmm2zp8f93zx4fb5jvi5hz5bryy6z"; -"capt-of-29803"="1b89cznanql6vmcn1jyr1nqkva40i61lsgjswsqjgdqnlbmvsm43"; -"capt-of.doc-29803"="091qchrgwikiissyrbb5i14634130vn08rkj2v7cnqzsb9c44f2k"; -"capt-of.source-29803"="0dlgrkl1vcvf8qck0pn20ic7cmsvxqkmvgp04f9hn3dmk0yrzc3r"; -"captcont-2.0"="00zp59ypp753b17wcn9212gxk0w11g2a7rn9gi2mn4k5c3djc10w"; -"captcont.doc-2.0"="02n200ziiq4lbfa3mc8yk7icayl7l5ci3kpl8mlkdyg9r0a14j1d"; -"captcont.source-2.0"="04wilkx7vd5bn05cww36lywb10xq6b2nbhlxnjq5xbmdrdf9ckyv"; -"captdef-17353"="0gjbxdn70qskb3xl6gmags3gjq4pks44k8c48lxljx3avpvxnfp5"; -"captdef.doc-17353"="1wl56hjc0204d6xrpvypgra7md18db4bz7657m49893m2pmc2x7x"; -"carbohydrates-0.1"="08fsn3xp2bmkkhhqq0l8808j92vibkc27mi8frhzb7g253fnmbwc"; -"carbohydrates.doc-0.1"="1ygfgsik471prmbnv7cwak72w8daj7zgvdw50hjn4c6mqsi6g3xa"; -"cases-3.2"="15f3mngrmvd0h6yy3jiifyzfrgi014g4dsqz9c5g1mw65yyssl8s"; -"cases.doc-3.2"="1vq4x3lc7zrxsh3b7dy6w53aikx5vfzx26fi288b44g99f3h37jy"; -"casyl-2.0"="1cmz40n2h7nckjw9x8wjrj0kkig4xhjslqjachsdgidd151m65c8"; -"casyl.doc-2.0"="1y1gc2a1fw8fmrs4milnqvn0i099khhjq8pmsycj4bxpbsbpwqva"; -"catchfile-1.8"="0dx2smqpw2jmzbsfl1g1zpa790qaxas4cz1xb5r905pvpca4q9h7"; -"catchfile.doc-1.8"="1xhzw6ahzn8fgv2rxn30xszzpdjqgr97njvx7fz9bs9z7xr8f3si"; -"catchfile.source-1.8"="1gbcl7bfr1zdvn69zzhsbfa808qdfq10c11qc3qgihpzz8s99fr9"; -"catchfilebetweentags-1.1"="0xvk581zl6wk04amq4q6s4mhpb4d3f239ihk16m9fglabhq34xwx"; -"catchfilebetweentags.doc-1.1"="1bd9dgjp2rvsv6mn40m7i2s5s84wj7hbk8rka2a5djb00fv4fgzq"; -"catchfilebetweentags.source-1.1"="0lvxhx6id5ka9r3zp8h0xgrs05jax4r5rcyqcs1f77zfc2s6s8iy"; -"catechis-2.5"="098swk90wbnnnlxs529ixbjrhxkaa8s06f3g4rfazbv8ij28g27b"; -"catechis.doc-2.5"="1chl62idixljdf0kiicnb5mwdq1yxla13j6j0s53sbp6shxsgps8"; -"catechis.source-2.5"="13l8lnwirsyah34nh5scz1p6hrr8brpiddlxzj407lfcav7x1n1m"; -"catoptions-0.2.7h"="0739w56yv2rrz9958xhargjjknkf4bs2rgw1d9122ixrp1vw3241"; -"catoptions.doc-0.2.7h"="1jfv3946gqfbph8lzpzp8q1n6nhd2dcjprjylzw9kwxj5i42qqcj"; -"cbcoptic-0.2"="0y4y76b69ila35ak85wkakk6w1idjy92jhbnj01i82xpjnq9qrss"; -"cbcoptic.doc-0.2"="08c3v6rppp3qfmg4nz0abwn2ka60wc6zrdx6qh1b591xgfwcm4jr"; -"ccaption-3.2c"="06xbcnwyh6s417dc5kdf9h2qhi557fp0w5ikjdwkzsdq8q3ybd00"; -"ccaption.doc-3.2c"="1319qx3dz57f9hs21lxicwr8ql8131yk97zdps9rpnr5c6b0pgdy"; -"ccaption.source-3.2c"="0is0wzbqijcyi703k3va7icjxmf3v2rmrlhdlbhs1wzfyz1cmd2h"; -"cclicenses-15878"="1rsj1gknw2ib42h1jn5zdhwv1n5hg2fdny08wpkwyyn14r5n52r7"; -"cclicenses.doc-15878"="0vdr7nw2w4mqh3hiinywmrcszav7b0nc6jgrky1l3pgja9h78cj7"; -"cclicenses.source-15878"="090smmkqiaam8k5jfk30xk6jrzdz6y75bcawm94x5l4sc8mqihir"; -"cd-1.4"="1h6x7mm7bvvd9za8vsr0dnbll2m404hbp7g3bwh6z5dr15y0hw8q"; -"cd.doc-1.4"="1ws4qpknk8zz7cm0mfi9g9viy1f6r14y8hfi7dw2fl1lzi56j4d9"; -"cd.source-1.4"="00mi6aazb16bq9b68n0jh2vs9n5kv7mizgp61n7r9mpk90hcaws8"; -"cd-cover-1.0"="1x1z64h0473bf4dvyiraym65h15n0jkqbc24kr0xw4i0fk0q4l2i"; -"cd-cover.doc-1.0"="0lsxmkaldpc89sm9pq4zi8j3fd2aszglx06mqn3y81qjil9h7xvp"; -"cd-cover.source-1.0"="1060k65sxs323zkjv8pvx6b98v6bq3h51r84dmn960v9xaw8pp3y"; -"cdpbundl-0.36d"="1f3375jl826gm4arxsv0saigl8230d35dmkzvqyg2kldz5ig24s0"; -"cdpbundl.doc-0.36d"="1yhc82i1n44fp375vqyzrq47qdzwxc3x3zg10a791s4p25frzcn8"; -"cdpbundl.source-0.36d"="14aw67ah211c1simgsz0i3j6jxmnsj4arjfy5g20i05l892sb2xw"; -"cellprops-2.0"="05gr1jgr9m7yfrl1d8pgnh0z8xm7rk8522vl5wck2s2slmk8schy"; -"cellprops.doc-2.0"="15f1mbagh41qvzkqf1bdzlvchfn4dibsa2qj7zwaqszc6smscl1c"; -"cellprops.source-2.0"="0yb9gjglaqfivifxi6n1al6w1nm0ah3r4d9y8bc7xnfxikhx3sym"; -"cellspace-1.8.1"="01sm0xv3jbh0n45xql6p22dz1i4j9qxzsz7mkl8rgrypbdhv5f2c"; -"cellspace.doc-1.8.1"="02i83pfa5pvvky3bhw0fx4pplws8s03v4zpjawls4vwmgz012lpn"; -"censor-3.22"="0vb23lr2ny6713ab825xrd1vqnq1g93axn3x6ywgdap4c0idfzzm"; -"censor.doc-3.22"="1v82y130k7w3piq3ppn2h9dr7pxr6yxbpmfg35j3f89l9zkhwbd7"; -"centeredline-1.1"="15paqcr4acypfgisqrcbd4qg5ma2z0msz7d76shzlc8a8bxahkph"; -"centeredline.doc-1.1"="0zfj31277wg4ymlzc3z3skq4c20b5c6yw69460knw4jj1qi9pp0v"; -"centerlastline-1.0"="0wc1pwppiwycm5w3hp5ysnv3wgsw9s8m9p9ra3xbmlkqxd6zjwnz"; -"centerlastline.doc-1.0"="0f1x3wzxvgjxsgqparyjq4x32zbqjm88v5xdxm5qkiasai68r7q3"; -"centerlastline.source-1.0"="0ngxhlawj8igq7d2mhijpfcybfr6lv1jl82vs9kk7j8xrdf2nyr2"; -"changebar-3.6c"="1xdc20v3sgpk59q2rdjc3lmn08shvsicaa1xqcxyyrfvpw8gh4fz"; -"changebar.doc-3.6c"="0vyngv1ljprxv18awpaxzs4kip7l9zyd1dnmnph43s92nqa6bj66"; -"changebar.source-3.6c"="0gmgcbsb913g0bw3a4bvpha6gmhsf6z77yhrrs6k2k1lj0pyr96g"; -"changelayout-1.0"="08bapli8zvv8p15bv3sj7l646fagzbj44dbq81apb8lhqanvlf0i"; -"changelayout.doc-1.0"="1s304gpjg30kpygvg4r8r2j4bk9fg8vlb331lypd3dfd6slphm60"; -"changelog-2.4.0"="04djmbwcl4llwry38km6qcxz0akwx8y7smvpz0bp7fnvcc8knxnx"; -"changelog.doc-2.4.0"="12yfrxiiramv0d2l0fyy7m38f0llmlivbfarl6xr18ncbxr0g0qf"; -"changepage-1.0c"="070rd3drhaaw6z386v9z5rs7dmf15ci05lmlxsaay3s1ry1425bc"; -"changepage.doc-1.0c"="1149csn0iphkxj7p1bhkza8v6xj39k49rylp84d1ilckf1q4imng"; -"changepage.source-1.0c"="1slacsdfrjyy7hmhj4ssjkh0ln846b2ds11g446hmdvckyvz4363"; -"changes-4.0.2"="1r1iprf67b0x7iwc6d8ljb04j4rgp668cj9z80j6wi7abd2fk60c"; -"changes.doc-4.0.2"="1c3qan4rw25838mi9pgb3aqf8mzj4yv1lfvhc3z8b5bkhjbbhlqx"; -"changes.source-4.0.2"="0xqmwy0bnpvnhb7j9j27rpiphzy4yxn8p2431ipkl3gc8dvrc546"; -"chappg-2.1b"="1lx2yw7xyvbhvmcaj5qk2bjfmgyr4dn7q0v8q3xfkrnbzbzmcajm"; -"chappg.doc-2.1b"="1c9qkc2m4rcixnif8y1zvcc0mzwjhzsbrbmy1cqv598cysc2yaig"; -"chappg.source-2.1b"="0fzy53whj61n52k1ashphabpa076244dqjy1v7icrb27gd1y86mg"; -"chapterfolder-2.0.1"="1lphi7j367ga43j95vlph7ywzj93lppnn4n83xhbvwp56azryqm1"; -"chapterfolder.doc-2.0.1"="1ns01x1y3dq3r37q783ha7xsnlg50vfw5knh2saw1rv40wf9vf1j"; -"chapterfolder.source-2.0.1"="0zc9fa6xgs0s6g3rfzq3p32dlr3ay4k6y443z4zslkpmnv0hprjc"; -"cheatsheet-0.8"="1cqv885i4crrramly68wamd9fcx0lj96vzys39aplars3pjv0glz"; -"cheatsheet.doc-0.8"="1ykadvnpwkyj701xwfpnlnqr313d33r0yigmsscshgr1dd52jjf0"; -"cheatsheet.source-0.8"="01hd52i399c9nsk68ymr8hmllxq1vl6v01fvs1gpm90pgvgdc9gy"; -"checkend-1.0"="1g4kx83kkpdd4fbd70b29hv82gbf19avd04b3bcxy8d0r7zyyyad"; -"checkend.doc-1.0"="1hzllxf7pnp7kg2623i5yhl2xq6phifc4jc57f2zfgfvvw0hqihy"; -"chet-2.2"="1ngh07j5kjp5v1pmymckqnj9knjadqzs8ia4h4vdyxp4zprgyqv3"; -"chet.doc-2.2"="0l628j4b4m7a5p3vvzz8rwc236wqqs7vrf698gfj8gjdbbv0c9cz"; -"chextras-1.01"="0jb9dl29m57hby3hi2cfwks99xhrnf74d3fpan64852gvk0shb4j"; -"chextras.doc-1.01"="1ijm0ymdd4hh8sh4m5kxmny9nfn704prawr1c8x7445k9j1m2d82"; -"chextras.source-1.01"="0kkbsx2rqakaxq00nkvws7lpilzysxkmsijfxp1vyh73fz9cb8jk"; -"childdoc-2.0"="0vvf825w9081qcibwgyjdm57rs6083axqnr3lz9g8hd5s1h26s78"; -"childdoc.doc-2.0"="0hh51g80vlr0malbfqbfb0m5nln84bvnqa2d847khncxh0azlr2f"; -"childdoc.source-2.0"="1gaisc49xfpk37nrnm33wazihv61b61yhi40wwyblmhvwimmx6qy"; -"chkfloat-0.1"="1bv0gfqa1bhrwq7vmjn0ih49lzb5g3sxv1fdnp25lxp5fxck31k5"; -"chkfloat.doc-0.1"="02s4m1ngjcw8w0ywyqislxs6cb5vj5zgczg3dnfpqsypvxg2xr12"; -"chletter-2.0"="01gvs00kjr313a09y65hif15vqvxidi6ri11ypsbnsc0man6dhwd"; -"chletter.doc-2.0"="0mc8nlph24bh90l4x5bfc9dyldd4jjn46y08xgf194482dz2q8gy"; -"chletter.source-2.0"="03s40qmlbnlslcv8na5vwz67fad1chagal1pjq6lk0glhn5211dq"; -"chngcntr-1.1a"="1a61sdmfbbryqd2gj87bm4qsva0xjmf9mkxhxnjixpqmr4gixq8r"; -"chngcntr.doc-1.1a"="1rrkyvwbgfxxrnsdjybjqxqg15xyzr4s7qydx1ky2k7d2yxhiy41"; -"chronology-1.1.1"="0scb55ph1k2hm5bp1kvj203c1f27a6d263x39cmb79n9a6idynrk"; -"chronology.doc-1.1.1"="1rxwljr8jh5q3id04vg4abl0h19dkbzx8m04iq7500syf2xsgl7a"; -"circ-1.1"="1m6siikjprch991sqbchbrmhvh2knjh3895w48wjp9par050cbgr"; -"circ.doc-1.1"="1zmyxc0iz7ljrkklqdmpiax9alk56pf1i4dm6ljpyisd95blcys2"; -"circ.source-1.1"="1vdj8qzym1ihkhm628zz99w6xwzhav8ci0vlckqpz3y91nkkpxaz"; -"circledsteps-1.3"="03cz4fk8lnqdqnvx870f3anrg024jrymziwxz5n2nzmfv20smwc5"; -"circledsteps.doc-1.3"="1lq6w8879n19ilp45ajjq4nq8bsl5nn18n3cbwa38305w4a72vzh"; -"classics-0.1a"="1l5p09agmrik9dkhwghjg8qh407bjw5q9hviykq7kf3y006dpzky"; -"classics.doc-0.1a"="0xp87xj7328ipwq0l8xgxn2baqm9zmp8dqyhv1iy68k9wgqr2f5w"; -"classpack-1.19"="045fl18pbqs3rxjp05mcmzhrqs94xgqnim96g8mij5v82fc7c99r"; -"classpack.doc-1.19"="1875ak0yjxlvsn1gs97np1vhy2jr2yymjxgr72p25g548sgi64q4"; -"classpack.source-1.19"="06r1kpanvp3y43jc8vrskba6qrsi115akw7yjal528fxn1lypq8n"; -"clefval-0.1"="1wdxl93z0svgg6h7vdhzqp74clcldxqh95yimqb190cbm6v5ll05"; -"clefval.doc-0.1"="1d1pw87hszspsfrl5c14q3c2iy1fkbh77dzldhajx71iqjfza634"; -"clefval.source-0.1"="1x7dvg6q0hy6pg05qpi2qaxw7y7a2dcfa4khddvbfcngp1dirrzi"; -"cleveref-0.21.4"="1d4qp3jl9mgv4afgdgcns5rr7agn5smiwqkmrasqchj4hqzwxhwd"; -"cleveref.doc-0.21.4"="10wy2zndm51fy3d80cqnwsjxyczqjjffx61ir6ky3nkmiikiyypn"; -"cleveref.source-0.21.4"="1qyyvn226dj4yq25cf5f7yzc3gx9qmxmnlnjijydgmmwam71s3xl"; -"clipboard-0.3"="1i9facsdigll3rzl8xv1i85cqyvlc54xhia69cv5cv0gly00p1dl"; -"clipboard.doc-0.3"="1b6wvadihwglj0653bn8fnnq18whx2hymigvyknw00fyn3xjgvgk"; -"clock-15878"="0w5z1ffi25nabsaqh91glby7ifn40c9rhzxlz2kbyvbrdg6a3and"; -"clock.doc-15878"="1wp9hglx1vw8zfa182m2103xb0rhg9hmp51rc7bzm6fh3iyz52is"; -"clrdblpg-1.0"="0p38c8p426dn4i40wwhi5hisx3yc8bqdi7vwxdbya02smixkpp5f"; -"clrdblpg.doc-1.0"="1l0avfhvabq1mm9yqrpr29ps9iks84j7mbfgrbrd6kfgpdpqqhx1"; -"clrdblpg.source-1.0"="0iphx9hbs4ld49d24f2i8dcyjxaqgvxznq3i34ik2ywampr2a5k1"; -"clrstrip-53537"="04k0wdzbj2a0cvjxyzb0msrx4l7jaxnzrl8b1ly2q9bmmwmd5ch2"; -"clrstrip.doc-53537"="12wdxik5rqmrrrlab5mzmn02k8ksgwn01n4kfa56w150qn00jxgg"; -"clrstrip.source-53537"="0vhbf3ml1f6s2hi8m77d6cdsq5iyn8f5n5lfswj5wdxr12sq1313"; -"cmdstring-1.1"="08wyaqfyjp482gwkwfq2xw3skazfzlv0nn59qri9728rmgykd3wn"; -"cmdstring.doc-1.1"="0236d4ngq70xrgsaxg0b0yqgcnq55blkq7d4hgw3sx6s6hkxfkn5"; -"cmdtrack-28910"="0ygl30hj8rczxj8sxis9cfq419rscvndj5fwyrls3c1d2mnscizd"; -"cmdtrack.doc-28910"="03gp5n28lg10h6amf4vxamvnsr7hvrkhmscfcdf4jyp3kkkvnv4w"; -"cmdtrack.source-28910"="1m8kfxys9nh3xml6inyn4qyhqmw3h572lvlbh7g4z0zzqgiah3qx"; -"cmsd-18787"="0zykh9s50cgsxsv2958qyvwck5lw9s2a6fdx7yb14b95wkryqssd"; -"cmsd.doc-18787"="1mp1lxxhb489appwqsbg2g3lym4xvffg047lg7rpyw4msw3m87ak"; -"cnltx-0.15"="09czgnx6jqn856sr0hg5j9azaxc4i22yp1dz95nn4s331khl3z2a"; -"cnltx.doc-0.15"="1ly2cl3srazzynhikk6myzsfhffz3k63ddw2x9sbnvw6j7syd545"; -"cntformats-0.7"="0mx4rgzk4av74s906andw0h9ga5zl2c3ip0vi4q9349yj643k2q1"; -"cntformats.doc-0.7"="0015ynn7mw1y8v14qckbqkvb1fn5xqaz7rcs6gid1n19f1qsbh6f"; -"cntperchap-0.3"="0g7211nljimm9a5fvry89ch4nf49xhad9ka7prdmlpj87h9ygas4"; -"cntperchap.doc-0.3"="1fmq2r8ssvp99ykil3aak8w301qvh4nldsph389m7qar2pviy1sk"; -"codedoc-0.3"="1zz70vp8ssblnacrqdsq9nwvf1lw69mlk9d94cfjc818szcgi9v6"; -"codedoc.doc-0.3"="1f3i3vw1cmdvgp05xckr748kzbairhvdpfvr844y7wnmxzr4rfzg"; -"codepage-51502"="0kxf5zr3mhn5pd8pzmzslgnngk8gms27ax6cqn1z0n35zvh0p17h"; -"codepage.doc-51502"="1sd01q8lzrzgk9v1dyhf4m7a4fspjll3w8wwkbzp7gc693xg3lm6"; -"codepage.source-51502"="0b38lcswx2x1jl6ydmvs6yr1y0kiv6gdicnbrx5qs8xhwd93bcag"; -"codesection-0.1"="0qp4k2z442idg0mjnancfskj0j0k75w327fixjgdq1kl9q6jm9p5"; -"codesection.doc-0.1"="1fs5qhcm1cil5cqi8dh04zxcnv2imq4m77287amq0mbh3j5h9i77"; -"codesection.source-0.1"="1qfnls0g4z3xsmh89wjcw31gm09c7yh1g99ksf0x9ml6yx1j8f3l"; -"collcell-0.5"="0f0dzdnmmi4cpyg2qfdxkdl83qrcsddpqm7z9g9mxfnx4lf86y3i"; -"collcell.doc-0.5"="0wyvhcw36arrgnwq7zc8vck3m37qrn7my4r6959p4i7zhpvsazzz"; -"collcell.source-0.5"="1k7s9rkbp829wlby7h1hwlv48bzxwwghcsnmlxrs7qnh374dwb02"; -"collectbox-0.4b"="000fwzzw018nfijir6hzwr30szlqgr3glmpnl56rrjxbxapixhyx"; -"collectbox.doc-0.4b"="0d12j4mh3m3qhdzxabxigfqi2r8hc7jrw2d8lnfz16jp4yjhp3x0"; -"collectbox.source-0.4b"="1k0bbphvr20k9hgpr3dv869h9ygxx3g8vjapkc63nq8i13crpsvz"; -"anysize-15878"="0kkjzsk03bvnap54gdf0i797zqq6bdz39yh4dn810l5hyfqxbhwc"; -"anysize.doc-15878"="15z3sa1zj1hbi7cy9q9wn4mcrf0pb3n39q2lhkx0ijhzaxn0rmvy"; -"attachfile2-2.11"="17kxgd9f4q7qwciayq465wm1akrc4a5c3lwswhria540lim2sn8c"; -"attachfile2.doc-2.11"="1p66kvz1k17hvkkh5n1ygj9fcfygipsdqlpi4fpllc2q04w79y4r"; -"attachfile2.source-2.11"="0k1j5yiz71zzwpnm37pklmr4h8bavyfjay396pkqvjwrmpxbxfkz"; -"booktabs-1.61803398"="04bfbj0v47hiww6z8xlzphm2yh4vidf9gcp3rvh81j66s7wybffj"; -"booktabs.doc-1.61803398"="1hp3fbvg2v2hk1bns9b28hdjb2bcvn5d83apkr503ahln6rigf8a"; -"booktabs.source-1.61803398"="0p0hym0xn4zcmq8q5v93z1zi8n7hxz9kg58fq53y96hf6isigdb5"; -"breqn-0.98k"="0iilwmz8nc837cdya0hydkg031q18igda96m3bzjmh9slrgzj4xl"; -"breqn.doc-0.98k"="1xk6kivqrm3qvbik1h0gbff8ypn2g6w5s8vhmwpw5vza49hr7wr4"; -"breqn.source-0.98k"="1373k3iyglxk95hqj8zyi367cy49j21ghrqydjcaj3b5qqs61qcg"; -"caption-56771"="1y0rvpimkhzwjgc7v4f5dvsl4dmsydzikfk151wn5pfsv7y4282i"; -"caption.doc-56771"="1kg5jmrvwnajmmgcilgzncw3bda7kv0n6kchl415bl7l6s1yqkbm"; -"caption.source-56771"="1bjhsn8gzb37mm5j55cmqrwljjx7wfdqlcpqvdqhqc7gyfbnw6z9"; -"cite-5.5"="07nw7axvgir19ayi3zy0b2sp8bb9pq1nl36x0wv3nrqjilvgrwr5"; -"cite.doc-5.5"="0pg5fc41iwqc1y9m9b47nh48fqp5dpnjbx14ny7ch9irxblg5d31"; -"cmap-1.0j"="11ki3gqlk6hjbpffmi2zdlj0rg5z5drcx8zw9nc480mxz931h273"; -"cmap.doc-1.0j"="1ykxc5bg6s1c2p52fyl2dkmkg25ylngsfrhsw05yzskj1l8v32yh"; -"crop-1.10.2"="1hnf65q6mg5fq75l4g81zvp4qqdb092zb41m6nl3zw2cvp8gal23"; -"crop.doc-1.10.2"="1w6ql3bnghj633ar1zwbv580py4f1fmdm4vk7pa3q7vpnrwrgh5n"; -"crop.source-1.10.2"="15fxivp8d1xww6j5nbfkmsb0b2c2ldmkdy3ikw3m6jjk269nwy4h"; -"ctable-1.31"="1xqhq2ww64h8vpqqzg3zbhh0z7xpjbcqcvxxm4a6kyasyhc9iyr2"; -"ctable.doc-1.31"="1nfdrjjb3j1n8w3x4v92v9l1k0smnygwj47ry717qgf2sq7f2b8n"; -"ctable.source-1.31"="0smcvvlq8n9ahx0z1kmf37p8zi5bjsh5q4x5mk7npay96s87z9s8"; -"eso-pic-3.0a"="01q25ka4aqpz46z84ldhd5rs3xcqjk6rl7j0nhgw4s2lznrvrpry"; -"eso-pic.doc-3.0a"="1fglwrzd52fv11i3bq60d9fzfm4h4zh003nks9wgprdj9cz0s0cf"; -"eso-pic.source-3.0a"="1si3j1cylgck60rqlk5ral8mfdv348xp7ialwakynqzf5yv1ak25"; -"euler-2.5"="0f63sy9zs0myb76wqgzww48g7clq6ni9kwnrfjkyyc4lacvd36in"; -"euler.doc-2.5"="1rl4bxzlmw95pgcf7va9gsrgz89602a9pqvhiym15b5hdwc5cb07"; -"euler.source-2.5"="0fy3dx3bf8idddxsj29yqd7bsv7cyyg8q9njmb3p0mw7laqrkjxl"; -"everysel-2.1"="090nizak865w2mgrflmz91kc0b2zmc6fq0xxrlpz68xwb214lzwx"; -"everysel.doc-2.1"="0bhqpzw5dpgq3842jbba9y21yj1808nxrg50339lx7b8vc5d2i8y"; -"everysel.source-2.1"="0aibvqmg2n26dici3adi849a5k20ck68v25vx1bz2f15q4gggd6g"; -"extsizes-1.4a"="1249x8lklry9ibil9crfvy2x3hk5afnc3g3khixqf54jcb29zpg8"; -"extsizes.doc-1.4a"="06a01bmilk7hqr2k9237i6x53f6wz4z4vhr8n0qc0i3j09n5i0ps"; -"fancybox-1.4"="077xd75n1lpy5a4gdgk88p0ai2is5aj4lf2cfxn7nsyhdvc1y6gv"; -"fancybox.doc-1.4"="1giimlw8zfksar2hwarpnhy2sd0jsdlxzfw6gz1lmdb8xmwkx2nz"; -"fancyref-0.9c"="1ns9b3viqg45w3pmnh69fdrjc9p39pfnqwwsfl9nnx04pf8b0p8i"; -"fancyref.doc-0.9c"="07g7ynr4qjv5l8v71ymbhx3vf000g5qq63c4i8q0iq35gird9yac"; -"fancyref.source-0.9c"="1p5xd5a6lwv71hp1sx490qwqbjn720gc1fpkk2inmmq6h6vwgpdy"; -"fancyvrb-3.7"="1i7rk7wna0yi9najpjabridl1wa8yfhp166p7plyls8afcqh5fzq"; -"fancyvrb.doc-3.7"="0g1i8r7cxjdqnzwfppgc42dr00fdp3q1njxhs0k5lv0mih0hrh9x"; -"filehook-0.8a"="149wsy6d4qzjra3m6cl0f9p25mwb3b6fc9d6vqqps99ysc9nvmia"; -"filehook.doc-0.8a"="0r4phnzx8y2swlyyjk59hxbvas73r9m2k81v330zxfigll94a7lb"; -"filehook.source-0.8a"="0lk1qzv2j1g3qmf91b5axcpjilagck5k7b7hfnmqj7p95gkdlb95"; -"float-1.3d"="08jb0v6lsyff09hid3whah0i0fk5znsik5rigl4l7vflnvc6km8y"; -"float.doc-1.3d"="0pqj9qq5yprg0xfxga8ck1s2wyjzz4ymhpqgzhzbxbdslh475vg4"; -"float.source-1.3d"="0774d7gmb8c7fc3f8yzarlx1m8nld1vg4gpd3dfyw5b39ra4aq4h"; -"footnotehyper-1.1d"="1341gjq4lqkzgq3n40z8zdy2qyz26wnyyjcgyddh93dv71xhynah"; -"footnotehyper.doc-1.1d"="1jf8ri15nx4hxzi4bqxrfi3m4izqyjgbpjfmpyxg18sshhypqx6l"; -"footnotehyper.source-1.1d"="1683x6gd0z7fjrdffs783b5sqy4xsyfxjq0r5i2ag9kgkz7rzah3"; -"hologo-1.14"="00d4dciklw6npr3wrsncak44nw3mcwx15c8kgglqjwpgpi6knn7a"; -"hologo.doc-1.14"="05if4ff6nk9adz1s061a4yall8fjq2piapn694q6g84wb9w3syrh"; -"hologo.source-1.14"="0by96mq2whsflfva842givdb92swmhpfiniysxck17g9dwlq6qmq"; -"index-4.1beta"="0lx5jl7nckbn0brsijlq78mm0gjshf8m1dqjhgl0l59qi56x5f4x"; -"index.doc-4.1beta"="117h2g30zbw5g6x3xlmpgq0k4fqixh0l8ah7350q1sxvddxfcc24"; -"index.source-4.1beta"="06acw1yb5z4f887p44l9afk78kpnjv9djmbwj55bac23ml2k3ddr"; -"jknapltx-19440"="1jw24izfsw3l8bn27qci3mblmhpkal9wcldhjll7h84fgjb9q396"; -"jknapltx.doc-19440"="0m3blfj4ninra6zn501x17q6b2qzckzcavgihgqmk9q51yibd5aw"; -"koma-script-3.33"="0k8mhikpll066x3683gmg3xas7a2mz93b9fip4k56hacxxb6map1"; -"l3experimental-57789"="1wbswk80mh7a5hys1kgapzz03mfsrdsvb6li1cpi7z11l1sh16cl"; -"l3experimental.doc-57789"="19f5d2zx2cg3gnb5n8q4dg476ps15a0r3s1fzlk6p0zs2q62j84s"; -"l3experimental.source-57789"="0hlqkkg1hxr8dn6l9lzsjfcbcrksqp8qnjz8y16b6irpwd6smxds"; -"latexbug-1.0j"="1jlrv9pzvfi9d2sr04sqymcysb40kygbry8wgpdy641mlkygcr9k"; -"latexbug.doc-1.0j"="1y8340ry27s2ga549w0c24s4lpr0l4mjinzkynf7rxcp6549j39h"; -"latexbug.source-1.0j"="1kxhfkgnr6b5d7hkxj4ckmd00r2ani29j1c82v5idccm4bqv3mjk"; -"lineno-4.41"="1krdnz6742d36818qhwn9i5f0wr9wqpjgh6qq1dnbjpx5589djnv"; -"lineno.doc-4.41"="1mgl7ali64f8mq2hl3gnwnirwc3r8ibb1fmd3w3fp0c3r15alyc5"; -"lineno.source-4.41"="0whh2rf7q6c6afw4qb68dfzq0bpqxmrp97f6fpb28i57m3f7fq35"; -"listings-1.8d"="1xlqk347698pq8w7rqgdd9fq39a279hjixcnxz93nzhcp9v93jzi"; -"listings.doc-1.8d"="1c3b3mhbaz5nk58wb569b6r9hwjb65wyjf3r70hrn6z2y06rq9lw"; -"listings.source-1.8d"="1q7k6dmma7l3vraic7k6gycb1jbpfzy09njj4g5pjc7j89qfk3sj"; -"lwarp-0.895"="1p2i08d5i7a41f6vkkbfn4shv6c4bhz36sxy2f5nqz9lbqxm13ll"; -"lwarp.doc-0.895"="1fbjaajyy7aibp4cxq3b4f9xwjxi8f05vak0nd5p7k7dm9yjzzmf"; -"lwarp.source-0.895"="0k6b44x1s2sgbq3rw2lid2hk95s6hcrnm73sdfm7psaiqhn9n3p5"; -"mathspec-0.2b"="0gspy6kjnx7bs5dxap8ym8s0k9i8hczi6s4s97y7av7vc8j1fb5w"; -"mathspec.doc-0.2b"="07mmfcd0fvhrhafsfk4sb4dvs5x8x1rjk1a2xl20kwpfpp8l1rb6"; -"mathtools-1.26"="171iwsrxs8l0qqkkppwvk4hq60x6n1iil9nhm6p1lqvc5g1in7yi"; -"mathtools.doc-1.26"="1rw7bllfd28si9axmydmjdcqpivdrqhqzqvxzj1ciwx2ggksmwvd"; -"mathtools.source-1.26"="175xg321lcrmc9fz3zbfc0734qab6fbfvcxpm4b33zi8kil4bqpf"; -"mdwtools-1.05.4"="0l40ydzljgydp8qfq1lm9v8nz0mrz4zxpjxicypn2hx7bxs2b9rq"; -"mdwtools.doc-1.05.4"="09d2ahrpksnjd4x7gqfx7yw51ivfpv4pwi6ms5c394c3v30xak94"; -"mdwtools.source-1.05.4"="1w3sjwa0n3pyn33k4lwnzcswm86zj9givshk0raq2qdb4znvxsk4"; -"metalogo-0.12"="03crm3sswv7mz5akghqvkq1zpiy9jdpy32ivwwmf14sfrrri2cz7"; -"metalogo.doc-0.12"="08vgbmjhynb4ramaj68i27hpgijg51j80lm0qf1jrfpapz7lrzij"; -"metalogo.source-0.12"="1ak8qbcbqgirljfwhq7ylxk1w2frxfkjvadjq00cclj007idr3x8"; -"microtype-2.8c"="1c2g1xzm914kawss1my0irmp9b05aj0c75prp65iqazmgs2niqrs"; -"microtype.doc-2.8c"="02hgl0zkmy351dp8y1v6da57d4lk6hm2834hpns62ai4xl9ffjx3"; -"microtype.source-2.8c"="1is19v3w7a4kfdw9criahs00j7ynkfzisjpdh1pxa1dy3i0a3fh7"; -"newfloat-1.1l"="01l6gl8hjml0q2kf3wzdnypr96ib3dryspgqd6hhfg33h26dji5d"; -"newfloat.doc-1.1l"="0lagdv0hd7kjxf221a2vzpgskvfr2h2wcdps0l90ycr48g9s1j68"; -"newfloat.source-1.1l"="151qai42ssn1ngn4fqi7098hmfb9v858bkbxh0qrszawhrz4w5q4"; -"ntgclass-2.1e"="0hi8qb8xqxkpy2xa3ggc8fbbraar7xxwi3n9zy4zmjwq9p9r97bn"; -"ntgclass.doc-2.1e"="1dk7y25pvmavvwaxnvsf0wqm7vwz5wqmqd1gb7zbklmwszd2pbm9"; -"ntgclass.source-2.1e"="1pzp4daznyj38karq0vj8a1jpja0jbdsdyr1136nzi7bh3q92i0c"; -"parskip-2.0h"="037404fa7flsznyidn6vpp5r5rw6wpzrg6sc8zppj9hqciqlbd52"; -"parskip.doc-2.0h"="1pw9mgg04lxmrin7vplqyfhxa2bb73yf7qj8l3bwc9yiw78v5h4m"; -"parskip.source-2.0h"="1ysz2jfdi49qjyrfkx5k1vjcykk4774i581d7kynw7q9r25lyq9g"; -"pdflscape-0.12"="04r7pgna2bziz6jsxkm0kkva37gbnz5q42ib1r23pah9knhw584d"; -"pdflscape.doc-0.12"="128rzqfkvx5ys3f5402fi7qf7iw2rrgmrs3jvrglmj9719fv8g94"; -"pdflscape.source-0.12"="1idx3b5ndgnfnyafhvi6xjqvgsyjp2cvmhd7dwd6qn6m88c3dhki"; -"pdfmanagement-testphase-0.95c"="088pzj43hq8rjn8db370b1wp82zdbjv5l9c06j9jbnlsi6m1hpf0"; -"pdfmanagement-testphase.doc-0.95c"="0l3nazd7ykqrrpaq7hkvlzpmib9xj8lr9lapc91p751155sb5gdr"; -"pdfmanagement-testphase.source-0.95c"="0srl7w0dbzadckjxgf842n7cf223s2b8b4ahcb98c5yipnv48wi9"; -"pdfpages-0.5t"="0p41hryggm71xlfjv7cbp9dq59wjsc7l4nvzyvzb2d20qnvgv9v7"; -"pdfpages.doc-0.5t"="1mc18d74fcw273lcpklpy1iyxjz2ijvl7yp5wm2sn8cj0dnywb2z"; -"pdfpages.source-0.5t"="16wlid55jihy0xglhc63fwv1c1nr3scy8p64yyxwz0gc00l2sipp"; -"polyglossia-1.52"="03hw0zcl90xc2m9npcrpmpmkiay65hmkc5d75lhpwybx9fiz31r9"; -"polyglossia.doc-1.52"="143yhjrndb77vy51rfwwsnk62ri91m34bc47qsymh596sjcrszzm"; -"polyglossia.source-1.52"="02b2jsvwvs0pk96cvv1a7byc6yq5808q4g173xvv72kj7lvczlsk"; -"makecmds-15878"="1z4m1kg7zy5q8l0a5d0fr7jl46wrw0rbwkxq1d0lm2s13xdn71dm"; -"makecmds.doc-15878"="1hqwvilvx61w47schnchlbgrj5snlp0lahsq5a1g2c1grmzpirnc"; -"makecmds.source-15878"="17c66isk18ch47syhsihj96yzi1jpr84946gck7r8ivpmk3cmmza"; -"psfrag-3.04"="0m5dlnjf7gmikg4nyxzzfz999gphkg41qm2sksq9ly2rspbdcs8s"; -"psfrag.doc-3.04"="135c7sr4i8617vwr4nnz8vcy5qv8icr0r0cmqsj6r1hpkm67zqhk"; -"psfrag.source-3.04"="0d68rzpxax5n0da8sg1nh50li7rc0m7syz0kvpsgzqbdp1clbcjn"; -"ragged2e-3.0"="0bx5fd1bpqkgzh1ixsri0w3hd0i7fdsbwps9qbzilwawhf788kpq"; -"ragged2e.doc-3.0"="0dnxij4vyfgrl7y06g56cikz8iql22rzfdcm6yxzx1i9zbvhbp4c"; -"ragged2e.source-3.0"="01arnx366ig5md4rk39f78zm2wr0h4s6mv0rx8xv3fks51nsaiar"; -"rcs-15878"="1kri1q5b36d00k1pmpkpa0dmbv7qqprycxzmlmqvp7fx82s5awwk"; -"rcs.doc-15878"="1x6m7v28p3lslral4wk595clg3kjf2nwk2mi1sva2fl56mny7mzx"; -"rcs.source-15878"="176fvqs3r8wysrqlqwjdnm0xqgqdyjq7wfwnfb2iv3c3rmpr7ab0"; -"sansmath-1.1"="09zi9xps6pv6pjwp8pjiz6w4zqa9d3rwqn38167k2dlwnc3ij6g8"; -"sansmath.doc-1.1"="103h78a075lh094slfwlh2yk4dbl0wryzmsksvbp80gbv8w7llpv"; -"section-20180"="0rqlczfl443z7mjmnmndclbjy6qnqvla89s8yqwngzyms4z1h3v8"; -"section.doc-20180"="14d7576idcbpxlw7hy3hsdd41gpiyksb9ajwnn0jm1mk2snzb51b"; -"seminar-1.62"="044c6chman0w57y8lz7j3n4s3ajg1zz81qf3ndz5pfakyivqywlk"; -"seminar.doc-1.62"="1wc34683392vnd1hb2lqk9p1ydxbs05njkqygwfkncb1q0bwdi1p"; -"sepnum-2.0"="1gawca8sqgvkgc92hrv0mjhdhh9nqiafxg2ssk7m1r5dqc091qg7"; -"sepnum.doc-2.0"="19skfqlaz82ji5fzqzgnfaz642ms71hqhv2pavm6a8ifish8wcj6"; -"setspace-6.7a"="07dpjjwslfjz4vr7g04gdy3n5f886hb8x6x2h6q593mdzy3l47sv"; -"setspace.doc-6.7a"="16zqyfv4jwrzcamns4lz684g5fijhilwnx2wywim197rw396pvz7"; -"subfig-1.3"="16fs6ax4rjnv446x56jydx59ahw9ylkpq22a1dfnnyf8s4jm7a08"; -"subfig.doc-1.3"="0jm594akhy2b1w8i7ccv23z4z94lbd6rwpmr62mg1h80af806biq"; -"subfig.source-1.3"="1aprv7xqcwnl6076w71x5x8kspa1sb5hlpbcdrws3slfzm40skcw"; -"textcase-1.00"="1d12a3wqsm2qqkd4x97j1b42ngwljh0k7y3qjpnrjfs4rd2pkgxz"; -"textcase.doc-1.00"="0gzyjqj3i5lpj46qw9q4ivhswmb0d6v2pm7c005fc1ngy2y9dy86"; -"textcase.source-1.00"="1sfwq47axxrwgwmiyxjgkyzd7hm2p0nzyy29wab3c6ab184v6avg"; -"thumbpdf-3.17"="1zj2733wnq4zydf22qhza9j0nywh6fmn8xd3dc6nwfzm68pdn9ic"; -"thumbpdf.doc-3.17"="1j3grkd8vvz6ynajk9d4nss86qsx53xw9pzkn2mbm1smddbdh8cc"; -"typehtml-17134"="1lv5bl9bq1413bbbsjvh8gz1p3qd075y7asi9x0nja36rmcags11"; -"typehtml.doc-17134"="1cgx2prk9ggw3wkbabrm0sbsfb4ablglzh2ckvg5s0chgkilcnyf"; -"typehtml.source-17134"="1ihc1dq38rklrmw8h4k4i6pq3qy9dlwn7nwzmjblpsghszfivxqb"; -"ucharcat-0.03"="0xiryrx3pjx2nq01f4f0x3anx3zvkdarp87103z9zvpf6aa27slw"; -"ucharcat.doc-0.03"="0k1aqic1ljafdk8xralygdyjapkqa0qiainrbf982233kjqclpvd"; -"ucharcat.source-0.03"="08xxmm2rrpyi9a601bzxka226fnhmyqfv8cfbc1qdivn8658785y"; -"underscore-18261"="0a93sgddm7xy8iby50yficparkr6hnzj46w70madbwpjkpnfya78"; -"underscore.doc-18261"="1lqg7j0hnnhqnfzdv0zzgpnmbysypdind3fmr6axkw0czix1pz5n"; -"unicode-math-0.8q"="1ix7yd0yiss2j5gm6s8njqp3287v1h27xxall0ya34ip1n85wkmx"; -"unicode-math.doc-0.8q"="16w4qsgvgq8vi0ylivi3j5b80y4in205ysyq8xaa2ksa8rbbaa4b"; -"unicode-math.source-0.8q"="0isg86y341w2p4a8lpsra9djb2ldn9w5cxffwzbprri33j2yqs82"; -"xltxtra-0.7"="0zpvlsdsrn6pnlfd3aa23hcrjfnnrjivi7r61g25j9sqcx7cmkym"; -"xltxtra.doc-0.7"="12wp6zwqa5mi5i5ridd2amnr48xrkqmi92xdhh95ydijpzyslhli"; -"xltxtra.source-0.7"="0vwlj6f7z7fh1vx257v0gnxj29rp3xqjpxlnn156xp9i8i29v0hn"; -"adigraph-1.7.1"="077iqsmfa1fpgmnppb7bcnskpa9ap4wa53ip67b4d21pa1arzszq"; -"adigraph.doc-1.7.1"="11z48jaj6xcwrzv8y2byjcs88mdvqi2fqk0nqw3cy5pq7b5m7rap"; -"aobs-tikz-1.0"="0fiq64szq6243gy7vg99gi9zhz5c0svrwjwj92qnv131zj71lcg8"; -"aobs-tikz.doc-1.0"="0yy2nlq6d6q5cijdswkn3b1f2a3j5sbl3fdv599vxna5pgywsw6s"; -"aobs-tikz.source-1.0"="1dj665gs9cbx3mf3nqr0944kg59gwg43ll1dz9ci3jra0nsr8w5q"; -"askmaps-0.2"="1r6lk9szs7jm57b4hl9w4ngb9dqcsi6pvp37rcnwnznj5m2daj50"; -"askmaps.doc-0.2"="1ryw8yy59mfi13rrwgrfg5y5dy3cafz2a3f8zmq5fbl7zhbylq6p"; -"asyfig-0.1c"="0zy0vxxmzg7nzwzw8z84sym5wdfbs7kyf06r6vnn05ga06wwn603"; -"asyfig.doc-0.1c"="03nby6d7cjczj3irqql5wpxs4fx9z77bb03lys5j1kg63ccq5msp"; -"asyfig.source-0.1c"="1rzicq0w7byrxqvv8pympxkwq575zqs01s02z205azaqdgrzdhss"; -"asypictureb-0.3"="1ls5ryz8c68liyyyqkjvmzyyblh9m8c5b62igz8frrj4m5vhi3aa"; -"asypictureb.doc-0.3"="03d4l74m9qwjvl71xfkhspf0d2xaafl9d2kcqhmil5yg85hsq069"; -"asypictureb.source-0.3"="1jzpagmnv21k761r52m2f708275k4pwa9sqlp88l6pgv6s6p4pab"; -"autoarea-0.3a"="07fi6gdnl9srrhmj5v28kfvjs3skf8g693hbdrfzjkyw76iji46x"; -"autoarea.doc-0.3a"="0chpz1mj3sjqjq931i7wkddgs0b96nwnfisv8r3q56ln35m2g1g6"; -"bardiag-0.4a"="1lwa55zrl4pqyvl754j4wz076gn9rbl0kfchad5pzhckm27vvp6n"; -"bardiag.doc-0.4a"="1q3ng4j9g4bp3vvbs9d4md4296vi2xhzxji8nbvq1ibkzbplgd01"; -"beamerswitch-1.7"="019j2jbww7sc5lj6h1smsvf4r55ir4k7x71nklny4s71a4sirb1w"; -"beamerswitch.doc-1.7"="13qjgjm5k9ly5wllbl5naa7pj6gmskmqgcwgkipa2gd3zninms5p"; -"beamerswitch.source-1.7"="1d9ayi5zhv8vihd6jd9lbj3z50ih640x3fm02k5qrpz6k0nv0xrn"; -"binarytree-1.01"="04q8h54dl0fmczrv6fqvvisim1mz9lnvkdmij6b3jcn60z722k84"; -"binarytree.doc-1.01"="0j8gn6mqaf1zfi9y5ahfzmywa64kzl9jxpdcdz1fl98ailbzywf3"; -"binarytree.source-1.01"="17nc2whi2nh2r17gi9jn0qya8nyfjnn6d5r10klkp42b75jff993"; -"blochsphere-1.1"="0lifkhwl8rigg1w2k915yv1r9xylsj0qnj48cx58likwanvl8s2k"; -"blochsphere.doc-1.1"="0dbh11c3fjrdypam15gjlqwf3n9wxwhjqdd1h01f2f8yams42xfl"; -"blochsphere.source-1.1"="17bkqf64qvjhbids04bm3qhghqrrwf4m2bsl3gjxxc4h6sfih259"; -"bloques-1.0"="1gr3521mxmabcwvkqxn7f0wcpcmzy5jdpypyafyklmnhc2ij6zqj"; -"bloques.doc-1.0"="1jmvan6ja2zf01lm0dmh3dg4rf1cagfniqjfrmzpxc062khf97w3"; -"blox-2.51"="0p3ci3xf1vndbdf147r9l1s68x72g7r2np6znizj3qqxd22h3wxx"; -"blox.doc-2.51"="0hskpi2wnlrrqmv0s8i4g4bh03ka18w3czvnjjvhvmf7im9wq2ha"; -"blox.source-2.51"="06zimj2liix2y0f6a35kb8q9d9asp48c58mhc3pssa185bcc7bv4"; -"bodegraph-1.4"="022m4w5rpn7n9fndddjjlyfxrwgirw5x6k7vl40nnyc8swkjwb62"; -"bodegraph.doc-1.4"="0v79v2ijgx7qs3xbsp6h1nw3rn9rry5j0qkk07bvyz5aqnzx290q"; -"bondgraph-1.0"="0ryp004w9bbphqwddprw8c3v1vndl0r34gx7ag36hlqipl6r79pm"; -"bondgraph.doc-1.0"="1hk7lp72x6skzvknhndz6f4lppamd3frl2f4dbs4hlvi4wfwjgc0"; -"bondgraphs-1.0.1"="0dhm5g508wi8r8hsk753bqflc4rvm4zi8iv0564pfsfz40fh3xnn"; -"bondgraphs.doc-1.0.1"="1wnjhyr6r7jkmxzry9my2mw8i7q2nwq26zqyfi9mh6cv3x2p8siy"; -"bondgraphs.source-1.0.1"="0qqs868saap9zsl70bwzfpmq8rnyvq2k45nc31ddzq3563djhfi7"; -"braids-2.0"="1037lf47r7w0q8j3gdxcv032vyyqvw75zacqy6p61ydp43cj587c"; -"braids.doc-2.0"="0k8r3mdimm0yqv4wkswngc2yzg3rkgvrfxgq2ny3gcndqb10gp7d"; -"braids.source-2.0"="1xf8jn4mv0ds6bcaqlr59265r83984h9kqj9bsb8h3izfbpfx7qz"; -"bxeepic-0.2"="18by54j2rg04n19whsb2zjkksrdh6f6i54fq257i2mvcp0qpxwr5"; -"bxeepic.doc-0.2"="0117dzkqs1sy8si4dbal9p5p6csskcby2swmf2911c0vbpdl51zm"; -"cachepic-1.0"="1j93lljbpwca363sjk5qmljrfq4f671kg4qrnfyv9zqcxcpyfmmg"; -"cachepic.doc-1.0"="00j7j75zq3wa6z1liy0y6wzxjv96sq5r4dh7kp9f9icmxzs0x8xy"; -"callouts-44899"="19khsdal0siv0vvj56bxgkrj7bk1yyd3lw8iz6zijchp0by6gbbr"; -"callouts.doc-44899"="18zy2yzjlgn9g2wzlc9i52x8g3dv32hvbybjkm9fmklsgnw8fang"; -"celtic-1.1"="1vg75zj6p9bhp9qg4c7nvgncs7iiki5jizx27ld26yni9m2cd0sb"; -"celtic.doc-1.1"="1llinw15fnpjshks9yzlmbi04pkn6s87jfwgpnh5vb9hfws1ira5"; -"celtic.source-1.1"="1w3wm5ci6kzpnvlaxbpqndclhxlbs4xiwq90iig98wf97b85lfi9"; -"chemfig-1.6a"="1j5m660a1pcc1cy9gkcszv402iflwc98838nrah90ww5zbnkk1d4"; -"chemfig.doc-1.6a"="0x4sawnsi06v2k4qm8fmyxx1jn1d22c42v2na99j3ay0lk5384vg"; -"circuit-macros-9.5"="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b"; -"circuit-macros.doc-9.5"="1ffj1cg743606s14nizqsl45vmp4rcir4lk29jl1wm9csw03fhxi"; -"circuitikz-1.3.3"="176mlnx0qr2hpb5vikyna5w0vzri7ba2dbhcd0mrv2akaziiwq0b"; -"circuitikz.doc-1.3.3"="0yixqi5mhwyypq03lrcsdbi2x89nmsphffkdf7zk6c26ibgdnwyp"; -"combinedgraphics-0.2.2"="12569y2i0q2lbmnwlwjfc02x0drpa3vcy58wbch4j2xzv1cih69s"; -"combinedgraphics.doc-0.2.2"="1jn4vdnlz0mwjv09ry0phbisf5zv5valwd3779cqbh1dzpnpl7lq"; -"combinedgraphics.source-0.2.2"="0xacdk2xsdlzgrxh0sa8sgjkwhwasvahgdgjjxa9p82bfjhr1f4d"; -"curve-1.16"="1h1mfx67i3d2jr6l8qlfys9m6bqzn4x1wb74cjbrkdclyqn3lmd7"; -"curve.doc-1.16"="1jv8f3izp9pvzh5qs3sh33c95v0z3wn88f278qxi0f1bc1k8990m"; -"curve.source-1.16"="0l9cq8aji7z8qh0p45af8rnz0iw9m1hgc118482x699iqrvg96y2"; -"curve2e-2.2.15"="1kxd01qfcj2ii7qics40g78xwb0d1scdlkc8a2mx2zsqyhnwgs12"; -"curve2e.doc-2.2.15"="1y75vjq25yj5pzddxgakdj8b18bq0rykfsv4j724aicmpfs8z6dl"; -"curve2e.source-2.2.15"="0dk1iksqd5chp9b221zq54n7flalwr91f6pgb2k5amwfy6i98qh3"; -"curves-1.55"="150iv654y4x5lb3njd7dfjf8i0axlpf7zz6gx4wqgq06kddjr7w7"; -"curves.doc-1.55"="1ddgy7gzw2871qsh99m0k90lgh8kf5883skcqxww0bl7b335qc8y"; -"curves.source-1.55"="1r9c0rpi7q6ishzaaw7qnil0lzqgdvc0ybmr3j083af17snkq0v6"; -"dcpic-5.0.0"="0yfjhpn8hr3yk4dyjfzbc8g7cki64039lb96naacyv8mjhqdpgyd"; -"dcpic.doc-5.0.0"="0vxqvnkxm00k0xqpllcnq01si33wyg2mkhpb7l8jxxxizn3wf5vi"; -"diagmac2-2.1"="00jzm6pdzxbg33fbj19ih813j9wvb1g9hr01g9xjc0d6nprq9mcs"; -"diagmac2.doc-2.1"="0vpm9lc33x5xyip25kay38fhld0a0z4l6g3nvhbdh65apb4j4wfs"; -"ditaa-0.9"="00ym9qcrzq9g72r5dkvqwsxig9gryizzznjfzarq9x9dvd7x1r48"; -"ditaa.doc-0.9"="13cw5a4wvv5fyknckvm6qzhl2lvaqvqvlwi711ix6zq6db3ghfsw"; -"doc-pictex.doc-24927"="0fdvqhkgi5j33rx0r4fifj69f4smn5w0n99vx90a3fw15qzxsg5y"; -"dot2texi-3.0"="0hb9mv8ai85smn9viig88f5hprj3dyj574amy9nzdr8f52lrbg2z"; -"dot2texi.doc-3.0"="0wa63gs8h9a5d94chiq1gr4lam8p0338lyqbw3bmf3ix3v1bzyvm"; -"dottex-0.6"="1ykjw55qzv5vk1wk90qddswvj3ai1s5xx674vkf5r07nw07dca76"; -"dottex.doc-0.6"="0vk0qgwvmny4fpa9d0gwg4s8z68aaiw1bn135d5msgikbkhbbmw7"; -"dottex.source-0.6"="1ph52wyv7fqri6pxsi289s7svy4p4zap1bdzbwqpbsrp6v4ngjqa"; -"dpcircling-1.0"="11qhxh5pgjyc98hnlbq8hfsb77bavs0z3yjx4809z6aypah5cd92"; -"dpcircling.doc-1.0"="1qrx0pnk1p046mx6nzjwgrfxaq1hmdgalqsp3cr6d6zgqwzsnms1"; -"dratex-15878"="02nyg30awmpp2yi4m6r9gbgz04irjzpbjhpp72j0qxzly8c8frqn"; -"dratex.doc-15878"="1a5knp5hylpb1i7hkd9160bah7pps9b0hm00zgn9fk33g5xrvhbz"; -"drs-1.1b"="17jp9fvj86sp4ywgc6j1dp3pnvgllilbq75298qamnnj3f403vlr"; -"drs.doc-1.1b"="158wkgnrgwfg2ikbj98hmcaaymrwpmnmaxillksv1b7gxmdrphk5"; -"duotenzor-1.00"="0p9gq8i6xcfg4pxdnqfswjcnc17x7pzsp4iya9b3fjq4kplqv28s"; -"duotenzor.doc-1.00"="1bc1pycds7r45c2bzmjhxs2wv0f2wqyxbycfrl6g4fycr341h8gi"; -"dynkin-diagrams-3.1415926535897932"="02s19zsjsql9qhlhf94z2smlr0j40z4rrx33iiwc54xx3j55asap"; -"dynkin-diagrams.doc-3.1415926535897932"="1gk31brjcrw88a2fb3y7jq47g9lkpr7dq7b2rmvkbwxd0yyf789i"; -"ecgdraw-0.1"="09affkfqlsrjgn546h6fkbzi4y7dy9zgf4i5a8kw6lbgl631gvid"; -"ecgdraw.doc-0.1"="1m42ngbia5ilcx6hjd0xid07vdvxmrb2vd4qmzr8bzzflj2janhf"; -"ecgdraw.source-0.1"="0825jfxsmicfqv1amnjx69wmfw893pcdqihqx7vv6yd9xs4bqciy"; -"eepic-1.1e"="07hg546cp5ab7x4zq25m7z184mvg7hyql7dsbwvgpq6hyz5pqzyq"; -"eepic.doc-1.1e"="13v8n27iw1b7qvs3baqqyls9cp2mqbycrbax7jnr8mfvp83jmpkz"; -"ellipse-1.0"="0hp6gm0na1gjxdjivxgakbkrq48mp9zblbfxxw68l2aa4jm1x1a6"; -"ellipse.doc-1.0"="0invkczwak9b89n6w8ny9bh1mg7amk418cf6b0552pb5rpkbby8m"; -"ellipse.source-1.0"="0143mncfyss0cyzq0aim8lvzxhq5q8a0cpsh92llqjl19s30d3fd"; -"endofproofwd-55643"="1dz3kfsjalq9419l9sdjws5bjisy8pmy93my8m8acdf3d4ryr11x"; -"endofproofwd.doc-55643"="1m5wq64v14cz4i29smnw742ak6sraxq9rzwcqkg40vgzsss73lxc"; -"epspdf-0.6.5"="0c6p7gqzkqdyii0jh11pvkzqjlvb7c82rpm4qh9mz8l7b9xfrzzd"; -"epspdf.doc-0.6.5"="0hdr1pvpdyxrs01438azgbj5sbysi3bxbiisdrqrlbsxvwijp7wr"; -"epspdfconversion-0.61"="0arf6kmziarh1sgani0bnp2jm8psxj937hrkaslfj8fm2s46gcmz"; -"epspdfconversion.doc-0.61"="1xpj5lymdh9w2ary36sx66ib0hwbjfbbhhcipdq4nkikq7a8zmpg"; -"esk-1.0"="007jcqvxp41h0ky25mgn2k3qdvyiyr3vj9mn6ml1zsvy1ymxq4dj"; -"esk.doc-1.0"="075wb7q7z5idhqh39isvkacpgacfcv966af904yk9ralin5fwbr0"; -"esk.source-1.0"="022n8rh8rwn9y4yx1rqpdynw2lpm8npwd45y88r2q29qcd9f62qb"; -"euflag-0.8"="168c6y6rivahj6cw377l54jsykpxaxvv3nbmr80w19d90h4sqa5l"; -"euflag.doc-0.8"="1a65rasxx88bkz3bg51bmzdbq67yphljaa8mgkp2b69fjsifm229"; -"euflag.source-0.8"="09g2gn9ci11dca9s8bgdrjaprzb66vb47ssfnj6n061glz9a244z"; -"fast-diagram-1.1"="13c2r5prb7dg05j0r4lkdz36v51zj6v5p2c7q22gfkbz1lj1s6s2"; -"fast-diagram.doc-1.1"="1f3ghs0l6mj2q3iw74rjjb12y8151cccvhww13h4kzc30vacr3r2"; -"fig4latex-0.2"="1bq3hj1gnc1g70jvrrvxsg1lkxrdnj81h08qr7hqwlwll37qlha6"; -"fig4latex.doc-0.2"="0ddaikx7qphb98xc3nswyv01d0xh5g4vf95fqsnbhg811c83jpk4"; -"figchild-1.0.0"="0ha1ca8npa8pis6dp54cn7sz08x3q5h2b113h2afifmcinv7iy6v"; -"figchild.doc-1.0.0"="096zwf8wp643dk7rkkwmksx5y4d4d168ww2csmmm87hwnnvhsznj"; -"fitbox-1.02"="0jk46rrq01bbqkwfqf1rdrzwv475mdmz4hqvbffkivnbwj1vz18g"; -"fitbox.doc-1.02"="0gb5gpdrdagilxsklq1aijr5zfl5n82nwal1h9qls0iqzjvgizka"; -"fitbox.source-1.02"="039q5as7939zc5nby6m6piz5h0zphm19hqjkdyrgzw1q4r9ypzc6"; -"flowchart-3.3"="1b6gwbnd9xjcvjxgnl6xjq6lja1a0p2xnrdlbrhs6ka6f6pnrbl2"; -"flowchart.doc-3.3"="06i32gmsqgvqgy0l0qbdjybnp4rmz2cn1c7zw76w3mhd9z220d77"; -"flowchart.source-3.3"="14ikpr9fga193y2vgr5sisvzc5scf04b1xc9hcv6zmkcph8dvnnk"; -"forest-2.1.5"="0q1xd07z1ccqrrfl3x0fg35sdv2kcyl6vgps7f6gpk5yp8j7d392"; -"forest.doc-2.1.5"="1s9i1kxd5zhdqv5xx29kh8i5fis642hcw76ya5bh94qffhwwg7j3"; -"forest.source-2.1.5"="1i6r6i8zh70zxz6sk0c9b07345vcfr9aapw8q5kzd3k76fzcqfdl"; -"elocalloc-0.03"="0jj85nyrq2y7w7pm9pq8qdj3xszg5s3a1j8zx2dvsy6a1s7mzd8i"; -"elocalloc.doc-0.03"="0rgf8vijb0dl48x4rwbzg7gd1apjs7vwl8rj7zyv60vx53zzkp5i"; -"elocalloc.source-0.03"="100hs4drnz5jy657crs8g62281sbgza7k78pvk1qfds2y8la2968"; -"environ-0.3"="0in2a7ar0c6ji7qhrbgp4bglcr2cmb9imxch8fcrwkims4g3vjp3"; -"environ.doc-0.3"="1pb6nmprhz3j9dx2h7sw0y66y1qlvhkjl3ip28bxa133fgqab148"; -"environ.source-0.3"="1jkbi2g2s13rngwqvr435i9n94ycnzp9xa8szik0nnmj482ah2hn"; -"trimspaces-1.1"="10rx6pcvwn1lzyivn312j76lsrw3lb40jgzyj861gl3r3pcls0nw"; -"trimspaces.doc-1.1"="13zf5bz4pp0lwp44kxdj1zw44h978bdpaiskbma752603jlznaqs"; -"trimspaces.source-1.1"="0nfwqm4a7c1ks5sqypkwmffqasjaw008pxjb5spr49h3sv7sp04w"; -"inlinedef-1.0"="0k6190v8lv2l96qpmh3pkblhwn6camcq83w75rz09517bnysm4yz"; -"inlinedef.doc-1.0"="0gz9m7fwcdxs6q5a33v7n32x5jr4hbxsy4j2shwv39j1j2amr1vl"; -"inlinedef.source-1.0"="007648wrb4ar04g0851yw663cvlmdyifidp854y87yzh536hfwi1"; -"pgfopts-2.1a"="0g7a22d0ppdzcazrif8yjic19lvz143p6vwflz16p6zh88yhcdm7"; -"pgfopts.doc-2.1a"="17q1mlaql7f510pz86n64sm4m97nii72jghf75qs5yr9h9lqrq6v"; -"pgfopts.source-2.1a"="1mz5nzbhmbgzjkpkglz2w3s9s8kzrigg3wrd91dmdhjsm4d4kczi"; -"genealogytree-2.01"="01z2gfczggyhm7anfiax6w9d0da2ph8xxx13yc9agnshv1p5x28n"; -"genealogytree.doc-2.01"="0q3yd8ljwzqhnxid8xpzgd35hn80jm67vdjw6nvkad5nb2z112m7"; -"getmap-1.11"="158fwravmqda1zwzw6qzvq7lrd1xsjm9cdw3qgif2jjq6zsrnjqd"; -"getmap.doc-1.11"="0s9djdlchnp6w7wr7w2b4jj6iq3v6f8r1ri5kbp5q3hfshjgah22"; -"gincltex-0.3"="0w1pk80idhws2yva3zvlbnwy2xbrqa0dckhwj8d9sdqxn5j2va4a"; -"gincltex.doc-0.3"="0zdv33r7r6x39p80jwjxk4k2yi4rqyv9w3nzkn7si5ckw223gz4a"; -"gincltex.source-0.3"="0m1yd9b6qlbmrxqnyk7kgxx7227zy6v10sf1vw856gpx1r6xbc22"; -"gnuplottex-0.9.5"="1ck4r4inr8ac82p0r8062z3hwf9187sv43ym9586sk3ip6kqb3yj"; -"gnuplottex.doc-0.9.5"="198g23i6k5f353w2aa9f9cw6cj8b4f93nsk7iq2hvhvk6ia876vx"; -"gnuplottex.source-0.9.5"="0iz43zdvzfs7spc6zvgclyh0vjnzkwcixgk5mg2a3wrig8r4q6fq"; -"gradientframe-0.2"="0c77ymahnfqix4h3i5q8fyzra5vr1fc2rygycwsz9zrf332ca5qw"; -"gradientframe.doc-0.2"="15lf5hlw760cqwqjf91wjzfbplp5npv586k967bpzm17pkmw6pqq"; -"gradientframe.source-0.2"="022x1whvyd9gqw2kj3m8pncn0m0c839bdwysw4sq5xx9nw6ixib2"; -"grafcet-1.3.5"="0yz1f2p8dn3a1ws5skmznbd4ih9bri6r7vr6rx3zcspmad1fjg4d"; -"grafcet.doc-1.3.5"="0inzw5cw5759c4l3ikzgn0zx47b0l575yjpz2613fh9l5ys800nl"; -"graph35-0.1.1"="0xa99vmdhmh77dyr63a3rqz79mr6lxa1sq74x8d9sj041gdmryq4"; -"graph35.doc-0.1.1"="08h1v6f44z3m31qdgb4b8p2z4d331d8ccqxii85dzmih25w9jwvh"; -"graph35.source-0.1.1"="14ch24l1prmpwfv7bwd8l96c8mf0cwdwlmz37br0b2qcb4kbjr95"; -"graphicxpsd-1.2"="1fganh87hpkac141i4c8f5bw06sfhy3qs14blx466h1nmc6308az"; -"graphicxpsd.doc-1.2"="12d820bdrnlq0v6rzd72icvac73vq7b7sq2kq0nab05xsdi2418c"; -"graphviz-0.94"="1gpl57lb4wkysxdhvqajzxjb4w0m5nxdxi841dzg0sg2igchfab6"; -"graphviz.doc-0.94"="09aa9yl3zmcc5vlvjvgaxfmhj83qk4wgp4fx90bgn28kxnzhicxx"; -"graphviz.source-0.94"="1w878b21va1y0mz08wr7mgdxl09hmbmxbzfnpv2mdqyy01lwpzks"; -"gtrlib-largetrees-1.2b"="0l0fqpw6sd1gg3da8s7wz324q5bdd9l80zxg835gfw0vvrn912im"; -"gtrlib-largetrees.doc-1.2b"="1mq4pbmsfvm4y7g4ar3a438469yy6x4ciksrns05dnkk54adyyj8"; -"gtrlib-largetrees.source-1.2b"="02x48sgx6vfwbdvgj0f5b9sc0kmkwcl6jyqzv0ascc77av9w41na"; -"harveyballs-1.1"="0d3wc82qamnc2pivkr23njai42vbn7xip2rlsj4kc8p75zh9da3h"; -"harveyballs.doc-1.1"="1792wp7zx6a9f19lplca1b7pdyf8zjvqndl26s84sfv3w4fmbr8z"; -"here-16135"="1l6xh4jl2nipnswdn78378vhr41ikj7qk07j7iaqkyigk5ndl0vx"; -"here.doc-16135"="0i454862gik3jy1g3v21laf8qag2cadvapqz0mn68hl9ymly4b13"; -"hf-tikz-0.3a"="13232m6hybqv16f6v0bmgiyfqdfj407mn0h4m9wgh9pzwy3g1rmz"; -"hf-tikz.doc-0.3a"="070h5rdgfffjs8sb2gaximsqjzby2vcf9ffvpljkd3jzc8rznlbm"; -"hf-tikz.source-0.3a"="1df36m347jl9640jig0qrk445s0gxyk6rl74i19xxv567bxh9n69"; -"hobby-1.8"="02p8xxqxkq486dxz2fy3vghm9qnc13pznz84w3grn1b1cys1sbmv"; -"hobby.doc-1.8"="08q2nn1av4wcqnlacjjh6bgbx57qrc9vigb695x5zrrydcqdac0g"; -"hobby.source-1.8"="1pbzsba0z0i3zf9np60fjx0wvpvimslal8xq15pf5p9lrjq946r5"; -"hvfloat-2.19"="1575cs79d6pcnf6a2g9bvlijrqz2kxskly4771j9haa4gg9g8gnw"; -"hvfloat.doc-2.19"="0ha1lnzsy9yh6qv78wdpv9zgqyzn4dxc8rn2lb2j4nfdwcciards"; -"istgame-2.0"="0zr94dl9q3whjlsjmkcdjyhxndcj4dx0d2ynm21inksavhxc9xbs"; -"istgame.doc-2.0"="1a0xrxblfh2kz1bx3iqw908cifhh0gwvxxpxcfrvjsilzbd6hc7w"; -"kblocks-2.0"="001mn33pf532iwp3d8likhbc5a4nsgq72dirbilbdgaxqxndmx12"; -"kblocks.doc-2.0"="14qyg0sqrr5b04j2ramw9zcfhbgmc9qfyy5im9la4id4b4zxrk25"; -"knitting-3.0"="10x5yxlrnj67gzd5kz7fvnz0nykvvi26sdm7i3n3d0si1vjzvczs"; -"knitting.doc-3.0"="1zm6s0rd3zkir9vxvbc37big9ygnyhcqpr4p306vqavvmf5g7p57"; -"knittingpattern-17205"="1ydq16bmviqkbf9zkrlxsh33bfn8nmyzbbi1xwfd7nsg1bhdf6d1"; -"knittingpattern.doc-17205"="1x1bswn2sd1w19g1szc573zayk43zi3718a9yqfzqnxa0qxvxsqd"; -"ladder-44394"="0a2sxy3rvc4w4a625wa000g4mjm00d8fpjff49v08kw1ddadv6fh"; -"ladder.doc-44394"="16dg0nz4k3491mj7ccvw32r71vyjz2hdgdh4xgs7p3n9jg4jdp95"; -"lapdf-1.1"="1lfmn6axzbfk03j6f12yqa0vy3gzvw1ylpq7k2ki4prb3zwhx9sx"; -"lapdf.doc-1.1"="0h9wy3amir9wdqv0b8678mfmcd172zll9p5v7sf1l0w3zlbw5msy"; -"latex-make-2.4.2"="0xsickz9392cgsq4jrbil9k6d1xk1dlgq7d4mfmw36lxgkwgkhks"; -"latex-make.doc-2.4.2"="0asg616gsk2dv6mlz79mj9glg8w1nim58qdrwkhnbr7ibwyplxn6"; -"latex-make.source-2.4.2"="02d0d09wy1zvsqv6w8nb07b5yy5lrfp3igxzf3prxyxlrzy6zdjy"; -"lpic-0.8"="0axszk7cpnc58rs7w7pwy3vpj39l6zc27g8lfxjzkzlnc8hbnycd"; -"lpic.doc-0.8"="0hyg9v30h6n38j8a4pbqfjxkqfc9ls3hcp1cf8n8dwr3ajyhvins"; -"lroundrect-1.0"="0s44pbvm6iwl2jyffnxriqlmpp6zs1y70z4aix8wwfasx86gq131"; -"lroundrect.doc-1.0"="01ncbhr1x995763d1dnarhy56d7mq3r8k1b56whqs6kq55115w2w"; -"lroundrect.source-1.0"="1sh8ypnfq4pwaqd934vdh77svs9d3a4114vghg6m4sz5fxh11i39"; -"luamesh-0.6"="1di01y6p60r52nr8jqlgrj9sf1fcc4mhkzlf2fjx533ss6qsm7si"; -"luamesh.doc-0.6"="0ybcj2yny2ljd1kzb4waf01h0w0n1wk8r77dv4a74v60px99k6km"; -"luasseq-37877"="0z0p4a0cr7id3i3wfbg0r7p20d742980k7mipiawqs8a3b18x0g8"; -"luasseq.doc-37877"="07chcsawrnayyskhf5x4bm5mdz7c71prh4176gg18ym9jf7kpvjp"; -"luasseq.source-37877"="0jdq2nrsc1svjcbx34r6n38zl1a8nf74wb9hf9nr89a2mdl3aj71"; -"maker-1.0"="1fymg22y0w2kghmqh5pgxkrncdcbbmhhxappc72g5q337hcky0xa"; -"maker.doc-1.0"="1yz72c1ghqjs06nagngpp2q62gh67c3klwm73bcbc090vdfkw7mf"; -"makeshape-2.1"="1fy1ccz3707f8wxilh95k8sc3a93gl93qcpvpxl833mbkamkx3kj"; -"makeshape.doc-2.1"="17dnkldg0v2qp3hdy4bw1k48p8xx3v566pm088g8qb0df6kx4217"; -"makeshape.source-2.1"="1yd3ssh3cpy54gm0nkp2ah0nqarbnk9hqw2kkwdf96dj8vjlsgwd"; -"mathspic-1.13"="104vf0cbxhfbgabxjpypyx16fbpyi05k14dhw5ynmlh4rv3ck7li"; -"mathspic.doc-1.13"="10j7z7yb5fjqlldf8w5sm5kic6v842dijd7f4v0b2q5h1gbhwyim"; -"mercatormap-1.02"="1gw28rgsdllh8h9cg70nayj12aqw356svv34lhvfj5b52y7ykabs"; -"mercatormap.doc-1.02"="0v9v54qz9m9hnfid2k9xl7fwgwhjxnk0g7wndxypd73b63mvfhpi"; -"milsymb-1.02"="04r9xbgsc8w783zf8nn5d6c5fiwmzhlqdw5a36wk7l9ll2rvbvgd"; -"milsymb.doc-1.02"="14wj7l4bykfy8nsayl105g61xc8zvnrvd13mbcd1qv9x5j8vvp4d"; -"miniplot-17483"="1hl5nd6p9c1xhm1kpw9sh1s81ymdy8lxfn7wh1sdvildcvclvd4q"; -"miniplot.doc-17483"="068s76gnva6rsnd7gfwswxfam56dbiw9s9ymqr2hcqx7i4dl87x4"; -"mkpic-1.02"="0sib2pckayb4i7lxga35rkxvy05ix6idifcqrlcbmddfix3djrzp"; -"mkpic.doc-1.02"="11pj8q1zvblsc2dyd68a0nri9zpqzrp9a6lha5dk91a2aygzaf87"; -"modiagram-0.3a"="1d3sz2yxc1n3xk6haja2yz14jgcl15pp21y985h7dflk2yjflabx"; -"modiagram.doc-0.3a"="1a42ylnkigyvvkk0yrxcpypz1qlki9r4jzpy6lpky0fa6bfbl4yc"; -"neuralnetwork-1.0"="0rhvhk46z3wgz5w7xrbmlmgk2px8mvajbrrj4ygpqa58g37wl0v7"; -"neuralnetwork.doc-1.0"="1apv7bhss9ilqcm5fxwg83gxm9i8563671jcsmhkl13gcii1lpv8"; -"nl-interval-1.0"="1lrj178yhmd4ajwvpdlbsr97sg39k39b8n30wib0ww2lagyw6rgq"; -"nl-interval.doc-1.0"="0b439r5r8zzhgd5k0n1bzag3naxs2bjd6hlm3sw60viq8fs5wgy0"; -"numericplots-2.0.2"="1c127aalh7jcx9rxhsyhi2k1qdz6fg8d6qj0kvf564s9c0npgar6"; -"numericplots.doc-2.0.2"="045z6l4dmn3bzfsn7gi6bdhwvp3cbf9nj8fcs6q07vi4by71bk98"; -"pb-diagram-5.0"="07l8172hqnv9dq6qg1ipbjjbmkpv7s589gci6q82zb8a0y6kyqvy"; -"pb-diagram.doc-5.0"="05h5i0b1y03j5y0nf8iv8hb5qnq1lh5a55nn8xggx2rknnq0d1b9"; -"penrose-1.4"="0swjzbd10xvab086m7zjbxgq0jjzrxds534rsv6nkmsm3zr9qdfg"; -"penrose.doc-1.4"="1xmylw0prazylvqmqklhpfxhwy6wvbz9jln1cyd23m66297f8q66"; -"penrose.source-1.4"="1l9x5l78zcgrqf9xi1w518j6l24zbb6mh51fv3g7xcymr6miljvk"; -"petri-nets-39165"="1hi46pzd5cjvpakya2bl52w7m84xm8h03m01jfrry3vnp9hqbc11"; -"petri-nets.doc-39165"="0ixpads25k51rlb2kapxgv75w5igbnv5isn61c29qpm51dpaq012"; -"pgf-blur-1.02"="1w9p9l2nw9bf0rhn70y70h6lqqqx3qravgarmmz1z86ara26k49w"; -"pgf-blur.doc-1.02"="0fq1w85wqqrml9jzi7s2n888165pg4ds8ysvgh56kbkd2zzahnw3"; -"pgf-blur.source-1.02"="1pc8x23l6qcq356s843si16yc6yfrvdxg7v821271dndkg7d2vvh"; -"pgf-cmykshadings-1.2"="1v9cpsh206r45hjn53hvxixi3kh3l094xgj5yq9vqsviiprassd2"; -"pgf-cmykshadings.doc-1.2"="07p9glm33cz2dk4891r338z45y1wqbfbmmdk51if8jaq52dp9w18"; -"pgf-cmykshadings.source-1.2"="1fpa9iqc6rz6j9qja43yfhrcahgg21ij3jscbpsvwq5iy7j96n46"; -"pgf-pie-0.3"="1n98jvahq7sd19vxhzmg7pz6cr796k8r8dgb7p05r4znxaq5k520"; -"pgf-pie.doc-0.3"="0qlpzxpl4r8g59297xldndryw2al05sbwnsycnpv904jllypsi83"; -"pgf-soroban-1.1"="1y1c70a9v9zy8i58j19g5c8nc7f00zcdrdjmdcbm19r8vi2r09fr"; -"pgf-soroban.doc-1.1"="1r1rgd313fijmjqy468j25d55p76vxmcrgkp968riknych16y1pl"; -"pgf-spectra-2.0.0"="174in1jgiy165dqpqvm6gqwcpz2nlr6s7garwvqqrwphjsj766g2"; -"pgf-spectra.doc-2.0.0"="1jbhxjqqxkcnh8svzpk37lfnyvq1fm70zdnvvghbssy76940340a"; -"pgf-umlcd-0.2.1.1"="0dd5llczfvn64kp6iqfmlgig1g9lsryz078hz2rakjfzlhbbvgdr"; -"pgf-umlcd.doc-0.2.1.1"="086qcz59zznqg7a40l8y2hi7ijajkwq3ppfbckl65niz0rmqzjhn"; -"pgf-umlsd-0.7"="0rs0iskzhmlgydk4i9idql66sk9dyiqrglp429b2sjaw0mbjyxvz"; -"pgf-umlsd.doc-0.7"="0vl7wjrgnfz0y0pfp4izqi1528i81fssak85w1sl2n97lhyq8mkk"; -"pgfgantt-5.0"="18snhw1hvff64xq6jaq6wjdxcrkjwjv39hif31zj2r0ghsajqaqs"; -"pgfgantt.doc-5.0"="1xhls9kyhf314rrmd8r3065qaffbm48mc746lwhsrh6vmq548baq"; -"pgfgantt.source-5.0"="0hgjiy1gs8nx0211ar38qr3ql5yx32mcdvms0yibpglr2ncv4x39"; -"pgfkeyx-0.0.1"="0gh229dsrbxw6brfz5m2zz6x3zfsa03iqps5bgcr4bz0qfjl0a2s"; -"pgfkeyx.doc-0.0.1"="1cbldr5x9n649sk9dfcp143jrzxh6l4ibzndx4yr8f7id5nx3nag"; -"pgfmolbio-0.21"="1arhxgwpsw9ifj3yy36mv52r8843bm3v1lrda17r44zjf4fhimfk"; -"pgfmolbio.doc-0.21"="0kxp1gqd09q5h4ixjlfmda9jm25wd3s7dsxcqc32sw3qay4d84cp"; -"pgfmolbio.source-0.21"="0lxbszlky3q27cyzfnnvglmzim4lfjh14p62j43sj5w2arv9w3v7"; -"pgfmorepages-1.20"="0xarflkdk2xvfmmsafv1hhpdrfyddjxlqjjwps9yzzcwblpjnali"; -"pgfmorepages.doc-1.20"="1wsa6iqyrcjq7zyanjgaq6a1i5d7lm1bk9y07mz0bjwc2yv359zi"; -"pgfornament-1.2"="0hvr6cbp4mzajmqz6fyd3x7qr9b2vlwdhkpc62axgm2sww8igp70"; -"pgfornament.doc-1.2"="0i1fncv9saflkvib43jp02mh94cv0nnq6k8psrf4l1yx95sdxnky"; -"pgfplots-1.17"="0hdr9ykdy7vl2gjxakcs0wziqvpn192hx1msj1fxsa7mg29nflfm"; -"pgfplots.doc-1.17"="1dybzp5icvg2i23kqx9pp1lzmhf7vnznb88y708v2a6xm1lzf686"; -"pgfplots.source-1.17"="0sjfj0zg91s5gq8fs88p16h60zxs07nmfwshb494q2bwcsf3br7p"; -"picinpar-1.2a"="1hw5yx5pwz92mfxd5z1fr91dv3dbsqq1522xkflc8kjwl72qmmk3"; -"picinpar.doc-1.2a"="1h4z08ws3r1kfrfg2qz47zsv26hb92qv1gd3bi7f7jidczvnwgph"; -"pict2e-0.4b"="02rhm6a26vgpscasrbz25vjimlnkh9s18pq6a9025k65iwp5f08z"; -"pict2e.doc-0.4b"="15k5w2l4c9mxay416bgj745g45pqyaw749mn69dchg2pqh77yz1j"; -"pict2e.source-0.4b"="007yb70j4ay0qdls8kqb4wxf1g3672yasjjlqc10zsywc005f0nw"; -"pictex-1.1"="029xdg1c8g9xxycsbx0av6ir3pxn13pbjvwfmckrsd7gspcf2j2n"; -"pictex.doc-1.1"="11p0ypwhf7yvjmydn6g9f5d7i9jlm0ic14ljkkhksw7v19w4aahf"; -"pictex2-15878"="1qqf08yharknq6csk01jdff62mg011bryqlq5mbmjwqwh7wxs0wy"; -"pinlabel-1.2"="0dlg15b6cjykp481xn03kg3p1zqwccwnm2la710xdwf87p1k4bp6"; -"pinlabel.doc-1.2"="0jw94fl3awpyla0flmw9f72j3ssrqh1scfrbx34mxlbmnl4z3pfc"; -"pixelart-0.2.0"="0pv055wzvaj7zymqnb9zd2fzvbb4c7my1kablpldirksp1wh15xl"; -"pixelart.doc-0.2.0"="0ak3djrw28lqrc6bgmfziqcpbbhz05qi8shvlxy41l3hjiy6mycx"; -"pixelart.source-0.2.0"="0nmbvm8z8j5q3ghggkxk6y2b3syq2wyqws5n44wmsk6p3kvsiczw"; -"pmgraph-1.0"="0mrvf2r4bv4qa9pzv90ardy5ncq2kgy3y89pgr1acsm5cspgryr5"; -"pmgraph.doc-1.0"="1pizlqyb0n20apwb6rvh6yfncyxnh6vfhnvc10il9j4894rii6mw"; -"postage-1.0"="10s3lcypskq2qmlyqcgldkg4i4a4qbbqn27v6cr6h3j4z93zir3x"; -"postage.doc-1.0"="1zy7hrrwmdlr3vib8i8vliznri4p8dhfgkz0fx5qgc3ji15ks095"; -"postage.source-1.0"="0h89r91diqwc1z9wzvbsynazv5k9spg2rfvg39kzb83lipxiqwjf"; -"prerex-54512"="0nri97arzym6z3pjzidlr6svyk1dpr4yrlgqzh2jcsrqhwliifwl"; -"prerex.doc-54512"="1wcf96nc4zvmydn9d628s9bffq3lnhnllci0v9pci03cs5p1zscz"; -"productbox-1.1"="1idarj7sxqkqzlnwaqv9f192r228fclilz01fjy444ly765k0cbk"; -"productbox.doc-1.1"="1pzba2ymna70gflrnw6hs35dgkv17qfjs8gh4g6van44wjykhfvg"; -"productbox.source-1.1"="1fnqp2sx0wmyd9130j5zbqw2dk1nkajp4qs46qm47b90wga8pkkj"; -"ptolemaicastronomy-1.0"="13zs1n17jsiaavw98g2ggfrmb4pbd48qscqb918shai2ffkpx8lw"; -"ptolemaicastronomy.doc-1.0"="1r0c5rixwam85wchqhf405h7mwim88616ycy1i4zv03hby18156a"; -"ptolemaicastronomy.source-1.0"="1aacl5pvqww0j2kvk7k5ikn43qhj2pqsxh47kid443g56hclkzwf"; -"puyotikz-1.0.1"="04s6878wblhz3m7xc7zgqv0ziwx76r22c4sa974ismfqjbdh6xdc"; -"puyotikz.doc-1.0.1"="0wikdmv19kj62vc5bd0n2dl91cqg44lwlfs41nw808hnk96a02q3"; -"pxpgfmark-0.2"="0mkcc99fwi8n63fghw3mz2alhgpakc3hqyd40s2fpwisvh15rbbr"; -"pxpgfmark.doc-0.2"="16sapygswd6mr0pr04c86jzngw6gdf62bgv2xlrfzfpq7cnjafxb"; -"pxpic-1.2"="0ny14rjzj9vidwkgkcx1jn66m3gk1ppbr62vafgcfy8mlrj6hnjv"; -"pxpic.doc-1.2"="1d0f0zqq2l774rv5f6844xcfci9pls428i86xy85z3hgfmjzcjh1"; -"pxpic.source-1.2"="1fk1mqscrz7la2b6pgrwcsll6pdm9p02hwgkca2yjjnfwdz5l44b"; -"qcircuit-2.6.0"="0vxsppwbmhh03mq9k3zb2hgl3628q4i51dz98j2s73z19693266a"; -"qcircuit.doc-2.6.0"="0571vlvpvmpjhjbbrd1ybzckhfy7ymralr017d09kf9p5gk0y677"; -"qrcode-1.51"="0vs5sg5hch0c2rxy27yiy1c543l2fnqinr8nvsyr288fja0pfrig"; -"qrcode.doc-1.51"="1rmwz89yxlgrypmki8xanqc3xxm10m9zc2shh5r0fzwmsfssri9r"; -"qrcode.source-1.51"="115wlgvpxx0vkb9d4gfwbqamk7sfmcfd11hxbfr8khd5hv8asvpi"; -"quantikz-0.9.6"="12g2vq2sckjidabs2ivi1r87mzj2rvqk89632szgr8vccjjk7yqb"; -"quantikz.doc-0.9.6"="0ckdbfx2fz0kjja2sanhmmrr61ald26gw4v5d4fw4bqrph8mpbq9"; -"randbild-0.2"="07ix44c2zm185byn868bmm6fcbwq9q37h31brfa4839hpklg41pp"; -"randbild.doc-0.2"="1cpyzrmswxawxk6x2vfjy7y8qj3mjrxgmr9lgjvz11f5fvvdb0i0"; -"randbild.source-0.2"="0yzz5awhhw52zg877nl76410a4q6gy7mrri0hccicj529kk0d1x5"; -"randomwalk-0.6"="10ivivbyrxm50svqdhv9lm623pvmnifpwpnbhpmx2nvf4crxxbcm"; -"randomwalk.doc-0.6"="1lvff00h8c2fxyf7if1d2xqkk87lb6396w6mb4yfxwsk0j8j2jhf"; -"randomwalk.source-0.6"="169x0wy0k91kmfbisqh4ciz8n4knhkxmz2d227gzwbf80sr2a80y"; -"realhats-5.0"="1afqmzxnp3bagbhwp6xl8155snqh29r60iy6vaqk212nr7l66jfa"; -"realhats.doc-5.0"="0h1n9p7pzdj38cd1s6s1cw784xrhkidrdangn2zfk8sallj0xv0b"; -"realhats.source-5.0"="13knaq4jzjd3f6fhvayfzva61svkra12z4wfiiwii5wdk60pi0rm"; -"reotex-1.1"="113nfw6md0v4522n54q63smd2g2iwm89qsqld237f32r3rdkbcl0"; -"reotex.doc-1.1"="0lapzgfp019a7qihfhf1cp2szwq98j8kmcy80c3gf1fa1x0c3x1q"; -"rviewport-1.0"="06nc81iapfymbp0kxfk0srpxilfhk94xwhslv6az8n5a3bvp2mq5"; -"rviewport.doc-1.0"="1m4xvkafdf2skhclg60fjgvyd6vd5y9jrn3186q0hdi66pa7dl66"; -"rviewport.source-1.0"="1hijca49b0cvh3w8dqwng6wdssmg2fjjj7ga9ifmziznb2k4qng6"; -"sa-tikz-0.7a"="1hmxifd6zkq4scfwybz0j4za911r76v56pczgym1shx8lqadsjcx"; -"sa-tikz.doc-0.7a"="16yjn7zpfwsnwg0mpqzwqrlz6v2bf1gf7qd9hhj28kzp0qgdnka6"; -"schemabloc-1.5"="0bpcrivkkwqb6kg09rkwhqzmc101c64g1j5kicfp11r9ha1fbwc5"; -"schemabloc.doc-1.5"="0cvbwk285i01brrbpalclm0bfhxs4hnngrmn9aw42ywdi44ls624"; -"scratch-0.41"="1gd2yq2w2v7n3kfsid71qv2v5q1rvpfm49rsk4815pk4k16kxhg9"; -"scratch.doc-0.41"="0jhy08h2v2qf3p8dvh8mz5yqqrdzxnzlx1p50ng7xn88d9ihpqdb"; -"scratch3-0.18"="0z7adggc9lc9j98ljpgfz36ys0bz2119cmfxdyx8gljaray22w70"; -"scratch3.doc-0.18"="1687l1infxryaf6hngfgm72wx2xqzn48ka4si18x4acj79nqipz3"; -"scsnowman-1.2d"="0991pn476g7pqhj6njgyal21fn0k5ig3c0bwzv2vfric6v52nk9g"; -"scsnowman.doc-1.2d"="0kn1dhgq8qkfvfhg4ip2zsz6x3w31ax92nwypcg9scd1p5s125r7"; -"setdeck-0.1"="149m9s33isx98vkl3498ywjy6f9q31jkw8schc16hxxm1z0jadnh"; -"setdeck.doc-0.1"="1rp64i0nrrxn7l2g6dlcmfvwbq3rg62h2ifxrzfp3k5ifnlkhpz1"; -"signchart-1.01"="1qg1r76v1llj68iqk5imp7f63774ky68sv64xa6j4w52jkkswn1v"; -"signchart.doc-1.01"="0scpaw7l26fcqylcqspd0g5va331yf88a8wc69diw78haywwgp4f"; -"signchart.source-1.01"="1lx77qldn3d23dvs11giircs2pafm54094h6ipxlc4g39g7xc0zl"; -"simpleoptics-1.1.1"="051635sr8yp7n44hw9wza6hw0b4av87yp42wkxwq0rshxldqgsq6"; -"simpleoptics.doc-1.1.1"="1lwk3qq1rgkgi7qd8qxdjjfrnk44c1gj4vl01m1jl181dxjs7lp2"; -"smartdiagram-0.3b"="0b9rq06c0xm9dpd6yljvgay0p7xpglpddw10vlf5c50wma4xqjda"; -"smartdiagram.doc-0.3b"="1gkgpgnsyxv9nmhnpalshf23g0iz7bcp4agkh7l368j2h48d5xmm"; -"smartdiagram.source-0.3b"="0chpnchdqvljj7h44ybpkln3b7kjzr7b18cj2qhj66ng9cwpywwd"; -"spath3-2.4"="1aq6vfhwkvqgjbyfv7x29dwr5iiby3iswsbw33pj351hzjp78a9k"; -"spath3.doc-2.4"="0xbhh91d0rwzhjwlmnrcszva6z4h8cnvnv6di31k6s5cs0akla1n"; -"spath3.source-2.4"="140g4blf80szkkyc7l2lpz8vcd1q32slha9d6wh4f02akg5kx157"; -"spectralsequences-1.2.2"="1sgrasl22ifbmgl483kg6zaknabwjszpjrjfb8jx6ii2ns6cvgd3"; -"spectralsequences.doc-1.2.2"="1k258c12k1jm2ignq7h09g4y8i3iq8k5wmw1dyi6ppwpc3i6fpd5"; -"swimgraf-25446"="065y4xxg85kdcv3gwp4xiqd1xdxjkng9xkdyvlk61zfjv5pks03r"; -"swimgraf.doc-25446"="17qxnzimwb828pby8mx2xlmjd2lnnpd60rdn45455x8zfxdll3s1"; -"syntaxdi-0.8.2"="11l8609xj9gz2zkd6b0ah41lgw4qhrvdjj47vwpzb4sb1sirsfgw"; -"syntaxdi.doc-0.8.2"="04hnwc8hc4z88wxrp81balza27xjj56ymv4wb8lvl7kg0087ldw2"; -"table-fct-1.1"="1kpmd1qynxq29aanvaanq35ihiv0d55k6wamxdz3lssicrn3f2vr"; -"table-fct.doc-1.1"="06jr9wmjppzd9m0d8hgmchnf78k8r7cxiqlyf3i6apdhjf6hcxiz"; -"texdraw-v2r3"="14vg45kci5pffvwdqnnb0dv3fznfaay3rg0fjiwfill24ifms14s"; -"texdraw.doc-v2r3"="0mz605k5n9angywvay4nck8ixq36gpbmixqa742a3ch2cr66ddkw"; -"ticollege-1.0"="1mivwaf3ngmdr1zdkl9xif1rl4fy0b062r43064645idpkk4120d"; -"ticollege.doc-1.0"="0xy35cggk34ziagi1m60ymckknls2wwil0wdzlswn0aw2zca9lc7"; -"tikz-3dplot-25087"="06ij3bk1aham4iv0wm14z9dhcq1v60qiv9n6idfcmjqz6m05cdf8"; -"tikz-3dplot.doc-25087"="1mq9drqg2z9khxfylsgpz32binla5abq88938jcjk9y21d46r31h"; -"tikz-among-us-1.1.0"="1w2afhv7qs9n77bfy0mybg59hhca7vxzmy831rzj8lxlzlla21f5"; -"tikz-among-us.doc-1.1.0"="13bkmfbwgjpw0q2d5c2wi6hlz0v634yiq220m7y1zh25kxnn69c8"; -"tikz-bayesnet-0.1"="1sdal5mq1s3xkklj09hy0j41xymprmh78z3923f55bg0kzdc2i0v"; -"tikz-bayesnet.doc-0.1"="0kwlqx1bys43hzwpwj8snrn5693grfih18fcw3d74a6x7s5k0h8m"; -"tikz-bbox-0.1"="023xrf65s1c4g63ggpmsdyckp6zspgjz1ad7pk7jf56zdnhqaxb1"; -"tikz-bbox.doc-0.1"="0ilj988mh0w1ws8ancnxsz0ig4s5k0yi3ywihn6vsk3z94k51yfm"; -"tikz-cd-0.9f"="0il2dpd5fmwvvhmzrq2zcdxqbcl4jsq2gh06hjq90mf9l6ybrgvy"; -"tikz-cd.doc-0.9f"="1v8nhl4q48gjig1z25ba73wwaxh4mfpfl8di9fsrcdisdfdvqk6d"; -"tikz-dependency-1.2"="0v471rprwnqlhwvx0lqxvpsgh8ph16lbvrpcrynx2hx71n9daqla"; -"tikz-dependency.doc-1.2"="0h3mnxwcb1k1ilw9pi1xcwmryjpci0kwlaqfxx2i8lcggsdrxfxi"; -"tikz-dimline-1.0"="0mp6xg317m0dkrw73609xdn7r9hbf8bdmyp0bdj2xzpynpvxisxd"; -"tikz-dimline.doc-1.0"="05rikgrm1f0f0rx7ir1nn4cy3a93bwrck2xqnms26dg4dqddnrbk"; -"tikz-feynhand-1.1.0"="16bb4h6wbmyv9mz68sywgw18h2dcyxkmkcyjjshkbagimf3ikb58"; -"tikz-feynhand.doc-1.1.0"="15h182ywc8ihahv76khphah6awpahbsrdi0hin578jmg1582rzp4"; -"tikz-feynman-1.1.0"="1kh3riwk5iksldsg6ljk27lhh6fka473k958q9781m65isdzhwa9"; -"tikz-feynman.doc-1.1.0"="0cjl1zvn2q39khh4afzvh6nh8dlhrkd6vn3i8n2ywv4xldpb2k0b"; -"tikz-imagelabels-0.2"="1xg2malb3ybgcvmr1gksgg93i4d8fvr7pqjky1b98n0abfxybxv9"; -"tikz-imagelabels.doc-0.2"="1fqkzfbbm4ckbjpgjrg5fa9ggam2lcy5gzvnhc4njyjxwx1hjcsd"; -"tikz-imagelabels.source-0.2"="0cqcbwccfq65zsbnkcdjfqwj9h8ndjhan1ghnzp9by8z41qj2fvv"; -"tikz-inet-0.1"="02xbywhzzkiica13d2dzingz9qm2v1w3fjrj9kbjn9q9fmw2xw64"; -"tikz-inet.doc-0.1"="15mvq4gpd22nah4p84dazld4ncdshygmffz7sx42s2zqyjwrm6wi"; -"tikz-kalender-0.4f"="0lkvvwzfilmhcamy00jdfrwhxr75d3jzppyhvvb26ymnzm6v1inv"; -"tikz-kalender.doc-0.4f"="1pxc1wii1hqmhr42yskil16ahjslkn7y6q8qj8hbq85y7ymm3lxi"; -"tikz-karnaugh-1.2"="0qabbn2hs4wp5pkzpjrr6g26nd8qmykljy4j46snm36ixj600lfy"; -"tikz-karnaugh.doc-1.2"="0z974a95hc2z72brn7nd5c42b2rdhf40sag725m5bi504v1sz0gs"; -"tikz-ladder-1.1"="0a1bbsfk9dqdmp5y3qgc2i9r9fl3wdj4fbag7yisxlgrh447k4nj"; -"tikz-ladder.doc-1.1"="15pjhbyfwr6029bnkilx35wz1nc07440zy6w0wg3fhaa1ynn5jnn"; -"tikz-lake-fig-1.0"="0miw1aws614ffb4q8szr6zh5rb0216hz1scl50ambx1qv97azsgm"; -"tikz-lake-fig.doc-1.0"="14yb48ylr5rv4n6ikqh704vvzxx8k68l8ww2vnv9lx5nl2nhybp7"; -"tikz-layers-0.9"="1ym859l9bzzd2rack9kcbckzbpmqxyglaa0jggpf3hlbsgzy33h6"; -"tikz-layers.doc-0.9"="1lnlfl8k4czvxz1vyfmnqk3k1arc7jpw7cbgrnh5xbanhvyjfzl0"; -"tikz-nef-0.1"="1i1l0rk7k6kc9vyx9jbpj25bkl77ml5ay1wvwff7a51rr8c87s99"; -"tikz-nef.doc-0.1"="1nsbycqfai72xbrzy6vz7lzpywdavbcyz7x3h1kfhby10s2h136k"; -"tikz-network-1.1"="1mf196mmkg097slc5aslpjlpih2kdq5wkmcpznsyhg7s20mf11yy"; -"tikz-network.doc-1.1"="05dzfw2x5j1i3534qmhp6wcymba5mwilv2vf7vrw5fmrgd4h1gy2"; -"tikz-opm-0.1.1"="04ch55a4jvvif7c74s8bbsq0bkw3v3zjh6wdlmij30cfyxn114jg"; -"tikz-opm.doc-0.1.1"="0ajrvamsj1is4lh0xf25wjylnjg8kd02b7kwj40nq1kawnp0hlxb"; -"tikz-optics-0.2.3"="0r5z7vp05s92hk87m01vcxfa0kkvfmzxyzfx397b3lwmlavzws8q"; -"tikz-optics.doc-0.2.3"="1zjlpblczvr9390fmz0vh8zf0pbf1zc4d01l4ykhdpvljf7ndrmd"; -"tikz-page-1.0"="0971kcdlavr24lkf9wdzgwb97cf952iw1d5ls6zz7fsfj6pigqjn"; -"tikz-page.doc-1.0"="19g4b944wzahnabpw2kighd1vr63c7im3xgcjz3l53yrz89nhjmk"; -"tikz-page.source-1.0"="10v67pn2zvpxl3817h1rvn0y4wb7dj07p4nv6wf1jhchgvmb8bdz"; -"tikz-palattice-2.3"="0pfp30l373li523l0skr52fa397h2wkizvggsls3kv3p087j16an"; -"tikz-palattice.doc-2.3"="0krdfwivibibgpxsjnlsl11yppmsynanj2lgf892izxj2m3hld7d"; -"tikz-planets-1.0.2"="0gjkapcls19839jrjimshd3cqdl9x0ld27i2d51s7k8f0rcakkmh"; -"tikz-planets.doc-1.0.2"="0xx18gdj4r9jj7qvwlrd237nhcbazprhqgzn6m6cy8m36xy6yc09"; -"tikz-qtree-1.2"="1x638b7a71mwlcrn50w86j649qlzjm121ap6jgccr5vck6q9wcms"; -"tikz-qtree.doc-1.2"="0khnzjc78v1p8ahyii5rsqx29797jv3ycdan2d55bvw87p4iyrra"; -"tikz-relay-1.2"="0lyln2ifd27njc497kndz6wr2fwz1i3j8vw6b8f7ca2qh71b9zcz"; -"tikz-relay.doc-1.2"="14ds9xrf62zl87gi7w3kdh0lw8bqkvg92b7pjjab68aqs949k1zj"; -"tikz-sfc-1.0.1"="0kkfds07qskfbd7yxfyc6spylnd0nnhjyfa8s7i44y4d2x1skik5"; -"tikz-sfc.doc-1.0.1"="0b5cf8kcchp8h33x5ih1wvwdrgdhbkz589d55454i1470b3h4f79"; -"tikz-timing-0.7f"="145r878hxqfx1sdn4hdagmcnfx8xqcihfz775zabn5sbzki87ywq"; -"tikz-timing.doc-0.7f"="0na0rjgnala2lyww8chnkqyp26c1y2siaj7gqh6h8fjpi5bpamdf"; -"tikz-timing.source-0.7f"="17wzwm58194p5jlwb74z30864q7nzg9fi4q4dbcp26b3p6kn5cxs"; -"tikz-trackschematic-0.6"="0bvl0ijxkq1300n35dnq6hnc23d2vb6538bqf8adqwh8981iahz9"; -"tikz-trackschematic.doc-0.6"="0xivh3nr8z7g29k9rsxib2qs26ryfayhzv8hbiw44zmxkyicp5cc"; -"tikz-truchet-50020"="00yf9044lpsazd8wnmcz39lnazrxpqd7lpyr8ss24gk9gm33b563"; -"tikz-truchet.doc-50020"="1vlsyyh7xj1fn6wkafh7ps4ys439n1lmvmgk63pya18laxkphxxk"; -"tikz-truchet.source-50020"="1zbp1xb9sbbnr4iiqgg352ymn9ybfmkwmwd49r1ws3w7iy3qdvrz"; -"tikzcodeblocks-0.13"="0q10q8gfbdw20ysv40pj9c1ks4mnb4dqvvz39fvyji3f4s4xd60n"; -"tikzcodeblocks.doc-0.13"="1imd5qf95ykqs89zqb32yg7p61in242vkjx5wv6r2xh2dkjpvv9h"; -"tikzducks-1.5"="1sdryfjchphbk6w838pfn7ddqxg5gq4hgh4k7b8k99avnxkckll7"; -"tikzducks.doc-1.5"="14rmpx2xwww8v0lpdgv6nz0kp43w1wlxzpr3i11gi1didd78nbm9"; -"tikzinclude-1.0"="0s0mhfshfzl28z6lgwn7f540pbmdxl51gqf7nw1s88738mx3m4z1"; -"tikzinclude.doc-1.0"="11jj75nnzw9m3i6nndbfscllfxzn5bd636s85q17gds03jbqkhfc"; -"tikzinclude.source-1.0"="1v1bvpfqhvn3hp3zjx3sqv4kg288aviy1b9zl3s8r64zmai86bfy"; -"tikzlings-0.5"="19gcgnccnfy6wx449cmwgbvbwmh36iggap4pc801w8060662j7yh"; -"tikzlings.doc-0.5"="1hsvpnvnrr9grrpvqlssvajy8v1qi66pw9hil0pwq586g9sy11ld"; -"tikzmark-1.10"="1y0ciyb31z8cixb4cqzh0580bqjalpdy95nqspwrn7l7zgcf43y2"; -"tikzmark.doc-1.10"="158lkrd42j80wz5fmm0v59m677rrvzyxsgz63d0645qs0wcjr1cn"; -"tikzmark.source-1.10"="16h9ddm3i5b1nz2f2a835p6baxl4wdsckd6hmampb54163i00d15"; -"tikzmarmots-1.0"="1m33y48cs82f2z19gwhr89qyaa9n5qlrps9ash5ijjgra9dkfj8q"; -"tikzmarmots.doc-1.0"="1jp10kd7vpx68z9i1j1pk904yjb078yr60hkfk0vxhwhnpychlgz"; -"tikzorbital-36439"="17g4bd556kkhrxir4c2q6f7qxa8rigkf41dj979nb5k3a7w4k3b4"; -"tikzorbital.doc-36439"="0h1s5dnyv8n4hv608c5rspdgy2h10ilqknddai779h9biwhfzh3m"; -"tikzpackets-1.0"="1kidqyd1d7wvs1f3cp6ixp397ipaj7jd19djhy3q4dvbnzq1xm4b"; -"tikzpackets.doc-1.0"="0rlpz3m4vsyin6ckyjkxjp9a40gxhhi44z18hrw2blmp0mg011v5"; -"tikzpagenodes-1.1"="197sijaabaa3sf5syasf4ciwz8hkgy2pyr7lp78gzhlv950drghh"; -"tikzpagenodes.doc-1.1"="0y9ik1r203inp74hx4xznkypw0p88zhg9fq6b9205i053vvla239"; -"tikzpagenodes.source-1.1"="01bjvk944nlld4zbrld35n45dzljqf1rng83y14ipn3wcdxa0plx"; -"tikzpeople-0.4"="12i0m8jilbl8ldji9xmxm5hgsl0bd5vkjly1ykmj6w2rzgmjfbbp"; -"tikzpeople.doc-0.4"="1a3cjadvnrv9hslwgihxv8z16awkikinv44zcj4fd5drnqjsvcrq"; -"tikzpfeile-1.0"="1rwv1i6yb0jd5gw16db3kqar4ykzbwcyw51hv781iz358hgww5mc"; -"tikzpfeile.doc-1.0"="1530vkp14lpv0hnv8qcxalibsi1pkcj9xp1pa87lisrillxs7kwb"; -"tikzpfeile.source-1.0"="180cp8vp26shmnjxg9qs9n28v4xy0qhqgm1bvbkqrpagykzzhsrf"; -"tikzposter-2.0"="1r6pia3sjl9xcixnsr5pk8cma4f18mvpn60dxmpzpn2nn1sk4p26"; -"tikzposter.doc-2.0"="06vy5vmzrqhl6zk6z9a4kyqfvjqc4s9pslvl9zfl17cdqsfvbdf6"; -"tikzposter.source-2.0"="1idiz8izn9m9h7kyiavw836v9x1vzg58vap42wpj7yd74izwvf1d"; -"tikzscale-0.2.6"="0h8hpk0nv712vydxrzyhvqxrrqb34hw5qjgq9baagqj42ka06qfg"; -"tikzscale.doc-0.2.6"="02sz63v9zxr58417jn00ypm3myga7x29q31xbnz7p7mmq5q1r94h"; -"tikzscale.source-0.2.6"="0rf6rsrcpapmhz3q5wkgcivhvswy1kb3mql94xs372qc08bxsi3h"; -"tikzsymbols-4.10c"="1q0dycjw1njbwlji717k2n9dpmmjk5bwic12x9zhywx8hily9cg1"; -"tikzsymbols.doc-4.10c"="02gyp8pgl5c08jyvmvqngzvpbvy0g9pac3c388i9ky1vm1ylrrh3"; -"tikzsymbols.source-4.10c"="1q62sf2mrx29xif25imb8qnpxyg1j61nv3wnzyyairry74s5w89h"; -"tikztosvg-0.2.0"="1ic82cfsd0zc478gvwkx25lwxyvzr07hn8hg70j60d602ml31d2h"; -"tikztosvg.doc-0.2.0"="0asjk337l699bkv1jchmpvcc5jnihcill8yzasgvmvf05i0pvzaj"; -"tile-graphic-55325"="1l87pqfzgyr8apcs9f2gssf5rh1mvknkr5jim98zj5f93ca5mjpq"; -"tile-graphic.doc-55325"="0rq35cpk9l7rc30l1hk55r7x07f96ishr3dzdi7x4d50gv7675ah"; -"tile-graphic.source-55325"="01xqc704g5pqwmlfifzvv61nypgvnabxv6xw7ljgv9vvpyvfh0ni"; -"timing-diagrams-31491"="04yal5fdbwwdq5i7frmvxm0z7zy379gpwbc5383xn0nfdyzrq91b"; -"timing-diagrams.doc-31491"="1w3qzl1j3viaj6qi50qcyx51w2ms23j27p17h526iz11x39w0gw7"; -"tipfr-1.5"="1a9vj3r5b15chzyrpfd7rn0f19qkq9lqklzxvzm4xc5b5n802zbw"; -"tipfr.doc-1.5"="02x8fikl1vnirfcrw42xq2cbkf6wpciary55xyk6xwnnhh3abbgb"; -"tkz-base-3.06c"="0bff82v1gpdjyclklkfd1ns90dinwdhlr7k4jr6amql1vqh04jqi"; -"tkz-base.doc-3.06c"="0hi30szzssy594m6i45lk5418a23xhb689j353dxfml4rc9hgm2h"; -"tkz-berge-2.0"="1c9kgzsagh5ww0zlwywpddwn3mx0wrf8yc627gjap3f7nyyvixn4"; -"tkz-berge.doc-2.0"="07bsfmh9qyn8q9z4brd4si1clmw7sn2vh2nr8idqnm1z1jqdnq40"; -"tkz-doc.doc-1.43c"="02p765y97adxc354hn4fw40hhcx42j3xavxjyv5swz8jn26dys19"; -"tkz-euclide-3.06c"="1kcd294pqi2plkgs9gs2lp9n5baca62l2yzkmj53wk8ql1028886"; -"tkz-euclide.doc-3.06c"="1m95b6bz31fcbwyp9xvhqw03abw1x2jbd9wsglkgdn95ggvjlarv"; -"tkz-fct-1.3c"="03rd7731f4kvln990bbjfy3xhjbprplyxwwvnvr97ks6i504phfy"; -"tkz-fct.doc-1.3c"="1p47gkq52l1kh1mvychjyfrzakrpckcb2g55gxg3pnglqbj7p5ca"; -"tkz-graph-2.0"="08kfjaniwrlw23vmz24yq9gbdks9fwcf0g4jyy98ikfqh9phhhs9"; -"tkz-graph.doc-2.0"="1drk9va3bgq62qfkcvp5z30gvnscl7mbjz66m27wmgagb2ki2f0q"; -"tkz-orm-0.1.4"="020bi7dgjipd2ancqji6fa1zcf9lh9d8n4zbacy5l5nclxfiphcl"; -"tkz-orm.doc-0.1.4"="1zgmsl11cf4fgkfilflw8c4wrcfwnvk1f88l90hwgclfj5q0ashr"; -"tkz-tab-2.12c"="142fjk2kdv02b7whr2m5a53z6b7rhh2zfv2fi55q1sy4xaa1wia1"; -"tkz-tab.doc-2.12c"="1p0h1l1jca83j27wa79ncjarczissgp1jh9f9ylqhbi7y5mk8abw"; -"tqft-2.1"="0v14gsk9nwyppdyvcd4ngx6mavd4sa1y8zzmjbb8gcf5dlnz2vg9"; -"tqft.doc-2.1"="1wwvklsd7aqn36vym38m3q6gqf8fgf16axy627vdfqgg30jsml3m"; -"tqft.source-2.1"="155kv0h90zkymc6b3r1iambxsfx3y3rci6nrk01yd185ml21dvdy"; -"tsemlines-1.0"="1c7sjdrgqbjw6f2s3185k5rlkig643pkkahjisx16h0akbbdm4k3"; -"tufte-latex-3.5.2"="1azsqa3qa1w2k0r4sp83xp9b7g1xjw47wv9l0sk065zq0bdjr9yy"; -"tufte-latex.doc-3.5.2"="10h41jbfmjg7p8k3m98l2jyhl7365qym844y8f38g0f9sr1pyxvn"; -"ifmtarg-1.2b"="0wxhdmd2h7rs3fck9yq1g48kyd33m7xzz3g7ixg046azai8f90m0"; -"ifmtarg.doc-1.2b"="0h8li5c5lxccf2a325p4vg7xgalzwryk8czdzcf637sbbkfhd53d"; -"ifmtarg.source-1.2b"="1yh0c42glrw5cgqk22h8lrc12lriz436wz9vrc4145gjcxm6p09s"; -"paralist-2.7"="19m0ddw80vjzm8p0z5rrd3jf9kqzq653h3jdqlnjw4g81r0z730p"; -"paralist.doc-2.7"="03kv1n9m1b6r0r5drp81hv2i8dgnlcsz81rhi4h6a3xyxnyhw6bj"; -"paralist.source-2.7"="069mn3mk34rxxhl1c1878zs61pk7asa21iwwk6r2v88yziczkhlm"; -"placeins-2.2"="1mlx2wlm5j7qhhz8q1fvxd4zvjmjpzhk2aajql3wqvamrawba6k4"; -"placeins.doc-2.2"="0libqvl13md069fjbx3gl17fyzpn6v4jk4vk5086szbi93dr692m"; -"sauerj-15878"="1bd9cvx40skqlx71hnfrnc87b2p1wrw3587fjxlp6a22yhzghhvq"; -"sauerj.doc-15878"="1swlcqm2z289ijbxnv7aib0v0aisqdn4l2bfymvn268siz58l4cg"; -"sauerj.source-15878"="0l5p9c0fl1p7gy815l5064x93msfgb6z2lnvm2x24mwfnfpykrqg"; -"xifthen-1.4.0"="0ys8yq13vhval5jg9a4n4pv7b3v11w1yh63ssvyx3pnr767ay5r8"; -"xifthen.doc-1.4.0"="1miqc1bfwi2ssl6yp9aqw7ygnars27vks0grpyfns494yimy8nc0"; -"tzplot-1.0.1"="131aj29l8crs9xxppb36pzrwqfyb6d7ch2iwch4izxjphb8pycfj"; -"tzplot.doc-1.0.1"="0kkl95g9749a6bz63yy86kf1q3s6p2dak0ndpsxdybvx03b2psj7"; -"utfsym-0.8.3"="1bkrmrd31r2r8aq2ldqvwrlx0k9pgnh8hnm0qzgjxb5mqj7rhwwj"; -"utfsym.doc-0.8.3"="1qllclbkqvr6nqjvfxkr1xdv2af6vi90sc40igxssf4d0gcbkp1s"; -"venndiagram-1.2"="1v4hbkc214fjh5wc2myqxa6jcvr6sa31c7nz9avzj2kf40kp3ip0"; -"venndiagram.doc-1.2"="0as35w7fd9xjqhrr3v3nzld9bnhz6xg7rqgs2hyzx150xndy6cb9"; -"venndiagram.source-1.2"="0ci3ajx316b6iin315z1xkdfmxbbflnj8sf2ww7gkxf853qakwlc"; -"visualpstricks.doc-2.3"="1wfri908smlw1ngqq1mjll2b80b29piicqmv67x0xs1v3kc2sz3s"; -"xpicture-1.2a"="1z3hbmqlamcm9wgwan834hggks2b73s73h3r2pppp00a1sz3g343"; -"xpicture.doc-1.2a"="0ymdwdspdhrhgyxw7h7f8nal6h0kjw6i8zicmll5vj8vbmi44dv6"; -"xpicture.source-1.2a"="1yjvqrpp7a0d3nldqidqrk2xk1lp5vbla865l3lxw1xd5b08y40r"; -"xypic-3.8.9"="1srvrq5biqczvyi7k0ilbray7ilzi6gsmvk3b2hmf5qmv8hk0cs1"; -"xypic.doc-3.8.9"="1js0fkhn60fnxgbgviri58c4q63a0ycq37r4hynxhyix17h51kff"; -"colophon-1.1"="0v8q22qxjrbc1mpsmfvdp13iwkjxp11cxs86h2b7b9rjs0cjxy6s"; -"colophon.doc-1.1"="0s2kz7q6nkwc19jyl32rzcbbcm7ykhkglanx010xfz08vgirk1pz"; -"colophon.source-1.1"="1z2dihgwd4vbk87n0hzpipm2359fwl1z13fjs4g9r5ys7iv36wsq"; -"color-edits-1.1"="0p465bc127rlm53xngrynmrxswzmp1xsivkfy3mj22h4ij6db03c"; -"color-edits.doc-1.1"="04zfa0jryyw79rz9s1c0yzr1i8zla7ivvfw701f8la1rab7z6q94"; -"color-edits.source-1.1"="0279n81xyiz4ipjbr1jdl0wipfy1lkl18jx8mbqcbwczw8k4fbn1"; -"colordoc-18270"="1hay7bb0xh2n2j9clvbn5ayz3jq0yjaixi35isdsf9ysvj81rx0m"; -"colordoc.doc-18270"="14bw1g3dna2ykyv4fl32gvqjs0n75vlfpc9icdk09l7zhdspsvfn"; -"colordoc.source-18270"="1bssn8rjrp34nm6qhmzcrcn6a0ah9lv5n94d1jxqhhaj4pmimd2j"; -"colorinfo-0.3c"="0ip7py03xrsrn40cgkl4dnj3q9g0f9fbw71c9rsg9j7vl82fdn46"; -"colorinfo.doc-0.3c"="1185m34382n9rk6w81ppb414vl77kikkhwvn78aahlyli4il51l8"; -"coloring-0.2"="1ld6gknb8a59pkz50wlil5p11mnv6ss0zsjbajbw63dg0zlwaglb"; -"coloring.doc-0.2"="18y8apbkh7yqzxrzpraqhd76k93xnvgq5rana8lq4xh5z3f7skjq"; -"colorspace-1.3"="17pahq2wh9vqwpkaqkzc3ypcz90i9qpmw7867qz4k8a87sp7wgji"; -"colorspace.doc-1.3"="0g766c50w7xpfvqpp6lxjc6lm2cyr8yl28g7n357j1d1lxgnv0x7"; -"colortab-1.0"="0hiq8wgqiwxnw1gsrymshkldspdnizcci56ihn22h0hcwz76hgzv"; -"colortab.doc-1.0"="1cj84k7cl6cww25yy2lynjrbicn0qy4y09rh6dx2zq19972fggi3"; -"colorwav-1.0"="18svrj3bfsa8m5q3hl5njc8ac2n1qw5lk01qlc45by8vd0y55s1g"; -"colorwav.doc-1.0"="0jprx7kl9vi0497xfnvrswcx5d3ij9474iq2xqvnl5yhw4mz0v49"; -"colorwav.source-1.0"="1wls4ixd2q85yawkm0brbwiiipb4avgfjgi2mi8ix1hwawycqacr"; -"colorweb-1.3"="1rz9ay86z5bf8m4j5w5prvvk1nmlaakj3g0qfsrl0cdqk7hwsfsf"; -"colorweb.doc-1.3"="0vzcwhbq1a6pczvrv21z0q3y1akfwm45fclf0857c8jvpikkzb1m"; -"colorweb.source-1.3"="1z0h3l9gdxsg6lbw7j6nqhafxq8b8smcn4nmq7ywdzryp8b6fbw2"; -"colourchange-1.22"="0y8r7789xaj16cdmsz4q0zyq9l09ihgzzgk4alnggsyx1ny45ybv"; -"colourchange.doc-1.22"="0zj9b8xcnjlvadams6a2z3pvnzjci5l10kran8mg79ncvzq386cj"; -"combelow-0.99f"="0s14rmmv44js6vc2l8h7gb9f8h5w4as71qgxbadaxw641xfs0ys3"; -"combelow.doc-0.99f"="0pwrqhd8m7c2444czsllk4sqai3i2scll94y6qy7m51jvjycyf26"; -"combine-0.7a"="0rk76f508pwhq4crcimw6mvqw40j31g2nsrxj17pld7ygxf9a5ah"; -"combine.doc-0.7a"="1kbvk5wdpjxw9slhz63pgz65kkxcn0lkr6i5gv8gcjh2w61xizq7"; -"combine.source-0.7a"="13z1yd5mb4jdsa3kjl49412zj2g0nkprmmv8d6ibnjg6zdf9s0xn"; -"comma-1.2"="1xaq59fm295wwnpls4qfw364qf9iyg97xhsvglgnnx8w7ydhr68a"; -"comma.doc-1.2"="0g8jpwf1ilkbk59p4l372is00qwhfbsf8f3db1mxysmlxyf0m535"; -"commado-r0.11a"="00by3sskyr1hfc9wqazn2rii739bhl2fhlwwp83h6wx98h51rfx3"; -"commado.doc-r0.11a"="0mk7k9gyv2xxd3l7m58dsirk32cn7wbmdy9c0nc6i1jyfpsfhmq4"; -"commado.source-r0.11a"="0719a7bp07vf5jgx00cjdgvzfnv7wbxrxna2bdjjsfyvipyr4z8a"; -"commedit-1.02"="00anqgix8vydq5ssblg5w5i8pziy8fvlva2kpwy5cjjiqgpprcd3"; -"commedit.doc-1.02"="0vvnkp8r0xbsyvzps4a20fr43cj2559cs6mq7jhja6jzvqqc6mic"; -"commedit.source-1.02"="1kzc8i6nmvw7xwz9fbfanabypissbm7hnmmgp2m8r462ywzpa79c"; -"comment-3.8"="14k4y4abv5mlhn1i8f90bxfymp9vz0aha4p2gql148wj2hh7h96m"; -"comment.doc-3.8"="1589g0dah13lw4p18cqprhfnh1184m79ddrgvc2l22bq6vb1dsb6"; -"competences-1.0"="0hijar81j2jpwk5j2hrgaxb1fnbk6qh2qb0qbbmhsqrdrfcl6xdl"; -"competences.doc-1.0"="0ywq9f2a1fb584kpvzwg8b16qc7bpcn3dzsscs6ndqbgcy0zc2yf"; -"competences.source-1.0"="01dccp2wqdy52kp79n099v9lh1vfambg0b63amq37ac68pwn3qp9"; -"concepts-0.0.5-r1"="18vjncdrbp7m7m08dnfmk6sgv79jx83bc4yvvcqb0j9mn9niy1f0"; -"concepts.doc-0.0.5-r1"="1bq82dgsl6gqnrs88dzg07dn4rmc4y5by8122zqaqpdrpjxhnvax"; -"concprog-18791"="08yr8yk9gp35d0nvh54ysgv61s062vj446fyb87n8jipfm49mj2x"; -"concprog.doc-18791"="197p2bdn1rqmxva56sagvb1z7kc8gwxr9zf612r6g8yb07xg5riq"; -"conditext-1.5"="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc"; -"conditext.doc-1.5"="1qc7w7xfpxarb82hf66f3i63v7ypdybqwg5g3j8qswj1a39cy1wm"; -"constants-1.0"="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk"; -"constants.doc-1.0"="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp"; -"constants.source-1.0"="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr"; -"continue-0.2"="0vwz01gmbid6b2aj32qnz1xrlk9h0nicjv9ix1rvqdad20m1i4wa"; -"continue.doc-0.2"="1mzsj70v9f6srmc8ja62pph9j67p644hl54fx6nyahvr2h9vdik2"; -"continue.source-0.2"="1q835904qai3r49yi8hrfxkh4bjf6913qs5fd2dv7myp1w93j5ir"; -"contour-2.14"="0xb8a0y3jazrq5gxfnxjl7qkyaqjnmyhjshgngqcsrw2sq4j4li5"; -"contour.doc-2.14"="03rxkl9vhhqa7gpigar8w2h78qvx4k68chhf0881ws3bm6lg15sy"; -"contour.source-2.14"="17sfl4npipzgc7jwqx740nny7fnd8bv8k4vav9ds765ky1xcs521"; -"contracard-2.0.0"="1qvpz8ybjc7yx8zx4kzcpjchvxrb949rqb3905rhl61shpqv22hm"; -"contracard.doc-2.0.0"="1jg8kgp9wvxksjz9kxyh3qqxhgjmalkpj8y004qvrxna2r2idj50"; -"contracard.source-2.0.0"="1v6ffg84czajnl6p6a1j8khnfmzssjkhbndz5ajkww64iiw060i4"; -"conv-xkv-43558"="13clac7dhg2p69ccv2yjzdh64yjx02y0fb0imx9lsd0knnb1j3aa"; -"conv-xkv.doc-43558"="12dln1r2qyadxr4cy3xbwn18s5y8yxgxid22wpb2i42n5qc8j1fy"; -"conv-xkv.source-43558"="02hz64vbcy7vg363vb86vydaa29g5cgji2mfpn640dgmqq0s91vb"; -"cooking-0.9b"="053wbmf3xrhwjxp77f1myfvz3f474kpk626p8gds939yx50jqzvs"; -"cooking.doc-0.9b"="1db5wxixparr81vanwkvg097ll58fqpp3qkh0wz7mbqjkansp6km"; -"cooking.source-0.9b"="1gka18njp7ipa0jp1527mhig43hhvz5bcdpvs95c61cvjrmwcdm3"; -"cooking-units-1.46"="0j20rj1s5ip6sr90n3v72kphqg6hlvi02md80gycnkc3kl0p2saf"; -"cooking-units.doc-1.46"="0wg611s2c6x97lf8bnf2cx7gl2rddldjhy42czz2kpp7rvjzfapm"; -"cooking-units.source-1.46"="0skifnmjh3jl6008j7zblijyywm5is7k7p8nlpsx22j2x0zv1g5z"; -"cool-1.35"="1lakvsarqhicdcfx306xp94m4hsypdabr0fggakqv7adcwmd734j"; -"cool.doc-1.35"="00mqaavadqb2m2rf8j00z3dclflk191gd70qb1674pyd0a82z2qv"; -"cool.source-1.35"="12r4d15nzd3r1dxnwz7vzgmxgpl12gkq88hdzqwnbpan4y90p9zh"; -"coollist-1.4"="0hv9qi4d40vyi5shga53czm887adq9h8vmq6m0n087iijqnlxkk1"; -"coollist.doc-1.4"="14r6h8zsdwsirmpz435py6a2hsc8qkw39krp419b6v0sdnk2lby5"; -"coollist.source-1.4"="107mpivrah9m65pa29wafwjjhcql9lwhrrmn8ny51p2b0w4xs8kr"; -"coolstr-2.2"="1ivmy6jmjbbbzfakfz5ib58qg4xd2pyka90zskzcwzf5a87r22ih"; -"coolstr.doc-2.2"="0pb30nqgfijdkgsmddb14n6aviz331wab2cd32vpqsb9jnc4rz3d"; -"coolstr.source-2.2"="0fakgk7g7c9kkgd0xdm9fpcrnx7jsczddbvypwxkppll2wfsnamn"; -"coolthms-1.2"="1z62gl39f9cvmwap70q05jml1657jxg7lvq81rgqh878z63d0rzi"; -"coolthms.doc-1.2"="0zqpx1c0lcrkp1zpwl776hd8gln7i5f5m5k5kjhcwxwngd8w8df0"; -"coolthms.source-1.2"="1bir9kbsvayk3xkchg7kjbwqkhda81vay9d70hmqxgwpa0l38j6x"; -"cooltooltips-1.0"="02cyrv06a8j85x8r9s0rf1wxl1npdwhjkcxdry7p6w65xwi4m4k0"; -"cooltooltips.doc-1.0"="0z73crjs5b9wkcl5ymkrp5qsbm852ajgdabxjagvnwckxdz0nkr5"; -"cooltooltips.source-1.0"="069xj8l41anzl1cxckhikfhq8azysjs614nv0ma4da5lvczx77ij"; -"coordsys-1.4"="12vpxh6ll7q2jpsv85j68ij0m3b0335hflpqahk40dagybjkp426"; -"coordsys.doc-1.4"="1jcjvd577886q8sqzcsqil81b2lm31vjxhbdrgs38fw8n6q9g0sq"; -"coordsys.source-1.4"="0npd3qqigvp0i5zdgizm68sr1g5xcplgwfahrkak0kq4g882qmdd"; -"copyedit-1.6"="1rl23bq3fbn4rajc744ra2prvm4rmh0wvhc7jjsiw7sw2hzv467a"; -"copyedit.doc-1.6"="1ihvynh96vgl8ik237pf2pdfzclslrn0i7lc64skx3q7pmyv11in"; -"copyedit.source-1.6"="0i2pwjj4bdfsykwv6bchp2p7x0gpdbnyx37ri1d27vl72yi72pw8"; -"copyrightbox-0.1"="0n9z6dngf0z98bnzn6nl8yvy7dh1jmcdbqfxnzxarxzqq16f99ch"; -"copyrightbox.doc-0.1"="1clg6jq9cja76j5x9laykndfqp0i5a4bfmqrxaa8rp6y2gnvpign"; -"coseoul-1.1"="0wqxvh5mnrl59ry0qahxzlfajgpp0yj27h0falxnr4m5iygv7699"; -"coseoul.doc-1.1"="0l3z0fxsdlln0hjwkxf9ka9hw8zmmixml9lfy4kbrn88xq6z62yw"; -"counttexruns-1.00a"="0qmm8902apb9ks1ik1dxmzb3ivkivpj7a8f8mkn5xdyxbnqvm5pq"; -"counttexruns.doc-1.00a"="0kpasflvbal7x4r1ni3jf30fh7w6wi68109m5ajcjqrjzxkpgmdm"; -"counttexruns.source-1.00a"="0840fyw71mw3l5k5g01wd6hn41a079f83wmbyg64f4yhgjdjxjnf"; -"courseoutline-1.0"="0mwv6bslzgm5ys4gl32mxcw42gkpzwkzrvxk6934682v85qi6f4k"; -"courseoutline.doc-1.0"="1k135zma8aacd0mf6l5v4zac2blqzf6z5xa40094by61455x48ha"; -"coursepaper-2.0"="0n8gikcli14inz5q85n6k63yg6dczlpi837mbxrv5552hqzpivwv"; -"coursepaper.doc-2.0"="1d8k6yj45x0wx790y46b46nhjb3zvv2ncbkhlzckq71fsi5ayp32"; -"coverpage-1.01"="1739rmdrj07q8s9xpxarwwds13hciyv3q41p18cm7md8qrdd74xk"; -"coverpage.doc-1.01"="19hw1mx7ghigybh23b8v65y0zx28p9armynkw9s7mgpbsq0wld32"; -"coverpage.source-1.01"="0spllq6j5rxqc6a96x0dx3n7skm4gqpp6fgas9vflywiw6i5vk75"; -"cprotect-1.0e"="016z5zz8njkk2cra768jlh2s9l3r4wmn50nk3psmk3v0i0cy0197"; -"cprotect.doc-1.0e"="1wjyrb0z85yighkw9a1pxxwilp31c5fjra7y07y0v1z20q6g3rlm"; -"cprotect.source-1.0e"="0lrf75hvlp6jpwfppkj0dwv7a9q51n897bwrf3gzwswb7icvqnf2"; -"crbox-0.1"="0ni16ldwni2gyzlivd5ii2fdq15h6np4mv73raa5g76i5rw42sbb"; -"crbox.doc-0.1"="1yk96bajna3ihvyhx482jrwiccbmqdr9852w11x00xkcvvc6azfp"; -"crossreference-15878"="0xc8d3g8j86dzpfxzfcildiyk8zi2apc9af88v2zg6zjra6vra1x"; -"crossreference.doc-15878"="1iahzjwns9zapa5y7z6yy2wjdcy6qiqrqvp9q9v4ky2zgsf7n5pi"; -"crossreference.source-15878"="0yajk2dxnsfy74r6a50zs4lc064aha0lzfqp26gpgnsx2h0bvpix"; -"crossreftools-1.0"="0pdhi9yij4n6bwcwbk077sdvwi1v8ww51g2r9ssfnmvmxs4zjw27"; -"crossreftools.doc-1.0"="0q80k648b967q9gcy7c3lb8ywk257zbsw04kc2gazlc61scviy49"; -"csquotes-5.2l"="12yxrcyh0igs9khkpms447k2p7b388p2vqb5bxxmcxp6fxvfq9lr"; -"csquotes.doc-5.2l"="0m4ync4sjrlv0qccls24brba7w6zd4d8hmh7h5nbwwv2lynqxf4q"; -"css-colors-1.02"="1q3vmcppk86v2y72g47ifp129fj4rgdq3rvzgkzdzwhs1q06ipfr"; -"css-colors.doc-1.02"="0rjqim8zdmgrz5dff8bjkz9kk456l699k5nplhc8bxa6dn7yrfdx"; -"csvmerge-1.0"="0fyrqx85mklws5zny7gmmyscnsivjfvwmgwi52k3jk2c97nvsy8z"; -"csvmerge.doc-1.0"="18pmc5h44jmlh583cg0hjr24k2pj369l6ya4hqm9kwka0bhg29nm"; -"csvmerge.source-1.0"="0mggp5xankhif93firc5g01c6b160bkwqwbhc04wcm4ndlamvip1"; -"csvsimple-1.21"="1h7zdribbh96iff296dl3n69xc8cdai9xxcnf0h3wndv775wv07r"; -"csvsimple.doc-1.21"="1cvcldm2ci1y107z5bwxsrhyybqdrvvpy5apmd8zc07nn51ymlyj"; -"cuisine-0.7"="16kvfkx5sj6xp5dz0gqlbp5079vh6snkpixmphvz2gzyaqnmafi0"; -"cuisine.doc-0.7"="1mbsgn7mvy39pwq5gn7l3h6l3lc53vjyqyvc50xj8h9gs1gpdrb3"; -"cuisine.source-0.7"="1r14f44bjdry108f6iy7byzms4dybc0wi936dwkg5ahwyq07pmck"; -"currency-0.4"="0673ji0kw0j0a764kjvla157mf5lcxa02wd0ypj82gfz617sn0r9"; -"currency.doc-0.4"="0v8sfvj7g65r7iyjijimbg855rbbg5d1zdkp7vc58q14y8f34a8c"; -"currency.source-0.4"="00p52nbdv0x1v71fb0ln63wb9mxdhy7zgagbpmcn2ca3xb83m16k"; -"currfile-0.7d"="02fb49hd8dh25yf2wajnzfni0p4krjnc9scjvnzazpsq1iygl55w"; -"currfile.doc-0.7d"="0mlrlxa66jx9dqh6m7b5rlw0vd0437wyjkizxw12xqi5a2656izb"; -"currfile.source-0.7d"="0zhxf7r1hlgj133ckyk1n7ki3814z91k546js2fkkmglr9s0bpf7"; -"currvita-15878"="0xrcc3pash4g8mkmnzqi0llhix63hqk12vlwn98ipww68qnhfbky"; -"currvita.doc-15878"="16v8r2vhvb9ssmnyj4zzgv2b2m10d3zg7wm2v6cn0p65hn5i76f1"; -"currvita.source-15878"="0xrsqmaan5h60970d12bwm7k9nlf7h0flzmqhl0j3kbnclm0x8w0"; -"cutwin-0.1"="1wzw6xp767mf85b8x6i37wfdi3gjnn95xcvhyfalcbjw19d8fwn3"; -"cutwin.doc-0.1"="0p4z4yjjs0hyl2ywd1n77kzz8mwslrmyb9fy5scpn4ac101xkf52"; -"cutwin.source-0.1"="06l4zx4k2jpqj09k7qjkgq6zl8rxgg86hkyj531h78sw4190g5nv"; -"cv-15878"="1w9gx9mhg9wp47rhb6kf1w03mypydp01rxmypv6yvcrk551b5jm0"; -"cv.doc-15878"="1b16zaypfphbn9x2fwh2v0i212jx3pn84vj513lkxzzfh0if78iz"; -"cv4tw-0.2"="0nli9s73cns9x44vr2npb7zgfinnywgwajlr1k2hf9jldzm09dm0"; -"cv4tw.doc-0.2"="1b9zd0ky6h8mlcigfwj49c4chsznvbycsphs9lkpdhxv8mx9wgyq"; -"cweb-latex-28878"="0cd2rgn25s02p2ga3509pnbc70iad936qznr2yl5q6wnlvd78lbr"; -"cweb-latex.doc-28878"="0vc5f0h9mq7p9040ksql4clcb9y1dxq7s1a4gzgpsjyla05ps3qd"; -"cyber-2.2"="0vlx0r57ay6jpybs6wlc1w1qpbd62cjq3snaqplaj6dkah98kcbq"; -"cyber.doc-2.2"="007g12qa9v04z3b11cdrd9z7pc7iba0aa2g7z460i0hi2fg4gv3l"; -"cyber.source-2.2"="1kivc83wjpm2rf2myk4079f1l8pyw1pm9a2j0iqbwshic2qfm86q"; -"cybercic-2.1"="1g7iv7xyl0a30kjmrwvcz2kg6y7q3r51344nf53r6ln1asagm68r"; -"cybercic.doc-2.1"="1nman70rpgd0wqhgw84qg8acm243y45nhxd32dmh9y8ywabynvc1"; -"cybercic.source-2.1"="12pbrk2bmgv25fa0llpk6pfgmz5jljmy1w5b6j0md0ni46ldjxpb"; -"dashbox-1.14"="034nwqqbd4q99mzdd6958w6a3jcvvpvamdycda5blh7in1gwm1b5"; -"dashbox.doc-1.14"="01zb6bc407282xhfc6ccrm38jjz2vyl96h552435b6cap68jv48m"; -"dashbox.source-1.14"="1lgpiyfizg0vgfgz51wk3mhhc344gwra79k1xp95c2p6w32bgf5y"; -"dashrule-1.3"="050scy57rjz5pvwd8bbl4h32w1paigyyy7dazr33v28061yap9b2"; -"dashrule.doc-1.3"="1ryclmf2l90n20qf516p4qz02znnp5rgjx6pfw4p3wrkamnh6xwr"; -"dashrule.source-1.3"="1f05m420qbbk25pc5snh3nb4dx7bd38nwfix1p8ndngn7l9dfkcs"; -"dashundergaps-2.0h"="000fzv5a00nap8ybzyijz7kx1ky4qx418jmkmyz5nm2rpnz8ckg9"; -"dashundergaps.doc-2.0h"="0zj18ikjshyd9jdrn4a8h1l8d9kypr38kx2cfsd9gllppp27m4c4"; -"dashundergaps.source-2.0h"="0n43mz7bnf05j31p99dmxr26rl6xzkc4maxra1aavg8s19x9pmd8"; -"dataref-0.6"="0isa7vgl7ic6fckj6i40llzp0cfr8j2lw7xyl4yd3fbha332sy34"; -"dataref.doc-0.6"="1qpkfaii2hk0ycpcycb2fl7aal7wn7ynzr8hpsnvfg7xv3dkvsmj"; -"datatool-2.32"="0c4f0byqwfkldxc1430qixy52xsidzw8s78igrxxrqhvvls4ywh1"; -"datatool.doc-2.32"="07gg85s1sv5zq1n766av958fc1qqlc9ifmyz8kd99b27yf9im4l1"; -"datatool.source-2.32"="1w5rdaqnx1mrf0vagxq5gvpxskwm5m4mbj2h4xhz78p3varn2i6i"; -"substr-1.2"="1qialx52sccay00z85z001xsm62ajvbfxqxc9ps0bpmjkcvvgad4"; -"substr.doc-1.2"="0zfcggj17bf26dxihkmqwn80pdir4n216x0nhkb3v17q889q903n"; -"xfor-1.05"="0m4y0caa22fps0r6735kb9pr2f89z5a8wflzrvpbms4nh3a61zgc"; -"xfor.doc-1.05"="0c0qg60h631d3m9rqr0nwj9772zjv3ch0d2p1ksnqnjf30idydl1"; -"xfor.source-1.05"="16xp7hziirlnd507g9bjvszm90wk9iv6ankq8bx27qkyk1shhjfq"; -"datax-1.1.1"="1lmm4dg5y198p9hhkhrb0nzahyk2i2779h9cnpdydirh07j6bpl6"; -"datax.doc-1.1.1"="1d1b4igfq7ly3d2qywj0j9yjlw0lxbpnif2zq1z38mzq9w3abybd"; -"datax.source-1.1.1"="0rjyskib7g16zc3dkdw56a189whhqzrxwlw9b9b8vdld8g0rn1cp"; -"dateiliste-0.6"="0vzq9y9ilc6pnhg60psvwsand6sd4w5238rq3xhwnj2nq80yi38s"; -"dateiliste.doc-0.6"="1gxjc45zim6vykmskmhrhnkviw9i7la56d2zfyi89c5nyjbry5a2"; -"dateiliste.source-0.6"="0ks8aka4km6z6xcn6sihsff935z8kg74cyf3czk31wmr9qay4yq0"; -"datenumber-0.02"="1wc1cixsvcb6346jvvy5811my0kgpc60hrs355w9v3z5a9c2vl4s"; -"datenumber.doc-0.02"="1lhqb3fj5dazlmnnxgxk80lq4n5gbbwkcf2dd228d25pnmx7jirv"; -"datenumber.source-0.02"="16cx0wgn2mxxp1wrfb51ngmxvj9r8fmfb1gxyqp1sd5pxiwdshnd"; -"datetime-2.60"="0xwh0sl6x8fqvaxahh8356dfwqkzk8g9dkxyaax5gz8ar9p3xb6b"; -"datetime.doc-2.60"="1j8zlxbyqpdrwm3z4pgdv3gz2firffk8wwr3ih1vcgn7nqxkcd78"; -"datetime.source-2.60"="0f644wc3c6zx6dgdam4wh6ap4gzzf5qn02krp90hkqmbrg080zxz"; -"datetime2-1.5.7"="12854by3m3pr6j7s6zm8inj2panr7c9h3ngm19gzybwy7cdb34nq"; -"datetime2.doc-1.5.7"="1pk1k3rsd9h5csnmnhlwi73i6dbwhlpqmf5z7kxgy9czmarbfg56"; -"datetime2.source-1.5.7"="1n60n0i9iwh8qyhv78z4d2afsfk04k912ixjciblgnik1gnd4xjh"; -"datetime2-bahasai-1.01"="13xslpv73cvxfs9m010qnnqsrz9ncgci65ha89y1zsi87fld4xfw"; -"datetime2-bahasai.doc-1.01"="080zpliqc8wb85gqx86klrq9rj7p73m5vnka5qmxzj60kvicwlk3"; -"datetime2-bahasai.source-1.01"="1jhxyrxl2f7qnld898b1hhga80wl6b6xfhi9vd9ka3w373qgqfjg"; -"datetime2-basque-1.2a"="0m9sf0ghni3c2qmr6byjjy88f6bjj4hhpiy9c5bgisc0ccb11jn2"; -"datetime2-basque.doc-1.2a"="0krgk4krb8yglk1a0fvzhgrj6b2n38gn8kxin23p98b9928wmcl3"; -"datetime2-basque.source-1.2a"="1q9h4jli6fcsd0vqlh88khv10gd6gz0vxd4gx9ikbrvgsx9wx25y"; -"datetime2-breton-1.2"="11hd7fq61g7j7nxsgrw94hdrrn54dnjvh10rfwcn0x6ck1vxawfg"; -"datetime2-breton.doc-1.2"="1h50bi7q6gvv3c2qchrx81ybly1svzyirhdcyy2swzqda2w1x7xs"; -"datetime2-breton.source-1.2"="03ppqjw69xbkvqnjfkqj0zlxsg4m5q0cx2magq88f3wmjp7kw2l4"; -"datetime2-bulgarian-1.1"="1vx3n6n46kzcspc10fwysq7xij5dnlrv2wn6b7pkfbl4yh1001yz"; -"datetime2-bulgarian.doc-1.1"="1yfgdcr1l6qji2x0i9gs17zb5scc9p91cgyk1w6brhy5sk4syns4"; -"datetime2-bulgarian.source-1.1"="00za8skfwr1mhjpizgslppnlg05rwab3nbak4kbsqglcv0nivm93"; -"datetime2-catalan-1.1"="1lj6407mzspkhh18yxxmvk3srgdpf8c5r06sycy128dqjkix4ma8"; -"datetime2-catalan.doc-1.1"="103nx5macgfrj8hkvyyra24378g5n1x4vnxi30pjkawapwjwk982"; -"datetime2-catalan.source-1.1"="0pc165ql0aa2wdwkz8wyk4yafxr0j3vnp98vxybq1x3fwfqvipv5"; -"datetime2-croatian-1.0"="1h8nxr5n9k278pngb36sswi6655p0vq442x6ixlw8h4mirlrq9jk"; -"datetime2-croatian.doc-1.0"="1lma00vhrjkvldgc6iq5p9k2ky4cfjywxdzy897308yxrbahm0rv"; -"datetime2-croatian.source-1.0"="1xcdaz38mm09i8zc8jpfxpbs3l2n5hhv8nk5xxw108x5k8vb8fnw"; -"datetime2-czech-1.1"="0q8f1ksl8lhkfxb2si8l84l94w4nfgav1ybfryd596kmcbpf6iga"; -"datetime2-czech.doc-1.1"="1wz7sznkpk9rik6612vibk2zc832qxrq4yq09rqwp6y2nar0p3vj"; -"datetime2-czech.source-1.1"="1bism4aqd05cjjrxmsqxxpq10sw72855fk5v2wjkij62yawklp15"; -"datetime2-danish-1.1"="18shs9bi583590a50jszym2pwcwgbz39p75j4nj5g32bwap262hd"; -"datetime2-danish.doc-1.1"="0dr9jv99c51na0b4ds6ac4rc26na0v0rbjybna25fiy4b0k7dgli"; -"datetime2-danish.source-1.1"="1h71ibvmhsxi1j5h2sq1zs29d466hylm7w9pl5xb491d091nxfl9"; -"datetime2-dutch-1.1"="1s5ff3wc9lgvz8md4kwwlqc792s4dqr2mcf0sif0dv0z8ssi079p"; -"datetime2-dutch.doc-1.1"="1562fdf0c1w556mwr5gfbc5qqnrbw0f8i7dc4lwh8gfnp7skirc8"; -"datetime2-dutch.source-1.1"="0i1kv624yr4zc184vy2y42qnycsqq57349d49glxc9lh0bpc9fgd"; -"datetime2-en-fulltext-1.0"="1bnmzpll7s2pv62hafbwxcj9i0c4s7vk1090xg2zvf80d0k0biyi"; -"datetime2-en-fulltext.doc-1.0"="1szzn4jcgchf1h8bg507lmb4mzdqx60k94v84z2g8h2pv7d5ip9z"; -"datetime2-en-fulltext.source-1.0"="1vrhcgsjhb6vfh44lqh2hx22zaw5qiwiwms7lnzwism5zghdkaxs"; -"datetime2-english-1.05"="1xjjv46vk4s3drlzvs7iprw3zhn1zk30bwi2dgczjqzk0fxyiql9"; -"datetime2-english.doc-1.05"="0iyq0385pj2lqmd5rwyanry6brbwrii4zg2jjnhp2ib404jwjqf7"; -"datetime2-english.source-1.05"="00sjzcpsp9jjfn9fnc1fmq19448qm0p0ggi2yy7qmz426mqb3g7x"; -"datetime2-esperanto-1.1"="05691xa25qp015w0cm5mzi3qrb88hlaq5jxjrxqgid1ni9rpgwh8"; -"datetime2-esperanto.doc-1.1"="1c0dhq8ll04pl3ics7d3p8r73mdawnyridapfr9540cs2a1xjjbb"; -"datetime2-esperanto.source-1.1"="11xg3v8dk7aiv9ms4nggsm1xs898m0zzi7lszi7jx8pcmxqnz851"; -"datetime2-estonian-1.1"="0vdnvfswgm92ncrkh11p523s6vczz1vdxyjqjl9cpm1nfj7wp14j"; -"datetime2-estonian.doc-1.1"="010i5rcy8pc5y16rwhpzzywlyna031g6s9xsdpgg0avci1yvw20h"; -"datetime2-estonian.source-1.1"="0xsgj8l6hipdb0f75ckqw1h2lmdkjxxgz0mw38pc1kg6sr4r3sdf"; -"datetime2-finnish-1.2"="01hjh5lmd2461n0g2a67z31h80wcfj14b9y9amxkx4k01b1268li"; -"datetime2-finnish.doc-1.2"="1cihjhhm37f38rknm45ndli3kmgrb1waxfncl1fg9l95hn929cnh"; -"datetime2-finnish.source-1.2"="0zi9ydsj0zjrg3c7618fxxabas6zhvdimbsd42n8fc5acvddhi36"; -"datetime2-french-1.03"="0iznh6qv41xcaryyh70lk26rmrk2j0j3239hib8g924zqgyi83p7"; -"datetime2-french.doc-1.03"="0f1j72g2xqaq64wi1jkllhkpxbjm1j3d7wraq42x13giv72g95w8"; -"datetime2-french.source-1.03"="018a641mqcpj1maqhpcrp09msf9rbr8a5nd16hk8c375sh2lqpap"; -"datetime2-galician-1.0"="1g5qmiy094yrid6jh3xvy783kq331bzk0lqzci7jsb2izymz0lqm"; -"datetime2-galician.doc-1.0"="0im51qyxg5dbc6p1w3k4vs63d7nyyipd2ad7z9czlfid0n4ywksf"; -"datetime2-galician.source-1.0"="0j4i3b3mp1bpqir7imsfw2y1098ak0j8zs7gjhm16xdrb4n1xhcl"; -"datetime2-german-3.0"="1n7s5fj27rlz61r63s1mwbkxm62ddb2izz7ip4fb165d0bbba8xr"; -"datetime2-german.doc-3.0"="057p9xgdbxq31ff43qi7lr4wy17nk625dnpczrinfd80xn92dhsd"; -"datetime2-german.source-3.0"="07dv92w3rfg0xi6d8n6ykp0rn4pj6k8knp9sx8an9bhzmwqw2yw1"; -"datetime2-greek-1.1"="13a1lpvg680881xpgphzni3hcdymvph56mhgy0jbsri14fw0mdyi"; -"datetime2-greek.doc-1.1"="1kkl386rd0h5psr1z4aw32r7m55in62hql8x9c8njzajm5frhf44"; -"datetime2-greek.source-1.1"="0kmwn8mawmxvrgx5d39j92p3r1nlk1z378z1h2lx129yz4qbsv56"; -"datetime2-hebrew-1.1"="1b04g9lm0g5128phix3mnx9yphg07ig7p9d149rw0b1imly7f6mv"; -"datetime2-hebrew.doc-1.1"="1lslls4q5j1l9a5m0gzv351jfc93ii0zzcb62p3icq2qjig3rz37"; -"datetime2-hebrew.source-1.1"="11q13hms2mnqyxg6hc3279a8hs88j2d7v7wl90v5avwgh8923q55"; -"datetime2-icelandic-1.1"="0qdzn3sg7wamii3gkjgq7sas1fb3ixpy3b2p6qfz37a38phb4nyc"; -"datetime2-icelandic.doc-1.1"="0fxwl3q2gb9pxvhgsd7xmcf78ql67c4ajws944rwvsh6bn7m7w5v"; -"datetime2-icelandic.source-1.1"="1jkcxsas9x43zafrl8bmc56800487p037793k58kcf7w6vlr9lax"; -"datetime2-irish-1.1"="0k40sibvdqhg333l0iyhg3zs0fkhfbkqhs64ch9hs0kpw1mah48g"; -"datetime2-irish.doc-1.1"="18yd4icn0vmmizims17lsailn0gjqnhx4c7yy5jgrycammbjns03"; -"datetime2-irish.source-1.1"="1hs18kcmzgif8jcfp3v87h6rvrhskcvi5jzzspp7zgpq73izb1nj"; -"datetime2-it-fulltext-1.6"="03nr1l5gzwzdg4simif6wrwzg9716vfy1nbp8xfl98hs3sznhdhi"; -"datetime2-it-fulltext.doc-1.6"="1rqkdp81zg5sq5klz10v00c9xzb162dsmqgic2y3v4mxi482iy89"; -"datetime2-it-fulltext.source-1.6"="0y50s2mnyyx5kxb0bjbbr4pr7ywnfq3aqhqybqhd5x6rqpwagnd9"; -"datetime2-italian-1.3"="1if93khnpiwn2qpk66i431aw55y43qr603kdfdfq76v4sq4zrcys"; -"datetime2-italian.doc-1.3"="1r7gbm3ik84ny6nk3fb36g337imfq7w53cmk47qg1cpmff6c800c"; -"datetime2-italian.source-1.3"="1ckrmbv22dm7998r9p3b730zyk7ldzzbf1ds8ac5syqibh8wh0dl"; -"datetime2-latin-1.0"="1xgjcby4kyr6pb7zmwvwyhcq5y468vvja64l8bfivhv0n1s6q2cs"; -"datetime2-latin.doc-1.0"="07lvgcnpi7z36l21dwbs1s19f3afg55i18wdjcc9d02566g2fjv3"; -"datetime2-latin.source-1.0"="1gi5n1sf6v965hd4p0c6d8v92myhh218ql6bgaarsba1axp2c1as"; -"datetime2-lsorbian-1.1"="0vpqvd3fcmd8kqs2cj6ix5g3ci9zjr7i9ym31whryras2cm6r24m"; -"datetime2-lsorbian.doc-1.1"="1ysrjnw655p1jplcxajrjgd48sndqssm8j7gv869nf0ngx4mx1rc"; -"datetime2-lsorbian.source-1.1"="0875nzp676qv8vi3f37k2cbf7vszsrws6clyldqqayxkr7gnin63"; -"datetime2-magyar-1.1"="06y57br6g9clfscqma0lqp38fzp6rrxja3sz5x6jgi0acyljxzxx"; -"datetime2-magyar.doc-1.1"="1mcw5rzb573qav00jz611576lvy8nkfl3g92wj02szb6fxq66g60"; -"datetime2-magyar.source-1.1"="1697h8jh2gx1ybcfhz8cqzvk70h83qa3028hqi3c1rhkcbxbrabb"; -"datetime2-norsk-1.1"="1kcdkppmc5h3w09bwcrvlsxcbcawksmdam0x5w6zbqibvhlhvh78"; -"datetime2-norsk.doc-1.1"="1vrip0mq47w2qn8i14ckazpzhzrl79dpyj7zv01b43xw5zkyqg4q"; -"datetime2-norsk.source-1.1"="0rkjhbqppncaw67pfiihy2grzlcsaszi8jnxhhvb2sf4i3dpqlr9"; -"datetime2-polish-1.1"="1mndpf6vnb7lbziaj64aa3q796bv17mh4r9s3p0y2k8yjrllql3m"; -"datetime2-polish.doc-1.1"="1cn5qrcl4jxcnn90llhn6x7rd5zdnzz9h5szv4hhzbn9i4k1ci0f"; -"datetime2-polish.source-1.1"="1c42vallyqmpjzivcfvaxidhi2rs05sw6xbkb319dznl1jmdby6c"; -"datetime2-portuges-1.1"="0ikj36y2n7zlxgvwxd8z8vmkm4gwdan3si8bz98ajc1z5yncb7ha"; -"datetime2-portuges.doc-1.1"="1m4ij8xjshi23hrm723m6vsbijd9cbd49b29fr2466sbxmnkyv22"; -"datetime2-portuges.source-1.1"="1r0nw953bwgdz3w150s78s0rpd9c88djygwc68sr3dkfd6iih05k"; -"datetime2-romanian-1.02"="04jypimj3pcvnalkgzwzxvgav8s0g6c7br1w5hk769k7aqjf7qx7"; -"datetime2-romanian.doc-1.02"="0nv47vpf5gcnj86f1m24xbmlvhf7iciyjaz2kxbbsn4yz55zmbmv"; -"datetime2-romanian.source-1.02"="14324lrmh75g4jigcbcgx9zyxn0318k6my6ndvymamldwln7gmmv"; -"datetime2-russian-1.1"="0m3cmm2ikili85z44mmsnaxhv3x2s6xyk6kkfr3kaczn3w8srqim"; -"datetime2-russian.doc-1.1"="01rfdj3wf69j976mkv2yxw0ns4pzf852miykknni4zw7lbcki00g"; -"datetime2-russian.source-1.1"="1x931h6rnzm11ipfa747x306iwn3381ahcf7bfzhg75p8707glgs"; -"datetime2-samin-1.1"="0wqnsvx33d68j18lm0fmvjrdg8g5hv0xwzv6wqnb8wwz1l5zmqvj"; -"datetime2-samin.doc-1.1"="1wfij9j00pqs8bapbjpmg8xzah9509vrsb9h8sqc2abdjnqgkmdc"; -"datetime2-samin.source-1.1"="037gm3s8rxk4chj2q9yilbkvg46dxnd2jpr886ibydfp1ndnqcp1"; -"datetime2-scottish-1.1"="18c3y6968css1zm1pryn3cfbdqfn9px0n62bq6mapmgbd7fi2plh"; -"datetime2-scottish.doc-1.1"="04dy9syy4qmn36mfy1agxjzd41prwqzlx5f8vpyq3148w51kpp1j"; -"datetime2-scottish.source-1.1"="0nhfk8b19dqa08lb10sbfwp3c2f4rn493dgp4sm254bk00nil1gh"; -"datetime2-serbian-2.1.0"="1akyl3r70rwdyjjqvpsmh5m9g7xsdmdmx7l9qyh54x8c7gir7wd7"; -"datetime2-serbian.doc-2.1.0"="1kgkpfgfqj99m0262zcc6b7fnik83vr45973720dbf9f5gvyin95"; -"datetime2-serbian.source-2.1.0"="0hn4w3rw6mqzcj14a55m2hch3ra1ax0kb3l254pfgk4x9l3x028v"; -"datetime2-slovak-1.1"="004s60h3zi0a947ayc7kk2slxwl6bmpba8lxm8000f6yaf00wyk8"; -"datetime2-slovak.doc-1.1"="1wblf0fd2lb6b05vvb31a33lz7dxakd5k6y5pcvs6iwjjb755n52"; -"datetime2-slovak.source-1.1"="17hwr9yzpdkcvqvm1fa4qvacgica9mm29npmcl7xc3c503h4z6wi"; -"datetime2-slovene-1.1"="1lcpx7nz5lqb6pdw2j0dybkilavp535pxijs13nfl043xizh4brq"; -"datetime2-slovene.doc-1.1"="0i6p83lixs6maiww4fdsm09nql3xx8xvs2qz38r5md4r5zzikyb0"; -"datetime2-slovene.source-1.1"="0grv3gcm8wjdcx9smsq3dzd916pg8kcvgmh6s47xh83wz00qqi36"; -"datetime2-spanish-1.1"="0ggb24w3sljmmydnjdkbg34n9mszjwrqny8vl70fcin1dj69njcj"; -"datetime2-spanish.doc-1.1"="1iglnacrcwwmc43shhsaamwajlb3mzj9dgqnd5qg3v7ynlp5zblq"; -"datetime2-spanish.source-1.1"="0fjkhxqgw1yb1nzfiymwv8bsv6zlnwvdjl7crd78n3yx1fgv9wd8"; -"datetime2-swedish-1.0"="1srl9lm3hbsg3bwdkdw4bz7rhhnkkl6pihjky5p2h0jr9mribczm"; -"datetime2-swedish.doc-1.0"="15ya3082by696ysi8gj7d0x5n5g93przna74r0g8yv3qpqkv52j6"; -"datetime2-swedish.source-1.0"="0yswvrgh6xg34iryy0anhb4jac8q0iyvdfw9bsbhaz1xbldn7xw9"; -"datetime2-turkish-1.1"="158prpx4ma56qvq6ivq7ffwp0llll5x34af194qygxs0ldsgjlwy"; -"datetime2-turkish.doc-1.1"="0n47wgnw5kvcn85s1983dg3fbixh7i4p3lxrfnd7qvaxyrph6lw5"; -"datetime2-turkish.source-1.1"="1hnwws0y43d9hpdgb63y5pxr6d0ahis2q40z705b199051lg2qfw"; -"datetime2-ukrainian-1.2a"="08ba6xbivl8gv2a3g0p4ch969zq1lid4zq3vqqvgzkhkdsvc2zkg"; -"datetime2-ukrainian.doc-1.2a"="0biih09p6a90qbjck5w0qs4k8lnqdha0xd3f6kdjmlljqxk24g5j"; -"datetime2-ukrainian.source-1.2a"="0mrysl74pfbs533h08jv5wld57s30nsq6mar2n07668nmplqj0ss"; -"datetime2-usorbian-1.1"="1dynq4qqi7mpckzcmwvfc17hvnfjlv3n93dwypp2sxl1596vili4"; -"datetime2-usorbian.doc-1.1"="0pvf7lx3g09jy5nxlzvgsixmaz9bkcq0zlhq8r3ijd743sq4y048"; -"datetime2-usorbian.source-1.1"="0888x4b0wjqwfrg96rcpxfj6mycdpwwyk9fjavj3j535nxb5hjxr"; -"datetime2-welsh-1.1"="01p4mxn78ynyan6pb9598qmi000alyaiw3bh83w0l5682v2fi7ip"; -"datetime2-welsh.doc-1.1"="0rkibaqirq4xgy6r7a1aws6awyamllg5z5zixb3imapj3x6c8p1h"; -"datetime2-welsh.source-1.1"="0d21jimjq8sipg1qh4fxwb9cmq3sga0wjlrcqapjpy559bnfgmrx"; -"dblfloatfix-1.0a"="1r8s36il4bmqvvvlrsdbhdp4nanbyd1lh71dac4f774bf5pkhzi3"; -"dblfloatfix.doc-1.0a"="0znp5j2v20q7bsic5j7cjqxmbi1dannffl0b14g2w0jp3p6hpfxn"; -"decimal-23374"="00byxbhi2pqccd1vd6hsh4ri0vzvq1mwjnvqmqqlrbr3qfv05zla"; -"decimal.doc-23374"="15v078s3d3aawihdmd0l1ndqinlsqz11xxbvbw0dyh0arw6d1rc3"; -"decimal.source-23374"="1k88s0r82livblqfb140npf2p7lvmsqkpasbr93ihwjj9vp54xb5"; -"decorule-0.7"="0r5pxcpx29l8x1bw4hj4xp66zgkjgm0qn2ryvxy1d30dyjgp34zb"; -"decorule.doc-0.7"="0a3qvnknhcx0jx8x9gk7bh4sbnzv1mnqvdr8l03nzjcbmysvc3hy"; -"decorule.source-0.7"="1lj47s4k44pjnr0n06xdcb37625hkjclrsj4ccmkgcr61d85vkwk"; -"delimtxt-16549"="0s2bbxhbfvq0jm4i90sh6krcik8yk2nl0c39lzr1nrakal0k5lkh"; -"delimtxt.doc-16549"="1wswrw94n5l1azs2aczv6vf56ksbagniry4rwq9b16bmvdy7slyz"; -"delimtxt.source-16549"="0sfwmd0mj359qkchqgm8zc80ayqp0p8ppdgfn3cmayhf2pml6gyj"; -"denisbdoc-0.9.1"="0nqajj7nq19s74m3qlsrii126gp6kqakf9qb9pianbdq9xqpd1yk"; -"denisbdoc.doc-0.9.1"="1f21z0638dnlc6wlpchkx16zbl2fx7mpbkppkpzmfafdhql2i77k"; -"denisbdoc.source-0.9.1"="1zqjcmqllbj3yig5a8zwjm4q3r4c9jw1zyaab64w7fvcav825h6l"; -"diabetes-logbook-54810"="0rmahxnjnjd677z42ra1mcp86na41sz9ir4chkpmaikhdvnbi4qa"; -"diabetes-logbook.doc-54810"="0qb2nyjc7fpc7yc632bblbjryxdx39xr64c4kxncdisi34am82z9"; -"diagbox-2.4"="1p7wfkhdcgdc1gifr4im390w039609j6mg99sixgpq8f0mqqnlsf"; -"diagbox.doc-2.4"="04i03qdy9gfzf14w1vz8nqqgw4hn191w423jf2ck5ibljwlwa214"; -"diagbox.source-2.4"="1x1ixmmixi2sal1iajwnf0wvg97kj08hi5vv4swdiwqpd14g1i53"; -"diagnose-0.2"="16pikxgaf40vm6l5r0wk5jxbfyzy1jgpq2qhpl859srxrygdar4q"; -"diagnose.doc-0.2"="0k6vxzd3biyrfwnfr3p2zvj5j10r4xsda65qf6ppdrjr8cvmjx6l"; -"dialogl-28946"="0vdx7qnpp5s6j5c96207px2fdhylj2kv3ph9mr3jcb6jyrsiyi0q"; -"dialogl.doc-28946"="15082p9pi47vdwrdqz4kdcl59ymsgnanrrnil9p97c1wbmc9saqb"; -"dialogl.source-28946"="1g9c68a7pqpk5vfcnr95zi11km3bhjll06zminw2knk2naxlykhh"; -"dichokey-17192"="0bvv3893jxpblddqi75hppb9s0rxaiqbq70jns2x7d79afl7xkwj"; -"dichokey.doc-17192"="0m5zc521shp00wld4kyhp9xipsqfq00q1dqd3qp9ki1b2kmr5w7j"; -"dimnum-1.0.1"="0mrcnz3s214a4yxljlbrzpqyrsjlh8gd0llj96wsirlc1kpsb3jq"; -"dimnum.doc-1.0.1"="13j2pbbpsnd70gmn3ap4sad4bvbwg3r00ix9s1m2kvx4k7j3zwii"; -"dimnum.source-1.0.1"="0sx3y3g7jn0dbbfw3a8sga2fs9pz9710jlckmc464a5zlxmcyldh"; -"dinbrief-15878"="1msbw91lljb18c10bia4zclgb1klhmnck6kf23dgpv5ihpdmzla0"; -"dinbrief.doc-15878"="1m3dvm2d0s7xbnvywwwcnjcl3hr8sczp1lmpcdx8m6gyjspllbfn"; -"dinbrief.source-15878"="13dcia7rzw0djajb71b9gq2isgys63zs6g89rnwxfvn41a0nkgh3"; -"directory-1.20"="0z2kczyvd4h3751ndfywzfvxl16xrjl3alvqxpscjsplrrrq53l4"; -"directory.doc-1.20"="0w5rhczldn9p28dys7pjn3lgs0a6dq4yr59n1969qbffbcyv2m5q"; -"dirtytalk-1.0"="10msaqhpb66l95vk8l172mpglilhdrqc4qcvmq3v58ssj19kksjp"; -"dirtytalk.doc-1.0"="13yv6x3v4is4l0z5b7a83r173jq7mkyqc8nn52sfdkr168saxylz"; -"dirtytalk.source-1.0"="1jw485pgqr0l60rnd39jfn4gmac5n9k67q8ykn2fk3s38nklyzib"; -"dlfltxb-17337"="0yql8krlb6cbi5vhds9s8qwy4010vlsi3szbiqlzrby82bnfpxnz"; -"dlfltxb.doc-17337"="0c4nvwlf5k1q34gsn3z0pb00b0yhprhp3a1mcrg9i53yw7chwsy3"; -"dnaseq-0.01"="0vsifiirz1mwmjnav8k6m27mm5qsn3iw01a9c056p4g4ji8w2v2y"; -"dnaseq.doc-0.01"="1n05sb0yvq1hm2wa5vdnkhr54fgdkxv2s4kd8dhzk2zqx6sdv4jb"; -"dnaseq.source-0.01"="07vdyylb7j94sphfz6c2szxhx7l5swvyzly3afky69lm356988zd"; -"doclicense-2.3.0"="01mb0y2mpgbpf0rv6xfwq8yiwibm9n3sh23r5xnf49agbw2zgynm"; -"doclicense.doc-2.3.0"="158rqgavljjck3ydfmagxmira7l6vvdi31xvv9n1fkypjxggdsi9"; -"doclicense.source-2.3.0"="1bc58ih6p32lj6lr3n6n4cq14kzdgzq4jh53ycv6b7frd21j8304"; -"docmfp-1.2d"="13cxjhbafm0xvnng6gc9g03p4j79sia7jvygxmphgnf7wfndv4sz"; -"docmfp.doc-1.2d"="1j2b530wcpr8252lcpmy0c5w83kqbi9xzsrfbdngi1jmkfy4nlgv"; -"docmfp.source-1.2d"="1w8g6m2whza3w62ngsaslv7h2x7asijznwb9glx6g2vjv456sgf8"; -"docmute-1.4"="15ad8274dwgzk7fzs7i5g3ss02ld8in8f86339rb314zmraj5kv3"; -"docmute.doc-1.4"="1mrwispvif8nwjbq12jgzpwjn9xf7mr91pwg5bfdcnpwwy8l1bh3"; -"docmute.source-1.4"="1nfv31h23mp7alrm9saz5abakjsvs7rqva3q9zvxlczix7yn63qw"; -"doctools-0.1"="1rdwmdah8rb2yiicd9mbqz0mmf56rpgnp5vwyjhax7m0zqjgqkgm"; -"doctools.doc-0.1"="02jrr4wbkdx8r44dpfn4g83j03n6yrska79ljnwigs77p5jqlyl8"; -"doctools.source-0.1"="03y13bijva11hqil84l2p4cap7fcm8wk6ds53nx1qizh66h8g9vr"; -"documentation-0.1"="088imchmqchi1ilwfzlhk8d4am2xjjgacnyw5w4mb6sirbckhi3d"; -"documentation.doc-0.1"="103rpywyl1h30c7jamp3cfi1rg89y48krdjbxc0calz8iq5n0460"; -"documentation.source-0.1"="1fzk62clv9ij07cfjcrwn94cqvz2piysij09y2wlkcs06lgk2m69"; -"docutils-56594"="1pxswkjs901clnd8l3n13ghqypv6l8gxr3pnwn9i0zakvxz6gdh3"; -"docutils.doc-56594"="11fzx9kyxgxr20hnyqy9nvl5rczdfyb43j1bjwxnim68kmy5bjyz"; -"doi-48634"="0rxsgmqmkpabw1qw7k0ssxjmzkia323dl0p73zw7qbwdpgs4xx5v"; -"doi.doc-48634"="0h6k3bg9wg4wa4shyijr0xsx935s8s8igad0zzyk57q5g7lhhka4"; -"dotarrow-0.01a"="0wjan8m1171m5bl5x6pygfn0lm3pyq87vmjjgzl1zd337l3wz45w"; -"dotarrow.doc-0.01a"="18d9y7mzfwsmy9c14ihj2blmikiwcwp2y462wjnmm8hb6gm58cpc"; -"dotarrow.source-0.01a"="0f8dmgsrd2wbcmxipj0p40d09sgcl8i5indbzsmkfz7fxvnpr15d"; -"dotlessi-1.1"="1ii8ilc2hqdwck9z1lpbyjsgh47pkfh62r1yv6kdkafqqrxzpxxb"; -"dotlessi.doc-1.1"="1vc8bpzzad2k222ghdcqmkbd7541b88wccc108avzj9v85wfpjbk"; -"dotseqn-1.1"="0n0hgp5saipf42kwx4hxxgx66irmy91pdzcznc8vmnnlayly8s61"; -"dotseqn.doc-1.1"="1an4s3v47f08z7v5gmz49g4bbz26xcvadn74052nhrbmj8xm8fav"; -"dotseqn.source-1.1"="05zxrzpm7mcms2skh9mpv4nga9ysqwin8qjc7yy9prcaban00y33"; -"download-1.2"="0dwivfcjvg12gsf4zikyvlyb0p1pks6a2fxdqgji2x79ashxsm24"; -"download.doc-1.2"="00p9cjzqqh95nlda8193111aa5kjagszbf65wfm3jfy4dahqxfwz"; -"download.source-1.2"="15shcpxz2h0i34pnm2nz47h37gy4xdws87p8yrxbfi4j10qr8c62"; -"dox-2.4"="1vv1arqah132cns24s99s18ixcrjqfkbq551d94pjs8di7fiik2p"; -"dox.doc-2.4"="08x3h0750nbh20wsnlkfz59na5kvi9jsm63l8dh3l7b0szzq88cb"; -"dox.source-2.4"="1p5xmacd5phv5ig0ga1wj32fqpji9fl21lbygb39qdjr6v3g7vs2"; -"dpfloat-17196"="00agcljhzafzhbcfk1jbxaxyc3znwxd1j1sdhr982m3s1nd8733g"; -"dpfloat.doc-17196"="1nydmlbk1p4gywq0hh7jnvd9hs9lxl73khbpi4zn5j4blzkb31x9"; -"dprogress-0.1"="1sz7msvh7wyf5k8ag857lr11dqwf12p1wzi6kdkwma05i8wwni88"; -"dprogress.doc-0.1"="1s356ffii215bybc5cqg91gril5am5zzh5w4s1nf875yl4yjxbji"; -"dprogress.source-0.1"="1f7ym5lr0gn24jaca509hbhg9xr5mhbr5wgncvvf937jmq6w2jxp"; -"drac-1"="0p8li8cln7674zd40w8x6izn2kf63wsxpwg3dpbjnp5jccifvsnr"; -"drac.doc-1"="1lhibs5s6h0a97ggjkp1i8j02ry9p0zdq6pzjxm4ijx3fqj1p3rq"; -"drac.source-1"="1478yizwfvzrpi50k3fxbs9vq7g39170jdh7l3ynkbq0fkbssxhd"; -"draftcopy-2.16"="0fxh7h37akz0s33vjmnzxjp04m7ynb0z6650p5wd399lfg5bi11k"; -"draftcopy.doc-2.16"="1z7cjzk75d3gwcb4dgvg7a8jl9bvzqnc7zn0ginqcl0aih37yg5j"; -"draftcopy.source-2.16"="11gswnpz0azxb2d1clmpk9bis9cijsd1hajll7jxm5fhnk6vigfn"; -"draftfigure-0.2"="0dhjlykc6p6jm6p0s0h0d74097ny29w84ns1pxbb7f8iwr8hhkvf"; -"draftfigure.doc-0.2"="0gnazf3bmbgnygn3pv0lzrlrcic3j2yfqxq1kaijkkhsr9w57jy9"; -"draftwatermark-3.0"="1xrsh755whbaxizzljcpk5an5k9s09f6hcndp1lhw2z9mfnl2na7"; -"draftwatermark.doc-3.0"="0cnzbj2wg5kifqg08i081d0043462vswbxr68spnnxp2y3b5ysdj"; -"draftwatermark.source-3.0"="1k66347n1cf3ap8406dw2qa21k6mazwhv6brr569i0khsxypfw0a"; -"dtk-2.08h"="1dn61q1kxyahl9xd5aqscbz0p499iavp0fr726v2zdy191wk38n1"; -"dtk.doc-2.08h"="1pn9v2chglsggi98d6n9b9j5zsl6fqms5ykmqr9x908nixlavlmz"; -"dtxdescribe-1.02"="0xl8q9rb9nsfac6cjlbg2ind900agza2n8zid4ss4vr8g8zxaadv"; -"dtxdescribe.doc-1.02"="02hh98qbdymaxfp0nc8dg2yiw7kl94jam56636kig6ik7305zhwj"; -"dtxdescribe.source-1.02"="0fij0m7yrwc391imbafhzc7iynpc230myfjb2j3czzaklan46p7c"; -"dtxgallery.doc-1"="07c403zbx7sxkhhrwrfw3np20xlqhdk893b4bd6r8lqb0zipp5b5"; -"ducksay-2.5a"="0m8dznw00in6hpsw3qwv42aqn7srxrzl54azby1a0wpf1c1nivpg"; -"ducksay.doc-2.5a"="0d4a3ldjvblq0n4mjkdvizswklhaz67z8myak8clc60fd2pv5f80"; -"ducksay.source-2.5a"="1j4bjigfj3a81h54xwi7ciiixr4fcl5g4vz85lxfwyqb8gw01mc0"; -"duckuments-0.5"="17fz5mkr812ig337m2q40dcsj98qpczw53vjrsqk1skmknk0q4g8"; -"duckuments.doc-0.5"="1pbq66k699v3b6c02qx89dvzsh45knr4y9s6a45gkm4a7mkk5nkx"; -"duckuments.source-0.5"="0xcdlvm247d3hl7bvb981fv07nb5g24c0n0171vsk3hacxpshcsk"; -"dvdcoll-1.1a"="1b07xplza4b3ngh50czq8vwmhpr2qvkl5xbgd93a9acvsf5pyg6b"; -"dvdcoll.doc-1.1a"="0fhkdwyvlizlb66bd24pfncbg58a31ygnfg0f9dw5z9ccfrf50hd"; -"dynamicnumber-0.1.3"="0y779azvla68n692x0gybg74cp3dk32219v67qfamfzz389nbs7s"; -"dynamicnumber.doc-0.1.3"="1appm3ddbv9ll0mbnid4xa459w9q89swmdlvdzy1fxdps4y0vpz9"; -"dynamicnumber.source-0.1.3"="0ydmlz697c46fx0xpnvcdcfm9sm0j3jmk47xz8znd2ghzg395fgk"; -"dynblocks-0.2b"="1zb7vk34k3z0cvw6kz74s7831fz17mg3j9hw60diabc0q47pwyr0"; -"dynblocks.doc-0.2b"="1m69hys2b7fvwn9h6q3whkpcnvi04hnhx7811s5fqhdfi76v4zk4"; -"ean13isbn-57514"="0bzvkzpi10d9sjlsc4df5v3y7qycbz1qkn7ngy97prq58wg047gc"; -"ean13isbn.doc-57514"="1gf076ybmni0wzhh0fsf5w4sj4pv3c3w7g7m09k9607y4havv20a"; -"easy-0.99"="0jrza9lf3yf4d1wm6nzwv5iyfia6625fjvflfmxsscbmwqickjhx"; -"easy.doc-0.99"="0f72bawmxrxqk60xb61y079bqpxj8kmvn167plbq5whq5b1fsxfl"; -"easy-todo-32677"="0fkwlzgx20lj44cvwv8hqv79v528k1gghx30lvqhg44wqirkmy86"; -"easy-todo.doc-32677"="1yj3c25mhkp16n49riza4qchr2pqycqmb2k80syn5w3dzrj021s2"; -"easybook-1.24g"="0gjpknhsjkyfnhd0xv73k1vq5j6kii7c3ms4yim119ac831bwzj3"; -"easybook.doc-1.24g"="0rrsx7v0gsilsq2z104zyfp2021zwm511gj038zj059k4ri2hsvy"; -"easybook.source-1.24g"="17rlywp9452hsagpf4cn9p2z5ap8348nyccmidxxqfiys5ydhhn6"; -"easyfig-1.2a"="164ncaq1l6hdrjp0zinynf825hwsky1xam2yqxphhk90438n5hzk"; -"easyfig.doc-1.2a"="0hc63z5456f00a2x70ckvf3r54zld4d3r63a8d4ra7502kk8s9n6"; -"easyfig.source-1.2a"="18f4bb9yf3f7q96w79rhx8h4svlxnv0xc6xwcawav63zsk40mk7q"; -"easyfloats-1.0.0"="0vbg5dz6wxzk20rn51xv7v526qg8m0ih3wikabdf1bfb4n093k2k"; -"easyfloats.doc-1.0.0"="1ncmmmf2w313cpsc9s4w0c3gzvx09r26gwlxhr9rszksvd4y7fay"; -"easyfloats.source-1.0.0"="1ih161wrkxf8sfm0zyl2m9xgmff4qs6qvsz7mzxbjl1j2zxzhhf3"; -"easyformat-1.4.0"="181x0sycxhwcfna2wblvijjs32zvqs6xl2am4hz8204mk321rjsb"; -"easyformat.doc-1.4.0"="0fg7y02717rk6ikw32qxn6iw7l59h5vc22aif6hs9xjnbm3nhhfr"; -"easylist-1.3"="1ghjps30fa1jvfkxrzaxqvy5ilacdyms6dl8bf2qg6195w2sgm33"; -"easylist.doc-1.3"="13wgq2pz9jw761p2yipf23k6lrx66bp25l50446rp1xz47yk386g"; -"easyreview-1.0"="10wl0aihr4c55b08mxafr0jd1xaz640p2kj7n63w3wqxzxlpq42i"; -"easyreview.doc-1.0"="0nnnr4l1b6qhp75n646pd446s7c3pc4fxsxw84gvfqgankfsx3zz"; -"easyreview.source-1.0"="0p7xrqivvb685d0xcljyi4whh5vr6yahskdl63ynw836bmin1b3z"; -"ebezier-4"="1zmsrs7dpw5gwh6h0707gxcpsnbb8qklsqnyr0q30mziz1wqhdvb"; -"ebezier.doc-4"="03afnc0nw7yzv03n4gq38js3y6x5v0kaxi5psmnzpf2lj0kfa7l5"; -"ebezier.source-4"="0492q2l7yrv1h51x4swqzfp74k9kb989m0lxbgvgffh4gl7zhi5w"; -"ecclesiastic-0.3"="008agcka4wj694snynfgak1ycm49rbkwn3z58470adc4rwi99klf"; -"ecclesiastic.doc-0.3"="1xmbxkmia5pcr2l5m3rd12qzpq92f75rcbipgpvck6sqpp7psc8j"; -"ecclesiastic.source-0.3"="0c32d6fzzn090hi9nxdj3qbbhp4q11siziwr7m6lp2l285n91wj6"; -"econlipsum-0.8.2"="0xca6dhbz49zxn58g5bc2yis2zci9v5iypfh3h53rxhlkbfbcqln"; -"econlipsum.doc-0.8.2"="1pb6z051r40wp8rv5makhaxbf23aq5j5gm6pw1khvhk806rdig4w"; -"econlipsum.source-0.8.2"="0j26l888qx5q5j39875iab4106fkn3ign9fmbcmcvf42yzx7mav9"; -"ecv-0.3"="1rvj3rf5vrjhqsz070id4i3l9svwsgclfhkjzxlb42va1bqxkcdk"; -"ecv.doc-0.3"="0cp3h8pagsxpr0i28v8x9dh9j6imbprd2hxrl6ln2m75c9ki2wmk"; -"ecv.source-0.3"="149jwhqpmfn6gwzkcqpilxp7hqnidjlvhi1khqxnvq3k947x33js"; -"ed-1.8"="0wb34cch7jfgvfql5jy6vvfalj9bv6pjyd9dg2i9msq1azvrjjv4"; -"ed.doc-1.8"="09kn8cykfsyk14g428v72l2ppwffcdrrycnyl65kixv8hj0vsdy6"; -"ed.source-1.8"="0ldjyl7gpa5fswzabzmklkwmz94z8al7pm97hh0yjzdqgjxfsdbx"; -"edichokey-2.01y"="0c4hwpvassgrlycrjygwywp6ws91vhhb2wq1jwdla8x3sk7hkdr4"; -"edichokey.doc-2.01y"="1b79022plz2a6gbf1grrcg4j6794fd0a45lmq68lci64mz33b66n"; -"edmargin-1.2"="19dmfw76l03v87igfhmh81kbfsp5zbznk62vqpanpppspchlx7p8"; -"edmargin.doc-1.2"="0v9lbfynw840xampn4sgxmq413357wjwjr5slzrlpv9mh1f8z0jr"; -"edmargin.source-1.2"="00b7b5c4n7baw4c973d0b3d4gzkr5k7m4xj258sw2bhfgaqnrjd0"; -"eemeir-1.1b"="0hxnd2rxrm56vblrkvg01c1pf5gccbmvd9lvrwlch89flxp3fiyd"; -"eemeir.doc-1.1b"="1s576bk99sw867ywkq1qhk31yycc19zqr34ry2zix25cs3hk4pia"; -"eemeir.source-1.1b"="01z6p0ndp3nc3pbbwchchfn9nlk86kp35qvb5hkqb3ha59wlfyzs"; -"efbox-1.0"="1jss3bkgyl365rkgzil7xp4pab8k00w57p60s2sh8wrdy10qjsda"; -"efbox.doc-1.0"="051s9yc05ai0yipwm5f5kdqxgiyiyzmzyxf8rbfwl9ir90k84fq8"; -"efbox.source-1.0"="0fcrnrfk6yrdhj25xmchlaimc5qqyhri287b9pwdwsxlr58wgx9c"; -"egplot-1.02a"="06i2jh1srww8111c2axcwn2lcs7lwdgp7npn2qpi2x7g38i2kkzv"; -"egplot.doc-1.02a"="1silqbylbkxfyzacmyvc3kf8g3md8931ax1s877p5x5zi0vpwbz5"; -"egplot.source-1.02a"="0qsyqhmx0gcl13hlhbia9rq82kkkhc6mhmzp56g9b62qy2wl1ss8"; -"ehhline-1.1"="11db4dh948g744bynf1ydlg6jk562picrzfbh5pszxvfdag91kar"; -"ehhline.doc-1.1"="18jr25hnp8hg3dbjgf16cskdhm6kx9nxliiggqixb7c1ii6mmn2v"; -"einfart-58414"="03a8c7b2nd4mpcipvnvv13f6prji5kd0382f57hkyliyn4ak9dmb"; -"einfart.doc-58414"="09c3a1wri0li7fzxxaj30hzxypn9rn3xlb03cy5vzwis0ga5rrly"; -"minimalist-58395"="0pqhsxvnjmlaciavxnj6z8na259w3ibbbcjk8binb977i3g5rcyf"; -"minimalist.doc-58395"="10yk6v8603ssficdjhl0hky6wcyisimjymggi0cjb2gfvzsn9faq"; -"elegantbook-3.11"="0hw23xwfgc6wvrqks0sws2aczpzi988i9i5drv9cngnlrj0wi2qr"; -"elegantbook.doc-3.11"="0imczlqh7rwd37vrv3dbhds2bvl7526ba2fhvggld9srsymciswj"; -"elegantnote-2.30"="0wdhwn4c1brqalghyj2mlpvn32kln9rck1nai16inihq41zqnz1m"; -"elegantnote.doc-2.30"="1byqlpjxz53c29sdc48073agpy9pg88yfbhvp0wf4fp7l9jl2m0l"; -"elegantpaper-0.09"="15mi33d8ml27axgkfqdvddwa6hyg02w4bqyd5wnsvai9fisigivd"; -"elegantpaper.doc-0.09"="140mrxwr89gkdswizwrgn0dirq0lm3gf5vvrwr5f7p961swqzk6h"; -"elements-0.3"="13hcg8vysd5ljbkpjicxpnvrdc1dg1c2vcf8lz1m7x25g2sgwq1x"; -"elements.doc-0.3"="1fp0jjgyd5f46pxs80wnz550jg6vv0dmpr45zn87anbq8mkxzcyi"; -"ellipsis-1.8"="1zbasvm792cghiji6gkg27ixjx7ms46rgqbi3wphpm9dix9296ap"; -"ellipsis.doc-1.8"="1w9hp2k4qvhg5275iq5kq79ws5z6i7jb1536h0qrznm0lkw33c4y"; -"ellipsis.source-1.8"="1z8f3x734nc364gybhslxzvvv4502a29dmb4nlz39hm0kzgqq3h9"; -"elmath-1.2"="04vacr9c71nmrbq6hnhpcgk8g75jzdvwf6z513mqabr9d0gf84l5"; -"elmath.doc-1.2"="1da0lrbzy598yy9jisjq0yk2qfjfiqpj32l1v63l3x7dff6yi4dn"; -"elmath.source-1.2"="19q44k909mkxrwsqx4zvraa8cv8jbq8z46xnm53agk0jr94bpiqk"; -"elpres-0.8"="17iqfpd37yhal9mwz6rwws4v8cdkv91iali8jxcjbg4xsxnsv6pg"; -"elpres.doc-0.8"="16ca64sw810if3vx2a2vcpnl9yilav2k8czbh5bmv8wb2ys9yg3l"; -"elzcards-1.60"="14vd8vnnss12flbszsg8357831r986pk7hhpcwqln53r6x5kd543"; -"elzcards.doc-1.60"="084zcf7dqig379cqc6ahiqkm8f5jwqgiizd6h5ki28pcbshi49rr"; -"elzcards.source-1.60"="1ipavy4km50d8larywyb63dldmawawzfw3x6m5nzvi70zkx1f6rw"; -"emarks-1.0"="1qf1qrbw2fsxc137g8dfsx1c202ylvg2ijdwcmxq1fv1pd2zjjwz"; -"emarks.doc-1.0"="00fkdarm7i16vlmjzvjpkyp5v4mbdc6isv12g07shx3nz5v4zgp5"; -"emarks.source-1.0"="1lznlfqhcwd3r8dp4cix5jav3dq63v4wspr1ks3pm0bkycy8wr5a"; -"embedall-2.0"="1078qszq99jdcy2vsaxmg1fbnr9fdbd32y5lyxl4bwl0ja62m459"; -"embedall.doc-2.0"="1c17d4bpzxws6j9z5p7x97zfggyzyadfjygbhi7ykfiy55qywhdd"; -"embedall.source-2.0"="02vdmjb6vqvqmfq7fhn5gb09x2lzpmrfhx6dspv33wmwzv99kzr0"; -"embedfile-2.11"="050xldq8z85rq6ma1bk2acnirnfbjn8yx3v3x1s2sz3qilcxmdha"; -"embedfile.doc-2.11"="0mmq1yrhfjhbna9g8cpywrz76jhv34mrxhrgnwvwlhac2krs7w4d"; -"embedfile.source-2.11"="1dshj04gn4krv7fvbi5yxbirc0di5v326hn6ij19pcmjj9afj29v"; -"embrac-0.9a"="0n2ll7mxgw228qb3j0x111yyiaa4ikq4797g5k8xyakjmv0w3sv0"; -"embrac.doc-0.9a"="1lqapcz7iv8z7df7cyddg6ylh2b61ndgbfhnfa8abzgsqz1h8sjy"; -"emptypage-1.2"="10h1mlhk0841wgc70hp51jnah14si7rf2mwpkp8lfc1xr7jwwvi8"; -"emptypage.doc-1.2"="00l43lhrr246hiwa717b72rc4ignqd3kljkw6ka3l8z1nzbcbni6"; -"emptypage.source-1.2"="16nzgkvl9gqsnhx38dp71c3cz5rrgm73n99g2vg7rapg0vb623xi"; -"emulateapj-28469"="11yv57sv6ys3g8h2ix5xjnjrbnyfvcma4i7vzdsj160rzi12n06v"; -"emulateapj.doc-28469"="15zm7jqpk917l1r2qfkqdkbsxa2q7w4640h9115v4jis0zwgj0s9"; -"endfloat-2.7"="1vqy4ii3dz79ffpjc5n234z9v0lqpkq93vla0lbq0791h71gv53d"; -"endfloat.doc-2.7"="0y3hkihs6pc0g835nk21qj8v3g27f6rrvadwmvqkhchvgh02bwnl"; -"endfloat.source-2.7"="0mdr1ga2p1ikbcs0zzznb1c89n8shrha87qm49sgzbj4d0f2gdbx"; -"endheads-1.6"="15dkd3ky14phrc9cndisa88vbmcp48wly8l27k4wvbbd0221rxwr"; -"endheads.doc-1.6"="0yp1rm4ly2005mw488yscrgc0y8awsis83wwcfh3qh8rcgm8jzhy"; -"endheads.source-1.6"="0578fyav3h5wz40c12r3rqzbsba7vqvk0r5jlw6wymk2m9n9n5np"; -"endnotes-53319"="0hm5mwxdvxhj9v51y88g6mm5fs9p2kaksmhps032cbc1inn5asj6"; -"endnotes.doc-53319"="0354v4klgz5yn1v9hkk3zpvv3x1l4b6jzla7iwxpnk9qb0bvfh4g"; -"endnotes-hy-54758"="194n7n7xcjpsxijzsjpgsxrpshilki0ixkwlbn6hxd92jjq7amz7"; -"endnotes-hy.doc-54758"="1mj4lfvn86676s3sv0v3hx07cjb4mm3j3i3swwzxg0i48acpch52"; -"endnotes-hy.source-54758"="1qhf4zzhk7kf0wcpacl82przkcf7g8z6jwirrzlwd39876jmhbwk"; -"engpron-2"="1jxk1j23v2c2ffqp9x948gkjkqvifp9lhd1wlp2nhmr4k0k3pgmq"; -"engpron.doc-2"="1j580xz1jgw088xah57zv8mrn3wgm6xipj1jf3c0rxyd3fkkk29v"; -"engpron.source-2"="0gg46lfqprs6jr2dgpa1c882wz9k8jjzrs281npy8hk4hhqgrg0y"; -"engrec-1.1"="18qzqg4i4f2dcpqdw4zs9lk8cxlxxn01wbh8a275wiaqj5fi7hzn"; -"engrec.doc-1.1"="038a925h1047a8wnwm54mmyq12332waxx8nbrg9m3pacr45hwmgy"; -"engrec.source-1.1"="0x32a3cgh7pidln750qbwxl7bkzcjwj4brxbqmhyfydnhzw1xzar"; -"enotez-0.10c"="16qlbi1s3sa8m1zmns78n2hv05f3qm93xhcmagix2aya7srifv4k"; -"enotez.doc-0.10c"="1iygaqm1gdiyk6s786nby1ahwc0rgaps2b1h4b141gdczm03dyn8"; -"enumitem-3.9"="0hp6sk3i0a1jwwvlr0lk4w75fc57c2fvqw9x5ir8db049380ixyp"; -"enumitem.doc-3.9"="1byxv6d9g38fhd83f4g23yqha8nvr5iv6lv97w40jn58i492dyrq"; -"enumitem-zref-1.8"="1isvqbp7wvib81r0yn7sngxa2dygkfm4jn4rdvw0kp8rknam91qh"; -"enumitem-zref.doc-1.8"="12ffsw4mzwg8gnw264kvc9gpxcmrhda5pwfyml2ih50g1dj6fwv0"; -"enumitem-zref.source-1.8"="02y3rlxcsdmafy4n4iiaz2j3syg5x7bzwzfvfk87xxg0n3bvahl6"; -"envbig-15878"="1szn3ngy2iwzbc9y5fpchr5vpx5alr908q8bfg94lylmb8lx2kb2"; -"envbig.doc-15878"="1y778gc6wl11afjjv2szypc8jf1g7gg2s0lvhv2skl1n3wpb3x7a"; -"envlab-1.2"="0q84vy7zbjqrrvy0r2j2hpbg9b5vwbwk860q24azms2zxy50a8vd"; -"envlab.doc-1.2"="16fnyfvvixp6lfgvz32w92q35s21c92556qxbgpcd94fd1pw2bki"; -"envlab.source-1.2"="1fygp7wpyzhzh070sa61qk17h05rqr4m1wqp78vpp0awgkmdji56"; -"epigraph-1.5e"="1lb4wzjcag59dcfvizvng9s47v3x2af6v62hc1x3ck3fqzx9haa4"; -"epigraph.doc-1.5e"="1h13sgi2bxknx2m5kxxlv9p4fxf1pxh1zdwm98h3kamzb4a4gm81"; -"epigraph.source-1.5e"="0kqfrmx732m0a6k21iiq1ar47ff50ri3f5wy8ib6ssbbvd9agx4l"; -"epigraph-keys-1.0"="0p4m2z9v0ckjncy5mpfs85nzpzzi9lx30a4dh6rjkhgmnk574n6m"; -"epigraph-keys.doc-1.0"="0gd3mcw13r3245dmd3fsgyww30f4anwff6vj14xsy75zcs9k0ywy"; -"epiolmec-15878"="0wn2pi3n9ls945i4v3x36kgg34sqhi1x4az5gq6lbvviin4lnrvf"; -"epiolmec.doc-15878"="1j9n7g9z2wbbq04wh2x0cxx7m4zggh1scblwrx9g69sd8r0b7582"; -"epiolmec.source-15878"="0qairwq1jfl5jrkrwlblmsc9gb34wpanz61zmsawz94yf3plwxxs"; -"eq-pin2corr-1.0"="10g0hf98f9mrp9k918nra9yvr8jrp2kbj78rn51cr5kgar17q1ji"; -"eq-pin2corr.doc-1.0"="0rzl206gg2h63rmdxyix4x0k3k21fn2bd7gp21ys757vd4q53jdz"; -"eq-pin2corr.source-1.0"="036ff4gi94g0a2qkww32dw4j3cq9gz05ah44n6pv550p8b9ssfy3"; -"eqell-22931"="0i0n1vb43vq2axghik3sbs2cja2fi78jl0q5xcrkbn5gr6vi49md"; -"eqell.doc-22931"="044bm3jyll74jrxh8va8g38shjn3b7wzchjq39n4rjp3238wirsm"; -"eqlist-2.1"="1cxas8g683y4i22rdakgji1r282mivmnap2l0b80rv3adg3ccvrl"; -"eqlist.doc-2.1"="11lbz2s5v35w13vvcf2bs4y59hsdd0haai1244jqswyfxgamybgg"; -"eqlist.source-2.1"="1lw20i1iqb0lxqpv2g7dw62ff4xd8w8k4y2ccpqmsb987sk223d0"; -"eqnalign-1.0a"="0214pwf689rj7ycjzrafkhpj1rrn74h043vryihyscci03lf46fs"; -"eqnalign.doc-1.0a"="128yh629nnxn2ca799s9zxbvbp0zam1lrz8nciinfbb10m8igwv9"; -"eqnalign.source-1.0a"="0pdzvs4hyyxr229jlcw7766qd4npasc676hf74nx0msxwm5iq2yr"; -"eqname-20678"="1qryjgmn2cw2indmmybgzrcrakqi6a3crvdcyvj769mciz8lsdwy"; -"eqparbox-4.1"="1bg49m7nzw20g2g51g07d7sgq0sjiisrbaq4ca31qbybr2rxcp12"; -"eqparbox.doc-4.1"="0z86nwj06zn55gk32wwlxbqfb12a1fcgqizrpagm7yp0xr99b8wm"; -"eqparbox.source-4.1"="1ny9mcnb76yds4l7q35wdm0x2vzia80aaqr12idybkzi75a7b2yp"; -"errata-0.3"="0hp8pls350swslim7m3cpnw23v94vnqj9avfvx9hq0bgl99szc5c"; -"errata.doc-0.3"="0h30iip57km31074cya5fyhlmyamix8anpk19rqbsfb43h3988g8"; -"errata.source-0.3"="00bdq20dwwmq0nw3c271ah0bclzkzkwbr5ak4y9asnab1g6fl5yw"; -"erw-l3-3.1"="1103f0mwhjwq575fg099v1xsqmm3jg0rfgmz7d8xqpjjy3y6g7gd"; -"erw-l3.doc-3.1"="0zhbp441kw9h9xmhfvzxkzisx4kzq3ba4jgkkdrlnd6zxl82fdgm"; -"erw-l3.source-3.1"="1yhz5jmbapzjr5xk27pqjs6y1cg0civ78gzz8h0g6klp4jjgsigx"; -"esami-2.5"="1qc8vwxmbhppzpvqbnf7c7163jhhw7fqva423f3yr0nmhhzdkj9d"; -"esami.doc-2.5"="1i7qdy6q824hb5nl21d5j5p91ll7ki5x47w5l8lr3cch81mkwxqi"; -"esdiff-1.2"="0p5d89r6pzsf0hzaky89843pa4z2n4dgq3yg8li4gb5m2b4fjfkg"; -"esdiff.doc-1.2"="0jw4rhkshni47zdk18b3gd4amyhh6v9a1mgja58wmp2vrwv1nn2f"; -"esdiff.source-1.2"="0iwkbkmkl31wmdrd1wapd94p70mwd45lqld3b7pfb0j287nzkzl6"; -"esindex-1.7"="1vxdlbqc3j33gdvy04pifd0cdfvnjwmpqbmz305g79733hvlbw55"; -"esindex.doc-1.7"="059y8wnnzqn1kfy5jhbpk8zi4lgx7r5s6xg6b7x3iih1ccdyhwma"; -"esint-1.2d"="1i9bmx7sk3fzzdb1ny4a9b3sq9mjjk2x78gk18y77rxq16d2bjnr"; -"esint.doc-1.2d"="1sdklwvw46yj8xbli4yl6qqp5jdm9a32fkspk72p5186swwkwnc9"; -"esint.source-1.2d"="0j4ms51a3qzk7mrc9vh5psk83jxnlh5xa8vq36y9iihha0d6rz6x"; -"esint-type1-15878"="0nfvka430084h72w0gdlvbxxlay9lp5z76bckmr5vd1vqi4jz8kn"; -"esint-type1.doc-15878"="0lp2hc76adxdl44nn4g8hb19cflndzg9ir004di3wggh6s2yx40a"; -"etaremune-1.2"="1l3xz9zh5f3wj3v3mvq9xk4q6vc7k01pq3ivsvm0qlkni4bffyja"; -"etaremune.doc-1.2"="16v4vsd7dzihnx72bdz99994kpw6r5im659hm51w5wyh8gf8mp29"; -"etaremune.source-1.2"="18rcvjpyks01d6qkq61rmngmwwyxksh4i5dmnvq8ihx4vj3zlgqx"; -"etextools-3.1415926"="04x0a0wy3avac8cgjgq7npiy06b0vrkxa0hizpn4vkzv7xbq79yd"; -"etextools.doc-3.1415926"="0z04a5f4c1xygqsgkss4bh0s41aqv0i61sh6x9h0isrqlhbvrzs5"; -"etextools.source-3.1415926"="1f0jr38lbsrdjxhihxks57y6xw37ghgmydcq48ll14nywx07qa2l"; -"etoc-1.09c"="17bqav13vx2jlp31qwv7nh5sp4ga8spwm6x48vxqh4zwwc9fkyrq"; -"etoc.doc-1.09c"="0jngh1s0b2iz1xizbidd5wlwcidyda9r5filn3qflcxkh3mhkms1"; -"etoc.source-1.09c"="0j55yrbaswhmjixjmkj3pb652w34nh6pjgdm484a9s2337399rld"; -"eukdate-1.04"="17r61096angayvbdi9r3d7ljb1a5z9q9r093kpgdsi11ahcgsr26"; -"eukdate.doc-1.04"="0071bi5m6v5ak6g5pxjxzq5y5353mpdjx4f2dbznkmfd23wp8j7d"; -"eukdate.source-1.04"="1p6vg8nj8qipj59jwvp4izf2dv0l8490773h6j87wlclnnnlh2gq"; -"eulerpx-0.2.1"="04lcc883va515zqv2ql7wwffr352qrlg585q2p0i6hkdwhc3s4lv"; -"eulerpx.doc-0.2.1"="192dagl43ni38591fky5ywird1vlphqzw6iakj24awffnxi3sm8v"; -"europasscv-56829"="06vqrnfzcq04mjk38q75n1k1dw3ap7z5xnzpjmgss8rl6mjn4v3d"; -"europasscv.doc-56829"="032298ir415l36gakqalg5n1nk70c47xbm2svvg1ygb32sgn4afp"; -"europecv-57641"="16mdycdlk7nvb5g1mpz0lz4vcf0g117sifivr4bz9aqmnsfsw242"; -"europecv.doc-57641"="0f98qm36flvns48z6cn0v7n0fiqcwb6ji4gvr31xhbgf697kzs25"; -"everypage-2.0b"="1i8fjcbk3flywzd55y0cbsdmzymvkynvgc5cvv6yh5y6nr514rjd"; -"everypage.doc-2.0b"="13drphjv7gzgdzzwd6fxlngm2rprhls60gj4lz1v69sqifymnn4h"; -"everypage.source-2.0b"="0vdi8yd0r33ajnym0f3j42ajkc2xs8b5yn3kmklmgx19kpc93ln5"; -"exam-2.7"="1ybbxy46wn1xz4b6vd6g7y01ijl8a5yrgc6v48jilnhwdh25yklg"; -"exam.doc-2.7"="0lva2zbslf01bsd0jz8k1k0xqmbf1jxjsqridayv9pq0ysn2m97a"; -"exam-n-1.1.4"="01yw3s29jkvrcaa8krhdyf4k53kmlx4mb5x2p933jm73whvlmwqa"; -"exam-n.doc-1.1.4"="134d4g914gw2gll8x78z06is7lhihxcxyp94jf3mpkn569m608jb"; -"exam-n.source-1.1.4"="1qd2gaq55rz3x69lidf4lyifq2m9nzizly0wqg3y9wygb7xs8sc6"; -"exam-randomizechoices-0.1"="1cj863bz3sh9xz6g0kpi0131z2zf302vrzjfhsj02d903zh0f2nm"; -"exam-randomizechoices.doc-0.1"="0bsdysbdy8ghmirwxagfgfp46aqqk6pqmwhmm0pkllb2vmf961sw"; -"examdesign-1.101"="0y9kqiihidv24553zlijr6fspbayvram1mqgy9kmd1wwskvbza3w"; -"examdesign.doc-1.101"="0ddgn0f086qdsyssg4gm6ynlcnnsd16qpvn2g3wzija7ai5sqkig"; -"examdesign.source-1.101"="0z5539hv1li9vw0d3jx7q9s844f29wi9xr5z30hvzl3721rnkvzg"; -"example-33398"="06ld0b9gi8s7y6igijylfvj2qvj3d45z2ml9wd1zfzkpf32pghmy"; -"examplep-0.04"="1a3pdaqzc9jx2yf66vmjg9r4w07b8afyqijl21np6sf7rrsn7zg8"; -"examplep.doc-0.04"="06jqa848zzswd5pbfrvr9lh3i4l5h8wf3v9g179g3q2yb4dmvjwv"; -"exceltex-0.5.1"="1075b0wm708wj537pgki1hvj58l0pfrdiglalbjnk3gmf18rk22d"; -"exceltex.doc-0.5.1"="1s48mcj49j9jm8vs5nhvljb972vhfng09xvd6kiw01a7i4zpw3h1"; -"excludeonly-1.0"="0zfml40br991mijcmplxlff2lzkn8fdgwgxcam7vnr23kag7lzxm"; -"excludeonly.doc-1.0"="0argzz7nwadm11qp642r454w8p0swyhvscic71fhwi47n69cfbgz"; -"exercise-1.6"="18f7mgc2lmm1lg13dm858nqsqzga52sw0r6zlz7f0pv5hpc0mgak"; -"exercise.doc-1.6"="1y50izz1z2s52knqn9a1jianq36isyafviv0yxqqx6zdfckqca0p"; -"exercise.source-1.6"="0lpslsk9a7dx5xzr5iif1prvrn399j70wfcqhgbypz970zzpril7"; -"exercisebank-0.3.0"="1algypm3nhkbccd9k1w5qr6y75hqiinw5dj1h4fbmripmhdwircs"; -"exercisebank.doc-0.3.0"="0szpxkmx8qi3zpcrjzd1nzn7jcp30wf9nv8rp77x7rd2yd0sw0dy"; -"exercisepoints-1.2.3"="0vr2yxqx2ng1f9qybapz61146lvsniv6mjwl1yfxk10qyvdw3pnv"; -"exercisepoints.doc-1.2.3"="17kz9fyd7cc4pa4j6dsm8h5zpwfr68wg3ndbswgh2pgwwvf63777"; -"exercises-1.1"="1yvdj03hr40732swfsg2br9f4wx9855n7a3whlqjdnczp6545lvi"; -"exercises.doc-1.1"="137g1gvwfxm3gid5xvikrqk0iw75csrkqgrwmh0hda28dd4zbdwg"; -"exercises.source-1.1"="1lryxm36phhp7p269zzf9a200k9k0v8zw8qyqvyk784vmvyilv7z"; -"exesheet-1.0"="0mhdvkhyk80ikdw1j11yvghhb8pgja78yjxsh3savf39grnnw7vs"; -"exesheet.doc-1.0"="130pczqsc1a0awy7yi0yy2wk9467nr762j9my6f1w0qi7vb5i8dg"; -"exesheet.source-1.0"="0x8ydqs3xgg8zzh30bbmz9yj7h7q6jb6xvic8lp309kd72vhk0cb"; -"exframe-3.4"="0sc11jk94l0nmjjd69k6nl7j68szdkihim194pdxlyiybwqf9bbh"; -"exframe.doc-3.4"="02s61k5lpjw121cyxkkhlbm5d6wv0gl009abkjbidpgxbnd5yl4z"; -"exframe.source-3.4"="19y20l5g814cvn9z0axpkynxp0vwkay782dmn05g6a6qzjb49i0j"; -"exp-testopt-0.3"="0g7q4ccfamsd7sr7wb0qsw74dnwiyz0rjrniaxm5jvgaadiinc7q"; -"exp-testopt.doc-0.3"="18i2ym0da8vp3xxy5q2gaykvja3dga4l64q9zjxknkm50vj6dj23"; -"exp-testopt.source-0.3"="1xfp15q94icdq773ivdvk4n47i2k3g3y9smdvmxw5m9f35nayypl"; -"expdlist-2.4"="09yhcdbx3n7gj3g2v2yh4navgdf5ik4x281h51kd1lzdzbbnf3aa"; -"expdlist.doc-2.4"="1qgwn2ignri6wh67wwjsqpbk28jch01m8fn0nw6lpc6kfa4a9g6v"; -"expdlist.source-2.4"="1m8dww4i5w0hivs904v8ls1dhs35vp3qpbb44ihwha0zsbvghabk"; -"export-1.8"="0la9v2m3n15hgds8mmp1c56dz0a7iqygjk2qnd99n5924n187wyd"; -"export.doc-1.8"="0ipbs7rdwjp6jrr4drgcs73mc8fy6bav24qfda1an7byglgcf2nm"; -"export.source-1.8"="1q3xbj3zicbizadihwb6b75c4d95b6wq0adi45wbqf6hzj05bd5x"; -"exsheets-0.21k"="1ymcfy9i2ll048sc0gyljcbwa06m9q0g6nxp3csvk4a367wv9cxa"; -"exsheets.doc-0.21k"="1l3ln3xkniyfgmhrs37rixszacsvalwq78fyh72v8ca61krxd35q"; -"exsol-1.4"="1jlkz4c29bn3wrzlbyxzz9jl7f6iiyvz89r5r2cvnlhfai83lk6c"; -"exsol.doc-1.4"="1z663c69w62v8fcm25ikaw58q3kxrh2mh357zjhgi8ki72wjwja3"; -"exsol.source-1.4"="1ja9w1k43v1yjfa1jhbzghdqha6i19lc6hsgsncr0zjm4ky104w9"; -"extract-1.9a"="0yfxyzmicqczvn6pc7ykakpm2hjsrsb243n1bs0crjsvacw29hb2"; -"extract.doc-1.9a"="0lkljkwf22vq88nj21ca023ysa0hmgcsh7a0xhk210ba01a9433f"; -"extract.source-1.9a"="1h06ji378l32a18nbf2plhk4q3vzihc541d0wkw80ik53m0frn0k"; -"facsimile-1.0"="0mfzqrn76b2nhz60rqjdr55s6i9fzw96ya74nncvdjjcvaqpjrjk"; -"facsimile.doc-1.0"="1i3vv6a8r1mmkmpjwr66r0isha7s5ksp5cwgx3rj9sl3wfnywsfz"; -"facsimile.source-1.0"="0icxnmiwmrjsp1lhhdkcgsjif1s396lkdxp73vz59afzhwdm6l0b"; -"factura-4.00"="1jlql1yfkcrsbfbgjdwhaz8rjcmm1d64z0na93ycgldv7k8q87ly"; -"factura.doc-4.00"="0cw8gkcacf93xhj58j8zxnf6xn8cp27z98jlhdha3kic4k2w79q9"; -"factura.source-4.00"="1gzhz8ighvggbybjcvcnbnk79j679i1vjqizwdvbky1qpykgiz96"; -"fancyhandout-46411"="0fgyvrww1h79bvwf77h83p2lwff5b564gk8cjjnkp26zjpphah22"; -"fancyhandout.doc-46411"="0r5wzyw7z8gsm2k1y06h9gj5cfxnclawicxdjpq50dnb6233ac08"; -"fancylabel-1.1"="0fyrhiknwb658rg4lkdkfb221yrvzfs5g2rmxfas69p6aambyv36"; -"fancylabel.doc-1.1"="0fpxag39xa2piybkb19fldg3ykwb26sg700jp8hy6kgb8afp4hrw"; -"fancylabel.source-1.1"="13hx2k4i8ji3a9kxd8j2j177l4d5asz79r9v707d8i8vkxcm1ild"; -"fancynum-0.92"="0vfis38yawys70hv4vrrnyy820dj89dqp38jbg199pbb8y0qf1kc"; -"fancynum.doc-0.92"="01f7d3him9gcm7p8567ljamwrg2jl25xs7w6jm05l89dkcb34fdh"; -"fancynum.source-0.92"="0cfm5da0gk4y8plad5khzhf9gjyayxmca67qpvdj296p86xxdi32"; -"fancypar-1.2"="0d0yl486lw3lwk5p893s91z954065j0yjx23a3na1j9ngw1lbijs"; -"fancypar.doc-1.2"="012m4rrp9j89ahkm4nh40kn6xfd9rxqsyyf5kpf0n5yii9yb2qwj"; -"fancypar.source-1.2"="0rbzph490cfwybjdqndnm7xdgb1ffbciv9pxs21wbvgvyh1cc9gd"; -"fancyslides-1.0"="0hfa5jklvybgx9rji032rdmyh2qr63fkyanvvs0jmg1bkpqw7s03"; -"fancyslides.doc-1.0"="0nqqvkv9gsl3jp22rjkxrzklpz6dfmm3wy3mc9f15jv9iy2zlrr9"; -"fancytabs-1.9"="0yxr24fnjabfzhyvfj7nhn26cc7hi08byw7zzmky3nnynxnxc2p6"; -"fancytabs.doc-1.9"="0f9b7rvnz5syq5dghj426k9ypppjg4q9wzs8v3jl8af94xy7zrig"; -"fancytabs.source-1.9"="10p8hb18qrwp2dxsjybrawnlryl97k854l11c0327r39qiya61ns"; -"fancytooltips-1.8"="18hygq6ks8pihlamr1pyvmsrbsl8wa0kx2qy8san53hd450lqn0y"; -"fancytooltips.doc-1.8"="0q28xlckjlm231r14ysl05ic3kb6aa5qnwv9x0qj3iz3lmyfq9zs"; -"fancytooltips.source-1.8"="0nhmjrivw8a2xhblhxnjbyvmz4hp68sjxnnfzmqyrf1agjgwz8m0"; -"fbox-0.05"="18974iy4qh17kmhzjrbnzm208y5wv4bq7aq9l4cdqnvzacnkad0i"; -"fbox.doc-0.05"="1m81a4n1ar5k5rpsjfbmqnwd2mnrhidl4bfgd8jmmlxnsfd59q4q"; -"fcolumn-1.3"="19in9l9wg7wb454ffmfhnmhrchf2m5fbw0kzk637k4bb5w8c48xs"; -"fcolumn.doc-1.3"="1fqgwd0lw8g1w0bifz6wdl6mx4378phzdpr5xbinzflmzzj2s700"; -"fcolumn.source-1.3"="156wmyx2i9fgvzfc9b9h3xxfii6jda2q7rhjqpbcqb650q3nfy6v"; -"fetchcls-1.0"="1pccfz68chmnbfi9qnrmdnyq5kvkq6ir5dl09jqbjlcw7hw82ka0"; -"fetchcls.doc-1.0"="0if19dgb2k75qhyka4jiijnl3msk8y8kj0fzhriarsicivwd47ds"; -"fetchcls.source-1.0"="1qb9ymkvbxmxlpcs3drcyk02bc372s0vhw6wwpig2bchb1hwdl44"; -"fewerfloatpages-1.0b"="04903zr0lk50i88vywpbzpg908zkmy0w8vcfks55cmbfb2ja37qd"; -"fewerfloatpages.doc-1.0b"="16hb3xm2aszwlagzq9w3bi2hyanbss3s4f09sypg07dkilifdnv8"; -"fewerfloatpages.source-1.0b"="17rcaydy16vqnlgn76ijhjlv2jcnw962wrsssca8z8y6dfvy0aqs"; -"ffslides-38895"="1mpfpawdhh16rl6pnvxnkj95gf9hjs49gj7cwfyngmqkjc2idi8j"; -"ffslides.doc-38895"="0z5kpim798zxj20p70dpcgmwg4vx9mb0zrmq620sprxxdr2gd059"; -"fgruler-1.3"="0cicjknd9djh0csq1s7fx90a91yx4q25nllsyamsmp8br2c5rsyb"; -"fgruler.doc-1.3"="16lgfpapgn487yilf94lg029mcc0xqgyc2jv928fbwvs3lwgsc95"; -"fgruler.source-1.3"="1xg8zr5rjcmyz9qh9q7pd1scrxk2ld7gyrq86p9nfhn4nfcgybb4"; -"fibeamer-1.1.8"="06gb540hvfywk1y4n6apcxn4890ya7jvc5pvjdr57896pqrs3sdw"; -"fibeamer.doc-1.1.8"="1rili08dmdl4h093m7x281hzb7g3218qsq5llc0a012ak738r4pp"; -"fibeamer.source-1.1.8"="00qzawg66pm81f3w9ick6asab9nh7axmgbpc0ckdlj89bcziqpzg"; -"fifo-stack-1.0"="14d714q6mzpag5rcn2b2454pad3mpvdz6ii8k7jdvx74ay24zphv"; -"fifo-stack.doc-1.0"="0pgvcyss7h1mynawdhpm8xid0albf5cajhz423ygz3ifi2dfrasx"; -"fifo-stack.source-1.0"="03hkqd4s9dm2h10i8pw3a6qgrjskiyhnkp4wh9r55l60wnqm80bc"; -"figsize-0.1"="1hb2fck0pz1gz6vm0ffpzn3vcm7lclagsi599bi2f2bc9ly2372p"; -"figsize.doc-0.1"="1zdncnl8nmkazvqjyamzgj1x1f5fm3kyw5m5fi669rk9dqhsiq69"; -"filecontents-1.5"="062jaqszh5fr1pjrl2hms9yngcr9xwhkfn9if53kb3wal1dn4x48"; -"filecontents.doc-1.5"="0i3fjb81chwiz6msm1k0frkfaqqcla49xhg1xq0z617y3rb59pgg"; -"filecontents.source-1.5"="1zryw6mx9vmikba8za8981h3nnx4gbbb2g3m6lm3cws0ak1h5jwy"; -"filecontentsdef-1.5"="0lrdmz5fnmrlzga1w2hr3ksydnz52lmqlnnmix7xrcp81qv9xmx0"; -"filecontentsdef.doc-1.5"="1nxb4wm4wd223f9wn7x8j805ybximrk0v6n1l56xysz4k30jxcba"; -"filecontentsdef.source-1.5"="0n7zq8plqn1yki6azmncgdlg2lxcprfpdq5dv0qnxvpvw5dawdvp"; -"filedate-29529"="03fwpi529pp6bqwr37ns8nas236nhh7nm592rpjyrvlyv1w30ifp"; -"filedate.doc-29529"="1dywknjhl2p9590nvcpg1vi8r0iaj52dv7sn8c2y8337w37c6ny9"; -"filedate.source-29529"="0fwqs6wqw93ih2icg9b5zxgya1zbaj2sn0jd3dc8b8dm59cwggk1"; -"fileinfo-0.81a"="0x922migfx9y1nqqs9lv4ygk3cvqj88a92cj1kb9xkgykp8c6cqx"; -"fileinfo.doc-0.81a"="0rw1pdrqghgdwzyfrc0y44cj1989lrvpab4n42qxbbb9srhmary4"; -"fileinfo.source-0.81a"="0kssla41sryd278w12syrhsi5aalld94vjcmddldcc0l8l71sz5f"; -"filemod-1.2"="05lipahmxgd7cy76rz1j3p2z4k31gj4q7ihvb0zbi44g4n26hz6v"; -"filemod.doc-1.2"="138481q84a436a9ns587qcmmsv7p9fb5wzz1gwla25jigx8fb4fr"; -"fink-2.2.1"="1pk9qp2cbc1yagrgnjz6rnldn6zgcb6bw3vi452ks4fwic4pgwz8"; -"fink.doc-2.2.1"="19fnaw32vgjpj991n5nlb0hwac92kmny3zc483wffbhbca1nkdck"; -"fink.source-2.2.1"="1dm06hhp311xjfjjjpw66hmm52yivjhgkpwpif25cvq1z8dfgw2h"; -"finstrut-0.5"="148pca47nggxv9dyg5n0p40ri1mqz5chj4ir49472w62c8zh83fk"; -"finstrut.doc-0.5"="1jrxyksw0bldvf5faykbpcngjfx06y83q81rs3k3m6vldm3rw23d"; -"finstrut.source-0.5"="179640qn5swml0wrc1glvbf94ia5y6s1qlyf3hf2vmr3vih7k2mh"; -"fithesis-0.3.51"="0f57kk9w709j938sndpjaqqkk4ma41c3mhr7cxw9hyabis41n92k"; -"fithesis.doc-0.3.51"="1jxhk1jv5v328zqvcnzl1hhlv6izx5cirs2knl9qv21mz3fwk6v4"; -"fithesis.source-0.3.51"="1iin58ilwrdvirarh53wdawd6zwc5pas5p5p67vgy83qf39cf214"; -"fixcmex-1.1"="063a2mwh75mdbh8syvrdldb7cj4iyvqkbkda4jm6cq3nwbq9kly0"; -"fixcmex.doc-1.1"="1c9q5srhfil0wnk84k072ridssgwbmzpskk6pwpaq8id36dydvlm"; -"fixcmex.source-1.1"="1h3xrdz9anb2cxr8p175rrcjvaawv80cj3bp9l6bcpli6yb6fdfr"; -"fixfoot-0.3a"="1zszczpwcggczq428ha84g71rvgml2zrx2v74nmk1damcp35pzlv"; -"fixfoot.doc-0.3a"="07zdbq43l9yddc9gi4i2qqpvz0xxmkhxgg3wl329j25p4h58amra"; -"fixme-4.5"="167003w7a4xhy35fj6xm7mx1hvqn1bh1b563sih3adrwyrdnqjbd"; -"fixme.doc-4.5"="03qddrr56q77h8qhrx9kryx1d0cab6lzcngsbmyzaj1g81hvwsxl"; -"fixme.source-4.5"="01rpq9xd8rhy4fz8g1l6354pyibjsl90h591w7l7cz7v0yxldy17"; -"fixmetodonotes-0.2.2"="1pca7qpkqfd8506jcjgr1kwcymbcljzvsq47xlvvly3qzac374vv"; -"fixmetodonotes.doc-0.2.2"="0icin53y7xj0dddsi90n3hkd2wrcpymlyhfllyqfz7ac8y4xn8r2"; -"fixmetodonotes.source-0.2.2"="0aphhsamc6x1k891ybxhnqmhiwh0my9sj90x3w22gp7zhavgrww1"; -"fjodor-53207"="0gnmdc2i49529hniklcyqrfyrkfh83wbv9zmiqngw8hqmdw3zv68"; -"fjodor.doc-53207"="0dag2ial9cx9hnrhxc40nb31jvkv618jklwahgj6ckqfl89410i8"; -"flabels-1.0"="1aawdjmk8rinhjwnkjz67bq7rcp15i15dsbb9xll59nij849ppjg"; -"flabels.doc-1.0"="1yzlhd6c5b9y1r1gy7kvbrxygrkia0cz98p496nj1kdg1wr1xzbl"; -"flabels.source-1.0"="1vyjgbn2kihvzf85fg4fdg0v46nh0flic1amk7k3sdcxirn0fzvb"; -"flacards-0.1.1b"="1k1h06a22jc8wdcxf1066rn4sfgy4m3wh479f4by1zrp773gykzl"; -"flacards.doc-0.1.1b"="11hadqdf0s7zaidaxfhd6lqhl3qf7zkalf9wimi3j3plp8ln5499"; -"flagderiv-0.10"="1rnnj84vl29061hnbayz5sxp6h1civl9c9w2n3b0s56i9kxv3dd6"; -"flagderiv.doc-0.10"="0djwrp2rjyyd0wk0sg55w2l75fwj3gabd6bim1smpvjwsps0fcd0"; -"flagderiv.source-0.10"="1q0g5127vyhkjb1g0v20kd0x3p0b67a9haich1a6yp71iikl1s8p"; -"flashcards-1.0.1"="0jq9xq3i2rsrajmvlxziwijf75np9y6q6rvg1rxk620q3dzghwp4"; -"flashcards.doc-1.0.1"="1cwy5g4rxydlayaw5b68m2qrj1h5l6nzs3h4cawdgh2hdi6zd7li"; -"flashcards.source-1.0.1"="0vkldfg44kyw02zpbc66496yd8zxx68gfh40k0b592hha7ch4y4s"; -"flashmovie-0.4"="01rmqf1rg5vbxzs9wap7m8d19fw73mh3k7min4msbipvg1vqhgi5"; -"flashmovie.doc-0.4"="1lza6mv55da69v8jwjlcd08v5y2gs2s87z5h1hrsp3p3mx3chya1"; -"flipbook-0.2"="15b2nzhpgj6018769ggajya6qmhq9rnyzha0sic9fff24jwdq62x"; -"flipbook.doc-0.2"="0lf04giwsgjq0fsk6wrms4c3dg53v1lq3n0q1ij5pw4390llsqd3"; -"flippdf-2.0b"="114xvv7sv9fhqxgfz5ckydn95mrg4049ml3kg6vjjiwbilmszr2h"; -"flippdf.doc-2.0b"="1fgk3g74arazrmw6swfyq38s5gdw8knnwwf5ij0dl566cwmcfvmj"; -"flippdf.source-2.0b"="0hbw3wgdva8vkic4sz0349mdyx8dpz3k5kk0fn80m0yqpldwgkid"; -"floatflt-1.31"="15v2m2mchki2gcz0fcp3myyr806fqyy77nv9g6rqm11aqp6212bw"; -"floatflt.doc-1.31"="1d7v1m23p47rl9lln02c6bsi5mkqi7c03dhmnjhg8bqp6xfkfmaj"; -"floatflt.source-1.31"="1j53lkr1j3fp5wlb41x2vimncv2l1pc8qm7qy74i0r1xf7kfibzz"; -"floatrow-0.3b"="177knmgpv583xajihdd5q5spaainn8h35kgydq2sfi6ch6cadirh"; -"floatrow.doc-0.3b"="0py5a36gdbsd91679k4chfxy6ykj2wkjqlg4zkp5xsww6fxglskx"; -"floatrow.source-0.3b"="1mpskdqhghmgh7i3425xb985pwrcqcbfw3hlfhbyx3bhwwx5pnqx"; -"flowfram-1.17"="1ccmry6f8danw6jqdsck7pzwjsrh5vcfy99f8kzyqcbbrzl5rn8h"; -"flowfram.doc-1.17"="19rrav68s3wlwgaa4mhgqsdlr1syfpvp4jzc80cygi0fhv2hn7yi"; -"flowfram.source-1.17"="1hrs58xhwawxqd96jb5hjywbfra6az2qkap0p5zap9zkck8ixz81"; -"fmp-15878"="07ml6i8lqcz737fm33g95nx1hz1p0z251h7pgxvvvdmn5dml1l94"; -"fmp.doc-15878"="13i7axi1s8qqgdvdky20dckmsa95q2q54z7cf6zgd0znzjy6d4mp"; -"fmp.source-15878"="1fd8h6dndrc7hphs87y1lfplmkrwgn1pxgmvf00gfhgkg1zf127b"; -"fmtcount-3.07"="11d9pq2cqd1qv20wr5789bzmk0a82j4rf8y9xh4l6nf2nk9p5c3g"; -"fmtcount.doc-3.07"="09ikawga4sg27ch8rvdf9ni0k8b3nk3k84mgydlv4lrg5gb2hv12"; -"fmtcount.source-3.07"="0ijsl21nsx2kkgbcc00bzs637rq3x92ax0xbrdagkfvnrna0bg69"; -"fn2end-1.1"="0cj26s7555q49fi382pbvy65xa0yp0wbihk3y0magblyxjn72wdx"; -"fn2end.doc-1.1"="1kafhgr4c9d4pjpydd27ha1pdbxk364qv8dmcr7k3l7xlv31jv4f"; -"fnbreak-1.30"="10fh7d75a3628jrsbl04g2pc4015nsnrw1gda0ndv8bz603qc01k"; -"fnbreak.doc-1.30"="1vsv8prgd37bj141p0h92wjc7sqxxzw04czbwyk12xzpbg7d7gyp"; -"fnbreak.source-1.30"="1jf28rb0vv2xvp06awiglg4ggk6mzc6pyr1irfgyyniha54gi0ab"; -"fncychap-1.34"="0x3sjslvz1gsrr8607q9r6k8683p9zcz7p0kxvr92j9ls1prl5c4"; -"fncychap.doc-1.34"="0is37brbbdqb1szx3rwgmaqbl8vlqr82sy8svam39yrbnzd9v1k3"; -"fncylab-1.1"="13l9jmcwabifc7m9klgwl2gqypwlizy1mb7glsvp3jslpkhfj267"; -"fncylab.doc-1.1"="11w7z5q433lnzfm4c72697f82yb7rljk9zq41dl5bdb7l9wd7325"; -"fnpara-25607"="0rn4yk1zd4h2r5xhghv7v0ph0raspq4r6mw812hn80bn8rhjjrlq"; -"fnpara.doc-25607"="1w0pkqqgkq379nnqk0wx419z961l3g81ldkh8ivfhn9q5vk04p0s"; -"fnpct-1.0"="1kwfzz1mfk9700rs3hcq0l2px9qcbqlj3wv66v0bgj176g2mpjkp"; -"fnpct.doc-1.0"="1ilj77lbr7qa9wjf1m045grs7334q17xy03q73rf3si3lcdz8mqf"; -"fnumprint-1.1a"="1i04c2j1jnw9qkbv92nd4rr0zzvwwdwwk0ya5f4g4rarvw9h4z5q"; -"fnumprint.doc-1.1a"="1cwc4jv9jxxinradairp45rlr97h52vxghfxin6dwszw51ac8p7n"; -"fnumprint.source-1.1a"="15d3jpxs8zgsj40xipg3mfgir41p46c3ppwh4629a1dv4skxg2nj"; -"foilhtml-1.2"="1qnh70h01ys26spbjcq71zdhq8j7lszinv26v6ikpccsaaxnfdl8"; -"foilhtml.doc-1.2"="09b3lmxzhfa1h7nwjvidq2pd11dkz4aq3l4ciz0xh7gyslfdwvgd"; -"foilhtml.source-1.2"="0zhva600hf43h01n9ycjcjair84y0wzpn00z6ihyh8s6g199g428"; -"fontsetup-1.009"="107sk7dnbfxv564n7xggi3m7qyzv9vlpn4knnsimra6dcnk8zlp6"; -"fontsetup.doc-1.009"="04b6rzah9vcaixl88ybgx99fqiiw1kb2wcdl1lqm03f3vmfxa4d9"; -"fontsize-0.8.1"="08c2zgkicn7i82q2y9m0pv6ld103yjhq6vw2yvldivayjgzrkzs6"; -"fontsize.doc-0.8.1"="161ccr3rpjgdax47bl4lspn13ivzg8jl0qjn54b3srcjj3cwzrhf"; -"fontsize.source-0.8.1"="0yp7j3480ka17kqadfkvhjmwmxrqzgzaz88qfya8b81b4b19xhwf"; -"fonttable-1.6c"="1vz99pfw4akid9hjf7dcqf1fx5h30sr25i1f9q6a9frk0wpwff72"; -"fonttable.doc-1.6c"="1inb0ai6q8rjsrcwgv8ns6as60ifdidqzqb8x9ygaw3j5ykzr02q"; -"fonttable.source-1.6c"="1qjilvy77072jpbdc4p4qfy5d4n2ww2wcm5drwvai6p2aclqf29x"; -"footmisc-5.5b"="1lnvcwxyq3328m7lrdv8plzzvphwz6206y1y3c025g50k11jvkil"; -"footmisc.doc-5.5b"="01bcysxxzlvmya4npjryflgbn9bqiza3b9hjin5csljfmgpkkypn"; -"footmisc.source-5.5b"="1wh9sq39amiqp79wy23flqv7a415k56ik7hdrgvfxgq8sk6aysml"; -"footmisx-20161201"="0f6csxzkwbf4nlw6z9rfyys1f7fc0vpdi2m36g7y3k9l3j6wb3mq"; -"footmisx.doc-20161201"="1962sivh4jipsxd0z0cpzpd0jdw8v4afbpzfinklivnla2c9hp4g"; -"footmisx.source-20161201"="09w5bfx94533q36z3k0a1sf9jx6acz85qgqypgn6b0b5mkhjsmar"; -"footnotebackref-1.0"="12vxch1i8x0k8d760vgq61i7j3kkylgbcxj6ggdv8wzd20h4izyc"; -"footnotebackref.doc-1.0"="09dvvnjvika3617zx438ca8z3fmdkqbxx9y73pdhn6gaggfmzr72"; -"footnoterange-1.0c"="1k5xz3xjcgr3a23yfyw3zrh28hxqcr5djl4g3zly5ackq7q2m19p"; -"footnoterange.doc-1.0c"="05rwaqpnfsmgcyx9f88vw766iz57g8vy1il0vp6cky787lr047zd"; -"footnoterange.source-1.0c"="15asynssisdgz6py0f024g7fjf1rpsv9v0k1v4l3fjw8ppp5ddns"; -"footnpag-15878"="1qdl7lpfy5nn6qx026b9aqz8nfs958grh443lkqyxnrnws0n2nww"; -"footnpag.doc-15878"="006w2w6aga9zazlk8sv8maqi4s1rdzqyphp0lpa8qv5q23vcdhl6"; -"footnpag.source-15878"="1hh2754as2yrmfz4hiyyl8nlshsfdhpgpg3ifhs6h5s0xz947rw0"; -"forarray-1.01"="0cn062f805lgy5m45q6flxj5w6gjfa4w1ip7zmhxd2z09s962jf8"; -"forarray.doc-1.01"="1d6m425lfg1g8arjyz4j3q9253rdmfaabaasbpd2ynhjr1abfh3c"; -"forarray.source-1.01"="0dpqr0hff33ddfw6vs0pnk8yhaa4gxkxgn43qgx06mx1srv6rz1i"; -"foreign-2.7"="1hqmhy3l2hsjf2hkxhrsdc3z1mn3zx8718w90g8152x9k84bf7jw"; -"foreign.doc-2.7"="1gnaazl1ds76sqdpbj773k80isyf5hmjxh22p3hs9zxcpnvdhng7"; -"foreign.source-2.7"="1ziafjxcncsba0gbn1qjf2w2gn2g9z55bpcff71hr9axhp8xgpgf"; -"forloop-3.0"="1s89z93fvsj2h4w1g8ak512mnnfmd3pjvwbgwym6y0dc428sp5k6"; -"forloop.doc-3.0"="03s4w726zmx10s1xdwyrag86lw84qf4rc3vcdn4g1mhm1cwqg756"; -"forloop.source-3.0"="07bjxa18cszvffxbvrzg26fpp77a5vvmywrr625qyx8v84khcs4f"; -"formlett-2.3"="1gjdgl26ma0sh15yrgi8kpy4sq268jkz9jmyw66iy3d4k9ybggsm"; -"formlett.doc-2.3"="1mm2m4qgiz0aplbyf3rwzhpfzhyg3mfmzc00z35kv6s5phcmlnf1"; -"forms16be-1.3"="140xh5578cpjn6mfwnghy38alz4av25gha09gl7c7qxljgpc2a7i"; -"forms16be.doc-1.3"="0wa6pyn8l8d14d47kqvwvsnkv2s9mxfhmzan7jgzfrmkb74h7xlx"; -"forms16be.source-1.3"="1l3ci86wl6an48a68vfh4ynajq6j3br8wbafm8w8c0x810hb141w"; -"formular-1.0a"="16h5hf50ngqarcxk4gjs9x9mcycmj5cqwy5pb6ffpj9xbsxn4r8i"; -"formular.doc-1.0a"="19aq7sbghvrif72x7vzvabrhwj7lgsddsbdqbkv9vhmp82452vyy"; -"formular.source-1.0a"="1s8ngbw6s163dzj9mi629yd4fisxr1gl8w8i618my426szc1vrcx"; -"fragments-15878"="02m23bx1p090m6w1frb2k6m0cv6jk8d9fdbmjscwa7c9c55qh5gd"; -"fragments.doc-15878"="11kj5gczbhb0imfsf30hc74s50iwq4zfs79j6kv62ib6v3p32mm5"; -"frame-1.0"="17r35x914f3h72drsszy74ir5phcxmkrcvwlrfd11li0lsmiyj62"; -"frame.doc-1.0"="0888jcccsnlpzkynpg8mvxy2mnb2d3xz41bi341q9fdbbzs5lmnn"; -"framed-0.96"="0fp0zbq3bjfqx87zb01m5ffn8kw8044vkz8b9cfndz1ki64d9x4r"; -"framed.doc-0.96"="1pjnqy8zl5zkadpkvwa35khwjk1nxg9pq0h1wqwgrdvqk6gj0cbi"; -"frankenstein-15878"="0zj1gcl4gab78qcs2rv5i9y4q234iz731x2hnab169ygql4d95i8"; -"frankenstein.doc-15878"="0x1fp5xc2qlx0pac2vqm8567fdh8i97k25ixr28w7fzwl9xnm91x"; -"frankenstein.source-15878"="0ag37z3klcy0jvcvvj7v14clx2dvv6q43lh6gw83rpsx51v9wza4"; -"frege-1.3"="1n0qak8xsi8wlg7r2daszdvi3hv9gmp7i04phcnx4hnlr68842d9"; -"frege.doc-1.3"="0hb7a6c0i0jk8cvv2vfr743ysqn2vh1y6amy7arc4zafi097nwly"; -"froufrou-1.2"="1790fjq69nmbgh9ghychrkcc5mq6pnvb7szcj4ikgmajdaxa3kza"; -"froufrou.doc-1.2"="11s2hrxr7byzhk66qczgwazqyb8rwpba1r1i0g6psnzmh0pfdgw1"; -"froufrou.source-1.2"="1g9lrwwrjczak9003dvrzqps5agylasjvvzg8dwmckm627jya6ir"; -"ftcap-1.4"="0dbrhynslppw5nrdvikzdkfvilzr909ypc9v8nxpa3yh4zln182d"; -"ftcap.doc-1.4"="0iq7lq25gzyc85wpmr93a8ivgc9038rs80mvhm46zdrrixh5ry21"; -"ftnxtra-0.1"="07fazshsyqng62sfbnjhxglscw707jmn5lz1ws6avq8c5chs70pb"; -"ftnxtra.doc-0.1"="0a100iy3imy2x6rgv8pgkid75ah21684ddm6vda58gv8yzfz9fyd"; -"ftnxtra.source-0.1"="1ips0zm2cka9wh4474sc283102s6r9hvr4if7lhd04c92f40r3my"; -"fullblck-1.03"="1bxnzkidpszq5l2kfilrn8ny1gw680gcx9gz9975vylh5kissrmh"; -"fullblck.doc-1.03"="0zj229qkv3zdf2gz6qkgblj33zdhf8zixy59gqm4v69ld491wvh1"; -"fullblck.source-1.03"="0arshfc79aljbpfnnq5rhi7gc9sqhlx002xqg46wrq125cgdj13q"; -"fullminipage-0.1.1"="0zy9vk5a0bljq3my17fw4jl8rhd7vdzcmw550ps8zbjbhxphssrc"; -"fullminipage.doc-0.1.1"="1n9lzacq920lmc18rhavz17xnm92lm964pglf6j8i7yyj5aib61c"; -"fullminipage.source-0.1.1"="16q6f9nss1jx3pw1xq0j82y4gn70hdjaj9m7pq3947m6bkyz92vd"; -"fullwidth-0.1"="1kis1p158phkwxdfhpb4ihfs2w7wywj1lighc44sfkpima9c4nmx"; -"fullwidth.doc-0.1"="056k7w66rh0z1kxf1m91sbjhg8kdy9jvfkwm3jmi5mkclil5ihi9"; -"fundus-calligra-1.2"="1rnrqblg06qkwcy7f460pd1hnh4bwl47zyswa1iv4iknx00rd8a2"; -"fundus-calligra.doc-1.2"="0jvbvalqyj0kyf6cwr6zf18ylckh3fwpshwhmnv7ldg5r1ylia9j"; -"fundus-calligra.source-1.2"="14a0d7d8mlsw7qwpspqc2rmcdyhnfy6l7f57bk9v9jc8pg9fxb6m"; -"fundus-cyr-26019"="02zz37h71nqq0f4sf00fiw80pq1q3yadnhqm2j3niz13gms9ydl2"; -"fundus-sueterlin-1.2"="1zpcss3lzhc9zkh8b91138ycwj8pihch318zr9pc6bl3ifq37wq1"; -"fundus-sueterlin.doc-1.2"="1pjka7j1378bqa32h0b2dcinf6ayjmzcbm4c1sdw6dsvrzbnda3f"; -"fundus-sueterlin.source-1.2"="1y4bg8r2hmpa38hdgkrk99v87cphikdb7sq5x9aczbmwwgmgw8fp"; -"fvextra-1.4"="0qx1rzvaai2571c3fmlc9whij7wjmgqznrddannpfim6vrnsiklx"; -"fvextra.doc-1.4"="17096sy285z8qy8556ji6zgwn4wcmqchdshxn3s6b3gz9gpmdz00"; -"fvextra.source-1.4"="1x2vswnng9v8ngvfwy1zpg2ivid9xdrk605gahp8h9gxlrkhsm8n"; -"fwlw-29803"="1qwlknaljj8f1cpnln328az913cdwypr7w8m8iqbqiqhsl49siap"; -"fwlw.doc-29803"="1cib3id21xblai43gkn78ypz6n99vwzhzmpdifdm8wv001x7wb82"; -"g-brief-4.0.3"="0w0i9mqc5wg9za3n99i3fkn4bw78l8kf6glh0k6rvrzss0sg79cj"; -"g-brief.doc-4.0.3"="1ikasv5w1xr5ms6836q1bnk7b87s24m15mnwsbdyf7cnsh267x6k"; -"g-brief.source-4.0.3"="01j6zxs8vpiiimc10hhl93xcixwlzsih5k56n7v9a1a3czgymad6"; -"gatherenum-1.8"="1b5j4106mjdswm519nb9sswnpnna5v6wcy4p8xbccv01044iqlk1"; -"gatherenum.doc-1.8"="0afd1c352075ix46y0jrhfwlbsaibchvz3xs916qi3hd8a90hbpx"; -"gatherenum.source-1.8"="05dri0sgr8h29q3zxcsyhplhrkj1wllfb42d8scy6hp4mkmbsr06"; -"gauss-32934"="0jsbvm7sh7bhs5yfl17fj1gbdqgpm7qchf07y3p7k0rxxg0f482z"; -"gauss.doc-32934"="1f6ycdq3lpylkdwja4f89plz7wpnz73wzgjz74far6r9wr026443"; -"gcard-15878"="1pcxw9mg6hadr5c6m4z3pdzs0b9jw22injdlk46xxhqy5gsafa7v"; -"gcard.doc-15878"="03686fg2fw1k1j5rrskxpb0yjn2n5l697l66gww90jysq9546iag"; -"gcite-1.0.1"="0dl1plmbn4i5hzmjz48hyfl5wj819pg6k1kjsdycx4wi0d9ff2pr"; -"gcite.doc-1.0.1"="175151qpcykxsf1a6g9v6mkhr6m9cm5miw3ys6j5csrqm3vsl604"; -"gcite.source-1.0.1"="08h5kxah5q9105n1awlrmiy0zrl3rafb8v3nwp4qfakr83q3vf3k"; -"gender-1.0"="0skwbiclrpl1n55dr3lkw86dvqy3f1n0b271ygsz6rr3qa43478r"; -"gender.doc-1.0"="1gamaakkqqf37cwwzxjbyfhz25gdzayzdkqk60xls9flp7227hbr"; -"gender.source-1.0"="1l5p8ib5lbvq2b8pizpwpbcv8aslmi8dd554win7ssd6vhgb68j1"; -"genmpage-0.3.1"="0fr4m2y3vfymlwk7ik7rymifyam2jhbxn3qr2sj40zbcr9wbah6n"; -"genmpage.doc-0.3.1"="12fxwrz5gpswyf523wm1pg99zilkgrpq8z3ls5gw9j7bdb71nj1l"; -"genmpage.source-0.3.1"="0q7acjs7g1xh5kcmrg20k9jayaf5vxz5p5amjjd4xj4rnb1wdlj1"; -"getfiledate-1.2"="1bhqqsvykrmqlgd8whfwxm8bkcqdfzm182ryngq8s6yl9vx39ck5"; -"getfiledate.doc-1.2"="1jdsnf020iyiyxaabyaxp0nzf02s4kqmm8qf02vaclmbqhciicf2"; -"getitems-1.0"="1n02xiwch25vv9qk3rqddsm54nhp4fkwi3i5a7r3285md2b4vsiw"; -"getitems.doc-1.0"="1m2wfxyqkbfk7zk1czmqp8wwmqd091zijqxvanjxf7azxfmlnvwz"; -"getitems.source-1.0"="0njzl590bsmdnvm1gfqfjf5xpj9mj5ijjxjjxiya0741ylhwv6p1"; -"gindex-0.2"="0llk0aaa43n4in5am3ziqvkl1c35q27am5xk1naszwlqxcn4lx42"; -"gindex.doc-0.2"="0fpy0kvkj84vg1jz80jaz26k73rijrldy4m1p1xl3ccc7dxvr299"; -"ginpenc-1.0"="1brakvxxrm1gahl609psp4na8ylkggfs534nysnrijq6vf4r1ryc"; -"ginpenc.doc-1.0"="0d4q0n0wh45ndqgd2zk254791lcvzrxz4alr2bnm9akcfbv03jz2"; -"ginpenc.source-1.0"="0jw7qa8wrb20wf8dsaxinkrvfyjdsndd9izxs549dj19whf1jmfy"; -"gitfile-info-0.5"="0qk6r9fiv44hamlqvsgpm75nd68sgj81sgy93zsylypp15283z2b"; -"gitfile-info.doc-0.5"="053x23sq6657lddjyk9bzadwydfh4zxl78gxl1payxmbl9pj925i"; -"gitfile-info.source-0.5"="0fnrwcjfji5pbkh4kdsishfy85gqcvcmfqxwr5s1n3bm3prgfc8b"; -"gitinfo-1.0"="1n8mm4g7bmiawd7l7xhx9fcxv7z3l629bj21i6j9s0rfd6c7mzz2"; -"gitinfo.doc-1.0"="1ip59qxlqzrn8y211691cv4bg8d0yxkyvbpxw8xpzg99fpp3isqx"; -"gitinfo2-2.0.7"="0k3vw12yh13q1v21bz7i3m32s1w49pk13rg3c0d0l1pcx0wwz20i"; -"gitinfo2.doc-2.0.7"="0586h9c1kp5cg7gk67xhy5fbshpskrmfb81m4xncaxg6ajaljk7n"; -"gitlog-0.0.beta"="1v0zpfry2rz6xvm92gzhabc9sa157kylvp6jg298kdsbr2limn3k"; -"gitlog.doc-0.0.beta"="0pd1f42qmka0wh9b8m15nk69p6isqp74b5qkjg6ymwbabqxbcbl0"; -"gitver-1.3"="1iazzsks5ki7xvc6sm9mbf7ry2rw4xlnjcypb8gxpv55cf6mxnbn"; -"gitver.doc-1.3"="0b9dc6rbfrh2r4hvy9hmyg190229gva32cn9j1bsg1jf633l2yvh"; -"globalvals-1.1"="1kgzrymfd5lzvb9dqlb4cgxfszpzhvad859r7sl0dl282596apgl"; -"globalvals.doc-1.1"="0c2qf5fqn4n8lhifvi4731r3vifwxp7h9sfd4c26d2nm1w42hv7d"; -"gloss-1.5.2"="09d8r16dwl26a76a2gky152bafjip3r3hf41bxxcb60sjvnz2qva"; -"gloss.doc-1.5.2"="10vgsm0cvcbfxwi7ly38lsvvg139y6abmdsv91qxq3s1pn1qxg6d"; -"glossaries-4.46"="1jmydwbz5rqf2ljbhi1af2r9fjpni1kym3fv3rikr7mqawqsp6ir"; -"glossaries.doc-4.46"="11ccsky6m4flpjcfic54569pmgqdqllaivh8czxl6znc79lzq46b"; -"glossaries.source-4.46"="1cghqqd09n5raz1y71v2z04hwva0vsgl0nrxm14mh0396k3cp0ry"; -"glossaries-danish-1.0"="0qdyvkx33a9jgfa7y1pbm1lg5v1ba4xrxxg0hyfqi0pmpkajqb87"; -"glossaries-danish.doc-1.0"="0gvpcl8881g9xfcxhpa3h3c5zc3467ak8mhmr4szgjrsi4nsrnv6"; -"glossaries-danish.source-1.0"="1823i0b0firwzz9038wag2qg2h39az1xsj8484w36kbij8q7ygld"; -"glossaries-dutch-1.1"="1ipxgp919h2jh5jajq72dwaf6v5qi7xjplcihjy8j88zakd9iacs"; -"glossaries-dutch.doc-1.1"="10k1xh64rzgcddzaz7qawb2qd353j79xn3754byhn4d1kz6nihxw"; -"glossaries-dutch.source-1.1"="0g2kfnxmnnqz8y095b125d7ira54s5dpb5shfqld7m52cranscy8"; -"glossaries-english-1.0"="15nm7bz90ijx674p16d596jssi5915iy43wc1qb6gbbk4s8y9h3c"; -"glossaries-english.doc-1.0"="1dckvl8g0visp5j8ip9kvmis7qw1n81xpjw136bnbm28y7a5m4sn"; -"glossaries-english.source-1.0"="0x2iw6g9a6dzw22p05n3v7vbif8svhnw9sjqfmxn020jqnajza0d"; -"glossaries-estonian-1.0"="1p2d21rx6vs8gcsalbf5kjyhmz71gbbn10c4j4lsy7rqcb97zi99"; -"glossaries-estonian.doc-1.0"="0q8rsf08snd2p4nkfz2ry7rmsbdpixgn14n1mk4wkjclrbnjszgs"; -"glossaries-estonian.source-1.0"="15xi0xl53jxfqsz7dwbmcrnlshvs2zbdq38v3izlyz47aaf6ajdx"; -"glossaries-extra-1.45"="0asj8vhfb6bbjbdvcfjv7wh7wpgp29ldm9x45hjkj3iib8f8z6pm"; -"glossaries-extra.doc-1.45"="05i9mll0qszgdkkpmckk55qwy5i9hc8jz985w61a1cf45w2wwixn"; -"glossaries-extra.source-1.45"="1nrs8rkf0wdmdvga9d3ala1hvs9vxpbsmi309374i80wqhczfcda"; -"glossaries-finnish-1.0"="18la9s6gblpqdqa1vcvsddzfxadssnd1mrg6iwl4aarq57605cql"; -"glossaries-finnish.doc-1.0"="0zjwasnxi1fzc3xq8xjmgyrfcxpf3sbfgh6nzz60zdxd8sz1wvfz"; -"glossaries-finnish.source-1.0"="0jfvjka4i94vh88jfpyysm6r1q9wwg7q29s5ik8d3da9g3n1bhyj"; -"glossaries-french-1.1"="03i8xx80d740c5yv3i83zbxpm9kckzj2kbdsakxa3sp9b0j0jk0b"; -"glossaries-french.doc-1.1"="1k5gkdj5madigzvs138r360nrg6d3fn145xf8g708bk43r92100r"; -"glossaries-french.source-1.1"="0fhi17x6kk73mismll255b9nsr8hm147zd0n3rcndbih9ray6c6a"; -"glossaries-german-1.0"="0h30icsisgk45ghhmngda0nqsjzsm23hay0sxch00ix5qcd19s27"; -"glossaries-german.doc-1.0"="0jmkcq9h2kfjzfwysfps7nqjl7f0zmh5s60ww9kll8ypdd4a1n0s"; -"glossaries-german.source-1.0"="085xarcnj5cvkljz70m27c7390jpj8kwndpyb762pr26dxvgspqh"; -"glossaries-irish-1.0"="0xyijjl1mffhmwlx7b7rprzl4rvhb2h8jdsx2jq86qg5gxd6c4r6"; -"glossaries-irish.doc-1.0"="0kic0jhmwiik3y2gipncii6j4348qkxbvkzs3sp9678xjl6j5zl8"; -"glossaries-irish.source-1.0"="12qdj6wfgrw6j4vdlkv0bcknnamb09vsyxdmyd094hwgi4cs7wi1"; -"glossaries-italian-1.0"="1dwvjb91jn93jbvh0idvn3nxm6s7frxyvc5a7yszyisfbaxx917v"; -"glossaries-italian.doc-1.0"="0sb6kzw87nh2vznwhky087017c6338jhqahgh4ljmzan9h3imk84"; -"glossaries-italian.source-1.0"="0hj3wdzdrjv9aciqgj68ihaalvarimi85vff0hf6isnmja5pwg28"; -"glossaries-magyar-1.0"="0y1540a4f531mc8fqpxv50d25a78waipkhhjvgnilbh7p1l3cf04"; -"glossaries-magyar.doc-1.0"="1sgndhgxlbhfjg22hpqazyd4zrqmkiahjfwhhwv1nk4dnn1rflcp"; -"glossaries-magyar.source-1.0"="08m0srsv9nspqfzab0g276rimzw64hg9i6dddi7fy9pc55iikfky"; -"glossaries-nynorsk-1.0"="19di0liyrqgi4vb0aiw3p507klaszwbdmsxjh09snp7jyri2rd43"; -"glossaries-nynorsk.doc-1.0"="18l362siz2p65qhb2vfgqdnczqwcgcd33qq8c0c1h3vqmsmcjfvb"; -"glossaries-nynorsk.source-1.0"="1diq7h06jw2s26jrbb44amniqyipdndzidf2z122xyc9cgcwzcwm"; -"glossaries-polish-1.0"="1pm5c1i0zfzj32p75cj014n2kdlfhfp6zlh09y5y8a7cfdsbcjdj"; -"glossaries-polish.doc-1.0"="1r0igixgkwcp7h3aslj7kmchxz32qp09vdan6w2garkgj1nspnv8"; -"glossaries-polish.source-1.0"="0zg3pfjg03kcrqm4b3s2bb9z3jhlga85hzd1n83pbrvf7fph4ld2"; -"glossaries-portuges-1.1"="1gjadmklh6lsx5drjqgph31z3x0g4xy11g074hm4y2zgziidkbyd"; -"glossaries-portuges.doc-1.1"="1cbzpx932chvxrf4myhy6bg4jrj05nkr2l2g893k6k7xgm2i1m7y"; -"glossaries-portuges.source-1.1"="0cz40x5s9whyr7r7w8gmw9gm119xmbb1qkhz19zfijg6nnq2yig2"; -"glossaries-serbian-1.0"="1nbpnq50kki9i2i2dlj2x9ldy6g0in0mz54ii107m8fc66g90vi8"; -"glossaries-serbian.doc-1.0"="1cx33aqm3qcj94rl6n71wm0sq2kc29r1wny3bwwpqg5mp3bw2g8g"; -"glossaries-serbian.source-1.0"="1vgihxf778vvf86rka345qmnbv5s2ma1b5h47s2f15x8bjx4xy9r"; -"glossaries-slovene-1.0"="0i74cn88m4llskd371z5xakw0s1gdgfmc01i55xqmc3j1n5cayh6"; -"glossaries-slovene.doc-1.0"="1bfw6dnj6vcz0v6i8dhy2ffd6vbjqihqshkzhnwrrc858rzgahiv"; -"glossaries-slovene.source-1.0"="02c4gvv1qvhbznxlxff6kx976whcv80c15k2jxsgd6bira50414r"; -"glossaries-spanish-1.0"="1wg894gdkqkm2mpzixgpnsd5hzbvvviba7izbshiihhldsijs60d"; -"glossaries-spanish.doc-1.0"="0zkfg3zk204q8a4xj00ibixqi0j3ll4531vrbavafm8b9qjl93xr"; -"glossaries-spanish.source-1.0"="01hnx7zkqlb4r549252y3nsqrj8ywi30ci27r5n1p846jv366lxc"; -"gmdoc-0.993"="07hf9413bmj1iv1g13wnngfb07fjb11162pz1769dz5si4av5nmm"; -"gmdoc.doc-0.993"="1p3zpf3rmmmvaam534vyw2n8r3klfxlk36jk19pk5akqwxwv754r"; -"gmdoc-enhance-0.2"="15c1bah1lxa4ap43287qm24nmcml5g8a62plq0wsdhbd07w51h34"; -"gmdoc-enhance.doc-0.2"="1fy3y1f53frsv09vz74n7v8gv1wscga6h4di9wfspwan1x3kdp76"; -"gmdoc-enhance.source-0.2"="067ind9qmah7w93bhwg9vfj8nyps60gsvbxmx7qhkr6c1cxqa8wr"; -"gmiflink-0.97"="1b7gbvkhscb2p4yhcwd8mlh3fsvgfq8g6876s1brygnp9lsz7cxn"; -"gmiflink.doc-0.97"="189srmaykk4pmm3p65p0i00ycisr2bdvb51r6ddn4rjbliv6i9gd"; -"gmutils-0.996"="1yf7r1bqv7kid7v65bv56w4an5nx22fhxzh67fh7r9y8msrz86lh"; -"gmutils.doc-0.996"="1xplwkdjdcz76rmmmnv8zfp3fj104b1vag6rzrxj7ap9k8zzc40f"; -"gmverb-0.98"="1mqmi97imyr63ff0qyv797sipncqizbx9cvlg49wxnf3bjyk2ki2"; -"gmverb.doc-0.98"="0r9sygczigi52piyk4zgw807zjr0jl4babj3qmnnsg0qclhvaqnq"; -"grabbox-1.4"="1w9gmzwzy8dmk5rymwhn75rlciszk2wyx9yiiqn3npz872b55sf2"; -"grabbox.doc-1.4"="1h4fzi0199gfzdsx3f4pz76q14lv90sgad8ixfixn4kq6zywg4cs"; -"grabbox.source-1.4"="0sg5ahgxmm6vwa2ng0w8dmgxb4d3x14929i8apkm21bainhaxg4d"; -"graphbox-1.1"="1hvhadbpd988nvrlcppvv3bnm5lzmlnxgwmfp6r4mgsr1q7xgg6j"; -"graphbox.doc-1.1"="1gls7j4753s16q6lgdsaa3yg8fc4vzxh74z7qr2ykz9b8ij0sdr5"; -"graphbox.source-1.1"="0nfmfn7y1qqbm4yifqxfpxn9yw2xb9yj4smv9fmxrs57ism8d9dp"; -"graphicx-psmin-1.2"="1sz53s8j6rn37xz1kkw0zr85625qki05zfvj6zpyw1yxay86r89w"; -"graphicx-psmin.doc-1.2"="1fjg0pwh8qxk79mmrpgnwps50r8hvw6hqsjd2cp021wkqcyk5zb1"; -"graphicx-psmin.source-1.2"="1rjl35jhy6dwja782xwh0qp3bxyw6ziha6fw5qbaq16jfy8hs95q"; -"graphicxbox-1.0"="1pl1x7n7yv7grkplpx7fflfi4cwzmkmh8nnd77i2n5wdlylyabxd"; -"graphicxbox.doc-1.0"="0f1w22m5r1xz6n70yb1p21qq3fi2rfj9mdcyqq8s40km1i40yxkd"; -"graphicxbox.source-1.0"="163isaz9zh1jr5wbhsw3ppicxsq4v92d6516dqgiwjhf6hdgay94"; -"graphpaper-1.0"="0gb5vwg422w53njdn8f2ng0rj5klbwfl4hw7xkqdj7g8cybnib4m"; -"graphpaper.doc-1.0"="0cdxw7yxb6i72j0mhlnmbnarpwricwmc4j6r90jlazaf6pb6dxiy"; -"graphpaper.source-1.0"="0r0rzdbc13i5hjqnmyx57s70pmgg8ql2z609c8awcvfb08x12fwd"; -"grayhints-49052"="0p65f12y0v9s13gkmd0limdcsz36lnbf0975c4pxcsc42i8smvqk"; -"grayhints.doc-49052"="07qpkj60rrl1pc651qa8kpym3bzcc0qkfwaggcyin9a65a5snnhf"; -"grayhints.source-49052"="1g32xq2f1ncq124j2j8xm3vdkhv4sxynxc3wzx7x6s9i91p5l59y"; -"grfpaste-0.2"="0y1zw0l245chmlgmi7cmg2yp7s30z8055wnrbm6f45aizcvgdya9"; -"grfpaste.doc-0.2"="152b029w1203lgfmxdmhq3nh9h2hcdx4xanklv59rih9ha5l8j5v"; -"grid-1.0"="17yxgnwlxi16vkhhy0mij2f07cib589305iz3kzf0gfha2x1fnxg"; -"grid.doc-1.0"="0h3pfv1hilyn9c9mlqm9nbfd0l0s1n8w7hgaa6cab43y8n60z8gy"; -"grid.source-1.0"="1ah419141p76qjl1q82l2v6i5z34mj19rvsbwldp8fawfkl093k1"; -"grid-system-0.3.0"="11l07viwfi88i7c05yjb39wxzdgvg6xvxlcgbmqpvc4fbwmr45bi"; -"grid-system.doc-0.3.0"="1a72i4af612w28wkbsvqvss5462ar8g27y83w2h7y65nqv42wi9d"; -"gridpapers-1.0.2"="1nshsbv4qf8vxsvrqidwr4rqny5lp0cxijx018bcskhh3xra7r6n"; -"gridpapers.doc-1.0.2"="0z3vns6jk1ihiqf12i46n8yhfyjmnkb4l5wyc18phbh9l6879b7q"; -"gridpapers.source-1.0.2"="1bnb38mgi6pzm6gvxf0k60z1dal3kgi2rjgwfrcg2h5vmb5rpdk0"; -"gridset-0.3"="1hg92rhf2jl3yp9y85pm0hrbc2a43ysxkhdakfv51a3bynd7ym51"; -"gridset.doc-0.3"="19aq6g6dnbmgz6a4pgxm2c2vbwc0m3hicg7qcbjpchahj8278w5y"; -"gridset.source-0.3"="1gmgaql1wyd6kbhhv0ssyhg5dz9jls0y895h7yg8pyjqg4d0i2rh"; -"gridslides-0.1.1"="1y5bngrqi46yii7807nw2y6vr7xavmbnk7x3bpfj5fjm8vpnw4aj"; -"gridslides.doc-0.1.1"="0ringj34cl8lqdfa3qwfcq4jdfzsghw4haw7c9dq9acqnpc6sh3f"; -"guitlogo-1.0.0-alpha.4"="1zjlfd49hkq9qc1l3g974wxzw200qyiy9vbiai0v9gs627hxckwj"; -"guitlogo.doc-1.0.0-alpha.4"="0awpik3x75rky5w6rk9zg3cy83dgxs2l57wfg8sq9h35zmni875w"; -"guitlogo.source-1.0.0-alpha.4"="1hi4rb31mc3820fafyhk2158y67b90xp5wl6xxd0b5fqz2z28qnj"; -"hackthefootline-46494"="1l2iq2k1bil4l5nzxrfi4pg831kxn22ld7402y285hlhv7cj6qfc"; -"hackthefootline.doc-46494"="0w10yipva3ixyp91iy2y15n312gk5fw90960p3adla2w1p4qhs4c"; -"halloweenmath-0.11"="0sfcggpqhai8xzpnbyz1vlvh7cfl3n2m7z0av4drd7wqzas0mcw2"; -"halloweenmath.doc-0.11"="0k7qfv036aa691902chj1rgcf3z2xd58xfb2r0b5z80g6944xjrk"; -"halloweenmath.source-0.11"="0ir0xr3aiyjiashy6jl39f401ccgx3dhlyiqx4h2myiwq45ay2ka"; -"handin-0.1.1"="0xcsmfa4jjhrl3xkglqwbgvi844q1f9zjgpyix5akx058qjvwl7g"; -"handin.doc-0.1.1"="1k3ar5yzyndnfqkv3bhl7q8aczfbaaghv9mkhzpfri4za5ks6fnn"; -"handout-1.6.0"="1563x16fgw29vzw9bzjrc8maj1r8337p288y7v066qjaq886x3xz"; -"handout.doc-1.6.0"="1y1wpkpjwhq7aya9b98ym4xsv15zavmv8k1i6q0vx302awi2r5yr"; -"hang-2.1"="097qbqwbib8gj53qlydflff7sqp5ghcg5812hjnav9a0rgklpw8y"; -"hang.doc-2.1"="19falj7rm7diwr24q5rpab3rp39awnyg0hdxfhhalkpdmjwqk2iy"; -"hanging-1.2b"="0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb"; -"hanging.doc-1.2b"="086lzvx4g6bj04xdqnadmb8832klmq362k9lqh4pz7ym34mzh5c7"; -"hanging.source-1.2b"="0wwfnkb66m7r77723kkkdp7yxkl789g310m5lhllwx33fbhm8vhj"; -"hardwrap-0.2"="1kwsns5vg5pkplcl5nhmvpm2ccdv0f9431qxjxq1k6zfsknpy60v"; -"hardwrap.doc-0.2"="0h1n80c9l34isgyzl36hf4nigxcsykfgqv6i9jjdf6dqpp23bpw9"; -"hardwrap.source-0.2"="0hiqsj0vpfkmi8z048ymlnxrxaam8raq2f48wlyk67x4w2gv72k8"; -"harnon-cv-1.0"="125885fg7frl37pmxxj51i7d22xydj5wsva9i27126903y3qdm8m"; -"harnon-cv.doc-1.0"="07i4qv95fcfnlfj18qljwbkv1cm5r00mzmq570ra3bgjc301gk9a"; -"harpoon-1.0"="18p0xqjxix4ka9a9ja513il0wrpqrqh8v9v13cc89kh8qfjlf9m7"; -"harpoon.doc-1.0"="0l2y9l8wn55dg06fbxjnv16bkhgbg9rpfclawfh4p7m2cf2h1k44"; -"hc-15878"="04qricj1nmmmhxwsam901cr43h96ymc7qdb1m52byniv51i8g0yn"; -"hc.doc-15878"="06q64drrpgm7lzp45hrl33cs2dj4mx1mjpsd3paqgsn2xxqls2yj"; -"hc.source-15878"="0knqx9smbx7lyr1r6vn50x3x9zldv14gb3484jqk28jvm92njnij"; -"he-she-1.3"="1rr8pdpizasdcb1sfg74nsqs67xh2lcwd8w2rjaf719bpx9372yb"; -"he-she.doc-1.3"="1lmahrp33iv7bbnkbiwpkagy3rm7j0wric7m1fbzdvkgkzv274na"; -"hhtensor-0.61"="13mx7mg5jqrlyxnx19n0rs2crpxx2gp6m7l41m6l2ig5vlgc0x1r"; -"hhtensor.doc-0.61"="0k5fg9ad5avnsg84xwlcbzffrzf6y8l8a2m0dqw3clg7zjmq4prp"; -"hhtensor.source-0.61"="1pay0c1z6avkb44h0iibfn6xskiglym0fckfqrdv0bablk3cghjn"; -"highlightlatex-58392"="1pmhvjxp5038nnxd9bnk3s30wgzxvbzq6z8cfmvz0k8h1nzkc1a1"; -"highlightlatex.doc-58392"="0q4v0dvr50wd0qbk8xvn7bayyq00kj8b8wwyn6axia3mpjmr7a41"; -"histogr-1.01"="11zbm3d05j6nrzwb3hpahli54lf06aly60arh4fi9k52qcbsylv3"; -"histogr.doc-1.01"="046gw7h51w5s8p3rh6kwwi22xxj8bspbh7anf2cdzg4w88dardl4"; -"histogr.source-1.01"="153lhmgh0n224xkg7dmcajj7bydnv21spihh371hj5a461d4h9k7"; -"hitec-0.0beta"="1rzv2baizqa6fj063knxhac39slaaxk5lbgpl6zwk60nbp1lxq3l"; -"hitec.doc-0.0beta"="1p6vcgy1l1avz05h6r7bqwr7hl3jrnyryl3vn1i0qad25jryf7qn"; -"hitreport-1.0.0"="01xxw91175ffcix6s7ji2600j966dbm6zl8fbnfwabb1rvn39nq5"; -"hitreport.doc-1.0.0"="1wpscl97hpc3s1s34bskz088ph3x83qq7m6qgjj0xa2hbm2g77ci"; -"hitreport.source-1.0.0"="1hxcw8n5aa4jfpd8r8f3442diww9zhnywd6kbbqjs7928bb51vk4"; -"hletter-4.2"="02v906vgbidc2s1mgz1k3666riwb27vsl7dp24rd8q2m167xjd29"; -"hletter.doc-4.2"="1x8q4jkrbw6ddkqqlaz6mxj4q105vjs8k8ifphvkvhawl9iikki3"; -"hobsub-52810"="11j0fxsxmyd93px9j5fdarz1231nczdkfpf1qf33kcdpyb44jrs3"; -"hobsub.doc-52810"="0hdidvz42acsgy021c1dzlvshcmw6fz3pkqrwpk66qk2nnh30dal"; -"hpsdiss-1.0"="1l7mbnhds4c6y1w5vylsx8j7b4syl2j785l3xzvk89nc5g6ck2qh"; -"hpsdiss.doc-1.0"="1cxdd1340b1gkn915id7xcdac2zp79r1yi5g3wjwmj4kbn7z6sbp"; -"hpsdiss.source-1.0"="1dar4y0ajqz93znww0fkf36li50b82hbxixi30hi8fm8y2hc3j2j"; -"hrefhide-1.0f"="1b9p4qwbclsgd61qqnifqaid1s93r0yqkwi95f24snvklm8gw7zk"; -"hrefhide.doc-1.0f"="0x3md2dm04kvnf4dfs2i6gpplpsayjcw4qz9qwayad7nbnpr9i61"; -"hrefhide.source-1.0f"="0jcf8pvsndvhqa77bi4i8wl5lvgca8w0h74pmaqvs1d0vc8nlja8"; -"hvindex-0.04"="1wk4q29iyqrk83kafwhah5gvvj2ywpnqzvnza6cwrkb85fd1q2i8"; -"hvindex.doc-0.04"="0vcdmn3xc4cm3rkdkzi0qvqakgkc3hrgy8nycr5c8vcb6xaiw0gr"; -"hvqrurl-0.01a"="0ckdgawrb76r4fszzsrjlapnd2m9zcmy2la2621c4gwrgyskjvs8"; -"hvqrurl.doc-0.01a"="1bxcgwllrpknm4akd85sm13y6wn36n86r04y8kc9ymv7i0c77gis"; -"hypdestopt-2.7"="1753c7vjx3smnhl1iylg4x0sdcqfg6gb0wdbwqmlass4qdn494w1"; -"hypdestopt.doc-2.7"="07a2dpvvyj2r2691v8izjnqjksna1nm00za4sva1npcrhkc2qq1q"; -"hypdvips-3.03"="0ax6n7ki47jyzp5g8781c7rv54hwrl0fg7d1bwzbj9bmqi39df4v"; -"hypdvips.doc-3.03"="15vnypyl6g50d4mycz3s41h8ccpmknr0vh9bwacr6nxbzlyyykrk"; -"hyper-4.2d"="12737gd2nmnalkgl4d2sh45r4d621zl6g2zcih98m7dw8qr38w2v"; -"hyper.doc-4.2d"="0hzl3fzgmn6kyl6p4d98l9ycisfhb9v50a1m6n8q1k6jpvr10z9f"; -"hyper.source-4.2d"="09m0kdcs4kqksqwxf29yq4l52kb2mj5pxkry010ibwqw64cs5p74"; -"hyperbar-0.1"="1bj0v54k85isn3p48vmiygcvd3n06r4mqcp75hf96mmp0wvmczg5"; -"hyperbar.doc-0.1"="0fmrz4hlzd8clxx150fk4zbkdgbnhg3b7ck10225b0n1lqgnlh0h"; -"hyperbar.source-0.1"="19x81f6bki5mnx1nblrl0ji663q0pzkacy5lbjsqyr7krdc33fyh"; -"hypernat-1.0b"="09lnsw7ycwkk71fyjk8zwgzdjv8ff3k028q7hr27dqsiyg4hjg7a"; -"hypernat.doc-1.0b"="150ayv12ym9h68a09h1xakdfzccpix1pff9blkzjq6iz5imzzpr1"; -"hyperxmp-5.9"="1p3pj50iq61bdbqvm4bijj48bwg2n6sn2dhlq5xgp04w8jxc29v0"; -"hyperxmp.doc-5.9"="1sqsss76f9mhxv8vlp1dh8gnjpv8i4mzy74146hhfjwvaf5zygmk"; -"hyperxmp.source-5.9"="0n7xzbq57kaqnm1aafrz58am7s6wn9pcxbgfiqdc6yniz8680jl2"; -"hyphenat-2.3c"="0ckfvjxdv4rb8156x2vmwl15mk9057i2lyg9xhqkmvqh1ani4lc4"; -"hyphenat.doc-2.3c"="1lzpdz05dw5m8ljxf5f846m1x4nv5yrqbg3sixf7dgyhsmpfxnls"; -"hyphenat.source-2.3c"="1ddwv26nfl4jwz8vxs4fwc9qw8gds1sg275g2bg9ci8dfflk16k7"; -"identkey-0.1.0"="1vs6sr25ybmrfkg5v3m021hlhw9x3gpynh89q12a5pl2ka094hn1"; -"identkey.doc-0.1.0"="0r33gzfwrj4j8a2i8kdddbhgljf3hz1b7cjfxgmv5gdqmmjywnx2"; -"idxcmds-0.2c"="179mvb95a1cxkn7ncgs7xwhh04d36s9nb5jjxvaszcfkp9rnlkcg"; -"idxcmds.doc-0.2c"="1ym6yi4cpw9flz4si6blg5bfj85sf0p3y6nipc886ixkwiyvsgm7"; -"idxlayout-0.4d"="1y1vzyb1l5b8q3qqs62zfiw7vfd9c1pdha9z4nm5xpsar1nk69qx"; -"idxlayout.doc-0.4d"="11qiyzcj4zi8kd9h2k2jhg8i8rzfwdam9rhr7cmvbxqsqirf0fp2"; -"idxlayout.source-0.4d"="0fkpj4gn06wkq3saprsb3gm7myj04yll4spz3j7yi28yniv4cr5c"; -"iffont-1.0.0"="1a4zx0mysk6i7awvcjv2y1yid1k160icrkqkvw34qsgs35qnqbbq"; -"iffont.doc-1.0.0"="1iqchl5nra5ldmv5ddpwjcm84whpsxym34vphj2zxvzl0hqwrc2n"; -"iffont.source-1.0.0"="1x187pafzgg7h2vvy5dfc44y37q45lkzqfkxh8b52pysxxl23014"; -"ifmslide-0.47"="1n4dmmslpsx9fv9wqiipcg04lasym2fbgsqkvvffqmx5rszgdpha"; -"ifmslide.doc-0.47"="0n7hsymjs1zfjc5gbn26z2wdl5qicc7pd251s0h4qnfigq3nhr08"; -"ifnextok-0.3"="0sf9dmz303pbxfi24z6fb1wxia89qaf4svgp4sbpi1yl3gkxwrmj"; -"ifnextok.doc-0.3"="11r5zrs467h3rv5j8c7b5iav19v9hbcxbspgfdbd061g871xxd5y"; -"ifnextok.source-0.3"="047pc422qhh9d80rjgmjgmn5xsapf9azvqrl0cjn28qw4m5ccs12"; -"ifoddpage-1.1"="16n7s8cmsfd5ylxmz2f87mx6f5szr8na3zygji8izvi4g0pfc1zf"; -"ifoddpage.doc-1.1"="1z7x0qyn7g96isqgkdwwkp45mzplqixgm9d84fhizfzx7sw9r6a7"; -"ifoddpage.source-1.1"="14x0haj3xjsk9dn2djg117sl7x5nbwgbivhjj3ichnxlgrlf1bis"; -"ifthenx-0.1a"="0bp087nfq5hb3a60ayprbz621nmk0acisizkw5i25n4kryi6vc63"; -"ifthenx.doc-0.1a"="1hzz8s2xlz2pij81cfgjad8yaamv8l4iaripj7bbifkq7gy38afj"; -"iitem-1.0"="1sdsc28fw1lrr72s4wwgwk0zxk9720ll5xbvap2na4i3lp4vjghf"; -"iitem.doc-1.0"="0grgh5bslsl67ygvz2cd3xb9adn3w4amhpkkxnh035vkld91fxh8"; -"iitem.source-1.0"="1fk3c5rc8ylf9jg5id4jnm1gjnrvafiivhr0lpfws4ddr2pmir06"; -"image-gallery-1.0j"="097brbh3xf2xi4s151iy8g6abnf0ba4yar78jz607f9dfni95i8c"; -"image-gallery.doc-1.0j"="0f8a7jzj6w25al9c13mxd04bg2c701s0ynsd1rvnqdik6d98s0l0"; -"imakeidx-1.3e"="0w0q18bxpbsqrj97309b9lyfcf4has5ldjvs0dwn45lciav8a7rr"; -"imakeidx.doc-1.3e"="0h2wqdg6navbpzjq38ks2b9lz3hkmgi7v1y8ihbbv3aisyvp5r93"; -"imakeidx.source-1.3e"="0l7q94z5a3lsy4kh7vxyr6mmywc43p681p1vjry1f9vi0s6ljwpy"; -"import-6.2"="0if5vrbx6456ydarw57p1jpkcj2d7csmiffgll6fgxf2kllqga6v"; -"import.doc-6.2"="11hi1yk9xhqks4i3rhc4s8bbaakxbbmddb7j5sym780y45qm79c3"; -"incgraph-1.12"="0ydcq3pk37a6mimv85vm3nrl7b53sgs7m1d78705swk0hfh2z3x7"; -"incgraph.doc-1.12"="0mc5c6g5af1ri0hx66bcx5lnh2hhl0lgdj6xwsjhwkyik49lvagq"; -"indextools-1.5.1"="155l4azvgwbk4h70x6bkbddq8k4jxhh485xa7jajz9vq11lkvhs0"; -"indextools.doc-1.5.1"="11n3knyzdamz9nz00i2rck6gffqrzwcycah0ds2a2wmcm7wl6yvk"; -"indextools.source-1.5.1"="08qifym1c39rk935hdsm7kqxdy3gaphq34bm3w6klr92cz6w0n1p"; -"inline-images-1.0"="1nq64ymrmfiw19bcbb25gmll36xbv58ynzvv140089pw7xn5x7bm"; -"inline-images.doc-1.0"="1rjppia3m0kvf433ansxhmwvii70i4k53iqk9jphhk2xv2gfd16v"; -"inputenx-1.12"="0jjf29lj8ha99r2x0vz85swkr2aq6v2jwis27irsi79syfq8bpbc"; -"inputenx.doc-1.12"="1kkblvi4dhfxsij5lmbdvmnapskvd5yahha5im2nlllh8crypwv5"; -"inputenx.source-1.12"="1681djxj8c43i93ip864bi1p1fpn2dngkvh18zs0234ls0gkwiy1"; -"inputtrc-0.3"="1qy90zwai5ciajsiph6sgmzmfi16qgvx389hvxsfi28wccpm5bh3"; -"inputtrc.doc-0.3"="0fcxac4jsvhnc85p9nwpp44ij0yq4q1lxlw42dzhg88fdkl57srg"; -"inputtrc.source-0.3"="0b6kl9a6ilv0i5xnlcfjgia40ynl28dbz1rvcvak3637fva07ghk"; -"interactiveworkbook-15878"="0dibc16gdam4yxil37y2zsz4cnfiq2grm6qqj512nng4zqnwcdj0"; -"interactiveworkbook.doc-15878"="0nh4zm37xipvmv5h6yxy1ir2gkjy23h22j8dnz7m04w021sgx7i2"; -"interfaces-3.1"="1d2sg377lxrwv0w0zdhxdjsnb8sbkzadpp29h4jcm7v6qpirs1wj"; -"interfaces.doc-3.1"="00dmb0jq7vvf7xfppwmw1pps6453rv438qkpv5qhlamqlvx2b28h"; -"interfaces.source-3.1"="0s5gfwv1izv3y3z3lmfbxdw06830lzy85f7vza4i8zcdwf775pl3"; -"intopdf-0.4.0"="1qd594mdjbzpfcv7km0m5n60h5nqj0mcza8j766h84dp3vw3ni8i"; -"intopdf.doc-0.4.0"="1dwlpcjh71y8v9k0yqmlk9zr7wgyamg77hz0nyb7k0syhaw6q263"; -"intopdf.source-0.4.0"="1g39qdshq616g7s3c31maihwmdiayny5kbm3rf0djmfpgs1rxk8w"; -"inversepath-0.2"="08xivnvbyhaihb24w14b908927fr73kbk66x82nv9j332lpmfgmd"; -"inversepath.doc-0.2"="097fyhn6dj9d8hq26xads2s7vz7hvixwl27psqrqqvhdlq3bvj7n"; -"inversepath.source-0.2"="09d3dzckxrg9vdxh84nx3xzwj3rfarvf0bpda4qib179bgnqrf7d"; -"invoice-48359"="0z2ixjxicphaya7244mi0gdnxnv3qawyxpa1kwv6s0r8li4604k0"; -"invoice.doc-48359"="0ki54z1rlb9xwvsgd2bxv2sb135cc6zh44kpww0mx76vcky4az1r"; -"invoice-class-1.0"="05vbh1iclf9gj6nzradfvnqa7yp7r5c3ccahg3j7qrdkkb0xj8ig"; -"invoice-class.doc-1.0"="0myl8pvvfzd5jrlva1cxkps9g6jr0lpfw79wr3ghv2idz8ba85x0"; -"invoice2-46364"="0646sb8da53x6aybbfijk35cibay4pnryq1xq2nzikdsf8i5x0x1"; -"invoice2.doc-46364"="057a73iw33rpsgpxcg13jlpcfmcmsq68jdz0fa3dhz964nf2xkpz"; -"invoice2.source-46364"="1z4lilb3h8gp64lgw7xbcnqfjf0lmzv760ggdjhmh5ibdc4ic58l"; -"iso-2.4"="04ifwh4vn074cnibyafzq59zjlnlmdfyq03mqwk44r1mgmizizdi"; -"iso.doc-2.4"="1bnh34708psjpbhcddv87axjhxiyfjic0mamlpn3z58qcm0jb2pz"; -"iso.source-2.4"="0gaxih730r70xgy84vbqz1fqbdr1w9fg9d1hszp0kqvqaypfmcyg"; -"iso10303-1.5"="14wjjp2iwb7l8m01cinmpm3g9hk1rpjx4a0rc41y614ah5bmi4ry"; -"iso10303.doc-1.5"="12m0rri6l538iyphsh2abcvllckg566aj1487sa9jc4m56armvj7"; -"iso10303.source-1.5"="1nnfz5r5hk0rf1gvwrgp4m7jb5lln1cf9pnb46x9l9hyiagq5din"; -"isodate-2.28"="0xw8356im72iqi67nspwkhafrwl46gb3i41yapnj0hqb672gk4lj"; -"isodate.doc-2.28"="06m8ic0nsiy5bsymzfhpia9i47kbpwqmnbrvmsp44mw5g2ccjk41"; -"isodate.source-2.28"="14b1ymqd6qbcksnim642py5qs5n6g2sy207apkx9mnhhbqa15an8"; -"isodoc-1.12"="06ikl5zl5l6fmzwak6vq6zcfz4z2scpw6gx7nvdrd6y1s8vp5h27"; -"isodoc.doc-1.12"="0ybkmdz34nxyxsnxjhd1z2riywfkrxv77969mnwxip60lny6mkrs"; -"isodoc.source-1.12"="1yxp0k3bvy4fynvnlpyg482sd2xjb0d5nnkcfxjqq8wkscgr3vxl"; -"isonums-1.0"="0nqzapahfvqg59zxrgjiyywkh8zb8mz9gdc2733r78rxnz81m1ba"; -"isonums.doc-1.0"="1axq0acxk6qhq42ayr0zjs3356ww3ryidvj2wii2c00isw0qip1w"; -"isopt-0.01"="03skmw4hmib197p3cfbhf3mbhq5hrjavwinwc22drqmca370v305"; -"isopt.doc-0.01"="0jxwzfysw4qsfd1694grnzs2jfqcbhm40w1xlgcsrq2ylgcjhr8q"; -"isorot-15878"="19x89d5fvjpn66y8ma1h24dwapw2x6a4nxbw4ixp7xqkycyhy0wg"; -"isorot.doc-15878"="0jrglpxxks1fbwgvmx0w3fjcnsfbf805jv95kawvgz1ix3mm71v3"; -"isorot.source-15878"="0rfc2jdd4f5yds516lr9m28izg3lbf6wwvpsh9hrl466dakgdayz"; -"isotope-0.3"="066b5jw98ynyc15jigxc1idp79i89hwrq19rdizzx90s6xfnxlgn"; -"isotope.doc-0.3"="00w5bxh4dkph9d4z0x8h6akcv1i2a3b5vfr4xbvq1n8k4i8ss7jb"; -"isotope.source-0.3"="0x8vrmprpgpgbxp3n886yajdd9mv27r9shkyz9mp1bd4zakdgc8f"; -"issuulinks-1.1"="07rpm9kcfj3dxsax8kp5r5mvrgg1c5yrpbiirsk44ybjjkhhjscy"; -"issuulinks.doc-1.1"="0qlz8y0sszp1jsnbbgaj9h2zcz1yqk827pwzccfi4wdj4rcpvvam"; -"issuulinks.source-1.1"="051b05k40zs5amjxnqav6ibdvj64wfhcf16a2hlkaf5kpmpkmh54"; -"iwhdp-0.50"="1snry29lnq4cm6ybwqi29lhyvn8g3zmqbsig0kwnywa92dl3mnl0"; -"iwhdp.doc-0.50"="110x1wm1ii7b5r23zng2dx4ly8vqqwr137gfl15a6v6hcr4zxvqg"; -"jlabels-24858"="03fpym9q84g1b0pns6sdsb4jx78aq7sclr5fkm05ckvkk4v3wmsj"; -"jlabels.doc-24858"="09qa8y6axg9pvma507b9w63dwd2jrxnmd64f5rfd7wpznamhbc0w"; -"jslectureplanner-1.12"="1kciz53cg9p1f710j5rw8pilfmbiz755a24dqxckam98jy5g4b8s"; -"jslectureplanner.doc-1.12"="0lcq9dygfjrs63yjwdkjkssxyfx6phmbydh6c8lcfpkg984pfg5c"; -"jumplines-0.2"="1d5w5nh0pkmhjjjq9x2n4r72ygjh2mrbdr23vsrh8cyvj3xym4w1"; -"jumplines.doc-0.2"="1q0mzjyfj8vfp42f8m11g6fyx60mb33g5n4i7pw9r0dfx8y4jvpd"; -"jvlisting-0.7"="0ry7gnzgl2d6id7xgpbdhg8pj920105fd9qyx1a0riagp0pgyryb"; -"jvlisting.doc-0.7"="16z6amx6czmipal3sbqmdsc1v5x1p4nyy5wxalicy1dki1f4zpyn"; -"jvlisting.source-0.7"="13al33s01bw43sa2ffz5zlxgaqvhj8lrcz8y7x9xx43wvvxjmdz9"; -"kalendarium-1.0"="11f8zkjfxbk5w4y49vy712ivfqx66m86jdddygfjskp47gxcxby2"; -"kalendarium.doc-1.0"="0rbac32h90cnp318a0chj1wfzfrvz2y140siqv5slld90f7d5546"; -"kalendarium.source-1.0"="0virfajl7xr8yiksxzmr68dm11m4240drg7xn72gxbs7jfh48wqy"; -"kantlipsum-0.8a"="1k4ilpfxa6a5prm0rgbrjw5jsr55wyadj8aq1r4hl3q953n64mqz"; -"kantlipsum.doc-0.8a"="0pwwrjffc2525krx7p2d2y0zx3zp2yj4x0010ah8k88ix78h47xf"; -"kantlipsum.source-0.8a"="01p1gccy0a7nsyph5l1g370bsk2d9pxc45c87j88g8zjizllfkja"; -"kerntest-1.32"="15695a4q6ikdy6f9149rblfc4fx25hmpyczgr1z1q8x4s5ar7dr4"; -"kerntest.doc-1.32"="1fmpngs3q7pwf4z284gg9b4cfw55afdsnzg6qpanlryk6czbch16"; -"kerntest.source-1.32"="0gwz65xgxii7vriw5sf1zi4r97prf2c3dwawr3ghhgchmblimf8l"; -"keycommand-3.1415"="062i4fr9h2sc1zy3ybyqrq5hw4g3g54gx708rrznkl4zmpf93ppr"; -"keycommand.doc-3.1415"="0ls9fbm0815aar19hg40p91n1iyyfhn68ndhvapmwfsxhi6f2d9j"; -"keycommand.source-3.1415"="11blfbqdn1a00bfdv3nwd7501pd5qrkk7pqn2ffir1461xivz26f"; -"keyfloat-2.01"="1zw3wmhjx6inalww7dy5564w6yv87cjdn8kb06b7qnzgh1xyk3w9"; -"keyfloat.doc-2.01"="1wbb6i1l31193i83x9jd6qggiyklvns6ma0ing2b2gqsmwaisbyg"; -"keyfloat.source-2.01"="11yylandkr8cryv5yvwa4x356vzrgm5wkabcvqasmndid849i55p"; -"keyindex-1.0"="0fsszjcw1r3kws565pgc5j7chifbkf3dh1hnlclwwsjpxbji4n6c"; -"keyindex.doc-1.0"="02n7lxz8pd49q9nf6pavhs01410zj9pbszqqbmk5c1ld077276x7"; -"keyindex.source-1.0"="0k3img6kb6v853wzmhsrrhx7lrh275ssx57b83vk3yx9m831qwmb"; -"keyreader-0.5b"="17cfxcn374q0pgf7bbqwc0yrk6r15d79h39hzbvf7yrgj4r3880y"; -"keyreader.doc-0.5b"="0fp2hv3azi287gz129gqlsirw4dr1d5lqhzxliyzfy8dd9b2cqb7"; -"keystroke-1.6"="0h0ci8pslybspsnpmv73qml22592vp5lr50qqppyhw8qkng22gsg"; -"keystroke.doc-1.6"="1ig565mxjnji3ng8vsc2wa3jyp6mrhma4hnb3shwnrj9g2kvj84w"; -"keyval2e-0.0.2"="05ssgrl08d55in1wkam99bfdfkjhjrda6j96b6nmj61sp97yg3ig"; -"keyval2e.doc-0.0.2"="02ajr27zgfjk5hwmqm05gdapkg3d3rk1k9k3nqm4nbvwhx5sahg5"; -"keyvaltable-2.2"="1wxrxa1qfk9c18vnd75kvw62w3jcjyw8x7z5jbr3854v2s7dr8xa"; -"keyvaltable.doc-2.2"="19262vqgi7d5lyki08rqznpx0442i8z280grs0l8y04hdivlr3mf"; -"keyvaltable.source-2.2"="1j14vyp20r7wnylpmik8zfg5zcbva4rzxckazk21xjapgpy9w951"; -"kix-21606"="0w5qaq50wki5b3s3j7p11akx7mb8z1khchhy6093pzzrny0hd5c0"; -"kix.doc-21606"="1jblprmz9vfriqdmi9ihh3ihi7pc9wf9cp8qfli89iir2xy7lv3d"; -"knowledge-1.25"="1zi402k1sm97fc3wmvwzrwkx1sipik15nb30rm884q721mlamw0x"; -"knowledge.doc-1.25"="0vkjyjn900iwmazsy7jjqb0s0y8xizv2vhfb9a4sd7c4y2lcr0vf"; -"knowledge.source-1.25"="1d73hr632ml7v8y4sphl82vrpjk8z9ync10q82xhykd8wdxfzlnv"; -"koma-moderncvclassic-0.5"="0kgsbg4is158j1ssjwabicw38mh2cd4n1ggxinflb8i18xsmlgh0"; -"koma-moderncvclassic.doc-0.5"="0f070dxww75g36il70gmrx9bn0f0d3mmh26fmzqb5zmf93hyhcsf"; -"koma-script-sfs-1.0"="14qhq2h6pfjy878nkglbif7yjc12g6q32kl4xfc7kk3kf9syp0kf"; -"koma-script-sfs.doc-1.0"="1cjraqcc13bcq451a36i5x2sbwj97zy4srrpaxybmlisvnza7vz9"; -"komacv-1.1.2"="06df0hx1rm87vgsb1g8b00ak77n6zs34c7mb76k22fis41qmm3a2"; -"komacv.doc-1.1.2"="07sxwgrrik3vadlp9a4lk3jmcqnvfzz5ir8l33zi7sjrapr7mxxa"; -"komacv.source-1.1.2"="0vd6ha60dz9ddmf3rkbbw5h602fkch3zifcjip9nyfs7wgnkg3r2"; -"komacv-rg-0.9.2"="0hcf3aw9r3hr01f9109rid9c1c36gmg9z0258zlqgq9l8qs0bryz"; -"komacv-rg.doc-0.9.2"="1g985pnkhlhyf1285w9g1zx86vldyg45r4dyp1dq02pka5nf33fs"; -"komacv-rg.source-0.9.2"="15v5y47jj0393vkikpv5mqdrrygs66b20gsmp03j6v6iih52w7fk"; -"ktv-texdata-05.34"="1md2iv0csmr5f2mcdlb3lacccwifd6iv7yp6123gra5xcp06k4y0"; -"ktv-texdata.doc-05.34"="14sk7x2va8ja65a65fpksj2nd16v6rc1f0828gmm8j81d13cci6y"; -"ktv-texdata.source-05.34"="1ws256l59plnhmw1rycfznwpndni5i47liqhazddwbg2hragfahh"; -"l3build-55426"="1a2lib52a16c42hbcj7n8hddbbb94r5ghhj1kw75czxixlgrqgvz"; -"l3build.doc-55426"="1ka2lkcmq33933gz8r8kvsaarsgczcv8bp5jplmq9mjwnxdgig8d"; -"l3build.source-55426"="0rbkhc3lcf8zniqn4crdqjrmsl3gqyhzb2bpp0sn28sa6wm4x99f"; -"labbook-15878"="1qh16jjmpyqdfndfs91nmbfhwxif5ygk35zlsailngpgnp1r2x7s"; -"labbook.doc-15878"="0za4mp2zq9s1z90sgqcvf6zac7w0wqbf8y5w1qrwmlv6r6kg3s1s"; -"labbook.source-15878"="0w7nff8c2ffrn2ywz1dahd8n4cb959b6zf3ka0s913nv04ifdkgi"; -"labels-.13"="1d1lxzif4f3qxkall0qzsn4lh55ljr45zba0xwzyvfbwighp1vvm"; -"labels.doc-.13"="0fl3as2lwdga814fdlg2pwyw600cvrii9hd0f4vscfzq7lmw01k9"; -"labels.source-.13"="0y6mkg18jqsbqj14h52317d1vvzvn3mv89q2gl4i3i89ka3dfajh"; -"labels4easylist-1.0"="10pfzxw0d856ki2krsdpidnfsk27mg4k0vj3jx7pry5cfirx6m0m"; -"labels4easylist.doc-1.0"="145n7vy3d0vk3cq3qd44l3a6hjmazipm7wmr4aa2knxvs4nyvw2l"; -"labelschanged-1.0"="1z8gjaqqydwf0mkbnlbzd7q49fdj8c83pmcwfhi27w5lnyb897a6"; -"labelschanged.doc-1.0"="1rv3vx641hzfkckkjkf31xdb8zx3sarcdpnsjzhnafzy0y1vg8c0"; -"labelschanged.source-1.0"="0n0fdxj14kb1bk8zj3mnhnj6q5nf6h4swb7lwgn8jv0l5z5qmp25"; -"lastpackage-0.1"="0wjpjd3b48fj4mqqdx38sqalbaa9ab3c6rywyjqhvrd1pxfap2g0"; -"lastpackage.doc-0.1"="1123lz0ki4kww93952wqrhrw9l2cnk4wrrwyi0dxc5w1yfn2gg87"; -"lastpackage.source-0.1"="176fk84mbb6w5ql94381kz05lh8q8im7ri6rfjff7f4ymfjnh2jk"; -"lastpage-1.2m"="1wmfi6qz5d58vfk7yvvaj9dp6hrcnf0zsscgb1y52hprkq5cx1np"; -"lastpage.doc-1.2m"="10fnb5b85r1ypyfx0c3a119da12ay2412kld6rxqckir6nfx9v4r"; -"lastpage.source-1.2m"="1nysnljrg0irgmjddsyhpk8d9s02wr9g0h9ldpdwlxkrvvj82nk8"; -"latex-amsmath-dev-2021-05-01_pre-release_0"="1q29iyi6hiff7qyprffz0i527rhnfvyfxszsc9dpqvpgw20zwdqx"; -"latex-amsmath-dev.doc-2021-05-01_pre-release_0"="19k9bdm04kba8in8vd1xmw045nl4p74r0c73kf18z14b8aa3iw0q"; -"latex-amsmath-dev.source-2021-05-01_pre-release_0"="04cq98iz15f2yr2749yfxlvljzq3hb5fmk6r7mzz806z7pvy0vig"; -"latex-bin-dev.doc-57981"="0kig2hc245vnmhfnpqvxiskbaaqf0fv8j569ihsfr1fv3x94bdzq"; -"latex-firstaid-dev-1.0k"="0spc5czykhc13hfr6fw1lmdxv2m2g0fiymz2s3ch61ad6263p54i"; -"latex-firstaid-dev.doc-1.0k"="0jy0h4njarfv4w1rdl1y35p7i3la0hfafvwnms3c3j8jj2rf3zh5"; -"latex-firstaid-dev.source-1.0k"="0cdbcj16w2h0mqm5j8a5g5z4v0gb8mrgjamw50a2rb7g07qwwkca"; -"latex-graphics-dev-2021-05-01_pre-release_0"="05wyr9z08sld644dfdzj9m6v4j59b75yzj5541lcfkp8rl4ailiq"; -"latex-graphics-dev.doc-2021-05-01_pre-release_0"="1idfhdlhdxd3lbbgvjpb19cg2bfa2244q8nkqqpdqw7zd4vg6afz"; -"latex-graphics-dev.source-2021-05-01_pre-release_0"="1ylzclvgzrhyyfgsch0hh98zbnd9y4jrf0q8fq2xzyhll5nnmzlp"; -"latex-tools-dev-2021-05-01_pre-release_1"="0zfxs0axp7rzw5xibh60cfjywi50slap3y6gqi0nlwhibp7655vb"; -"latex-tools-dev.doc-2021-05-01_pre-release_1"="1ggh78ifrn52yyz1fr4j2k0zkmhizwgfvabrr2bfmpxm2a458yrw"; -"latex-tools-dev.source-2021-05-01_pre-release_1"="0wmp1cvpbbm4xfmbc2mj64k3dby7yr0q3w0axkfw2bv3qlrvp4nr"; -"latex-uni8-0.03"="1sv4n2v0m3lck7x320cwbay23k7r9fh4wm1vxg9m4grphc72n2b0"; -"latex-uni8.doc-0.03"="1y3p08mni1ng6dyp0g98in7hh3mbzqq42249idy90vjhc177rjc1"; -"latexcolors-0.1a"="1wpa7vw8vphdghdv1ap5ilcgzj5n6vyvn4a6lfvswg2d47s5y1a9"; -"latexcolors.doc-0.1a"="10bbk7bs1km97hpzqzzfasxzp0w202y8w7pwyd465ygr4y19wj6l"; -"latexcolors.source-0.1a"="1j7vfvyj2k4q9drmkmh3mfk1g3vs7czn1x16fx9jyinbdxnwblnh"; -"latexdemo-0.1"="1dw7p679126br9gl9pmjcc0f596314h67dzbbq0ypsd2yb0y7x1a"; -"latexdemo.doc-0.1"="0bnh076zi1mqmvf2x24wp45zndyak6y04z3x56ah0p6z96bg29lr"; -"latexdemo.source-0.1"="0ddchhzfg9s15i9qvxban35ncavcn8bj0dyhkvr3m8g9farv5mh6"; -"latexgit-54811"="1kg9cbz6h70496snqqa2h9xfknm70qf96xyvnc829k5v34jskmi1"; -"latexgit.doc-54811"="09rlc9nprx6590snfg7gakycsam37wmmscybvm48vdn271vvla9l"; -"latexgit.source-54811"="1pn4gv4prwsnnr377xg2x3kf3kmi8pxgczbi9knzavkd53653akx"; -"layouts-2.6d"="1ab9azs06k1p0s3n5zjhrykpqac9fi3kr3w31xmh698zpsg3jq4c"; -"layouts.doc-2.6d"="0ydpj4mbjyg6qy2wmj90rqfpkcq30pws5d11kdr1gcwbzqqkgbbh"; -"layouts.source-2.6d"="10mfwi1wv5v0qdwqj1mh5q8izgavlhclnz2aj8h02ijy4kzgfg5w"; -"lazylist-1.0a"="06p4r8q0a0m7pmbbcddxn5xc22f9zhvl2a9q0iv7ibkvgyy6pqja"; -"lazylist.doc-1.0a"="04x6ai73z7cqs7k9vgicxfcnvslr5812dlzqrspafy8w8qfx37jy"; -"lccaps-1.0"="1iy7ijsfpxcfr3d824j66ahcvmc3p21nl0k94x8bhfrq98qzxmrp"; -"lccaps.doc-1.0"="168yq8y5c31d9h31x081wh7aifsq0bs66cvk464wciy91sxyf34y"; -"lccaps.source-1.0"="0q3jn7h2b1dhdshdj3gxwwdg3gfrz6n5c5sflacgpzc16pn9gbca"; -"lcd-0.3"="1r911gvxiwwh7vvjhgi034j3x49n2dxxvf38zsldmqaj4sccfky9"; -"lcd.doc-0.3"="08id9jhafkmhypjy72d79v2yr2jgm6pjf4yhaw5279a4063a4f1r"; -"lcd.source-0.3"="0vkgnhkc1774d3g7r6sv7km81dvdrbvzdlk7jca6q40nnqw4zbw6"; -"lcg-1.3"="1zgpbj9zim5dcc5c2lf6hy33hzzk8cmirqh8kv60bsvha4hwvzi6"; -"lcg.doc-1.3"="0fnpj3mdxd0v1lrkp2ywb184bay0j6vc5m50jlnipjfjhry68n15"; -"lcg.source-1.3"="1al9wmw475g30jw8lwx709r0p4lq6p2p9n1ky69ncyy42zp79ld7"; -"leading-0.3"="1ky6c51dcx0gsj8f6zrwb242d940cjml0gb258ags5xi5iaq40yk"; -"leading.doc-0.3"="1l31zpglr1bz0gif3w7kqzhd37zpcgjig2ly84fcyk805sf7nncd"; -"leading.source-0.3"="0f4ayaz2m0y87ifddl4622rpf858zmh13xafp53nh96b8pyvcip0"; -"leaflet-2.1a"="04fvi31wwpsnkpsni3r6f9m3vr8b6h71f2znb79aban9g1qvnyh6"; -"leaflet.doc-2.1a"="0f82hm37i7w547jpmxkl8a2k4f92bw29vdzq4ywwllk2hdcq3sv6"; -"leaflet.source-2.1a"="0igkl1rjl14raf3xv631c7sn0mc1smyc44mldwgzgnzxxkv5kzzf"; -"lebhart-58503"="04gx4wmrcs6xmw6jh4zd47425f44z9vj6hkrwyj0p0naqvs9wzb3"; -"lebhart.doc-58503"="140sq1pyn8walsyhxrmz6kz87y4dw2gcc5rbwiykz7dgb1diikd7"; -"lectures-1.0.5"="0qdhkf7z1rnxm2ql0ywfk11y3aqp8yr1p9202d4ha6729n5pyima"; -"lectures.doc-1.0.5"="1xakcm4mmhl4ahnvcpn7k748v4j2m8p6d4p455claqhf7xg4jz15"; -"lectureslides-0.1"="17a0zn4hnkr8mp6rhmm5snjq85i023r6fjpmhpzbkw37l40lfjf6"; -"lectureslides.doc-0.1"="1rwcpga5xk5kns62mcrkrcnsmb13klvykzvclnm7w76hnybd0f4l"; -"leftidx-15878"="05fi4rp3s0s9ank7pphdwxnlnanc2r88dxhyxbz64fb26sja25gy"; -"leftidx.doc-15878"="047a5clwf0r43r1j87k2zfv0pa3nrii213y0zhv5r3zkmwvm1qky"; -"leftidx.source-15878"="0a8rzkycppx8qayqw3s7ndzz2xp4zqgx3qd8dp9s5ynlm10020nv"; -"leftindex-0.1beta"="16p8n98cw5kxah37wv263mq0jg4jq9f2dfzjyy06sadjwsbf4psp"; -"leftindex.doc-0.1beta"="1g5ykrfix8d6k2cg3nsh6fp5ibpgfajxgf9qgff4s99ir2fgyhrw"; -"leipzig-2.3"="0wml5k749fgx3vq10v4vc970h6nqm6qflg2z4jajph1h38kj2ryf"; -"leipzig.doc-2.3"="0znm18pkrf592jfgshmr0d7vk4d4yq4wvj9hqsfg9nrjd4l6a66x"; -"leipzig.source-2.3"="1sxqsgahdr0srk52iqdacsqn7sc73iv0n70nsnpvgfsczmxa2djj"; -"lengthconvert-1.0a"="0zjyynjlq48sywr5gyi6nhryrp8hcl41q1djjp73ingi2h2svz47"; -"lengthconvert.doc-1.0a"="1id32l1ipcilhkk4w9w2q8rfjlk99f5jphvq1hjvqdnhz4q1rk69"; -"lengthconvert.source-1.0a"="1zy9bnibswz834k24fk5srl0ahx4i4hlrqv6vnvwb3h8z71izc3b"; -"lettre-3.002"="13h1jsgjp5k82cq4rpx8gd114l49m1pzplksrwjylx0bzimlzgwn"; -"lettre.doc-3.002"="1w82fhhcdgsxwsnprx2p61ygsyh525im8j1zalcw0bji3i6pm06i"; -"lettrine-2.23"="150hglc6slr9ddy0fxs4r89p1x1fmzafr3anxi2c3qi117mljmra"; -"lettrine.doc-2.23"="06ni6clial2kx4gbzp7jd0x30vmzqhlgwdl0dfrgg88a6d2xdsxy"; -"lettrine.source-2.23"="0jcc7h3nphqivw47wllykffgdzx0hbap374hmmmkxrarmbligcrs"; -"lewis-0.1"="0ws9vk38j3m0sprl9lak2sjlq13nalcysk95gv68h90x04jj5zdl"; -"lewis.doc-0.1"="043kmzddal693kl6fds0xl2wwmyzvd9cqs8dmy1jzp0mdi6qw6vn"; -"lhelp-2.0"="0j55ilp7wn1w8vs60k6iangc9h637f2jrnpshh9glryxj9jjgxqn"; -"lhelp.doc-2.0"="1is5s8iqyb41fr2hr1kxf68xrlb8hqw3v1fifl8645dcgp8lac33"; -"lhelp.source-2.0"="0iyp664cy3n04nn4499ryzx00sr1iip1qmdlpvjx010r7hq4dyb7"; -"libgreek-1.0"="02a2jmvyi04d36v1v126z2mmyqn21vv9s7hblf5l8xsrzrgp309s"; -"libgreek.doc-1.0"="1g8bqscj526xlb5r6y3zsrdsh5d3xq7hj4yj6zhddnwang524ikc"; -"libgreek.source-1.0"="1xpppa9c0rk9bhx9pdq274x2zmyrjr0fr0idj935p9a65294ypps"; -"limap-2.2"="1hdv2rlvxbqm2wnn3x2xrmwxpwbs03qnlfj7k1s8mfpp5smmhd2i"; -"limap.doc-2.2"="1qj9ddllgvm9zqjvfdgg2sfdyfzpp8raf8n1l0zrg9vpiy2imdn3"; -"limap.source-2.2"="0l41pd8xl969ax257lrcnkxs0pzb3q1fmiy8ijz9jfrval3rqqbw"; -"linegoal-2.9"="1arnfkijq4324jzyq2sn681rk9ncbgv6zqfrvlbs3vic8wxj5c20"; -"linegoal.doc-2.9"="0mjpbkf6vw0n4ddd9abrah7rxf51gmgayspy6jpnai1wrzv0aby5"; -"linegoal.source-2.9"="18v5r4hj2jpqay98njcyijwvrbc067c49jrhja6i52ddj6h9q4wz"; -"linop-0.1"="1dff205vbsayq2jfyk0vvbz5yks6gy2bm4ylwwk28wmi55fqjycp"; -"linop.doc-0.1"="134jxv5bqklpdhd3wfbqibsp21jspmq9iv3fik2igwsbn20dzw4c"; -"lipsum-2.3"="0d5pm9v9ipmnzn08h18g8k30mqsf48la63m4amq16smbcrjcz31q"; -"lipsum.doc-2.3"="1q2iyvhh36f2jg4m3cfhszb3slfnv7hksf3ckyykfm3h25lj324q"; -"lipsum.source-2.3"="0z9f2cgmimixwml3h51bs6yvz0zjvy1b634hjhpqyy1b64lvsmph"; -"lisp-on-tex-2.0"="0g33w5hwgpw7hd62lij0h5n89n9r9ynlxswb34j0aqf3x7nsdh8m"; -"lisp-on-tex.doc-2.0"="0rgjcldb2rg330cp8m5vxbi380xla73jb36nn94b2awl4g34bpvd"; -"listing-1.2"="0kpf5svycd71r8p61y83wx1k99fwxm95qz5fbnqkfrq3c0113h3p"; -"listing.doc-1.2"="1zd0mxh0gxlvqrwxvycqr5yzs5fns0hrkn6g6b4m1v6njv2f9lna"; -"listingsutf8-1.5"="0scs9dnkl2hj95zgjiggn2ikq2nf62q97nnml3hbvmwdargassmh"; -"listingsutf8.doc-1.5"="1s7k2gr69xlxln2yi5wyvd69l2qa8v33d92b6ahgxxpid3437prz"; -"listingsutf8.source-1.5"="1bq197100f74sal26w0r4iv6ys2qa1ylbwbyw3hm9dlpb6kmdmgq"; -"listlbls-1.03"="19v8vx2ffza3icqlj0y710zc17lls87l3k2mkj6lc28qvz0kfp3f"; -"listlbls.doc-1.03"="0pd3812k1rqnq5hmsrcj32x9fk72jw1j3brcm8ajiczgv5f3gciy"; -"listlbls.source-1.03"="0vic2ffczicfdifdhd34ysdzcxprnafs4k9dpjlnfgfchh9jjwqd"; -"listliketab-15878"="088f2lm5lfbns7hd1m06f3zn1cjcbaw427z7zl5n47ahrvcz9p94"; -"listliketab.doc-15878"="1llrdgxp9mghs51sz4jjhbdllzlr1xgnfskask532zwn1cm6f4vd"; -"listliketab.source-15878"="04xfgaqpcskx5m8byysvd2rji31km9c6cbkfzf3ybj4a5bmbnq58"; -"listofsymbols-0.2"="1qp5y4rbnlpaa3nghlxjn5yzhskvan9rg0g45wqmg6yk9sdll5b2"; -"listofsymbols.doc-0.2"="15sr2n0bsvwz6jqgyspj6kxg511jy3fr18705pyp815hg4maxizp"; -"listofsymbols.source-0.2"="1sjg64imcxxqq8bsqm98954g47nfambr6vsyizkz8zqzmnr5vd80"; -"lkproof-3.1"="12bj60lfqlqvyk020lv1l6iinvqx4cvd6lfz4vhblfx3gs3xmcqf"; -"lkproof.doc-3.1"="05sppy6q0c2iangbzmxv5qxla8slc2k0fx62f6n2fg1ncgvfl7qh"; -"lmake-1.0"="1fk98049965cqqyzdl3yl9iblk87gwwrfccr5jqpdm5v6m8mcwrj"; -"lmake.doc-1.0"="19yqngjn320sng4pg835rffk6d2g3c5wyma46x1jr0bccv8s1990"; -"lmake.source-1.0"="1p002ywz3pxip5v4cd346nmpg0gi7wamlcl7bc6f4zvzqp0cg41g"; -"locality-0.2"="1b6xi8zzc9x8bc54bs2s6ryn7g2zfpy1zsdddlx3j8kvmbmgv6j9"; -"locality.doc-0.2"="0z0vrx1dy5qqgb2kx08qc2r06ljqnfsgiz58hpy6ylnlyay39ipl"; -"locality.source-0.2"="16xp8pc62jzgcmdhqpmfi54y5aaf7mx6bqgwslpwixgwym0i69qy"; -"logbox-1.0"="17qbkfkbz35c1a2v3agrpbkk1bxifacj4ccn3mh2w4kv8z8zvww3"; -"logbox.doc-1.0"="0kc0gldcfy4bshfkl7vprg80ywwsqhac4f81f2f0i6ql4jmlqwsj"; -"logbox.source-1.0"="1cj2gb5apapmhxc9vkypnq17w5fhnwdpp0qhi595gm5j5q1wqcq0"; -"logical-markup-utils-15878"="0nc8kgyplffng9429h0g4hynlwwxpcvnirxg7rj62zcjcg5ijqvv"; -"logical-markup-utils.doc-15878"="0x3j3fy8zd2vydzfa47ra9w8bqvklr2im8aq725nwpxbyyg3m8v5"; -"logpap-0.6"="0xrv4x46m54b4gfa805naab6fgpd72fwqnyjjxw0idy9kb3s3x5v"; -"logpap.doc-0.6"="1zb6qyxrqy07m65i18dcli30gb42y6c3ffr22cpxa7r8xmaprcg4"; -"logpap.source-0.6"="07cm2gcnv6d7pzc9d2v3bdvsmykqf00bbw177mqyjaq1chc0xpna"; -"longfbox-1.0"="1cm2zp8sina312n72bd1xza75yi38n1s2ach2f9sjxdx0m5c3ywx"; -"longfbox.doc-1.0"="1wd6hdarh4nm6x4qn789flnq69gq5p2r2pgybsynbna7ywar0l5x"; -"longfigure-1.0"="09pnqp0jfhsg7i8z241ggnx04j452zsg1zqmwy0i40fp2s36a61c"; -"longfigure.doc-1.0"="08y2a2922zk61iirlw24kdsf473sx0b44pjzxihmpcrf19vg2c12"; -"longfigure.source-1.0"="1p10y4nwz9wj321mf36avl3w6zwvspnb9cc92h9jf4iawnqyp8p8"; -"longnamefilelist-0.2"="1nz5n1g65fs7xxd4l0c9xdr2z46mxhb0fkmf5id4hrifrbl3jxbw"; -"longnamefilelist.doc-0.2"="1v8i6ax2qwz7d7mi0bnpyllbqyksdd749s8pr95jfw1fhi07i5fj"; -"longnamefilelist.source-0.2"="1615gzf3rjfr1nlmpgcrvmlzhif13g3kn210xq8p0vsv20irnqa3"; -"loops-1.3"="0hml4j8l5gdz1c2qfpsqdpha5dqjqx545am8x4vzs57ga7j2va4h"; -"loops.doc-1.3"="1jf63snh8bnyi1j16mjs14nyqr4bj4rjbwd3bs1xd30i54d5584s"; -"lsc-15878"="129vlr2gnirf47vs1drcsml3w4jcwg78hmya4r3nspaqm00b17gd"; -"lsc.doc-15878"="09faqnv9k96nwjcvgmml9f02vdj5hadbmb1lp59xk6jikvybv436"; -"lstaddons-0.1"="1yyfgn2bdlb5gjb2qicx837wl03djpi2cwxzds3bp3n37h52k48c"; -"lstaddons.doc-0.1"="1lxcah5zmmgv25hm6a3yfls7ysgg9dfzdbc3whdvw11mh3pwkiw4"; -"lstaddons.source-0.1"="0bbppx159q28sak5i6hj6zm1kqdgcn61a6kw4gcvhj536vnd947h"; -"lstfiracode-0.1c"="07fdzwb4k0dv2mf6yl31h58i61hmw0gfpgrjdnz3v2rnw1ip8kgq"; -"lstfiracode.doc-0.1c"="17a8sg0srw7096r3h7qa23msi6pq0dagap3a0rcpclp73z3gh3wh"; -"lt3graph-0.1.9"="1w5n9y7pqy5zmn6w9bx58nnawvhp5467d150qxnj3c92gh0qbj5i"; -"lt3graph.doc-0.1.9"="157y7a7gpgm6dc7hawdhxr0v3ns5kibykhkg3wfb5r5fay47jj4n"; -"ltablex-1.1"="11gazci0c064iav6124v4szdbj38anqwnfgh8pfpdq9zff0h9g5n"; -"ltablex.doc-1.1"="0jjd5f3r67lrbl4vyxjakm8l8pdrw9vm1dzhl5305ga8vvwb7gn2"; -"ltabptch-1.74d"="06ww90fh24s6lmzyvmqjh5gcr7vp3lq6cg9q6k6194g4kay6yx5i"; -"ltabptch.doc-1.74d"="0yb41cgqpgcxk27259gfz14v9bpndjg51i9nmwr1qwyvaqd6jvjw"; -"ltxdockit-1.2d"="1krcr5qlz0648ibj5c1jd0y4rf6rg33r0clyvdjm70kq26y1lqww"; -"ltxdockit.doc-1.2d"="19jc49p978z0hrx7p19h33nc65a7vjhlrfszwvr6mln01la3ivmq"; -"ltxguidex-0.2.0"="0qv1p01y18ia4w53dvlfhdrgy1xsicaigcas33xs6yqipr8cwgkp"; -"ltxguidex.doc-0.2.0"="0j4h20bblkwgdjvr2ihfy32mzyb9parbjgiijqf9sfg2k2p7xpib"; -"ltxkeys-0.0.3c"="0yc0c6hh8aiqm695by6229qqhv7ym1ssz6gpysy6hb10qrqbywkx"; -"ltxkeys.doc-0.0.3c"="10v6gw41aa4ndw2x4rwyq9x66hsdl4l4j0682dcfm4cpc903caga"; -"ltxnew-1.3"="1sidvpbqn5b8szbgysi1afbw5lw1cm8ivhq12sig0z4z4ljp3qf5"; -"ltxnew.doc-1.3"="1f69xq5753iszfa2yr6dfmz1agic26j4qx7kkw9j23nhm7f0lvva"; -"ltxnew.source-1.3"="000dh3d8i57vsa46np49ml0sb4j1n3gnpcfi1ghj7pz5bn9br8w5"; -"ltxtools-0.0.1a"="0ldvvkvyw1khfvg80ana7wj20917sjzf0lsp4699hf4jvw71w6x9"; -"ltxtools.doc-0.0.1a"="1j51wpw06jz7xb6qf6nc52r5fl31q6zhsdm3v2ngc1hd03dcxpic"; -"lua-check-hyphen-0.7a"="01q4j9bb19lf838pd7l26rkz1xr7mxcx4fsgf5xd4sdif18h56qk"; -"lua-check-hyphen.doc-0.7a"="0iaihbrppn1ap7bqvn37rk8b6m4lwdi8w4zkshiqya1mphhsfjg2"; -"lua-physical-1.0.3"="1c9dxz9l92gmgy9zgjsq22481k2pphwdglhk3z6c2d7wsihps0kl"; -"lua-physical.doc-1.0.3"="005b7qmyv2rqp2zs5gi8ikxfqhk7cr7havyg9ni0jl5wlwn1a4sh"; -"luatodonotes-0.5"="15syf4k00shgi159j6ja182k24xhfw71zk167wwmy57y7kwm5cam"; -"luatodonotes.doc-0.5"="1jcybpcd500lzkwa33zdmsq3svb9hrh8f56j4qgwm9cq4wb721f3"; -"luatodonotes.source-0.5"="01km6y8ajgaaab9j1bdp4s8gj3iw5b7cfdl1yngp41ph22888aw2"; -"macroswap-1.1"="0p35inib3yiblfhiy1cpvwahiqrr309fks7r515s21ybmw409v05"; -"macroswap.doc-1.1"="0w03lydl6vwslr17h4px8ddjld0dqs5zd15sysv0hvqajw2fs0kh"; -"macroswap.source-1.1"="02zfswma4h70swyy6znvhr54a38wq1px3f5ypz7zy1k26nqi25r7"; -"magaz-0.4"="0ah5blj8qfjqgnmygn35r38nj20sjyi6yjci4j9b90d8pz9w7d6n"; -"magaz.doc-0.4"="041cb5rqk5ldvbcqr8w7jnfi4krlc7g72ygq5j7pi9gy04d98mm0"; -"magicnum-1.7"="1bl7lhjk9glvbcn4lqanb3zprqigvxj07f5nm8zn9vpja90fyn6n"; -"magicnum.doc-1.7"="1as8l73v9bamajin552xb4xqs08ik8sq22kqdc3psisv4f874kk6"; -"magicnum.source-1.7"="1kp0d8wgphbh4mkv1qf9h2c1f2nkzqn9q8fln4v35yx2cay679qs"; -"mailing-15878"="0x2mgcmfmppzqlwkg5jd1zfyvfdjnrvnk8glby93s5nvp6i6g8c1"; -"mailing.doc-15878"="1aif16654381jcczmfn44k8v8x60clq94z4hcwjsqhai6s441hbr"; -"mailing.source-15878"="1cx0pq1qmkn6k09x1r8mx7dmpwvdvprmvwj45p1k7mmfcvq2834d"; -"mailmerge-1.0"="06z9cb353sl9q6a7jbvwwdd0zk3kw5xmww0r3sjiqampxib19i9j"; -"mailmerge.doc-1.0"="1dk2a71x04nbc0rcmd3axhz8yikzlw9ab1nd5k1ki7pmclwkscdr"; -"mailmerge.source-1.0"="1qkmlfc2dvjhrh2xcypnp9wansxrb9wzvniwfb7sll2bxjcfbs8c"; -"makebarcode-1.0"="1ixhl4k89mng2dqfc0wa0fq52xpafp15gghnyx28d9j1163wxr7d"; -"makebarcode.doc-1.0"="088wkffs4b8y0clgcx1impzbxck8klm32dbf6p1jyc2vpi848irk"; -"makebase-0.2"="1nmlgv76zy1ajfzbdv7hizby3hhciw41s10hbnlbrfdl27w14dpp"; -"makebase.doc-0.2"="1vxwgjk3dj853qbvy2fyqzni2qkkjhslf17xvxskq97w8fcqr13j"; -"makebase.source-0.2"="1f8aliax01b9ir5wzk0bjhqzicl26xa63khx84s9haplh183qk2m"; -"makebox-0.1"="1v2xpiabjcgyi1d0ifpvzcll8y01lzs48bs19nalv37jw7hkrr4m"; -"makebox.doc-0.1"="078bz2pism9harcyb9lq8kkrkq984zx2ya47yhpqxnrd85kgcxfb"; -"makebox.source-0.1"="11gjpqmc6dzccv3yc539ki64hzpn8ns0zzjvanw7afbn5bkyrs91"; -"makecell-0.1e"="0238il37zzshzl3qn50hav3wa6rd25k7rp5l93lb9g7r476sgvrj"; -"makecell.doc-0.1e"="0mf4jc9rv66qjnm3ldrpx5lbfw1yfqy0jsvg8d3wdcwvlxpcrvwf"; -"makecell.source-0.1e"="1vkfkfgjnhx5byipkrzb202w9jvmnjc2z3zjih6y61yizccwm543"; -"makecirc-15878"="17y2hm6p280azgjvskyig34jyj90zngswcgxc7xa2h8pljh1fqka"; -"makecirc.doc-15878"="035l3s20mvy61rnmsxy62k6iid8lxzwhbkyxa1hblfnmya7rs0xf"; -"makecookbook.doc-0.85"="1abzwzsm2jh11qj2qr31bznfc344ynjrdagqayrcgifg4725fa0f"; -"makedtx-1.2"="0yir2j268vdaa44flps15l739ngv97lws6n6yk3w4pz4jn5gylyd"; -"makedtx.doc-1.2"="02ir7wf6v6znly9c36z8k0djrzpkd74ssphkggmp8fj338fk41cj"; -"makedtx.source-1.2"="0jwdsfx2l8sz8y90bz3gfi51vswyzmwdvfmnlaa2gplhcjjbv4yy"; -"makeglos-15878"="0jp0207q1p0znw1w86g6m8ifkpgh3hi1yhkzq117kwl5ybswq8w9"; -"makeglos.doc-15878"="18zl45jdpsvvldxvfx79ijldh3g03acw254m6i8a3dxgxj2p76hb"; -"makerobust-2.0"="0nm751w11p7cqg8ihckn338i6908kcn513644c6a1qc9rg847hlp"; -"makerobust.doc-2.0"="0bidk4f0q6486vgwqvifzchkn0xi1l9j65yqwgcdnl3yg6vamqzw"; -"mandi-2.7.5"="0idg4r8wa8xa4025xa20xjcrzvahnrspg4qif4lqywijv8921h25"; -"mandi.doc-2.7.5"="117gassgkzz11c12ba562iipw6winx7fbrwr1s5kmjlcx48xpzqw"; -"mandi.source-2.7.5"="0jsh3czwmvyvpr52zj97kx7h7c2nsi4zl3hmdpmdarhkcwzjfqdp"; -"manfnt-54684"="1fzfcvifh013xs6dm6xq2gpvmf3v0qn8scrbjj3yak2ba98bcy18"; -"manfnt.doc-54684"="15rs74sfnyq2k27bs3dvjiachwamima3q4vp0dp0ic95as2n61gp"; -"manfnt.source-54684"="1v3j47xa7k66dadz8dyy9gm3k4s6465zgqpzb320isjpb77p7r48"; -"manuscript-1.7"="12r1b0hqs1kqdxvyg8lv8yrsdycfxs03j0lwfmlhbg6lmgz32pss"; -"manuscript.doc-1.7"="10dczs60ncdk5z76w5jxgis9m9qilxp8xi53gixki4i82yd4l9va"; -"manuscript.source-1.7"="08fpv1i9vz6fbf9vy48k6y45xz67kbqb5f30c8pxbvyzlicixdjk"; -"manyind-49874"="0c5badlrh2321958z75wi4ggb289hnyy0i17bpf4qw9sjym08pz4"; -"manyind.doc-49874"="1x65nnkmqp2x04n9rg2n8yh324vdbcsbv68xfbb3ppx2462wrls3"; -"marginfit-1.1"="0x8ias8bv1zaavin929782cjvp7aw94r18lqvv10v3vgq20n7kjw"; -"marginfit.doc-1.1"="1cj1fidjvvhhzn9fxbvyh75dfb78wxi83bdxnwbpc6rf3ax5bl03"; -"marginfit.source-1.1"="0rrn2lrqg3a1yz6l88qkh8sljr18p1wx1vxyrzg04pzj21lw8kkh"; -"marginfix-1.2"="0arldbc20d1sncwanx3szam53yv1d5wxgihj8lm4jmda1858bmgy"; -"marginfix.doc-1.2"="0kk9cghi0y1zfk6ya3pfs08npdy7v95i4db5a89v2177cd6z7a78"; -"marginfix.source-1.2"="1k1384nxhiywlvyndnvhj6a35q433ddc019ckf8al2b1ngg13y0w"; -"marginnote-1.4b"="1vyv2n265y8j8r9ch7h9qjhwlmlzmqx62gc4zzm4zxrk0mvigpa4"; -"marginnote.doc-1.4b"="1cl1xrb8d7dpr4mwa56664wdkabzx8zr8cn6kxcn9bgl543ka3bc"; -"marginnote.source-1.4b"="152bwxhnssj40rr72r6cfirvqbnc0h7xnagfrbz58v2xck53qhg1"; -"markdown-2.9.0"="0zspbmkkqzab4mqj4id65gzh2fm3mhc0444r7kan1010jzhfd0hg"; -"markdown.doc-2.9.0"="0d0jpi27g01cr7xsr6qb79b7fkfbxhbnjbwgdl57sblixgmcysfq"; -"markdown.source-2.9.0"="0406cj0wc151f3cj4c9x76g5i34krarp3nmxfqw0626zj03irp6h"; -"mathalpha-1.13"="16r82mxl1lvv77j77hbqiy74xcclklxia8x3da7by1a8j1yvr78b"; -"mathalpha.doc-1.13"="11nqf75xd42rspvfdnw039j9i9akf5zncjnnqw54blb3s6xcrk0i"; -"mathastext-1.3w"="078rlq72ivyavgmghk3nswracjhp3args4z2lv61z22x4q9qhvbi"; -"mathastext.doc-1.3w"="0zpxl6kk0ljyqms0vssh5myd60g58wwqjx24z2n8xlncassbsnn4"; -"mathastext.source-1.3w"="14q68iv2y35p0i3xz59b4nljp2r2a7j6a6ww494nbifsp215xm47"; -"mathexam-1.00"="11rn665k5vg9w9rfgcp602v6cg659d4c22gikkgjpslc7bzrlrkh"; -"mathexam.doc-1.00"="1lv8zdp1fajq1nms16v3nk7f0bc8az525nnjjjzags4rpl8wkzh8"; -"mathexam.source-1.00"="1p0lalc0ny1zb8gc4bbg7z9pm6airbg63l1k0qqmwg10wvxpsjn9"; -"mathfam256-0.5"="0s97k46ysqvgs6a8aq5q8iwab390s90drd3g0ixd8zmv9a4hy1z2"; -"mathfam256.doc-0.5"="1zk42fsknkbzyx4m7xn3yjw9lrdvf6m7crnqsp1q7qb2nv3hn1br"; -"mathfont-1.6"="1cchrbpzjkvdfvn5qnzy9q9x39x9fvggf2hil6msqrri8wahspk2"; -"mathfont.doc-1.6"="1lrb88kx05ckyn9pf9w0d4snjydggfsg9qy3cm95288xxhn8z26f"; -"mathfont.source-1.6"="0vk88801illr345nvxi6adw27m1dj9v1l5s0j137gbyqb53cqdyg"; -"maybemath-15878"="0qb9nr6m819axi9qn8i32fynlmkjvyvc45gyp6pckwj54kxzx06q"; -"maybemath.doc-15878"="078s9v2bly2q802wdidzpvwaqfdkz00wkgyhn6867bkbq89g4aa8"; -"mcaption-3.0"="0bfcl1swwgz83y4f80a1kydmxhdyqxld0d5cjfgxfhnn9dxp3wc9"; -"mcaption.doc-3.0"="1afldwg6dghvkwd8gik8dmag4g2pb6ag3aks26qi0ygph05j9cwz"; -"mcaption.source-3.0"="0i6sd9vm1pn9h570am4lkr2br81bhmqqwwvymb8r37xpmmp9yvsk"; -"mceinleger-15878"="1a16g83g9wd5vdx70bq8zbr4hwm8fk46dpsna97r9fgh44n85pv9"; -"mceinleger.doc-15878"="09z7srskh57mz055ywyxwg4zcx07vq36jdy8z9w6w74af4icpll9"; -"mcexam-0.4"="02qj4fb3xg9h74z9wc2agisp5cp2fbis2h5ci8j09d22ak60rh8b"; -"mcexam.doc-0.4"="0f4d54kf4svyq54qcd1xqpx6zl9h99ahfzz1l72jyjhlqf4v6rj2"; -"mcite-1.6"="18did9achsp32k7wq4q75a9q43jxdm8k40q41j242gndnkn8axw1"; -"mcite.doc-1.6"="1gdsa91a4snk3f22mh06mr811b1kb0vpi30ss84d3mrnsvd1p0ha"; -"mcite.source-1.6"="0q1bv5nx9xf6r1fvgnxb1x720dm0xqrqg3kya0504q8qb0kgxqfj"; -"mciteplus-1.2"="0xbk5zrd9mbk4xid03j7a0c96s311rb1vjawhvk5waqw9y6dn476"; -"mciteplus.doc-1.2"="15aldir7viryb2f8vi0a83vgbdwbp5gcdg0slhp6j6ka6xv7ayhs"; -"mdframed-1.9b"="073gcxy2s8mskf4mvvs1jr8fkijci1ayg0b5r5xzcjw0s5azny1m"; -"mdframed.doc-1.9b"="0m8k7h5c0h1fdrpdf2a4vhgr8saqspk81c0cdjm2cmbsfm8zlc3s"; -"mdframed.source-1.9b"="0p96sl69p5342yy9fgw5cnkfi2xabdwb74mw7i1gbxvj0vx1f2q6"; -"media4svg-0.5"="11017yr6jwy9dy2ann36zxpzcgv816w3ma05i7plha3rdqsyxlay"; -"media4svg.doc-0.5"="15dva4jl5hiq0xcgfwryhz5zyc1v12rvp9mpr6njwzvax96vwnks"; -"media9-1.15"="1kqlxl1ny5xd86w4rnh3xgs1yf75mlgxvddr5skfywqcx23kxxwl"; -"media9.doc-1.15"="0avks17bchaj14k86bkikqphz56zzbjh8bk4mdbq5rm6faq41fb9"; -"media9.source-1.15"="06prhfr2aha2v176g4nm72b1rzl1xxdv5164n5lfdsahaqdb1r4r"; -"medstarbeamer-38828"="1cndcpdvkdvjx07rfan5dd7yg6sv532b6vvd97cm7ag2g1aqcilq"; -"medstarbeamer.doc-38828"="0i995yaqv91h4iv3h7r5m73vb7xvpjkzrh6nddcjjcsv2gvpjcxi"; -"meetingmins-1.6"="0za2aqj7gbmxxdm3hqkq2sqkhl3c1q8a3s778hw164dfpi8jx85r"; -"meetingmins.doc-1.6"="13kqp3561k9pcz7lmh7izmxw8iqq0s1jlhvq12dh00wvr7vwr8dr"; -"meetingmins.source-1.6"="0fkgaqldjdry08wl8al8d0kppbsqqhig83mgwfk20rzpji298b5x"; -"memexsupp-0.1"="0h3n1bnvyxr0ylg05fm819lzhzd7kbip5p5mr9kc5af8pd6yci9k"; -"memexsupp.doc-0.1"="04zwmw6varldbg5cxzk4bv8mbh80i9gdysfxpn1i4xb1la38b0bf"; -"memory-1.2"="1zgfjz995jbji8hycizbp614dn0g13rimh9csgrga86f1ivgcpmx"; -"memory.doc-1.2"="164nnsi25jk25p3kh54w2l8zk0rri50p0s9g4r5f50c3wzxi1g4h"; -"memory.source-1.2"="0mhxxhiqq5miqskb6c4hmjdjki280yyin2dh0md59ai1aprgd4p7"; -"mensa-tex-45997"="0gg38ls6fil67d0ln2yfjbpi2r6cbrnavfl926jbpxjfh4qxvqcq"; -"mensa-tex.doc-45997"="05krm8b1ylr8wjr0xy361whm0kn6mj4y6yrycjj47927xnij5qfz"; -"menu-0.994"="09mnnssvb83l1jhjbb4rb6lbzhwf4y4y0mq5h36dj4h2hp4qfi55"; -"menu.doc-0.994"="1g0ihkjlnf9v90x39mm2jn2ziijildyiqfda5bkm441pjh40x0pc"; -"menu.source-0.994"="091a0akja0y153lhhplb4v0n4z77qvxh9nchlr0v5sm9bbpvpiyd"; -"menucard-0.1"="13dirr45ysvi196wgsrdrcxspynzvrk88rdacrfq84l4imbsh683"; -"menucard.doc-0.1"="0sbgrk1l2b9mdhiymwvp6zci4nb86rn2r06chdbhgy9lzija4wdv"; -"menucard.source-0.1"="1pg4c26pij7p218a0r6mcwbmnsgdj7i63z8z7gq71i8jqpfcmlrg"; -"menukeys-1.6.1"="0cj7fgb05bwacxwh7p326d0gcgvkpxikbqkqgcbqz0fjsa7hl28z"; -"menukeys.doc-1.6.1"="0ks3fdxjc648mcp91i3jiph2zaaxghpkpnaknx7rpcmfyha6hlb4"; -"menukeys.source-1.6.1"="0d89ldwlkz41d4ai2vimpjq5vm4w9zbwgxvbqdx1zssps4fxgqff"; -"metalogox-1.00"="0imfkjfk1fbcpxsa3hfcn9f7i3dq9vmjzhl82v1c7i9h36y60jsm"; -"metalogox.doc-1.00"="04zvsg40zj93399hdn7w5cf1vavdwk2pzji4k647hrp4klcqv94w"; -"metalogox.source-1.00"="02yd2vz2m4iy6ndcibgvpxvfsq8hncclrf9ggfkb376h8x6vcy34"; -"metanorma-0.5.0"="17vg55m4yj3xcfgvmm2kw8a81fblwykgnbcn65drll10b89wx6xp"; -"metanorma.doc-0.5.0"="0z3mr4aw6gqdj4621dlghb4bsc5i44mlg81w81by98783fn4xdyl"; -"metastr-1.1.2"="0ci2qs1iyyn55zl6n12yn20xsff42dim744sjkxml7xad38vpnkz"; -"metastr.doc-1.1.2"="1jhvf4xngi5mjycbrbijn72p8anx15r1n6vh5hrjai95xp9jn88a"; -"metastr.source-1.1.2"="12rv9fayml2kjy7rmdh6d7g4xr2yg3r5ngky467y663p893nxk0w"; -"method-2.0b"="1aafzyca2l34p8jxgdhwm54yw16znd1085lx58wrm2fjw727946k"; -"method.doc-2.0b"="18sjh2kvy1f3c72w6k2m60jf60zbz7bz91xgq20wjigfagdmsqkd"; -"method.source-2.0b"="0ckvvf1h80mlzyqbd12yagfl8hph9l7k35mghr1ri4k317sm3ls1"; -"metre-1.0"="0vfb01vwb6x5wf4sq5j1rrl3jpzw0mwfqy1jkkirxkhbim5gln25"; -"metre.doc-1.0"="0zkr3wymlzxnk2n9h6nz65a1gsg0k4pfabdrkc15wfdn0yczicj1"; -"metre.source-1.0"="15cvprv3zg5nfsd5l5sj2s2hgx5gljn1jqzgcr4lpadpans14pkx"; -"mfirstuc-2.06"="1v7b4g2xqq0icci5kk9w920hqlkl0cw9z7mhpzd6bax8mbkaqih8"; -"mfirstuc.doc-2.06"="10dym0f52kkscvshnd7y9cqmycrsha3vjzqxbypjgklm0fg663bq"; -"mfirstuc.source-2.06"="1jx2pk3c4zg9gcslc2gqnmw6019jk3hd79qa79dc85jcwzdv0chn"; -"mftinc-1.0a"="0yhw7zpmbc3780qm46p5sc2qq71s2vhmfmi3kqscck876h4935fy"; -"mftinc.doc-1.0a"="0yxpbp501d6vwsxpm83zjhypvz3xz51f91q414zxjvsy1cvvprr1"; -"mftinc.source-1.0a"="1zamx3658d8vaik5w30hvia5y0hp119vhvqhj4h5kkwnwmz8hs45"; -"mi-solns-0.6"="1bv7gr2wa11cbsznz414x35n5yy5jw7q9kngnb2h5y73v8bnzvc6"; -"mi-solns.doc-0.6"="1byfb723572whq315zwybwm1bcvcn49km80gn5bi081gy81r75hw"; -"mi-solns.source-0.6"="12xrddxlrngjnk0yk35spk886yd9p3nnz6jrp51dfzw1xz6pkivr"; -"midpage-1.1a"="0hh4r2sgdgzm0nryzqymd66a7hr74rvcsn58y7dc7di6mhikrysn"; -"midpage.doc-1.1a"="0jfw5wd6qbxhf90mpi8fmv0nbazkbg9h65z91613j1ynqqf0087y"; -"mindflow-58475"="18ghcxff1sziazalm9sw367dgifbwqyca4vc6y0a7bf8gb14wq89"; -"mindflow.doc-58475"="0pc1hc1r9wzqfgj0m82rp1yb64j9r2q4dicfs7fvi8846hkfx67l"; -"mindflow.source-58475"="0d4dgx7mp66mr63q66wc5mnkjcncam60gkdgy9j6ag54j7kibbds"; -"minibox-0.2a"="0r94l5sy4n97p895xk33ir3dli1ngy3p67w2d3i7f6hi6czvykm2"; -"minibox.doc-0.2a"="0bzd55wkdxw8spw4706nj0sk478zbnvq9cnkpid638cwb6csb21c"; -"minibox.source-0.2a"="1dm8p6rjivm0xxa7px5dvsnrqs48zwn2kiq3vr6gdqmiy0ld1v93"; -"minidocument-1.0"="1mrzcxa59kpmrkhnnv08z7h48bj74gk2b0q3bvhmvddd6047yxwy"; -"minidocument.doc-1.0"="0dl4l8skhz7fm23mpmgmy593f34w78mm5qwab5bc41sg0xc0lyy3"; -"minidocument.source-1.0"="1n0qf2r1mjp8vx3s750fw5h2q51pp3qxf90gds8bzq2cv6mi61sv"; -"minifp-0.96"="1vpq8mh443hhmnf5cgj37jm362m90zdhm55jzqh1x84dadqpmivf"; -"minifp.doc-0.96"="08f3hp3knyc37a2fy87i11q62dlb35ri197gxm3ghl5h28zvzpfb"; -"minifp.source-0.96"="1l837v8c70s8x1xn4xhag6nkfpayamgzk95fb23qw23xpf6zp2wv"; -"minipage-marginpar-0.2"="1qpymibkrwdbyf2rlvfjj0g8agxisd2ym3xi7lzx3g953g5whg5r"; -"minipage-marginpar.doc-0.2"="06rivjd4x8mdpzv9h1yzkjbs317jvxa78zbv1kzyia7fps74wi1b"; -"minipage-marginpar.source-0.2"="13k27b7avz3v2jadjh84w74rsyh4gz2x22b8j5lv6yvrjnwv09f6"; -"minitoc-62"="0v80ga66rg4cgifmyfa5vq52v5wz48lj4js0ym9197x2w98ra6ry"; -"minitoc.doc-62"="07dah8lz54ccvrgigrvgcmbj76ppxaismbllfwyxcgkrkvqzxqkj"; -"minorrevision-1.1"="1mcgql832xmgpcwha6l0d282mhyva6xmyf75gbb6inwbgg6qkv9m"; -"minorrevision.doc-1.1"="0x9lw8xzmnn015n9hyzajnl9gicafj06gr2msk6vxwk136ayqfiy"; -"minted-2.5"="0n6ni5pl2fxchy2g2s9pbxa48wscviilbqi83pysymq7hdwcw1p0"; -"minted.doc-2.5"="1yyp2kmiw3b52gjnck07pzcz717srn21z15jh6ikx77a0m4nl6la"; -"minted.source-2.5"="0c8gn4ch0yq3pa5x863g6yshl6q44b8jqqv0vm82pqr1s35fh2im"; -"minutes-1.8f"="0yc7dkvbn0g7gm07h9r62ma3aagbgparrlamh462a9ckdc7jzivp"; -"minutes.doc-1.8f"="1m8blswmxhcm2ya966ajknx9arz3yh1sn62wnyxls220af3401ss"; -"minutes.source-1.8f"="12qvfyiscs3y1wk3r2mdq7vgkmz1ldsbg3wz4agib97lc30qqmif"; -"mla-paper-54080"="0yzfqb3x58qzw5lcyw3f6c3xyd98zx7zmz9j2rmv42r5wj1g668p"; -"mla-paper.doc-54080"="0kzi1gnla04shaiysrgyz4ak3l96h11shkrxcj0hbav43ndj2xhl"; -"mleftright-1.2"="14lvlhhjj50v31lgf7ywk5dx7d5gbnivssl15qzpa6s619q2h6l7"; -"mleftright.doc-1.2"="13vvfx4wxvf5liv641lwdm3hdba31rfrwsmirl36qwbrqsrl8xic"; -"mleftright.source-1.2"="004ficd5chakwcklbdx83qp3985s1imlz5knc7f3m51zxgr4lmw5"; -"mlist-0.6a"="044pjvbyabzqashbzag37ymqa9mr0c1qg3p7rb1j91r0y5s8ra8d"; -"mlist.doc-0.6a"="1vlxzzg6f3jmcmp8fjn58gciywc2qgw9v1kxpm7qr3vlv40pdb13"; -"mlist.source-0.6a"="0jim2g5qc9cdks4r3yi67hhszx3kkh26hhc0zgm2kx9syhdjv057"; -"mmap-1.03"="19hnkczxhxcr7pa7880mfgjfhjwiyl2yxhfz67dsrljqsfpi19nl"; -"mmap.doc-1.03"="1f861w6clfn3k8gc6piil6bq6admbyr4kxqnkw8hh29s63rdn76j"; -"mnotes-0.8"="1vzc4p8vki02himcvqja44lv3rhf9wh9gxi6aw39g7qbf3j9k28c"; -"mnotes.doc-0.8"="0wwf1651zb4jigmg2l64wh9j0y68fppfzn4gaq8apn5b47b68vl9"; -"mnotes.source-0.8"="1ihlcxhzms48lmqy169qx2d7cavwwf4k96q93cd4dxrxdph0ccz4"; -"moderncv-2.1.0"="11azbzdfi8fdnb2gwchdywv226j2ii7iz7cn41ls2q5kds41apfj"; -"moderncv.doc-2.1.0"="1214g042annbjmfbdnmxxcdlwyhwzig6lqdd06nfv59qr9gy2bi0"; -"modernposter-1.03.1"="1qc422hbqiyy6b539r7kyrshcja58mifdvs3bva1ikdxanxhnaq1"; -"modernposter.doc-1.03.1"="1z9b3fanm97c3ik1q6v06qfwrgqcqwyi79h5dlhcnpwsm5dxqj0s"; -"moderntimeline-0.11"="10alhs944akmqfslqzi09436mmnjz8nm85r8jpjwpfcx28vfdwnh"; -"moderntimeline.doc-0.11"="1bnz01q5rib9gr724gq6saxvzpg3lfmimh14rw5fn0fcn9bxlwsl"; -"moderntimeline.source-0.11"="0y2kfxcpacslpn1ly6anv0hlil2x6wlsi37w9b8hj7xfx95qh51r"; -"modref-1.0"="0pd0qd9yjhvdl3icrgl40lgyjsgahjw1jgc2ah75bfcwj02qm4v1"; -"modref.doc-1.0"="0caqpnyg5gbv3b6336w59nn0w9ic4p12f5ig2n7r6kg8ydhp53d8"; -"modref.source-1.0"="0n28d6x8w9rh3hah7p1imairyyywssajg7zwssp03dla0xlgxrql"; -"modroman-1"="17ijrx7f87pbkwbyjwigz3jr85fwzq6rr0pz1591fk9i36jhjaal"; -"modroman.doc-1"="044v0nkz0h1c7xsb66kmpqvr5gg4lg1qkx1x2qm9ijdpsbc4zsng"; -"modroman.source-1"="15xy8jpp2ac07qq0nl3nskpv62c59xb8qkl51irvpb0m01d97y39"; -"modular-44142"="0khqcm28cq8cr51wmyv954zy85k9dxvmiszz5w4izxvyk14d56sq"; -"modular.doc-44142"="08qhmna1mbra9395gvaqbaqi3rmyhhckx781x4zw5439z2bpmg39"; -"monofill-0.2"="0kpzszxph3bx34flvhz746xkdpcc9mj0srifki9y8fa6vgsk2rz1"; -"monofill.doc-0.2"="0czdlvrwav8n3p9afa40icddh37md6g39kmy02vcnwmn9k3izp4p"; -"monofill.source-0.2"="1x5raychfhcjibln59x01fay8r25fwxba4lwi0bnd51drvzs76pn"; -"moodle-0.9"="0j7xxp92c4j66h2bg5f6pkcsgqskldbw5d125iahiy5hm3p4lq4q"; -"moodle.doc-0.9"="01cwv06w4f06ykspidm03mbqr97x42gf1qysnrrcxgs3hpfj1vdz"; -"moodle.source-0.9"="108fvgc2fvlqwjabvbky7y8sqwi3hn0f5vc34mi9lzsn2y1j8xr8"; -"moreenum-1.03"="0cjq1a222c813l93yzf9757dcai55vh24r17cv6awv0d1xf6jggf"; -"moreenum.doc-1.03"="1g71dcnbcjb2x8ilhyfbkbb55x8740pz6n9gzdd8h6kyxm879zvl"; -"morefloats-1.0h"="0zdlkd53zl0y69d3manicnd8ch8qls6jxgr4mncqg5r57lqp10kd"; -"morefloats.doc-1.0h"="09xmhl2zaxzyvys63n6r71g6qp281f6y69gy4zbkjwb1n68js1i1"; -"morefloats.source-1.0h"="109wx7axxf1pgpxq34pz9i1cg357il0rbz8h0xqacn2yykh9q565"; -"morehype-r0.83"="1yssb0c3l0sqyv775mjnbba3wv1h6497x125li68q8iwjc529wdr"; -"morehype.doc-r0.83"="14s0bvxj2fjrkcrdp576c0ka1appg9g4ri4mc2isfb73yc6bmgh0"; -"morehype.source-r0.83"="1sljhzy05akipng9lfajapvdm8jf2jf50v1awl38ld0wfkdqvcdq"; -"moresize-1.9"="07vq0wf250ixhrg70vdvaz7zh33zaq5sm32ka8qh1ab590c8w7h8"; -"moresize.doc-1.9"="1qa9y7q1wi7f9klziwgj6dw9c7bh453srljsx9m106nbyd1cvnpr"; -"moresize.source-1.9"="1gzj5bh16afgl8dg5z44h7d4m79i5naj4wl09m17x6snvfz7ifah"; -"moreverb-2.3a"="14srw73gbfr0c3miizzs1rml2ms504hkv970p4dhp1wpk8ywc5f3"; -"moreverb.doc-2.3a"="0bp2lmzbd3zxqhijfqc7im10476xc50yc8amh0vf017ll7prcmjh"; -"moreverb.source-2.3a"="1snpyn7bc4qbmamxybv1j1h407fp597m26v2jq6yzijszfanh3rq"; -"morewrites-49531"="1b6pfqhqn3hadnkb28kcl9k5hc7mynbk1ik7njicrbxwlx3qqm5y"; -"morewrites.doc-49531"="1iqmxgzvrhmfmf6jmc5dckziwzvk1ygyzbr94sp0209x11sw9fb2"; -"morewrites.source-49531"="03dd4cv0x0lw4xbzqpv26nm5q2bn50wbjjgiqnif2wg2smfap9sw"; -"movie15-26473"="1x48h56mw1pzllzz5b8fx5ikhp08gx9jybdn7qk3jvfy13a4r5yr"; -"movie15.doc-26473"="0bhyfgsjwmvvl7lnam0k254w2rzn01wf5gzn38ymmlcbw4ajkkxl"; -"mparhack-1.4"="10zmkhymx023jj7isni49sc06g9g2pjkf6c421rv64jqis34jvzv"; -"mparhack.doc-1.4"="0rcx478bxy70mvzrqp2vp5yl17r3arvywp4bsn3c8652cl92qqlm"; -"mparhack.source-1.4"="0jw5imcp3dd4csjp5pvbqh7pbz119q8f2jgg9j743b80l59rmlnw"; -"mpostinl-1.5"="01p16dzg5izjgd64l4qgrhx0dm99hp5lrn9v2rlghs8m249fwmv8"; -"mpostinl.doc-1.5"="1a1rhz5q1i69bi1blvwzz404h7mgjkjcp9c07dd8w6xri304gi1s"; -"mpostinl.source-1.5"="18rfna80lz3zrf7wynr8zdbiv36k2n6a8wd430r81ybr9233dhxp"; -"msc-1.16"="1svx3k22rlcrgm7fm0xx45f5q40ngrfpvlabfkicdpnh2mwcfy4s"; -"msc.doc-1.16"="0l4941csa7xfxx4p9s7sbfk6xkv5cm2945y6pqvhj01wqcdghmnc"; -"msg-0.51"="1g418z3slb3cjf0wzgwgv0zkq0jnj647zqh6iqvlv42r7bil9001"; -"msg.doc-0.51"="0miycfpf7s74jz831kqbh6qlkkzq31l1x0fkf9d04b8zp26mzilp"; -"msg.source-0.51"="18djwd3g50ys4ckgzc3dp0y344qy86ni327jmyz3lpnqai8w1c8w"; -"mslapa-54080"="0ayfh1yv1a8wsq9qldgcmvq9d12sxwaa7df5p3bhsp0klbqf7pzz"; -"mslapa.doc-54080"="1hiag2x2br0c0qpmm347cyxmi58mwg2x0lyqfakm87f68lbbxdq5"; -"mtgreek-1.1+"="17k0lvghiw4milj4cnf6wjhsj7c1banw550dvlw9spv60lccvqqz"; -"mtgreek.doc-1.1+"="1qkl09lkdl9z6lm5hkn5c2xry7xd0f0ijx6xnyq3l6q99cnbafzq"; -"mtgreek.source-1.1+"="13h8knsfbl91g20gxjw3c0m6j33wh4zkmm32ybfvzlm8q7nf2lhh"; -"multenum-21775"="1jn6xqrc31zzaj9yk244g3sbi8fj2klswbg24fkclgj0cjr1xi5j"; -"multenum.doc-21775"="1pnjjbfwgy6ksdl76n9iiqla2wl0qa4370n49h4xy3rmrnbjmdqs"; -"multiaudience-1.03"="01g9ynwghq4a40jfb8qvcslgc0wa6qsfwfxr2m3cqyp5f7z27mar"; -"multiaudience.doc-1.03"="1bspy5q8n1n1vdd2570vh1xkfp2nrd12v17x9jfqxy5dbhggbfpy"; -"multiaudience.source-1.03"="07c5281w68jna67wsf71xafmk7yjw808ninnkzqs13csl5vkyjwj"; -"multibbl-1.1"="1aj6j8rp94mh210pdwd9d4a5s5z9v5f36wpylwjv4v2ghmyrgyap"; -"multibbl.doc-1.1"="0r4hnp4sgpx9x0hmrl3qlw55xlchav3r8sym2vnv4sqjnx4dc740"; -"multibbl.source-1.1"="1c7cvjabssssy8wq6x6lr909zq4f0bkhdzx1x37n3rxm2ngdqpbs"; -"multicap-15878"="0ky6hrdsc7wl65zk9krv5bf5z5lbiv1xfn4g9q8b3pp6ri874hzc"; -"multicap.doc-15878"="15zkw0sh0lf5vdi219h32nw0icq88cj0vnz9g9j7zb7xqq31f5g9"; -"multicap.source-15878"="0d3gyjr7kwx25gzsl4j5z887c952zxrsh3qk2j0cbs6yahzscxim"; -"multicolrule-1.3a"="01k425dsahhikw9n03dfarnlqc1irz33rm9am6w3gx8pd2d2q6zx"; -"multicolrule.doc-1.3a"="0h5is5lmqqybyp9c8kr0d12x27lgm761dcjhi63i7pv37hk0kylj"; -"multicolrule.source-1.3a"="0blj75rh7vqy8s8c87dqpbz7d279hngzl99272cyskmj8m4y6jpa"; -"multidef-1.10"="13rv808x0bz97cm45r2rjxy0yhmjycswcf89pl7z182acrbs30zq"; -"multidef.doc-1.10"="1jcm11pjx3d8105k12r120nqjjyk0ncmbry8pvkcpwf8kpxcqgp7"; -"multidef.source-1.10"="14y2vk3y8f35wxka65fmj1i235hbb4sviq8g0j300d24nlp32xsz"; -"multienv-1.0"="0j0s86c6xqpww1x46l2vn66l0wflqjsl5q4jqa4089xhzaxzhdy0"; -"multienv.doc-1.0"="02j3gripplimgh9qj3mjy9nlifdi6frj6cawxnjsm35r19m9ia5q"; -"multienv.source-1.0"="1s28zxxvbi5yg6iigdixc5kmn5w7h4hss3xrv04hr2838xpma3wc"; -"multiexpand-1.5"="04v8qz91w4fayy3llr20dqwvdx835wl9fmxpcg45sd3yrik2s4nf"; -"multiexpand.doc-1.5"="0pw7kqc1r0mvnb03fp5l3gpy5m5zvrynaqkg4xsdrhw4gqxlpfy9"; -"multiexpand.source-1.5"="1n1bngipr1sjjqnzsdgyyy08hnk53f81j0fqffjlr5siy4by1p6b"; -"multilang-0.9b"="0zkkfvkybq5hxbdwkwy5n7gal1ir7ixg8342wynk3ga9z6lb9shw"; -"multilang.doc-0.9b"="026d5yxli87f2svfyqmfzbhydwd4c929n2v11wk5prg4zc3vp08k"; -"multilang.source-0.9b"="1v4ql5jxlmpc6458qcqvbsrb9pf3dss60z3i3ylmyp6mx0kjmchr"; -"multirow-2.8"="0bsn4xzliq9gllmac4wqqsnws9slywc0d94abh81awpzv6vy8jwj"; -"multirow.doc-2.8"="070q5s39pfdq5wiq7crhdqhcyjalpd8kydig4djgji975b0xn0bk"; -"multirow.source-2.8"="08q074bixnkvn7hsi1n8vx0r6pqwwkdjsjnxz0n3lam30x4j1jib"; -"mversion-1.0.1"="12mvnkij2q08j50ka3nngmcz0p07lmvqg3jl8fxrfdzyy0h7zhdd"; -"mversion.doc-1.0.1"="1z9d4bcylv4sk79hfzgy36bza0r9lkzw93mis2m6ypgdbsaa3n2a"; -"mversion.source-1.0.1"="01dbma0p4lhygs64aym66j3vp3c0hpbci4x42mpr0yvjnglymbj6"; -"mwe-0.5"="1rk5530j3cnmf46i3gb6wc198ay99pwlbb80ynj33dypfiwsvhcb"; -"mwe.doc-0.5"="0bnw57l8bb6x4k8i4icc8g215bxrccmn39vyhj888ijygdw2hgmv"; -"mwe.source-0.5"="1fl2xlmqdas5rijzrail9yqlqz1s75z9fzkip5zjb8s0gfnbg3qa"; -"mycv-1.5.6"="1nnm6ns6qx6ny4xb7z61pajysfb0nfl7gs5dw292bwi7daxs98xx"; -"mycv.doc-1.5.6"="1d3rra14k69l5pfmcw4fwbkn257935zdiyd2p9gzx0bc28ivsajm"; -"mycv.source-1.5.6"="02ailkp9jr5r70aphfzp6kjm83ni6gigyqn2nr0zlsa098frpxg9"; -"mylatex-56751"="1zihhgy4xaj04qr6rfv73050rvb8a77zglaqgjby5b4a1j5vyw7x"; -"mylatex.doc-56751"="1bdigldcdk3rz4p58w7g4qssbx13jbhqxbavf3x38r71r1pys5x9"; -"mylatexformat-3.4"="0nns88lk6wdq053aljg9k17d3g9fvi75n82swglq3jxmxx2k7r89"; -"mylatexformat.doc-3.4"="09dnsxwdhdnpwf0y7cfj6xh8gws32xn12fc1rh1xiy3ivlynj8c4"; -"mylatexformat.source-3.4"="14rd6zn88zaaznnqh577zgbbmmdmbkzn03201i459v3jzcvijfp7"; -"nag-0.7"="1l31y7mr00s6md7a68cz51yv0qfd26xaj04ax1ph6dqc97r3fv1w"; -"nag.doc-0.7"="0gc56zgva7kziny3ridswnp8rscqi1mg51d8x580pidb11mp7dw2"; -"nag.source-0.7"="1fh9nfjbkvw907ra1crqfhm7hl4k703g80w3c8qvd18r86wmn2i4"; -"nameauth-3.6"="1p4jrwadp6hiv0z3ql92nc7n9qxc9fgg5nig6l6lpk9pd2z5b04b"; -"nameauth.doc-3.6"="1p4nw3w39p6l5mzkb9mz31hgbzrnx2a48vgrnrq5gjwdh8kggwz9"; -"nameauth.source-3.6"="03zn8f859x0dm8jx6cvnzqfm9fvsws62xvpyy1ls50kwjpqyf88c"; -"namespc-15878"="10sbvwc0r3lm90qdxds13iyfcddq1vjx2p8vvs4g3sav4fk8p02k"; -"namespc.doc-15878"="1z34xb5s5fgl4rag0fmc5i5j3jb810f543096mxpq46j98rcp5mz"; -"namespc.source-15878"="0xjcnrrrrw4032sd6wscxvar9y3kd4547rsd79dpkbb0ksmqbqrx"; -"ncclatex-1.5"="00w3g79rn2xa33al7cma09b8l9na6xd5b7w40j8z9day31i2p89p"; -"ncclatex.doc-1.5"="14fvmjnnw8n22c3j2mc44bqrdlsxn28dasfk9zmajvmxgic4w12m"; -"needspace-1.3d"="0abcqdcykpq4wa5a95c8w1bn6cz90zlsy146186v0s54njc5g3mb"; -"needspace.doc-1.3d"="1r9mn0flqdnaca1w2g4lsy0pk5a9l2sjnkpzzg72qgll9dsqqkmq"; -"needspace.source-1.3d"="02j2f9wl2ljyi82dxk7qk71dmjvgl17vp1d3hgvlc54gl5qcwqi0"; -"nestquot-27323"="0l2glc6aykd492rspxphgscx0ykc8cakvqkm8z99jq7xxi80l1x8"; -"newcommand.doc-2.0"="1vlxm26393psl4kjfh533q03sb4klnfq84nld9ggs8l5x08dks58"; -"newenviron-1.0"="0vij59qibxvl81r367yxfl4mgp8fjzd99x3aq008hwh3g1d8ciaq"; -"newenviron.doc-1.0"="1nvra7lh4zvxy70hf4ndj4nl3ij3ar8g2fxrc0951qvixz9jx7mm"; -"newfile-1.0c"="0gah9qbkpib651rjfrakzldi4wd7gv74y8j455n1yi6wnr0yq570"; -"newfile.doc-1.0c"="0vqlij71kfjzbl08sh38rzs9k714xigjc1cdvvpj2m6bhimazp76"; -"newfile.source-1.0c"="0sw9cqids994lscbjif8h7npp4cmzrhrcvccspag2aa78gsvz04i"; -"newlfm-9.4"="12mryj5w7dpn0mdv91grkrd24n2pn68p54bl70bg3pddvz5ab6gy"; -"newlfm.doc-9.4"="0afpxw78vijnhx2rwv94ar6x4ivcrgz7873vdc5n4dafgg18z78s"; -"newlfm.source-9.4"="0z081mn0zf92ana2v99sdyyqjz4lqnm2ymndp76xwih9p1z8233s"; -"newspaper-1.0"="1afj267dlvgcw8028b4c0v9rdj77w47zjgpk0grbapy7wjgpyjb2"; -"newspaper.doc-1.0"="12hlji06sd7bvw7r664cg8ijxabc2q1rb7z516ph18ayjl5vca82"; -"newspaper.source-1.0"="1h8abnmiai3c66cjndm6xawz00z1pfmgwlp6w43amjrk1rm4r5vm"; -"newunicodechar-1.2"="1zr5w047xqg9bi6drl2rw414m9bzpa5r7n5270zr8k8jj74xcv7x"; -"newunicodechar.doc-1.2"="11vk77c83xy40i9vclw4v1h5wnr03mb77fa8s2lhi0p4sq0c3vgr"; -"newunicodechar.source-1.2"="060kbd07al8cwns5877ap7irpf3r3bkw0w62cwvl67y03gcmgr70"; -"newvbtm-1.1"="0d9q6mvczacdxykp381181mnra49qa0y0mngr0dnqp24hfw9j9l6"; -"newvbtm.doc-1.1"="0k6j4xpvjwwvz8cipgrqvrs2dj66n7yzlr9mcfsgd5w6rm1p1h4i"; -"newvbtm.source-1.1"="1p3g9qyq4x0ffv68501zlpf1w0ffm816pa0wqjpqf8pz2jmgcg5y"; -"newverbs-1.6"="1n3qdw6n18kci7j9ib7iniymr78i9dzk6iiyc3pj4iy3n9s0xx3g"; -"newverbs.doc-1.6"="0i8vx3hac230w9a13sm3p8l5bv0sipyfzwfvkk3na53l6izdqsbp"; -"newverbs.source-1.6"="17hy171m0ka9j9spj3p292b0zg445zwxc93jj12y82yyd294rdzd"; -"nextpage-1.1a"="1p9dvw7fqspkg6hk6rdmsb5k5m9mkj0kz5a47wg5dgfqgrqpixf8"; -"nfssext-cfr-43640"="1qp85vnmzsn967iqvzsf7yzsq1a4zxvyim7r0xb8pncak805fs61"; -"nfssext-cfr.doc-43640"="1jac2k7nldxq11rcf53glb5y3haqdsxzzxmgmvyzhbrzmnx0bsms"; -"nicefilelist-0.7a"="0p26s3qbxbiz7nyf13lbjzvgjbw5cm9wwq2ji1i6sfjppv3vl8pi"; -"nicefilelist.doc-0.7a"="08zij33sv0pidl6fhbqypx53clzqjdbfnvrrd0yq8m9b527fcd7z"; -"nicefilelist.source-0.7a"="1d2l47v2qm7mzbkhk7x5wzzibnks7n0hz1g8sjxvabyaiqfpk6nz"; -"niceframe-1.1c"="047y9dh0p51lyrrq5fkvp4dpiszvf2nmx53hccl8hzgr2bs3kbwi"; -"niceframe.doc-1.1c"="14fapa38pffkj1hs58b7r1zkjn3dql9d98jzh13cybyfynd5crjp"; -"niceframe.source-1.1c"="095frb90nryk4m2iia4sq3kfrcfg2k3nq079770xlp720zqy07rc"; -"nicetext-r0.67"="0aqfg8phvhlgvyy71flqsaqwmmc6lsl9vsxpxd61v69hp2qhvggh"; -"nicetext.doc-r0.67"="0c078pfiw1nz11krcgwbdlp2brdy2xmq6rda9yahfjjg54xgdbg5"; -"nicetext.source-r0.67"="112ji0zwy54nqswil8lvvcrq0ai7jsmdagvf2786zg9n14h5kr75"; -"nidanfloat-48295"="15l4rdj7bk1279xjjkgh9a7scfmm6w88civ48shh7gwx8gsvcscb"; -"nidanfloat.doc-48295"="06ccf5yhrqvshj3d8ic3pbnvmdpjxq54i57y3141wgqcj5h062dp"; -"nidanfloat.source-48295"="04q480lddynb2gqz8azmyik8170vl056fhfjsnq8ydqj0rchnnqi"; -"nlctdoc-1.07"="0jgnmp6pfjz2jmlvrvnbqsmxk0bj276044hzdgkxl635ilzkzds6"; -"nlctdoc.doc-1.07"="07yl0i42zzb7xw0wbdwzpm7ibz6imds379ag1s77zii5zvlir1x8"; -"noconflict-1.0"="1flkwyz36xycq4aidj9v6ga29ghbww8ss5dkz4lzsr96nv38q78r"; -"noconflict.doc-1.0"="1v3q7xbss5ra1dizg2mz66zq97cfsv5lgnd136xqbbmn5vphl0dj"; -"noindentafter-0.2.2"="14z62mn7fyfj7m8wk7w8faq7lwixwfaf1mlk9bcc1rrpvm5hqn85"; -"noindentafter.doc-0.2.2"="1r6a40hxbkhm539b0yw4kmmg2wxlbnlrfa0wpkicp2yi2zy9xiif"; -"noitcrul-0.2"="1whs120vlg4cdjmb1x363g92ira9nc8j2h65qnvwv8qrmh2hrwnp"; -"noitcrul.doc-0.2"="0y3j12rb8ks8sjs1ikw3sccq7p7zmixc10nhdy9yg9rzwcgmicva"; -"noitcrul.source-0.2"="1dsjxs73xf79sjq9xynnv78jws1j39l240lvcvpir1k8vnzwfa13"; -"nolbreaks-1.2"="15qa4nf5c9gl3ha4prajqxl2p1ks6fpql03d52prm9vqkwphzgyy"; -"nolbreaks.doc-1.2"="1h9n7ki3iznbzq519cliw03fcn2k40f2rldjkhnp5vlzma81inh3"; -"nomencl-5.5"="04wp75pbkhk90137k93s24sl7iggzp2x36ym02y7x6g2cyfpf6v8"; -"nomencl.doc-5.5"="1qvn7ih059frjnm2cdk3sria70dyraqi9g4c6bw2qw8amcwc1bnd"; -"nomencl.source-5.5"="1ygv511l2sifvbx7iv0xn58s51ifzh19l0cjd8ibb89a8i8s9cxv"; -"nomentbl-0.4"="08jvfyn4vd8qwlnbsqhlxnwnl4qv5b8r32slcbfwshc4kyi2hn9a"; -"nomentbl.doc-0.4"="0g48qyrrj6npsjcnnzn3mgsmd5fq4v5vzzsgxvvx9x15446987cm"; -"nomentbl.source-0.4"="10b41ax3ynpdbn9bawkp43whqjkygh8f2p6qdjiwa47w1acca8zh"; -"nonfloat-1.0"="1ay9s9xrf27sgan2gan86g68i91rwa8spmmj2l13pb3zl5qikw66"; -"nonfloat.doc-1.0"="0jjil5rbxzcpkyid8y5dahab2ca9r77sw2scgrc4mf2h4nhrjfyz"; -"nonfloat.source-1.0"="0vyvpxyrqjqmlw2fj4b9avy7sn79m4q8gcbgzdkzzp8d0rng5i8s"; -"nonumonpart-1"="0dyf0nl16j7vp955g64rbvvjyqq31x5iv7dbkh8cikwvgn9g85s5"; -"nonumonpart.doc-1"="06j6sc8q18mnnnpbj57ykays69n78z0iz1r3vink7qaw4a8fbyba"; -"nonumonpart.source-1"="0p3gicf0fzmk0f7lblydf31pi9x0f6x0k5rvdd2ia8hrjdaqv1dz"; -"nopageno-18128"="098q0visa9g5lh3vp6bp484fglrq8g21v4cb71cnc30f7avkg1v7"; -"nopageno.doc-18128"="0n7p2f039vmd060ncc81yi2hnn7qyk6b7z2hpxh9pp78dwklgx98"; -"normalcolor-r11"="1yvbqc6px76phjgy9cwpqwy035nb61nvcxy32v9xa9wfcp36nw7g"; -"normalcolor.doc-r11"="0919aan1qxp5lfqm902ijn6sflkzv1dgxi12hjfixd8d1d7rlfgs"; -"normalcolor.source-r11"="13lqp3zjnhm1wmf5id1bbr86l5qi13xgij455l38l55is468sv8j"; -"notes-1.0.1"="058316ialcra7m56ww7imzqqhk318abwscw5g60hr73x3x7d9dgq"; -"notes.doc-1.0.1"="1zq11rygqkbx85cf79ixwcv1w971w4hx8zfsv7z16am4mlxcdz5j"; -"notes.source-1.0.1"="1ycxa3m2l13z6a3a4a88wpznvwdb78qyxkh879cvg85apb11rffq"; -"notespages-0.8.1"="1zn3ygkiyqax88azc7vcrkfw5hfzbbq3jkacnv50c8z5xllk2nwz"; -"notespages.doc-0.8.1"="0556azchy0yc8757wcy687vn82q0jmyf7n38vyx3admpawyk1pxk"; -"notespages.source-0.8.1"="052p17fbdpbdpzaai5xn8r0v6lamv7ps78svd27216p71djsfr66"; -"notestex-1.0"="08b59wvl0n718vbzj6azwmj5cn4jk57yzzzzgxkgkjj3kq2926ig"; -"notestex.doc-1.0"="1n7qdz9sf7jdvrrcvixbvk1yjjqdwsr8c4vlw0glwabjyzj9hi3v"; -"notoccite-18129"="0cbvwvgh3rkms6akamnrmzwm6796ly5fa93qsb30bqafgmx56il9"; -"notoccite.doc-18129"="1h14fkdn5kvxagkjx8h6f6a06v7y9z48s87x52cblwykgfm70qxz"; -"nowidow-1.0"="1w18i36ynsyldb9gs0yhv6plyrjs4762y7bglncv7bhqjmyy7y3g"; -"nowidow.doc-1.0"="1l2zq2ain8nhkaa8aagpm22nvg8p1vk2cdgs6pmrydk0hhmjh01h"; -"nowidow.source-1.0"="01qjfpps7ahmrwvg142mspj8gsyx21l3nr75g0v7qsqxbfjjy6gk"; -"nox-1.0"="06036p9059x0lzliq9b2pqahnbp8jlkd1gnq300rq0syj37mjk5f"; -"nox.doc-1.0"="1qfjlzczcnmf3pgqf4qr5v9c6ws6qba9hm28h3xwf2s3099drxjd"; -"ntheorem-1.33"="1mbrpw822ibb7wpzbl3fhnxg4djwy32knn9hqcvw1kpahgfbks66"; -"ntheorem.doc-1.33"="1f1cridxgv2rwv3f305hsd5pm59im1ik8qmpqhq4rpvwph8ny140"; -"ntheorem.source-1.33"="1pkrhkl9iq0giyvk6lqjxx5x681rjl9zmc0kmcypwgbqww59hp0i"; -"numberedblock-1.10"="11v5n8s9glczglmqm4bfykg5v0qdqr2wfnymb15aichqqvbfcgsd"; -"numberedblock.doc-1.10"="0rh954i5167pmwmisn3v26zqqgdrk5bcn2pc16m3wyrdgvq02kzw"; -"numname-18130"="0sj8plvx36i2azwnk9zhxd16x7dxk2419rdzc93pl3f68kxdmy5y"; -"numname.doc-18130"="18iarxgxxi5dj0cj1bf0il74ndn5lng3axf7zz0jwqpl5d84pz6b"; -"numprint-1.39"="0wkijyxl1zzay8vqvsyhk6kf5247qr8k55rz91dn1ph7b597d952"; -"numprint.doc-1.39"="1jra448iyyvc8qgc9z49brb6j9c89fzf5zhgz48k9959bv8izs8r"; -"numprint.source-1.39"="1svwh456nbswkrmj98s91vr2x05fvs58chkr5d5slq14wg1cpa0q"; -"numspell-1.4"="0lzzdhdw5rz36d83v0y0g75h4mjldsjzmd0zdjbv3hxsjplywdyy"; -"numspell.doc-1.4"="0jvywqs9bxrc2bm1f61liqrimbhvm5akl8lyc3xr8gqmk84v82jh"; -"ocg-p-0.4"="1cfg5253i7rb0ng65fwm6v0yhs2l91gv0a3d8bra1bkwz2f1mfmj"; -"ocg-p.doc-0.4"="185fgw41dbw1hsbv5lr84spv1qcfglm0xhrgwk92g0dgh20d0kfd"; -"ocgx-0.5"="0a1mvlgn1vql9w8ziks677ysir9fc904ihxhn2hy5qsk9j8wc5w9"; -"ocgx.doc-0.5"="06d3hdgvwymvxq7vv7ccjiyay6vf2v6c8wznqxyjjb8sv64mzlgd"; -"ocgx.source-0.5"="0z2jgksb5pccxs2bf94vbzb04b1k6a2ssrx3fxc3fwl3z8afqq9q"; -"ocgx2-0.50"="18m9m5nyr8npgv88di7bhr2bajsygrw102ycyy5rd52bqvlcrnhr"; -"ocgx2.doc-0.50"="1ah8qwa28qxjznw111ifhxnka51smqackhkwkzydk40nvjvpzawd"; -"ocr-latex-15878"="1l5s8wlqk4fc9i3fizhbm3c7nafq36w39693xm1x07giqqw8q8cl"; -"ocr-latex.doc-15878"="0ai4kr65ls66ywxncb63jr6gy6lcw6zjvlgsbp4wd6kfjxs27bh7"; -"octavo-1.2"="16pwz513a39630p51n84761asli9kba5z3pmbgfkcz7yfk9iiq22"; -"octavo.doc-1.2"="0rdb58jnyyp12i7ndd6qibs2jc1f0zcw42jh9j48aid6nwslvrbr"; -"octavo.source-1.2"="1f13rhvd2l3v7fdivk1ybw0gnacv9y2pzwnbw8ykmaq3x7m3x2j6"; -"oldstyle-0.2"="14lm3ghfgfqafqivam1dqf3gqgkchnbnc84z5i0whg2p18x9zns5"; -"oldstyle.doc-0.2"="1qj8nbcx1krpha49k4yzyix13vs9s41g96r7kpdmv52vlpfgs4lx"; -"oldstyle.source-0.2"="13c4dxvikdxx7qv7y9rfpgj4fgzp21q71xpmq1jzx7phwrsn6wcw"; -"onlyamsmath-0.20"="158p92zgnmicfwibiyr5qbkwwkxhvfpvngkbpbw6grbdhlwsn63g"; -"onlyamsmath.doc-0.20"="1d2znlhbz509rqzlwqnbz9b64mpbhckh8pv23fqr8058xlbazkh6"; -"onlyamsmath.source-0.20"="08znvq2bzapn0dfa7f4sd08gm5k7m3sh6hkwy17zwkc0987wx487"; -"opcit-1.1"="1g54f5sv05rg1xxpydsakjrlckmh1wq0p15w4q0935iw0aq7rn8g"; -"opcit.doc-1.1"="1rx3ap93f4570d006qci6j6qi88zwxc8504gg554aak1lffazw5m"; -"opcit.source-1.1"="0242ajp415h3y20dyvi2lrp38saq10dgb6hpnmadzs7wrwxhma55"; -"optidef-3.1"="1jvalzi2gid20wn253swvhil05m273x6685n0b5wbrz5kbvzk212"; -"optidef.doc-3.1"="0sdd6rsdfx1fcw1493b12ww5llww6mv0rij3f1ik290c6qbmyr3w"; -"optional-2.2b"="1mv65cqcrjhykpl565z96s57z05635q513qr440crbh61rp93chs"; -"optional.doc-2.2b"="1ks001q2b1yw87q0frhqq6yv77mskng6v1sm6kd8r22cv5g49xbx"; -"options-1.0"="1v2j59zcv5cplh3czd6r7cs4n79yvw3448492bxk446j4lx2mfcx"; -"options.doc-1.0"="1za038prpjb3s74ryr25q7hmz881gr8abmf68h7xdjq6bdk73da5"; -"orcidlink-1.0.3"="0ajvvwlkick7cm54bwp93vbn74a77jc4yb5vpy481pgl3c1f3rs7"; -"orcidlink.doc-1.0.3"="0d4y49d9h7l1h0d187g2pixrk9midqdfm79lyh3mxh2w2l19hv9c"; -"orcidlink.source-1.0.3"="0byrhilaxyisxdkxrb1zzv7r3snihw552n7ypsl67jjmw0593vzw"; -"orientation-1.0"="0qcqyr76wiks50i1zr3skp7bsnjzi6snsyvsm2za3l08kbdi3ixx"; -"orientation.doc-1.0"="02cmfz42sdd1gr4yaha603rppdh4c4wjj0jbcrmwlfgl9a47rj11"; -"outline-18360"="1q5dr9xlsn3fz7bcv08biv5cv71qf8brzgg4468mksh8lc8r2kli"; -"outline.doc-18360"="103sijg9ib5qfwaxkdgf11zsdg2c46dv00hn08sspl56a08j54sl"; -"outliner-0.94"="03j0mshhrchrgpa2z7j7q6n783va5v0w16gp401rzbvvdn0l2qni"; -"outliner.doc-0.94"="0vi80qhq10yy051sfzh6pmn34laghhvx6plnggrwvcmpp4fcw14h"; -"outlines-1.1"="0wzrf2fkf9kh0d3jjbc3kxvsmkynwzg622ghwcabaps097r9z45i"; -"outlines.doc-1.1"="1avkpx77sis4hrrs9dqizq2sz4vjzvn19ks8q7l32qyz6lnxwk2b"; -"outlining-0.1"="0kc3x4zq24f2dzwzypdi4ysgsfi40l54zxpaxdfgd662wxangrsp"; -"outlining.doc-0.1"="177xwyzq3mha4061dxxshszsyysmb6nl5b2grg4m55mn19qlw2f0"; -"outlining.source-0.1"="029wnd1px0wdgffblxcbs33r1ffv761sgma7bap9g2d1n3dwja2c"; -"overlays-2.12"="1xfbb4953ab25dbccfsp9ban67vrq79j443mlglnzqmg1njrckk9"; -"overlays.doc-2.12"="1nm0d47vclan46q0zvigxri5zqmfpv0qkk0arsg836vnv7l53q0g"; -"overpic-1.3"="1szm75fc37634pky5sm2l8b30zqw38n1h0y01w7c5is5s0a9zmgk"; -"overpic.doc-1.3"="1lixa20fskjpbc6clgr4sm74d76bqyyxc6y1drzhm9xnkggd29x1"; -"overpic.source-1.3"="0q48v02rvx1w95c077r7mdxzmvg7za151fxym24qsbdbqd3gr9ja"; -"padcount-1.0"="15p8g5hjwlm80xnm9py3ss6afl6c8rdq8f92z7518hp0yp7d3zfw"; -"padcount.doc-1.0"="1crpv27a9rfmh4dcliqvi7aa4h4lvkv48k5zk0kx6ahhxa2zkzaa"; -"padcount.source-1.0"="0vkk0c7gvzihlmw3f8ni4awj9r6xrysj9rrsbqk6dkngrg02x4xz"; -"pagecolor-1.0i"="0s7x69f89xfs8zlpnqg3igjjp8cdjpbg0666knz1bglvchihaav0"; -"pagecolor.doc-1.0i"="0lkc1s21l352wjgzvg4psi2ivh5lid9q613sccc4nvbbxj3vp8wd"; -"pagecolor.source-1.0i"="0dlrm09asm6y9kwcarn7b3lp5fxs26c3mr6dgxc7dy0k63kqnmpw"; -"pagecont-1.0"="1fh6bplg468dandbyvmwf13sh27r6x4dmrwslldlc9580h8jv02k"; -"pagecont.doc-1.0"="1vrcr5l1facyyf9p8977q0i5m7cn7y40dbmiv99314iyawa3rr1g"; -"pagecont.source-1.0"="1qc105f5v0jiahk8gpgr77lqfaladba4hmqnfizbblzbjhhgg05p"; -"pagenote-1.1a"="0jd80dz0jl2gmfr74lw6jy1x2hj6zlji9az956gkj8bxxc6zir54"; -"pagenote.doc-1.1a"="1s7imj4fi08487xmcsicsa4cknpsgd10dbcyn6vkggm95qn6119w"; -"pagenote.source-1.1a"="07ngnfinv2mki203in54l4gx7r4qx9rm8k4x7856gr7jy1wkw16f"; -"pagerange-0.5"="1nixc1dn9cbdi3pa5yxajii6c9ljgc2jrnknsa7wb66kj5j1lqch"; -"pagerange.doc-0.5"="1vy3c498j95miksm254a1sh7d8bp3g5p7lvncc1xad4g388q6hak"; -"pageslts-1.2f"="1lm8707bl8a9kxrbbr6sap3p66zwjklqv13invm4gcsg92yf7yhi"; -"pageslts.doc-1.2f"="163h2h9n4cvap2c369f2yxv3idij6wzjqwf0wd7w5024h1vvj683"; -"pageslts.source-1.2f"="01nwizj0vlnwzbqyl5dn02vg5xl2aw60wyvp4plm0agg8kxmsi3a"; -"paper-1.0l"="1d8w8aicx5drrgqdcrsb7vdy39xh6xmnnpympy1db5i2mc2nkjca"; -"paper.doc-1.0l"="1r03wy4harxplfhqp0dsqfpp0s4j5gn6k2p43fpw7wndna8lnhyc"; -"paper.source-1.0l"="0c1iv6aynpfi37bg30q235zdpbyhj83rkir4kdg4vl8q27c8gpwg"; -"papercdcase-15878"="0gfkn87avjnfjx2k6hz5k2s9iy2lxwx9x4r0cp1lcwjgjsavf2y3"; -"papercdcase.doc-15878"="1hm0i4vvxhxn0wvsrbxd2lkqspqkq7ik3sxxm1nd575p5l3zgl69"; -"papercdcase.source-15878"="0mkadgjk395z280220zndpbbks331d5hcsxqnarpjmh00mkhdj7f"; -"papermas-1.0h"="0x4h95w4znr0qkbmh18ws13c49fq9wmx1g0rhkwbkg5yxibyhbk1"; -"papermas.doc-1.0h"="0vv07vzfsgmpm748si100rbsfp0ipvnnnqidg6c5b4fgydz2dcdk"; -"papermas.source-1.0h"="1z2wvpy8r0qq0zjf48i2z93iyz6vjnzc0vm8g5pd5zrq961hfj4r"; -"papertex-1.2b"="144zirbvdpq1q8an6i5rngycmlrgicf9skh6mnwyz45n4zyyzyg1"; -"papertex.doc-1.2b"="1aip8lhazpmmvdib6yqivbgjagyyhmava29q9hrlx833385vvnhj"; -"papertex.source-1.2b"="0bfkh8vwqh6jx34fmqfqf2qz5wjpmq9bpzbppf0cphs5frbwg10b"; -"paracol-1.35"="0lbdk9wbs6c6kq0iyf6amc72m1njdf3h8yvcnka9dkhjp228ldf0"; -"paracol.doc-1.35"="0fnby29nnrasv32p9xwwwax57ijzscpnsv43rwajlqwcdhi3s2nj"; -"paracol.source-1.35"="0q9izjw8lrwcbx0cpq66pr33cn02wl4daxsjvlkrjzw8zzrijl64"; -"parades-40042"="1vmjda4cvajsqai47wvl0byi552gdcy0j4m36p58gjn3d9bc8818"; -"parades.doc-40042"="1lz9dsy94x5cvv55nk975fw7dlg4bm6d8ls0p6gy5b58sjd6vcp8"; -"paresse-5.0.1"="0kxlx7p8949msfiafqf0j2ayg41cmgnk1g8023af9rlxbf69swmr"; -"paresse.doc-5.0.1"="1v04rmmmy8lsvmbvnqgiivdr5rxfh97k3fb0zc0rs3jfg0jl290g"; -"paresse.source-5.0.1"="0lvwpyc8fdp3y1h7jrmlymajjd40a8kc4nv94wg6nx5xq2rksd7i"; -"parnotes-3b"="0d8600ssj90rwl9rxd27i23f58lmxyf5r1sn8yrl8fjnq42q447b"; -"parnotes.doc-3b"="089i9fwzjcv98pnqmhca26wpvn71zcgb79y3jg5w8szagli38839"; -"parsa-1.3"="1n2yh9v3d8s32ylicq5vn76m91s6648zgvys6vg8m63pafzl8rlm"; -"parsa.doc-1.3"="0i3d87kajjcw9mallswncp113jz9jn35jkj2y10dmx6z5sv3x3qx"; -"parselines-1.4"="0ymcapxlfyb6xi4k0z1y42cyzan67yg5v4nnc2f1ac35yw4z57pz"; -"parselines.doc-1.4"="0396j4dscv2pqk9vxmz0p4xm4l3v9ln98cwv32r615l1k68vafsg"; -"parselines.source-1.4"="0cg77iddyvl6p818j74ci2zg4zdddp82wddhxqh57qg8vcvi9g5c"; -"pas-cours-1.9"="0gyw81drxs56dwqh6v1gqgs4xcwq78v9isgg38djxq17km075y3g"; -"pas-cours.doc-1.9"="1zn71815y5pkp24l0cd4283zb3i85mqqzbxmhxj19v5s4jx3ywsn"; -"pas-cv-2.01"="01aqcqyw0h459xq18gc0y00z2j13zwdn72qpfmajps7ppadlcbxw"; -"pas-cv.doc-2.01"="0mwgvj4hbq9b6ih6l6hg6gl5qrxyyf0mimwv50vpy1z7bhdq2l6a"; -"pas-tableur-2.01"="0w4760s1z3nqnyf449vmd7x7inhsp08n9i794177rx7kc2yj2l7j"; -"pas-tableur.doc-2.01"="0fish3403ixq2mp3l69qij4c74s999mimh7majfcw58b0y6nizpw"; -"patch.source-42428"="02xfy1fs30nha0l03lqwl8xrpd81855kb5nb660ks83aj187dghy"; -"patchcmd-1.05"="0v0033zpp4w75lbxk8w2byhgy3s6qvm9281xc2c75bryp0ar5pfq"; -"patchcmd.doc-1.05"="0vw698r5q5ai4lx4vrb24x8j9dc7iwaml8scsh9c22cpqn2sn26s"; -"patchcmd.source-1.05"="1cb90y0i5k9s4jj3f9vnj6rhxphjc14p5nm6hllibww3h1khnrxr"; -"pauldoc-0.5"="14p0lnn5hvn6szhgr0ngdc31dbjrfk7r8m8n2jn5n8nirsrdzjxf"; -"pauldoc.doc-0.5"="16ls36m6c8v4x46bz26ysl0ndi9jmby2gl8b9wglw9ba2gf97xjw"; -"pauldoc.source-0.5"="17440237dyqhxpszm6rcpdhb8dib6l9qfqj5ls2m0bk3vqm7xv8q"; -"pawpict-1.0"="0sx3lwgm3d3cm4s5408x5dhf45kngls8izzkqjrqjy074736968d"; -"pawpict.doc-1.0"="17zf7acasv8h9crzg6jw3d2grmhi689476z9x6872h7kzkn3whj1"; -"pawpict.source-1.0"="1vxmq9s2q6sq6qza6lhkd6lmj6pg4bw8qvcpqr8zr12nqcfy4z3g"; -"pax-0.1l"="1d212favd0c9g6hfiy2kc45knsa8x7n3yldkp5xp5xvfa98bckp6"; -"pax.doc-0.1l"="1646yl4nn4fr1i4wjdyikzbr254fxiga72ihf9jkiafjibxrrl8z"; -"pax.source-0.1l"="1g565cpblg4dkdrrrs79qnfd5ips1rm1785nyvjf4m1p4cpffdgg"; -"pbalance-1.0.1"="16i5d309dad5g00kwwsv9yfwvf3qaqs5vb9s80iizk6bicgf35yz"; -"pbalance.doc-1.0.1"="1f87jlzha44v1z2p94faijcpaak85fvnyyp694da4d3d4bvg2f34"; -"pbalance.source-1.0.1"="1iy7xzs5azgprmy4jdfpncsnvksygnqya61gzjiw02ddhr8rmh5d"; -"pbox-1.2"="1b6xli52wbqlhxf2sk4ryighd6jaj6znvpfv6n9s1iq40ag943dc"; -"pbox.doc-1.2"="1qa0h3ahh8q990wbwyrp4glwhdhbcgzz9yp436083w8c9ang0lg4"; -"pbox.source-1.2"="15gqbvrsigqqyzcf8rda0z0kcw5h6cnk1l9pxjh7apz7i3k00i5c"; -"pbsheet-0.1"="04z9iszj9hx7la9zqqqxrsfq3b6asld4zxvrszyjqw7z3fj7pyz3"; -"pbsheet.doc-0.1"="02an134idar5ndk2kk2d446bxawv0xkrwg8xvgxgpp8s1pqdzai5"; -"pbsheet.source-0.1"="0ad7zs28d47p3swvl6kz2v1p2nskrcf8fjwy0igwy8d8qalk0dix"; -"pdf14-0.1"="0gpbf1jxfjl56pn3sj50b6x0z3fqhb7d1dl8dhf31vgcj8sn9n08"; -"pdf14.doc-0.1"="15rgv0fw23c4zbwlx149hhbq711hq39v1nka52mjpl7lgvvzny98"; -"pdf14.source-0.1"="1wm9nlqws9g02zkk3rgrpaic293vfskfrxsn3s2jb3iz0f12bp2w"; -"pdfcolmk-2.0"="09rqw5csr4c63w5z5c019rm8h4plqzwy0icxbzgap048a7x02kqh"; -"pdfcolmk.doc-2.0"="1nslm2frwxqcrm3spr601p2r6ga2b91d7v1v0rbi7h06h14mvxa6"; -"pdfcomment-2.4a"="13cknk58kksg605m2jjkvmkfm47sdk56irj8xa3p0alx8c4cn67m"; -"pdfcomment.doc-2.4a"="011l19b3lhc8zn3dn071gnlg2300174xaqkdn83r631zz45yriv7"; -"pdfcprot-1.7a"="0m4lf1rb2j81ry7v2g9lfqs42rizifd64q7xw9dzhnixp900ldfk"; -"pdfcprot.doc-1.7a"="0b9ac68snrs7fs8g8nqrs62h8jjfyjsa07psk8qc20nvpya3hjq9"; -"pdfcprot.source-1.7a"="00nmdx6l66w895fjir6r2pwrnh0vpn706i9wi5qxx143h75rgifl"; -"pdfmarginpar-0.92"="0mhf21dcz4ndhbh1g0h3kcqza4ni6iigrkif0iryyzg1zcx60d19"; -"pdfmarginpar.doc-0.92"="0arfch7gb07grg0n8ij0wfzbfzc8bv5izvhp3vjz8hl8ha3wyzgd"; -"pdfoverlay-1.2a"="1gyrwbv8xnqd4kb70d070q0siissyvw0v9w84di6v9wb27s8yg97"; -"pdfoverlay.doc-1.2a"="0nj5ahamxmqv1vqibjai30a18429a9f3dhngw3pg1aa9s34f9c9s"; -"pdfoverlay.source-1.2a"="1kh26sl5w11p1vg85spvy4ppw0h8fm8n1bh58jhbmp5d9cgrkw53"; -"pdfpagediff-1.4"="1a4qmaypz1indb2pw4vz0hv8ihanhf9z0azs3zkv2ya6qkc0kphp"; -"pdfpagediff.doc-1.4"="12di5a3976bkilcyfg0imx3w8771ky0acgrag7xp9rpcggbi3r08"; -"pdfpc-0.6.0"="1v4zrirfjyl2ffhpkxyd1pv5vb5m8azfzj3spgp9d39jmkf9w06w"; -"pdfpc.doc-0.6.0"="1hs0ws6v5713wsb57x003dg2yl27gfw794mw4p62bhrghpsgfrkw"; -"pdfpc-movie-1.0"="07d7d7h8zfap39dd3nks1bnpnfpgs8nrzzdsmchy6isqfmfrypgn"; -"pdfpc-movie.doc-1.0"="1la9fvzrlik4ar3fdaxla5gbwpa2v49xrrwc4wy60i7h80vqv80d"; -"pdfpc-movie.source-1.0"="07lw20wp5cqr0pvjsw3ds75n3hggxgcp9rbvw026lj5k54wik1bv"; -"pdfprivacy-1.0"="1l1nqf4ihwfycnb1x44l1dl2h9f3iy1ppvr0l4zb8qcjqhl4j63y"; -"pdfprivacy.doc-1.0"="15w8jwhksfiv0h2iixk07xvvmk1g2j322xqid753bcyks48xffjz"; -"pdfprivacy.source-1.0"="1nqjj51h0pcrjnybj3cqb8zwi0r1ipzzw8ic2clnf3in88pjzjhs"; -"pdfreview-1.2"="0saxaxhma5gdn150l934y0q8x0nigbcn9r7ixr8rwz4d85g05m9a"; -"pdfreview.doc-1.2"="1kdyc7h2dpr4gjzf9g0rx66gsxaiwran9k7vj8942pr3x2d2jbaa"; -"pdfscreen-1.5"="0kkdnwgwc9z1rqsz8cjsmfjdi3ycwi7n7pl2929yvvwixp10rr6f"; -"pdfscreen.doc-1.5"="1zhg4vqfjjmg4z4blrr2zl6jp7m2c24m5diifgn5j3m8nwxp6m2j"; -"pdfslide-15878"="1za0jp9dbrv0c875zddgcvddlk7gm47crmn97k4zx2s7glx24wj7"; -"pdfslide.doc-15878"="1rv7wbzrlgj55n7r6i9bm1vxjvjr38v67lizmbdcxz1lfqbv0rw1"; -"pdfsync-20373"="1wwndjn0058hflw73y8xfsmnspvaz61r55k96fmsdfb7xfncv1vn"; -"pdfsync.doc-20373"="1dz826gclpf2knrgks0lhvm6rs1xjxqpzgbz4nkv1f8li7379y2q"; -"pdfwin-54074"="1mxfvchz2h9wrybvb0ri4iygwn1ljs2jzsr9hi7j7ych0sjq1c3j"; -"pdfwin.doc-54074"="1wn4fj00lpfw6jvfr3144gjvghdjvqxc13ji6kcf8q18vcdjfcbd"; -"pdfx-1.6.3"="1pim1kiilydijs57zcsd1cnhzvcq5y621fb15hwg9y69s624wjwk"; -"pdfx.doc-1.6.3"="1rb38sw6lyvy24hkdyw7xrbm99bplvcp4cfcdr80pdwf51g10faq"; -"pdfx.source-1.6.3"="1y55s7h2cc39vp36ickpkc8dl42rmq77l1d47h1dxximyihl96x9"; -"pecha-0.1"="1ia3q7gygbg4scgja2qf5p7wbgd429cj78b8ffjcz68vgdg86jjy"; -"pecha.doc-0.1"="07b7kmf1if59nrqnsws5hklv0idjjxwp37a16dbjpcfdirb4s2m0"; -"perltex-2.2"="09vc7pbfjl0zjmbra41p5lmr6l6r4gh2x5h9h5hg1i76n4mfkd8d"; -"perltex.doc-2.2"="0sndaglhb92b4jvp0jzpvdiwzc49ijh309aysahrw0pwkdl2lv5d"; -"perltex.source-2.2"="14rv37h9qwgba7dqq8zzvm0dc9y4hmyr6yvvkfbh2il5zs7m8nrn"; -"permute-15878"="17ky79fz5pb9xr4gwrfpnpxj16mzj6f3wnh9dfhddzlmbllw1djs"; -"permute.doc-15878"="0m83nafyxbixsyg37ia535h3axvf2vp6ky0yg1xcv8ppsl72fd8m"; -"permute.source-15878"="0k1h40himliydiqssvmzl18g28w0hfsxc6kv7wn1q41sm54knhay"; -"petiteannonce-1.0001"="0xvpw8lh1zlkc89chbyjsfszr7ix06afh1fajp5iiqiyxb021v7y"; -"petiteannonce.doc-1.0001"="0nnf9bw4jdm3w28957bdfsl9z94a3dxz5kvmjrg0jkrp3r3cyrgv"; -"phffullpagefigure-1.0"="10vdd225whr0y166xbfc8qbm39vmw3ksvcjm7ylkafyp670ckc3a"; -"phffullpagefigure.doc-1.0"="008q8mf85s4dfbjxbc0k9zpwazbvhbfcc0hqvn679v23kxgfphnx"; -"phffullpagefigure.source-1.0"="1xwiygkhf3ggmgl21dsqmpq6238whn20wzhwn8znhh9sxwa58pyl"; -"phfnote-1.0"="0sik9q24cr32xc3v88rbfqp9q6whv8pr2acg95g94r2nh800ldml"; -"phfnote.doc-1.0"="0rdzcdp6xax2p15ilqpk6yc84rag379ik6zivqh9aivcmpsl8ak9"; -"phfnote.source-1.0"="1lf2g3ka3090s9pwv6kryqzczw3bnrrm9g1f826bdr5ic83k85w7"; -"phfparen-1.0"="00is93n463f5iv4gxd18sc3w338h6a38xahrd1r5j8mv2d419wq2"; -"phfparen.doc-1.0"="10ninpjl9ij19kw8y8pvbma34b1y462qdigpslid2g3gyagkrs8v"; -"phfparen.source-1.0"="00bd1j7zn84d0lfkw08mc93q2ayg7j7bq9klcvvcd5m189spj30h"; -"phfqit-2.0"="10m4s3xsyg57dpxnlsxfr6wrr05p2jny6rw386dhgy8dxc1pdazq"; -"phfqit.doc-2.0"="00kr0rirmjkhhbdvwifzxwj0ifbj82kh59skfxpcls0kd08kd74l"; -"phfqit.source-2.0"="1mshxyi4yplr0hc0sfssjm27mi0dr59zkhf4gar3a12y831c4m36"; -"phfquotetext-1.0"="01na6w8kspl4i0i1s4cgnl4r5fdcybqxx7mzdd6mwbd24mh971a2"; -"phfquotetext.doc-1.0"="091rcqssy0snh6m0z2pwpflfvvf7fsrriyb9lq0f5pnpqqhya8ds"; -"phfquotetext.source-1.0"="07q96xkawcsiipr87nbwfawkcqmgch8h695gg8wlq091q2wrp452"; -"phfsvnwatermark-1.0"="1jmq6l0hb895bfqh2qycxpimwdgp44c64cyxs3vnfzxsb4ii4sz8"; -"phfsvnwatermark.doc-1.0"="0bcj2m5x107sswwg54zhyfdfdhxn14klnxkvb1hc56qi4wc4vkwy"; -"phfsvnwatermark.source-1.0"="1q2l9w8lll3i4bjna6csx4kdpai58i25gn1yn0z4p0pbzqvi08xp"; -"phfthm-1.0"="057x1rjr18yw83gsrp9gvgzk3vq95dr2z3pjrdaq3rm0j9m3a2vd"; -"phfthm.doc-1.0"="1xr1588xc5pmnmcxjxpym4qhsq1h8cc08b4b6vyw7w0z5a304z2z"; -"phfthm.source-1.0"="1n33br6n6ffzksqri0xskyj9x9q93lgzr7cy7rsn0c2aksnmca4l"; -"philex-1.3"="01m80gaawlxnga76rkqwwrg9bg0szyd3qi0d3zyvk1n41h6inijx"; -"philex.doc-1.3"="12s81zvlsddzscvlwqm080y6iv1wm5vrffp9aqdlkpcf0fwlriva"; -"phonenumbers-2.2"="1npdf1am3604gk6anrwpkcsjcchg7cb7m6gqijp53mw64mbka1jy"; -"phonenumbers.doc-2.2"="0p1k4i67rvn1458gnlq49v79m5rjadjsvifabjzz1clww4dxlnmp"; -"photo-18739"="0d9mkavi2x4wha1c9zi2fswv7vsi4hr0588gj82vwmwlrb6v8gsa"; -"photo.doc-18739"="0xnxkv1rkz4c7wh7dm8rna2g2zf9i97aaajlfqsr6ls1d9by4zn2"; -"photo.source-18739"="0vxja102ajrygarqfg0y7bmmhx2my66dlnfp7rsc4kldi1g2fs3j"; -"picture-1.6"="1i2775x39n5vxspy555rwn86384yyapl70kcfir96prp1846rfjd"; -"picture.doc-1.6"="09gid4bb2wbmaqday94qj4r44cpk57rxpzg6grdcjg4y1dkjph0b"; -"picture.source-1.6"="150wv3jb6hspwhkjnbxff5izskvqfvhvqxbw773qikjjxsaidqgb"; -"piff-21894"="1q0xdl6ip1706wxprpd85vycyksbnn1ws091gvmpdhn6as4fxg9i"; -"piff.doc-21894"="1sa2l82yndb9pl8bfmnna20ackv9rxp7y6ljjyix3bpksqp20rwq"; -"pkgloader-0.7.0"="1vmpxv6x2dq9b4ddj3xxqzkxz213bvz7qn24jlx04svdrq0cnpjn"; -"pkgloader.doc-0.7.0"="064qsri65nyy25sz8y9avpxyg3rzcspjr1cfc5jp0vfd07905zix"; -"plantslabels-1.0"="16hzr9zavc26mqddsq4yzb2y60r2lh1yjlna1qyaxqrq7fr76g1z"; -"plantslabels.doc-1.0"="0pvy9gaarrwr4f0bzdhj3xgisfmpd73rfcv9mlw87k3l9y2vly0f"; -"plates-0.1"="1238w5267spw6liidzxd550hjdjxsg3d1231l9vf5fmcifllsnmg"; -"plates.doc-0.1"="0w1jn22gd938zqifhbiikgggbly2fjhiwjdh2jq66yax7p76pjc3"; -"plweb-3.0"="0yimmz965gsb0ddvq3ck28x73p9fn08c42f4331088130l43dkx5"; -"plweb.doc-3.0"="0ad3z41r1a3wkwr7lr9hf7n4bcas10fdjky7f9ykam0244r5q4pw"; -"plweb.source-3.0"="1zpnyzxf125qqz6j3m2182yn71nkrlaan1qfwl98v020iia6vyv1"; -"pmboxdraw-1.4"="0a1mp38f2562yq3nzv39ffwhnzwpamy74pvqnigg7hv2v7blkijh"; -"pmboxdraw.doc-1.4"="07f1n2wpfqrd62agh0ddw67fnl5qczw16640h3v5x7yw31dx4n29"; -"pmboxdraw.source-1.4"="0mqg8xkhqy18m2sbp2i2sv58n2hxf05qr215kbmh0b53lbp16pzc"; -"polynom-0.19"="0vn9k3vci15lq0f6r2354ag4bs55jcq6571wvz3k4daym5ka57s1"; -"polynom.doc-0.19"="1cxsw0b5vxy191xy5clf15hb2cpyyqj5ipvgcw9n0hm8ka3g9l1i"; -"polynom.source-0.19"="0qh4w6q9qch3r41ps38yzlv850wcqvf6b0b6vqirk9lq978k387i"; -"polynomial-1.0"="10w1vq7101hnp2ifaa0j9mfccg9y4s3cyms4m63sx54lbpj6rc1r"; -"polynomial.doc-1.0"="1vn0i77hzr72xkj6ka4r8n0g0nbz382z729v269x6p5j9qqmiz21"; -"polynomial.source-1.0"="0hsb8yyk6ssih7fpc6qiwaf40cwn8xx4jgwqgpmfgkc0x1qkpri2"; -"polytable-0.8.6"="02gsan2wakxsw1niq6l82ag2rkkasi1nclf5yad2kl6c5654gp47"; -"polytable.doc-0.8.6"="03k3qz08bfqjyw4ymmibabbaciqz3srd2hll9np7xdphjhf4d2i2"; -"polytable.source-0.8.6"="1sh5wsb5i1f60sqdych0b3zjcli2h4g46znb0q6n68r4ma7xqixm"; -"postcards-21641"="1glfwj94drccwmmsx6icc9vyzq7w8kvq6flkkbg1bp0rrkjf448j"; -"postcards.doc-21641"="0cvhgz34mplpjzzdpy2bxblmz6qxxlshadj8in810g3y22v39khl"; -"poster-mac-1.1"="1b1zq9ay8fxqn9593f8n10zlkirw2b0piic71b9fx6s9a7x82w7a"; -"poster-mac.doc-1.1"="0wc0194ixbrl722a0djm704fmbf49p7vxk5fyv6d3gyznja54fxz"; -"powerdot-1.6"="0m81n5syr8p99wn8x0yf6h3qjc9n5rdmlrd0mg778m2ccmjzim82"; -"powerdot.doc-1.6"="0npmh2sld6kgjnylv9bbrm01ff877mi86qj83kc14bcs1wf8709l"; -"powerdot.source-1.6"="075ab8yw6pdxgr1h1dxw9wicmdhzlhlvqhja4z07j43x2f6cvbjc"; -"ppr-prv-0.13c"="05xs41xfm5hjpx9dzrngaj824rr8cpwcpvzxsyp1xpzlsv3gk1m4"; -"ppr-prv.doc-0.13c"="0rfrxzfm34kn4sgj1dzvdyjx7s7nkyjc785j7pgb609svld6jvyk"; -"ppr-prv.source-0.13c"="0miijdgcsn709kpp0zjyqxyxfgk0f798v748brmqshb6mfxbryzn"; -"practicalreports-2.0.3"="0rv5rsba1xdwcv89fl640yyqqk8c8vf2w647yqz8xawm358la42n"; -"practicalreports.doc-2.0.3"="1a7p22pkmb365haizgg3ainxlr2626mg6p9962cy0933hb59llcv"; -"prelim2e-2.00"="0fws0ssw09yzmzlvkz4sl571yi6yvynnr91s76vsfxk9xrzvkb98"; -"prelim2e.doc-2.00"="0madkchnll3aymjfk002ika9awnxqwglwa30mrvbdd3rvghqnm53"; -"prelim2e.source-2.00"="1bbcnrlhvqldvacxms4jclk5khh618wqkkyyib1fz2c93maxmz6g"; -"preprint-2011"="0qs03jsxjp1cl48lxnvzh7p3pnpxfv8143979pknr06r24g25csd"; -"preprint.doc-2011"="0zkaw9x3ziwddsv03acbmc02isp74ikpdva2azzsl1nzk0c3qs3d"; -"preprint.source-2011"="0y0mk3118yrm95bn22hdwn9qay3j7j1ijkr30hpysf9l11z5ck2c"; -"pressrelease-1.0"="0hrx80i1nfwyhhda415v67qxkgj6fqbg4bicirdn749bwc0anhar"; -"pressrelease.doc-1.0"="05spvrh6dfq16z9jlswzqrwnscnywp482cv3bhak4vavbxs8bf35"; -"pressrelease.source-1.0"="1c7nhvaxs4xlycsx2n6bkyy6rhnzc9ddcnw6cccpgilds546ns4v"; -"prettyref-3.0"="0akbp6wsxn4swk0kwxw27x3lpf5anwk49bb8pvssaj4xy68hyq1h"; -"prettyref.doc-3.0"="1wmvvsz7y0idwfki553qkfhg8j7k5h79nlhmaz6ln448x8gym8y8"; -"prettyref.source-3.0"="1w9qckaw403a8nyqyx8qyqdn3zfkxzgfzj1hdw5vwi2805bbfy1f"; -"preview-12.3"="1jfhsdygkfnsf454rgsvgdh15vi4qa9yhlm7h2chkaid8rq5ig69"; -"preview.doc-12.3"="11xcl7k24ymm12g3s8g3qkwldn6w60km0rvq5xc3draim95qs254"; -"preview.source-12.3"="1hvvv7qbmq47kx94jxyrkwqi8lv95z7khk6hb808kwyjkrq5jzg2"; -"printlen-1.1a"="1h6q95dvpldmrfbpdv9v19p34iwq3jzz7vs0z7b6fnijyybjxnpm"; -"printlen.doc-1.1a"="08p9zwkgjpkh7ip3i54qjdazgnwq79v15hvz4j4y2dvh294nmrgn"; -"probsoln-3.05"="15zsh16v5rs0baqvy9jwn59d95qj6glvc5h054ldb8sy5nwkl3sk"; -"probsoln.doc-3.05"="1l5mq047bpdg21mjdjwfs6ghdh1cb19bf9y5939nlw1wyy1flcfk"; -"probsoln.source-3.05"="1lzai2ynjnfinf38jdqb0bdccrh58jbhnwnpm9ikskxpzy7v262d"; -"program-3.3.14"="0ay2z8ga10zr5p453ss0w5qqqyknsgqd2hifa7lq0gih4rml14pa"; -"program.doc-3.3.14"="102c9fir3hn0m7y3lkj9j0vwf0srbv6inq87lcxwfkvc7yw0rr2m"; -"progress-1.10"="0wgkyvyf24666kg79h7wq1piq6yq2nkw6k5g0ydk3y4gwzzkfhlz"; -"progress.doc-1.10"="0r303dr6yf1r5kk38c1njjra7vgvp9qrblxj7zd8fw1vlq2sc7fg"; -"progressbar-1.0b-4"="1d0d6dy9ssiij19s259d2ns2k5v2ccc45anhz1qm7iqli12ij0m3"; -"progressbar.doc-1.0b-4"="0bxsgvql8hqv4qw1pv18vdxcshphdpbb29mqp3pbbsd4crp4qb5z"; -"proofread-1.04"="0gnn7zkzrszglcqcwz8c4i13apildg7s93rkp1z3h5m2gr9w9v42"; -"proofread.doc-1.04"="05g3k77vczdqk19gigs9b6w8rccvcr0d382ysqn0yg6cgd70bi43"; -"proofread.source-1.04"="1mggrm4cfji364ylra3ffdhwbx6phcxwfzw2mwls00msk7jdzpsg"; -"properties-0.2"="1pxl101mc318ivzszyycwb79rqghx4x8xr9fvq216ambs7gq4sji"; -"properties.doc-0.2"="1arkdafwmhg0hm11as4mb75pjz2mnah1l5msy5xnlk4asbwfc4sb"; -"prosper-1.0h"="1vsjb2r4xnlwwdjbnkpvl42c86rkzs2imsq762n2w6x41i591ics"; -"prosper.doc-1.0h"="1f5w1vb4d7z990mz6iicjakqhszcwirphwv966c66j2jc3yvalfn"; -"protex-41633"="0i3dvmvyxfwjrp6fy5bl1kx2c9vapj19vs97jg3rkfrkdbk0mhdc"; -"protex.doc-41633"="0wpkhhp2asi3761nvl5gp53j3vr4iakfy4rhciv5l1z4gw7d4j29"; -"protocol-1.13"="0kv4ndgdfmwah88sspp4maca6z1l39fg41bf803kapp34nfxqggr"; -"protocol.doc-1.13"="0mz77awxgv9jk97xnl16rs34b1zdqldfi3m2qgdi9y3synrn25x7"; -"protocol.source-1.13"="0q0vxm79xpxkgr7yf12mqkpj69b75smyr9kl5jw2c1j1wqxzxh16"; -"psfragx-1.1"="1kb769ai57d7zg3bp0r0mspz0a2l87qiyg04a87iqk7vxrwv0bd7"; -"psfragx.doc-1.1"="110n7a7jgfmzps5ng4gibxigmm3dpkqlz6jpbnphrw1pnlskwjsv"; -"psfragx.source-1.1"="180yrq0rnsb9cd8j70jym06k543q211fzzswzg0dq8fzn3hk2wwh"; -"pstool-1.5e"="1g8pmd13f73v8bsrcpf4a6hh00pww6isz00gj8cxnj0xnd4p9xwf"; -"pstool.doc-1.5e"="0vwxrcm29w8fiw4mmr5jcxrlc122k4s1wg1sqvmzqypwpvyls59c"; -"pstring-42857"="1f7a26xxxzwfgprhzxq4ay597sln18hjk8cmlzjy342jy45g6dpj"; -"pstring.doc-42857"="0ngxd95s8lzpsgirgrq4dg0p1dwh4l0gs99nhich12v6l19jd29b"; -"pxgreeks-1.0"="1j93gwgk66k3fwkhraapis7ddj8a4bliqh783psdv1054j5fspqi"; -"pxgreeks.doc-1.0"="1md7q2q0b2lhffjm39cxzxf86rw8759zxwj5sbgavzdhyc70ssli"; -"pxgreeks.source-1.0"="04vdi4wf7lw15v05jqycm66j1iiy6g13qrc1ynrnq0df8b0zfs1g"; -"pygmentex-0.10"="12byiwqxbg46wajl8qd55qp5khr0dmpmq38vkv75anc8ffap306c"; -"pygmentex.doc-0.10"="14nv8i6vnpjhdfs09ba0lwqhf1ndfxkhm5p81lfliy7mlpqgqi60"; -"python-0.21"="0qi09d9zyqfimr5p3jlzs2xbhz0gbxz2g5v8vszx0k7ysn791f4m"; -"python.doc-0.21"="0x1nfbv7fmyhzhgy6xsndhd9nja8xbip436kg7ygscjxml6gibgh"; -"qcm-2.1"="17pryjm0r6w559lgkf03aws720zsap95azfbixm7p8lr1gy5nwlq"; -"qcm.doc-2.1"="0wx14xsj4sy6xpcs87bji6xfarfhlzqdzgyyx2p8439m6ay3cpx1"; -"qcm.source-2.1"="1gsfa9bby33a5qgi4p2awr91gn8p4d2qylz32xmzhp0x6fpqhig3"; -"qstest-15878"="1xk4vqqics2iwzxck416za70cksx836qrsm4v8idyg9kscvjr1jp"; -"qstest.doc-15878"="19ddnrz4wjd51h8g0z40db53wh0zlr6m1nfczghc5b26vvcj14y0"; -"qstest.source-15878"="198xvadvk9fb36kxzv1wpis5qb38dqaxsqva6l7l23kz3sb6k849"; -"qsymbols-15878"="11jlwr2pwrxck0xcw2szql0rdynjr2pk4jgzlqkpcardibfr385x"; -"qsymbols.doc-15878"="078qxbmv1zgg73a923sbfqnwmdwg1qkfxra5r8dzi8wlq1cv29ii"; -"qsymbols.source-15878"="01lmlclv9rlkga19mw4ikngdpkxhmhq77kylln8kjhcpa1cylk5c"; -"quicktype-0.1"="16qy6rxxkdkkli1knibhbm28jg80l0qjsn9lsb36b7z5xwxj9f21"; -"quicktype.doc-0.1"="0ic0lkhj3rdpwfsrysm5qidw0gby11kmfnzbh5k2fpkfarwfhxxb"; -"quiz2socrative-1.0"="1s6g0svlkg503r5mqn3iw90qyw5lwpv7dj92yck7ymziv9p59qkz"; -"quiz2socrative.doc-1.0"="0v9x0jxrgiscblh8w9wip07di78glgzd0rn2fp1hpzabi8x94dvc"; -"quotchap-1.3"="1284ldj6pfqq6mz2a62pi81k1jca8xkc6wa1wbrv3kqwfdcc8cwa"; -"quotchap.doc-1.3"="1bnhvp91adi4bhzwddzl16qw6d74in94jq2h16lk06aakcwr72hd"; -"quotchap.source-1.3"="1g2cfb5j1qjqads2m9ad9a8n0j7ihrvd55q9b56jd141a23layb6"; -"quoting-0.1c"="1sghajwgfdc1p0gifii8wz1rvzsiy38f4jpfmh5pys9w6nr9a8bj"; -"quoting.doc-0.1c"="0aknicilv5rn3claf77l5br5mr21yg1dhdc1j1yxigz9k8pljzm6"; -"quoting.source-0.1c"="1h01p11ahr4ykqnhgl0kwc5i68mw9wznswrxy9ab5rpma1agjkzp"; -"quotmark-1.0"="1v48482b57w6f1cx0b5av9cq26zhgcqkwi8yllnl9p8pnrjngc9x"; -"quotmark.doc-1.0"="1jmdv5i67hsbmybjr8j2sv7f7z8bm3a30yy0ycyp6b5c3ycqx04n"; -"quotmark.source-1.0"="02bg50nj945gycxf8kb7s9c87xwszprq3zynrxxpzixrxqd06pf3"; -"ran_toks-57520"="14i202062jq45h0dcwr7pkxpw1crjklwrvv2fbl2p7c9wpd3ch73"; -"ran_toks.doc-57520"="07xs3spnmv4623i61gij565l7asl85519163b2470bidy152p034"; -"ran_toks.source-57520"="01jv80p4hbl4idffr6b9g567wqzwdvlklkjb05kh1360d708lkcv"; -"randtext-15878"="11a4j40zaixjklf4rkzb17cxnfmm6lp9kph3kkp2kalz41qamc0k"; -"randtext.doc-15878"="1g8nwiz06w4a1sdvdfch5yavar11mj5xpk631n5ym2d5g7hp0dm9"; -"rccol-1.2c"="04nw4h7z4k4rnvqh5s602l8h05n85iri3p3cpic4ss71ccn8c2dw"; -"rccol.doc-1.2c"="0q3qb0sbhnbqwgc0i9bw27s317rbz05k6pmvhad3m8mvlsbgh285"; -"rccol.source-1.2c"="0ss2436k5fbd25cynhw13lq4ns4payl8fi8lc96vi0kvn6jmkwrq"; -"rcs-multi-0.1a"="1n60pzx6qrbabksj2aqqf1j4i1b298ldsyjg8z6pmhladq2r3ia2"; -"rcs-multi.doc-0.1a"="06lqyy8igbiyl86b8fsl968sv94xcnl1amppyf8hmr52dhdqcysc"; -"rcs-multi.source-0.1a"="1pdds0kh3p3rkdn2nrpyfrw224q3rfnahypif8n0aijkcxdlw3w0"; -"rcsinfo-1.11"="04j1sq20960w5yyf37pnzvwaknl8f18mx6rmj2s2vch8bcncdzjh"; -"rcsinfo.doc-1.11"="02zyrgcd0m77xp5p95v63b58mv0h0miqlziagwv1rz3ywvmgwhk7"; -"rcsinfo.source-1.11"="1fgmppgp0n4arrilxmrjn7h7pf5jq7gm6drdz6njq8w1l1qxlxg7"; -"readablecv-3.0"="1za8mnyi0vvwfn1i4wcrmba904jxi805f0v3507nfav55h1x343x"; -"readablecv.doc-3.0"="1ixyxxiv5pcyhqx1ddwankc8ymfm83123v8d5i4lpwdr9g9h4jc7"; -"readarray-2.0"="0pcbbbp4q1vqc9p7qwdcml484a03w1836rcr0d33f0rrxy6xgif5"; -"readarray.doc-2.0"="151gnl2p3a45mlrjm2fvql8p6a59alpdfvgykyxwf2dnhpcibz8s"; -"realboxes-0.2"="0xyp6w8kbycaqmrkkrl8701c7shvd9i16vvgs28cvr61nkv3mv4s"; -"realboxes.doc-0.2"="0xd95j7wgv3yzrzq9lvdxpzvvvki2an8kg0zm29yz01m397vmys1"; -"realboxes.source-0.2"="0r0phiq8v15ra9a429j63kyjv3w2p96myr8czijfcb9g4920jvmm"; -"recipe-0.9"="1pnyia45nx32r1ng711k2l3g2h4r6n67nfxvg193z4mz1i20hq85"; -"recipe.doc-0.9"="0hhm5l89naj8vzjnvf2ambpawq7scp9bgpfjzszgb6069c486bvp"; -"recipebook-37026"="0ianmda3ji60acckagmlsmrsvi4sxp3prznvzqkkkvv88w1xbm8n"; -"recipebook.doc-37026"="0fmc59fddgfs4v6lsba04g334xlkhsl1liph7v3yx4qj6l9dxlkp"; -"recipecard-2.0"="195lg2kvww7amwls014s21l2pnyp24c8cfyb3glrxphcvcdhhr6q"; -"recipecard.doc-2.0"="1h13vn2zw880gvzi1pc8j41wa21ygja43hrjmyav4zxziiisrnwq"; -"recipecard.source-2.0"="0fkwvjxjhaywk61j750a05x0s5fgb96q5n3afcq056yf01jbvsxi"; -"rectopma-19980"="1ivjyfhl4g3j1j0xnq31rcnl66z3xwaixyzs8wwmbf1y18lgzyb9"; -"rectopma.doc-19980"="0gfvsjszqrn2r1cm7blk0xnrnv94l1a7ialwhvf733vm1m699lja"; -"refcheck-1.9.1"="0v82jjddvis01n2ngw7yngv4kh2impw77s1yq360sxqjym2m34ng"; -"refcheck.doc-1.9.1"="0ckmd4wnjl0zbyqr5q18whb927sjbz1xgdg1hg5w4ih0g36sra63"; -"refenums-1.1.2"="1dlfd5dx3mqfhn73y04lafcbiprqicv9kfz2ylnd4fhhm62svb7a"; -"refenums.doc-1.1.2"="03d3p9d1f0pr6gk918qiq7p5p6k0cf1zh209akl6a35042a6nms9"; -"reflectgraphics-0.2c"="11kcq0dijnwwxf6d3s0fhk7nfhvn3v36lly2wf21vgsl387dkkaf"; -"reflectgraphics.doc-0.2c"="0iwcljjlk1741kw6cayrbjhqalv74apppw612gh3nhh242nn9bwi"; -"reflectgraphics.source-0.2c"="0hy76c57w4lw0v77qaf064j7xz327fprdijljd7myy02idlszbmv"; -"refman-2.0e"="1adim1622bngp214hsdzjgjkjcv7b24a6aaqzihlms76vfq0hklj"; -"refman.doc-2.0e"="1jpx3yka29lpssvhjl12h1bxj0k996x7a7rf1742wph6w1n5ymmy"; -"refman.source-2.0e"="134hq9c9kdr7rgzmp5jkjccqgfw10zwv33zmj25b91xljn5afc6w"; -"refstyle-0.5"="0nx762gng6bmlrala884r4mjh2vjh4r20yy00bpjzq0il98hs2lh"; -"refstyle.doc-0.5"="16dm6n9mh488li57ighbd3badiavxlmy1ffz2hln6lkd9qp2y6i7"; -"refstyle.source-0.5"="09mxinjwbidd8sr6g8hb4gdq81ifzp67jbw24xc69x82kh48r8pq"; -"regcount-1.0"="19n0gwvh87pb2fanw52rc5j540v9yw10h2r8svczim9sdginy56r"; -"regcount.doc-1.0"="0qnxcyh2vhkylaav056lc2vg24y5h11svzy6hrk6rr3sza9k6z2k"; -"regcount.source-1.0"="1xfk7qs4x302lfi93a1n8nzpsmzmypyb34d8hd7h8y6nm7q2g4y3"; -"regexpatch-0.2f"="0i8dfsr32f4w3lfh88z45sdhvwzqgh52xqfqgj53fvynblpz9msw"; -"regexpatch.doc-0.2f"="0qh2g9sdj971a75dv3jfxi3ga3mf6fmb4azphkdgxmm690dblx35"; -"regexpatch.source-0.2f"="1iq45q093v1n421r37w42815yxjb7iby426a48mvgzyc1c82rd37"; -"register-2.0"="0i084dij80m292c9f57hb0y3gs870520l8awl3wb21ss76vs5501"; -"register.doc-2.0"="0zi950xii9qbscbv5030aw02arc77c8inwxmzkslcmapdqxq5wr4"; -"register.source-2.0"="1jz02c2c5xpinxninb1a2bkgan21gijs48rks4xv17y7k6z9h00v"; -"regstats-1.0h"="0rxapv9sd1i5wvb7ybaq84bjjcy5widjrgsfbkgg2w3zcanb6k61"; -"regstats.doc-1.0h"="08iqkmpa3pg17ik8x49v5xwg8a08806xvp9d2xyamf8ndrcljnh4"; -"regstats.source-1.0h"="00k0b24g1c1kpzpvqka53h6c19pxw5cf4sw0ymgllr21agri6mni"; -"relenc-22050"="13ym795q37rmxhmr0d8834y272si11f0qh7lmhffrpsf4d3bhf74"; -"relenc.doc-22050"="1hb2sdm9lgzfkj2kkbrlb3alnfjq4rw3islgdzkqbcgqp9s06f67"; -"relenc.source-22050"="1gk7nbczw9b897idmsgqx6i8xdmi7wizhb3dyc0hir7qmivaqv6s"; -"relsize-4.1"="06sy6v0jscrj2qs7axm770xv8fkiivvj5lwb8mkf58gd5jwc5bgb"; -"relsize.doc-4.1"="1sgv3x3dky3i7xivh6pzqh3lrqjhb62g0ji0hdgmy9blfrdf3api"; -"repeatindex-0.01"="1z4z6bpfjmgn8mkpcl1rsd9m1jxdx6lx2kz83r43d1ks5zjc6wn7"; -"repeatindex.doc-0.01"="1vcq9vbfw4dwif9q5ki0bq378yd4sg5g2yxr24bjav97shd9iaxk"; -"repltext-1.1"="19h9qfzz9idywv1bi4qpl8yqv73lwj6s6aqxqhb8jlh3b2scp4y7"; -"repltext.doc-1.1"="0nhr1lpbb5nvi7mfzrjxfq7ii2kib8klzcsqg99b4pj3hcwhv93v"; -"repltext.source-1.1"="1phbwgyvdm6a616wzvlc24jm40k4hbyjsnim5g5jr15phlsa6r2f"; -"returntogrid-0.2"="0cfik8imjgrhgilc7005cgy31h1azjk15jrcvd4vpf3g5ml1hpsg"; -"returntogrid.doc-0.2"="1plnz793nhiq9y89x7i51bgp9d18kbi0bpwslg982hf65yklmiwr"; -"rgltxdoc-1.3"="10wpra4vdjvjsq8n6iz33mnl69b13jbslp6ccf5b61va4v66z78l"; -"rgltxdoc.doc-1.3"="0xsz70p88ij6djhlf7n1718fxqcngfxnyl60h3ia0xi1gjzrbk1c"; -"rgltxdoc.source-1.3"="1vzldzdqyiqfaims3a8w378k4bfwxyznmw6028xvwrk7abq1nr4f"; -"rjlparshap-1.0"="1af2a5fmzx1mmk0vprx8w18rqgab0dcm1c7sfvnh7v59lgvkh6rv"; -"rjlparshap.doc-1.0"="1is0ny6a5ndhgl441vrv7ik4i0br90nlcddiabgmshwyn87kiciz"; -"rjlparshap.source-1.0"="19kvfg03r3nr99a9ylk3yr6nnq8r7cvfp3rsi2vi10m19jz60ssl"; -"rlepsf-19082"="0ycf0md4d2bz8003s0q4xi6qdjspi8z1dp5040cm3qm25p7jsrf4"; -"rlepsf.doc-19082"="1asi443gvl34m648ap9j5an6fx5x94s3v4dp8bqvygn615jhd0na"; -"rmpage-0.92"="0y292gcfkj0nk8090iqnlrx9mhvh545im2xms080kz0l1847frpc"; -"rmpage.doc-0.92"="0rq7xjizq8nwg9zk60gjd9vcjvxyc0xaldc4304nyihfjxfyd00b"; -"robustcommand-0.1"="1vxsxdg6122psbplm22l7f193fv7rd3dadcg6ys4ngzy957acvig"; -"robustcommand.doc-0.1"="13d5rsj95yx81bfbansh964dig4hjp5raxagzws58f24l8imvfzn"; -"robustcommand.source-0.1"="1zgnyglhz8i6hgzxlj19kdw31z9kx44zj2vziwkhcpr9clxl8as8"; -"robustindex-49877"="1fl9vr5mynjg8w74sk2jh8vgj5yjpmyhyr107iblmcicgwv1sd9y"; -"robustindex.doc-49877"="0xf592xvmh6xmw08zwwcsn9xyadd9637vicnz95fbfpp03p9qjnq"; -"romanbar-1.0f"="0p4a1g1s22s7jq4ahvpqspx5gkd6nhwifbf1shjp53f38myy0bm5"; -"romanbar.doc-1.0f"="157glkgzh4c5zv15akrlvfl2m03i99hfrm952x919137jkvjbpkd"; -"romanbar.source-1.0f"="0w70p08k9k1bwf9ls4wgnclp4iqj4hzn132ny4s11lzcaj4v8p5l"; -"romanbarpagenumber-1.0"="0m2772qfl5862l6m81rrx4xcbj1s7vhk9x0ywsqnr8qxl1kmv3h3"; -"romanbarpagenumber.doc-1.0"="0mj7kh8jvhscc4clf2199594994xdx557q0nnsk95srwmncq8f50"; -"romanbarpagenumber.source-1.0"="0hq151qq6wb0q1xhbq6jqzxfh3zss9iyya5wxv883a8pd79rancj"; -"romanneg-20087"="0y9nlxbjyiwivw9jkc0vz0lj3b0nvj9dcd4sj0gxgxa1dg853rlp"; -"romanneg.doc-20087"="0bi3b9991x1pvh8s8yrw5031jkvvwkrwah78qfd5rlywh2ylnrr4"; -"romannum-1.0b"="15zjf8wbjif83vnib3y6vqxc138aplb93nfkh95wl2rmahaigmw5"; -"romannum.doc-1.0b"="0a8zsbh28jl761ir6is1l05n9jyvzr31y86qwaa714yxwpzak0s4"; -"romannum.source-1.0b"="1gnvnj1l88l66mrhvd50cx44wws4a45708jmrncb5mnf0i6v7ci5"; -"rotfloat-1.2"="01ycgag2ip0kxdsaymfcndmbhfcc95ppkmwhm3imryibm9112bv3"; -"rotfloat.doc-1.2"="17x7jdnrnm333cq706cdkgzcyscq1k162l0rg3qgvknig6991v64"; -"rotfloat.source-1.2"="0ymb6xbsqqj91b9vkfzdab1ip0xqqj72zm1kd812gjgkpgxc3jfv"; -"rotpages-3.0"="1pqfkyqs8ymfqsvq35cpv438g8a3az6sajh2bszxncl7m3rqa10d"; -"rotpages.doc-3.0"="069jlj27xa7vnl83bx5m4k79lky0ayvcl13gqxlk8an5kdwmdr3j"; -"roundbox-0.2"="0607rknc69dnzwajmgaq1n8ixv884bqp5n9m1g6n2d9frmmh057i"; -"roundbox.doc-0.2"="1vyna8wndg79vman54sv24hbdlv2jnrdkiwyxgzcwc2zv29asxs9"; -"rterface-30084"="0wlscg6lhqar791sz1d63mnprxvaqvjx0mfk1pi1c2zsk0lnpghs"; -"rterface.doc-30084"="1ghwg489y801j2c1s5c7qpv9yyh4g6higapzjw95nmmyf32aka0h"; -"rtkinenc-1.0"="0q024qcai2slxd0ral92pzzl4apqn5gr8gj3vw7whz7432m4z7gj"; -"rtkinenc.doc-1.0"="0kr27a2294bj80f3qria15bjpsvgifgaj27zv9wj11rqr5g4zm7g"; -"rtkinenc.source-1.0"="1kwg3qbk2ldq5mirpvg0cmhd3nyz79jfdbw7y37s2c86g3c5j0i1"; -"rulerbox-1.01"="0srxrij0sxvm04n6zk4vq4qqmxbjz3v425nx191z96fpjcssx2cn"; -"rulerbox.doc-1.01"="030wrw1ry800yixlgb11xbm5834njv3ad9gl4jv08x1pxkj29vcp"; -"rulercompass-1"="0ky611n65rvaii9b5ic498p7divfm71h843bv9h70v363mki9a0q"; -"rulercompass.doc-1"="0wqgnb9czbmymzmv7j48lgdv8s280id5sh8mwv6p0jqn69zcpdd8"; -"rulercompass.source-1"="19943zfp2rm3gdm6w5db01w6r1nl0kn4zkrnnxg4ic4n3gvv76px"; -"runcode-1.0"="0fa32j3ippwdfg7sh02nhnjb1ajmdfa39nm15rb7ss11v7167da6"; -"runcode.doc-1.0"="1j7mf48wdpl23d84rwkmb13c8rjvi4c7v7gvk07rl92xg8pc9vzg"; -"rvwrite-1.2"="0gb5j3hn1s28ar9d30g158xfc2vaavhm8cbmivr1ba32njdmmqcq"; -"rvwrite.doc-1.2"="09n9p9q4pjil70ydk9cjh2gqxdslnhrg9avfhj0vvfacknbmh312"; -"sanitize-umlaut-1.10"="1bzm60z3gyd3s75dc8n7z7rjqr05713lna6i1z9l55fqnbxz0m9g"; -"sanitize-umlaut.doc-1.10"="04vgqh10ydvincbfiqfq5cb77f9mqdlpjgbr8a2dhnb7v02pfiag"; -"savefnmark-1.0"="09i4rxdm2agj06fwggg9jznjwdgvqlafhmf8krncc6vsj8h4ih8n"; -"savefnmark.doc-1.0"="07w3im9nz2s72p502gzryyrccj4g980axvihrk5b5b3w0qzlpn4b"; -"savefnmark.source-1.0"="0wdb9xsrfddi3sw3g4gppv7vn70f3czjplgbr7pj1hna8grig5p8"; -"savesym-1.2"="18z0xwarbkb6cm7n29wasa04d92g2pirlzsr0icnzfip2f4j7524"; -"savetrees-2.4"="0bzr06y314xa1r105vrc9nd37akqcsq58j0qxzlyhc8jvbji9ajc"; -"savetrees.doc-2.4"="0c00z409by0qp0if8ccrah81601w8njlsdylj42achqr1f9q8rvg"; -"savetrees.source-2.4"="101p1q1in7qp2nrkz48c7wqfdrg6mj7iqxwg44aqaib1wb27g5ak"; -"scale-1.1.2"="0al9axcipchrzc9a3dscmv3yvzwz2388w8knr4vw51mn72ws12jj"; -"scale.doc-1.1.2"="1fbbdksmcrd91sixwkkgljnbk08i9jfhc751vzggrj87l38ym67c"; -"scale.source-1.1.2"="19nfy1dcq5bd23dnl9aa8jimyif5sil9lf8b4hspyq7cvzcjcplm"; -"scalebar-1.0"="1q9jqf46j12f9rav2j4ngr52pqfyrc4h9xj66cgb3mcc7nqgmc4w"; -"scalebar.doc-1.0"="042xgbjlibp1273400sg7p6fzdzbnv344dgnrs3y93gk6g7vf8k6"; -"scalebar.source-1.0"="088k5a86279b7iwci0wzxv5wnqifqiwc5kc85701987x5qiaajhm"; -"scalerel-1.8"="0b4ppffs7zcg3y6i3c6dnjb2rl1xm5rz7k5mxm08qj4dpdhyjfpi"; -"scalerel.doc-1.8"="1js1z2fkxy7ixh069hmg5cxm33xjwwg002y64m32wj4ldb7shfk8"; -"scanpages-1.05a"="15q22kfwbw6scnx8q9dj3p0hr0m86lj2asy9fp9s0a15xsbhq1is"; -"scanpages.doc-1.05a"="03lpz3836rwk5nk2sbbyv9s0kvjbw5ld9cvw1n40b5hggivc2sgf"; -"schedule-1.20"="1p36glmixr7qadjj91j9rlzph03rp8hfrrfdqcg1ayyzkinr9a6i"; -"schedule.doc-1.20"="198yxgq4255q9bqjj141d5rvzjxq4rw1363gcwy40yagqs4xhxs1"; -"schedule.source-1.20"="1gc4zpw7ylnnv9k9kbqjf8r83srxbiqmqyy10xnp8gx7xrnbmnyx"; -"schooldocs-1.0"="11pf882l3rp7h14l2w2j3b2gcmxwf6bqv5kc23shzyl4008xx3gs"; -"schooldocs.doc-1.0"="08cswnn7fh5j260f3vyix22x8i6l12waj3z9pfliij8kr39j77w6"; -"schooldocs.source-1.0"="1zijm0iwqcpzrl4ixzmd9dbg0q78nhz6r4rc4ydr9w06xsr4w4g6"; -"scontents-1.9"="0jjc5q254c4qqvhv23r6f92dqh8fgza9kas6vpc7j9kiklkjilmd"; -"scontents.doc-1.9"="1l1206yvlyf59hcjf8y3gsanwxims96jp4k52g3wbr0pqgq3dfh6"; -"scontents.source-1.9"="04wzz12zh694ds8p7x2rmymg352ahkf5hcx1xacz3craf3p0sjcc"; -"scrlayer-fancyhdr-0.2.1"="1fzlwlzkqhzdhnz2gdh399a6kmp9f3czd96s6ydl0k5v47zph90a"; -"scrlayer-fancyhdr.doc-0.2.1"="0y37kwqsaci2wpklz2xhkh7x1f1v1ql84sx90ssd6fpq8saf25za"; -"scrlayer-fancyhdr.source-0.2.1"="0dvilqmf5xfq0djxy0mv8q1bhr94v5m765a6iz3bniyr585zgrvw"; -"scrlttr2copy-0.3a"="1as8ipxhssfx4hqa4s246gfim09nl35dx1wanfc6p0yk79nm5lz1"; -"scrlttr2copy.doc-0.3a"="0hsyiicb359blk6m4kj5gddlzwphxr12hbrwbp34cjfzkbh5ib5m"; -"sdaps-1.9.8"="13n084nchrk9awap3bnywd9b7qnq5zvka71vp96h1yibry4n6qq5"; -"sdaps.doc-1.9.8"="03nbkcb3rjmgnirdyqn6pp85qbqg8p591n2412zxhvjmd74x1295"; -"sdaps.source-1.9.8"="1dggzllm84lpqcl0zbrk9j4hdb1d369rr9wpilk5zjff6p7nvch7"; -"sdrt-1.0"="15p0i40aa82f9lgdiy7wn5vbkbb4z5hzmmr4g52w6jisx8c1w45v"; -"sdrt.doc-1.0"="0y1gxcyms3wprp47y2mlfcc68gijyvyc6h10ivif1yydmxq1b2ki"; -"secdot-1.0"="0pnimi0vfgp5zsp0iwak0r0j562w59cl1fn3pnp1gwjz65q2229i"; -"secdot.doc-1.0"="1v8j3l2bh055b18zxl3287ardn0ns5qjgbqkj08qxz5ls912y2br"; -"secnum-53657"="1xp02rh3wxix7hx05avjxxphzmcqpwhalmzm0mw4rrhwp5jwaajw"; -"secnum.doc-53657"="16m37g00k226wfi1zjdw6yhdvxcwjlzhzz8lbyc53fk17q8k9dzm"; -"secnum.source-53657"="1g0cnxa3xd3lbrwl7pcappnw8mx5ihig7pd47ffxsscdg4h8vvav"; -"sectionbox-1.01"="178z63iys35al6g5lavqgdd1lcadha9rp25bzm41gyg84f2hpljk"; -"sectionbox.doc-1.01"="0mk0ijbrvmvky4awh03y2q14ks4x9hr2pa84ia0380xfx56849kp"; -"sectionbreak-0.1d"="097mwp2iqg6rk1xxlppqnks0j1k45b0hlrg84x12y0cgrkd7cdbn"; -"sectionbreak.doc-0.1d"="0kmfpgcga24kpzm9kwc066a6m4kzw2sfkhr815yc0y2a1agj3zfw"; -"sectsty-2.0.2"="03ixlxxs2ss5lrmkcwilrzi7r46krh21rli07y2j79p8l23n7vrh"; -"sectsty.doc-2.0.2"="12xkczxiw3spyljn1ay9z0xrxdg9ziidnyryri4pkmsh5k60wxw8"; -"sectsty.source-2.0.2"="0h94wh43pf8bphafhcmpsjzj26592c30pih0x3p7csv8dwbv6js4"; -"seealso-1.2"="1mqy9br1fz73q2l6czmhly8j6dnw51d50dkfh9622793z0a2cl71"; -"seealso.doc-1.2"="13sg11r8d8bd9gmscprqai5lbjwfvr17ida17836zagz83b6y16k"; -"seealso.source-1.2"="1yv4zwq6aic2wb5wiz2564mh531i34r9sl87y07yk1ad89kgjbv0"; -"selectp-1.0"="16kcbpvjsdc1ndhhflfmnz0igjyjc5k62gcfly447w7d13qsg2s6"; -"selectp.doc-1.0"="1frpv5dbxfg708xp03hs4vkgqsxjihn3yk3qvcpns6awjlfi2n9d"; -"selinput-1.6"="13pxqr1mzkblniv9rcrr5aslx887xjahjj9f27h7hpx6r4g7hk17"; -"selinput.doc-1.6"="0pbqch586hfwfjbm68g7i56d0jcgg6w26k6g2qlfdbk8mjpc4r4v"; -"selinput.source-1.6"="0na8byym8s2y2jyi1691cnw46izri0y6ybf3g0pmil2hpxy544ry"; -"semantex-0.463"="17qb4jzxx41ixcq8xdvn96qxj7y5hdcjky05lq52d99mrr48d9g8"; -"semantex.doc-0.463"="0qzw56k0lj5kqi4vc2znwsnf3wp9c1hdmc3n3mq9yhbbf5vgbblg"; -"semtex-0.45"="151sfla597g5n0nv676sbv5m4kfpmjli7ddhd1yzsiqa3axw7vhm"; -"semtex.doc-0.45"="1mm9ya9ls0ryfxzkss3lfmslw9wrbcq9d5abf022ifbs5184rgnr"; -"semantic-2.0"="1vf341vlmgc00d6srdwjm0a2spad674439ml9k6ir24pll39ia73"; -"semantic.doc-2.0"="0rr5kbn1yzil4h0j42v48m4mkqk8rzwcn05rkn8vs2s13az6djna"; -"semantic.source-2.0"="0x2qal3q0m886lw5xd9w200fkq4hn34qs2kqsr7i7dcq9xwl57qp"; -"semantic-markup-53607"="10ahkdiwm4h5mwigkzgjiq2xmy1lzgjdif11zajwckv2xng5ckgc"; -"semantic-markup.doc-53607"="14gv3pgdyjjjj8l8vfa2pgzafyqlq0666hbk0cz6497g99z4ga15"; -"semesterplanner-1.0"="1d69y3s4hhv0lpf4ljxg7r5zg0g1fhjw9b30hhpkxvsbfdbl030p"; -"semesterplanner.doc-1.0"="1a7a927gwspc21drqqb72rymyncip4b15w4q9cy654zdp16b5i10"; -"semesterplanner.source-1.0"="0v66xizbjvlzvxdwamny8rggwb0ivwmhlzpjkmm7p26s5l9kd5m1"; -"semioneside-0.41"="0lmr3fxahcln1sf6fg4mkrg8dl3k3670wmz14kpyzd131g73l1iv"; -"semioneside.doc-0.41"="1n7iy5qvd0f1hxp025w9x51llx8cwly4lc107iq5yz9njdwn1g30"; -"semioneside.source-0.41"="0vshjv6nzbp29yza2vj4g8hfx0sbbgnd1s7ck8ms68zcv23534j6"; -"semproc-0.1"="0yvs0kqk3jwq5yw7b8wwycfrg1v5q47mdq3bprx7rb1yh83ip53s"; -"semproc.doc-0.1"="1ycq0qdrhxk9x9gbhigz3vpldc0dfhb3nwmz5v9i45v0l2m5l3bc"; -"semproc.source-0.1"="19v3w2y9406r5bhjchc6rsfb2brrw7f7sb8ikmr8586gdsnwykk4"; -"sepfootnotes-0.3c"="028x18s5c1jxsw97idpj8fmlzs6h46nsgd8zg0awikhdmypl9ac0"; -"sepfootnotes.doc-0.3c"="0mb7fidrjns48c06pk7yfq3csac74a13i3d2cgfdvn7lxz6lp419"; -"seqsplit-0.1"="0m1vlslfac4n7fwhrmcl0swx1rf80ks2p3psrszwd8rz79q6xlc8"; -"seqsplit.doc-0.1"="1wbmr7hayx3kzwmbr1w1hlhyyzz84skbahd03bw0akbgk0qziz1p"; -"seqsplit.source-0.1"="1ibiys9lfj92mklzf4lvdzn192wv843zxkv91grjjba8cvn12w5d"; -"sesstime-1.12"="0nrwgky0rh7lazd41h3jxlb0kgpk5q7hhbgkfdab41zrawjp9y86"; -"sesstime.doc-1.12"="1a353bn7z135bnk2a8q57x4z8d03aimyjfqx3w9x0r81rwzns605"; -"sesstime.source-1.12"="0vrwbbmfwfqpvsfz31yid9rxzdc19749fwhlpimx30arqpd88jhg"; -"sf298-1.3"="05px7n24nn9rlrc02mgsndzxc5a397m6c0n3sbsihq0qy9zl6nqg"; -"sf298.doc-1.3"="0d3fh5dglipskc7cjcdg2n836qnhfcdfkzpalkck7b85kgq0zrbg"; -"sf298.source-1.3"="0afcavg1zs5ldi9fjhsnvsph4xqwy8jkhil8jlcqcqbq39z73pq6"; -"sffms-2.0"="0av956vbxjwf0pywp4hrxag1ypaj59314i3xqinq7xhwwxlr7g6b"; -"sffms.doc-2.0"="1aq8bs7bsbrzzl2bp7mg2ckccazk107ckjl7118m5d2rk0mf09pi"; -"sffms.source-2.0"="0fl3z3f3pm7060cfxn218ycnf1y7id8kcll960h9jvpqkq3dhx26"; -"sfmath-0.8"="05m3whw5xkml48yx93j9h46qmspnr5hwsfszb59l4wy4jfj66zk4"; -"shadethm-53350"="1miq7szfh1nya53vcn9kv3m8jb1sx8p1v7z5m3829ynbyiwr7z9v"; -"shadethm.doc-53350"="1gbjisy9miqp0mrciz793vvhj0a04vaai1ixi6vzplhlx9gknv6i"; -"shadow-20312"="1avy8291hmmvbrqdn4yza9w8w7a7hbwlh38sl7288c6gh1hkyibr"; -"shadow.doc-20312"="0rjfdi2hm07j418q3fvrf5pxflh1nfkhrk58nsa23fixxzaw5nlk"; -"shadowtext-0.3"="1pnnskcw1nq6m3rlvsa69dxq828dx0bgggg8n2p2bxnr9gmnba3c"; -"shadowtext.doc-0.3"="0lfvn68d48yh8smf4w8c1is67chsfnipxc82fx6mal1czlyn73hf"; -"shapepar-2.2"="0siq7d3d5gr91s3bc5873540b1ia73ggkf1y1bs47zb3mh4z9g0b"; -"shapepar.doc-2.2"="08bwm9a4rq70swqibj9s0i4042fnribqz93jx02xd0638wa51pph"; -"shdoc-2.1b"="0casdf6vn89la2vgqy5zcc04nlsrqpiz0zj7mwlf6w2zqcpmr1x6"; -"shdoc.doc-2.1b"="1vzz7q88xq2dg3r1xf4idgvdqs4q4w5lplg9rvi867qa8qcf3ly2"; -"shdoc.source-2.1b"="0wxd21fs45f9d5y2ml3w50d7z8ig25gv34iy3mldarnqi2v64p7z"; -"shipunov-1.2"="01mckfm6ikchmld5r8mdy5x472avh473bfc7lk4rqan8p4wivjrl"; -"shipunov.doc-1.2"="0k6x9nxsqcg74z9i462qix58qycf3wjii5ld13xajn04g52bwvpy"; -"shorttoc-1.3"="0y1sa1l5g19arc5wdnqp0jzvqn51m4gb07acpcp3ajqq7n7yaf3y"; -"shorttoc.doc-1.3"="13nlpmb1asrx8vi08kb6kcqg6szhnzb6667crj9xchbk3zm9iyil"; -"shorttoc.source-1.3"="0a3hl98rl5qadx1mqqla9hw6i1s3324i4la2kwdazhxhvi6nxm0q"; -"show2e-1.0"="0mhpxhvgfnzwwzd9ahyzdhqxzqz9sj6vldrnbjy4n0r4fv6c67pi"; -"show2e.doc-1.0"="0zfir9yzh3mgpkldcak7hzal0mwls90h1m5vxiax6h2izfkrixfm"; -"show2e.source-1.0"="1lnhqxazyz2gfgkgbj7l2140x81bgsxb71y8dagcqazjzdmqgcdl"; -"showcharinbox-0.1"="013an5sq2kxrfs04k51ldc9vkixag1lbicl614sbj3n3ixgk15db"; -"showcharinbox.doc-0.1"="1zdxvlj1jspgkws4xmwa8yy7aaxqwr33lmzkicg6ayy465jmfk9b"; -"showcharinbox.source-0.1"="0b8hq68lbd0xjyd1cj3qsw1rd4rvjsihd6s9ab5v3a0q1sm5kaw3"; -"showdim-1.2"="1pb5qddnvv4kl79fcp20zkcfgxm8p4zix82g9431db3bbavvmkri"; -"showdim.doc-1.2"="1hc208xi8c4ihxb9nsk6y5p6p43yyylqh7jgy8lai2a526xm2hgw"; -"showexpl-0.3s"="0gg8bp3pddkp3z79z8wkh9263gnxhcn6vxhgp2mq7w8i166rrsyc"; -"showexpl.doc-0.3s"="0dv60pc2p19bzr1fj2hqkgyjry9j8ykcgsi0v3xpvzh91ic9v5q9"; -"showexpl.source-0.3s"="002v6m0gzzx4kr8vnw75czn58cmzjnyyfyzi2hvfx9ykh7nmibng"; -"showhyphens-0.5c"="0imf6fpfw30wh3x18c6s62qcf3avyca3sh43nd10rqb51rxq9y7r"; -"showhyphens.doc-0.5c"="0fcjqbpmxccf2r9idx2gzf0vwix0w271qsw74wq0pcnwi0qx41ni"; -"showlabels-1.8"="1sjwjrgsc6wpbk713l127wwbicx7yj291jz91r7babmbjxj433ym"; -"showlabels.doc-1.8"="1q8sa587iv6smdkr2xxb2qq0zc2l9k3mq4kabs3lls0jd238wriq"; -"showlabels.source-1.8"="0h25cly3r6vczm941ig6d51n3qcpb804snns943k7pl2yc41yzw2"; -"sidecap-1.6f"="0ars40rnriqyqiakw7fcd7fq5xz0wmhwgg4m255fawvyyyq5d0n2"; -"sidecap.doc-1.6f"="0873j451nsgbh4jvzjs5ppfyzmrskn7rfh29m7p8la0z686driw8"; -"sidecap.source-1.6f"="178l2mniiniwp5irg31m47janniv182m30llyzp5gplv3vfv93pp"; -"sidenotes-1.00a"="1ip6ybhfihbbzflafcqfhspr1d1x44285msahf7f9ilmhd4536x5"; -"sidenotes.doc-1.00a"="0f4nqbw2y36ymgcj7ywy9gf94pcg09aqk4kjpankksgwmvyjbsxg"; -"sidenotes.source-1.00a"="15kz5d5038vi03siq6lbbf97nng1024hx8zzgrasm304sf2c0ggl"; -"silence-1.5b"="1zixww8d87jymdvxjzjhvhjjr5f8fxhbjwqyzivki2rhw6dpsp2v"; -"silence.doc-1.5b"="01qb2z62da0ji751i3wbhq10rfin23q20r7wr0fzvqv163niy93v"; -"silence.source-1.5b"="1m5xiy5j8l0xy9731mf0jvk4f6bh7d22vbsgpjpvy5r0vxafgxwv"; -"simplecd-1.4"="0d6gw59xd1mqc991yy6k5jva88j66pd69k5sl5jrysl4rw1mxxng"; -"simplecd.doc-1.4"="11fzk8p911v1myphghzpmkj7k62vk4sdicirys1jh8rd2cpnnwcl"; -"simplecd.source-1.4"="16g6fcsr0nw7isqimjq29g0zyf72z11qx9xz36zq8z4khxsl09ln"; -"simplecv-1.6a"="0b7p6d8y7xa8xs9i2qyljk2s992gprsr3a5pjalkkssa5kiz3371"; -"simplecv.doc-1.6a"="02x3nwmxdk9spx5crlaw1xdqlwah04m88zrrw4wdg0qjnhvv4mvr"; -"simplecv.source-1.6a"="05ikxmvflqz5m3qallwgyncda49dzq4fibllgc1j77pdh99cy3vq"; -"simpleinvoice-45673"="1mdc6aij1id1jxlbkwfdvdv87yh55v5qyazfciffpbf91qm87z0s"; -"simpleinvoice.doc-45673"="0lvk87l3xafl4s303rhmksfajnw77qd90yvzhdk126dp1prh7i6p"; -"simplivre-58414"="070a2vjnkd4zz3aanwscf20fmap9sy0bbfvw4wvv2ajf7lcybgch"; -"simplivre.doc-58414"="1ishzi609rl4f611w6axdg9qhx0sr83m3ff8cx5rf473wa0rvnhx"; -"sitem-1.0"="19z6zmwriwrlcpgdgn5yl2bzbz0fkn3p8g5hrwd368bq7wyfc8mi"; -"sitem.doc-1.0"="1wwnqhl3ffqnp5qxddicqwsr7515g6j53rx1rgi9b5z3cv42f5qj"; -"sitem.source-1.0"="0y249krv2h241wy8xbi5xjrxypa56zipi8fbmqbziw9cjjnz993v"; -"skb-0.52"="0k441znw2bn13aiyc6b5hskl76hbhcpilc1xg4jw837dbj2v6qiv"; -"skb.doc-0.52"="0qi7l9ky0y65cmcp32j93lhwlvflvz8didq9c77faq7ffgzz51s8"; -"skb.source-0.52"="1rnraidwhkxlhk09ppa5k0ndqhrra4asbpjwv2j5dgf70wfm5vmh"; -"skdoc-1.5d"="1bqgnqqv5806f375xjny7vjd831ymdnhra2rbgh5hwls7v9hwp4j"; -"skdoc.doc-1.5d"="08g7qrmasrl302pxq94dk13y2bdbg6ipxg4f774kzbp8zwqa2xwv"; -"skdoc.source-1.5d"="1qnyh8gqbk6dhkga2v9gg97q0cbbv8hpcc7nwjskwckc4jxplqwy"; -"skeldoc-0.1.2"="0fnkq85bidvd6m14m90w428ndx54fj2855sxsajfzyid63jrfa9h"; -"skeldoc.doc-0.1.2"="1jgg6h4cdz6ir7ks61lyq9ixczmhdcs34mi4llh767baffvb8340"; -"skeycommand-0.4"="0z5jpznmx09vc5klsvp4hldmlgyp4bwz25gp775kbmad8azad1x2"; -"skeycommand.doc-0.4"="09gmmakvxhvrh7k06vjh6ly1hmax1z5x7vqxyqdwi90ajh2zkmgc"; -"skeyval-1.3"="1an6ghhsq5nibwas1csypz9vmrmsj7jviamig1r9zzjrb5kzs65a"; -"skeyval.doc-1.3"="107higin87d7kca6753f8f61yk3ypk5hkidrbckm1vzn2ci515w9"; -"skills-1.0.0"="15ra36iiz7i9qb4669j32b26hzmjyx0hann3kd12769f2khb3ial"; -"skills.doc-1.0.0"="03j6cj9xg2fhab2a048hb2cs2ddqac6x7zfcf7p9s8zgzyqqi8s5"; -"skrapport-0.12k"="03y0arbbj95jnicmz9d89vsyw178hw1410vy3ydvf8j88j8z57sy"; -"skrapport.doc-0.12k"="03b3zp8w0m5kffx10j7qnikdfy6yznvvzlg5hj30nxam4za51n91"; -"skrapport.source-0.12k"="0vwhckxi676ygxc18rhcsfnr5kp1j5697zyn7ir5qxhm8vdmqf33"; -"slantsc-2.11"="1a05zrd8bqiqgh2bwlll2wspmd4xnvl7p8mz3g4j7nkvx8bp4844"; -"slantsc.doc-2.11"="196sqfqgxc7pfyi75d0nqy151if55k3wlvpq8ai7647rmapn17np"; -"slantsc.source-2.11"="1jw70y8052qvjkr796sz9w0c6kdyammi3gy5v8iq0wwmf38jl8qf"; -"smalltableof-20333"="1g0kh262h9xv5zr2yix9as4ghfsrqnhj8y9gzb66xk90i82pri0j"; -"smalltableof.doc-20333"="1q96blk44d3nv5bihz81a25a43vbf9b86d9w00cl9kkin1zzkf6w"; -"smartref-1.9"="0g8dy72b8q65pw2zmcs2yipclpx3g445v9snjnyxbb3q82asqy5v"; -"smartref.doc-1.9"="1nwl85jj0d97djdqkczdw3544vhazy57fx8psdcvfdncbvpk84jy"; -"smartunits-1.2"="0jiz4mhyf4zaikq0fi4jvan27ngksrv7z5gmch88qj7fapg4xhna"; -"smartunits.doc-1.2"="1cw6k8bvj5xakh909jq3x527jnmma8wa7dwp1za8hsajwmmfzxgp"; -"snapshot-2.14"="0598yminjxp01imxrbzydqjli0i2ws1f9hw6f3qhs7xykfacbaml"; -"snapshot.doc-2.14"="0j614bp2fydpzr2lx9xamn36fn4x0wwi5a58013ds2a8iiha6k1l"; -"snapshot.source-2.14"="0bh7gy9inl30h8y9v072fh2malc07cjwizgxc6wvm07n2x3vidfh"; -"snotez-0.5a"="1dgwmqwxsr0drs1qyh8v6q7v0yxa24jxrg3dm5lyzx39d98mh24s"; -"snotez.doc-0.5a"="07hhfh7d081d1jmzxcnynszwgjp2x683ki6f5q5pj7rzvlnhmm14"; -"soulpos-1.1"="1p9ql9w4q3kihm34gz7wrqf3zlwgdljmwl9lsd7mzc7hxhby7lwx"; -"soulpos.doc-1.1"="0wgf20csnp8xygx6qm20n3rwhnmsdk06h5jfwmcpsm7rnwj5fq9b"; -"soul-2.4"="076n834lx41qw6p661dgq6massdxycq8b3gl4564pkh5c1s98ggp"; -"soul.doc-2.4"="0rgd9ij3hd5934gi2m23hj8rxgqamprlkb3gj921kslx32rixm5y"; -"soul.source-2.4"="03ggiykhjpxnklnzyhc36b3pf83nfa6nn1swxygkn6jnyqcypf8p"; -"soulutf8-1.2"="11phsqx1vqm41d8cvasn53j1zyl4lkwsqnbpk1hmhn7pd6ypv9yh"; -"soulutf8.doc-1.2"="0fkzw127xjxx1z3q9ixqrx93i2j0mn85h7xbfdxkjh6f9k52s333"; -"soulutf8.source-1.2"="1k4xal0bk73z1zkgnfydjh0m8x92s1jx36nqqddfmykycxij7ypl"; -"spacingtricks-1.3"="0y2pipy43fns9fcqmcwsx2k8ikgkznf1nq4cw77rzcgzpizaqhp3"; -"spacingtricks.doc-1.3"="0lh4507lis4m9ggmacqiqcqbqzp42bdcli6q83gc780j669sgxfi"; -"spacingtricks.source-1.3"="19wg8n0mim29pxwf98gz4s292qjazrj7lsnq98idy0cg34gk3d7b"; -"spark-otf-0.05"="0kgfj9kmsyi501a8xl41c9dqw0msqn60wsh99znhh4b1b0hk0qw7"; -"spark-otf.doc-0.05"="01pa2m9q90amkpcpa90z8azhz9hcb2k7i3yh67a7yh2ndi97qn8r"; -"sparklines-1.7"="1mb6c3mial9ashhvmjhynczjpb462j18qyy2an4ckgwgc46pwhp3"; -"sparklines.doc-1.7"="03j6xdkvsv5p71bifmggf69w3s1n7758yii1caz9p9bcqmqbnrk9"; -"sphack-20842"="18vav5d5846hzn6ry7ypnbj9vmxxxxjxm8wpxah9mlml6kjy5hc0"; -"sphack.doc-20842"="0caz10cwphajhni7rq8klh7x9m46hynbrgyr0c7fjqs8jfdva4k7"; -"splitindex-1.2c"="03x58nb9bqd1fn3k9fqq5rdafsna9rbxjhp44dwzig8kp81f0g0i"; -"splitindex.doc-1.2c"="1v2wwls8fgb1rhk91hrjsabxj6plx2bq7h07fyqxvl3982am9wm5"; -"splitindex.source-1.2c"="06ksmac3dxacfq7j4ad7vy9kls2rnay1hww3kgbp2sgadqvwmz0z"; -"spot-1.1"="18ich1w6d68xa2p65lh22yfwdkvgbl9zz9qmd4yx84ljzby49zhg"; -"spot.doc-1.1"="1flizmkafy77g30ffsispr2m4yaqyfw5hvynf7ppph1q07jqdy0v"; -"spot.source-1.1"="01sx1j1sxr1bgi5h48ij02nwawg2wgg1c7mx22q9r4sbn9mprlbr"; -"spotcolor-1.2"="19xicma97v309pbwgdyizrjwwnlas95wq0d2qlyw7m9wrq295lpb"; -"spotcolor.doc-1.2"="1qsdgagx45z4gha0y7z37687jxrc121pr592b1xcy8bhf86nimhm"; -"spreadtab-0.5"="0zgiys6ry7szi6rvrj6kbnlysr8nss66j3xspqwc9j2jdp5c9lp7"; -"spreadtab.doc-0.5"="13c2rgms44wmbqvfi1yi7ini69kjv55bg3czwgx2rn99shafzh4d"; -"spverbatim-1.0"="0s7042ln9l7jvb0vyrmg4h4fdgzy6vaabr62n7zlkr8pf7zd8nvh"; -"spverbatim.doc-1.0"="1rb6gyq7j5m14d8707gkqv1n5ifk1y497mwflhigqgyi9lgcvgxc"; -"spverbatim.source-1.0"="0f3spbpb6icwm84v4lq0skkx53nw3i0b90ik0svd9dhg31y24c43"; -"srbook-mem-45818"="0znvycl1land17f2c9cq09hhhg4b677rixzjc0hsq34c91s3xdq5"; -"srbook-mem.doc-45818"="1nf53sq2ic8y70z0n28kz27lji35slwkxrn8rz0dsaas73ga5k2y"; -"srcltx-1.6"="054b8g0vvhbzazxs8913dzir7qb6x5q5pfsiwdp1z1awkpafwkmv"; -"srcltx.doc-1.6"="0fidv12pgqck21fffgrrz2a0pfsb01fsyld8qhf5r00915aai6h3"; -"srcltx.source-1.6"="1sj23lc6k8kwd11q3sq6wbslwl4fsc3wzp45w4by3mw5k1q5xqcf"; -"sseq-2.01"="01vqjmi5vpd2s00sqqj6nlwgqvz9c43igg09w282khlca471253l"; -"sseq.doc-2.01"="08xq5fjn951hdpbrvzx6p09a173radfh8a4wzhmifd5rca9l7asy"; -"sseq.source-2.01"="0a1rh7s1fjxn3bblqz4lzhd9812d9p71wwww5hg9nnpn3gjvdr6n"; -"sslides-32293"="12vg8fdv0di8vgnw8wj1y6rad6izmczfqzy5pr6gpflzmn14fbq4"; -"sslides.doc-32293"="1dssqc7f6260hl527hhqq8zbiyszb13z3bny3rwjblscl9ia29yf"; -"stack-1.00"="1wadfhja3yji011aawrp3jgiqdxil7lzvkd1pzy9c9y63lzknfg5"; -"stack.source-1.00"="1qv2bvjs01lk9b86rzb7n0lk2a4gr870qsnahyrd9dqdnvvz4n9n"; -"stackengine-4.01"="1hivczypj6glpy2qja23a9f21s9j178l0v2ggk1hlnj1g62p8g4h"; -"stackengine.doc-4.01"="0ypg4nc7y07h68l8frwrl8sc7jz85rhnfj56gdi63chrnqsjwc57"; -"listofitems-1.63"="19qh891v470h4617fj9ajddpf119qh087ng7ay9q73qhk90fhs62"; -"listofitems.doc-1.63"="1s7gl5ai3xdpj05lxhj80hc1i48x2lhcanwh4v3w10yyzf13axyc"; -"standalone-1.3a"="18il89hp4lcxyvcyafh9mfisqsxfr03y8vjjp5d0q222aw1ah2gf"; -"standalone.doc-1.3a"="0z7mvcbrfcvb7livkv5qqv2d3mkgkajzknxlp9ail4wf3k19lb0v"; -"standalone.source-1.3a"="0g1n118l3v6g4amdazpjk4qw1y67j1v39hi35rw487yabz5qlv7n"; -"stdclsdv-1.1a"="1130sj024qfsszjx4adr3bmmr6594d21bcv3ixmw75y85djha1iz"; -"stdclsdv.doc-1.1a"="01li1x0cc820y0m6dmivjabnbhz6v1j696cwx3d08fiw4x7n4jiz"; -"stdclsdv.source-1.1a"="1ypihjm5r0v2isrrv8152fp59ynjn9wmhp0ffx508n7kih9yisbn"; -"stdpage-0.6"="13q3jc6snrscq7bl22myd8rb04q9q5b0a3xvr609j1lxczbs1xnc"; -"stdpage.doc-0.6"="1kr7851lc6lp4aq78xc61nw495qnhnrbsz0w2yyldwfh07h4byzb"; -"stdpage.source-0.6"="0ygk73pk79wgn4qpg0niv3d0a4l8bdhrdvv1a9s8g6ayngfr0nsd"; -"stealcaps-1.0"="1cfq6w2s7yxdsjr2c61zwndcnlhin57y48k8y3lr3m5affhcrac8"; -"stealcaps.doc-1.0"="1jj9g83q6g7pv0k35jfa0wiq8ypqymh9sjjhppnnagd5zxvysr3x"; -"stealcaps.source-1.0"="19pnsn1w7bvpghnc8gg3zw5m29hyacls94gp3lh1aa3avmsks21b"; -"stex-50489"="04ranihj8is2md5ag94iiwak16ld7v1vr98fnzd5jcs28sjxngrc"; -"stex.doc-50489"="1rzss5g5j6avn2946g1dl4cciry6fc5dlcscrx48sz8incf9l84v"; -"stex.source-50489"="05chvd8rb9i17lbrqlwg7nxsqqhsxivcsgxxkv8pxv90zycbd5v7"; -"storebox-1.3a"="0vy7iavq6qqxpmwhm9cz4gxp67nriq230kcf1mr1gq2w0ncy7kjc"; -"storebox.doc-1.3a"="1crb1bkra0y2gjzf9wndr5c3nvc83v57lkdglxb8v1pzpy7halmx"; -"storebox.source-1.3a"="1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1"; -"storecmd-0.0.2"="00xk8l8l99qpsmkdxcpccf8g7av2asa26qrh3bi0kkmapm7agk8x"; -"storecmd.doc-0.0.2"="1n5vw689y9y2kakhkyqv47d5cin7f3xqfz8bc3yncdrmgh4kq82j"; -"stringstrings-1.24"="178qqf3ii5kaw5rpjazvf78mjb0aw4vnqzxpsv9ahbqfxpa16894"; -"stringstrings.doc-1.24"="0x6hcdp3hlfnd0vn3inq92nja4hirvhg9m37zmsh9ilnnz7dk8lp"; -"stringstrings.source-1.24"="1aryr9b5d4jrj6mc9cmbpc11l2mqxlxsc16c5h68ql0i6z0bpsz1"; -"sttools-2.1"="1r8bf4q6q5wz9403wrxr44719scrxjmashv6ivsiv5xvsxw9fbk3"; -"sttools.doc-2.1"="0kmjxdw1k8bswqravr2iw98dxhf18fyryv9dxwvxfddqpappplif"; -"sttools.source-2.1"="07jb7sj9mh7xg32fpymb6bgs8s2ryq1sdd5gyx4137hxlhssclvm"; -"stubs-0.1.1"="1p454rfdp2v4zq3vx1716x2w1cr1a6dkcwnj2hx7w2jn8118vqkb"; -"stubs.doc-0.1.1"="03la45gxcy1l1qik7kgcb518n3yvzwgdi5x3ffzfpj4yp2rq994a"; -"studenthandouts-1.0"="1007rr5m0lbfib30bkb21nvpq1h7didqijg6jsbprmkgsz1xfdkm"; -"studenthandouts.doc-1.0"="0sqfqxypkrcyp8fc60xsb1v9nbw7h1xrdai626dlpknhnm00kzmj"; -"subdepth-0.1"="1l79nf05yrvpzsbsjyrvyhsc4kx7dfbvx57qc1ymzk2zphnfw4fl"; -"subdepth.doc-0.1"="0g8apcawmna380iwys0dvshrdi51k50gavh8wgwybcvfjib82h4w"; -"subdepth.source-0.1"="0ac0l63sisx6ry7m3qlf0f98dn7gml3pfxlyiab8664cv43df2s7"; -"subdocs-0.1"="1mc1zqvqpw5ln494c6afx88gigkby4zlb5i4gbizs75irgyrs01y"; -"subdocs.doc-0.1"="05m9pcg8dhk8rayald2mnzl0wa7z3w8znwzw2b9ifbxz3cp5k4d8"; -"subeqn-2.0b"="17jhiyzv75q79mdkpn6vj60j61wr8yf8qxz63g16dl4xf1xvlqpv"; -"subeqn.doc-2.0b"="107jnszs764j7zr9hywn7dhjdyqd9mb6mwyqcilhgyz8ggpqpz68"; -"subeqn.source-2.0b"="1gwz9pp8jzb7fsj4dg797rsqynjbk8q69m8xjzz4pbmsysi01ijq"; -"subeqnarray-2.1c"="1bj51jrpvid2k3pd8sgrg85aq4iqachah22izpn949zvjvhrk81s"; -"subeqnarray.doc-2.1c"="08aaqv3ca0b6pnj3f6h7c0l2z7spg0hmzaflxrgxbnndn1zh0yhj"; -"subeqnarray.source-2.1c"="1slm6rfgf599d1mkww44kcd3lj88z43dr8i15imamxr0dz05jiav"; -"subfigmat-1.0"="1vx7qh6na1il98gla65c42j8r00ihy277l3s79jab917b3xmrr85"; -"subfigmat.doc-1.0"="09n91ami9skfmrrrl6j7p7wy62ds64zrr0m66c2wn0pnm6lanmxc"; -"subfigure-2.1.5"="02b2y8isk2irxdm7bcmx22v5lbkbhc15jqpx0dhs61dnzb5x7ag6"; -"subfigure.doc-2.1.5"="0lhpw3ayq5p15blz7pwkg2z44g300fd2k42lvyf7zii67x2rgjh9"; -"subfigure.source-2.1.5"="1mvp7i150kxin5819cvyfwwzgwmiq1r89m2ywjhv87rgg1v31kx3"; -"subfiles-2.2"="10nslhm56kp5bmzr2nlbm40rlp3i02zj4z6vxj8w6cj1vv7jrd9j"; -"subfiles.doc-2.2"="08r52aci5ab4cv70kbrqq1ak4ny627ks43nhqk6kn649pcahjqlw"; -"subfiles.source-2.2"="1hmli1qvgpnn2bmllf1w53wjh63zk92dv2wvvi6fzjpq0q6lqhwg"; -"subfloat-2.14"="1ibpaj98ibx67x4kff1p0cnzpxmhs4yyqs2y4vj6as5jx43qnwj9"; -"subfloat.doc-2.14"="18ps2xbqdf7pgyhj848zw1sbk36drwkpa0g1s9mw882ynz16gl9g"; -"subfloat.source-2.14"="01c11mbfyynpa1yi0arlqcaklikr4sr83j69piznabj5jhb45nci"; -"substitutefont-0.1.4"="1djss6q6l864sj8mbvavdxd6fpmcblhb666hyskwciha6naja8xg"; -"substitutefont.doc-0.1.4"="094ywcg880qdryi970cx12hrnkjawhmpz6mmh8p7cxir80ah37n7"; -"supertabular-4.1g"="10r18kzg7p8s2wp1nydvn5f5vfbailcypqb7hkhxyjzpkdfrp12w"; -"supertabular.doc-4.1g"="0cw3vfh4mxd39n2w1yk0nxjq67pb8s0kzv6syr2s4x3p3nrml822"; -"supertabular.source-4.1g"="06r03i93j8rxw6ddiwmshb88q3h1dc3srlh4djwwycjbgp66xx87"; -"suppose-1.2"="0mzw5b2aackc2xjcxbi45m20v3xh1wmh08nnn0kfjs1fdm47wq9z"; -"suppose.doc-1.2"="1v86jg194kpdgbfngaxn1mzwa0r8vxwjprgiw6sxypks6vnqz79x"; -"svg-2.02k"="0h7ciy6qc3awr2317npp2xi958s4rz8kfr137s2rwpabmkriypsg"; -"svg.doc-2.02k"="0c2ibjsnjffp6rr4fk6b74j1vm6vfi0awvhbpz4yc5cvgjw733nc"; -"svg.source-2.02k"="1dh1857r254hiyi0sjdm3271h26wah74b67fvhmkwwr0wxz7w7vr"; -"svgcolor-1.0"="1jjsjh5qsra0pi57k4430j5fcjdsdb9gwrzgf9bhkfrwr1gfsmvs"; -"svgcolor.doc-1.0"="12q998m0irshvh46ndv4zzpxamg6jwaxx8c054av5zgpvb9g5x1d"; -"svn-43"="1yvgad3kgly04sm9cwjmp1g1sbnsa8rqqb6wvsip285x9kc6lfjz"; -"svn.doc-43"="06qfqmcdgdaf9ghlpc2x8w43w2f0sbaylyzcwyb3krw1d8p0zixl"; -"svn.source-43"="1f37y92ikznxblq6nyy2nkhl88d818z6wbkf901cpw8sjf79a35j"; -"svn-multi-2.4d"="1c1gq7li7p3m16xv5ad3s08k5wvzjij72yl8gdpjxlc8z3hxxarw"; -"svn-multi.doc-2.4d"="1fwagcrmfhz8qwajrpj3bh4r64hm1637kxsqrwfxjnxfrk95v9d9"; -"svn-multi.source-2.4d"="1799jhirlv8gvnnfdh4mwsclcsrr8919wl7wn8y88xwdamiib282"; -"svninfo-0.7.4"="1npqdiwj6lnwgfnzb4iiyjl6bl55pjc8mml3gyrvd36j2f6cl1z2"; -"svninfo.doc-0.7.4"="0728psfyzblwp3nciax4hncbf7sw4ww4rmrlz4jyrpmnv80qjp37"; -"svninfo.source-0.7.4"="18rcrh0kkqfz1k84my8adn2a8y7ppjprcy77pfqayix4lyzw6syn"; -"swfigure-0.9.18"="0ryiifcsxkiwgmq2apa1pfabgmw2g52agylf45b622q97akgknjw"; -"swfigure.doc-0.9.18"="1xbbjxm49ja41cbz08b0zvmwgp3dm6asckwjgqj8yv93a2fmxx02"; -"swfigure.source-0.9.18"="116cdphwhm29jp8rbf2p4zmnwj1sb3xby698jgkj52ha45qixs38"; -"syntax-15878"="1gd38myk5lf5fxlx1j8cvjv6pcpcr15r0370ikxf7fczv8s4ab2l"; -"syntax.doc-15878"="0l6rkyidqvvhkrjxs8y316rssayihqimbyqwvmdzqpnfd16rdxpv"; -"syntrace-1.1"="19vx1iz2zxv49znddhcsl7aw4i267fmxhxpszzg2i9z0klm9b3nq"; -"syntrace.doc-1.1"="1dzy8pazcp3lfc009g0n1h0a6q3v99ii43pza3m2gkjvbrb5sk00"; -"syntrace.source-1.1"="0hb5iklz2c7zqrl8zrhkn8k7dj1zgk5gvf4wpr7h32sa83ajqrdr"; -"synttree-1.4.2"="1n2n1q2pwx3fi0dhh3h5dj7s5wrz2r5zpx77fmxjk0c3d45c8wan"; -"synttree.doc-1.4.2"="0rnghg1459nlliwbcy8r60rc9si3ya35c7sl5zqh67sfwla2ixps"; -"synttree.source-1.4.2"="022b2sn42mfdnska1cvqjsafakah9a908rvyw0d326d7lxx8wrx3"; -"tabfigures-1.1"="0fgdwqd2qqqg8k077p6cjdv2ag5z0953jh0d69gjxfn0bc11yyjq"; -"tabfigures.doc-1.1"="1j1klsqcig3gdb4jvcqvm4kzb5zj3fm0mkliflkgm7sla99zw564"; -"tabfigures.source-1.1"="1zkisnxdfdvx7gwgqjddp27sgj3a2qy6mc9vzfx75qf4c6y3q7za"; -"tableaux-42413"="09pi8sm17m1v4h362al448ayhj1h5n0krdaa7zsys00l0w55qm3h"; -"tableaux.doc-42413"="06173sm4yx2a3mfadax16nqj6ggn6yak85l63jiaqdczwyb09kxi"; -"tablefootnote-1.1c"="0i1mj9bq2hj4d7y7za2zj64p5dfdvsfi51147as5kfb6ci90rc56"; -"tablefootnote.doc-1.1c"="071xk16ck9r0jip847ikb2qjyv3ghf1m73w4s619zilvm752c0ak"; -"tablefootnote.source-1.1c"="14vrh8c322skk3rpjpr03fgzbm03khmhf3ifh2fm72yb5cqgbbqr"; -"tableof-1.4b"="0imbkzdjpwj6z0lnw5zdc8hlhgr9hbc63a55pn4rcykb5zvf9hqn"; -"tableof.doc-1.4b"="0grdp4xs7dlrgpnlqmlssicncfrs74bv8gqbw9sa0r39cgd0rjir"; -"tableof.source-1.4b"="0pfzqhcyap7754lisgzdd795vfni4w5jpg8d9yyxv0wg0z2w7cpj"; -"tablestyles-0.1"="05vlmkazizr31l57zm9q4lsw5kinqd4wrmyjgrlgxl130hy3chxx"; -"tablestyles.doc-0.1"="04wiizp4giyh938rfs5j3s9jm6fjz45bxas3nq3lnmh5akcnpy10"; -"tablestyles.source-0.1"="03bxnqry8imwj5ihs7n61b9f689x3c0p6yx0lza71cawh5jx6zh8"; -"tablists-0.0e"="02sffbb22hirw8mdijf7scxbivipmqw828qzdbc49vaxq7ggmzib"; -"tablists.doc-0.0e"="1fwhps6a0j8r5zqcksdqw8gwa55rh2r2la3iz7wc451zk3ddbxpr"; -"tablists.source-0.0e"="1wpir71xwq7xhg41l6sigp55n93v94lashgi6lgr0g9ad8hh3y4j"; -"tabls-3.5"="17bg083653km6v92hifll78vs0p9zwfnj5rbw1pcl2siizf3pfj6"; -"tabls.doc-3.5"="1gnk4blwfikqshqjv4zd4cykp1k6k025h7vnbjrvia11l6kcnavn"; -"tablvar-1.2"="1c3q074gli4k8a9665i9da7rpv8rdqd6x1kffnzm8n3l3nws6y6b"; -"tablvar.doc-1.2"="1jakhzygr71avs9syz6hlrlrabxa0l4061w5x8kzk03bdgygnhc4"; -"tablvar.source-1.2"="0mk3s6fxj1vpi8pr2pvg504wrw13adav02p2l6313d14zfzgp6nj"; -"tabstackengine-2.10"="0zd7gp1k40wg6b5aln30qxbk84ks3ys0d31vlw3wijvh31qbw6xz"; -"tabstackengine.doc-2.10"="1n26fdj1lxwwx1abslxl3vkcvhk6lbnbi0wqi5mhx2n6g6ir8b89"; -"tabto-ltx-1.4"="1ayysa2dfm6q6wli0ldk45mfw9jvj79mdx5kcpiay69xjl96j89v"; -"tabto-ltx.doc-1.4"="0rgk0znx33lk2gafzjbwwvl61xl4kw36h9f66kay0y91cy9ra9n8"; -"tabu-2.9"="1x22myjp1rpg0in3jgjj4wy0xyva8xd5hsy5c1rqqpy67wy83k0a"; -"tabu.doc-2.9"="076ivdvaac2snb4dgkf4hzpnbjqli28hll6s4r6z609c5v34mf1j"; -"tabu.source-2.9"="1pb4kibjcmwn8snfhcm49jjp38i979dac06p471w9bjnsp0khs85"; -"varwidth-0.92"="032izb0vpcwiydg7lli6hnawij95s5ygkwdp4bfk1c9j17d749cr"; -"varwidth.doc-0.92"="1ysrbpv2mmi8fcyhdabvs2jiqj2mkajapjvsf10c8rw6i3yaplnx"; -"tabularborder-1.0a"="1p7iwpalamif71mrznbmsig5g9lxs3l16dcpwj2kzhiixsh78vfv"; -"tabularborder.doc-1.0a"="0rd6k4b00aj398hy247x84jj9c3d0dm00xnaw69p7wvlprzricwc"; -"tabularborder.source-1.0a"="1lrvp6128j70fzwqr61nnwiivgllbbkw7pd53l11sqzqwzxppgi5"; -"tabularcalc-0.2"="057720z8l7ss0kpkg7l16fc2v82xr0wqlxzxbcak5m3hl5k03g7a"; -"tabularcalc.doc-0.2"="0539rar83mprammyilmclcbjxr657z6q2xmmwmlik990imf78lqc"; -"tabularew-0.1"="0g9pbr0vhhjj2lz9bbgwvm49wl8bdwvv1jjggq2dnwwqbr4vc4p8"; -"tabularew.doc-0.1"="1ff62dxvnhi4q1gy8f7qhc0zz1jiayl6f8j96dp0rz38l2is7m86"; -"tabularew.source-0.1"="0sfpx5w61xrmmgip0c746mghhj06r2mn2jmj56zingymm2djiad1"; -"tabulary-0.10"="0z57030pg4pfvghjii8bgqba589cabnj8qsr9w1abpwp3pfy4zbs"; -"tabulary.doc-0.10"="08r21q2h7sjrk875x84lngcqgiy5ijik56ly7g7wyzhq3jyxds0f"; -"tabulary.source-0.10"="0lsdypidawyhzj73c3yjs8k4xy2sds7gz8gazxfy460zndsz675m"; -"tagging-1.1.0.1"="0sws4x1h52cd313apfzydqpj6c8xrb8x5881cfhwir000n48crb6"; -"tagging.doc-1.1.0.1"="1pv7savkzm6jhaliw5ilb7qmhlj3iyiz2w6kxchanwrg4pnqabx7"; -"tagpair-1.1"="08qjcwyjs90sg8agmpmm3122h20898hy6dwkm0lk3dba1j3w5drj"; -"tagpair.doc-1.1"="1dkn4gq6zxfqw9h64h7ggkbyrk9vzyax8gmnk9qk8dccdvf5n2sv"; -"tagpdf-0.80"="0qz31vkvb1i729kvmalrhh33nk3f6wr76jmcykwica0m1yz39nh6"; -"tagpdf.doc-0.80"="0vc3v5chgghf9vx4ljvw1caqf78h8nj49b7c6j88r7gk9dlbazzx"; -"tagpdf.source-0.80"="092rd4g51w9wnny5s5527wqvbi35xqnzzlbnarn43il17hazxvn7"; -"talk-1.1"="0i9whk49bahsm2kbj53pjdh3fpg1ixfyxmfvcp563ylr8j2ibimb"; -"talk.doc-1.1"="0rgil00i39p2agz9fybg0h3xmpq0wxcpjcqpbpzjw5lcf4mpcni5"; -"talk.source-1.1"="0kdrknwwivyxiyn8xqappf3k5l1brkwkkhjqa0l5n0abzafkjcy9"; -"tamefloats-0.42"="0mhiz5lxz0szi8ygmajjmldz1bjf6f1lpyxj3b9zb17h9aw8gr4x"; -"tamefloats.doc-0.42"="0s5cy9m8jpxh81c10fgdvn8wy7pnv7sa25hy8wbv6qkr1qwz8dss"; -"tasks-1.3a"="0n9byy7yai7cpyqghp1warj134r9m83kk9qrzs8plfb604lbznvr"; -"tasks.doc-1.3a"="0fradxaivwq5vvqm37n97rm07ja4p6gxk9zz07yixj3nnsbspczp"; -"tcldoc-2.40"="0gz5v5hi7r6wr8qas79lakwr7gnf8d5kypf7cp62qvrybp0ljgqs"; -"tcldoc.doc-2.40"="1vy7k0f6ri4kbjrhby0napsas9wwlq5by2q1dakbz7r80zr7dc3k"; -"tcldoc.source-2.40"="150p69vd9465icda6p0wp37gg9vl8y3c2ys3b8f9ij9a88x5775j"; -"tcolorbox-4.42"="01xkk2zwxlccrv09z2da28vnpjaq994bwsdsi2c6gf8v4sxb3mda"; -"tcolorbox.doc-4.42"="1cyqf6a805sccm21ihz9b85nncziq92g777yayzrbdxm44llyvn5"; -"tdclock-2.5"="05w49l1kvs73sxchbwrlfs9n6mn7qshx102gkjk4jslhnw9lc48z"; -"tdclock.doc-2.5"="1n0ir0l10p9fai1cssri11bpzpjabpsrpfji6w826l8i3xlqkdkg"; -"technics-1.0"="1fr932788zvxhvkvmq4m9kzc834w4xzdjq4p80kda3fsk7a7iv2v"; -"technics.doc-1.0"="172pqpm2i2wfv3qgvz9hvg8wqz8q7kqy5afmms4xvxhrd0xyaf2l"; -"ted-1.06"="0m9dv66nl6q4kq8jq08ayx4hrkh9r2i7hmr290s5d7bkyicdkgpw"; -"ted.doc-1.06"="08yjlfrblhralk4b9ji4g47cr9r1zj8dp6sjha0169395wn4820l"; -"ted.source-1.06"="1cifrswbfk6714m63kvmrsyvz3q29wd1bgl48f5d9ay7pz07wjyq"; -"templatetools-34495"="1djj67vbfjrhk273yqc9ss38bz9bq1sasxs8bsd47acvfkgq45n6"; -"templatetools.doc-34495"="087ib1pxgryfx03057yfj3mfm3sgy885s5nwy21cmdniwqsk0i3x"; -"templatetools.source-34495"="1cpa3yvrjlh4l8w0bfyznpk6bvg6fmyhplzsz7jxv9s01w642455"; -"termcal-1.8"="1sxzpnrgc7f325w0ww0b92y8ih6jrzpvgp6b5ilvcpyriym89j8d"; -"termcal.doc-1.8"="0nv2s95n2h67j4zd5i2iiz5ygkc1s0xp5wjnnvbb27cxqw1h4sic"; -"termcal.source-1.8"="078bs0l7615z66h5fr1fcd1ydyjbc3lddl1z7j80dngnx5j0vf28"; -"termlist-1.1"="00dw7p9623kxpsvqs1yqk6n95hfl0b166l09djibybxx43fbk6dw"; -"termlist.doc-1.1"="05rbr62rvl0shhdxvscsgqci6b6n60pfzbsmikan6v2bh31d8mbn"; -"termlist.source-1.1"="0dl6bl28wvg9fcdlfqhchcxg98s3d668pm0sp7rmxzz97nf4fi9k"; -"testhyphens-0.7"="1sqq2rf8amsn6zdp8l1vg5v5jxcn7ipp78qbzzkikiamlxv89nkv"; -"testhyphens.doc-0.7"="1nzimg7bz6h9dm7hb9r9fzs130dw5y7cjzmb4rc5dp5a5xhiliv5"; -"testhyphens.source-0.7"="0s92imbkb4p70fd629bbg2cma72ys853qby1nwk6rvdw8gp47pgg"; -"testidx-1.2"="022w2n8zw6vwfbsg3fa38ba4mng3jv2prk9yv7ald23hyhmsnmnv"; -"testidx.doc-1.2"="05w8pfdb733sb15vb7ryi63x5ka4m38jqvq3rlhyxnr7ahrw3inq"; -"testidx.source-1.2"="0h88x6mmid6nmhl4pw9p4p9nlh90p86g1k44a6bbcyzdlxc8n6ac"; -"tex-label-16372"="0flvmmh0lzkwvwksmnb8m4ix6pzw6f18flybkgidkyf9mf0gg8xc"; -"tex-label.doc-16372"="1ppvdq0cj62zk3b0i76lc35r9pizzli7mm4j2zvdabysn0prlyyb"; -"tex-label.source-16372"="0ysjsk73ksninqk2dyrw06arl692x66rsrr8vb4l2ri3m0lyivlf"; -"tex-locale-1.0"="05l4frsxpdmsrbn50q87db878bwpi076wagj5r8kdnmdwmcanr6l"; -"tex-locale.doc-1.0"="0j9m67n83f4h5yhfh3a51s9yhqh6kpjz8y5vlxhyabyf7rcpybd3"; -"tex-locale.source-1.0"="1x0wmqsrbgdgy67gln4jd0518cbd2cxp36gqrjrqgn574qsl5cx9"; -"texlogos-1.3.1"="0rp4l8da3dn6djdjajavxqr5mmi3fsyadcqrpmd9cfggdvb9i8qz"; -"texmate-2"="06hnwj11ify60gx92zqky28spdhppgai5v08l73kiabrryzdn8w5"; -"texmate.doc-2"="13d6rlazx3qx9zwbb60z1f6dk64n6rph610s97hha5kpc0v2vkm9"; -"texmate.source-2"="0faabcm8lyfvzn5jb7vbpkpa31gjb1czkr0g391vbdmx9lrllxar"; -"texments-0.2.0"="0vhwraxncqx74akzmjcww4akisn3zjgi5b6ac8c350flhl0nsh5p"; -"texments.doc-0.2.0"="0xn17gjnb7n3ryc28p8vg2hshcwa660482pzm9byq8k6s3a78yny"; -"texments.source-0.2.0"="1kq5zw31sv0i87h30ahyasqy1qh4m36f0j37f8532s20n5llcq0z"; -"texpower-0.2"="1w1yn4is019rjnj137ckmkas48xblmhpn0gvp8dac2hmsvqfl06f"; -"texpower.doc-0.2"="16j3xy98k9hb3p7bg9inzqmsl07csa6lx1lgym4h6rcjh247llqn"; -"texpower.source-0.2"="0nkbapkzq4knxhs63fiqg0rcxyp72vmd35jz46dha87s2v5w2km5"; -"texshade-1.26"="06rwsg8jzklnrxwahqhp1wybx03p4brxgg9xaaran8lsjfwr3gp6"; -"texshade.doc-1.26"="09368xgwa3vddlbavl7mcbfgag7i89g58nlg27fxcpd3rq36lss2"; -"texshade.source-1.26"="1ffpah2ylppfs4g4ina6x6xd44r8lqzpdni5h79a1kd9nwhi3apg"; -"textfit-5"="0vmffs1a9zspg3hcnd7p0mffa0cw4nnbx8s4vari3n8npmdxrf26"; -"textfit.doc-5"="0dcb63v0yhlhvjmcbsfnw3px6qizmq95rq67i64dgks85d4dhi6m"; -"textfit.source-5"="1h2yql1gy6hvwv0rirm9v996j3clrywsg9dzgnvrkrvnkf1b6dqi"; -"textmerg-2.01"="1bwlcaggagg811sbsi2wrfsz31rd6x92m47aszikmkzfzx4ina7k"; -"textmerg.doc-2.01"="00p7r1y0npb8xfq1mcw5apccb6xznww3ya8q0qgg5irqyxs7d9fc"; -"textmerg.source-2.01"="1972gkv933fmy32ys96qg6p1yp7551mc4cilvnaasnrwyr776f8p"; -"textpos-1.10"="054xx9dxq3d5872rrnyjdqpiwf6jgsnddah8i57l18wrls8l3jyk"; -"textpos.doc-1.10"="1ih0f5rfwys7pi57l5i03g08qh6avza9sy2khwd58bgqyfdk3m7f"; -"textpos.source-1.10"="116aq86hyd3s6mygg1sig4lg3jynpymrngas59497raxd5w7n7c4"; -"textualicomma-1.1"="06myfm4l1k1ms5bmgswbqikg3kkrz6qah97ncjv0s32inkqjcicc"; -"textualicomma.doc-1.1"="157m953qh08i0a8lhrk3228ir2clyk32zd6x9ar2fgbkggjll9ch"; -"textualicomma.source-1.1"="1zp5qj4b8fn5y8a7aylz7bpkg6jnmqifral9l3h5g8ka1727ng9h"; -"texvc-1.1"="12knhsx5y5n6wlzlmzvym6bza5dry1z8qlszka0f93wx8hpvk7cg"; -"texvc.doc-1.1"="1852x7zd684h6jjhq3f465z4q7d75871hh5gc8abvdk9p6srnwsz"; -"texvc.source-1.1"="05532lckvznsv4slyvsn4jrv93y4gxbcy3q3r8c7g0lgya255s9q"; -"theoremref-54512"="1dfv3pz7pjkazp0czzpzhga9j201gwvx785v3qvqasrvpa0vwyyq"; -"theoremref.doc-54512"="0zs8q0xzinp2ih68c75yj9mbjh1pmpqc77xg9hmj8n3gpf1kmmi5"; -"thinsp-0.2"="19d23nm17nybk0dda4l05dsbs1695fk0kl86vc713l19mzw4l7fw"; -"thinsp.doc-0.2"="139v4dmnbhsd3nqlp9qknml0glfmh1f9dg0nnixggf19lsayn27p"; -"thmtools-72"="12nwkxgv50ifzcfidpqbwz9kz25ji4h9dn2n0n0dbp5d56axp93h"; -"thmtools.doc-72"="0dywknaalhw3vfaq8gsmk2iyig5k7k47vc5jq8ihh55bcpw1wr84"; -"thmtools.source-72"="1fz15j6710mwp0wli7cm1g5bmwz1a5v4m4rpfwf866af6b92i8zg"; -"threadcol-1.0"="1whvgb3901wciijafawy5pgnr4adpix2a6ph2v52kwglg68s2ixa"; -"threadcol.doc-1.0"="0dky94vqbqrba5hsvgs1sllwy6cxmr6mlr6zv6qgn1yrrmjxs0by"; -"threadcol.source-1.0"="1qd96xl0h8bnp5mqbh8mprdfbw1bhvp60dhj46hqyl4w7f61jj20"; -"threeparttable-17383"="043vgdllz4k8fcclyw49515rcwl03albnmszbqi7sbsskmxnzck4"; -"threeparttable.doc-17383"="1mlhxgv9q1gnkp383vinybzh95fd49dgz4x14jnjilhjabvhgyid"; -"threeparttablex-0.3"="0ipmhy0jpx38sy1jyyw3ab953cyh95ix4qwrz1ywhi54dn6ahygs"; -"threeparttablex.doc-0.3"="19mk0y6nn6bn7gmn7vvlbijqdcjp2br0s632lmhnyhwz0d4xz6mi"; -"thumb-1.0"="1khi4j0as028c7fhzkdc6dmbgdyj45lbasbv4ksnxmf2kylmbhxz"; -"thumb.doc-1.0"="1h4b21mmp2bx1vp8n3556lxm16x7acy3srs9khgq24nrfkagwrp9"; -"thumb.source-1.0"="0f2z9w9mxfj0b3s9mvch95cv49bkyv6mxmdzmkyc1zr8bwwqdahy"; -"thumbs-1.0q"="15k7rn5fygvsrjln614jndldmq47zq75zqlv71f2gvr8nqgil93n"; -"thumbs.doc-1.0q"="0c70k96v2m6nbx9b8qx09pky9g0s0ipqsxy3fsn8spjjrqkwk0v9"; -"thumbs.source-1.0q"="1ns05c3ji4svj4x9y2qy9hn0f2bvlllbvg98xsr2xv7gylr2pkmw"; -"thumby-0.1"="0q3h6cwbw90adw3c8ggyb707l23qvsfl3dl8zrzhg78dm9l8q3gi"; -"thumby.doc-0.1"="1v1934z064ar7zgjpnpxvmc7bkaq080h0hka0snkj7kwqm6sfry7"; -"ticket-0.4d"="0qpqzff2hj01g2k8nq9vc91l4zvg7kx4p7nf0gd6ji9lf0q5caaw"; -"ticket.doc-0.4d"="07xa7nf2qgvjq5pzaj7k75wzg2ldcpxb47ypx53swssz277ixvp7"; -"titlecaps-1.2"="0rvggjj8rwdk0nln1c2f5ljvimvrk2bg0kqpc007lwajd71aw175"; -"titlecaps.doc-1.2"="1acn8ch0n29isx36ndpdksc5v9cfavn4ganv6a3vdhrrnc6mksr2"; -"titlefoot-15878"="0c0nhhxhb3hmvg3a64lr5npbqsmrmprqqj9pic91j007k4s1in4y"; -"titlepic-1.2"="1pj4mavc06r5ghcvyjjhvn7x2xrccgdfjr3961al7420ymaqb726"; -"titlepic.doc-1.2"="06s1r8xy54129y7fvzaym2vkfbyw2x31r91i8cyxyra0chzh8ngl"; -"titleref-3.1"="1y2aw2m7jg7l9vcr35nd2qpbafyff1bc8acy2cm9k7fcjm4rcr17"; -"titleref.doc-3.1"="0rv9hsx5p460pa3ry50fnrcb0kf08rzdl7bq47n5nhm8frpmczad"; -"titlesec-2.13"="1r0g5yd7ylacn2r78y90vlggy0w6hlngki7f8jhiykji616l1281"; -"titlesec.doc-2.13"="17y6kxsz8kl2y4hdsirz6m7zxsgsb55714whpzrw11rhjdv03363"; -"titling-2.1d"="15iw3giwxg658pzb6basjkp4v92m3qvzk1fcarnzikc649bjcbch"; -"titling.doc-2.1d"="1r75nwakbkwf32qva6icp3pq3y8bgfl6cqw304lcw8p6bih74y5j"; -"titling.source-2.1d"="1jdgyn9zyf5rwbaz004g85rr2jpd5gi5iyn111s0r22ml41ci3hk"; -"tocbibind-1.5k"="1swxyai6gqlz8zjah2qnz9c5dkd1smpk163b56rba0kx7zcmvzc5"; -"tocbibind.doc-1.5k"="189qi2qyp1nasg9w902ydk7rlzxl2qww9w3p5s3p9ywchvm1l9cf"; -"tocbibind.source-1.5k"="08sr335sgs7hrhd6cbdc4dh3f8m9fpplv72fk54y57rx59l8wxbs"; -"tocdata-2.04"="0h5j04ycxrzycc0wa6mrzh03xlg4hrqgqnbm749q6wd0qzx3ic2n"; -"tocdata.doc-2.04"="0m5r2livan96g4p489qrgh3jf7k6fsn551hapj5qv796lljzv1rk"; -"tocdata.source-2.04"="0bwcv3hq5ldjx3bx88sw1ls3svrgql8zrngp8bqfj181b96fcms6"; -"tocloft-2.3j"="1vp3s7q0fcyfj2ksk61gxdjjnwhd62dzfd94yp7y3qfy7x8hyqxq"; -"tocloft.doc-2.3j"="0zjs0ldib6hm3b9msb5x7r64ddknqwf6kkc9cc82hbla9wshq4qq"; -"tocloft.source-2.3j"="1764cq3d9ad5gy3qag6f6wxgnna0dhk3rx186jqjpqyqli8b4lgh"; -"tocvsec2-1.3a"="157m17r777cfqjn5p4j1rbj10ysbyms87jrhk0wjkahag9rgny1b"; -"tocvsec2.doc-1.3a"="0dvzcynpfn9fvfkks5idncgbdqbhxj0vp1d3mfzymhiw4sds31xk"; -"tocvsec2.source-1.3a"="0gjpdjkl73ip3jkhr9sx94mwxz3rvxaacn553xwa9gvk3xh5rav9"; -"todo-2.142"="0chmi45gcs8y2zh24072y37g3z62ixpv8cg7ck7knmkzwfzv5i13"; -"todo.doc-2.142"="0n6dy738cj08laf4cg4y0sadzzzrz9wa9m87hwkya6c95znl0091"; -"todo.source-2.142"="06xpbraybhf1wbl979653waznvgq697jq61xcpz29gn159li0pdb"; -"todonotes-1.1.3"="1i2n4cijpm2s8x2carxh12a2ci4xy276avwc5g8qjl3qckwssn01"; -"todonotes.doc-1.1.3"="1xaq4zvjvy4fx66jlij2gqd468n62w8a4glzylfisplakg50fmib"; -"todonotes.source-1.1.3"="1qf822l6z7askd74n0ndvvlr2y4ap7mzj7nn55zviba95gln0jxv"; -"tokcycle-1.3"="0pqzrn7s3vjdv6f75afrfyqzaz7j00lmp06pbwirixmn9g7qkqlx"; -"tokcycle.doc-1.3"="0slgpw0ml9rxd6zqr8s6cmy4vm8b5c7978a3i7dpabf8hvkd7s2p"; -"tokenizer-1.1.0"="04b3jy76qdvbq9c6yc0lmq99jqcprmcfd602zm6xsr0lwmxrp1cd"; -"tokenizer.doc-1.1.0"="0lpbfdvmib9ykdcwrcd5inpibgkm99avqyn94zadbasr54k62gna"; -"toolbox-5.1"="1qpbidjji1rj056700iyrbhgmqvw8is5kp2mmm5r9f455dmgm390"; -"toolbox.doc-5.1"="17n7dxi0j8razw5s12s4drz22wd63xffx1x6w0a4jhiq87na4jq0"; -"toolbox.source-5.1"="0l9w43kp3h1mbas4pab9qk6b18ny5r1k8vmm9nq2j95gm7z5p77f"; -"topfloat-19084"="0md1db8a7ifx2vg269y2dhcf4l07qa35jg57x4q9nsn8ac9gy4v0"; -"topfloat.doc-19084"="1q7fssdrg5r2i51b722mw6wydd17qd8b41iv9rqa7s8r9brf8f8i"; -"topiclongtable-1.3.2"="1p71kg4882rjzlbq9rfgvppz532s227xs2jmg8zbgplfd3j96mnj"; -"topiclongtable.doc-1.3.2"="1q12jsaxs9d15qc19wjca7xhq6qajdp7573lv9dc6y9il84r1izs"; -"totalcount-1.0a"="0zd8h2sanc98qzhgkzgaxjyzfh969lb2935778c80n0w8g53ipn7"; -"totalcount.doc-1.0a"="1cwk1dnpin4zz0zc4rbf7a1spz5wzvza3nc9d4jrpxqbzgs36nb9"; -"totalcount.source-1.0a"="1cp1fkvs1gbif9brdwxd1dyx81ylshayq6gad4fw6npzqynppk6f"; -"totcount-1.2"="1mj04hqxi81i1pwjrn10ipm6b0xwv2081paa4kvq7yma8g2kmi9p"; -"totcount.doc-1.2"="1c1941vfi2pf0wsbfhhzpahyxjzb4jx4lr85k7g6r8vk64qahy9i"; -"totcount.source-1.2"="1f6r2ci4dqri4fxd5mwmfmqmw2k5jfr5vzf2mazynixxp809mjwq"; -"totpages-2.00"="1z6brrn4kb6w6an8iz6das0yykwj2cbaswa9wy2p3rfc0w95x0ms"; -"totpages.doc-2.00"="0nm7x3rv5rxg40k0xls5d3s5dqrpc8vw9g93sa3jkdn18xkxh2zs"; -"totpages.source-2.00"="1b0glns220jsmn1607d5f44k2lijjp95cd0dkxabdc3p576ipmmv"; -"translations-1.10a"="06dj29zxiggxg3j7mprg7w764i1gr7j39gp92igs0j9cywq8bwqv"; -"translations.doc-1.10a"="169asrvl2r8297a46q4vg141055m0yb81p62q5h08ha0d3zcnvky"; -"transparent-1.4"="1285prqgw1gl2z9rlvamlca10xxy2x8l9aj63q3zvvz97jbza3kr"; -"transparent.doc-1.4"="05zb4vc7ab9am2dl66xkj23cmk7kylcanicf0fcs57znzyy2l444"; -"transparent.source-1.4"="08j4c9c211s18ljacgvp8ck8wn6rdpdy4g057g0czfgdvg9b7w0k"; -"trfsigns-1.01"="0g1xdyhin39sqbgi7x5m5r5786x2822sf49271arhnv58md7ns76"; -"trfsigns.doc-1.01"="1nr4pypsglxi17kpxh6y9xh0b1ky0w41f2i6h5fi7y63h9gjl87z"; -"trfsigns.source-1.01"="0v1yc2zq5kqcbx8dp12nzfipw2cd7f6z2p9wxxydgjd4xp6s8cny"; -"trivfloat-1.3b"="0s74sisq1bg9n593az435chspj55ysx9b0vqywl30mk60hray6zm"; -"trivfloat.doc-1.3b"="09szjgdcy2fc4ddkw09vsa2am5m98mgm606i6s2nrkjgldm0x4ap"; -"trivfloat.source-1.3b"="067ab9d2vc3m950587iqcfismjnl8fp0jxw0ssdsz3gqxys6vgz8"; -"trsym-1.0"="0crl9ik3bd9jwvy6x9sl102bvp5pgj2rq9mywlrcpbxrvvffw1ab"; -"trsym.doc-1.0"="1pd0r5j26xj63qvj7mrifcxjrzazdi702ang8k6npq0cc8v29iar"; -"trsym.source-1.0"="06aavqqczg63yc0s1mwry4nd2ml94424a2qxswcz60y57m68yq61"; -"truncate-3.6"="13hzrndx2myazl7f30i736zs8vk12203hv9rskwncl77hxrqqqpm"; -"truncate.doc-3.6"="0l5hgx3207h54s4n5193zc6ssj6l49xwx2hd9jfpqh1f73kpn6hf"; -"tucv-1.0"="08m364pqd2imqfi5jalxjrwbjnphjihnmlpnpqg8vaz2rsmddlh7"; -"tucv.doc-1.0"="0rfpmrlh7wbpmpqp5j6iai3g9x1zkhqvwfnwjfskknx5an1ad79c"; -"tucv.source-1.0"="1s0shpwhb7q4zhn6kq2010a4d3jwck3liir5jn5h0gzqbsafai11"; -"turnthepage-1.3a"="0zsgmi4akjkhwqas45r7ppbx5c8i5fyvpmk6a8wmpk99ib58pipq"; -"turnthepage.doc-1.3a"="0jkv2zs1m6bggjhf3g71g9cyvrnmgmr549fqsvc4lf8fp9kp3ayn"; -"twoinone-17024"="02na16ki3n7gcbzi45dk6nwna3dqzgxwc73aha1zncm05bnj3n4q"; -"twoinone.doc-17024"="15ldj27nb6pp90abilsybzg7hn0z8xfv7mmwrmwdq20qw8ss75ay"; -"twoup-1.3"="11zxz1wlnqia071kg3d70glp167k2c210gc4r2755sh6m23wp8p7"; -"twoup.doc-1.3"="02zg1rq2ylm9qvgwh530d5l0pq9a377z943s66apyf3jz8z55sj6"; -"twoup.source-1.3"="0lmqla1wrsrzq900c4fhjzbvg7iwbd3y05g40j0lmfrj8w8lqvng"; -"txgreeks-1.0"="1872zrdb80wfkjh2bdblv31k6cm83cmsnqns8f3hwf3vr0ymvb62"; -"txgreeks.doc-1.0"="1gswhcdlf8n4wpnzy0fx4maxvy3n4dcbag9r0igrcvcbqnp9sfcm"; -"txgreeks.source-1.0"="0n4r3zn19z62qkd2njxqj74k60jr59704mnhrlvmmxi9x3b5g5sv"; -"type1cm-21820"="0xdbj0yivyb7advckx6k2iwbn8xqkxrlapjrqrx51jcqhzqshknp"; -"type1cm.doc-21820"="1zw172nb8jym439sz8fb2nnfxmazbnr5mjpmffwkfnasi2f7b4in"; -"type1cm.source-21820"="114wlrzzvlnd1la16mgdp88f7a6h6v8l5ddq72is0hcddw80g2g8"; -"typed-checklist-2.0"="0k5niz1agw13ybzk0yc1wdbnp4wc8fsclcs8xdns3wgj8yk8x3fx"; -"typed-checklist.doc-2.0"="1ppi49lwwzmh6y03xykqz168iv0f88wrmnx0m8ww1d4ah3kq09dc"; -"typed-checklist.source-2.0"="1m4m1bq32z8m2bh28v20fmyw4w5q1r1c6ywsjgkm7zkq44zxg7yk"; -"typeface-0.1"="06i3zhnc42zbzb5lk0pqgiwq0y7wgds4hs27jybizw9y3yhv9nf6"; -"typeface.doc-0.1"="0z9q8q87iybb4b6g1xnnryr5aihic0vdsjq5xv55i3gbgrd15kr2"; -"typeface.source-0.1"="15igfb6xy0g7jykb50086as2drjr76jcprj3kafcf347427026dv"; -"typoaid-0.4.7"="0m7nvdni7nsmbmlbpf51cb3s4s5qaszbn7mw62dfvvawgd2d1y0j"; -"typoaid.doc-0.4.7"="1b24irgw2779j43pc15cwpazx0mdjy2zla9n6lqvmwyhl5xnaswz"; -"typogrid-0.21"="1p3if64qmyhflwlf4gy59wl3xajaza5xpllxy5f3a7n1pzca46rx"; -"typogrid.doc-0.21"="1v9az7ln7z1w3d2bcfn02kxqcwwl4kg4zjri2pmvicc7skzkplr9"; -"typogrid.source-0.21"="147flz7xlwjxbq7wkaw83mxr8qbcqvjknr27a0aaq5zs81jcyy8f"; -"uassign-1.01"="1xwinmh3a8scfgxm40505zn85r0052pcykcs0lcvazn91007dl8i"; -"uassign.doc-1.01"="1b89rvsspkgs60rkmqjad7n2pwwmviiizpqr2si02kwnsqfspqdw"; -"ucs-2.2"="10m8lwdnmff7xqvyakkczlyp3km8hy29vmz3w9mz7n1mjbjkd0q3"; -"ucs.doc-2.2"="03s4inp7iikyr3qx3wx74z0rag1kwm1mlh6ngxrsl4slajg7wsn5"; -"uebungsblatt-1.5.0"="198bz1875qhh366ddvdxj72jpcdinfxsrb2mzirr17fq6liwbwhq"; -"uebungsblatt.doc-1.5.0"="0814xqw1iglvwn5y29fsvgbrm5clhgiz6ivbh8a8rayscbjwixmj"; -"umoline-19085"="0xx4v6w2sw43nqrzdpww561511dcaigsz5blywqg72giw0x2v3la"; -"umoline.doc-19085"="0zpn7ii50w0bfh3cr84w6nk5zj0g8y55r577wnkdmzpm51qxznxc"; -"umoline.source-19085"="00nb73pq0s7xychc84438aa9472mp1h7drafg27wm916f10832cs"; -"underlin-1.01"="0gm9cikysz83sdkhhwd6x9zbs278gwfw8mxh7z22l3c0nvfkxbfa"; -"underlin.doc-1.01"="1rvryx13hyif7hw2wgb88n95qycip95xh92jdy1jm2l6pl3c5q3i"; -"underlin.source-1.01"="1mczvxrhlipisffdi9jv5m3d2i7h34jpm6vi4dbl58cg9sasc4a4"; -"underoverlap-0.0.1-r1"="14cknh021b4qsymflf0mnv8q2vvhgsf2088s1g6pm8ckpx7diq0r"; -"underoverlap.doc-0.0.1-r1"="1h1qvk9m04sp0nm4acj7kfib5cfpch1mkpvs55mnqqsgasgnymjn"; -"undolabl-1.0l"="0arbapmf5dfxaiakj12nkca4qbyyhc3idjjhsahv8brj886jg8zz"; -"undolabl.doc-1.0l"="1sx0q3084dkfx1hkbjfc0cwhj4mim0gpwr448iafs11czi316x6r"; -"undolabl.source-1.0l"="12msg1fh7f978rw1mjsrprqrr1wbvlfai3vg61dzl329a1wc39mq"; -"unitconv-0.01"="07nmxxclxvx28w8w7gmgfs5vqgbkxxavw8c31nk54dvskd6l6zlk"; -"unitconv.doc-0.01"="0yfcqw1fx38kbc4kcw1620h6mydzzxi1y67x1yr6wa0aiwsd6il0"; -"unitipa-0.3"="1wdgnpllyrkacm64z6sbpgfwzsij525y8qf5nx2lw973bpczrxlm"; -"unitipa.doc-0.3"="0ydj67f0gb8v8yhaqyp5i5k1846jkcvl2mp962mrc0c46wd5am7a"; -"unitipa.source-0.3"="1rg62iidfq4wlhmjkq8yf1r6i3sd1j0d92rh02biw1655qazs38j"; -"units-0.9b"="0rblvdf1cgsm4fda44vvldy6my58dnars88wv2blgnzny8s00jhn"; -"units.doc-0.9b"="0nn5y3w25sjxq0bxq07d6453awgm4m4gih5678lfxf9yvnmvigq8"; -"units.source-0.9b"="0mmqp3vhly9v02fv4q4d3bq7zzx8nmm33nlvbn7137jgc7p5vlbd"; -"unravel-0.2h"="07qdrdr98l6la49zqnqy3cbn90lxg5h3wbcxn8dwfsw2g2vf1xk8"; -"unravel.doc-0.2h"="0q8dfnz6rdk1ml1nibivh6lr1g1w2m70dl376myc4dhqh2g8s217"; -"unravel.source-0.2h"="0fnbc9h330vs4fvpnacjy4waa5gzar28kz6k20pvicfizvq5nhgy"; -"upmethodology-20200406"="0a3jlv480lj2h836wj2paqyqh3ia3bc86431gb4gsp1jd8yrn53v"; -"upmethodology.doc-20200406"="1qzqc2mib1pavlmvs8rcn3f7hk21sfmlg4s9i9ss54wdayxgyg2r"; -"upquote-1.3"="1zglh6pb1fq0ipsivhj0knhcwcg04mjkxca5s2adbbfk2xs1iqgy"; -"upquote.doc-1.3"="125756iaikya3v0wk9a712klp39ndw7i68bybnrif2klm4c695lm"; -"upquote.source-1.3"="137lbzacpmkm1fdmp548m6r83mnhclsrcyqk1s0rkp558fpnqpp1"; -"uri-2.0b"="1mmxhxm4y7qsvq4kgdnq2vhid360gcgq0yxbcgw46k56hxd61kln"; -"uri.doc-2.0b"="1zadcddyfrgfbrsyl4461zwz8g3rjwypixvmi5ny8f80z4igal6a"; -"uri.source-2.0b"="1w5hbpzc5xka2z834hnzx16ky0kdx3x4y0xxs61l9gx0ygqkzbpa"; -"ushort-2.2"="0235a399vqry1vdyfyva9anav8axs1pxwf9v4hhhazsf85m23qqn"; -"ushort.doc-2.2"="0r0jib3fclxjaczcbzkb8ywmnz0xkrj02blg0f5i065h2s1qa10b"; -"ushort.source-2.2"="1sp8z5jnb5qlihv2hz0j2gs4rfqpy0ka3npph1dvvjvi5520c94c"; -"uspace-0.04"="1yd3a8fj29f1n7zwqvpp3nm07vpdw0lhkq08l6pnsfwb883cjkqv"; -"uspace.doc-0.04"="0s5scd5j011z6c4x7mmqvz43wan9fgm76zdddlihs27ja2xsvdxi"; -"utf8add-55291"="1js79n29vap5vfqpczrwi54jvsc8c76lj5dcv2agmpi6nsarg2a2"; -"utf8add.doc-55291"="19fwiahqadl9xmbzp3ividqcsf09smg9rrb6pq1d8b7vbh8yybmg"; -"uwmslide-27354"="1kpbdd8q3q0qkz6alvlnl24jjx6shc8z8p36d9grd3idyx0h18r6"; -"uwmslide.doc-27354"="1m41j80x7cj8h87fkyw4mwhvqhxvxx5dql596s7xay8lcwlxq5i6"; -"variablelm-1.1.2"="1z8nkkljglajrjxvw15r91w1x32dc5nswir7rjqmhghhsngv7x4a"; -"variablelm.doc-1.1.2"="1h4a4lqqdrhgwi0dmg6d59v6nc3baarvjdb5mvnji27jxi4yz3jq"; -"varindex-2.3"="1s3ff9i7w7dga61hrkd7m2rfjq7wrkx1b7alx68kxkjcnl92rb9p"; -"varindex.doc-2.3"="1567hz8fpjbjsra7fxg8dlqkd39d0p0a6lj9kpglv31chws6w2sl"; -"varindex.source-2.3"="0gdrsb0n4sr7a4n4wxrvnxh34a6b1wzpqcp2m39rvw9my3h07vhy"; -"varsfromjobname-1.0"="19j2avb7jqb9ndnfskwqfm508maqa6kd9qmqydflcb9hgjkz47xc"; -"varsfromjobname.doc-1.0"="0mcv48nbly7ihd8q8652v2gm6drvpjv42h0jrw9dpzraljzvpgff"; -"vcell-1.0.1"="176j001aqr4dkz4h23ygdiqqycf5kjwywa08hhmlq13bpk5ia14c"; -"vcell.doc-1.0.1"="1sksy8a9y1jdldnj7w8zz7skzwikgwh8gway3078g574janq24nf"; -"vdmlisting-1.1"="10fzab1jn6hk6ah7h9kyv9cyrv2l0gvlmask1c90njhvgqi2526s"; -"vdmlisting.doc-1.1"="0b0vrxv5mlf721mfdvw46ixidgzh0bq88sgrvxb10y05wjcjqiwc"; -"verbasef-1.1"="1bb1ddwlix4v6knmz68yy7i2jsismqdz189p1664q78h12rxcpx3"; -"verbasef.doc-1.1"="1rd4mhi7w3nsvvx0zxv43nd4ldw7if1zadh0xxbzbjaljypmshi4"; -"verbatimbox-3.13"="0sc53aigy5jx7yvxpms4f0s9msn6szkqmy2jm2ydh8ac02f2lqpb"; -"verbatimbox.doc-3.13"="1gbli0qqgff2ph1lc6nhykz3bh8f0sl18rnk39jqs4xpzr7m641d"; -"verbatimcopy-0.06"="07syldn58zwnwxwdsmq63qgr2nb0bkl9di09knska9jk0c50ql1j"; -"verbatimcopy.doc-0.06"="06awpisb1y773xsijrifh0121pq6fdzp2ai0snxny5vrpmyp412n"; -"verbdef-0.2"="1dy1h0vcknnizm2f3zggga85slga5p77aw3ll5ca3kx5qxp1xqhl"; -"verbdef.doc-0.2"="06zh9v72ywrg84wlb96p0y28sn9919pn2xjgqhaii6irdf3hmlma"; -"verbments-1.2"="1iv716hb41cy7bc7bk2420lwdykpccyg6wxvbxb8vk904fsgdk2a"; -"verbments.doc-1.2"="0hzrzb6m8iakip93in80x6k15b08z9xwjrbki12d28xdadqkpqcc"; -"verifiche-4.1"="0pch9ihs7qvqqsq9iswb4zjirll71ld4w7nxdhjbm6v2242dkf8p"; -"verifiche.doc-4.1"="1yghyb6wy5ip9ifpb0hgyhmn81lm9ak76v7dzz84zh3q8vnvqnp9"; -"verifiche.source-4.1"="08rn6x5acqva4hzs3j6wkdr9gjadvl047capkwrvdzaclfg7zffq"; -"version-2.0"="19b4h22lqvgzqqm0pivjjhmpxmijrr5rfy0xc9g9y7czsrp810hb"; -"version.doc-2.0"="17bsgyjvnna790nz3x94wbwslxkkz3958vj2l3jbyphm5vv92fxz"; -"versions-0.55"="07bxhbpsqgdbpwph2w7gam699605m181xmj8jhpcsf4rwcpnjik7"; -"versions.doc-0.55"="0pjz8nk7dnf2jp6yixhi55zbrlmhv477qsx6p52dwkf74vxgv5ki"; -"versonotes-0.4"="0kw6ydfy7fycfrr5i8p38farwjrhkfvdlvmaxcxzk0cgnn7102mh"; -"versonotes.doc-0.4"="13crgm6g52n4d92rmw7w08j1c5l2nnhp17816w4csb3fjsrr83w2"; -"versonotes.source-0.4"="0vvkxga9jzv87dzsv1rac75x147lcf84mkfcx2npz8sbbsc1rj9v"; -"vertbars-1.0c"="0a5fc0a4z482fcxx27wrn20fsdvx9xclsy36623h80pxnfw49aji"; -"vertbars.doc-1.0c"="0y8vfa23ld199r45pqd56rv7b0iskskpaqc08lix2zss6a082iy1"; -"vgrid-0.1"="0yb2hr83xvy19j43kmjrx9kf2cadyairjr45vg5a0pbr9nwpzdsr"; -"vgrid.doc-0.1"="0ymfdbqws78n3mm9cbf7zrcdbn4hb9pzzjsw77hlg023h4hkddh0"; -"vgrid.source-0.1"="0rwsi6lmd4yhgpa6605631ld2bn8pzij7radk8vhwsa1sn19326g"; -"vhistory-1.6.1"="0hli68fad0zj6dp9l9sshz657i30l5xqwhskvkv1zh9mwsrkdh0s"; -"vhistory.doc-1.6.1"="0vjskzdg9523fnj4r4zhg7w6wsldcn9xi4xfk6wplvjsafgfpqhn"; -"vmargin-2.5"="0k0qp68wnfr13i2prx64n463g9xa4cf6y656m2bc735pvsa5ln78"; -"vmargin.doc-2.5"="0l1lv0szznc9l5jz261nkcpq6dq28869s6h616rama40kqpdm0bh"; -"vmargin.source-2.5"="1vwydnpsd5ha4g86dg2q5s012d6l3yrksc580m41q3i67npb8chb"; -"volumes-1.0"="0jl7n29bdwi7m74zb6alp0c4aamic3776n5bd9xcnf5ihfmh9ssv"; -"volumes.doc-1.0"="0052j7zhnbi20x6hsxv68ls2byqci2n4crssb243diid8yc763ac"; -"volumes.source-1.0"="1lvc7fhdblb5ys2blbm0fdib5y311nz4l6xll1zzpsvbwpcc8imp"; -"vpe-0.2"="1w2pxz5dg3q42cdydj10fzf9hmwbc1xy8655s7ngzhnj0vljrj1l"; -"vpe.doc-0.2"="00n8almyx5g71gwxcn05vpfvvisqpr4k1lp123ys810p5n25s31z"; -"vruler-2.3"="1di4a3czay9gj5dbps78iik9r5p0n5vxk9dagc2ak6gdbc3rz1ls"; -"vruler.doc-2.3"="1885iaxgfbc08ldwrzv50jpmczhnjjvhq460vspdp33f3z5i7ifq"; -"vtable-1.0"="1bdf5h2nsw76y2w4gw1ap0ncg9ibydaqdhlpynj4qyy2c9qkb55q"; -"vtable.doc-1.0"="1w144as1s1kfd9a8z92kl8v2qm6il09k5myz9siq5dqxdfs3k9hk"; -"vwcol-0.2"="1wfqcin8xmxrby5mxn9s5j32zmr4ka4k0h9ps4kdddpq238db89n"; -"vwcol.doc-0.2"="1zyndap37lq6jk9pafpzd3q5bib2x7yrnz6wk7wlgmgiyb6smj1b"; -"vwcol.source-0.2"="17apnly4vihdn7dzh6hibgairrnvzadxlv724cgb5lqaci74gnqh"; -"wallcalendar-1.3.1"="04rck2mzvzpm2f934iz4nni9s5w9g7a0qcp3kvp3bsqa6nhhcf6v"; -"wallcalendar.doc-1.3.1"="1b2nn4cwsb6vi29a49cnnazpzffwbpyw48wffklv11frbmk74dnj"; -"wallpaper-1.10"="00cixdnwr4vpfpqfdcbra4gwz0i36kddak8ywv8l4q4d4yd567c9"; -"wallpaper.doc-1.10"="0ngsn8an7gqzkw96sdxb4q24h7bvbjw0gsqk6dzrdphclvsjy8w4"; -"warning-0.01"="1qmymyl01vd3hqvgkzzwffffawbwms0zhs0na7nhvlv59f1316rm"; -"warning.doc-0.01"="1d27zqh4cn9sa5ivp5a47d8dji73dzvirp6pl7cgcihy62ll34v1"; -"warpcol-1.0c"="1dr0ic0pskvw6397q1yy1ibbpl1c1kndqaw5y72zzzy52x4l4j71"; -"warpcol.doc-1.0c"="1jc7rilhf61irh8kgc437mp45ryz0yr63z11r9ixbsj04dmfk2xr"; -"warpcol.source-1.0c"="1lnd9b42xyzfnrz94x10vxrmfy6r2l4wlxbfc1c02fmnchj2wq6c"; -"was-21439"="0g1a285svl2pnvg9g75rgwrr2lhq5dzpf814mkivigsywf02vwqj"; -"was.doc-21439"="1gkk6x7zijd3k10abn0xrchxhv2qbf7ln04civ8lvklwar7wjj60"; -"was.source-21439"="11yqamgxd7zxirlivzwayb3hvn7f52v09ah6ng05phwj4lb4cx9f"; -"webquiz-5.2"="1v3yhi4p102l59lfnyn8yiq8995s6fhr39018m1bbgljvcvm6bl9"; -"webquiz.doc-5.2"="0lwc3r3w2d7lzz39ilncbckmvx536z3wvz84jlnv3flm2dll2z7s"; -"widetable-2.1"="1k1jnl3jbrbcc55cl34wj3znfay2wnf8k8sgdslicvnan2j717zm"; -"widetable.doc-2.1"="1giy0gvhngsmfwc87j9k2p820j6bm2mc2r1kbcl4ci0c3383mify"; -"widetable.source-2.1"="0krkcnxzjrn7lqd0qh8lgjixfpd3c5glvj1ilqhak9ifd3lq8r4s"; -"widows-and-orphans-1.0d"="0pi09xfryird716sfw1gl1fy623br6nrz6szh6gp5rg1vm5m4mi1"; -"widows-and-orphans.doc-1.0d"="0llr7v338qadj3d1d98bl9vq9xzm3ax7disrq1ygiignpq6nsr4z"; -"widows-and-orphans.source-1.0d"="0fpd0h85lrn89y3s7klfhmyzz1h6shkrml8px95l5xwg4q9jdirh"; -"williams-15878"="0pbij6hwk82pmddl199sxin34fk22wzvgfj0dpjsg0i5qrsg0qcl"; -"williams.doc-15878"="0vvz6fsh4vlhwirz27gyni6xnqinhl6iymgmfhlcc808y7fawcvq"; -"willowtreebook-1.01"="1w5fhwfirnjims0n0wdm0mpg36dz329wb639c3ydhnynyvsxssg9"; -"willowtreebook.doc-1.01"="0af76d9zkasgx5jbi6l572irad1d9r7lxszs822x6l8fa8121hgi"; -"withargs-0.3.1"="1b49fag0ivb5srlsxcbmy8ssqsrcbgadkvcxd6xn9l9bk28wpfwr"; -"withargs.doc-0.3.1"="12n87c9181kskqvx7bzvqjimg7agcm8n2z7rxnh1g4kh9bjr57ms"; -"wordcount-1.7"="16vxb87jyj7006akcd7fdvnqihz9rjyw2pl43mdvr5lxp22fpxdx"; -"wordcount.doc-1.7"="1yv9lj7k7m446knp2ghsj0dj95splsc6071w2iarh8cq1xlbj3kz"; -"wordlike-1.2b"="1mdgcdiwnqcsrqrzbl27v56xpnzvxb7gg7a8vass31srk8n10ssq"; -"wordlike.doc-1.2b"="0i9k22hwjkq3pb6z8hiff6zz8l3yjp4vh8x89z5mcbg8iw5gjacd"; -"wordlike.source-1.2b"="1azirdir33aixw7zh9ps9npxy1v8ckgsdjb96ri1ma0cy2z5d1ij"; -"worksheet-1.1"="1rsh38fx4ayai0mlakqgpzxpnwp6ckzjcpiwy7aqlpia0504jgpc"; -"worksheet.doc-1.1"="1hagdjrf472ip4jjkrjv6mgycwjlhbggval7kkk449i0xd9kiz39"; -"wrapfig-3.6"="1axad52pzzsx9d32rivasl5d49dj51adk5kcnb1rr8mz59421rk3"; -"wrapfig.doc-3.6"="1c3xd0ja4063qzag0v07mxkk52yczlcwdbwn84gsfp5hdmd5cibr"; -"wtref-0.4.0"="118ajsdd1d1g1fr23pnq1zrdczl5qgdcrqp4ly6kp8w2iwjhqdn0"; -"wtref.doc-0.4.0"="1nk1w4w8x9xfyr8wdr68gx24vw3arf89ak72rbiwjkspzjl1h9fa"; -"xargs-1.1"="1r4giz5gp4pcnxw12lr8hnsa45yv1lm1ddq6g33rkgs1qjzkhv02"; -"xargs.doc-1.1"="06kfclbfr2kc95c431hn54g0c6vcv7vscsskg9myrp94ilq1qglk"; -"xargs.source-1.1"="0k58hqv0jmk3v2jmx212idnfrs9rxqz93zq34f5kqx8dwhnss9pp"; -"xassoccnt-1.8"="1vrnw8yszs9x1c9mm95a1j3g5zhm61a1l4qibwwvaw85r1r8557n"; -"xassoccnt.doc-1.8"="00jvwvm78l9czk29if8qxckzbavyfx4zmvxr2ax6x5bj2i6vm25q"; -"xbmks-53448"="0pv35b38frgwbi4ijn1x8w5mx48fcy709adlrkzhy641bw4isv86"; -"xbmks.doc-53448"="1nr1m8mhqwkjl9l9pw72ls8xrvg8w2gi8rar4chk3xmh6kphi7ra"; -"xbmks.source-53448"="0waizijqrvg7qigh317vr56bi2b795p5k3h779p0kbl53k3f9f6i"; -"xcntperchap-0.5"="0hqagjlxphvfqmslg91fpxngbm15i3kmawglszj8z585i0j570di"; -"xcntperchap.doc-0.5"="0yf5ak4xr07jzlh8s087c7g8rfa71isziy1z13qy8ifv2882p9qa"; -"xcolor-material-0.1"="0sa38kjyy4iywgd9lwhd1aqw48laqj9h2crcarvjd8hr4xwhrbcw"; -"xcolor-material.doc-0.1"="00jfvs4r7hsclvy49r6waanq1q9vszdi5fhlnbg5arhkf53lzii6"; -"xcolor-material.source-0.1"="1jiyl9vry12fl3y2c6l8z5ic8jaahshbvaha8c98h1h2d8mqk6vx"; -"xcolor-solarized-0.4"="0ggm9s8vqw80jfsmw5jn143xcbrx226rwkarjkfqhnlzx85k2d36"; -"xcolor-solarized.doc-0.4"="1vmr5y6c5mi7hgkb33daamag2y4j6vpiyxnh0cpya824l6miichq"; -"xcolor-solarized.source-0.4"="06f2x0w9k87wd75vm6gjxg2pdrcv3g6406nraq2mnlf9sial9mnh"; -"xcomment-1.3"="0hxbf6hid76d1gm7ngjbrrcb0x7faxsqa44560f93n6arhj1nmwm"; -"xcomment.doc-1.3"="11zcprsby27n8dh78658r6xmmkpqzmx28f6sqc7jhg403jq0j27f"; -"xcookybooky-1.5"="0hx5n7rz2aw460m9cqk2f2p4d3v7fhr02cjf8wk471fp8jwn5bx9"; -"xcookybooky.doc-1.5"="0x9aa92w7b43n49d6m0rlac86f3hsgsrhvq82g3zixvffypyvm1i"; -"xcookybooky.source-1.5"="1z951i4sad1i8bjmw7bgbkanzg04icjj0qfjrshr3m8a67wlxgjz"; -"xcpdftips-1.1"="02g4rm81gf314ds6yzrgasj1ighbyvka7p0vb8mrl78m1ybqjab0"; -"xcpdftips.doc-1.1"="0wcbx6qx288448h2rffv87xgzfj8i30z1v2j6qcp8nlqq21lmw38"; -"xcpdftips.source-1.1"="1h60va01gkm2m9jz521wx93libahh9fi3a8pyb67l6zgjd8dllxi"; -"xdoc-prot2.5"="18nqhig2kiwa1yzk06v65hzriq6la8c31j6f7caxzjrhjkzx0rvm"; -"xdoc.doc-prot2.5"="09i5zcp7qisgf5rj6ys4rqvj8v8lxcxr16ddmzzvibgdc8kpc3za"; -"xdoc.source-prot2.5"="0vxkqg2jl0qfnahfs82764z7npvsyc0ys3qlz6xk61ylhyqvycns"; -"xellipsis-2.0"="1slakkdjh4c88caxcdznir5gkw0v7aahfpqksp4l9as9bsl52980"; -"xellipsis.doc-2.0"="1jlndanic0xc16ba1hg1lswcxa2b20hibd25bs65wyag04rbh8lb"; -"xellipsis.source-2.0"="0768vqhmxgra190g0k3k4hhzgkhkxwwnvwmdpymphsqm9lvxbl95"; -"xfakebold-0.08"="0dd7dj7nrdxrnznly4qvsayfb9n0cd70zr41jm8b7n800rn8z0v0"; -"xfakebold.doc-0.08"="00k39478xw7hldrhdvi2g8gl1745msxhfiln04q64m6ahpabca92"; -"xhfill-1.01"="00lb01b27h1bg8h37rcm7wmqh5pc3gz7rkw0l6xrfai0mb8ypq2k"; -"xhfill.doc-1.01"="0alaqaiz2dfk4sh4xgrxfrwxgisv2p0bfdz7ppiqmli10al1h2gd"; -"xint-1.4d"="0mxv89x10fav03059zrxv40ccc5c4dzmdqda51fivnfkyqvd2ysb"; -"xint.doc-1.4d"="1jhbhhzg80rr4s1k9wf0v83zi11ragvyi9wgvcv7d0qs5h6lhsln"; -"xint.source-1.4d"="1vlgci9gbjknaijpg7hkk9id2lmivf855q2jqpa4i20a3w5cc906"; -"xkcdcolors-1.0.1"="0471difnr81ihdan9qm8a15pgiy33fcc8qpwwigkhqby1f2sl6kl"; -"xkcdcolors.doc-1.0.1"="1s6xza7ci8gazqhrnhqj1c4kqd8b7dbhwy01qds9wjxbwrvxrm9y"; -"xltabular-0.2e"="12skn3ld5cjd8jvh32l1h86mcqmx03v2w04189rkxh2q90kyjmfw"; -"xltabular.doc-0.2e"="1lps5w6p2j0c1bszyrbwdfn9r7mii9k9k6ap9s2ssb2rrfzf291f"; -"xmpincl-2.2"="1sm9ls98cz83nc1s6xymbiirzdawslwd6cr2khh5w265h3kgpgin"; -"xmpincl.doc-2.2"="1k532g5b8fm6ly9whah5133g6yngadb9w6cvf2apwm9hwx1pmnxj"; -"xmpincl.source-2.2"="1972vmvsd3ch9qc78kw8dbf9rm56g6mbd18dvfa118bv2a5m114m"; -"xnewcommand-1.2"="1hqpc8p8bl56gzcmar6m670l6yq5arlh382s3m649lya35yydmms"; -"xnewcommand.doc-1.2"="1r4wlg8368ax3p492qyh0nzxkfgkgvm5bzrbm0jhh9ayk9sp7ryf"; -"xoptarg-1.0"="1ykc3mdg45hhyk5x8lv06zggfv88kyrr1zqnv8s9j8cb5c4r71jj"; -"xoptarg.doc-1.0"="1g42s8mgr7yqdziwza1g241vjgygzddk6ly8md6c22kj8g0sq9jg"; -"xpatch-0.3"="1almf1wif49mi3yqr4qsdffd6m3q8xcma8x9v737ffczsffhs923"; -"xpatch.doc-0.3"="1lxsqxzajkcfw4b9i89bk0gmhrsprkmgqqbj5v34bgvkvh0n5pm0"; -"xpatch.source-0.3"="1cf161h6g6m3q8bq38imvmja7ral7lpyb26byb8nn26lgixkprad"; -"xpeek-0.2"="185jan9h82hrc8bai9h0k09dj2q8p2klqvz042h7xrh2napk060m"; -"xpeek.doc-0.2"="0sag912jjxpiwbsgmp0l4p0kw4jfhp1j3sy0lb4kdxcqrzf3m1aj"; -"xpeek.source-0.2"="144glnmckvjm24smk4d2xmnkfz8n3r4k7zjmsd0iwa004n28il5h"; -"xprintlen-1.0"="0ywzhbp0b40cq395x5bv348f5dbbv29cqvlh6gkznr6qkjm6ai3b"; -"xprintlen.doc-1.0"="0dslr7n1mfbclyxic7pl1i425hbcb925jfbag0sfaal03pbczq7z"; -"xpunctuate-1.0"="0bqv9l0f3fwvzv2hcp2913spilawj21zbhdfgs9k04knda4xb7wm"; -"xpunctuate.doc-1.0"="0r06jwsc38qac0k4b2rmm56phxi0qgmmvlixgk3w3mk51d26jz0f"; -"xpunctuate.source-1.0"="1i5xcn13kr9nbfx8nc34n7qn7zj3p1hggws1yd1bqjpvj2dbssk4"; -"xsavebox-0.16"="0qw2fsic14k7wcb50wpf8apkv97rx9jldgqavvrmk63wzmv3hn7i"; -"xsavebox.doc-0.16"="0vx8k47bj3pqn1j09hz1mimp2jpk44dqyc6wivlrqkhrjqwla4n8"; -"xsavebox.source-0.16"="109n0kvp3a4gb0wqpml2glmb9b6xsagnh4s4kcnwvia72h5fwf0g"; -"xsim-0.20c"="0ckr4ygax1452xqfai6yxrbq6cqk23yvlasrs95nfsiflsl2xrsv"; -"xsim.doc-0.20c"="19ydl87qxpgrqxhfqp9jmvspha2zv7rh1n09dgcqxw4f5hfcylaz"; -"xstring-1.83"="1ckbhk2psw5bn0agpsmy4zc59s8yadja7wr659s39r7r7y8mwcab"; -"xstring.doc-1.83"="1z5z2mcg5c9sd7ykfy6r9ybzvmg3g1aq8k42zvgdx5fhmkrbz0sv"; -"xtab-2.3f"="1cpcs7k8liapv68cghfwj5fw80rz71qrld7l9lsnli50h7ph42sz"; -"xtab.doc-2.3f"="1z3wp3hqy98a4l34kgm604zajdyv0b2vq0jipywmdc12115cw63f"; -"xtab.source-2.3f"="1im5cv88g6n88rxzx8lqcxfmhkihywrv2h9gclmv0jx2mmwvwafv"; -"xurl-0.09a"="1430pz7rliwv0x8mx52v5xznkzjsxh2xxj71106ga6skczcszp4w"; -"xurl.doc-0.09a"="13j7y5j4grjw5zn0rk3ad6yyhadbb4f107zw090dy8wwnvgmfd1v"; -"xwatermark-1.5.2d"="013zwh6gz8npgyvdj8daa6y9pb8554lqvbskchsc366k0m6xrwd8"; -"xwatermark.doc-1.5.2d"="01x4rkl6h9afsbfis3ixbqi9inb1sgvavd0wld9jbwcrmv4qxc76"; -"xytree-1.5"="14f3vxkfmv2s944qpdhxpvbrpxq2p259bnk5sxlcv8lbsk2fvvcx"; -"xytree.doc-1.5"="1aq5lbx0x5v2f4fmhp0bcvasy5569mrbf75xk6m6vjpnls49zjfv"; -"yafoot-1.1"="05b2niwqs6c43gl4ag811ljdd0nasmbdinz6dx2d488nl4jiifaj"; -"yafoot.doc-1.1"="0mbg6y7qsdsq5nwgdh32kd9x3ghvf8qlbrm84rg6269ff0b5achv"; -"yafoot.source-1.1"="1p3zwyg1pf3ad35w25ahlk1r4c18k6vvllcv8ccm952mjg79mj83"; -"yagusylo-1.2"="12p2kxrqa4479wrwcbbxsn5hknr1ai9rf1x76psfs43k9fh1pnn7"; -"yagusylo.doc-1.2"="0g0vx5zjrfxrf595c0kz378n2h9hrlaf9sx1ypw3iv90zns1sp35"; -"yagusylo.source-1.2"="1js0slg00sr0bc0gysxvlp3jwlfa57lldi6q7a8fvqjfg9bkclvm"; -"yaletter-1.1"="13xizdiq8dj7iyjw7a9srhr24c1z6g50r44a7hjz0909z3b58j65"; -"yaletter.doc-1.1"="1jgv50mssx6g94fh5fcysi884w1iah2qdwb0vrkg6952266gdkvw"; -"yaletter.source-1.1"="0byfxy8h76m0jwgd4q0s1ar08sr9ys9jhvsz2l44id321w5276dj"; -"ycbook-46201"="1ajhl8vkd94yajib69s3jw6v2jbbn7h6g92m0yc86gfri3qcff2r"; -"ycbook.doc-46201"="0zf71gmxj1hwywlw5h8klgyrn9mww12hc4bic0l0gmwixvn6k56k"; -"ydoc-0.6alpha"="1yv4cdl0xak9ag4hw18xvzzkn2bnf6dccvd8vz4xl4a2rkzz5fl8"; -"ydoc.doc-0.6alpha"="10v3h8csdl78qax3l2vimy2xni2zg0qjhzgrf7j5h5f5nijw626r"; -"ydoc.source-0.6alpha"="0jai53ykd4q3k56psl6hs8xw07jb47g3h4jbkv9d42ayr5laj2fh"; -"yplan-34398"="1f2kxbb32hxwgin5bn7b78r8sqdj4v1q80sh1c87425zw8jyd73z"; -"yplan.doc-34398"="1ls02mng1jwihz8s505brmaqcjn4abqys6bwl22dy855bw5rgr5k"; -"zebra-goodies-0.8.0"="1f8iv32wgmkzqr75m44hiagz34d9h8qz38ylh3jaq2d9hxf0l1fq"; -"zebra-goodies.doc-0.8.0"="1fz5bz0k6ymj32wc6lkikk0b36b6l9n893xqhbhac4y5gxd1r8z0"; -"zebra-goodies.source-0.8.0"="1as545i691hxy3kqnn72gksgqc9hswz7n48zzhmaz77q6ilnkpkm"; -"zed-csp-17258"="0wr6dxb5ks34x8rzr7s2cnanxc5jawqcq0zhkmxrh8cjqcfkk1w9"; -"zed-csp.doc-17258"="05gm4s4svqa4wds0ichfm6lk39i0y54y33b96bnycrabggqfw77g"; -"ziffer-2.1"="0nalr6i8yqd1iq713gigafnh1k0h8kgiml1zwpk8rjyya606capw"; -"ziffer.doc-2.1"="1cr63lkqi9kpkbpnrwmbppipsmw6wy732wsaha0y9y5ia2934nck"; -"zref-2.32"="0s0306k858i40v3hwvq4z66ip2y023npd4nl4xf31bilqh240p19"; -"zref.doc-2.32"="1rb9jbj2lj8z8iplnjz1qi5qvhn32qvphgmw872qxn9gm0hx82r3"; -"zref.source-2.32"="0lrxqvqj7s8ia0fhzkf00pqgxgi2wnrxdclfc3k865nfj59ybshn"; -"zwgetfdate-15878"="1fgz3z1f9ifcbrwiq166hnff23gmlgp5vn0djm2znci26bcip4s9"; -"zwgetfdate.doc-15878"="0gda7xd1sbiaaspb253xgl47jm6bcn8hj101m6ih69mxrka6sz60"; -"zwpagelayout-1.4d"="1vw3fq52fyn59n4ia99pwdhpah1l4nql88l578zrcmarhjviwvvc"; -"zwpagelayout.doc-1.4d"="1389mx7bln9rgn7iwsjlrpal7gfxv85yvck3xd4f8flspqy0mjiw"; -"addliga-1.0"="1w9wv0wbv8acc7qvcc5pb5kjxmy2nz95cb990mmgc2lxvvsaw2rl"; -"addliga.doc-1.0"="0q41i3cd16ahpklr1ddmzmfs741x5k30vaz7gz7k8jrf0579nv7w"; -"auto-pst-pdf-lua-0.03"="1vh8q7spf251yfc0maaw9xcm1r7w8qyf3vw7nr6gafmv6si2i4fk"; -"auto-pst-pdf-lua.doc-0.03"="0vmwaflyaj4crqb98gc9smngrpk1hlhpq3acfw6bnpdwsm5862mi"; -"barracuda-0.0.10"="07x3j8hcsa0i0gw5rrp5j05i1qhcl91z7543pwzjaxvplakxbj0z"; -"barracuda.doc-0.0.10"="1gyzr84bpnkxn6q2rzwgg6i10qm6sixg0935ai8jqwb3k5bskxs9"; -"bezierplot-1.4"="0iz8zsifxrwbv35jlgq3qb4hdf2sqgj7smcc3bfll655zq0hqmab"; -"bezierplot.doc-1.4"="070nxd9n0i9r7h195lkm45zfpdbaqz4lf0k69qg6qj5adwrdqbvr"; -"checkcites-2.4"="1s2yiqslhli97wh3b1fgnbv6rw59dwyyf4pmfkxx0csn0bgdmvpg"; -"checkcites.doc-2.4"="0hj1phvdqyr43z70nnzk6vqa5x8vpbkb0wvp4jzdk5ry31x08484"; -"chickenize-0.3"="08qxlyxghdzsbrqk9zhj6wr2ffbzd3nq7299z3q7s39z9azrr1z7"; -"chickenize.doc-0.3"="1k4pqd8paq4zqygws1ihpsklxrmsxlqvi3y60zvaghq0r3iiqqqs"; -"chickenize.source-0.3"="1j4sgh23sai4qzhpxibz2zl4a82nfiq7asgcz42ab5qdlz5vnh8n"; -"chinese-jfm-1.1.1"="0lgpg27qnc59i1lkbis5jr3z4fy2cl86x1dm320q5kfjm6z06vla"; -"chinese-jfm.doc-1.1.1"="0bpl9vkjvn3bq1dmrgm4f0kgmbvxrxxhd1alfd4yw30xib24aq31"; -"cloze-1.6"="1w0wydk9kimnihll4r8nx1kp6fccgmhybxl3qzrqxk58x4imp3sk"; -"cloze.doc-1.6"="1pprx0mdxfn8gwdsi03ifscinnvj7p3w8nwir20z5q5121clss95"; -"cloze.source-1.6"="1ijnnfq0xrcnysc9sf54nc9a2xg42jqfiqawb8a5jnc62dx9zwyf"; -"combofont-0.3"="051xpkjszw281gcpacc5s6wpbvwx66hkbr5fpg72205raa454bjf"; -"combofont.doc-0.3"="076niz8w1i6zwq1938iplhcv41qfasqhw8darlr84fr08d3hjwl9"; -"cstypo-0.03"="0lfg2c985h1xlnx1fa3kx1jjrhw7kmgwvalqh5127w20r0lrh8c5"; -"cstypo.doc-0.03"="18yx6l49qk1ayaz13qqw72r8l8z348d20yqdm305nalhqyksv1bb"; -"ekdosis-1.2"="1s2wzjlrbg5yfz54wn9nwfcwx39d1qvp8c26gbr4q3df07s6w7z1"; -"ekdosis.doc-1.2"="1248iz3kjjf3wnfh7zhxv8xljv5mqf8gigxf4i91fkpi0v1wwc9h"; -"ekdosis.source-1.2"="027wx7w1723klnd2nymk6kfch8251vjk608wc0xl9g5h5v6dlsam"; -"emoji-0.2.1"="0kb1xvzk1zgym9ajihrvvap6s39r4ypjp60gn3b91a28g80qkrx6"; -"emoji.doc-0.2.1"="0sba7wi4vb6k1jamc7k42zy6b1fy7z6s17viifwcan2h8z4hpc4v"; -"emojicite-0.3"="08y8qg37m8b3qf2wkbg802kmx359i6ki445ljjnxybs7apvxjpn5"; -"emojicite.doc-0.3"="1iwlxc5ygq7l4qag7yxxas0rpcywmjcv5pcayrk5mz34xr06x5f8"; -"enigma-0.1"="0cl7a0xh9y1lg55wdkj03n3ayyb0853nad04fpgjla6z9c9l1lrm"; -"enigma.doc-0.1"="1cnbi0n8pw2m8xvxk51j4rlyvj112cdz5zjhc9n8znj25iva8in1"; -"innerscript-1.1"="0ig7y528vl2r4dc4xqx16qbl28hy1vfhyk1b0f0ifnrg41hqs61v"; -"innerscript.doc-1.1"="01y491bx14p1b4pylx4v6ilszj3v88j404fxg3wh2pfi1m5cn6sd"; -"innerscript.source-1.1"="1wsj16c896rba9xjm9f0kfbj6hafkb8l0p41412vdzbhqv6zby6y"; -"interpreter-1.2"="1an61a9gdja2h19m13i4024d4x4f741x4yxk983phl97nfadv900"; -"interpreter.doc-1.2"="1vgdgriiwv3lbdwp72pdc7yz5f702xxykqdp4ih1ssx1sl9pcw05"; -"kanaparser-1.0"="1cwik91vx5bzq5jn8xjgr4ffz7n9d2qpx9v9xr298afmadg65h0x"; -"kanaparser.doc-1.0"="0y7j8qp9j33hw80dypc10nr28x2zn174sq1rbbbr8gc7vsvz5pyw"; -"lua-typo-0.32"="0ab8g7s7bcbgri9bil31s10y33vla1zphlgl6b9954gkvr9rvabv"; -"lua-typo.doc-0.32"="1sdj9klzr2vgqwdvklpkcpwbg7s1kbacr8mfp8hi4zfsfzbj8gwg"; -"lua-typo.source-0.32"="1m7pjfkg48n1kngbfr7l0mxkyw1fki2w5qj1vgr6kv4b77r004wi"; -"lua-uca-0.1"="0728k7rjl3g43j2g3mzc02nwmwhsl5rgw8mr2snjiyh55p07wfxl"; -"lua-uca.doc-0.1"="0r9khvjlidjxgjwziw29z5r2pj50h4rivg2zbpl9cv6i2khp3w7r"; -"lua-ul-0.1.2"="0cz8774npl6rxzb5p1w527qki60gasim7slmmd1qzrcvkwf6wa01"; -"lua-ul.doc-0.1.2"="1jaxvbzyfnmaaj1dv7f9yf7vx8jj058qiin38jwbgwm7kyj6rhxa"; -"lua-ul.source-0.1.2"="0cbiv5qlnfp9svwpxc8sf6dnpxh14cn69g6rq6q5d5pplhaaagsc"; -"lua-uni-algos-0.2"="0yx2zskmia6891ksdnyk67f3j4d9dbhgknzyi787v408g6q7hmln"; -"lua-uni-algos.doc-0.2"="1d71cfj4dqq0dyk3a452vzghw4341drcgmyxhhlx4g3kbm2qak85"; -"lua-visual-debug-0.8"="0qnp6zvfdwc2jy642a42npwjwzlz5nl0kq67zc5ajylc8pvd9xbb"; -"lua-visual-debug.doc-0.8"="0iac45h1d6szsgm8xj4nz9xcd6gwz6c3d7bn2kxifyh1lpxnq7hw"; -"luacode-1.2a"="0qk8vadwymhcm7yw3sffdh9i171hl8vg07j1b5gbsl1sa70cpam1"; -"luacode.doc-1.2a"="11d6ak1dvdx64k0i12k4c5kh24f5vqy0ihvj9a5lxa9gqypflrga"; -"luacode.source-1.2a"="1fafh2nq66cz01jsbkb0mk907sppahlswsbb35pa3q5j7iqjzyav"; -"luacolor-1.17"="170b7537yv0c8g2raar6yf5npnbf21blp16vc75v1x1196mblz18"; -"luacolor.doc-1.17"="0vcjrmxqc67j9kkgm3yqs78qndzskqnbjlwgrshdmdms6lij47qj"; -"luacolor.source-1.17"="0m4hzd0rhp9vychlixr46kx7rahqvrrfi2cx5jl53gr0w9gp1l7i"; -"luahyphenrules-1.1"="0msfn7s35xhpacx745w0zbr6g5pbhhm4pccd5cmqdhq6dh0fjw2w"; -"luahyphenrules.doc-1.1"="0y2rxs5mqyw6cyrmgsqqibsw45qjlzsrcwpd74m9l9d4731nyn37"; -"luaimageembed-0.1"="14xmb1cjqvpqwl33qx7376ndsbkql48v6094r66ksr7vlyap5hgp"; -"luaimageembed.doc-0.1"="0r0w2lzxf4avfsv5s6fx64bw300vnmympfdfzz1k05c5c2kjy9x9"; -"luaindex-0.1b"="08kckg0129ksr8pdm0a2yawwb3fa5js3mkp6jd8f90y0w7acrvis"; -"luaindex.doc-0.1b"="02w8s71qdkxznkmqv7c62dhar2x6ia9zsiwd29qxjf51dpwj3mg2"; -"luaindex.source-0.1b"="1v09zszin9f4k3gczrfs86zv019l42d6khacjdb3qjp2gg8w9qn6"; -"luainputenc-0.973"="1wsz8aw4dyhiw5p7gyf26lcixk1a8czr06akd1h6dwj6s5vq4vka"; -"luainputenc.doc-0.973"="0h6wjb0kjdqfrmzikvbddq4w31d55mxlcl5n3phr56fa9i49qmgm"; -"luainputenc.source-0.973"="1yps04v6fvqspq3rip0c6pw5a5y3annwfaij7w27i53419h83lbd"; -"luaintro.doc-0.03"="0xab7yymknvhsh4c30xnhrlvk798mbnl9fbf7njqx8mbmnv869bi"; -"luakeys-0.1"="1ccdb5pr542lxzazw10qf6dldwdy95p7qdlz40vmv3zqyav6zc43"; -"luakeys.doc-0.1"="0brlbzw6inxgqn5arb6m8a5lw2hrxgiqq1jcjndcbd7hxnzkyz3a"; -"lualatex-doc.doc-30473"="12kg6l5lrq791qnh9gzmfbqn693fpnbp1nn8fddd5ybw6gr61qr5"; -"lualatex-doc.source-30473"="0q34k7x3lwhx2m7n0xl3c0jqv3hzz9zpx6hi5dy06k305qjr2lv8"; -"lualatex-math-1.9"="0fhi53ysw6q939d4slq2ryiw5c9bs7kidar62vphm8d7yag6ny7y"; -"lualatex-math.doc-1.9"="159ly8gyrk2jhn1dvg7ppc6fslvkxkwmmvkir11rhfwyvjxxcs7l"; -"lualatex-math.source-1.9"="0yz17h5bp5pybh2d8h8w45x1vl60xqfdfq8jsg1bhqahxd7c3qz8"; -"lualatex-truncate-1.1"="02plqfp0xi406wya3c6cdgj0777m11fzkbk9nbharima6zhsc1nb"; -"lualatex-truncate.doc-1.1"="0gkgbliv8bzpdk27mkff02v1d03vggyq4nk50yawrimz0k7q64bn"; -"lualatex-truncate.source-1.1"="159wcqiyb5rs9a7wfm5mj5vcqh4kr9gv4pv6w0d7vfylkrlh76nf"; -"luamplib-2.20.7"="13xiip2dddnm12r4q5rb2cmsjxl6qg67h1m5bi00rvrhz64x5pzy"; -"luamplib.doc-2.20.7"="0gf6q2jan1h2nbwwr1cg6rl5gbjw98700cdp58d8q2snlmbf3xjh"; -"luamplib.source-2.20.7"="1j9in4gvhr15xq00vplzv8if1fsipyijb0lpdss6vv5jkg45ps38"; -"luapackageloader-0.2"="1ynqy88drl04ld2lycrpvjj3cxddmbycznfamhl1bmn01c1q9784"; -"luapackageloader.doc-0.2"="1fn9kqab5hyvscjqmd34vxjkdcr7bapgw7w3ckwvlsslxrv22rfs"; -"luaprogtable-1.0"="16jmy3cvn7rmzf5i03x51yp5l90kmrdy0iqg8ji4z3xwrf0iq79x"; -"luaprogtable.doc-1.0"="1d0k83dyiml9abnfc3b9l4n6w18lgm37bijr8xj3chyv04v85392"; -"luarandom-0.01"="08pmalwh5w1gih9f29crnwqx40x6npizpr8vnjmjfw3iy442gbhx"; -"luarandom.doc-0.01"="0kgwqk2mh8c2hkv2x1gzl3a04q7azi0aqcv6ab3nf60ipmq81n1s"; -"luatexko-3.0"="113n3ydasq5w93bcw7hjigi4gg3b21n8cxr13nhashix8f2ramm8"; -"luatexko.doc-3.0"="1jz9lx2gnf5jdb60qavahvy1lbivy0qxnp37slizh22rx88s25xc"; -"luatextra-1.0.1"="1dx2hc1md8csvb37lckxj4987zaldfd73c86y0ni8fzd4zg55s7z"; -"luatextra.doc-1.0.1"="02dl0skcr30hh9wgm7bkdv5zvx3czcdkxv3zdqnasdk0b7r7mqh7"; -"luatextra.source-1.0.1"="1yq5i4v2dxayhfzn1yw987i3zjm6gy4fqckx5kybzh8f6jr9167b"; -"luavlna-0.1i"="19qndfkfid3xmqs3jaa5nxdsh7rg4dcrki9dkdfmff1b03z0pfxk"; -"luavlna.doc-0.1i"="1xv8gzjxl0awaqhhs1ls7lvxy48v8k5lsvxq4lzlvd452r8i82k0"; -"luaxml-0.1n"="0fjs7g0m4fi7cdqlkjgp26k3xn7d1rb0y4ih3vpzirsf4g6arar7"; -"luaxml.doc-0.1n"="07fqr933ndv2ni6h8kgl4nq61hzilcb3cr7nqqyzadzdray583xm"; -"newpax-0.51"="1i4ss5q9afxpskqdvz97svq2535i7dx4a7jhbxi1s50qr8f9fba8"; -"newpax.doc-0.51"="1zwpazpzqz3inkfx3vj0nbh8041jjch6daiqb8mcy80gchq3fcw8"; -"newpax.source-0.51"="1lc8j1s43327sy8wxqhmkvp6v4qx66zmsi4fan15w7sljznwd1pg"; -"nodetree-2.2"="0p3lm3sf89w1amlaxknpgrsd0w65sgxa30avxv5lc13ry25hflry"; -"nodetree.doc-2.2"="0xcb6b8a0w3hv98mxd5lh20yi7l7bm8fi230dh7vgv9rdvagz9ja"; -"nodetree.source-2.2"="14p1zfzf1wrw20b8dsb8ppalw5djqrj2k6xw5di3zbggr3zzjcjy"; -"odsfile-0.6"="03x3kfvm31l8lc0n7bic06xf1ypgkd22x4yv331vam9r8kw2i9wf"; -"odsfile.doc-0.6"="0p5iqdqrlxkq7zq5h8jk8csdsghkc71jhdwqhn151n92zxn6lg2w"; -"optex-1.01"="0s83rnrnvl62sb3c8s9zdh3q9gjc1kzz5wdsbz97kkk1w5x2bygk"; -"optex.doc-1.01"="1lkprlmchcwc7fi1hss724fyw28z5ivyjxcg08ramabhak0riy8r"; -"pdfarticle-1.0"="123b9f0nl8wyyxfnbs5krr5ayrgl02hg9z8w87lj6g0lxch7dfhf"; -"pdfarticle.doc-1.0"="1pg4iix7i0m3smy27xk5p03x8m6rq737kyhpf5qzckm276n88fzf"; -"placeat-0.1d1"="0vmvw0k1s023siwsrl4hr32wyla5xmkvz449p7vlfv1n63383c1g"; -"placeat.doc-0.1d1"="0j9xm75xv0lqkqzm4g8aqxy6cs8vxydmm50vsjj4g4aah7n8jygk"; -"placeat.source-0.1d1"="0118s2p8vfam65fwynf3vabqj4kz0kkw9kbq49k7akwwj1wpyd7f"; -"plantuml-0.3.1"="0pr3i90wdf440x5pdxn695xjz4cpc17y12mkvnyd1rxpw09003jr"; -"plantuml.doc-0.3.1"="1z0pgf56601gyhmqqq2mcil4rp1n6r6nsrvxpw0kra6lnvkppisr"; -"selnolig-0.302"="1xrndff5if1jbk5vzycj2alj72r123xjwmyr1lrsjkpkp6jqjg0y"; -"selnolig.doc-0.302"="14ppr67fbhsqi6d5x0f40awac7j3i90kk7mwrjm1ch1572im5dhc"; -"spelling-0.41"="08zkbw4fdfmfz1pxcr96xjhrs8lfbf6sydp8crp8110fikksjv9i"; -"spelling.doc-0.41"="1wm6r4rhkmxmc66zx9nvvdmjaarx789c33vzm26mbd6ylv5qs1is"; -"stricttex-0.2beta"="0igsjl8gsdld0way8nry9r50ibvm0aj8g46ki547c1jhdgmw67fn"; -"stricttex.doc-0.2beta"="11pyyvsxi2d4dfzv4pmapa2ffyp5fky32823fklcffd2i6jnvsbh"; -"typewriter-1.1"="1cgyi8q0w8j6xywby39g4nprg7p7p2dpgfdb58qr5nsppa2i31m8"; -"typewriter.doc-1.1"="0lz81r7jv8frdgb1aglxlr98cngacacjvsa4wjzwr9cvahc1q5r0"; -"uninormalize-0.1"="0ai1w8n010sq2fmwvp7625dfmmlvzx9d67ji34zwxdl2cyjlgsw3"; -"uninormalize.doc-0.1"="1dksyk07zjmwbzgc7c2d5lz7fkvrllbj1nrpb34vd54yxl4azgip"; -"12many-0.3"="1lh034gihn9gmpzf5sz9anrxqlb7qifaasa98dira5vccizs4axd"; -"12many.doc-0.3"="10f5f3xf2bmrf794ipj5xjsv73j7gqmhgg2fjrdmmsvqij7ljjk4"; -"12many.source-0.3"="01nldk50shy8ynkcjz0176rzkrjhxssi7x37bd7x1gbw6pd32m3a"; -"SIstyle-2.3a"="0w3aywnn3l1yis6h6ck1vnmyfl90s3wkr4ixgrgj1plmxlvgqwpp"; -"SIstyle.doc-2.3a"="08r6ngi4xdvqm3pyyg6h47b7zfwq2fb48d4yf114sggd2ncaksll"; -"SIstyle.source-2.3a"="18g7igxi3y1hz988kzd2bkpmdri6qm513pkx1pv72abfgqi3gvks"; -"SIunits-1.36"="0msw4324hfzdq87rqahl6wwv8jlswyz2jbkx0ph22jx5rxyjvwii"; -"SIunits.doc-1.36"="1zikq0h32838mppih4iw40j8gjy1zphbn5ynhb1677ccbi1vxyl8"; -"SIunits.source-1.36"="09a6fa5vjb79mvmrcjfxl2y5jgi6kxxgk6sl4s9grzkd93id9s1f"; -"accents-1.4"="1xl7fkm5gc36mm0bhx7rm9v4g2d9j22gr5fjxjbzmr6byjfgw71k"; -"accents.doc-1.4"="0il1ccxa2ndnfxn2caz9d4mv39y21rh360lynra7q2v5j1cyqrw5"; -"alg-15878"="0lrzrij15s989hy2j9wi1fzkpzvqjfhmgj6ryry0gy7nk3azhhrq"; -"alg.doc-15878"="1lgi63jx57arpz688i22razcrzarl96id8xf45vznh8iraba3sja"; -"alg.source-15878"="0mjrh4mnx8q9x40vr4csj3h3w7wh3hs8hidbklym29d0scd5rkx6"; -"algobox-1.3"="0xplb7wlbizzy95s4pk1nhl2w1b3g80frkd8p4na2rv7awp0da3d"; -"algobox.doc-1.3"="1bp5b0zr6shhaifkqdliw9qa18ym4s68xfk6k2njjnwdqyrxyd01"; -"algobox.source-1.3"="13cwnl7nxxrs0jsvfrvcy7a5pg8a92qnhxjsbarcx3jmg43d4zp5"; -"algorithm2e-5.2"="1iw3yhdk9nk1y41hw1qcpqiqaxadjc0nf6cgb23kd75ah2cpd53n"; -"algorithm2e.doc-5.2"="19xsi1dgxfi06wxls70pvnys20i2na2y7m2hq8y6v947pc5kbb1b"; -"algorithmicx-15878"="111iyi2j8qnzha97r1grxpcbnfkpvcwndczx043c4gw5wqmrknbj"; -"algorithmicx.doc-15878"="1rb46zi4islfbykhr68rnrkj4q966papin0c5m752gh6kzx5r57p"; -"algorithms-0.1"="1va2ic75nf0dfh0dr576lpgqhzqv5203frr37079q648871zqav5"; -"algorithms.doc-0.1"="0fqif0nb9ypd4sw2i9qsxl81h3g4h0gm0yqq67d5n9wrpic8dnjg"; -"algorithms.source-0.1"="14jgc7vnww5xhnd76cwix5c599sfdjil2i916cfpmsd5yn5qqdx3"; -"algpseudocodex-1.0"="0mqlh4jbjvay1qk2vp7wcszdl3m74ph1p6563qqfr9zf6qmz4b16"; -"algpseudocodex.doc-1.0"="1cxxswskyp7s1iql7g2dncskq6adx6s70iy6b6shjng9m77fbzp8"; -"algxpar-0.91"="048yw7nk0bnc05swjbmncrrlns3gij9a4851fbj9civlc8silpby"; -"algxpar.doc-0.91"="13r04cc5d04ya1c6cm2h9a1f5c62ln5b7zlidiw51zg6200rrl2d"; -"algxpar.source-0.91"="0bl51gdyi1i44j2cfz432z5cf63mp4yjr21cc2hwihyfd9vas3z1"; -"aligned-overset-0.1.0"="04gjl08y9wbv5qls9z2plxx5n4abi4nzd8qik88via4xghhqiy7i"; -"aligned-overset.doc-0.1.0"="0il97kycqgqqimqjvjhnhc2mxy2nja20vlspsqrl9zaah71p1b3d"; -"aligned-overset.source-0.1.0"="0zbaa3m06kfkj7kkv6iy71d20n0kqq1dwy63dwfj4l49wv427z08"; -"amscdx-2.2x"="0ncbf7ss4iwyjzp6lgzgzn3azy5iasl03565kgsm1pcbgprqibgy"; -"amscdx.doc-2.2x"="0nfpbma3cawyy7gw6v0w81maz1jgicb2r4cm5gmlipzxwzl747if"; -"amscdx.source-2.2x"="0jg2qk0a9y15hl4w753yhjff28w9wc2vbmd564lkikvg60b9yiqi"; -"amstex-57972"="0l078b9fkaai7kn2szn5hblqp3amlafr7ha0hjcn48657wsjq4jb"; -"amstex.doc-57972"="1s93yy1v49b9r2zfkdinsp0i70bhmjmrm876srvhgqs6k95f4d6c"; -"apxproof-1.2.1"="1ds9qv2a6klgl0vdcca8b1zm3lyf59amcyqpi89l1rj729p4qkvw"; -"apxproof.doc-1.2.1"="11r9acw77v8i04baysvl8cnhfcqn00hbqrd4mfxas6r8yd1jl1ns"; -"apxproof.source-1.2.1"="1ara6fxxbdv84anb2v81hhvhx9sicjmny10267wbz3y1crms1cly"; -"autobreak-0.3"="0dzr4wbwy018f97kzmfvza9i7m9mbpn97mjzi336sgq440v01hrd"; -"autobreak.doc-0.3"="099vqvdh2djk7fm6y4x5m7cma71b2anpqkc3lfzjazpv15kpnlq6"; -"autobreak.source-0.3"="03kqdrwznx3k65nf5z3p2z6d80rki7w4v5lhdfk8rin3112gn68r"; -"axodraw2-2.1.1c"="0dcls4qqm7pl0iyg7mkflqa2rd86wsafshx41xlg62din6fmybwa"; -"axodraw2.doc-2.1.1c"="1l1kwxd8zq5xxhw7zyig0b8nna4fwr6615h4jjwpywcaqsnms6if"; -"axodraw2.source-2.1.1c"="00nq53ahf63lazavijry572yii3jix1df9c604xnqpga9z22bbq2"; -"backnaur-3.1"="1sj9a62s7mqms6i2gv52dls1jncc478ki51wlnp6j5hq34g8sw8s"; -"backnaur.doc-3.1"="0mzpammz9ic3d56ylxl40b3m8rc0s0ilhzx25h1y781kya0n6wb5"; -"backnaur.source-3.1"="06aw2vvmkl1jprdznc5cwmyaw890csjsbkqmy814ddx6py7pxni8"; -"begriff-1.6"="1hl6jb8gg3acsj6rs1z0w5v0i6ivvas87hij4n64jdwgf1lf02ja"; -"begriff.doc-1.6"="0bd8gwf3ifqkjpr8wnrp0xx78169b8yc1ppdnyg9v6n4l1b0x0s9"; -"binomexp-1.0"="1mx2g0s4y5y9abmj2b7smz0xc2nzyvnx4x3f4h5v3w1x1kp5y0hz"; -"binomexp.doc-1.0"="1yi68q48p39v20rzny1603j20n8k6ddpjqi773955wmh1p4mqsb7"; -"binomexp.source-1.0"="00rmdk466a4kc1492b947q1f97d7cwd2svvc9wr6w1agzz8w890r"; -"biocon-15878"="0g6r8rh12pbnbhddcv6sz9h8wnv31q6jqs2xbj5fjj7vcb46z694"; -"biocon.doc-15878"="15wd9arkdxsh8aral3zgl83627yl4f0wdx2r8b6xb5ivvrbwaslj"; -"bitpattern-39073"="1j01vh1jy41714k3hms4nkk8j5c5d4nizgrm5syi20n8pcn3l9pi"; -"bitpattern.doc-39073"="0a9120z9rsq8pqi33iv7f4j79gimjgxfqf5jhnrnmz0hgqdpl2mi"; -"bitpattern.source-39073"="16bjmxm11kh0ww6ymk82qs947zgavm100nsfnjl60hxwjl3yknzn"; -"bohr-1.0"="1fbrgfp1xnxa5cf5yqk9735wp0qwkjkpf8sv8gdjg6a06mpixn6m"; -"bohr.doc-1.0"="1jbmck8ld3rg0nw5rs9lbnr0i34gi2sxncri2fmcdpl8pp3xnw55"; -"boldtensors-15878"="0nywpj03fzn31fffyfy9plxgq9008hhs2v1d3nsy3ggas5kvrm5c"; -"boldtensors.doc-15878"="1vdj6217qwal5005zsmj0jm32s7scii7nmawljqi1j1a7lzlv86b"; -"bosisio-16989"="10dbj6gzv7z1na2bynrdz9971k5fr2vr4njcnsm16nlhyjzypfhh"; -"bosisio.doc-16989"="1a0vyxnhbbdm2hi8gydz0vyasvzzh3k2scyv2kxx4qbwvv4liyk4"; -"bosisio.source-16989"="12f99cgcf4mphvbqi2ffh7nwj627c5cxc9v8xrcg8nwfxr81h7hv"; -"bpchem-1.1"="13l29qi6w99d47cv0ky9hsm6356vk7n88xkxjx5v5pb6vrg8zblw"; -"bpchem.doc-1.1"="0n8w0dvfqal6k8syw9inaykdj2ndmkjqgg0fi7himam2q5qa36y6"; -"bpchem.source-1.1"="1fbbs8lfzr3nih6m623r1wxdm8vgzfli2q97kp5jl998pz0ipwin"; -"bropd-1.2"="0l7ifzaqvqhk2dr31757ias4w4vzpdz15kma0bj2fm7k4sjx7d5y"; -"bropd.doc-1.2"="080g65q0v34rbfl67mpvqfcwfvr5znwv0rys8m3fys1s9d4yyryw"; -"bropd.source-1.2"="1kk38an662s7blxrnk4nhfvr49aymanj3qcm288ca6kfabg84w8a"; -"bussproofs-1.1"="0d783i6srwanhm806hk0y5igbw99rf5x9anl7ib29pijrqvg8kjx"; -"bussproofs.doc-1.1"="10mn4g6dap1rksl5jnsp8pv3n0hhfrb9imldjyrmiika2d0prfp9"; -"bussproofs-extra-0.4"="0ndqiz033c8dxkdknf7hy1d42y0g2hgdb091wxrvpla7ryawcb8v"; -"bussproofs-extra.doc-0.4"="1bg3sh0r7kqkb0hljc5m3x9gn3wkfyjr9b0d8myjwwyf4g9hzi0d"; -"bussproofs-extra.source-0.4"="0p1imkwz82zwzp0p49a2vj7gdywv7mxr3b6nbmvkpz1n2qxs2hsg"; -"bytefield-2.6"="1ag4x4saicjq5jbw26m39gqfj1sv6661slsp6lnk1cyvn3ym2j36"; -"bytefield.doc-2.6"="1rypz5a1ll05f0k1gzjsrbvlpvmj8k4gc3vr99b1crcnsx94pc00"; -"bytefield.source-2.6"="1cgh261syqgb18f6568q7aq6g2pql45iarpwwf413x29v5vz10j8"; -"calculation-1.0"="0v7f5qx319zrwhy85lvk354a7x2vcainiq90y1jkm5cscs23xqjx"; -"calculation.doc-1.0"="1bk9yqx607vp65ifdawaldcsxm065hmyrgzwyy90wkn4kmyq1snq"; -"calculation.source-1.0"="1y5a2n2asfhwm8jylfg5zm5dy4v5s8gjl5ndizwk1ywwl0am2dxx"; -"cascade-1.1"="1gffas6hpj012cd9wvsw5a24bkw8iqxmp64pgj8rhl7xa0n94hr1"; -"cascade.doc-1.1"="1q8hf1bvq0h9qcc5876ddc7hlygqqd1i99drxfk9f07gc99dpg64"; -"cascade.source-1.1"="1y0drfj70ghw71z6054w364bzgzd875i387x0j8p299c88hjp6lm"; -"causets-1.1"="0l7dlry3np34gcgwn14rzzkhhyf8wp69ffanlyqc5n9v1nzzpzjy"; -"causets.doc-1.1"="0afqh4mhixi7lyzii8z3yx9zndm4lzdg24d72y3cqrym4lzf5dsj"; -"ccfonts-1.2"="1rwzpbv0vaf4p77k4hf9ac14l9sw8hsvvqx5diq9dirsfq2js0rb"; -"ccfonts.doc-1.2"="0wccdc79b4qzm3xcwfa8nbbvcp248xgwhh7dszlxw3wh1ggl2lp6"; -"ccfonts.source-1.2"="0avnik79dw3p1wvrg5rlqcaxr3w06mr5jvyms54ha18l2d63yw7q"; -"ccool-3.1"="1dzc7z7q6m58pdjs99170nv0cs8ddi96nkn57qmgqcyvsz5r3wqf"; -"ccool.doc-3.1"="1b7cjrnza7jh4npn31a8311c2m1hgdmpsrs5wcj6lnlkz3g70bsv"; -"ccool.source-3.1"="17dvd32jjh58w75mlccx59ailpwpx89vbzydzjdmzf1x73vf1x63"; -"chemarrow-0.9"="0vy1y1f8czyp36ssicmn1w2px76x47afrfqjfn024jmbs54fwfxq"; -"chemarrow.doc-0.9"="059c8r7vhs6765h0x0ycqhkd65nxb6sqq7xhi7y8jyb7i6q3rbbw"; -"chemarrow.source-0.9"="1ds3yx6mbwjvhzj6ximgglgccndqjbimprf7iszhkz3w5vxq6qz6"; -"chemcompounds-15878"="05rqpsyf12yrhpnzip0ywzflrvsjfdqhpi74iwpwb98d3q82ckai"; -"chemcompounds.doc-15878"="11264rxfhbf36jfkqdfyl2dyqal86bhjbm1zsy9ps8w4fsgdw94a"; -"chemcompounds.source-15878"="044gavw3i9xsa073bwpg11xy75dip172ih6h2p1mbpp8i7bzsrg0"; -"chemcono-1.3"="08cch2gr35wclm1l0j05lfbjskqw43jzz3aj4wi1dhpm31b855q4"; -"chemcono.doc-1.3"="1kcgfx2clh4x59h4scw5mg035wqr2cp5kidn7f6p2aaf5607xid5"; -"chemexec-1.0"="0yj6sygdzs247fpajjl8gk3c6yhk52npbjahgngchqmblhmhlkc0"; -"chemexec.doc-1.0"="0pqksv69yk7vf622x2p2ah735p0a93agfnfyg8hm2jadwjmhzikj"; -"chemformula-4.16"="1cxg6qf8yxgjjj407n983n3lnnldnrwrlwqzisg588apmdjl01df"; -"chemformula.doc-4.16"="117yw6acki6pkb4gybayvw31bmxgkckr0a1gpciyqm75vb8j8gvz"; -"chemgreek-1.1a"="0di3w4yqnjs49im28g2a2qk31d6cqhrbwpq1jcxykk8am7g2sn1c"; -"chemgreek.doc-1.1a"="065mwb7ah9h4qwqp36n0sdlkjv435bwrljz3yzsgym7a4xqvhfwh"; -"chemmacros-5.11a"="113zzfnrbg20ymvb8lp9dy66krymdnvsv13zs974h0xjwhb2kz5z"; -"chemmacros.doc-5.11a"="1rmyhq5fqg13z7b5nalf2d29y85sz8rlj068kxwby9i8xhz0cn6a"; -"chemnum-1.3a"="05z6i3cva4cq45z280ls3y5hrqk9m3a1v5yq51rdj1ilk3yh1a4g"; -"chemnum.doc-1.3a"="0g0q6a845xgpfwkhi31dg6w2rrza8cgxj925rm5m6mg026rd7v03"; -"chemplants-0.9.8"="0dsyymbacp2ffa9lcn7snb1hzxiz3qzqaziij42knpnag4m28fyz"; -"chemplants.doc-0.9.8"="0l4diz19076ijainyh8gck153460bjn4m0jxyjqki3hjs7f15d15"; -"chemschemex-1.2"="1xs0vmk03pmlw7hcnm0llgq7gpg1wlack2k3cry0fnw8jqi6ls8r"; -"chemschemex.doc-1.2"="1gz7sdykvl3s6c5l1vhx2zyjljqrcs2h02s15nly8kjfcmvcncq0"; -"chemschemex.source-1.2"="0wkrpfipgl4yx3d5a5pvfrsxbp3dh9wwm0i34z2y6cra8xd4m58v"; -"chemsec-1.12a"="0rl9aqh35pr0pr82vaq605ii09cxk73mjf3qs1dwcb51hjz51f35"; -"chemsec.doc-1.12a"="1fh5fplxlkzcly15kwzji7ym1ri8q33rs9k6wpbszyr2przn52sy"; -"chemsec.source-1.12a"="053j5riyl07jxzm2l44ns7wyck2y0680p9p73054szd859q86v8h"; -"chemstyle-2.0m"="0a0sd2sv9g68alicfvm28b13kdipyrlck9ipdb3ybjjsi8fn99fg"; -"chemstyle.doc-2.0m"="0gdvvkfjbzf0kdbl5f4j30cvddfbwiashz520g7kpkv460swvz0x"; -"chemstyle.source-2.0m"="06ws8xqy1y609hzfc90l9zn2i1h3a6yq2hxcg1bfsbsqagh11rnz"; -"clrscode-1.7"="0kk8hsrd8rr5vadvh58fdlzpz29cnpr5nhcl5il8fj466dw0igv0"; -"clrscode.doc-1.7"="08wps3rkrx4isg7abr6icfj9pcnhpnpylnk3wvwb42pqah8975xd"; -"clrscode3e-51137"="1f7p04gaccyynqm0wzfz8jinsrrwn6i4amc51s835gxkjv2d8gwv"; -"clrscode3e.doc-51137"="1kryc0ay3bx1maydfha6wm4qw2l9xprnhs3901qbz904l21yawhg"; -"codeanatomy-0.4-Alpha"="00p5rnl1xcyv1bp2db8a5r9ch00iyimdcmqaj7knrgm73i2cvbx4"; -"codeanatomy.doc-0.4-Alpha"="08qh0xd50snbrr92wrd12w3jdingv4ryv6bk5n2sfxk8mcada2ag"; -"codeanatomy.source-0.4-Alpha"="0h4xj1sqimnkk2bdbhayxdsm8qvqsv3qzzpm91acb16ra7kqw1wz"; -"commath-0.3"="0k3s00r4l8bypv1166p8jkdj1wrx4ar4w0y1fggmpzivqicc02g3"; -"commath.doc-0.3"="1n2929g5jhkrrp7fs237h80571m31dd9x0n2dhnqfgynnc9vasrd"; -"commutative-diagrams-1.0.1"="08jd1dzi1y72dhpwng3p11vw8jl98n9h9npyypgc58n2djla8nb6"; -"commutative-diagrams.doc-1.0.1"="1405ya2nynfbzrypjm7i9grp5k53nvrx11wzg3xy82z32cvds0y3"; -"complexity-0.81a"="062xi5wlg3axhrzc9a6nj068z7nskb7qwwk2wr0fzvsflqa9cp0i"; -"complexity.doc-0.81a"="0yzdyn9j1jk0nsw0l4r06cr4brhz1f3lfxc918zalx6h9wnkxi2b"; -"computational-complexity-2.25f"="10as8msnqa06dp3hp945m42rgbaqsja8z4sc79x7n77z6qzmznvl"; -"computational-complexity.doc-2.25f"="0dq56zzw1xzzpm1rdjkqwhr6v93xiv00c1g2rmlmfj5dnbzng7wq"; -"computational-complexity.source-2.25f"="02mapvsz8j1979gy7pmwkdr6wq55v0al71ffl9bi2bl7f5nsz0vc"; -"concmath-17219"="0m98kyji3v4gg1a30phmn7fwssnnbdvyjxvfpl36lnljnicpg28l"; -"concmath.doc-17219"="1392wq35zidk71vxybrwjq79p2gf4spcv0qqb07dsgapbhr2g0aw"; -"concmath.source-17219"="1zn35da4jlplqg7fb5ibzaah2yh1cwjqvzmx45jxg0hnsc7xmlfd"; -"concrete-57963"="06m8d6z5z3dpj9i0nvp50g6pn9j0m4n0n1j3w94nml137qghawyg"; -"concrete.doc-57963"="06z5hh9ksr9jpkfchyh2zp8b827klb4v282ipizrm1dvlv2r1603"; -"conteq-0.1.1"="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df"; -"conteq.doc-0.1.1"="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy"; -"conteq.source-0.1.1"="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8"; -"correctmathalign-1.1"="0dvgaqy8pkk3plhqlxgkxkiwyhfzwcyn391grbqv764mvh4iar69"; -"correctmathalign.doc-1.1"="1fd32yzxj3l4sp5cp9rnwv3175jz5m5hxwlfm10x282g44l7mjid"; -"cryptocode-0.40"="1kmia37x8w4wlx2yaqj2g9mjxmyafhwr8b3l32j3ri44rs3wr2j5"; -"cryptocode.doc-0.40"="1yfzqvcfqdbfz5mvfnlcy11j6bg3vqzirz89jbxmv27bdkdnh0ad"; -"cryptocode.source-0.40"="0c5d5fj72l7b31590119nwf47vwh0d92s90af1w7l78ncr5k37aw"; -"decision-table-0.0.3"="178vrp6436d9an3d1v4p3s8fw1ifi9hz586pbl9qbnbg09x46fyv"; -"decision-table.doc-0.0.3"="0hwi8a89vgpz2zb3dg39gglb16250aiip3j9gk7bayr2gywdd9xa"; -"decision-table.source-0.0.3"="0jki68fx6sw818700gcdz06flr95xfwcvcmdhw8mqxivm7h9rff2"; -"delim-1.0"="0k5h5wk4fn4qzhjcgraqjzf6ggq7rvr8d4c1j2vwxi37fa83642b"; -"delim.doc-1.0"="167hklrsm9dh68nvl6inqck07zfg8w4gr9p5c2n8i6y6v9xlj3q5"; -"delim.source-1.0"="1xh63b78kxngcc3qgzmcfrf4pw2saipw054pzq47vp2ajppp1sq3"; -"delimseasy-2.0"="013r0cgz7ivrjfhmpcf5rdfl2573q35qmw0bhprnamij2jpvggzr"; -"delimseasy.doc-2.0"="02s406bh59qy6g8ckpxhgl0b4xxyr4zf91a6prhzlmbbhf96xbp1"; -"delimset-1.1"="126ax3z4c36z83479zk56jcvdj5r95y182rv42wkm4lm6sy8v24j"; -"delimset.doc-1.1"="1mb85h29fp7nxrkfylfg59jbvjva7lmr7vvgd8nz7k09w1gf4x0b"; -"delimset.source-1.1"="00hp5f5pfad36n4lkmra8mc2n0ynnq9ynnspqfb9378cx3m81cxq"; -"derivative-0.98"="1kcjldvyyrlqh2f3z2x6q0r8km0ly4l1kz7kmpkp0x19dk2lh1r6"; -"derivative.doc-0.98"="07h6jk6yly17zl6a6w3s5l6dykzhvi8dywvhv8krkgakkm5157jf"; -"diffcoeff-3.2"="12k33yfzk814ans730pj9q6h8valvaa11b87f73zn6cd0qyljpwx"; -"diffcoeff.doc-3.2"="04ffwi85qva4r6adddp1hkd28isv5pcrazsj1rdidkagd7gg2q89"; -"digiconfigs-0.5"="1irv3jc87bpnc289r5zh7pgfdgk4bvfwbyv6666kyq8f8yl7m1kh"; -"digiconfigs.doc-0.5"="0fnibq45xgwrha5vfav8lylnb6p2i0brd2k1yp8jm8id6xdsxmq8"; -"dijkstra-0.12"="18gg38x09m7xi80wkpd1sdlk9p1bsnlcx84s7nc1wpar88w4irrk"; -"dijkstra.doc-0.12"="0qr39gb0cwy4kisddkphw8j11j9rpm104af5cpxdcd7w0kljaidf"; -"drawmatrix-1.5.0"="1806y5cdgnj61fy0lilm424x936dz2q5f2j2s3w71kzl5ivyf569"; -"drawmatrix.doc-1.5.0"="16pql717cz27sic494xvmsw2mw9jxn71xka0k8fjys8j52pklqnk"; -"drawmatrix.source-1.5.0"="1x8lc07xccf73vcvywmrqk8ivg5xb1g75gqhff12zgrp2vqzh6g7"; -"drawstack-28582"="1lirkdnsp35l4dwsir1xyf4a2s608ymfc3r0hmgg9phiy9i1664z"; -"drawstack.doc-28582"="127c98z547disxksvhabrpnddrp5ax5dwbgy7nmyja2dg65yax9i"; -"dyntree-1.0"="13imdfv22qsy9jq5vksi9qsx8spcc6h2v9qlc6an9p93cq84fwka"; -"dyntree.doc-1.0"="13wn9lyjqds36ff8lyv125i0qqqqg0az71h7g871zylppfy7iqyc"; -"dyntree.source-1.0"="1r7g555bhgkx29hgp78v31nljg9yaz3fjjy9qbk9kvz6wcphim6l"; -"ebproof-2.1.1"="12dqzyi84jlzm75d77crxbwv2nzyw8raypdj60bjrn6kifav7v0m"; -"ebproof.doc-2.1.1"="1d6g3v3hskgd9wrddkhf7qxg160n6qrfgzxfswajswk0kg2w3675"; -"ebproof.source-2.1.1"="130d3af0n0gjvnm0ad3g6pm8dy1w8zp0q7im3gv1kqbm7k5h0hny"; -"econometrics-1.0"="09zlc6943vf9r2n096x6s0xwbyl4lnpcv8a1hmn81s5czawkrqbs"; -"econometrics.doc-1.0"="1bv3m38gp92cdwhvpwrhs4p34hrmr8800js6myif4r52gnd1q4mb"; -"eltex-2.0"="0k782lxa85dsmqbcw5q8gdny1lygfsv5h2d1d70f6y0df17r57ad"; -"eltex.doc-2.0"="1hshzr96sn318b7ssv6f5md23v997xahm2232c3kns3rzpfssy21"; -"emf-1"="1w7whsff28cf3p0i8hii1lklb8i541di3g4z5iv2rfm4xa5m6i2s"; -"emf.doc-1"="04qq6ljidaqs2i4lxp3m1varm232rhd026qirvr8q10vpkd6grad"; -"endiagram-0.1d"="0vgyl6rbgrq0jslb5k1796hlnzxjpavl5ab6vj6zizinr2rvh0dc"; -"endiagram.doc-0.1d"="1gz8ri82sx9nn2adb7sv434im46cb0ld9r4j9fz07kqn6gxzzr2j"; -"engtlc-3.2"="14lz7dw8wgksbihdvga2yyqa3qxbs382s5pzrfycx9z7503dfy0w"; -"engtlc.doc-3.2"="04lv0x4psfpivxfx5asf40pn0d80cwfwc1pwl21jxihdvc6jhihf"; -"eqexpl-1.1"="0q20g2zh9whs8vpc2mqdxpyk1223jd1ygvchrw2p71d17xhxj45m"; -"eqexpl.doc-1.1"="0bryz6gxw08nx7h1b5as1s52i8zr9l95zlfr4gm98n3yzbr3nzx6"; -"eqnarray-1.3"="13vm2xqfm36a1fpljchnmjnl6m4fia8x5bia0h0yxh7yw740vbzv"; -"eqnarray.doc-1.3"="05vh8d0yyqhn7d45ykrql4dbn07f8yh4jmr6qmx1mkhyiz44c9x6"; -"eqnarray.source-1.3"="109ds6zn3nl17kb4z6m1xpa5ds2iwqaxqbf5jmw54547wv34havy"; -"eqnnumwarn-1.0"="1mv50r9g43si8kmdmf3kgcjmw10kzipq67ssd3vllja4pn9yzmz6"; -"eqnnumwarn.doc-1.0"="1ypvd357npccz8vbbq8ss92cmxphq16isvw4ax0ppgxp2bh7cr4g"; -"euclideangeometry-0.1.8"="1yra81pj5irg2fd4m2d5n9152rlghp8rhhbx3z66syxg20i0mszs"; -"euclideangeometry.doc-0.1.8"="1c06vg35mb637hw1viaq08f2x1mi7nbn1y53h72k6sg01a8yzz9s"; -"euclideangeometry.source-0.1.8"="14054b687yrgdmwx4dgr3srjgm6ibw2fdkwbbndvcr1k27zalib9"; -"extarrows-1.2.0"="151qmfsqqj516ky9j4wbzh1618r769b1bqn4rc5fh51p1s28k8f7"; -"extarrows.doc-1.2.0"="1iw3750iikf6dc6kyid86r7kdzkpi1z4la4zlj63z26fczivif91"; -"extpfeil-0.4"="0n2j976a2607zsgf2cda5vljl497c1562rn7cih11h6vpx76jx9k"; -"extpfeil.doc-0.4"="0irjpxz1zk30myk0h1wjhzcxdpyqjfzxj0lx1nz56v4f157myn50"; -"extpfeil.source-0.4"="1yf2kcx73zp24wrjb59zd1f35809k52cdwym9xlf5fy32rh69y08"; -"faktor-0.1b"="078fxihxiy9bnszy2nj5ca8ys9hhhazkawwi7x2hzwfh3n4dyqz0"; -"faktor.doc-0.1b"="1hj13l2g7za8n3bkxmg04npi5fnp4jv8viyym1076wify7hrwc73"; -"faktor.source-0.1b"="1r8wksjr0q1nm118fzkn527lak31j3sjrbsahpdmvxfir7936njx"; -"fascicules-1"="0zlkjn8kg6vb58xp2xh7jwjk6dmk6knzqh8v7lrdbmzhw9j28vwb"; -"fascicules.doc-1"="1jkhj04gpwcckp9zqanaa9zhplgs2a5xqnn2xf6ir6qifiv3403y"; -"fascicules.source-1"="0d7crimrdcxlh8hd24qfwqnadxfjsfrfnjr4hx5rrj75mm946zmj"; -"fnspe-1.2a"="1w5ibha9cxychlvqrbj2v49kizc7hg14lhn1smky2m9ijqrrdwyn"; -"fnspe.doc-1.2a"="1ix8midc7hy8443fh3vkrl875h1v9hqfwmgjw750gdy9x7y06fmv"; -"fouridx-2.00"="033f2yhslmm70byg4pkw64g976vgssc6yiizmh2f1chlfhsz1qhz"; -"fouridx.doc-2.00"="1k6zirff9bqbz7assfrlq0r83bjqgzblgxix7697lmp6ww2rj4l8"; -"fouridx.source-2.00"="0il905sqxqvqk0fgsns3yb9hjh740h69imykxd84p92fndaha5mn"; -"functan-15878"="0vxwabhbnw3dlxzlqz4yi4l4iw17a0w7lj3gh2q4l3p9lhzr9qmp"; -"functan.doc-15878"="1jxx1inlzrbzm784zwkz55ykdqhn9ncz6cixs2wqh2sx1dih7cwn"; -"functan.source-15878"="1a2x71qhjdr2ayii65qivjmwmxzw6id3vljd8nv3l04xnp6p5dnq"; -"galois-1.5"="1knks42bg72lj8nqdy2iyaqkq5a76yf4zxql24mwxq5fq5xv1vmx"; -"galois.doc-1.5"="1nqhf3si1kljbr0s1sb22kq6nfrp9ycvm6smiyxbw5lyl3spqkxv"; -"galois.source-1.5"="1rlgf9bv4rjkyifz3xvvkv6xnqxl0pl973mq0zqxaiqfkh0i5xwk"; -"gastex-3.0"="08xba3pqif87wn23vacj7amqi97yk2qgsmmawpm3r3iirir2l1d9"; -"gastex.doc-3.0"="1b5qvkpvdlsq85yllixs638p1bwv9xfqy2mkzyckqcwfcdcv7i21"; -"gene-logic-1.4"="0fxddiswkvfzbmcckl6mhyipxjlr0yf0579i792c6rvrqs5avyak"; -"gene-logic.doc-1.4"="1nd4bxrq1g1gxcrs9lvnakaivla37p218pa4ns6jyjmimfl31gxi"; -"ghsystem-4.8c"="02hvpf3idwmm4hjkbvcz0w9n6sb6iy1xcj0iiqa51fzg8kimpkzj"; -"ghsystem.doc-4.8c"="1lld29kqvfgl4fmj70z52l1b5sqcb3fr8d2aim5l88grnypn9gb5"; -"glosmathtools-1.0.0"="07s9jh24m9d9y01kk6z5lw9acri8g8vjmfw0mgdw3mwpffmba5mx"; -"glosmathtools.doc-1.0.0"="1ya15q1nb7xzjxq7cgnl9q8pwfr1xbih6shd89krijr2l3rrycws"; -"gotoh-1.1"="1k3z1b1nyyk4jr2aj60d9p3fvx9ijpi21780wbbzmn5gydmivvm2"; -"gotoh.doc-1.1"="0kcx815006v0azrn7vvbldplg7z4bgsibz921k20pdz2fqy88lnw"; -"gotoh.source-1.1"="04frszj42vxnn5mf0mi5izwqw7mh57w0npp6n77kciyk84qjca7b"; -"grundgesetze-1.02"="0nl7qj5h707mzwr57rz2jqar5p26fg8ba14yp5bm5zvih4s674q6"; -"grundgesetze.doc-1.02"="0a1dfdac2hpfhrmlw5gvvi22jklcv1g9bx50n3pcvhw5jxcsr8zz"; -"grundgesetze.source-1.02"="1mnk3iab43846akkgvkfjfd46kn7ax7wg5hvb08k583bppw8711l"; -"gu-15878"="0h37ilpkqlb6z4fdjldnbwpz2j15izz0wb70n4zmmp2162qqbjni"; -"gu.doc-15878"="1gx36ngw3mbbw9i2xdi2glx80xfvj6pv5frh6fmsqlnvhgni13nf"; -"helmholtz-ellis-ji-notation-1.1"="19szfdy3r6i0ayfr4qjv99dy6h97pqcfr08xhy3v9kzqm4d2b5nb"; -"helmholtz-ellis-ji-notation.doc-1.1"="15d4dil3r44v5xds0n1lnqml7cyncpyr92prb56rfaav669hflbr"; -"helmholtz-ellis-ji-notation.source-1.1"="01zdhy1p6idpksjh1ak1lyw9j536bzr130bjgay471k9d76n38dr"; -"hep-1.0"="016jjvmmc679sk23dy0g09a0s0n176a5pyq18snvi9xajh2c4xw5"; -"hep.doc-1.0"="0czpwbhpgpbij9b97dlb3qq0aa9vyh12p81sdm0hwkj3i16yawav"; -"hepnames-2.0"="0almnyzzdf0q50r6qi7i6c4pp9aakyzdzj2jxkj1y0h5smi602ii"; -"hepnames.doc-2.0"="144wikhsm6mm6f459r4paf0chas0crzvd2rylpynhsmkp9sk3fck"; -"hepparticles-2.0"="076w3wmdywai4pc02k8nk0qyc4vmvn9x6lvidmp4z6as0jir7ydh"; -"hepparticles.doc-2.0"="027pgn4i7n6b2zk8ikyqj4wlkkw1njq4qcfkmy0bgqz3al08zr0b"; -"hepthesis-1.5.2"="165n2pwn04vsln5xy6lkg61c1bp65zyqsd37fmmd3xs7yhv7xc2d"; -"hepthesis.doc-1.5.2"="1cql3rp42bb5c33sdfip69g9rd06107zg6wmsmzkv8c019xwg4y7"; -"hepunits-2.0.0"="11szf1jiralk8jdp45bzksgd76bxcf8xgdk707spbyqf6fzafrz9"; -"hepunits.doc-2.0.0"="071xs04zgnw5ir33qzfn0wxxfsk75d9di0ssl394ksmrm14ny3vi"; -"includernw-0.1.0"="1w51v1v8x7wzibcy40ss7ldra83wbil8w1p978yvs5kzbky3vw2f"; -"includernw.doc-0.1.0"="1zl5fsgzb7nm1wi6ddc3cngqj3apmjwn1wkmsz785nss56vk9f7w"; -"interval-0.4"="04rj730lnkgj4xfm3mldyyf6bb6rr1f3dhms0rnaiq2pzv77cqyw"; -"interval.doc-0.4"="01ngbaw0lbh4dn8kk1vnv49isd7wk8gjh2qvzw6x9yk9nl46gzla"; -"ionumbers-0.3.3"="0pfs5064cya5i6h3bcypsm8fy1bas542kpy742gmbd4rdw8cbxgr"; -"ionumbers.doc-0.3.3"="1sks9qdrl5kivcgn9mgrv3f2gfifmp3icc4wjha4n1va1fqcqcma"; -"ionumbers.source-0.3.3"="1nimrr8b242h11nfxi9si1pg0wc6c0aaa0dl23hjjci89n8y89aq"; -"isomath-0.6.1"="1bzw4l364z6avihhihiprbaslnn49v1rrllf5cj0cg35r3jppz3c"; -"isomath.doc-0.6.1"="1d77wksfk5pidb24cjgak0mv1k09dqmszksrv4q997iwxkwckkna"; -"jkmath-0.1"="00nh8cf002lysvn6qiyy5mcs2n2z5ppr0x5vp1akbz0wwhkhw9h8"; -"jkmath.doc-0.1"="07n2xxfwk0krbiaphfkkfnc8mgc8iqmmmdiz0cj6s7688rlwij0h"; -"jupynotex-0.1"="0dir4hbh5sviw5spsh80cms12rppv3wfqp8cyg5fxkj65mr3akni"; -"jupynotex.doc-0.1"="0xar0qf1czdpzbjn13x2hwrby18qh6s1909nv2q24rl3nrrpzpcc"; -"karnaugh-21338"="0a8bbdd8khib2bfk4n6527d5ggx31gva1fkqbfw2jwc5194rk360"; -"karnaugh.doc-21338"="0n9jqsfn3v78flgqc6ir3w0lymh1j2kl2pcjxq4wnhzgjy8blbq7"; -"karnaugh-map-1.1"="1762fik0bi2530ws92jqfg3bh516wn9pdcyjy6wq2pr3hw33sqfb"; -"karnaugh-map.doc-1.1"="0vpa9xg98ab29lswrwh50i40q7zkkfjcg8jahay7mjbc1w7k882p"; -"karnaugh-map.source-1.1"="0f42riy86dbjcpls7ic4j9z26xqg8310l5r3n28x605jsbm3bwar"; -"karnaughmap-2.0"="01b0ndcd6vcg4y6v4zbi6cymfprv0s4vhh20hwlghh3wy5aknwvl"; -"karnaughmap.doc-2.0"="1xk80qqqpxagvwp1vfh9vgrqihakp7bkd89alb3j9bqaikgdiqdf"; -"karnaughmap.source-2.0"="11b5bjdccy4p3w65268c8im3c6bam9ql60mik8pifwfbn36bhpqd"; -"kvmap-0.3.5"="0ph45hs3x468lhrhsdwikqrw681y9zd3q0b5r088lrb8wsc5pd40"; -"kvmap.doc-0.3.5"="0n0ls3c5w662f95yam6q6rh9gv0vdyzf7rmnkd6dgz5gl1z99q1a"; -"kvmap.source-0.3.5"="0y6mcxixqyqmkk1iq0ys2i174ki4ygss62fx435lwm56xff7mvp3"; -"letterswitharrows-53709"="1d1as1lna9zhxmwvldn64wvkakcnhbr8d76f1cb9lc1s0j6gy493"; -"letterswitharrows.doc-53709"="06awkizz1i7z3g3db5ri67z2nhgccq9cwv97g63q2fbr0zwhps89"; -"letterswitharrows.source-53709"="0a1svwqw035fzrr0n1aybxwx42csdsmkqk8dmygg1nqzkhxcnmw6"; -"lie-hasse-1.0"="1bqc4gpk1f5b7afsqii6ny1xyh4zpc5347v0xv618svjh7dpyzpx"; -"lie-hasse.doc-1.0"="1jfrig40w3ac4j6y8aiwjyvsv9q8lvgvn1977f2yg12lsjdzcpyg"; -"logicproof-33254"="10b55lwrrq1aqmp9njiabqg59xdrd5g8skbcrlhs621s1999dq2g"; -"logicproof.doc-33254"="119zgxwx0q6c4ghpb30mvpdwrpr0xvk54hmj6qfpih0kxj0zp1az"; -"logicproof.source-33254"="19j00a28pz5dp29sx61dnrpqyl24sx9apf2ck334ap5sw7awnc70"; -"longdivision-1.2.0"="12cwjmn61kyzvi4p71n6sndw91x43pkcr959fpwj8wz09frva5j2"; -"longdivision.doc-1.2.0"="0vrx824jwwhq3p2p2yl2q60ssv1zlkj4ji4psypj62kfw3vnyh59"; -"lpform-36918"="033w5cd8z7r02h4r2p8lha6z81qqvky69a7aiahjpd15smss4wjp"; -"lpform.doc-36918"="0vnz4simqdsznciymkqyy0cpbnxfpkd54wdrcn5ra257a37x1f4z"; -"lplfitch-0.9"="1qjj043c943pj0pvzyhs152795zyskcrxkkmp49jxxm0hi8ww51g"; -"lplfitch.doc-0.9"="1nq554c0vjmcdb9xyprjvvvcwrkbbh8s1x0ypkzi0gqds4m4a38p"; -"lplfitch.source-0.9"="0cc04s2ndbs8j2xg4afxxyi2l8mmnxvgfaflak64v6i92n9icfg1"; -"lstbayes-48160"="1kpkr8xd1k1iinrp1ljj1wjphn0c58l8f6hci0axvxdklr02s3h3"; -"lstbayes.doc-48160"="0x288aij80j9vy6bscj3w257nj0y3z1hf0rf9yncs13jsxr8rz05"; -"lstbayes.source-48160"="1hcgcvnki1xkh4ni6jqcazl0rjbhfmm6gbgsp9n5qavdgnv7qzmk"; -"mathcommand-1.03"="1wvswr6dygg8piyrbvmd1vmdcwzy21wr4ij8xc8rl1fg3nkpwscc"; -"mathcommand.doc-1.03"="013i0qbw40n0nj6l93f6n7hqmjj4q7bc7s35imdb79r8favvwp88"; -"mathcommand.source-1.03"="138lqlcadfnydxyaqi20qzacd363avji0c4pygnc0m9xamxxxv7l"; -"mathcomp-0.1f"="0ciipbbi89n9aakg86czfmasfnx0k6rq7f8v0wkxk3zk2m441cb9"; -"mathcomp.doc-0.1f"="16q0b81y748qnyc2gycrb3jhw1i5yphmf6rpivwikzpk2nrg3ndv"; -"mathcomp.source-0.1f"="0xdivrbkhn1fh75ws54i2vxgx3xqaqkpfjir5q84vwxgmxfv4cja"; -"mathfixs-1.01"="1vvyka8kilv92hfsx8ahb200cl50kp1r4qdiaqgzkjag5kfxy1ka"; -"mathfixs.doc-1.01"="0gbh6yicv1mf0llfipqymy930zpq9jqc2ix2gfbjdh909l1y34rw"; -"mathfixs.source-1.01"="1k49pdi4kivk707i7fb2banj0qaqc5qx8zl2l8b41i6q2ir90a4i"; -"mathlig-1.0"="0pyaqwr2h9knxf1axi55vm6wr9xj15d5j5pagb2011k3b830f91b"; -"mathpartir-1.3.2"="1a934cglbiahnmqxjg2695rmp8fxlg3m19zka8ayc743ckv92prd"; -"mathpartir.doc-1.3.2"="1aw9sbhgca7hnshkd2vyzf5lrq2xql25mwp9qyishkzq9ayv7p13"; -"mathpartir.source-1.3.2"="0bn3zragwja3hh32fbrsdsswlf07a8i6qrpnv2c1c47m86xk3764"; -"mathpunctspace-1.1"="1vlbw77bqi0qlm6i6hk0kz1syjzjk41mmj9nhnsbm3l8f5fy44bp"; -"mathpunctspace.doc-1.1"="09m2w7pzcahncazlw16c0bh6v3xgnm7rqf71lpvl8p33krasaj9z"; -"matlab-prettifier-0.3"="1q7i44n15pvpc65k41nw6z8gxj0nwk39mhafnmsibxh41yyxz9ns"; -"matlab-prettifier.doc-0.3"="15x6lbj54597f8wm0vgf0yy0iwh7g7xv7cnllnay651zwg3z7h9l"; -"matlab-prettifier.source-0.3"="0vr8cll1v3hgikrng1rilqb5d3kbggcmdy92hsdnip7dr0hxc39y"; -"matrix-skeleton-1.0"="1ixn62c0jj73wjh41r5p5vazhpkh1pq5lp1hmzlch74cynw509h8"; -"matrix-skeleton.doc-1.0"="04fm0506pvrqw11lpsdpjn3386dnjmn49g7lhjhbz4ny5k42ky56"; -"mattens-1.3"="13rjfhj9im0rag45b8dlp9sxhd8c77m2qhszdxpg1myagzhqi81m"; -"mattens.doc-1.3"="037kj0fhgy66mcpdwi5hkx1gfdsczqb9hd6zdn3gfid0cm3kylsq"; -"mattens.source-1.3"="1brp2vf133py1a1vbi6rz254008pxi2q9ya6igahfbkj8mh20cqy"; -"membranecomputing-0.1"="0rr1wxfv1ry1dvv7bigcvvfv18s1pxq0nng188c5khnab25js6dc"; -"membranecomputing.doc-0.1"="1agmb82bxrzf9dxh93vd2cxjkzlyvl9h91aav29d02774xm7zqhx"; -"memorygraphs-0.1.1"="1ph43wp3h3pz5hh6dp3n6dzmmbn0fw11w3v2fjf6d07a73jqh97j"; -"memorygraphs.doc-0.1.1"="1k8gppgv5kkx7i799mwc9iclp2rv9hgdk2bwnqcyc3j3rmnpyiwa"; -"mgltex-4.2"="11xl6nw76hana2mdcq7m4h6kx6zx91apxcqkgjczcw9f7ip6m3cl"; -"mgltex.doc-4.2"="10jqlxxdp5kszxpwxyjf5mqaz6pzbp559kdzicm6qvif23cfgacx"; -"mgltex.source-4.2"="1pdlxf2qfyzm3pjjpl0wir4sr255lqnspbsvxfy7wz78aii2ik5y"; -"mhchem-52662"="0cp7dfkry418kb0md1bvkv5b7x8m5r5ygj6lnz3arym2fzmmrp7z"; -"mhchem.doc-52662"="1n1zviwdcdlg33lx8k6q3q70ccjqhk15dcbnvxrq6mh7hs5d61d6"; -"mhequ-1.7"="0r670dwmnr70dwxq4si58km2znp1dj6xy40w45q0bdiqzs5rbc8r"; -"mhequ.doc-1.7"="037is4p9k9x9my8migiiw6n5yzrb9zfkhhyjjgmh855fdnsri26r"; -"miller-1.2"="1nk31l9g231c3dk70fqph444z9x5rdjy6g7wazy4ygl3q4gfh6fj"; -"miller.doc-1.2"="1vvxnbbjn325y9s5h7qp6v2z1xy6wwppwqv6iwdak7mf47gww2gf"; -"miller.source-1.2"="0jpyvjpaqz1x5avqy1dzf22qwss7ksbp917ncmgjdxhj82jhy2d7"; -"mismath-1.8"="1c54n9sa0ksprq34f8a9k856a1nmgk1wyakdliibxgf797akwwns"; -"mismath.doc-1.8"="0xp93lv93gdd33y7g7izi92lkzs1gxaqd0wknyg35a0pxjmgpi8n"; -"mismath.source-1.8"="02qga9637ncaxggwpqnhf3720jwxg8jqqf4qfm271illi07hl2z6"; -"multiobjective-1.0"="072zpfc1achwj0b1dv8yskdcbg92a2imnmn9z492l7xxyz889n5x"; -"multiobjective.doc-1.0"="161nkl1q2kc91is8y6h2j71hnbly6hv1fjfmlhb50xypjgrv1ibs"; -"multiobjective.source-1.0"="1nps6rl8di10mr5r1hd71svlj0dxd51bk0plszk094a3r3l6z4z4"; -"natded-0.1"="1vxqyyfrmrkwyzil0a3xvlrmfzyfxdkfl10rlfzgwdwd63bb99kk"; -"natded.doc-0.1"="1anh6k76h573yci4lcw5wyf552zfqdrf75vpg19vrr3nijhj9k8v"; -"nath-15878"="13j02zq77fv4c5f45qn3hgb7v20xi0d0dpj0m2pfdc7fj74k8ib3"; -"nath.doc-15878"="1ppyrz9y2hkv6pq18w4chm90f9x9d3qscw679281si2phmnkl1mn"; -"nicematrix-5.13"="006xrx4jjayz7c8ingrhk2j1s0zd5hgjp954w29ql7bx5skrzf50"; -"nicematrix.doc-5.13"="1phqas7q2c71rbg061rn8ws46y2g6bqafsyz15imi4nxgrwjz6sm"; -"nicematrix.source-5.13"="010d2nr7zaczzv3140r4sf9ry8vij4cfjyxndvz3bxaipqnl8br9"; -"nuc-0.1"="1918fk7bh6pz1grm1655fag16i0ir67ywcx28jsggsly6641nkm9"; -"nuc.doc-0.1"="0r4345bpjdb9f5gmcdjf6zav64gab5f9i4nfql01yg7b7mhk487x"; -"nucleardata-1.1"="0rrxpz66rf6g9cp6ix4rrbjqj9s357qsbv87dhri62iy3alw5bv9"; -"nucleardata.doc-1.1"="0kfi9c6isdlf188zsk2yx38z43zjzxf8fhvl3hm2y87di2kihdax"; -"nucleardata.source-1.1"="1lai682rycff3hm954x482hzn1mq1lrik3g1fwkbm73s99nljyj1"; -"numerica-1.0.0"="14pccmir9j8vyvhky8awcp7y5rs8lc1l3bspw286lvib6k41rs0g"; -"numerica.doc-1.0.0"="1v4lpvkzxlcycphdaqy4bra0x7r04xjxkw334girhgbig34s3r4b"; -"objectz-19389"="0s93jjwcmyjd126wmf2rw3776jgq0ldk40f269cp29968q00sfn3"; -"objectz.doc-19389"="1qxqphnsgh412lizx6jij6qhnlx1d558bzd3klqf950bp2hy3cm6"; -"objectz.source-19389"="1l8afdawrrcnbpqdhjls28ncksg8lzs7g59viqygwixwplha0fb9"; -"oplotsymbl-1.4"="1x5wqngjdmc4751ci5qaivzgqynmmg00kg2clngxjqf48n4fakdd"; -"oplotsymbl.doc-1.4"="0bj6w6h4g991rfddmrxgc02090vay2h2qjx36cb0hfx55gwkmh3b"; -"ot-tableau-44889"="05pg1sn48m2h88wl2gw0lxrf7magnzz70f0ggsidjzdbmg01l7bv"; -"ot-tableau.doc-44889"="0b628crydy3flq7scsv3s6anxx3fpnjhiwq12v6yqjzdanh1f5vn"; -"oubraces-21833"="1rhavggv1c50krafvh7lwnvarh7lh59x7lwkipw24qakq7l2a6mg"; -"oubraces.doc-21833"="1bw3b54cn5dk0j4diq8qxfba0w3p0f78h4kycb2bqd2gq7258vyq"; -"perfectcut-2.3"="1hjppa3dv8a5740nr5jya445y5nb0nb2z1jlkqh386bnvgby8393"; -"perfectcut.doc-2.3"="1ly3zrrrfb3jihf02p2j5ym3m2gnr18pf2v5qg8rsj2l258xlark"; -"physconst-1.1.2"="0078ggfyyr2vh5ni05la8jaxnyxaz2jn0rlahwkw05ng1h5nwl0s"; -"physconst.doc-1.1.2"="0d10kzi278b6yf7dvm3j2nsks43jm6jfjql5jyv51l8bq5grkmr8"; -"physconst.source-1.1.2"="1qvhif2amxfqvwj6vd82f9mjgrk79crnz4sw5v19v02xzxv66fsj"; -"physics-1.3"="06nwz84201w9vky4s877fsiw4pk1kf6iq9yp1jcap7j57nb4l23j"; -"physics.doc-1.3"="09zmpxkrrv9j2ip034vqwblazl4kyprvp24k0f2k0xgc4fja2pqn"; -"physunits-1.2.0"="0fzx8c7sgd6incgwdbzyd3pb9dmdajb3qdfd3mj8sascilr0c2h4"; -"physunits.doc-1.2.0"="0ha1zp0lzx2q10m0wp492sf45pw5cfd98s9pnzn2wxx3k970agf8"; -"physunits.source-1.2.0"="00p7p4hh49i9xwnfd8y7nsgxajjcpdlxw1asyxb8q20x1w1wy2cs"; -"pinoutikz-1.1.2"="1kj24i32ql4jfhzfxyrcj0nmyyhf4ipic7zdzcz71za6njqv3gql"; -"pinoutikz.doc-1.1.2"="15farzmd27gp8ms5vck6xcjs0cx7rp47nww0shs6r0b0l99946m1"; -"pm-isomath-1.0.07"="14rjv3xkjpd5qszczmn1pqn9g70qx1xc137y3wxwi9p39rqwdfbb"; -"pm-isomath.doc-1.0.07"="19vra984m1gkmvbp2ih6nrfgcy9hqg761k0s795x1arwcl36qrc9"; -"pm-isomath.source-1.0.07"="00yi8a1a2rzrxkx4gvy7gmih48xd3pv6l43yz7hj8921n1nz3akc"; -"polexpr-0.7.5"="1wsnbcwgkn81jmrgifkhqyqxgm7bna2psk2dgscai9wfmgpj70ab"; -"polexpr.doc-0.7.5"="0ymb8l7dg6ilv2x9570kf9sy50c6j8d7vpflv7s2k99v682bk5fm"; -"prftree-1.6"="1sdb56cvlfrys3f884hg6qpv1nwd6ywfyiq8168bs78g4q2ah4by"; -"prftree.doc-1.6"="137f5nbcm6p428an3v20j5cx5djvdri12ph07czj13877pjy9ccf"; -"principia-1.2"="1ar643rfr612dx8yam9qwcqj66jqphbqf1rq7d2k2ap7m9k5y95x"; -"principia.doc-1.2"="0qya8p6arna3jqvlys3qs78pnl6q574j92z8b54668s7krja22r5"; -"proba-15878"="15d8n2ik6m5sc4vlp3k2w3h5h8h5s4agijgcnlkmklw3qv172vii"; -"proba.doc-15878"="1m2mbbn1fa616dfxkb7x8azqsvczyifygjmbblsyfkd5kl6f8dwp"; -"proba.source-15878"="0wbnfa1i6vbpbq2a4yhsvpyifiw1pirz72qasxm1nwmgfg5dndx7"; -"proof-at-the-end-51194"="1z6288wnaj3k0ql1797l6c72nrzrvg1x8py46g93q0awlihka6cs"; -"proof-at-the-end.doc-51194"="0vpjp1s66ns81qd03nqkw4782i7pl2va7w4nbngdmn38fs18l2gw"; -"proof-at-the-end.source-51194"="14d7xbxsm61f6z05442jhx47zblpc1d8yi57ns3vcbggaiv23h3q"; -"prooftrees-0.7_svn_8641"="08ijsd4gfkgczfgz3wmlyk6pb61cqdc7f36v5131xv12x6s2kd4l"; -"prooftrees.doc-0.7_svn_8641"="0ldhmf22q3m3nhxw2m1z9f19xzw753qrm0nw8hch6wzk419p29k9"; -"pseudo-1.1.3"="1yiqgp1ymhfjh2c1j8qa64bj6cq74jv6ba1wz3i6akngyvbmgqpf"; -"pseudo.doc-1.1.3"="1w8p88j2i8ngqgqv5pilbi3x9nrcjyiliwgjigk3acq0qv9vns2s"; -"pseudocode-54080"="0x2p2bq7cqajrn8s03dgikxg2nb94hk7mzmi7l911xdgdprlg6qb"; -"pseudocode.doc-54080"="1qzvdp0qmmlljahg6hqn7c67sszvjvp3v8zvg7nwam58by39l3k1"; -"pythonhighlight-43191"="1bf3jf05zyggcbz5c6hr06wd8dhf0q5m1i4i7p026s1b7dxxq1qk"; -"pythonhighlight.doc-43191"="0qw1rnyg5pawmp7hd3b0dyjzmbrlxa0hzg7bxnmvrz1akn1cas3q"; -"qsharp-0.3.1901.1401"="1lrnzvlalznyxmkwrn9nh3x2zz74bakiq09dg374js5yni36igf5"; -"qsharp.doc-0.3.1901.1401"="091kiiicfinn5cxpfhhb66j3hkmv80gsqd1b66xcz4ghxan43ywk"; -"qsharp.source-0.3.1901.1401"="13923qlhbx52x7h3v0iv6y8q0dz8g2ikvfz9m0lh9zwjcwv4mpxy"; -"rank-2-roots-1.0"="1fy1zv4yf2gqz4im40r19m1mmgagkvmfhxpzj44csasdcd2w1415"; -"rank-2-roots.doc-1.0"="0mrj96c11vrp0b6df17fkiwnbnxpis3rwk5ji8wwa1klg5han5kf"; -"rec-thy-3.7"="1pcs8j22l18pnfk1a0yyply6w6fs1rb5jxbz1i1cp42nhdrih6r1"; -"rec-thy.doc-3.7"="1bn4hjvfyyyi4ry9lzh70s1s8vnkh49xm439gy23mkz1ij8qa95h"; -"rest-api-1.4"="04y8xai39hlhj6y78cxq2fqy7fis7mbpwzyk4jmgqd3365738615"; -"rest-api.doc-1.4"="1w33inmwr66p81g66zxqiqccks965060034sx8rmjnjfgwqqgcgn"; -"rest-api.source-1.4"="06c06pbqa8m58r0lcr2xc6zahf6gjdc1r2zfgs3q1b6czy6rns34"; -"revquantum-0.11"="00mcqs4zd33larynscqza6p18a8payrgarwbgdsnnvaqf3c2rjnf"; -"revquantum.doc-0.11"="1nbs15bl80yl7hrav0awm43q4brdfqm83bpyf2zg00yz5pjm1497"; -"revquantum.source-0.11"="0dqxvcd5yinnsal4wydb5ybsldsax18zp016p2yzk212rk61rikd"; -"ribbonproofs-1.0"="1f7j2v5233fvjzlrlfliy18gy890mlr2n2fbqfhh88f2w3z4nw2b"; -"ribbonproofs.doc-1.0"="0gqbakw5jdamy0q4rx8y19xkdnb7v5arpkjmmsxhvv12pk2kb3d3"; -"rmathbr-1.1.1"="1jlafpdjryj0sic2zpn5f90754ydnfbb74x8b3q19klm3n20bsr2"; -"rmathbr.doc-1.1.1"="1nfcd9ypyscqv3ghlaljrnj4rm2md5h5k6yl173n15zrr56sxkfd"; -"rmathbr.source-1.1.1"="08mzgxkwk6frzgd2hq8fz30dliwrkrk23xmqy9p0qjmq9vi7vbf9"; -"sankey-3.0"="1f336mia2nr3sz3xcr878ymm4anyja94lmglz86skvl75jmh8p83"; -"sankey.doc-3.0"="0yb8sm559fqskd06lgkn3zc8zm24p9869f9d1gimfsk373hb6mjf"; -"sankey.source-3.0"="1q73vwvc2f6a820fixyg35mw0wp8z649zn8p6k4bd5hfzg7a3s7j"; -"sasnrdisplay-0.95"="0qhvx1nc7v6l2gq8c3av4sqsjlzm1raw6cmrf2lls7dg4dpz60pm"; -"sasnrdisplay.doc-0.95"="10f3cr5vfdgb7g0yw3pjqdfiaciwb81m2gssn0in1hv8izy09krn"; -"sciposter-1.18"="1pihppjlynvdlsin8brrhl2mg2jif3fa1mvsard686m4ar6id25f"; -"sciposter.doc-1.18"="0cpyz5n70hsp5hjdja3pl1lal1i2akn7xawwcp983mqfgnp8jm7c"; -"sclang-prettifier-0.1"="164sdqd7msilg6jk1ivjzvv49amji4hb5r6wg51vcxmg069apcr5"; -"sclang-prettifier.doc-0.1"="07s0y5dfmp26j0ayz2bhksdybpqb4cn439cvyifxillkq277dqk2"; -"sclang-prettifier.source-0.1"="1y67y73f2whg663hw56fwrn6jhhpdpm81w32kzwc7r6sk79bnq3a"; -"scratchx-1.1"="1rhqiix6dmdf9i8wan5xh0sw9ynawzb080b4izlp06d8vkfzx6rb"; -"scratchx.doc-1.1"="1p263dcjk8mjfxzgppkbkh7l2p89kavdk6llkffkj0z8gvg8xaiy"; -"sesamanuel-0.6"="1a6673xpr0q8v7wr1rrq3n6acydsfsc3q6kmj0qg6hm7lzqc1f2r"; -"sesamanuel.doc-0.6"="164hkrwdgpq5azhr9z2ganiwhzqxfaljm89igzprgcg23cy0l3vh"; -"sesamanuel.source-0.6"="0n1akz8757l5k2rv188rnqd90dkmy3xppzcfwahiy22p4bzaw2aq"; -"sfg-0.91"="0ldw6c8aqqd7m4ahziqv857zkjk3ap12xnnl5k43dcg8n7apb3ix"; -"sfg.doc-0.91"="1d627ks3av63b142f8kd7g0fi1f4xzq0yg219fj8qxja4mm5jrv6"; -"shuffle-1.0"="0laiw8v6izp53c8y0jf4k1nb8brvs36gd937nz2i2cvnpghz98if"; -"shuffle.doc-1.0"="1wd46l86h8vlxpasvhnvjimsfrhrbs56i767v2h7bdl8yp751ycl"; -"shuffle.source-1.0"="13qz2jc0f084acxdsf99fj22kbsjkr6i3y7pqzh1g2jd4d8bbw8m"; -"simplebnf-0.2.0"="0jjymrg2vs6jibfg6k21ckcznzf4ga0zqcvwwghyaqcxbmq7sh91"; -"simplebnf.doc-0.2.0"="05nkaf2p60a7k94vhqs71d75gl5aljyddlf1yjrbdigfmpsyagja"; -"simpler-wick-1.0.0"="0lm22wdxiwasv4igfsyjfi338qc7m985da7a9a6q8cm63hks2alm"; -"simpler-wick.doc-1.0.0"="18hmx8b6zpsc98mmjvimdayqpkffwjjch4sjajbz4csjpza7nl98"; -"simplewick-1.2a"="07rzphj6ffla4qz9pa31xnn25d420lvsnmgj7l78ryxai5amdfvw"; -"simplewick.doc-1.2a"="1ch7yqh3bv2y6282cgvqzm4pf5hgpfvlmpg66zcp44wnkq1sw67d"; -"simplewick.source-1.2a"="070f0zrnrf2sh0dx5dlbz6072b76f8iw03pvywhyryfgghfdfv7d"; -"siunitx-2.8c"="0dz02vigfl2k2l924kcfb912rf91fb054px2vxms3l2c3niq5wld"; -"siunitx.doc-2.8c"="1ds3xr22sn6h9754xczdl1jajcjl3g4cfhc73sq5sxbmbcqsmck9"; -"siunitx.source-2.8c"="0v1zxiylg0hzsww3n1d2p28qb0xslbvnfpz8yh4hjsnb6qzr5prw"; -"skmath-0.5a"="144iwn9hv4d71420878y7dzygmyyyr2l12gsqrbb44mdal68q58p"; -"skmath.doc-0.5a"="0an8w64z7dvbxgagga33zar0m2l44327q4lpz59n75g7c6qswnv5"; -"skmath.source-0.5a"="0finxgy2sj5wpzmjh5zfcq9l3dzka1mlffbgmhzp7yk57rrz9lr4"; -"spalign-42225"="0wy2kliv3mrcqvandk3qbbqjbri6xq69d5jsi80l7qdiij86z3g2"; -"spalign.doc-42225"="0jp34h19q4588rli6k0v5kg47j6i1gjpjgk772fkb7l0f5wln7k3"; -"spalign.source-42225"="02qzd21qzb8s2jsip2fr1jgf11xd7xmiyi7fv0s9ylyfr259c5b1"; -"stanli-3.0"="05mq6zhs6x5qjqk58gwws9lw3p876bd1f8a5c2jvb2azjl7d9r4f"; -"stanli.doc-3.0"="091knxhx7jsjiv4ip0z2jbazvv3xmbvandbraxbipp4zqqakb8bj"; -"statex-1.6"="11qpdrcszbsrasbasmk6h9wg5r2a11pm116i16h7mvw73vjaq76f"; -"statex.doc-1.6"="0dkb7c7wavn3qgndl0g8jpkx1qr00c3iwp6d0r72znggl4cznhsd"; -"statex2-2.1"="1949zszdv000dw1dx1jjznbd79q73fjiqnkq2axdbxffh47ls1dp"; -"statex2.doc-2.1"="0fkzbs76yfyygscazn4dgphs8g1byzg9n3fbdg6pizzncirbgh6c"; -"statistics-2.2"="11szmc6f380si38il9vw78n30yyfmmvgxpp8f8p8kzb373d3hs9f"; -"statistics.doc-2.2"="0z8mx2gar2fn97n3x01dw23l7r4ckqwgfksgmfdj7vhgs51wsv16"; -"statistics.source-2.2"="1dkz9vdcnadd1xd4k9i37a3mpn1bwm4zf3c6bg6rvzxaarrrci4m"; -"statistik-0.03"="1c0469cxfvyg5jl9q1pyzras6fk3f6zbgigaby0iav34imhg7zy6"; -"statistik.doc-0.03"="0fih9k7mpzg25h56x6zzdbdnhybd25b7hlv0pdbnlfb73s7h4mcv"; -"statistik.source-0.03"="0i68y5ynymx339zgxc9r8dgcflm5468gd6cwn9ngpnjvqqbas3kf"; -"statmath-0.1"="0imcx9nx9h5fi53nwg82n2d9s21vlngdab7znyg1z5pdll0df043"; -"statmath.doc-0.1"="10mxwgvjjnk2ci05ikml35q64c82c7dv7rjwajhk03gq8ljq939j"; -"statmath.source-0.1"="1himjc8cn3j5jr073qpp4mfyi2cpr0czf7iykr0w6b7722kkqdh1"; -"steinmetz-1.0"="0g9ll1hsf82wll1ng5lc2v6il3l6pdy3dppz7k7piqqmifzc8ifz"; -"steinmetz.doc-1.0"="0gyyqmllgp6dg2g4nh5q5ycnixlyzc6xfmi3szypmr1rai1dvx2s"; -"steinmetz.source-1.0"="07fj431nraf7f9qcmm5bvk03cblmj15xcsbnhgish4rxqbf7clsj"; -"structmech.doc-1.0"="1s384frn43m2vv0cqf9lm7vkg6911pj5v8d6h5zg9didfgv8pc8z"; -"struktex-2.3c-0-g7d3fc5b"="0qkfh53rhy29zapn4zr6n14nmximfyv8rbgxm16qq3l6mid5jnyc"; -"struktex.doc-2.3c-0-g7d3fc5b"="1nbbqh3g42qvrk478q2v6snl1lbmfjnb07jhx6z53yk87pna8gmb"; -"struktex.source-2.3c-0-g7d3fc5b"="0j3bprncnkp7iar2dh46bqr3v9zdvkk9c2w9kgj523bcyzw48zyx"; -"substances-0.2a"="13nl4xc0spsg4bq3ld0fv0612kac2z017zp8hwck2d8413jwkj8y"; -"substances.doc-0.2a"="0xbrs7qpbs5314j79nzcv408ghhayqxj2n0nfify6isxh85r1ks5"; -"subsupscripts-1.0"="14v5a89iwm2ykjsm3jxgbqsm5nba444yh8mzqf23s23z7fmcmsqb"; -"subsupscripts.doc-1.0"="10swcywyb0jdsjhm0cybvmyc9g2ksxq60bqaqnp23kfxp39g9rq2"; -"subtext-1.1"="030f7sq37qjn99l1z6nx7qbivhczpzhjm7drxhhhsssw4n3mci7k"; -"subtext.doc-1.1"="1m6zyy09a3193w0p91y8g66n8bnm80awzg2g8l195n4p41l8vnkw"; -"susy-19440"="06q7nw6bh9dkknj1jzvy1wljh9vn49z7mbhr5d0ydv10mp9y9zlv"; -"susy.doc-19440"="0dsr3yd5v6i240f7fgpbdlp0dig4dl0376ssd7nbg86scl63k9iy"; -"syllogism-1.2"="01x5kjyfm5ksqig5h2b8sgmn05ws0a65idv1xh5l709yp2i35120"; -"syllogism.doc-1.2"="1zqljwv03f755lzc9fhps5xh2dy6r0jdsvp6a21ka11kqq696vjw"; -"sympytexpackage-0.3"="0d77xd1xl9wc6qbd335kvhq8gbvvqzgqxblhcmyd5khhg3azk6sk"; -"sympytexpackage.doc-0.3"="1y743lffzk65wl5nwi490wnmf4xaxcnkpicmhadcvjcadvhrnlxn"; -"sympytexpackage.source-0.3"="0q3cl06b2mcpn5an1m7c68c4c0swmgacj3afqb38984dcvap5abv"; -"synproof-1.0"="01bx52ckyg4abigyzfcxi83jqdkczvsj9b80rznqz8vm9yrbv951"; -"synproof.doc-1.0"="1kvd3vvj6yx1bfqbi858qglc31dx03ish49q0lai0mp1814n6fqh"; -"t-angles-15878"="1p1h0gz1k4lr7rmadhdgb7l3gp55w12m3p88hy9d4d0ryzld299q"; -"t-angles.doc-15878"="1n01pg82p0yz0b7ph82k5ha7a9j0a4hc0489xq9pf4kbizh7ap4d"; -"tablor-4.07-g"="15xinskbqjj1dmi1fpvb6slg8kk3g66dm70z9f7dx8bzb1v65zwz"; -"tablor.doc-4.07-g"="0lmi8mn5k7b5i0n7bqhagjkkzs2niy9852r8r0vv2c8qfbpm4hpm"; -"tensind-1.1"="05vgqn5wcynyp8gy80icnkrdrgb0wsr3h0db033yx4yk3c8lhwaf"; -"tensind.doc-1.1"="1vns4k813ffccps5vrrpfmb7rm4fmfs8zgs7cnw2hqg08dmzijfn"; -"tensor-2.1"="1lw3dxk7ar07d4mb02rvv5r2zdkx8pz0w3dzf9s2pa2slbjx5dlx"; -"tensor.doc-2.1"="17xg416ccniiwvq0schcmp53a9hdxvds2pfn6q1q5xw78r983r62"; -"tensor.source-2.1"="1xh8fk3z37wc0jhz8jhz12d35xq6a8fsmn64ga4iv7pi1lhvaagq"; -"tex-ewd-15878"="1pmf17bxw6i4a9pfi32fjk0hd3p44kw2scwmr7p38320r6dv7srk"; -"tex-ewd.doc-15878"="0ss7nljpn8k3cz3av5qanc966q90v3qj9qy0akmdzbiy7q8ml7na"; -"textgreek-0.7"="0r7jcv38749xndr6sigy8zw96kwqw63k4m33c09hikawf2728jzd"; -"textgreek.doc-0.7"="12pwr5b8269hrwgpr9g4chw273wv81cfa52wvp3nhkd2cvbhfcp4"; -"textgreek.source-0.7"="0wq69l55462snrkpbpnlg03mrn2yxvibw38lkplgfc65gzaa07sw"; -"textopo-1.5"="10g5i5mg9898q091w9svm7gk4hgd6dja3dwy5dwc7s78pv0qcd68"; -"textopo.doc-1.5"="0r94ivbqmvs9lyw1ipwzcb4f0v9npvyfll7r8c9g627ikk9fmpa4"; -"textopo.source-1.5"="19p7sgz34dkvjqkld38x8li539kx140w1nj9l3ai5chilxz4lvy1"; -"thmbox-15878"="16c6p3n4zc2726adj8z131h03gbzyhmh5bj8hzc286p96131swdw"; -"thmbox.doc-15878"="15mkfzmy0141k5wgspngbwnnldf0i1rvbmq2bkzcpb72v9vcj8fd"; -"thmbox.source-15878"="0lv5mr23wwhig6r9fyy7rlv2cqxlr35y3g89i938w35s9q25xx08"; -"turnstile-1.0"="1br0ny72qsv5fpfw4x0v7q3dqy2jgicyd97ibzpxc04mp967njjr"; -"turnstile.doc-1.0"="1iv8ysamcqzc7lavhskf8kwi29jn9xcda0am0ak9s1c7nz7pb3ly"; -"turnstile.source-1.0"="0aadq0w193hl3rlb1d8xv60yy0fam4aprz4j96dphnanbb9g27ll"; -"ulqda-1.1"="1mpjwq43dj2am9llszy1yzz2jbhdskf14ki881j6q6h5zfwwacdv"; -"ulqda.doc-1.1"="0kkxa9sv2xg6d31bj00wszkchkk6raj2pvqji930098jray3zdc7"; -"ulqda.source-1.1"="1gb2r4zzr3q2kfigrb4j528jmr5paj38swhnp1dlb2dqr8y1szfc"; -"unitsdef-0.2"="1ck9awf9mzjhq0x4c3cpan79imh7ijpffii90955jc78h3bhcwkg"; -"unitsdef.doc-0.2"="15svjszg72axskaa3yg91gvh9y01s1nh5x6nhwqbr9mz3bn3npck"; -"unitsdef.source-0.2"="07v6xpwkag6fp8p331gcfbb0p1ca36rvrs9kbkayc986k6nds688"; -"venn-15878"="0kfq2wnjsbvk0ciwrm4923fpr7whmzyv240r4zps41vzpc4mykiy"; -"venn.doc-15878"="0izj8qsnxj9jgslwzz37xwr9n812y3cxmfs52yd7p4638qid50im"; -"witharrows-2.6c"="0zvrvhyn2c1s8h9a74g0dhnipbpkgzwld3l6ara2zfisx8rhs0dp"; -"witharrows.doc-2.6c"="18nxizvzlfhhsili06h19x1p2jy0dy4h1q6zaap3b013sipljhii"; -"witharrows.source-2.6c"="1815k8n2m6bsdw4ks9az3af4mcazqgxx1mi2mmrp3dypjkysa17x"; -"xymtex-5.06"="01432q9vnzbxzli9bdkdsd7ccvw3ksc76cs3568lsr35bkq1yy1n"; -"xymtex.doc-5.06"="0bx00qsgnndw8kq59nbihlzlnwvdf6gncdl3ljckcdn07i4mhl7i"; -"xymtex.source-5.06"="0gxi985kgkfyybg90f14y2w068ysy5vk4irc8lfvdgil3y8jwi4l"; -"yhmath-1.6"="02p5rzh9n92pjznrqia9b6jnlwmn14189m7fiabvinjakaxmwxwn"; -"yhmath.doc-1.6"="024p61b5i55m6n8fmk4j9r3q7dprp3lcyzkhag0wch6vgjkrajzq"; -"yhmath.source-1.6"="0y74zwc1pkw3dp56jnzzy4zx1ilw5qx9msm1bf55mvdfc045a17s"; -"youngtab-1.1"="18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17"; -"youngtab.doc-1.1"="00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh"; -"youngtab.source-1.1"="1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66"; -"yquant-0.4"="1ifp06l401fvbmlsdqwvywp54jq8iaqmx946bk6gdlx1bs3ywryq"; -"yquant.doc-0.4"="1xq6m3n0cic2pg7jh694z55qms61sbc754yrqv43nx4gqp9hpfa9"; -"ytableau-1.3"="0265mnd3m8dsz89qgalc92jx3h7201617wdxym8nfj7xymn7rq3q"; -"ytableau.doc-1.3"="1lw3llx9jnkil3ji4jv3h0cvb2lgmlqg68mw9jcmi1ymk1qgrkzp"; -"ytableau.source-1.3"="1fd8qxvrx8hmxkjil4f0ry86zdn25220xrp7w4j258nv1j7b2y8x"; -"automata-0.3"="0jqsvxn561fwz44gd0rwxyjwh1nanpmfsvd3kslw87h54hzlizf0"; -"automata.doc-0.3"="1w428b0wyxf0v7bf1yr9dfm4x8q3xas9fgv1q9sxbhgri8daj8px"; -"bbcard-19440"="0snfsyslxnz84a6lgwi21rg0f5vbs6h8yfyywih18vmlbjpba3zx"; -"bbcard.doc-19440"="0rbx7mpns7pgidx3g5pi0r7d638lwykjw0inpldb5g3dz1ipnpvc"; -"blockdraw_mp-15878"="11977c2f4100xfbrs5vcwz3vbijdvybq80zmfansdmxc0w3w6sq6"; -"blockdraw_mp.doc-15878"="1qb23f08wxmw3miys4sn89h48imzcqz720xfs3ihnbk2v75q3rd0"; -"bpolynomial-0.5"="16rzvfjwc5lrr6fvxjwp383ayi4pwhqk4x6k9blqzn0c0cakqmvc"; -"bpolynomial.doc-0.5"="08d7was7ly4wgy04np72f9pn4kz20hgfsprvzlpyp2rfxvixphfc"; -"cmarrows-0.9"="19r3r86vdlkjgx98dsf8c3crq14p8ljdfq6cijqqsvj6p4p6nfy6"; -"cmarrows.doc-0.9"="0svllk1cvjn1mw68yfhbd1na6grp4hlqbybqnmw7igw8ilpshl1b"; -"drv-0.97"="10dqig3wmp340m9h3n4yl6scg1p2a7ccazsqp7p8a4fkfw0cziiz"; -"drv.doc-0.97"="04kgfqhilxpcc0h6rhpw55s1j14wsb5v8b6ykq7ajmacrpmyi50h"; -"dviincl-1.00"="1qb2cl5jbgzjfgwqnvnfbbrbzxi4m64lajvz6pyybnrwv4bax0km"; -"dviincl.doc-1.00"="046c2cl9azgfg7y2022lj8x7yw8kg2pgjdixxk5989ai850k2j9n"; -"emp-23483"="13iaipg8n1njzbnd8s622irizd4cc1cbkyc735mplvwq10q2jxqq"; -"emp.doc-23483"="148l1xq42avnf5gz1sqjcdprnkcbgsii3fm1jiamx18175zygsdc"; -"emp.source-23483"="023jc6v2l580x2d480x11z6rlknjjvx8g3qkcrvdi778h5m5bb94"; -"epsincl-0.2"="0cmjwns5hnlqi1rk6py4s07kbgflm046pycpr1lr5c1dacmiycxj"; -"epsincl.doc-0.2"="06cyyhnphdxigpq4bkg28rx8h9kgmb3ywpbdak6v6ivvlksxgnaa"; -"expressg-1.5"="1hcrzh5xhvzhf7d9gfqfxj7bi89ds5rxa8m6al12mdr5qpffzzkb"; -"expressg.doc-1.5"="0kla1swvhd43xcvns17wlcvq33wvjidhkqnd4i587x9mdn69s8bv"; -"expressg.source-1.5"="07w45g2nbldwnbrbrmdq9pwi3xbi6cl2mqxaiyk78jfgr033rmqf"; -"exteps-0.41"="1pmipr1444l1yai8d9hhrncvimzb5scn80pqij2g90lz160962r0"; -"exteps.doc-0.41"="0ymkwhbl6r64pxhr95wdw10dvn6q95mkz1pwa1nb42sdcljizrsg"; -"featpost-0.8.8"="1p8xb6kmfhhqvxcmgf4bkw60p1py2s1pyn54700zs8vlkbxlqy6f"; -"featpost.doc-0.8.8"="1hy7n0jfdidj3an25j0m5bbv2ks40iviwzwijlk6qqdll0k26z33"; -"feynmf-1.08"="14bl9c8yz1z596281kysyyjbf727pi6mdnwag6gfqs1nsinq0a2i"; -"feynmf.doc-1.08"="1ql099wrlddb4fyfrsirx0vnhcbh0wgwp9yixhvgxfk5pbah8v8n"; -"feynmf.source-1.08"="0f9ghmp0hcmzadsfljfq7pinn69251dwhcdk4n62jrd07qdgqsyl"; -"feynmp-auto-1.1"="1yhvcxiq6ajjmlsvnznzvp35sap1qsnj54zv70dwpl29rkrgrmsp"; -"feynmp-auto.doc-1.1"="1y1pwlplkz2z7lqz84ay7ch1lw4plh4n69isqzsvhilnr31fkf0a"; -"feynmp-auto.source-1.1"="0ja5yqs9szyk4s2mk9cbjf6p98dagwk7pycma84y48kinkl96s0s"; -"fiziko-0.1.3"="1raicsznsws4rykrl9azi9lysb107cfbff6sqpp53y4m326xvn1f"; -"fiziko.doc-0.1.3"="0hfw1l9scfmr5k6jka8v5kajxqzcvdp31j65w3p9dsz9xvlslgc4"; -"garrigues-15878"="0qr2ak20416p5zlavcbihxkjvifzwj3cf03ipsnxlp4a0r3m0hgy"; -"garrigues.doc-15878"="03cx077kcvny07dkg9dpgvdb5vh4z7v0c80rn82vqj1l3i0qrxkn"; -"gmp-1.0"="1c98y5fhnq5w9b6kkpnrag364269s90kccgbqwr33bn9ixhsf0dq"; -"gmp.doc-1.0"="0wir24czbym76b9fcbzd29m0749lbh26n44yfl48k5pxy6pkqjcb"; -"gmp.source-1.0"="1qg01aaf4s939ixzl7wdariaxxg1d5z4s76cz50rpw0p7rgdqbay"; -"latexmp-1.2.1"="03rgabck8mcxnbg1avl638nhxdk6smvyd21v2ns61hx3jn09cpv5"; -"latexmp.doc-1.2.1"="1ad9axqv8h2s2xckrdxcnl8kazpgijrgpxmbwsb3h0hqb3liznsg"; -"mcf2graph-4.62"="167nj1q4kx3lpf75pv3ll8gb1zcml5xsggvsjg4l629jh43c7fs5"; -"mcf2graph.doc-4.62"="0znry4sigsfahr2qd92njgz39yg0ni8vmc5yryv89gfsdalz6lrx"; -"metago-0.9"="0km18bf69rf3rs42b0azc7i8bypy14201vk13yf5ahsypcjcgqns"; -"metago.doc-0.9"="1bx240q75pq9v23gz82i26vrp7z4cb00f9nb3cvvknbndk8y7hy2"; -"metaobj-0.93"="07p2r8975ps1ricqralyw2qz1zq5lmaaf50xqd68qwxmgrs3541z"; -"metaobj.doc-0.93"="17kqa3h13p9vba6sa5s29v29gkm0zbm5wngb0zx1lxwkpkgqaqv5"; -"metaplot-0.91"="01blkf01b89a2f1c7fw6dbp49iw9qw94krv1hiqg7ckkj8j06sp8"; -"metaplot.doc-0.91"="1fm27sy0zz3ppzz95bngipkq4m498g409igx4xcbkmqaghci1pin"; -"metapost-colorbrewer-48753"="154yj9pmwlmdq91kw5xllqah7pkccayv8r1zgvlqgk472x66zrzf"; -"metapost-colorbrewer.doc-48753"="1y0ml5ldridhcg8k811dqq2dh4xsx48cwfkliygq0q1kkl34vdag"; -"metauml-0.2.6"="064cyc53izb7fqc6xfk7pygr2k7wqivx29rkxzrb7sakafwmnkq4"; -"metauml.doc-0.2.6"="10n2xhjfysqihmkrzgcg96vsh0mh76h1jjcxx2nghydihjdggzjr"; -"mfpic-1.10"="1r8xq6npgnlvcyimi0xlqmqa140p94m5x832x0nfm9d550l1zrgi"; -"mfpic.doc-1.10"="07h8j6afl5sd7hz4gw0rkix1c39vdkg8376jgi7ypwvk1xr0wgp0"; -"mfpic.source-1.10"="0ynnc1p2xihrwzfyg46dljbc2f28l152la8f2z2y5zfvd08ir49k"; -"mfpic4ode-0.4"="0jdqbdi2gqb1v4cqahwss1rj44iw0753cq262j8zmaarski351a0"; -"mfpic4ode.doc-0.4"="0sbsb9lysz6hysrpf9dfgm2zn5qcsv7aaf5llmy9kan0m4h84afm"; -"mfpic4ode.source-0.4"="0iya4y3msmyq468zj2msq93xpa01044kmnv4dspz1fmh0324iklm"; -"mp3d-1.34"="18wgwwvh2vj1adbvbl1q6lh0wy0cynfvrx6cgq0m5nqps7b3idra"; -"mp3d.doc-1.34"="032ywwjrv21ypnlidvn95dcnq179pdiail86s4nxxllkjrryc2db"; -"mparrows-0.1"="1hmbpfw1wn13zp8dksnlc86vb19zs0dbwx9hy0sbiyfmb7hidznc"; -"mparrows.doc-0.1"="0ly0sw1c6i3k5nh26a260qw27x6rmv5p2zs11yh5076ziwdxnnlj"; -"mpattern-15878"="045sji1qqwalvmiinqkfm3x4rk2jc7m9nya48brcc0rc5icq7xqn"; -"mpattern.doc-15878"="05b9pr86yy3hl14jymk4g4mf6f5v85b4nv2bc68m02dflvm4wnsj"; -"mpcolornames-0.20"="0bg59x762rfsl3whzqdpajakjnnx5jbh55m73dw23id1g7cs5rsx"; -"mpcolornames.doc-0.20"="1n78abrsj5xj1gd2psgph7x4dm8nscvwmlp6ijz5p6xgphgqs5bf"; -"mpcolornames.source-0.20"="0q74zsx3ni8bzl0k1iwrr19k7f9vkwqfm0bp24m91wlzvh4vlk7r"; -"mpgraphics-0.3"="0ymwcn16n44y47ngdsyb0vvfp9vjnwixhxk67z6ni5d19f23jqli"; -"mpgraphics.doc-0.3"="0q04yj9j9f9j9rndqn9k95jwjm41g1rf5raqlrr1cn14bax0lr4p"; -"mpgraphics.source-0.3"="1hacfhb2dbflvmg0c1lif1hmhxkj3g6j1mdlb3wm43zczgaavnmm"; -"mptrees-17.06"="0cvlsframcnv6i7k7pa2pia8bdl7r8q50dr07p3jw6p5ym8ckc59"; -"mptrees.doc-17.06"="0d1pp6zgq75a1844b6rrkcldfr03pfjl6c9g26f2xbv5np3rpdxp"; -"piechartmp-0.3.0"="1sl8mz26cglbsqmpd8qz0l9yycxgcimi0yhkgnc04n2iik1xc6b3"; -"piechartmp.doc-0.3.0"="0g8sh91ki495mqv7zxxz2q40bk9dl150a9hi7yv0kbpiy45h3af4"; -"repere-19.06"="04y1qz2l2pa3qcmid8s97mp86rpwy4qxjkakhvqdkq6lvgfv6714"; -"repere.doc-19.06"="1mgmfdib0bylyxya3fzpwi53cpqhc1gir6xlva05fmsli2jslzjx"; -"roex-45818"="06mry55hqrakkc7yb7b174cx45n0frk3isxw96p4v77n9pyvlffk"; -"roex.source-45818"="0fwcb1fgz4kxbgcqm34s5glswj43wzg5j56ak5an39lsw0wirs94"; -"roundrect-2.2"="1xjfigxkgcszkcja58jd2w1rhhnccsl665p0k20lssb97wmdzjxg"; -"roundrect.doc-2.2"="0sg1ck97k8pbg2fjf99mhpvd251plphr5pk1dywmjniy9vmhv1ih"; -"roundrect.source-2.2"="02kk3h77drvkqanc04bjlfzg0scprcs78z3m2zf8gs6q8w95k7pv"; -"shapes-1.1"="0ww9akd1cf6nr9jk00qrjc8j0d9ryf7f8hc5ywmnz1q1z6mk1fqd"; -"shapes.doc-1.1"="0qh721vhyny3xmkwiaif3gdmk2bhy67mvyfkc4hxrba8lddnkfqm"; -"shapes.source-1.1"="0g3xfni1lmwdkl2jmprnhl3yxdrmilr6nb59kvznwph10h1c7iqd"; -"slideshow-1.0"="1v39pb9qdivrj26hpjbysg3hbdxfd247a346s5gdffraymiy9lcl"; -"slideshow.doc-1.0"="1s40c102kkaa24w05lmlg1kw8fwlfnd5vwbfqlrf4y8807izbj4s"; -"splines-0.2"="1dynq4y6crzmnn7wcana8klczvzzd2gkya41qpy9w6nxwa2b6kk5"; -"splines.doc-0.2"="0lyg56rnhrq620f083bayssdm36h6wl05d8wld67lf42056kxy8j"; -"splines.source-0.2"="05b9dwykc91q4d7xmvq5hg6vznsy4axpi4w6awr6l6qrrqh6wz71"; -"suanpan-15878"="18nzb8qbs7q233f68983q6988inwc0fm79clnpfpr37z2p7im95v"; -"suanpan.doc-15878"="0xria0g6qzx528dgwb2q23l5iqjzj8xix1215ciz5kmrp2h4fh7n"; -"textpath-1.6"="12f8qn2ncw0drx5r48ddb0xcc6fdm7jpmv5i1n0ihfcqaqa1l8xb"; -"textpath.doc-1.6"="0qhyflskr978qp01apai5r3qjhsj5q4mrvwck60jr79yasxa109k"; -"threeddice-1.0"="1r5cssaj6qxv17n04pgvib12a7b7fnxfk3qbf87mhs1xpxsh6v1s"; -"threeddice.doc-1.0"="0w7f2dfy6sbircp8dbw8s28s4bxbqnmz469c71v3qcaw6hgw3y2y"; -"abc-2.0b"="0fxnxavk76gayahflpa8f61j63x9y6aym7gqnmn6xfgggyab4qmd"; -"abc.doc-2.0b"="0ipxihm9jkb5dvlrk217275p7r6amnkbh352k07s7k7i7rjg9pmd"; -"abc.source-2.0b"="0461ci1zg2wq3f9qypwkxmyi0rciv8p2zk9rcajs0591fwz3drj5"; -"autosp.doc-58211"="16szmbffp9pwzv7zq3l4yvnsfk4m7w57wib7pqpgv1v5fzhlaahs"; -"bagpipe-3.02"="0i3f9f7a38vcsypmf0yv2cdsb1c8n3qin4n8ac73gwdknhhibxjd"; -"bagpipe.doc-3.02"="0fagwknqzl3k6vc2x9axng5zljhc4jhlqd1x59cjkbrwp8xvf8kf"; -"chordbars-1.1"="0n7ycv6wkkd4nr7d6w55375c0ym1pinqjyxx92dwllkmi5w2wr1w"; -"chordbars.doc-1.1"="1hg3kzyyw3ra6qqf9fh2rvv5rn2jaglzjvf10hwkv84a21hlfvq9"; -"chordbox-1.0"="09sghgyq6mv3w0m1vlcf82vjbdkb00gpiqr6iwlimpqjrv09bp3l"; -"chordbox.doc-1.0"="1fykwcz8d0ja7f5px60qf7pfzfcw447mrfpbq8awymr1ilwgmz05"; -"ddphonism-0.2"="09s324nj6g8nlib9wilpy01prixrw1ilwlvl638hgv5rxsspza5y"; -"ddphonism.doc-0.2"="0iirifr55s86nm5512ii0qm8lm4zy3jbrbk333hw27y8m4v9qd4i"; -"figbas-1.0.3"="1bgpchwgj10609ld6i4my2b6ynzlhqrfqi10g7pbqjaypyzbjs6h"; -"figbas.doc-1.0.3"="0ncmqsdvhssd1v77m0jhx48fk6ssxq5yggd29dd7k3jrypaf3bck"; -"gchords-1.20"="130b2svqilpj14jl5slw11b9dqhq1nvdph6y3qcq71pgng5lhjjy"; -"gchords.doc-1.20"="10mbr14bjxcl4p42r0zsqag5sg8yzp1mpi0s7fq7i9197kg8i77b"; -"gregoriotex-6.0.0"="1z3az5in2izkai2bf627zj5966ypv1z9z9510ynallfi5q6yah49"; -"gregoriotex.doc-6.0.0"="15qh7jfz42bj450zngw556z57dzq99cfsna5008yymgqsyvy5jxl"; -"gregoriotex.source-6.0.0"="0p6xm22hr6ka4jm9zrg4yifsc4125g22n4x9zjvmarbxixj04573"; -"gtrcrd-1.1"="095v007lhv0yyni3cqvc14iv9jqi0aqfmlr0zgxh45xfpqbsglnv"; -"gtrcrd.doc-1.1"="1ivw62rpgfyxmlrzvjvmhf4hxfrlgskzq3qr0p6g48ilv3is7sb5"; -"guitar-1.6"="1cjrmz39cpwj6kfq3r9868prd5bx0ppsxdydc7327247n4f270qg"; -"guitar.doc-1.6"="0gqck2vifa7r4wb9q63kw7mp8b33hza1jjyn3kighk2rrjbrg3ah"; -"guitar.source-1.6"="1pfcf4r1vwv80zc1p8fjvf8nqadiijsl8fjaxjanjgzl3zyy25i1"; -"guitarchordschemes-0.7"="0jhqamb3lmpzplvxwy7aydg6sv81b4xl81ss5q1nk66lxki714a1"; -"guitarchordschemes.doc-0.7"="0939llps22ir6bfxqjcbr22kvb6qxid7dzfqjxigl86y8amvv7lf"; -"guitartabs-48102"="1akm3sbrwnbg9mzlm98zpgh187w61g74zdyq6lb21w7bw30jkxbk"; -"guitartabs.doc-48102"="1mrifbwkv0vh4cl1jg92v7006bh3rfrgy7gqpz0byd5nc0vfrm5n"; -"harmony-15878"="11vh6dy95n049bfr46yyb6a5ziawmh3n8dr8l7cqhj4pqmkpgad8"; -"harmony.doc-15878"="00kf7kbrfr2cqv7izx1v90mpa81ncsn0r9jkxkhz8df8fsizaigl"; -"latex4musicians.doc-1.0.1"="1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f"; -"leadsheets-0.6"="0y4g6k85p411qcp5lg9jwz4z7caw4g906xgqf9813xcnry8y82a3"; -"leadsheets.doc-0.6"="052bjwhdl1gb2bsnhm40h4xi7hp6xw3kdwz62rm8lsb446kz7v5r"; -"lilyglyphs-0.2.4"="11mb49rcsi051k7yd7s02k9ca5g4mmifdjx1nqkvs6rl922wcyki"; -"lilyglyphs.doc-0.2.4"="1wl5ppgazb27s3wxgmz1xw8cwwmnnn0s582k5swx8qy91qdl08r0"; -"lilyglyphs.source-0.2.4"="0657barhxkzh3jj3b8rk5rl9i47k2h0p1wa2vxj00fdfqfdjn161"; -"lyluatex-1.0f"="02w276n1kdvx6l2gp9r40r561kfvh2jlivgb20q1xlvwpyjm8f9j"; -"lyluatex.doc-1.0f"="1c68c3hjmlzyd2pz1rgxwwpnlv0s3mmxb9y68ws9n2hnfx6zm5p4"; -"m-tx-0.63c"="1znv3xc5462jmm3ydrcnfj1nj7dld9f617xw3fl2gdwn083ivawh"; -"m-tx.doc-0.63c"="0svgf4a6rgisj614py6l9hm4ij7b4x75jn84s2ydbxzyv61bmmrd"; -"musical-3.1"="0rn4b1m1c58phyj9zzvyxdxbilma1bnncscwmxc8sdgb9iiwmlzm"; -"musical.doc-3.1"="022s1z7d5ins4gpklg9hadlp1gqxpr6862i1g4wp036db0457l78"; -"musicography-53596"="00kc6wq05k3vz07dn2hchq1fgnvmkj4as52v19jjqzakp3a7j8fk"; -"musicography.doc-53596"="0b43y731m3h29j9b9mjijrjs3hf430cc9big7b4jqcvm0kaxsq6z"; -"musixguit-1.2.2"="02cz225x5s3spj0wf9c51ka0i1ysmcrvlpa2b8vxd59f4pwz36am"; -"musixguit.doc-1.2.2"="1g8hay5rdkpa4pjj0lj5gfs7xmqwzmzxnc8k023ahlz38gdczgnz"; -"musixtex-1.31"="17w0rc0sjnwx0mc5k4h7sv46xbc31clg0fnri7zk64363k7f43rb"; -"musixtex.doc-1.31"="02707dmfdqax3lcss4k56qyc2x3fgxypyycndl3lxjzzin87am35"; -"musixtex.source-1.31"="0ari7nwxlyj0lnqhzcpq4vh9xn0kdzqn9c1a5ih5hp1q2zwx2m7l"; -"musixtex-fonts-37762"="13z6qdism1kbs0bmmabl112d3cv536s1vqh0sm8j8yi9l752y1xv"; -"musixtex-fonts.doc-37762"="0vq2mc7q897c9c7x80anbqy68bs897gjfkmdmqm87ykp0xas9kcg"; -"musixtnt-40307"="0g2y52s0151br5vr7hjv5dfcyr96cjxp4n9ya3s1jj81q6q01jjq"; -"musixtnt.doc-40307"="1y933975hv5vzwrgjizq315bkgnhlky21blv9kbnzf6kadic8ys7"; -"octave-45674"="0sw5r5gqvpmrn96rfz8y8hdbrwasv751p7ga5dary1v1kp4brcr0"; -"octave.doc-45674"="1r9wywnqhgrg2jjlzyafhdnyxd3fa17zjbbw1bj2a3r2jzd201h5"; -"piano-1.0"="10gfxklfwf60p54wcbs4l1jpwasxvvbnkjhjpiygnk6mvzjx7dyl"; -"piano.doc-1.0"="0czqrjlfx1i6k02aa1r1crvkw7k2fl17vzqzrkc97msprrymxwgk"; -"pmx-2.94a"="1dwg3v91z6q6hcbv8imrddncxcf9kmyfsra589drnjldcxcl5629"; -"pmx.doc-2.94a"="0v52qrsc2qif5av3jnb7gs6ph6ixmh97j8bscxxhaip4dv2hi6sd"; -"pmxchords-2.0.2"="0yv1c0s3zjy5w65cpv9gmdr13wkfg04jc0g7b1f0mh8ychhdab1a"; -"pmxchords.doc-2.0.2"="0n6g5f4szxsr6zqqp2czi29m1dncfgib1pd90mbrjprvwh0filf2"; -"songbook-4.5"="1qknajn3s4vpw68hwn0mjf9zllhba035gjgiwj807nifhgm2bvpv"; -"songbook.doc-4.5"="08p61v1jgw0s2bdfwgmb1zw5pyldfsy61d09n6qq93wclgaim7lk"; -"songbook.source-4.5"="1xzx3jxp4791imxw6h7gs1ach94k1w33f4p8pd4rvlcnwglnv9s4"; -"songs-3.1"="1q2fddi3z3d6f03y110ah1lc5j64cgg16w4hcxdd1q6sc6ccc61r"; -"songs.doc-3.1"="06y36cnx42yms6b3mnpkvbwrl1rrpjy1jlafycy33ijx0sbpizql"; -"songs.source-3.1"="0airs4wvpv2wmm2398sfy5sh40q0r2skha33999fkk2s9jc99jbb"; -"xml2pmx.doc-57972"="1d3ralqh0b71scd59b4hmm707yfrz1rj28ni2lzkhbb1ql73bvah"; -"xpiano-1.0"="11vk7k3n3np2wxx7gv9rvlgfmipmh1x0bjq5b2yvgsfxii65kwz3"; -"xpiano.doc-1.0"="0hq4v45nacdxygxpjby6s8smlfkkp63yg83zfmwcl3dgxzayb2s3"; -"xpiano.source-1.0"="00xnkxm6ijk1i0h3q0yadklc7f2np19bx3yzq4dzrfavdkxjz8f0"; -"abbr-15878"="1irhcs2zkam6sdl92wk07v5ckg56r6n10hgcjn5im2jpsinsad5k"; -"abbr.doc-15878"="1z45fraywqqnc0v28jxk3bzv9cndwgs7nmlgbf3b8frr4x18mza6"; -"abstyles-15878"="0v4wwf9w542scqx298gcvvngl0ncal0wds5m8h96x9cz7p9wjlph"; -"abstyles.doc-15878"="0zxygi2wfrwlgv9dj69m3v5ily0av65f3qiy9vfpbjlradak48yy"; -"apnum-1.7"="0qqm8np0jr2q3dyxapd49g35vk6ch3k9ar43yq740cfa7gs23ss7"; -"apnum.doc-1.7"="1jjk8a2aif4f7gmbj5laph0q60xpb0yv26j22z4ay2p6yf6a4fy5"; -"autoaligne-1.5"="1y4xlxgcj82g3cvy23wyacm91kx1fnc8b9y0r8vhf6pwvj4fk6h1"; -"autoaligne.doc-1.5"="0srhzzycrh9awp39cgfqzc3z12vxj33qgbnpprx06y6bx94956wv"; -"barr-38479"="09pzipw0qmsh0p5y7m63gwvca92g09r8pq6zhq25k62x3s8y6a4z"; -"barr.doc-38479"="0w4kvjv2zbsg5jppqky6yx0wr7xq61xj2gk5yqi1mbbagnra72rh"; -"bitelist-0.1"="1vbz2c27jjc94i23s1dzl9j0zf0n2935sgxgc5hq3bpaz1qxvm7h"; -"bitelist.doc-0.1"="19p9f9bzn60nf5163rdlw166zpk7qlfwhnc51bpkppb0w4rni2ai"; -"bitelist.source-0.1"="0r3lccpampra8dardrr7sb0swbx72aasaras43q4nx4jv6z2561k"; -"borceux-21047"="0hx755ghdd697fdc48hlvr21la4s9wvsn4v9c0n6sirlansba8ca"; -"borceux.doc-21047"="0fcsjy8yi8zhrl75zb2wb17v1ilpgipdr85vhi4dsjmw18whp03h"; -"c-pascal-1.2"="1gbijcvhkfc9jhdjs07l1mz4p8lchrhnrl1yj2gmzkskp4v2pkbw"; -"c-pascal.doc-1.2"="17ddnb3k2q279xrrsy3y5n8qyk7r8hlrw8vd446a11qiwypjvxy7"; -"catcodes-r0.2"="0sqwy110bqmy1npqqp6m7x4m632zmg4n52snrbzzz87jp59k6kwm"; -"catcodes.doc-r0.2"="19drsfj7f4lfmjhpmivyyzaps3yhxsy5xppgbm67vk4368sgsmpg"; -"catcodes.source-r0.2"="1c9269586s85v3swr33s28wb74xxaxy3mzp4153by2y5hpj250xs"; -"chronosys-1.2"="0ii3r31dii1252bg0xfh4818az1snrzfx7h4ibr6rd5q3a83yisx"; -"chronosys.doc-1.2"="1c120hcadb7xpkspmixhfrdlcmhl79jrf1wc0vsjqbq3wxjq1p55"; -"colorsep-13293"="0nf72pf2bjn8pcps45sn5dcjf1dkrww9wlpp1xbzl1h9i68p3h3h"; -"compare-54265"="0isr7gmskv55cr4f1fa7s478v6fh65q9ijxkmbpxj0448g9817w4"; -"cweb-old-49271"="0vx235zpflqpnrfa9kqq7wmc1rylg5bw1r26knfzvh3w1swbp4ai"; -"dinat-2.5"="0m040ib86lk9ccd4m2r33k8rgdi7dgga80skv2qif43ssws330r2"; -"dinat.doc-2.5"="1hvc4f56mi0drmdqr7qlab68b9dqkmczhj28d3lpyn2l2hx4dncx"; -"dirtree-0.32"="1j91nhdnf4zvqpn6a3jqrcvfpfb0ml18n2g474n5d2k1017mdz4n"; -"dirtree.doc-0.32"="05yd1fkkgyspqxi2ddmq3s0nwnyh1xk55lbzzk6pwxjx1s1cd5k5"; -"dirtree.source-0.32"="1pl4s67bwf5vbf0ccfhd05yrmfss59kng0ys871yq74rxm4abing"; -"docbytex-34294"="19f8kxa8pb7ai7npxxavcw8hbsskmnchi7vynzkbd0imcjvay476"; -"docbytex.doc-34294"="0q3by29jmymrf4pirwmfqxr6bdglh936yb1phficxlpm07ibp8mz"; -"dowith-r0.32"="1ffadlm7fzm72svbpln7lms9dl5pbrv6xjzhwbcsjbwy4smx8s6x"; -"dowith.doc-r0.32"="12sis4raxlfwzdl5jqg6x7fa7wsd9phaawm9ydf91wf7d8md6z2j"; -"dowith.source-r0.32"="1qm2v2lw05jk4nnfns9l1hldamjka6plg2zyly6vi0jlns741hpx"; -"eijkhout-15878"="00y3y01jpgzww1x6zjh748hpvizlrbgrv04p8aq3cm2pzs0g17qk"; -"encxvlna-1.1"="165xjggnbpc9baj9xbdkxzxsb9gdsxffmakffw0gzp82acxgfwsv"; -"encxvlna.doc-1.1"="0jc0wlhmc7f1vrabzk6ql62iian2n8s32r2crq34w2cjglmf69xj"; -"epigram-20513"="1zps5067mgi7xq3fpjvjln8i0rz53j7qn660khraq8ribv4glnpf"; -"epsf-2.7.4"="1i973a2hp5ms1lzgf3g2b73j34xymak9f8wz88fqczcvdfnnag2g"; -"epsf.doc-2.7.4"="0d6jhhvw882kq9l2a4vrfrnxxvkidfjkmp3zm7kj1ir8mk9qvva2"; -"epsf-dvipdfmx-2014"="1p0syahj7liknn447lb83p2rdv8xazpgabk39rjxga05pfn3csh5"; -"epsf-dvipdfmx.doc-2014"="192x6cg0dh0j9dknwb320g73hid9px635p79idr33x2zq3gaaw4r"; -"expkv-1.6"="18wgk5n2w2nfvdy3v5qcgvdwr50j5q28p2c5q2ff2rswljh044b9"; -"expkv.doc-1.6"="0dpaawa3388jslh1yymz4v7cq85n8aw8lpb4hshf35hirack7kih"; -"expkv.source-1.6"="04rzg273ls173kyp5vanmj27bwg59f1yjnl1w9m8ry6ynf8s158b"; -"expkv-cs-0.6"="18788maj4j6724scqyfds2z65f6s0r5i3k0yzbq78mj60kps5gkn"; -"expkv-cs.doc-0.6"="1l72x7z2ba2kbqdvwvnc451scw53qk3jsgpqbg4rj261imjn2i64"; -"expkv-cs.source-0.6"="1bsxi8cij8flqsj81lx87hbgvn1nnf2yvig4yqwgwfg95byzkmbx"; -"expkv-def-0.7"="05wi9b6nds4axc87lw2qf77q5188b82ccbj4v7mzwhmhc10ppvm0"; -"expkv-def.doc-0.7"="15hfzwn6kfwprkrhk0i6y2fbxyizcw697y498k2rylhv6n7gcm9n"; -"expkv-def.source-0.7"="1flgvk5ims1fj56b3y2mxkgs7zmmgphfk3pkslj8cm76wlfam3zh"; -"expkv-opt-0.2"="0qxk3nbwizvczjrqkch6r1d53bxrnnjxkjyakj0rrlbaqpyw4859"; -"expkv-opt.doc-0.2"="05r8p2k94fh4fs6bmf75g4njpppqya51kvqnznzlhf17b82lf5iv"; -"expkv-opt.source-0.2"="1z8plih94z428g95avckmpd29g3byq1r20d37sw379adwfzdcwci"; -"fenixpar-0.92"="1l79py58dih05c4kjb8cngzs3bzpbhc72f4hnz2r7nfwmjp86c56"; -"fenixpar.doc-0.92"="0fbx9wms2n0ff1cdpfavqhjg56przd7hr515vh81g8jgnz68s24l"; -"figflow-21462"="1w2wccxfjbas2yyp8sscxfb875kz3mwqjlma46v4328sd9vw4pwc"; -"figflow.doc-21462"="0nkdz047vypv0b47wbin7nz3cbcriv89w05d6yn26wvq5svlxgw9"; -"fixpdfmag-15878"="0s5ilsmnhvi57x9cqwp7nwpagfribmgkbl0z1ci55aw2a6bff9hn"; -"fltpoint-1.1b"="13zin0r1hcfihji2h33q039mpcf86lw2q017ss8848xpqs41fb0p"; -"fltpoint.doc-1.1b"="1yr5d1hs3bdd20df25c1jyb0hcizwq7bxjbcn804b97sjk2fk8gp"; -"fltpoint.source-1.1b"="19qy8da4ppsd1agh1c3xs9fxsl6z8c60lcyw4dd88mymk7yk4ysd"; -"fntproof-20638"="1gq483namx453zg5yv7acvhy9hb93z68fyfb54ayqkka2n35q80h"; -"fntproof.doc-20638"="1qzxky8jjvnlznm11rjzgxmhib0psv7lfk3nfb8ys2wl0zjcrg2w"; -"font-change-2015.2"="0955bj8r9jzzyyzn3shs3y7iyaxjzs9m3b9l2b33hpd4qxzzp03r"; -"font-change.doc-2015.2"="0khs319ifwl7gfkmv7y27ysqkadz04l7zvcjxn08qzmhsxhjpz6w"; -"fontch-2.2"="09jpw4fc3kk2w1rxs0lm5sfvl8v12y9gch4viy6hva3sh3w8yzin"; -"fontch.doc-2.2"="18si3pz2crkyx075cfnz3ddwbgyccgvyxfzqd70njxqspz8xwf23"; -"fontname-53228"="0ylpryn5wnjnf6acjl6kp67i0vl1dz59xk2xbxb0fqhx5ib1gdgy"; -"fontname.doc-53228"="08vfa7n2bzjsay7b7zaigkq7imlfmq92f4firwc3rx9hfm7hjbn6"; -"gates-0.2"="1vxn3j957za9j6ryf3nhy5r744gr63m78xzvlh0z10sr0bpw46v9"; -"gates.doc-0.2"="0igxfdxyiz280ryivffq6c7y84c16ip1av8wn11j6x62dcsrm58x"; -"getoptk-1.0"="0rh7b66fn37nkcy2y6q8h3j7i8njwdmizn68iy1bg2l080ns1nw4"; -"getoptk.doc-1.0"="0dmjwgv0qghhs7fa0a9jvk2mqbg4m3br1dk2x7q5mxyjzk9878da"; -"gfnotation-2.9"="0n2g1kjig7rg9bkry1hyq9jap95jb9crzxh4yd9jylgrygva6wr4"; -"gfnotation.doc-2.9"="0lfdm66xrvkphqnzmymym0s79bwap5x4h57q6ndb7h97p5pxhfby"; -"gobble-0.2"="1qg0qpgs9llmnajyvycadkvshnw9w5p10ndjhd8b7ddvy2jrp9rn"; -"gobble.doc-0.2"="1nqi3q73zayl5sb4iwip341rhccydhjxvp7c66ac764sx5wxdld9"; -"gobble.source-0.2"="0k42x8ni36gq51aw55ywy36jl89brhsc0177kn56zpvv2zmghqiw"; -"graphics-pln-56823"="0liz3zzg4w5pqfzfsf46209cxjbmb33nlraghjyi5cshpccmn914"; -"graphics-pln.doc-56823"="10vada0gcayyncpb918g1j8yhnyzay4aphq4bipj2jiscqcqaqs1"; -"gtl-0.5"="0hj1xzsny4qx2j6j7ac1b39whjcn3z1m97xyavmz9w7ak4pgnh74"; -"gtl.doc-0.5"="1aj1s3d53y0wsivmavam28zm0q1bxgk4hndr6ifv9fy4m52dw89f"; -"gtl.source-0.5"="1qvyhmywdwyaazcz7kvk321pbsqhcj69852a8zq0hkvgcadrb853"; -"hlist-0.11"="0ac4n38nnimrs14k1s2yizbqvqky905qcv0kgs0aq043kkmpi0v4"; -"hlist.doc-0.11"="1fnqm6kxr79y6bpymafr2s3m8sx5mviys06hcs8sfn2gzagg88bl"; -"hyplain-1.0"="1kpaxdya6m7x4dmrxqzrs6k6agxsg8lcg5yqqdlips887lf609cl"; -"hyplain.doc-1.0"="1q5dh42gpv4n9ps0yqyhcscjn47qz4zf35jlg56xgq2w5229k742"; -"insbox-2.2"="0ylnp3l21zx4y1bwrr33v8d79vlgz5frna9dkg62gz1bhjbw7f7i"; -"insbox.doc-2.2"="07iw7py0p0jfq5np89dx9fdvia3yk5mi0py77xrgb8v4gx7k5g3k"; -"js-misc-16211"="1b26v330702mbd9bviq6sr7pg0338hddzc84z55fsqjd85fp7zcz"; -"js-misc.doc-16211"="0bs30a1m8cbv2824xhj6k3jiv6dmdp6jjzsinhfdwiizc2kzriwv"; -"lambda-lists-31402"="17srvv0v10mczvvmxr6sfhlr8zks589c86v472g4rnmf4bl4my88"; -"lambda-lists.doc-31402"="1yq4kn0nfcgy0qh33qakv7c12lcdzbj4x9xj357yn8c0ijqkx789"; -"langcode-0.2"="1hj7zyjxh64fax5rv32558sp2ss986fxx0fqd5xb9c07s189cs3d"; -"langcode.doc-0.2"="06bygnvh4sdv7mp17c94wx9v1lj4zgih1db6mknc3wiifi5jcx8m"; -"langcode.source-0.2"="1bi25gqx2yi8f6g8hpnqp9f52qnfpyafi0r16scap8w0sbnwrib1"; -"lecturer-23916"="0alcmds4ds3m0rpq6r46ff56x78kv0nbdnfn80s9q638pf1vvnvb"; -"lecturer.doc-23916"="0ksqm6ibcakjf2dir19hr066gg2dxa5blfiikr1j8x966lfdjb09"; -"letterspacing-54266"="0ry7rri76dgbrkzr6na2kkh7bn0jpwkhh9b5qw0cl5xwyp81rddg"; -"librarian-1.0"="1rri0fb9ssj413w1g8c7p79hn72gqzncihhhg3ws3ldl9s3nm54d"; -"librarian.doc-1.0"="1i4m0gp38f64y59zcsyg2j7bb6zycyf9z5yr5wf86l6kh40cc2fq"; -"localloc-56496"="0ynzcib8hsflpjhykfl348pmc508g4i3ig38wjsb3gfm97mlhq24"; -"localloc.doc-56496"="08aiqc04rwinqr510r1wkzz43qq4nks1varmxyjbnw9acndn94ak"; -"localloc.source-56496"="1wcl06i82xkp6m5m311pn1ax42avlp6n54ad1j450apgygdszmik"; -"mathdots-0.9"="1wbxvraw5lp77chgzslrrz022zgqn2fhmzk85cn7ggafip1hr9s1"; -"mathdots.doc-0.9"="1ldl9l92y893dg2ksqn6n82w43a2l8pylz3iq4glcphalhggydcb"; -"mathdots.source-0.9"="0dkpj8cychzl7gg4bp41qqi3y50x0dyz2pxanfli4a2anh2dy06q"; -"metatex-1.1"="14s2my2zs3sx3hy0vapi8zvxb6d15fl7wqsnis58w11a3kni4f1d"; -"metatex.doc-1.1"="0z0s4ys1zsa2s2m4slpjdikzbkw8k8m780gb5mh2j2azc7yxlsdq"; -"midnight-15878"="05hzxlzr19snz16sddzpyh5f7vvs6jcdsqyqvqga17rr8y04sdwz"; -"midnight.doc-15878"="1ky8k2ys88n6hn2q9v9gr71g772gm5zvxlbzmibvajq0hhqm41l8"; -"mkpattern-1.2"="061y05sa0a12x23f68g7rinllkggjfghgmrq2qnan34f1ind1g36"; -"mkpattern.doc-1.2"="0b3ahrhxmm6lwijc7kgvn0k17fm9rkp7i754zrhfj7w4xgq6i50f"; -"modulus-1.0"="03sssw7yg7pa7i3l29l049qavwxphih5jvc86nysdzzng4a4dd7n"; -"modulus.doc-1.0"="1ylrs9705mgb8ijj9fq5w1yyd2fi4ykx8gpf4ckdr78h6rvzkr1h"; -"modulus.source-1.0"="0gm8vwidnls0z31zxcd348xyc4rrvcffncnwmazi9p1zplhg9ggk"; -"multido-1.42"="0rb320bxzg83nq66dx4d2jy3cmz83zdmv7xfw5n1chcswpi6l39p"; -"multido.doc-1.42"="1s8jhzznsqq8kjw19l6gdr12x1p63v3fyzfdrgmd9z66a45d6hsa"; -"multido.source-1.42"="1ypcg93f9n9cv3y6rj92l46b61zaj8wm9cfps1c86w675xs76zaf"; -"namedef-1.0"="06nr8bwymbc3ps7whpxnsnbnl1fayz36hlgcy5isg0gcx8bdspfh"; -"namedef.doc-1.0"="080m0d24cish4an6p4q7rcrqpr2r1yvwvzk431nszhm39h7d8z80"; -"namedef.source-1.0"="03kg4zv07ch01n0nc7qwk99n32ifwf89z2976wg5k12yq51prplh"; -"navigator-1.1"="0ank98y3a7b5dpc6gxqpgshi5qvkbys4nyx41gf6hkinmi094097"; -"navigator.doc-1.1"="15370abnfjvql6gkcamgq8q3p4kycgzlgdla57w2swzwn1bd6x2h"; -"newsletr-15878"="0hl73l6cv94g9k4qnldxad6nl56n9c1r9rkwh2c38sr31d6fn8z5"; -"newsletr.doc-15878"="15bd97zlny5p212naaig42li7ki3f9bfr9b5pqk0vhbf17pik9za"; -"nth-54252"="0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm"; -"ofs-16991"="0g2rxji8g1nafyg1nzpy18vzk20p4p6r754m89naygs1qn5n4h01"; -"ofs.doc-16991"="1v1z08m2ha071kb8zia1wlgkflkzj4hjws8rqnq7asvhi1s2p1rj"; -"olsak-misc-May_2019"="13kixnh85x2qzzfgdhhdk417hjz3aid2q678adlar2ha8a6vbspp"; -"olsak-misc.doc-May_2019"="1cfzdy18f34z3p717jc9mcgs8snhsl6j6x0jw95ff6ds7d2pzfly"; -"outerhbox-1.2"="1867xhxlbskiysifmwlr10lay8khragzi36fm552cwc4vjz2ybcz"; -"path-3.05"="14k9dqvcc2nazjysff0s1jrass14d2r9i9cgfx46ss09cw53h71s"; -"path.doc-3.05"="0kacibdjhmz39klvxr244n42c5vlaz1z71a8vnssmwmdzzwfzs5x"; -"pdf-trans-2.4"="0dr8d6szds3hlrnrw0rb7il23rxw5haz37dg3iacgcdkffnglkis"; -"pdf-trans.doc-2.4"="1dcmcd57zv90jafx3whd0nn9hm5x7aynb5npassjqbglb9lfml87"; -"pitex-24731"="1g91l1z71481hlwz8vmdac0g4vm5d6940gy1ly44qny626k9j079"; -"pitex.doc-24731"="070qn9b6bq4szqa9wqfmb3qbfxcgif79dzbb3qqhvs7fh9bivqdv"; -"placeins-plain-2.0"="1lhc72zdm2cjynx6lf6kafmf00nw17z3mnfhagh41h76cnm338g9"; -"plainpkg-0.4a"="0dq20a8nyyyy1342s8sc1z1i1gdfz49dmv2w9fl5dbnligzxgdfl"; -"plainpkg.doc-0.4a"="145249b9w3jpf9swgc4293r05p7r5ylmxvx1a5qlv3fgni945vms"; -"plainpkg.source-0.4a"="040m08y54xr4966f8b6z38spdhjh197l56am3wpza5qff4nbcj6a"; -"plipsum-4.3"="1byjqmx68gb2xcb4nw429z7wnagv5l0pi3v13dlwp57sgfkxrz0j"; -"plipsum.doc-4.3"="0gmq7rc2r3r50b7w5kqglaqmrqnxv6wav8gz09a2skkir6v1mpgl"; -"plnfss-1.1"="0l4kjidsxzp14ii850m23q3yz1z8my9svqrpd5hi6v7qnv73vdnw"; -"plnfss.doc-1.1"="0iw938rnvcfly3z5v5gikd3svx4mxwfhw0gsyv26m37l5slqvf1w"; -"plstmary-0.5c"="0cda8irxd0gxa18x47v6d1wiwwwh6w30fl9ipxdz112h67l342k0"; -"plstmary.doc-0.5c"="02ql0pxjkp5a803f9ayvr9splfchzk6yhzjfrmh2nxzwgczy9s50"; -"poormanlog-0.05"="0k4j77q0h7c4y3aa21ngkkrida8l0lp9k42489kilxzpx6ppjb4i"; -"poormanlog.doc-0.05"="1p1ri0x1j0r5f22nzhplgb87nr5zpc7gwa12p8xwcx51ncmn2db0"; -"present-2.2.1"="0irxkzfg19h5pn0drgl5dlpz34j1p5jpyii05b2xjz4810gnl79h"; -"present.doc-2.2.1"="0c7pmcjhc3p4ilx3fr6pxc4708kl7iw1lds5ngh8mlrwz0hhsd96"; -"pwebmac-4.6.2"="0syrvzqrrk7d83ddms2mc9wsawmcki14vgffdysi5j5gx0ppagr7"; -"pwebmac.doc-4.6.2"="00k4mp5r63i4jrv2pkf9wkrqkrmfvlj6xhngx54dnl2jk60h7nv9"; -"random-0.2"="1y4dn1i3kmd99b5br7a2j6ppf0ikzp744si5p6m5rmvg4vh1jh69"; -"random.doc-0.2"="1gfcswp2krrfswyjbyhck4pb0lq03jh2mfwzm2iwvd3zlndvccbz"; -"randomlist-1.3"="1kwbg73d8hk4wh69fajl1zqyvkfyfxzyv5xykknpa5s67pxkh9c5"; -"randomlist.doc-1.3"="0r8i0ywq21c1h317b3yx5ixr4b1fllgwams4yy5z13alda4wxqdx"; -"randomlist.source-1.3"="1s86m5hcncfqkwlr8mwdyh3fsnyzisiw5dlg52r499wr77r5z56j"; -"resumemac-15878"="0nixlk46dpyay8zsxrfkcng23rdyx48mnq8s84xs5whlrg369s3d"; -"resumemac.doc-15878"="1yln2mz6awzafpmrlzi3s12zj9m7qfj4laqgjpy4783rxdxy8w57"; -"ruler-1.1"="1ikap9dkdw9lzpda0f2krizqbfkyjxvyddils7clim9nhg77aq71"; -"schemata-1.4"="1idrxgfzwcy31cdw07f1axv9qxiy2m2j039rj7m6gqqjwnzpdyfw"; -"schemata.doc-1.4"="0wc4vcn0gbwwgf5c7cxcb66w66yl4s815d6m1cj3dv2mcm83cjyd"; -"schemata.source-1.4"="1qblgn5msrnnaap7w1r6szdzphf7dgij48g0h7cyj12dxy8gm9a3"; -"shade-1"="1dcpvvk5216znr2i0nn302da6vjixkih5nwix9m3hlmrd69z6hcm"; -"shade.doc-1"="0xs86yjd9f6wlgz0dlc89iryh4rba3752blz07zrxzrm89fdq22c"; -"simplekv-0.2"="0a46f1y88fs70msaydv270z33gxyx7v7dswar50s5syd4sbmid5w"; -"simplekv.doc-0.2"="07aba6adwigls3rakhrsamdcpyghr606mr8m0nlgfg5rjjljnjhz"; -"swrule-54267"="075mshpyi9gxbi3n0hbh3ygidzw1daxy697lhc7cc99i39y8scpi"; -"systeme-0.34"="0agy0h2zq8n6723w27psm3azigf2bsw4s80701xr0zz6kmlyrfg2"; -"systeme.doc-0.34"="1xxycz86kxljxg1np3zd6jzwanvp3f67la1k267z3w39f5i63x1z"; -"tabto-generic-15878"="0i65jflbnhqpqf1w7pkagicic1s39gcl319z7g9zr1g80f9532dv"; -"termmenu-37700"="0rw7a9ydsckjv6lc8q8yc5c4lq45bwczy98c6g6mzdcdl2dnhh81"; -"termmenu.doc-37700"="1r4901slsjhg0kzcy07qkm730g1bax1p2410mhh9ly8cix0hcxr4"; -"termmenu.source-37700"="0fvv10j1s49swvif5prjiqvk699l82js29n09scv0x1ixcy40h14"; -"tex-ps-15878"="0i35b4pp38d1l5rac059znlkazrcqa62qm8brhdmx7zzkbhyysi7"; -"tex-ps.doc-15878"="0kgf7y3nxkw8x42wpc1g5mmmbz28n73vgwd9d6rf6fjpzrycc2zx"; -"tex4ht-58348"="1bqhc6r94lnbz5x9hkb8kqnhpj97qy0rx0kc6wzzlys26i3z6s4h"; -"tex4ht.doc-58348"="1a7cm288jzxjz03v7iz9rzsddx5g6y5qxi1k5kqvhwyjb3fsafn0"; -"texapi-1.04"="09cnhqn4gxf0alkx0276jkpcsd0myypbn94jzsavnjq8jknp6850"; -"texapi.doc-1.04"="0529cncxbw53km02pymj57iphgziri3d9cj54pqmjqjx9qmgwfmm"; -"texdate-2.0"="06bqyfl1vnj4gadqsx94lj8cm1ia3w3bmlsfjwwfaad0al3ncxdp"; -"texdate.doc-2.0"="0kks8hswbwhp8dpjdbwr4nm55md4wgabl5ypzpx5arj41x8halhl"; -"texdate.source-2.0"="0mbcap5nfj5ap8gxn4pyv8w37hcfnq4bm5m6jx43cwkzf2hiwar5"; -"texinfo-5.1"="0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn"; -"timetable-15878"="1lnl8gi2rrzcy688qb8b1ff9yivwxdqmbcfx2ph49aymkxfym97b"; -"tracklang-1.4"="0dlfwsysadr78dkdrm96ibv3gjizwkqbm8m7pjipmp637vjb70ry"; -"tracklang.doc-1.4"="1dygdc8rj4kmh1gwpkpmqkih35yzx262n9f5n06k0ydf5rr96fqm"; -"tracklang.source-1.4"="0hdfmlmazyaxqhy8rv5ng3f4xkpbycbw79cqwbh0mw4nyclsf1aj"; -"treetex-28176"="1gl79r8h5brqmkw5paf26vm6s5ipa0f7g7cxxh3v68qg5cm2dink"; -"treetex.doc-28176"="1prh07qqn92il09fbam3c66czcgi3ssa6kd02mb62mczzf5k594f"; -"trigonometry-43006"="1z4sk50nzdplwarbv7ha3gi5v6g2sh2nf85ipdz2rbj3cnz0j53n"; -"trigonometry.doc-43006"="12pm2720vyk1c79qbgk935nridg3z48cbzmzbx9ak66araz9y901"; -"upca-22511"="1px88kyvr7jkzzcbd32pi7zlak9wwzf3b55yhnh9bi03pk0il33s"; -"upca.doc-22511"="07gsza0vhs52qjj8im4i1fg2v2lch9iwk424ik9c1xak1v7s9d23"; -"varisize-15878"="0sd1znd4c2254fsj6i2snj3ys1h5vss2wzylqcp2pv31kbgpfh0r"; -"varisize.doc-15878"="19w6h5w08iyc2kg61h5q4j4djwwm2x0bhhp6k60kfxnk4glccrmy"; -"xdvi-54338"="10aldzxy02d9phqr9qwpxxwci7vf5q9z7sgxcz50kf44asa28fcm"; -"xdvi.doc-54338"="10fxcamxf5nabfsirwvc289kc1lyb6n7mja7mjpd919f7az1knaj"; -"xii.doc-45804"="19jhzv5hqzj59wrfcr1dsj6z56qfckax694idgf8arri5lnbkdd8"; -"xii-lat.doc-45805"="1nn54xv71kcmn9jbkcslz6a64cvjcay9x96rrxnakdj9qcqd27r5"; -"xlop-0.28"="1clpl22vxgqjpzs0ypgak0d6z0sr6hw3gj18r7sgs2q0jf5m6715"; -"xlop.doc-0.28"="1acnr4yfcakpnr8pb8g26qh7z9xr4dms4nfy50ig7r7azmdpz9py"; -"yax-1.03"="058i478l85ilq0asix6mkdn1kfzh2abqn9ngar6s339db4h81lxy"; -"yax.doc-1.03"="06i376649jszpwgvb0bq8wxchjmhwjfvc78pl5q6q1ic2jpkq5pj"; -"zztex-17.7"="0qh6a0jgrf1b2363dw66m8v8r0yq2sab2qm3wk008pvvlajdj45w"; -"zztex.doc-17.7"="1agivqj1mqnhv3w70a292pypm2w5xcbf67wwfz3ywaaaq5amjbwq"; -"auto-pst-pdf-0.7"="0f212m856rdfzflq1bw3vfpy38d8qylaa3vqnfs595h3x5r0dsx3"; -"auto-pst-pdf.doc-0.7"="1f7kj4rga7x14w8v3cjn7lh95inliy2ms0q9vnfnv95jvp5a7kh8"; -"auto-pst-pdf.source-0.7"="10l3ld4jvpg1982f2a80ssl4hkdzi9szxv3y8l1i13pdfdhirv91"; -"bclogo-3.1"="1lnfpy6fvw51cfy7zc1bpqhgca8mcgnhyvh5l1s3712xl91hsvwq"; -"bclogo.doc-3.1"="0vf9fvm607fzw3rvc93crxjg9ilm6d7x7q5n1qrfmkzmkm5mjj89"; -"dsptricks-1.0"="074z88g37hq9xjlvbncmiccq5klr3x8ffprps8xnzvhk7cdwld2f"; -"dsptricks.doc-1.0"="0jj47j46l587hr11n764wl167rkp7w8q9z16zwnnb63dp0gi18s2"; -"makeplot-1.0.6"="0qp0qgcli40hd2dxgbd8fv9s03r81dlhh48pb8la9sh28qrb9i51"; -"makeplot.doc-1.0.6"="112chsx5wxrc7k4w3qzf23pjgr0np1ip1ylqs2igdcihchz6syyd"; -"makeplot.source-1.0.6"="1zksg7iqb9g6my9zyyrmwkhx04qy0118lxf60cm00njwmsi8w1pq"; -"pdftricks-1.16"="0vji4gmlg9b67yj8gb3aj2291ll1xg9p5vq2kvclj3xpy1vnna8k"; -"pdftricks.doc-1.16"="1hzd05l4yyz5giw9kqxaw410na7k85wj0cyw0bbwzxynpzxqllfa"; -"pdftricks2-1.01"="1dlzm7ivhxvz404nm61kxjn5arqgfw5z184qaxwn28yk6ri07s8a"; -"pdftricks2.doc-1.01"="0k0zr8mv3xq6ibc7s016qnk78b1d22jgyq35jwimj3rm2aykdmww"; -"pedigree-perl-1.0"="0mi97av4zk6vgxwyph81dq5wrwv1smqidfd5jrjjaiqvj60pq6ls"; -"pedigree-perl.doc-1.0"="1knhp254w8a3hqg1kyg009kmym55s8hln9qnzn3lwq4b24929ivy"; -"psbao-1.0"="0il4qhmc00ny1syfhid0mvmcz42sqp58zi8gf5hm6p3dsf5jy0z9"; -"psbao.doc-1.0"="0zrmprbhrbj3m0q0swlnk581ka3mws13dsha60izi7bfqxc6crqc"; -"pst-2dplot-1.5"="00y967mflrd0y38mqyv8r7h489jrl38rgaiq871wf9k3cbmf0f1g"; -"pst-2dplot.doc-1.5"="0j1c2kxc63nf33gi1f146pa6hw7fm5x9h4yc30dqg8hsd2v0bni6"; -"pst-3d-1.10"="0mh6xbrvwxx7nxp4yqm71hhpqjb41g4kinxkj2vmspw9wrwclbj4"; -"pst-3d.doc-1.10"="1dp9l6vwhb306j998hydb07c6ig10ibn7h0wwiaisgabn0s69xqh"; -"pst-3d.source-1.10"="0m9lvgmjzzc2lmp63vnly30j9886qabgbhqwpbbyl035cy6k684n"; -"pst-3dplot-2.06"="01v1qldms53663lib4b8sc7il7iyma7hgk19lmn7i42cid6gx56m"; -"pst-3dplot.doc-2.06"="0xww4khaqai4wx2wlrbyis25qgj7ykfamf7vvg9fvrkdh1cv4pll"; -"pst-abspos-0.2"="0pjh72cjpim4v0ri92b7nbjdmilpfa7d49vsvhfqddq68k02m0yc"; -"pst-abspos.doc-0.2"="1nwjynxlpxgqld6slhhrzlsalp9296nbnj2kzr6a9c9b4sjxxbp1"; -"pst-abspos.source-0.2"="1p9i5bg4jx8s6bb6ilbaa702l2mn911g09pjdmk6mnb405d908fy"; -"pst-am-1.02"="1vk1dpvm5bcnxc6k7kpqq5xb6a227bwhlrwd6mdbdapk58jh876f"; -"pst-am.doc-1.02"="10acmb6wm7z9bpgh76hlsjks9v2rzp0qqbcklrjx3iw0jqdk53vf"; -"pst-am.source-1.02"="06xvv8fh818ldzqccf911hw4wr6nyzxdmghynlsg4hjn54ff3x0l"; -"pst-antiprism-0.02"="1b8yxfyc4cac5992a3cc4xkj0ip35z63rqxdw2jx748qs7c3gyxf"; -"pst-antiprism.doc-0.02"="0d4v65fsk28hyiljr6fpk6yw7sac7n9jmx4bmdfgpkagspb7ygpf"; -"pst-arrow-0.01"="0xq79kh2rvgm1abb3j6c075hbcaw5lz44kbyj5gbd1sypvgzh935"; -"pst-arrow.doc-0.01"="1pr55ipihx9zv3vjv617vlzfg85mihnz6aj6c2gxvj6bwqqbmvri"; -"pst-asr-1.3"="0sk8hchv1p7vrpyjslpc45mhjg7l2r66mlmmvhc0s89q1khm08rf"; -"pst-asr.doc-1.3"="1a6d4g9gqjslnfr8fp0dpw72pp7c14qzq5l5i80kv36w5axks7pd"; -"pst-bar-0.92"="1aj1vvp5gwpnbj7nd2gdja6vpy27wg6m3yx4d7r9jqm6kn0sxd4h"; -"pst-bar.doc-0.92"="050nblwwni28rv31zj871i6kji2b15hvsk5n7f7q2q1hhprygc1k"; -"pst-bar.source-0.92"="0k5dw6a31ppa4qqq923pifcblx9wbldq405pglcd61a94pcixm06"; -"pst-barcode-0.18"="1kq92hkqzclr7lrfb6bdfcfpsp5sqvd85sqgl05ikzgcd9bpsgis"; -"pst-barcode.doc-0.18"="11fab07zcqp7g91hxs9awgmz30gzz0k9hh5j6i36aq58ym7j6pw2"; -"pst-bezier-0.03"="13w3hqzfim53nrh5bn82fb4gxx32gfayiaqjk5dx49xc4l3rvq6z"; -"pst-bezier.doc-0.03"="0xjs89hfkf7ak8izf59sl5gh5lawv04nxlajn7sskh187qwbqkgw"; -"pst-blur-2.0"="09fl784hqyvbvs2w9ymd4rda1dfykc1l8g5dpac00da1788ypzim"; -"pst-blur.doc-2.0"="1x881z1z4ra5bcms1yn2p7svs82h5ckwwvlw30jfdwxp4bgs5y28"; -"pst-blur.source-2.0"="17f9k4vqqk6mrh3dny6qfhb6b45g6sg7w50i3c7d9k0djz2wi5jk"; -"pst-bspline-1.62"="05ys29amaikrm31avlz0kcra9j48nwvqwr5fwl75ljydjf6drdaw"; -"pst-bspline.doc-1.62"="1czq6932fmx76c82ylrbh92qs2nnipll8piah0c7f35xl9y5xgls"; -"pst-calculate-0.02"="1knbqbysc6f3csy1y2vf413cw2jpf722l0hhs20yzm8mi8x279yw"; -"pst-calculate.doc-0.02"="1jyxfqc18whihn8jkp041bvpp1b4f7jwi2zdj8abnmx45d16i6jc"; -"pst-calendar-0.47"="19z0czaw9x8hnb1wm042mnlnhzidklyx49py8jm1gfqfk4bv6yy6"; -"pst-calendar.doc-0.47"="0f1lw3ls3ikp8r4ifplxbxcf5bbapv89k1ajz4cbna2y9axnw1b3"; -"pst-cie-1.06a"="0hy5a65lcfs2dcrr6jfd049zf355cygwpsaq5g946qw5sca30lm1"; -"pst-cie.doc-1.06a"="026x180f9w6i2ndmhpaa8yj8vh0zf0nd1nsii7jbhg2gql0pcsxg"; -"pst-circ-2.17"="0kxg1337z9ijqv05h4hmxz7w2qgriripppg16rzg3l3cssbyj5g0"; -"pst-circ.doc-2.17"="013y3b2sdscbgpf46rjf70rwxfqiigcz3d2wnhflrf7drrgrpahz"; -"pst-coil-1.07"="019hda59xplvwvc2jrk6zjlvx26y2m8l7j42sr8w6ydgs49y1m7x"; -"pst-coil.doc-1.07"="1rlp43hi4fs3gkfaic8r49774g7rgg97mkyxzqmi8qak8fz1v3v8"; -"pst-contourplot-0.6"="1cav44hw38rnyi1yjj5z0yqw2ilbrq328xrj4fdipkfd0km0bf1i"; -"pst-contourplot.doc-0.6"="15p3znj8z0s3d336ib264c3w0m200igsq1aq2bbcj92v43rzffrz"; -"pst-cox-0.98_Beta"="07662sjbviwbplb7mjvvb18v8lf67v997hn78q6gz262z41daf3n"; -"pst-cox.doc-0.98_Beta"="0iwvk4db5girx2fn6fhgx6irx288jw2jnd28j4zh8x3f5hf3xfg9"; -"pst-dart-0.02"="0zlm23bjm7danf07330xsc59lkyi51kh89jpxhgcxikgjm4cq3wz"; -"pst-dart.doc-0.02"="0w00zb309hnv2gz32rkirmvn3c1yy2j167939x4kvp9nr0ccw5cc"; -"pst-dbicons-0.16"="1mq523ngyxlds1jaq1cnwkp6hynlz72imc1sh1f2fch0v91a3kc1"; -"pst-dbicons.doc-0.16"="0j4p340dxlyj53s18xqp81cqwy6awpnw6k4q68yk4zx915v24l0p"; -"pst-dbicons.source-0.16"="1c071qx2ira6hd9mkh07k4kaqhy0a3cbhr6k1b4wkmlfswjynppd"; -"pst-diffraction-2.03"="0ccy05jagh7kpra07bai1j8drwn2701qdfgki925mcifsa74r3y4"; -"pst-diffraction.doc-2.03"="12xx19vaygrby5475la4nzygcbf6cf1mq3g14sxyhg997x9q4ha9"; -"pst-diffraction.source-2.03"="0wf4kpdn7vyaf9cy7dq6qf3lq37fgkcg91njfbqy9n9v8k87fv1x"; -"pst-electricfield-0.14"="0kk0jjlcfyvz5dws08wnm3qlhvgifrby88idssjhgvqgg8zpz3yq"; -"pst-electricfield.doc-0.14"="0zx7x15p6vxj1f9v8id7ba49878xjmbqzh762v1sy1bxygj9yb21"; -"pst-electricfield.source-0.14"="0n1rxq6jx331b0qlnpjy7mh84m9vdlrs8ckr2b3slwcwp63cs0sz"; -"pst-eps-1.0"="14grlhaxxhwmpw3xi3xv7n3bq3zx3qwd9rh707wfgz87iaj7jzvw"; -"pst-eps.doc-1.0"="0dz6543q5g4wsqcwcwablr7w7w5l6dk19m9qpgrhb1w8sg7hgc31"; -"pst-eps.source-1.0"="1cn9yl1prwzjvxwgyzs5jdywyirg9hy8g76cnl62gkk9ndmcpryq"; -"pst-eucl-1.75"="0h23rkrdnpybpqjksy411c028g54a5i8l3wjr85p1jlv4fph3kn9"; -"pst-eucl.doc-1.75"="1rspj40d3rx0xwv0sjy2rbgkkhccrayaj38pbr4l001dbpxk3h7z"; -"pst-exa-0.06"="1s94fbqpgv58zks5jfq3dbzhpw4p3gchhm32498m6bsp52kzzl7w"; -"pst-exa.doc-0.06"="1m7gwxbhnii3s7aqi8v09sq49010yasx6k4p7bx43rhir08v1zjv"; -"pst-feyn-0.01"="0qi5zll29rfc7jkmz4hs0y22if5qjn13whaf7a62rdfvbdp1l87x"; -"pst-feyn.doc-0.01"="184d371rhqn549a9vgvdh92ikzphmdsbskny0dnh0pcgxzwdabzz"; -"pst-fill-1.01"="14rdbc3mpi3mqc9vlwnrnp5lz1d0p55w9gqnkiv7dd8yqfrxvay7"; -"pst-fill.doc-1.01"="0b3swpsp6b323594q9rfrpyzlv4rsalnjs0qpij3fvmngpr6baj8"; -"pst-fill.source-1.01"="12xvv4knjv17b7am4csyy005lhmbxdz8s6kz7w54gcjf7py1kh4v"; -"pst-fit-0.02"="1sqdysxpzdlaph42725hvdgy672mzdmhz7scizb0jr5wnq3rn9x6"; -"pst-fit.doc-0.02"="0lvvy353s1py998a7vr01pgvkl29qp60w2gyrxxwjig7j7ihn5lw"; -"pst-fr3d-1.10"="1m0zz9bqdqw1hzwp06s4hma68wwm5mmswrp9jj3xc9r5xjyq7fk8"; -"pst-fr3d.doc-1.10"="1gpijw1iv0pg30kws1vclsy5yjd7rk0j3qspcjlmkj1bhq3fjrgh"; -"pst-fr3d.source-1.10"="1zvssd11fg4hf53rz4c6imsgi77kfcc7l9hh0ni8jnznlgmdjkf9"; -"pst-fractal-0.11a"="0hv8i75hnbpbf05sw4zjf2gal5pc0bzc4mf92mjdkvgnwbrpy58f"; -"pst-fractal.doc-0.11a"="07i2fma5sj2g63asl7rvaczdcqdfprw8s1z8q13s1v9i2rzq3asd"; -"pst-fun-0.04"="1r1zvnyg5m16fifi5xbzn5iypr4n4d9vbnqi42h6a4m4y1wb3qdh"; -"pst-fun.doc-0.04"="1gb9rz3kz13xzflr7r00dalqri10lbn830v3xcpmb4n29a2bf0qv"; -"pst-fun.source-0.04"="07kpm9irvp7dn0hd1wh08p7lfbgn78jj63yqzzxn1jb4wrb4qkx3"; -"pst-func-0.96"="0avpfmvnxcmqvxk8379gk37pnhg4yq760va1ly9vqbqzz4mxrf8v"; -"pst-func.doc-0.96"="0k9q302b633sc0h460h33h53k78v37a0hpkjkicsv9prxkbvckcz"; -"pst-gantt-0.22a"="1hkrmdwg7kc4xiif4fvhjwbj2ryxlrbyqb7h2n3rk2jmmky4hv7p"; -"pst-gantt.doc-0.22a"="1fqkwzsliv1mg3lyidgcsy652l5d2qy7x1rjix9swvk4vblx4fjs"; -"pst-geo-0.06"="1s6bqzsvq12jmji737lr3yc5l91ksffz1wgqy8i4r258x9s1qmc8"; -"pst-geo.doc-0.06"="1any48dgybc60dsfkcccgbai5rhgqga9q6fm4s8xlc6im2si4aw5"; -"pst-geometrictools-1.1"="025ai7cw5vv9a4n2gdp68gavmplp4cj3s3n14jhk5ga26a411s0n"; -"pst-geometrictools.doc-1.1"="1z2pgbf426p5qqqcpd3iqhdhk5izgxshqilm0bky4b459wagh9wx"; -"pst-ghsb-54074"="1cn63i49wi6ddq59vfk96jq8kbziivfdgyvvvvj4fq4g7qqs6rbp"; -"pst-ghsb.doc-54074"="03j0c92kfklj161wv59f9x4npsbkvmv39xvza5mi7s63m1ma23wl"; -"pst-gr3d-1.34"="10jn2wdc908z2imnpcv03ffm83228fam0cqgmgmcss1774r2nc18"; -"pst-gr3d.doc-1.34"="0985ydi7jfsvlynjs5ddjhyhbh11nficfphy6qnvbv0jj367rabq"; -"pst-gr3d.source-1.34"="1z981d54aclpbq9ggy28qgnsspgwkavalm0j68pj69jxbcfxrpby"; -"pst-grad-1.06"="0bzq77vj333dsgilfw9k7lslhpmk67id6p1z14aw7nfrhyc80082"; -"pst-grad.doc-1.06"="03v585i28dc65xrydsp5jj9nd6kfpmhrjkwm3w89dv0p32xyzh11"; -"pst-graphicx-0.02"="1d7zvrnhch7vj1l9xscg4ynj5alml7pb38zwqns403wvcdnmb1an"; -"pst-graphicx.doc-0.02"="1mly0nr5yc5rdghy04sarhrwlxiwnndk644s4czf862n92ammh5d"; -"pst-infixplot-0.11"="133806cabfd6c44b0sdhchcmqjqswy2q2j2ry5kr78dzdna40y23"; -"pst-infixplot.doc-0.11"="1cd3i5ishy7pawv3ah6486kb63351p1g2d7iwx9zh5vwywi1ymqm"; -"pst-intersect-0.4"="1wbipiav79g5cal64bny5ba872rr4848i32w64bhrl7awsddyq0f"; -"pst-intersect.doc-0.4"="1y45r9pdddh4pbb3bfp6mzss7whapf4bv7zbkrx7wmyjaal73s5y"; -"pst-intersect.source-0.4"="09pbicmzmx0nraf5s8b19grra8p2vvdl903kc582dwn7xvqrk3rn"; -"pst-jtree-2.6"="0082prldszninnbksndf6y5mklvp4zgdyk31v78axp5fl3mq437n"; -"pst-jtree.doc-2.6"="1hgy8iavrhzw6w8r0avf3h9x52fdl3lqshf6mxqpffaq1b0s6xqc"; -"pst-knot-0.2"="1m1bzq66jan3miyp6r9j1pkk7mim9xjn28ldd1nni06v65hdcz48"; -"pst-knot.doc-0.2"="0gfxyryyf75p89y2l1ar5yfy5c6qawbz503bnpnw7n575rhsz36d"; -"pst-labo-2.04"="1wman8073p41gxn5aa0jilpz8jl7zpk69vwid6f0981m3vc1jdk0"; -"pst-labo.doc-2.04"="1zdyp20x78zxqp07dcf6hiynlsq04s5fd2jjgjcs3mbjfz96yi6p"; -"pst-layout-.95"="0199jrw7b58x6qby4k48n8sd2rffxlkhrp334q2dmalqsi701l89"; -"pst-layout.doc-.95"="1346ww24d9c64h03zgz7m7xdsnvkjy27cq4nbjn56bqcrl88982d"; -"pst-lens-1.02"="0220idbrzzslcmlyxxzj52mj9iai0p2ya10ykgkssyd8nfbl2jin"; -"pst-lens.doc-1.02"="02hbbhdnaz6cc5zkp2zmm92kbk0ppzwljivr1grx4g0jqqw8c2h4"; -"pst-lens.source-1.02"="1pwn8wx5w65xdz46qf5mzjkg74q296bkmzwsxw2aml406iksy890"; -"pst-light3d-0.12"="0glqibq1h8ynfkgn9r2p0yvgplydsigg5chj5gl2vq2hsb38sqg3"; -"pst-light3d.doc-0.12"="1njiml3v4vb7jxpnai69b08pdikasjk30g3xp31vixqrzr56i4am"; -"pst-light3d.source-0.12"="0rrgfxsbvfbyc1g1xsakmiiy7f8skmv2bkgq6vbji9y1f5s3b4zl"; -"pst-lsystem-0.02"="02m2g6kjs8fxifsdxld6ivjxch7vj137828xpax8s7abr9f4dyiq"; -"pst-lsystem.doc-0.02"="1apcp1ms40xhypxr4fq6xrh91ff15gplzllh3zs5b1w153xq3w8l"; -"pst-magneticfield-1.16"="0ppqqvvnyr49y7m7y0b4cbzld1r2l5y19y7j9pv1hixd3a8n0ghr"; -"pst-magneticfield.doc-1.16"="06bymmj54rrkv4alh6hdqj25gjwqs1sx1iaw5lv6ih1ys6fnnyar"; -"pst-marble-1.6"="0d7xlygws5f1hipyc2ba7spr2y8h3rprigbrryny3mw2ycdh1yqv"; -"pst-marble.doc-1.6"="18jzc9fpjcrhya1knqsxxmaix8sglfbcsiszxc949pf4zdpm50ym"; -"pst-math-0.65"="0xg3fkk9kmhyqnrp1iyblqc3a7jx7xhy6692nx9ffq3mkg7z9vak"; -"pst-math.doc-0.65"="1gpfqhs2vjbflrriyiwywhq3dd17rf8pdp9g2n02g8ygxgzqhv9r"; -"pst-mirror-1.01"="1z7apfya920d82mqzrivckavxviazngxz0n05yavkzslv07qsil6"; -"pst-mirror.doc-1.01"="046mk74wj1qxkgz7wf8d3cglrds9krm0v2mkl0hqp86n2rr45nnp"; -"pst-moire-2.1"="1i0fs9whsqjb9s7b3g2gm2mparw809nzfvz0ddl61qr6zg7vbdzz"; -"pst-moire.doc-2.1"="10xpgzpi9ihl53gzyvz07jbnz9hk9piv6jcbk5pah57g91ffs70m"; -"pst-node-1.42a"="0ma3q1l68v5dzch9z6z3idixgs8v9vp0rqij4fqafp3lx3vcpdi8"; -"pst-node.doc-1.42a"="00cmh35ciz3vmy814id8i0phj0j4hfjkbsm18wjyxj83spy24pyw"; -"pst-ob3d-0.22"="0pglxl2prdi347qqrjpyk6hr3arhfc4rrcz1mnyz7q5jyamlskp5"; -"pst-ob3d.doc-0.22"="0s0jyb1s21pkmdnz4wdz793lbvidl9qdfh9cfqa0bwx9mmjvhpnb"; -"pst-ob3d.source-0.22"="0v9kih4gxk7aqwynihipm1595iswwkv5y6qj262aikhr6bz8v0sa"; -"pst-ode-0.15"="19kqlpsrrzbisg7wjk2z3a9f1xdl3msx01x861yw9nrqh3qn1ddc"; -"pst-ode.doc-0.15"="1bgc5hi7q0sjjq1qfdkfa80nfb7d4k964k7wx4382b9cg6m87zlr"; -"pst-optexp-6.0"="0j41zdqyv33mdk70i8smkhznz2bn9h4gzamgcrv0744ydibyijg5"; -"pst-optexp.doc-6.0"="1rbz7x37y20xnabd233frd4w1zpssd70mvl8pzzclyr40d8s66vw"; -"pst-optexp.source-6.0"="1sbpjr2d8k7ycg072hvl535lhh0093nnmhvb935p66r7ipcqx2lf"; -"pst-optic-1.02"="1591vaw8y2k99vr0g8dy11grrp98hvgqw5rl9zp501dh3hnf181d"; -"pst-optic.doc-1.02"="0q76b92w32x744y6ri1nf2dnzv00kyw32xyv3l5snvs728qdvayd"; -"pst-osci-2.82"="0gz1ac21gwhv2xqf5ny0zzgi83yg84qlxgx8mdj9xpnnpv6mccig"; -"pst-osci.doc-2.82"="1gdx6a07wg5bmfpx9myf7wxa309j64q5y2q1ikzfgf5czy0mxpa3"; -"pst-ovl-0.07b"="0p4yyrvagfjamwd1f81qyfhz6wwjpqi6nfazyl8ml1fd7qjv1g18"; -"pst-ovl.doc-0.07b"="0pqh9sz0l0j0bzvsva6kba6gm7cssy36i17px2zrr3lc9k6yajf4"; -"pst-pad-0.3b"="09z2dkb2h8hmf46b0h1b235d1yjv42dgx55pj5s4dbpxzgam7ljz"; -"pst-pad.doc-0.3b"="1c597riwdggb0fli4w4ay2iwkqhaiwxy3mcl9diz8lijy0h4fpk8"; -"pst-pad.source-0.3b"="0b2w0pgp8njbndx6x3hq0rwxsr1gwf848l6gk3vrkksq419j2506"; -"pst-pdf-1.2f"="1klgwqpc3m5k5ciiqb070h48r9mp4hmssp4s82k79n6kq45ar33m"; -"pst-pdf.doc-1.2f"="06b1kpazsfn7gv2npfrnrmxlky5mhw6dfyzip2lwd243m08jdagq"; -"pst-pdf.source-1.2f"="04b0kpxmzi42116pxmkdjl87bm6j22wr62w7bka9qww2ifj18na8"; -"pst-pdgr-0.4"="0k7i88srnysbkk62mr3w0fgv3dz8hlz96nlxbrfm4arhxs6ah2pb"; -"pst-pdgr.doc-0.4"="08lj4bd028bzwi25j21h98ma5zw72hiarpcn0nbxwhbbqz865q2m"; -"pst-pdgr.source-0.4"="0q2cadndr14x2sjjdsc07xizrb9cv8i5q8w14lrwr4xkamagav19"; -"pst-perspective-1.05"="0g88w41dpz9607g286ahba11af2a1x9zya4saxhjd75j9il0h4k7"; -"pst-perspective.doc-1.05"="04gim8i8fmy3ysyl1y237cn0xfdsiii2pwkl6y79abz1gscn0pfj"; -"pst-platon-0.01"="1crl7q5r89vl99jj5f6ki8vnz5f5i15x631ra811033xmi32z4yh"; -"pst-platon.doc-0.01"="08d0g6mwkqrc81g5dhk016bi2dvr3jz389f32kx89w6n11iw5pqr"; -"pst-platon.source-0.01"="1c4pmwrfk9yxg8jshhy5y4bwvlwwm6xn39lgr3xdvsl9bn5pfz2b"; -"pst-plot-1.92"="00kczby29pw6kgsva5xfz7db98r39g3z88vwxm851dlv4mmvxadg"; -"pst-plot.doc-1.92"="0axc5gm6icivnrb3ncyy36b6qyllaacifml2p1ik0k0smk9ff8kv"; -"pst-poker-0.03a"="1lbrwf66hsk6pylp0cij3yxzn6y9z7m8wrsjwpz9xgshwqqjffga"; -"pst-poker.doc-0.03a"="0rhp30incxzsg7xv5j5isb6z79xpsbyv1qp1i1ihscwx2xd6iaiz"; -"pst-poly-1.63"="168ydw08wgqsy642w7nf8nyzlmxccpcbdvyc5h8vqc6i8xwrlzyz"; -"pst-poly.doc-1.63"="0ls2nf4h4p1dc00mmplc73bv5vanddvxkmxv5kix9b471xx0y696"; -"pst-pulley-0.02"="12w7rcb0z564xlf17258dx1q290i3p79bv4vhqpq5pp3wxf46c5p"; -"pst-pulley.doc-0.02"="1x3c2n8js6kvnmdrhnm5ng6amkwxmdlbnz4wsh807q5agqmq8q6k"; -"pst-qtree-15878"="1bv3xxysk2jw5n41i0c0zm2kx2r6qpyfqmpaf6dqzm08rn7ax1lw"; -"pst-qtree.doc-15878"="1kkcrdm930lr128ffzcqd3qvh11mrikiar3kqszzscpyfkhi8vc1"; -"pst-rputover-1.0"="0ahx2fjnwgamdb4r6v6q3bg72xpgvpfan3ivvbi0gvvnah98l4zv"; -"pst-rputover.doc-1.0"="18gaman0znqzxdqw0r2czb30l18wh5740skvsclvn28b5wfa0i2k"; -"pst-rubans-1.2"="09lmil6ishwjaybj5nqabxm20xwx8nw1l9dj9bbjxg42h1wz26mi"; -"pst-rubans.doc-1.2"="0l6w0hssg5qmi93inh3n7wk7hps44l8w5xvj4x4rblh3fdlrrb26"; -"pst-rubans.source-1.2"="0phh3kkxrr74y6fim8ak28sdxd5fn11c1nyn3pksd7ddq0qy5gva"; -"pst-shell-0.03"="1j97kcw8w52q1ispkpbwblxza7q8v25288pzxkyc4yf7802a3zj1"; -"pst-shell.doc-0.03"="1i5dbbnzadhc47mg7bdv6vas7ynkx2c4qpz0khcvrz393kszjkdm"; -"pst-shell.source-0.03"="0rc6j6cy5kwh9sq2gp5scxpb58ycjqdycnmnqpy67xha62fnhcsp"; -"pst-sigsys-1.4"="1v3yz2vhazp04xjd0bp4pyyiz0v4yq7hbr9mq0m2s8pg3hisfbwr"; -"pst-sigsys.doc-1.4"="08m72w1jxrafcbr19fp0yvii9aama1rfl9czys6gr3sii9ks6qxa"; -"pst-slpe-1.31"="18f99ravk128r2cg84yxv3cjx2df8fgzq1f054z5g5ig1s5ginws"; -"pst-slpe.doc-1.31"="0g8dhw27n2vf73289y8rah5xakb60cy23993vl3ygz1cgrn356i5"; -"pst-slpe.source-1.31"="1mxninpgycpbakvmc9qc6032mncz890k5ggsfm507jzyfxrdp5lg"; -"pst-solarsystem-0.13"="0n6w3fyggf7favnr90239b6dp2j7q31qi5yjilxdw35s001m1ghj"; -"pst-solarsystem.doc-0.13"="1bm77lqaqbjnhwv6fra0g05ij4l9vj9hh7gs3sljgdmwy4syqq24"; -"pst-solides3d-4.34a"="1sayghfxhng2kh2yn2j095c7bymcfzwa0w6wd31llvp0pqzym1rk"; -"pst-solides3d.doc-4.34a"="1kz4855a4b9pjf35wvdb3b5vi3c7zwv8pf3d38n613yg3gmpmr9h"; -"pst-soroban-1.0"="0fygllzq9gp37nkffgk3am2vygl5d5dwyr4avf1gvh0s698jj8by"; -"pst-soroban.doc-1.0"="16a1w9ci7ivqf30hvr23fv6j6clqjb4y7nmjgcbfz20xzxk3aa1c"; -"pst-soroban.source-1.0"="1h6srvvl3s1prswlj608y7pj5l4zzn13yqrhdv41956ikd1wbb14"; -"pst-spectra-0.91"="0nd87bnxf8giakadg457p10idbnn0m982l0pgyx23495qfxywax5"; -"pst-spectra.doc-0.91"="1y40d08nwnpkmrm0jdj69drpip1gwkd8n9hqmairl1wccs6r6dhk"; -"pst-spinner-1.02"="1nkmvjy19cpxqs3ii3djmrr6yj8naf54a97jbprs37afml3zql2d"; -"pst-spinner.doc-1.02"="1sff7bhnxjj7cmixl9qbfvglya79187gx28swxr7mby9ybf941j0"; -"pst-stru-0.13"="16i39r6vivs0z1l5l48c3vky9bac22n5k7gddfj7vlllfg6llgzs"; -"pst-stru.doc-0.13"="1cl5sq39pfvwhww488kq0cgnlihf63jkhqdd4rciaa8vf55mc6wm"; -"pst-support.doc-15878"="1470n03zanpw35dnfzyjqm7d5lgddrimypz28x0zsk9nqpamnqnv"; -"pst-text-1.02"="1s0dqi2mpzlk8069piv4z7jg370navi4r5z8aysy9vx8n0vm27zf"; -"pst-text.doc-1.02"="0ia6h49lfi9394sfr29wmafbhvgdm5zj7q13zll4d1agakn48j27"; -"pst-thick-1.0"="107cprs3hg9jmkdq00w9wc6bbkqmrdi91zm7bjhih461jmqax88c"; -"pst-thick.doc-1.0"="1irf2v4yg0w5v40m2przdcbhr51qjcrbj0s0i53rq4w4v3gl03hm"; -"pst-thick.source-1.0"="1qwxccyqzhl6mikl6jp9s2asz1aj96l86yq9s8nfacjg14vk5n4c"; -"pst-tools-0.10"="1x5c96fr17krqqhla1bw9qlgd29r6a97nmjcb5xy3qnfhg988mq8"; -"pst-tools.doc-0.10"="15pfzrg0xab8psbbw41lvxk4r8rfi180575cnmj3hvgklnsrx69d"; -"pst-tree-1.13"="0j41snn7zf7nrxkry85g1viac03cryhc6ixrsjqfx6n92l2l2fgi"; -"pst-tree.doc-1.13"="18m5a9gm3sdhz2dzdlxc6k2rjnjazd869gsmq6rg83davgj5hp4a"; -"pst-turtle-0.02"="1b5948sqlh4yaf4j3id2zq9r43v6s3azhbjkww7vmxc53rfcqfpa"; -"pst-turtle.doc-0.02"="1wfka7rwysdd4pyb4nhp1fy4f1lnqg32l6rjmqfd17fzpkmb3035"; -"pst-tvz-1.01"="0ly1mqlv7fx1xjivacx5dwwb1fjhqfplps9n0wzypvbwyd4nbaia"; -"pst-tvz.doc-1.01"="18pcvx7rlvad0a6hp0q8sq5pf1y1rfydyqd11bqn94d56nqw6api"; -"pst-tvz.source-1.01"="00i2akla1ibrk6hc0rby5q9n3ji4zlrs52d77y9iyazj0v3fab5i"; -"pst-uml-0.83"="06bll6q06szfsaib7jf09915qvz0rzf0gp5c9crwb139gbpzvxwq"; -"pst-uml.doc-0.83"="1c0pna78alfhi8i7bqr9zwcxx7sksi3idin5wyqa9dr95a2pwd80"; -"pst-uml.source-0.83"="0q5x7m84qdv8sy7x2nqfbhwp1lryr5vkji4hf74a0ialc617nfvd"; -"pst-vectorian-0.4"="16ljzar4sqq025z9ff4nvsxz4izvm6421jmndlz9908jbycqq8f0"; -"pst-vectorian.doc-0.4"="1b58x9dn16waw2vr24cgrc4kssfavwiryanp9ljdvsq3h0rwwics"; -"pst-vehicle-1.2"="0ibvvjlfnlxdrsfhm35r60r66jms2y674libsqlpk7f5bww19x4v"; -"pst-vehicle.doc-1.2"="034zhw30ii840mzg2ix2gf3xlqrkiffpjfsszw0w9nqqyp8r6vls"; -"pst-venn-0.01"="1i9frqc6b4wg3pb0ks4v0xxsfzs348ddhncr31mhfs39nbj6029d"; -"pst-venn.doc-0.01"="1y2pz45hlm2gd1lvj8p40ldnl04pzccgbsa3asnbpcifkx3gj4s7"; -"pst-vowel-1.0"="1p1adlrg62jsqzkjkl8avb79w26kkd5jdssmkcsd65dg5qfa9x50"; -"pst-vowel.doc-1.0"="0wyl0mvx2d0zd8q0sdmyrqgr72i2igv0669ajv0gz8miv04vr41k"; -"pst2pdf-0.20"="1rm0frzi52i3irfy5703kw38d3f1grby27nryjpb4ziiw6n5yizb"; -"pst2pdf.doc-0.20"="1sll10kps82b47npv2g2r1l3kkm5y75mp2p2pzqsnxxivgl5kp2l"; -"pstricks-3.01a"="0dlfwvlcwl3ygrxrvfhdkpksdicg7zwvijyhkq2f1a456ainz69p"; -"pstricks.doc-3.01a"="1jva7s7fw9kyx1i5l6l9n37k4p5pcypjsjn26ci4p41405z2h2dz"; -"pstricks-add-3.89a"="0b702qc6i9ic26n1wxsl40r0mjck73ibsnpsbwq14lzq5yjw21mc"; -"pstricks-add.doc-3.89a"="0h2wi9604ajmc8801yb382i2fy5krrq0bsqnncwy606j11w834np"; -"pstricks_calcnotes.doc-1.2"="00vgcdf73p4143dfjcvs4b5v4phvisv76ink3iiijl6s6f9zbmy3"; -"uml-0.11"="0gl1063pjxrif7qpq9wxwajpsp32idmnlsq27y668lwpkpm0vmzn"; -"uml.doc-0.11"="0n3flbps3s8lhr9pimdw41kmyrfvn51pddm4d3yc08v96sgg65bn"; -"uml.source-0.11"="0ylzxyl44p0574qvga9arjl84ip8nsafpgabbwjrk2kcbs47jsi2"; -"vaucanson-g-0.4"="10dk1ff3swbnx6l6c30s1ryn2dbyx9harmrcg7whmqdys1mahsbq"; -"vaucanson-g.doc-0.4"="1dlf50f0hpislqkcbr685y5xg7iz2y6zvlzjdkjq3af4qv7ncf5n"; -"vocaltract-1"="0af79zsabml28hwhf2nq19s1sf7p6kljyvz6c2zlbx96a5k9mjs6"; -"vocaltract.doc-1"="1sjvklf54r6znggylk2wyf1fw806v8msc2g24ibv4p1ia3da2giq"; -"IEEEconf-1.4"="1w544ygz9wiw8680f7q6iqpi40nblx7jl208spxmpmyf4p1xfgdn"; -"IEEEconf.doc-1.4"="1s08cgfch5z3giimyrz88p9p88p7967cm2cs6avxls9sm4a9y9aq"; -"IEEEconf.source-1.4"="1ngzyzyk23xsrmnyvxbfk3jafhparpqlg8wp5qcd1n063ln8h4ch"; -"IEEEtran-1.8b"="1s37a8b870d5pjc54cjczcrlli25j6hgnxxxljab4fa2b5b7y4xr"; -"IEEEtran.doc-1.8b"="15xi8241lp45mvnbl6nay60mbdzww811sj6dvqby7236vyi7lr39"; -"aastex-6.3.1"="0w077r2lsir646ix8n40wy5vy0lnw8vdlw1nmc6fvw2hmrf3w4vi"; -"aastex.doc-6.3.1"="1rdpiv6rlcbd06flc3rk7a1y3xi899h53r6binbjd0krvrss48s3"; -"abnt-55471"="0zw8vdmqcb5qddc0rf8qd67fwprwjagzy8s9ildgisb7arqmbj5w"; -"abnt.doc-55471"="00m174q9gxsm23j3fla7m7lj5fbr7iqfw02dz9s6481nfsjh1wgy"; -"abntex2-1.9.7"="1q7r2j7c5p1f0gbrc3sjd5gjq2mhljf1nj5n5760snhwj3qblr66"; -"abntex2.doc-1.9.7"="1id5yj5kh0qgjywbiajaf5hf9ix9jq8178fv2kvp1yslra7r20s2"; -"acmart-1.75"="0mylq7szpa7hz9wzgfj2j5lfd7vh7w3g2vlk84alvplfkgha8ac5"; -"acmart.doc-1.75"="05zh7vx3hz9raa2jgxg1p6pwwk2g8r5lmzp3glv5c50rskcjaj6v"; -"acmart.source-1.75"="0sq2dq2a675wryy3j59c133qzns82a6hvga8zcvqw85hn7f1fifj"; -"acmconf-1.3"="17l1kcwv6wk5p752lmanlx0bmh2py4hfxranapgbdrhjpis4jm9i"; -"acmconf.doc-1.3"="1vyhkwqg0v3pxjnlwzwnmiffh6b3d9nrwnpaqjm24j9d2sc6cxcx"; -"acmconf.source-1.3"="1n8cf6n2fdb88xmnj2m5r3cjz3jlp9n7bn1yr717fsp2ks81pr3f"; -"active-conf-0.3a"="1chi30gbr7xjcs7y3p2y8vfg6hany4wbacdm4drha9pa9m5sxqgw"; -"active-conf.doc-0.3a"="1css89hbdg8zgl7zf2x7vfgbl90x7bjvf0c0m0akjk8fzx936g7k"; -"active-conf.source-0.3a"="0anxqifjlf96z4vvr031v26s73d1a1sgjp8xv9xxv0kia4l7048n"; -"adfathesis-2.42"="0j60iq9nzk5kbs12dqx5jk84n14kdlx93mcypwi9b2gn7kyqzn5i"; -"adfathesis.doc-2.42"="0c6k4xsy0jg95qg45bqk9527kb3k3azyxwpl2zrkw0ld6k47sswz"; -"adfathesis.source-2.42"="17irbcz9wjnc6rj9f736i2hw4qrjwa1gz5z6w7gvq26b68pkxrw4"; -"afparticle-1.3"="0516hjm1v88vk70ggagkj0s00n465y08fr2ys3f2gychrax425a5"; -"afparticle.doc-1.3"="1ajpc55z02q8wgriwzzm4f96dmn5bpi9n81zad6kay7c7vwfa9g5"; -"afparticle.source-1.3"="03cx2ak956rdwdd5ya49fh81vdwrzq9y813r1h8qcp618sr3h14n"; -"afthesis-2.7"="16jyz1skb9l78dwphggq23jm14zwhycmkx3kn0sm13dcfifrkxpd"; -"afthesis.doc-2.7"="091f4flclyahjlxwa640l7vmrfiyb4wqgkh19caq8fld96zkbjir"; -"aguplus-1.6b"="0z7mgsm9pa33gykhwzlmpa3shg7ragrz3jdp8qfakp5ck2mbjysh"; -"aguplus.doc-1.6b"="1105vsng0yramk84pfcg9pvzjbm3cbyp84m6sxr9wadw02z5kj8j"; -"aiaa-3.6"="1z91l7lhi5pnh2ignmskd24asaalhyhdywkl9j6a7dp6cplswhy5"; -"aiaa.doc-3.6"="1sz6inilvyaqhnj1z88rws7xwkhhpw35il4ppxw9kn9pwvnrn0vf"; -"aiaa.source-3.6"="1lsbfp2zvhpyf1vb1ia9hdz1i796dbfqpndcfy8lay48f89n3njg"; -"ametsoc-4.3.2"="1ma0kxya5gxirqh9dliz1g00bgkpfy4jkj1npjgwqvgs335rri81"; -"ametsoc.doc-4.3.2"="1jv1sdd8p9q4qk20k2id5zbnwacxicp7xmj1j9vyp6cm7z6sza8p"; -"anonymous-acm-1.0"="0blyv8pj41qa3fvhwsk9kq8qwp8x0b1iz7vyc3lxcpcv626aqr2h"; -"anonymous-acm.doc-1.0"="1j0fhwv26ziw6rvg1s2x0ry5yq2sfa8a55xvpyrzl6pjmzrj3czm"; -"anufinalexam.doc-26053"="1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396"; -"aomart-1.24"="1dczk7aan6kcczp3jdb2x7lkrbjaxk8vbbqzcjfvrmigh6fdy636"; -"aomart.doc-1.24"="0ka345n7kbqsnpgcyzbswg2g3a328ksvdwvqqkwvxbns1l6g5f99"; -"aomart.source-1.24"="0pzpbn7s9m4s6cy9nd9jg90s3km23nl3ywffp7p2hq8p2ms72rpj"; -"apa-1.3.4"="0g7y5l9908l4aikm0mqgwfcdg19dbllcgdp94cl1aha7h4jq0971"; -"apa.doc-1.3.4"="0bzicm0x6sf78jbrqp66mgfjmcd7kw0rgkv0c6ah9945b9lh4ly5"; -"apa6-2.34"="08gk55f1a52az88nckdljp67vqv5i1k3n6wwxhgqb0m66j0aax8a"; -"apa6.doc-2.34"="1lk20c5lr1l3niccfcagn4pbfqgixivnz6sx1kafvljxg5gw2k8g"; -"apa6.source-2.34"="0qbwizqyyjc72c8sd2p7pyhdcqnv4xzsapjyhyryaifpm7x6dck8"; -"apa6e-0.3"="1da46dhvpwmjvm3ma4zbnfgsc2yiqg9d6rdrw3bd5h2ibs3vnlmg"; -"apa6e.doc-0.3"="17m97m9v0pcs58i3k7sdj9h1vifv3f0cxxyn4fzi8pxvzljwl5qm"; -"apa6e.source-0.3"="1155ic0k6f6gw6zmqq8pv74hcn45skjzyarf9vpkcksj96qr07ba"; -"apa7-2.11"="11ikpp9l7w0iv6bxdl1m4r3zbh9r2rilig56187q7fd1x7x9pngq"; -"apa7.doc-2.11"="0fvfl5ag5d0rdax4aa4x1xz1q6vcvdzlj2k58x08qk6gvv1qqvzr"; -"apa7.source-2.11"="00zyvd1q8zpmqrx244ljh7caxhdfzz0yv7ph8vc0c0x5rrbz5r0s"; -"arsclassica-45656"="13fql9q89zkdhid841hwxyrdbj6bd692lnc52d0yiibrd9gd9f4a"; -"arsclassica.doc-45656"="13cqb49296wzph7msrhpzswlyknvhrjaa81509l4j4mx1snxyk4b"; -"articleingud-0.3"="1ydj9dysf2qgk36ssp8pdr4c6dh5iw27kcw4ykzkx22ih5an0n01"; -"articleingud.doc-0.3"="0mkv9fq0hixkjf40la5na4dh0yqi3adgr8fyi1x74sbyi78gmfhn"; -"articleingud.source-0.3"="1h1w0fxa1cyw5d943mg8na7hxwyq2ki40gql9y0f7fdx31faiavv"; -"asaetr-1.0a"="05ff3l9qhk7bc2k2kk0acpyy4fxdfh3crngj7lgnvwbxa5wh8dn2"; -"asaetr.doc-1.0a"="0whp9d9pas44j775i4vn7zh5ss0yr4q5vbx51kz768zwgs5x8222"; -"ascelike-2.3"="039w1lm3bpfrrb5inrmzklmr9yic7x1fs0lpjl8z49mijvqsv1df"; -"ascelike.doc-2.3"="1hb732idc36m86qgss7wwsyqj6zgirh9qvf7ybpmqz6arwsml46j"; -"asmeconf-1.26"="0czrnypfx3yxcl1l8pmlp10nic8m6q3hd9rq3kc978xas5ijpcbk"; -"asmeconf.doc-1.26"="1awjrmffg318hzfkw8qj0zsm8gfvr06gjmyn1x2wfz71wylvgr66"; -"asmejour-1.15"="0vn60anrwncmiayxl69m89ndh6id7sarm74lymkgq2sfdqm8yhdj"; -"asmejour.doc-1.15"="10zw3qvdd8ax3k8js8k0acsnp7v19faypf403bg7waxi6if5i9iq"; -"aucklandthesis-51323"="1zlsa80vbby0jp46jicygq2fn64f1mgppbw6bq4qm9ncsapdz92j"; -"aucklandthesis.doc-51323"="09n2pdviw6xvh9ymka32pyscn16vgcxbij79nq0hxn6b6msxnlq1"; -"bangorcsthesis-1.5.3"="1n59ivvxhdafbryz22llxbgkpgc38ks5bfkhqcmb3yckk50awyq6"; -"bangorcsthesis.doc-1.5.3"="1jnhnf8vzqwyfnxl4bn666ak1fkfw3igncpv2g9569ky47f3133h"; -"bangorcsthesis.source-1.5.3"="0q5gbp2zbmz9i33xhhpf3ir66jzcqqdr7r6zi9gz3biqr4wm8q3v"; -"bangorexam-1.4.0"="0aq9bswsygpbsjsi3m8gg3gsgwhp8i1hfapdvlf9055i7d09lyxb"; -"bangorexam.doc-1.4.0"="0x5bhac4gryhmld733dk6zhz2z9w7gawy7yv432v57hc9vvbhhw0"; -"bangorexam.source-1.4.0"="18w8zf29fz1ilas7h9nzvn0saj52n825c8vkqsq4np40sa2ccn4w"; -"bath-bst-4.0"="1psaz3dw0qd9z8cp888hyfl68j6rk8nn3pldvalfpyb1bmzr6aza"; -"bath-bst.doc-4.0"="0v4vap8rvcmlkz147y60pc0prc8ggc0v78laags7jnjpw6f887xx"; -"bath-bst.source-4.0"="1m0j1rm20q6h8ywcsf0d63srgbnr93kxacs53jllan4pc7vjd7vc"; -"beamer-FUBerlin.doc-0.02b"="1ragp50ky0p240cyx9cbwhri5k4ghzbvclps9p40wzgjlqf8a5ws"; -"beamer-verona-0.2"="018ckad1q7ffkixvf6q9a5d4fzgpkpf9qv06cfv0rjwp80k7psyg"; -"beamer-verona.doc-0.2"="11vv18n971pcmn8lf2cya7jf55x8zw1d9s4sg2l3q76rdj7l53ra"; -"beilstein-2.1"="1xh2955zfnss2n9g8rsa0m1kad4b4xpsdrjj891kj97hhgd9hpdf"; -"beilstein.doc-2.1"="0k78mwjqqib6hx7c6lcxkzrbg3gfw64a68fj32g0wpvdyj406ssf"; -"beilstein.source-2.1"="120gcmpz53l2pzagh40nsji9g86fq4xvahzhwqqw7p01r03wc0cl"; -"bgteubner-2.11"="0a8zhnl1nxzg5r525sn8sz44crjdm5fmy09glp8cjj7nic5xj32g"; -"bgteubner.doc-2.11"="04nh6c3q2w984x7kmgj023dbpjq9mqciyg4xrypgc4zv8wvcgv1w"; -"bgteubner.source-2.11"="11g65q55cv4s72cpraxw7yj4qskkhqhc0mz0sfy6c8jrq7255ils"; -"br-lex-44939"="0pdhzadajg5vx5da6ildn9k2nfvf1ks4pxjgm32ajpcpfxbjpwk3"; -"br-lex.doc-44939"="001822zh0f18zvf6b51qdh4ykkv6ywqa5pm8q2vsmjv8rayjralg"; -"brandeis-dissertation-3.11"="0lil19vpr4c7lsx4vysszc8knqzp06hb80qxk4q9w3ljg6k096s4"; -"brandeis-dissertation.doc-3.11"="0ngzpw5mwfg2qz3r8gz275wc6i434h5agcpw6h265pdv2hgx9qnp"; -"brandeis-dissertation.source-3.11"="0qdj81sxhj43ajq4zflka7b1cbchl6djz2lqq5psa2z3rf49kv4i"; -"brandeis-problemset-0.5.5"="155al8iph3949h9859w32q6v885f0p6wd18m53rkliqvzc6d9f71"; -"brandeis-problemset.doc-0.5.5"="168ywrm0cnk1l5fmqzpk9mxf4732mjb488gnqiz128dbsshh37yr"; -"brandeis-thesis-3.1"="0h7n5gfm76vzq50g6bkz99l5wbqv97rmcb8wqkpjwqs0sg3m02sc"; -"brandeis-thesis.doc-3.1"="099cwm9spgfdy222kp5m71wf74a744jb39wkhxgmyqmv8jdlz7hh"; -"brandeis-thesis.source-3.1"="1cfg5vk58csi6cpkkiwbikan438zjaac6vw33kxqv73h8af4kz1r"; -"cascadilla-1.8.2"="013x6his54n8q3qp2xx12c0s2fbjca1ffmcb1kjy0yr0qy0y698z"; -"cascadilla.doc-1.8.2"="1l8xpfmdp2sc54qxx0ywh7im342nd3kbmgkx2pfzwmqz3xhpybfd"; -"cesenaexam-0.2"="15n0abwviaz213q00nv6faxc67fyqz44mvp28zcyysrhmrcxw159"; -"cesenaexam.doc-0.2"="0vqxkqgyg79kzfcxh40knxh5a3d2j6q3f778k2npfz70d2kaizj9"; -"cesenaexam.source-0.2"="069n1sk2g5n9cqq9rchk9w5y40igh620a1j5miscgykcczv2y0jw"; -"chem-journal-15878"="01s4sbmc4g96cmnbhx9a6bqjskkrr6saq91cly2pfy5gr256vmnq"; -"chifoot-1.0"="05p6x3l0vpzgxqw4pkl5b8hhkfg4jqv83435z8db140gsk2sz2p0"; -"chifoot.doc-1.0"="02x1z9dbnzvbvwfyqk8axkqhzchd1dfjdqsf4xkajxvjc13dhcwy"; -"chs-physics-report-54512"="19ci498mf3yy0xhmq4ghy8yh138dzs8953ki2mqn9hj6jjx71yfm"; -"chs-physics-report.doc-54512"="1nfmbhp3gqmf2pdallpnrx9hqlb8cwkndfri8i0mh411hrh72jp1"; -"cje-1.06"="1vs4752d8c8jsj2yrrzk5xq43vs5sy4byp4fjgczlxas0vj0v9bb"; -"cje.doc-1.06"="16vyabyjacg4i2a362nf78dp59r1dgyj3k5rcs13ilq62dy67ia1"; -"classicthesis-4.6"="181s8s8yk6y9haxz66ks1v6wwhpff2vs7lxrc8kshg1mn26bya4q"; -"classicthesis.doc-4.6"="1nxj2qflzs40mwnpd02bnbnh0ndm8rx12mr1vyyy6v3sc6g28yn2"; -"cleanthesis-0.4.0"="0wsib3c130m19r4z3ghipvgqvmfhi1cx86670ad3ama3rdmc3zpn"; -"cleanthesis.doc-0.4.0"="0hhvak1l5zc4bj874rd0i6v15v70i3aq2dlv736csvd2b764g6y8"; -"cmpj-3.03"="0hn69a35zkfrgy2gndhqlrclhx13c7515wqw28j4fk6ffpmn6arh"; -"cmpj.doc-3.03"="06yhinxa4s8hswzzh7d9x8v768fzk171fgi6kxgm76hfi4ydlw9w"; -"confproc-0.8"="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i"; -"confproc.doc-0.8"="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994"; -"confproc.source-0.8"="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c"; -"cquthesis-1.50"="143w42d3xw31dy8wdpqx01r8q9vs2an1ixnyil8n0q0af29j49bs"; -"cquthesis.doc-1.50"="1b7k2s3ils5s5yb3fdd6h0is494pss7s76awfn3dj6yxiaps5zvn"; -"cquthesis.source-1.50"="05gypg8zsdpfhp11rk7nii2vdw4rand5lw6ijkm23lbq2b5nwvwj"; -"dccpaper-2.1"="0k9qkl7jqiv3lf6z5f8532l1km1y144xx0dbz85qhdpz4zrbaikp"; -"dccpaper.doc-2.1"="1plk09cyld7xbxj2qppj4svqfdn9brmg6y30bf4iydr5zqznbcw1"; -"dccpaper.source-2.1"="1q0qxwcairm5jrqhwaq5hd5kbmh0vx20aaw9gv3i5f0j4fw4ldrp"; -"dithesis-0.2"="0spbmfqf2i12sp0qvh6875vp2zrgpkrhvbmjzwyxj6mjn1yr7r9b"; -"dithesis.doc-0.2"="0w9xgl8y2w1f7ns2nn9j5rs7hd39w6as2drcjmw4dc0vdbklkayd"; -"ebook-29466"="1jy79jrf8cd1rljg9f3g0hzkihxkpybvbgjnkzd5y6cfz7zaynp4"; -"ebook.doc-29466"="13cj8a88qqgi6kl1d7kb0cizl4i2pjm51hqnz9q03249av3z377q"; -"ebsthesis-1.0"="0vg8n4xrlxyjx88yzlsr82drlrigdnb870p0rxd1nv2ik2i1jzri"; -"ebsthesis.doc-1.0"="0gqh1zxb1w050a9dqnc5vhx1jgmk9kqk9k591s05xckidhnpp2v2"; -"ebsthesis.source-1.0"="0rg2bs23051ravdqv14k6yrrc993xpxf61zi8b94f0rjm3mg8f89"; -"ecothesis.doc-1.2"="1avnq2y5l2bc2lkf2g16p2vh77dabv52jr6jrm4jfm1wdapc6fmq"; -"ejpecp-1.9.0"="1wsbr5cc3msgvwn8p5f0jzbxg1qpx5hqs4xqk8hycxf9cf1gvc5j"; -"ejpecp.doc-1.9.0"="0jviim06vwag6d5kj7f8xmlgracqw0r4b8iv3w8x38yaqgbln7fh"; -"ejpecp.source-1.9.0"="1i826k5pwaj29yjg4kc0zgbay4b4xsjmlv7icn8d39zci4zf6lqg"; -"ekaia-1.06"="009wk5qyv26rdi9gjbaqxcpsyzz6l5w8b0wrg9avspq81hrjkg9h"; -"ekaia.doc-1.06"="1rbcnilarzap8kdsvypjwin1d13xskqq33wg6p0p02b8gaxzf3a8"; -"ekaia.source-1.06"="15fl2jhhv01vl7ggwmddpldkmwdj6gj99851aczv47lj24w093bc"; -"elbioimp-1.2"="1vfg29q8b20zi9lhn9nsr55hgx710ysk0dvfqpipqjf53fjsp0gs"; -"elbioimp.doc-1.2"="066g7g84fna6wy1slyh2sp9hmwjhp57hc3qf59gj5mwqvaaym8bc"; -"elbioimp.source-1.2"="1ysvjlmik0kclmcdf738vhl7xigsq8c6lqpgl3z2daarlqx6b8c1"; -"els-cas-templates-2.1"="1abq2g167zk3j6hv8dmbhaklfyv65j5i91k4mc7xrg2rlgjibdcs"; -"els-cas-templates.doc-2.1"="1xzhiyxd1dz3mmwhlkpf6h7qszgjdyxxbn67kbzvy0vb7s1c6fs6"; -"elsarticle-3.3"="1jjayypcaczxw69dk3v69fj31apics2356l934kmag49rwfzxail"; -"elsarticle.doc-3.3"="0z7iywirs24112fmdl8fm818320s3ilqlgc7xi6nl4idjakhfmi7"; -"elsarticle.source-3.3"="03pw09cw4hd0ixfa88mj7bijj9r3b6a6kg53q4hzzzl97bf6v5yc"; -"elteikthesis-2.1"="0q8s05q36825g2h7lci12zvss38izjshr76fb686h287pl1fylz1"; -"elteikthesis.doc-2.1"="12j0zbg2kq1dqf9b9qg9kifbajhc6p3gh1b4kixljbmvz2hqp7md"; -"emisa-2.3.0"="120aa7a4m1psqx3wclwzghq0fcyxs8djlf79mp2ds56y0mpsqx5m"; -"emisa.doc-2.3.0"="0lfx3hkpgl726bdp7kq874vch5bwpmnpypk7fch4bwqsi2x59iw3"; -"emisa.source-2.3.0"="0jqand86y23qs7yldi656xhl6da09ff8d260qz92dlqpngghpzrx"; -"erdc-1.1"="02sf80cadhv7if8arbjcsgqkb0hhdrlpq6izqgcai6vb7xsc6niy"; -"erdc.doc-1.1"="0nv1yqxjmp4mfksmxm373pmy3zzbfcfvi683dalpslzq2qyz20yv"; -"erdc.source-1.1"="1vpghcpm9a2pvi3plh7pjki7sna3hkzvq2xj9gzmhqxcpw3jskwx"; -"estcpmm-0.4"="1v027r6j4vxxvdccq83irjdj1gf6kzy5i9jb1bhsv7c2gdf3ihyx"; -"estcpmm.doc-0.4"="03q3z9if5hswrr086zi907xmjaijh266l5g9a140q0fivjai4hcx"; -"estcpmm.source-0.4"="1qb1v30ijky1xhh5dahgprp3fhxfm6kvlxgb059429idvm5ap90g"; -"etsvthor-1.0"="19iza3bimr7xxbajmq50iqd6cc1h82kz2lixwphn9568d5k5vjm1"; -"etsvthor.doc-1.0"="13cijd5cx7sks5jdy67hp1a08f4y223l0hxd3w7ljnvd5azzyc1f"; -"facture-belge-simple-sans-tva-2.1"="0n8wwl82w7hn11l3c3fg7nr088v2mv4s2d3ynwahgy18k6953pxm"; -"facture-belge-simple-sans-tva.doc-2.1"="10yh7528nms60ypc2zh9viamk9cihi0a67jcvwzb2i8f88sx4cfq"; -"fbithesis-1.2m"="0qzf6ch5b25qrhzflh8rwrljhlj87i6xaldnpj8j9iq83y1xh4jr"; -"fbithesis.doc-1.2m"="0wvnm716qi0y54h95zlqr7m1q9dgmjnl9f0ghvjgm886hljq752z"; -"fbithesis.source-1.2m"="02zmk6yx4v47ngd6ba6mjn1rnhm2w6p330rfz6nkq8shcky7sy72"; -"fcavtex-1.1"="1rnfrvbm4baslmmakf3s1n37razfzbc6d11b5yfhhdhskq2aci5c"; -"fcavtex.doc-1.1"="05ixrg17jwd315q5c52c4b8smcihj4rzrxjparrgfimivd85i3h6"; -"fcltxdoc-1.0"="0bnz5b9ibr3lh5qazdanlvvpp8d1h2apzkw61qxr6kg9ymmk2w68"; -"fcltxdoc.doc-1.0"="0dvr57jz38v5wflcjjp19rwjbisbzkdc91fji9s1yrv27drawijp"; -"fcltxdoc.source-1.0"="0k54q30f7qp40fh3clxyaa40xhsa28qyavn13km65s1hwvg4hg9g"; -"fei-4.10.1"="0bf9y73y9m7npl2bdnx5xqwxiv1apdpvnlqygvas8xcjx1gs7a4q"; -"fei.doc-4.10.1"="0w8m2mvsp68z6kylnn4waccnyn3fb766jipxcq6mhrgpv5jkxay6"; -"fei.source-4.10.1"="041ay6v82k6pmmxvdjyxj8drgv208fspnnrpmjijnlnn37bjc2k6"; -"ftc-notebook-1.1"="07ng7dgbr1swsx0zwm831wijqjq4x6hnr02354jdy9z59k6d4lyg"; -"ftc-notebook.doc-1.1"="0w9jxcfvkpif1fyd4xgwbfba9b2sf77mqr9symwby31lxqwrbys6"; -"gaceta-1.06"="1yimj3mxyjj36ib4lfdh65sz5w71rlp41hhnzz84kgb5y103wpaj"; -"gaceta.doc-1.06"="0vvadcqjj3hvjll9nqn3mam9ycas0zs810qi2jnq6smpm300c3l9"; -"gammas-1.1"="1wcvzihv3xh52s3ydni4gs3lcp9icmxinqj6znwyy680izmw67ba"; -"gammas.doc-1.1"="1al5rvpfavkc1p7ayknxnrs4r7jzx7f7dbm3hayqwg0d7jdanp8r"; -"gatech-thesis-1.8"="09bkni09mafpmmkw9hmfnn5894cjlpj418f44dpi0yriskx0aqbm"; -"gatech-thesis.doc-1.8"="0z6m0sw0wb87vcrp63kjmmivk6ya75mxh2jjwl31p80q8inyvz0z"; -"gradstudentresume-38832"="1i3rbv9ixnr60yrjzbj31aaq758638k5xvlarkaqsjvacc3wx88f"; -"gradstudentresume.doc-38832"="0nvih6lkbgc7jkkj303119fyxnajl4iha2baz2yhy62h4mq8lhd0"; -"grant-0.0.5"="1whd5f3fc72balvgifnb37583v0882xq51qa0fbb92b0a0c71nid"; -"grant.doc-0.0.5"="0zfz8gj8di6sx9k48zdn5hv5x2fj5rd8dm7x4h2k6xssrj4aw7bx"; -"grant.source-0.0.5"="0pmg6kjzy6wahhz3lk742qzx8m5afz8lqsl05zpkcmi7ris9m9ah"; -"gsemthesis-0.9.4"="1y9wj43qpcgp82sfi5s7izyf284hzkn5py0v145jx03l2kxhv90c"; -"gsemthesis.doc-0.9.4"="0fyadx4x8d64h75fq3xgmfxympcbfjhwwmwg4bpj20d3dbf0rh32"; -"gsemthesis.source-0.9.4"="1i5w77zwb9c4qc90hxz7sna8g2c11mkf3vnkkm3scm6pkbg9z0av"; -"gzt-1.0.1"="1d96hgipk69b0b342knnmahz84px2lh12mvqpy9jg4kb0d3pfhd7"; -"gzt.doc-1.0.1"="137b9cjdvi8f2pyhw036dslxbspq9sy88bgby33yasa7xcnyx9jn"; -"gzt.source-1.0.1"="1492wlfh9f67w1zfpmzy1c1c4iivf91a8fwhi9247yr2yaix06rn"; -"h2020proposal-1.0"="1yz8bz4nmccv0v700zz7x11fjdqhs4hgkz8cd6bnqr3v0n8k4xrf"; -"h2020proposal.doc-1.0"="0yd0iffrvahaci04bmnd20bszgshx28apsij1i35l1wjr1hlnfcz"; -"hagenberg-thesis-56798"="0zfp35s1mmi3qa3r7xwlyynncbrqbgxr1mxbcpf01fszyx5y3lw3"; -"hagenberg-thesis.doc-56798"="1brvzchb8zxnhrz2mksy9a2h0wqsa7k7w6bymi20jrzq3kgblln2"; -"har2nat-1.0"="0zaqsnvg46pdf98gzlxa8l6z8v9l3fd7jmf60nbrfba7jrzpy1bh"; -"har2nat.doc-1.0"="00n5qcljlpw2rq8x921vhsk7xvz8z43gxiq41qfzin696ysn7xj5"; -"hecthese-1.4"="06cpw0cfxmrzgp2ykkmabw9a4w1cy5lykh3c4fvh6i101czv9mv7"; -"hecthese.doc-1.4"="0227fi4qj5383jggcqrl3yj2rgi0chjggbzc6izfz782v0livd92"; -"hecthese.source-1.4"="0igfzr6qn6hnx7m4wzwgsgzfdv17k96m3zn7c71cm0fhqjzx0wpf"; -"hep-paper-1.6"="03b9l3101gzw5m0jhikn8aq18riy8z07yjnlcqnrgqrk72i515ss"; -"hep-paper.doc-1.6"="10af63x3awg87fzd83kqhz3bb1zpkhrm9kyjz42dnkm6pjn969f1"; -"hep-paper.source-1.6"="0m1kwilnja5rvb2xcjhl1kyibird9wz9yyq028kv5x3wbia68ihp"; -"hithesis-2.0.11"="1krjq1saz92ca0xcqzmjz6v0j1iyfx1g50c16bw2sa9kcm589kai"; -"hithesis.doc-2.0.11"="0liw73mp94dh4cfm2q739k4cy9k05fw21187f6iyp9d576hfv8nz"; -"hithesis.source-2.0.11"="1izdz82iv9q0xgg6i000j6sgywhvhhmmkwsi60k1vj7w6rkfa833"; -"hitszbeamer-1.0.0"="0nw7ch41rjp0wz0k508x2kkg4yqfpy6yfcl7n3rb88ps8fiqd786"; -"hitszbeamer.doc-1.0.0"="15kkzvgn1n09i7nnfd9mll1l6xqwrbpc252k54gi791nc30acaip"; -"hitszbeamer.source-1.0.0"="1ysr0z079l5k61v5r77hy2r150did3a1a29k1xppxrjr5ry3f4nk"; -"hitszthesis-3.2"="1cpjy8vdzmina141n5j0jqjls4rnvwabwj4by59j6vx5fq8d9ygz"; -"hitszthesis.doc-3.2"="1zps27q5x5z68d3s5wmhs4ihdhdv5fjr6ra0xyfaznbl1qz7n481"; -"hitszthesis.source-3.2"="0q3rqd2645fv81sw3090gama6wp0w1q4xn86shy9nrmc877z1ja2"; -"hobete-27036"="0825ng1xcpdmjihiffzjrvcvx2fqdz9mryq2bwffas22kf0zlx46"; -"hobete.doc-27036"="0il6kl26r8wmm6jzii7gmr61af84bl9dn4szlnw34dgsdg0an5hh"; -"hu-berlin-bundle-1.1.1"="0fyzil2b9qsi0qrahdias38w2k7flai2p1r8afqimsg16vix5ndj"; -"hu-berlin-bundle.doc-1.1.1"="0j6icx6ffy5lxy11myb1addsd0yz8y1n6fxzgyynqd6zd86w5pc9"; -"hu-berlin-bundle.source-1.1.1"="17x425hywz0gkzpg04v3cghq47ps89ckg4ywim98z4hy3pqvlacx"; -"hustthesis-1.4"="0c5akc97v3fh3skxpgmffywca8kyswmaypkyxdzwrqb1k2z4xknp"; -"hustthesis.doc-1.4"="1llsyhbgdz9k6swry84q539yjsvcxj6hgirqcw4vbvsdxxxsbyn1"; -"hustthesis.source-1.4"="0nqs1ifkhhzspdwg5nbqgpd2309aw9r65cav51vxpn2abss1q6a1"; -"icsv-0.2"="0gv7wrghqivfm8yb3nkm6r8jnvx7klbhr1nbp27cjaliz70aapa4"; -"icsv.doc-0.2"="0dlsqkdmx4nhgs15hhn0nw6vk6h3q3hhhwdymy8nnxraph2mvyl4"; -"icsv.source-0.2"="1fh1znhlacpci7v23aj9zdczhc87sg3l0s1gsvrbgznpadgbzbim"; -"ieeepes-4.0"="0nipchw9hdlc7am3n052bszilwj192pfcnc9p5alqnffrd8c4rdj"; -"ieeepes.doc-4.0"="0ff8xa7w5dmp356klm3lfr9dnfplxjqpq7aiczp6xj092vmjrhdi"; -"ijmart-1.7"="1j4i7f745nk80nghnpajkib2y6ddrzg16h0gn5cd215pibjaml6c"; -"ijmart.doc-1.7"="01ds6p3byc9j5sgjhh7yhbpv36idlp5g9afsqryvhfrwy3r9900g"; -"ijmart.source-1.7"="18saabw9v60rly8qp8vcgj84rjz88gbz4g2sda4i15lsjpmz4dis"; -"ijsra-1.1"="09dszs5ha929aws50zq2k7kia529bxfczs6j8bi0fvjnmf6kx3yy"; -"ijsra.doc-1.1"="0lb3rlqsscmnqn65l1aq5x5ismsplgbm1ks1pn6cs2sxdjy2s0ly"; -"imac-17347"="1v7zpbzgxz42b6zv0y3d2cmzzsal5mmzd3lb1nk779i82dhs6pi1"; -"imac.doc-17347"="0s64w9wkfmrbvkd8mij3y0asrkzcg2k58xjl36vfvcf07aw5wcr6"; -"imtekda-1.7"="1hhxwaykslzmf70lvmrmpnn2kq3xa114lyvazgfg9sccc990gnlf"; -"imtekda.doc-1.7"="0lzkiirxgvl2m0vnqpspr25qk1wyq1bs2sl3zi6704q3fvp6sqbq"; -"imtekda.source-1.7"="19h57cyxs47awil222i5svqgwdmw9mrm16wja9f1j980nzzaq7wn"; -"inkpaper-1.0"="10989ja1vy9ca451gc0v0mrkqi25dwv4fdvw9y4k6z26g7902hap"; -"inkpaper.doc-1.0"="1dmvkq44kyxd5y4l2kc9wvgrhgk4kkfw0qfqzi2faf9xd6jssrhk"; -"iodhbwm-1.2.2"="1d18fjqgingshxvsawkz9idybfz5fdzcd41qxk5hpqms7zcjymi1"; -"iodhbwm.doc-1.2.2"="0iqw7insxma8pmj5v12zjgs72j60z99g7w5kfkb1h6biwlx33s5c"; -"iscram-1.1"="0h6pciksfrabg7wgxsgzciw22cp6gmz9cb3ifdsqb4n4qk9fga6m"; -"iscram.doc-1.1"="1p0p4w7pkyc9xp5af1afmsibbbrylcfrdcbn16adscw8y6wmds05"; -"jacow-2.4"="06w817m1ll5p4bs3jngq8csy7xc97h918r9z5a2n43whc6azpw3v"; -"jacow.doc-2.4"="1vsc0nhdyzjjl4ajynl68cqvkcfal8ndknkb2zrzfmx2iic443g9"; -"jmlr-1.28"="14j317nhlc0ihr6d413ly2n8p2a38q8g25pii2a2j3jvdyyas83s"; -"jmlr.doc-1.28"="162cglkqy9dz0iydzk5f2g6dfwhi574xqw8xhq5i7mrrq111211n"; -"jmlr.source-1.28"="09wxsfm0x3l3y68brdp4jn3lg5w9kg23b1mjsvscls6pi0ac5sw5"; -"jnuexam-1.0"="0550skzwdanpzxa22rv8mx6c1ihr930rfaq51yp82dijgd211sql"; -"jnuexam.doc-1.0"="0ghypsr9h50cxafhca7h8pdvzh8jn02gh889zw6avk5wx5vixav5"; -"jpsj-1.2.2"="0yv7lkv7sr7qhqv0rmyislf0a5rcd125kqwbnfj3696cwhm5aqf4"; -"jpsj.doc-1.2.2"="1bmms10hgyl4gs91i2kpds2mn9x41ks8fjrislj2zl8y3vqdkc81"; -"kdgdocs-1.0"="1p1rcb0lzcsmgyqz5750pl2r73fd18k76gry45zfsr7750kwx7x9"; -"kdgdocs.doc-1.0"="0b2j3mw8z0f3d4pffqw2r9zxpmyvykd36sskkhfg7wa4q521nf3d"; -"kdgdocs.source-1.0"="0sipsvbi9254zpg0bmcfin60szx9q0vnx07a9bdm9ma11qb1djpb"; -"kluwer-54074"="15av38sb3pzffxvrxlbwxzgvhnxhsjhkr3qwrlqswwq1sy4a2ssc"; -"kluwer.doc-54074"="1cx0xya0s27mybl37gw3yx1rmcyvrxnrp8c4012gvmqiyqyx4sjx"; -"kluwer.source-54074"="17w0ybfzs9x8yixzl8cfldqi42sq2jpkyap8i08mvp8krqgviz1n"; -"ksp-thesis-1.0.2"="0hcsni8p92pm3l7mi56jj7mlcv5rvdpzwbv1jv5f1hb6xyx2pn4i"; -"ksp-thesis.doc-1.0.2"="01pbmmwwjzd5cq4xxmx3fknk8d4q3fda3680g344g5s6ra5i45nj"; -"ku-template-0.02"="1f45rknbzb3d3h72vznfzspg7vx9im59w5s5lwv4z0b4sk7n1d18"; -"ku-template.doc-0.02"="04gpy6a0mpjhbl9h2rnflvhxsj5b7x7fwll8z211fl10cnvalcxv"; -"langsci-58476"="031xf53v0w58k29xz1v6lin1yq1ya95raqxzxfcg665mp4ks55l3"; -"langsci.doc-58476"="1547xim0yrill63vw9h93aw7d0w3q5yl3wbg1cigbc3rk2v1a9yp"; -"langsci-avm-0.2.1"="1ayf5xbplhjgf2fcpxzhmdz2sz9bcjdnn64x4pc1k2yrk7zrva89"; -"langsci-avm.doc-0.2.1"="1b780ydqh0v0phapnjk1p044cn4hs4ww9ahx0fm2d0gj77fqsd31"; -"langsci-avm.source-0.2.1"="0rkhl4pkcs6cjvrd3f14l18rwk0ylq15kfc8k1n97bvhwy7azk5v"; -"limecv-0.1.8"="02wknvixw2p6sik6s21c6vpkw3nv0xflgrniiahjm4bali7dk3vi"; -"limecv.doc-0.1.8"="0bqw9ynszgyqq49hgr41n63flvgmrx7mb2ida76yyx0zziv1b6w2"; -"limecv.source-0.1.8"="0syp2l3d5nr9002whpq95ld5wrqj5mgrcd5vvbrva0sm3lbr761m"; -"lion-msc-0.30"="02xxyl35xl6c48x0fdlfkcv4bfhz4hghp1v3ff6pf9yl3cvqlh15"; -"lion-msc.doc-0.30"="0nycprcfi6769r47llwma71hzdb9a6sprdkkk6p898pmk367wbnf"; -"llncsconf-1.1.0"="0c1xjmpr9jb0k7xj6nj5p9qli3lxl98gnyq0dr94m2h31zs5hpdp"; -"llncsconf.doc-1.1.0"="1a4l8piav4ihc628ac3sjxz1v0rkva7in6q10xw3vhwdxsxbkhvz"; -"lni-1.7"="1y1g323qij5xdjw1c4n31lkzldj5bkfg5k1vs0snnqppmznp4afg"; -"lni.doc-1.7"="11q1sfq1ks61fjik6wq99yqpc2z5crxdw87pbv3khb3i0m3hfkqg"; -"lni.source-1.7"="0l1khvrpzwsg26ldxfx97qv8q03g100iq27lp0wr2qqqyrwy7sb6"; -"lps-0.7"="146a42clkjyrg046bz43b2rpvz3i2dvhcsd132bzc76d3x0sqps6"; -"lps.doc-0.7"="1nwn4dff3szxlvw7ydqp1ylw818maj0ij1g08zlz2i1gclizwpa1"; -"lps.source-0.7"="0hzmjvgd9y746d9983y73jnc7pl4y85lk37h5d6j3jznnrdgk7b8"; -"matc3-1.0.1"="1mp6k50lm020xqrq2vwl9xyzr5jwp9p85c6ng3k22g4rqsxhrb3c"; -"matc3.doc-1.0.1"="17xh063gahp5m83vj6x8waqwvf4hrvg3wi80z70r94bag0nqqf2v"; -"matc3.source-1.0.1"="0pq4l1ays56ry5v3ig76h49kn7hdk1gi0wqx9b29vkdvzmzrmq02"; -"matc3mem-1.1"="1asybbjj93wpbcn577cqkbfi2bkiq2hzv5b2lqs31igawaa0vdhg"; -"matc3mem.doc-1.1"="1fgngv22falzvrsynzzj51jaf4gfcw88jwbljywixqb9xcg9igcm"; -"matc3mem.source-1.1"="03x6cm78yhgfljhcfrvn49favgf6h11w96s9agr96xmngzh4z40m"; -"mcmthesis-6.3.1"="1pjllpvmqva7yk4zi4gl91blwbciw4f0fhq7rjc214iglyghl9fr"; -"mcmthesis.doc-6.3.1"="0np4zsrlb5xxlwc37dldrcawd9ldmjqgq1qhbpdz639n3j4gmnq4"; -"mcmthesis.source-6.3.1"="0acxvqka48id5fhr9p07qh01h44vhq3kapczr0i49pyn2ihibnyk"; -"mentis-1.5"="1pjpgn0lmyd7y7qbri8f7s01a1akgdif0s9v56ia2rsimn5fgbzr"; -"mentis.doc-1.5"="1r6799zz3y0iw020wwwl8a7az2j5b894i7w0pqqvsq05g4g00fcs"; -"mentis.source-1.5"="1ajy89hkvcika3aybpz93myylwlgfilg1d432my0jvmsa40ikcdc"; -"mlacls-0.9"="00cm8gvw3q7jl9sxanqrps2xfxpkc5555clc6gg2dh8c3n0hliah"; -"mlacls.doc-0.9"="11248ijy391rzc4srxaci7c7511lyyzc296bdifmpl26lgfvvf97"; -"mlacls.source-0.9"="1rm1ajh2cm7f8mvbyny40li7wwbqiw73cgf5c0jqai81zg58xc40"; -"mluexercise-2.0"="1yhgp5cidpkh4ihz20d1p445q370bh25jwc8ikqdq6g1qnf8sdv8"; -"mluexercise.doc-2.0"="0xcifm779nln96bmx0kvkmnzc9yk2314yc6nn98wm7gqdw2bf21s"; -"mluexercise.source-2.0"="0mq8fa0vd762q2h981mj6is4d5vry2qgggbbmffvmfb4h76z5gh2"; -"mnras-3.1"="18pjsph7xpdvmnpq098vv4gl69k27ad7yxxsb60945zhgw9yjrk0"; -"mnras.doc-3.1"="1ml220k5md4hpj6lcmx297pbmdbyp1dj1j9vb55dcl5ypc6jr3sy"; -"modeles-factures-belges-assocs-1.0.1"="06n2871v6jx29r8qjgcpg4h3qbnc6kw24kfk2f08wbc2rg2xdkxn"; -"modeles-factures-belges-assocs.doc-1.0.1"="1509xrny3xvy7nii0v1rga8ip18g8bv3d6vf8a3qn0cayfa9p248"; -"msu-thesis-2.8"="1aqdhw56gmkqmnwkyxk7q4xjk8k28srdqpf9rlwfrz8vwpicsqrq"; -"msu-thesis.doc-2.8"="1lay1hg2r28y9zmq7r3zs87spiab8zcd3k6smjrbcj9127910s91"; -"mucproc-1.02"="06x3hqdp6d6nm3n296wnj4j4w93cwgjpz0nlw5qj0z44zlghs483"; -"mucproc.doc-1.02"="0y33jak5lzhjp4v5d4pzfj7jlrr87dl6wdnkqcc0p9fr4fd2h1z1"; -"mucproc.source-1.02"="0xzv1m01rj74gg188snznshir510lj5myckfjx7am6sxwlfni63i"; -"mugsthesis-34878"="04r4y2xvwfmfa23cadgkz6v0q5djlhm291dqmnmmqq7lp569037j"; -"mugsthesis.doc-34878"="1wjlcgb5lvfjmxz6dngd76bj6046sr8lfzrnpg4pjbw3s5v2jd1n"; -"mugsthesis.source-34878"="0fyslrcw5f9fzchjlw5pccf32vybh7vn1jl9dpc8y86x8gg7ngf9"; -"muling-0.2"="0mh2iyjikxmcnag0ww3n1zw2j8vyky8q148nhrmjcacbb6q6xgwc"; -"muling.doc-0.2"="1grdqc0i4jiprspfwjq7qlvnbz3z6wzgl9x81r9fxzp6ic6zl86r"; -"muling.source-0.2"="0d69hrm92c3j83jz14zv40rv8hrshaw8gxx8jmgwf4avrq5civgv"; -"musuos-1.1d"="0hfrgx3lk7mf9kzf6n8hswzh116pmllx0k3djbfinvvvhnqy972s"; -"musuos.doc-1.1d"="0zxdnzd8x42z5fpvkarhsvdw3x4bz6qppn0iyjff1fjzwl8q8dzh"; -"musuos.source-1.1d"="0igksc3i5ydqps0g172i2hkb854bnkf7xh4jqvwlimrlnhs7nnkk"; -"muthesis-23861"="0bbv49nnngkpnzq7kq15spn4x67yigpyfk8ymcgv647z0bvbladf"; -"muthesis.doc-23861"="1nx1qbgp67n73k54ppyi4li4flnsyi8jmy1lil0gaza38m5y8aak"; -"mynsfc-1.01"="1pv51wyvrwb4aadwa4wdq8cjlvbxgcl4h146lrjafvyqayr8r8rz"; -"mynsfc.doc-1.01"="04h49pz1w3wqh7rxd0zzrcwi5m2hpcx33pay0iaybq6vf73ajr1v"; -"mynsfc.source-1.01"="0iisnbgaijc17nqrd4pqfvl6h81v9h72m3f0f57rkq7995k37mya"; -"nature-1.0"="0b1ra8babjwpn7v22rjc22pjrjczh1wflhq9ihbj5ag3d10sil6s"; -"nature.doc-1.0"="053m69fwgcfpa5gcp3dnf7k37175jcsclfkh87lb0zwcymjghlw5"; -"navydocs-1.1"="0isw46fzvk85i3mimwsc3x7wg8g7ifbi23i0d4v676nd92j1i72n"; -"navydocs.doc-1.1"="1aiyz3z489bdsx4rh79gxbdb986hff75qik97fq0xrpk3w6x6cjq"; -"navydocs.source-1.1"="0x1n44brcy38fnfp03j9xl1awfawwa8d0c5cg739yr404qbq8dp4"; -"nddiss-3.2017.2"="0d1maznv4yqpjzxm90vdl68h6h7zr7m0k24dirq2nc1cky6l0j1z"; -"nddiss.doc-3.2017.2"="1apqd332kj67rpa09md0gb025kx4d7arvqj7f4l8krgsizxfxcck"; -"nddiss.source-3.2017.2"="0x2abanmpp7sv4qbwl6in3yp9k99fx453f2fn8xw9b0z053ivvp3"; -"ndsu-thesis-46639"="1bjrvsdmv68zlm2xd9v4jpkg39zvjhcrd7435r0jh0sffai4pdlc"; -"ndsu-thesis.doc-46639"="01jfadx1dcmm3q8pdwpxmxfmmp94xm9y0r77220ffrlf1iczadkg"; -"nih-15878"="1rlhnhdz58qqjv563wjpp11ppyqa5smjpzjdzfcra0wd6cxv9384"; -"nih.doc-15878"="16klyjxzxj4mipql71admicnzlnasnv9hb5pl52wyk4ic8ggdgwh"; -"nihbiosketch-54191"="17gggbkag8y4fjvj248wc8kqiklsqmilcyisx9lwcf5irngql646"; -"nihbiosketch.doc-54191"="17lfnfkgjdhj8i5zv08v6lgxrrjg8hzbbq9ihnpcbhj2scn96g7s"; -"nostarch-1.3"="181a6pjdr7ffsngv7j84ddps84csv7ir3wr49qjax3lr5fhiw7qi"; -"nostarch.doc-1.3"="1sjd4yz3j70pncr47ryis4w4459lbs4jpbb75wdzvgygv9qxz3w2"; -"nostarch.source-1.3"="0f6qrlydiajnla9n4mqnv8f1iyl0f8ip98hbx6dzmmjz0k5i9bhj"; -"novel-1.52"="1xlglq5lifj088v3skmvzpsg44s0a3jnz6y3j4mw92wfbmzwnzhp"; -"novel.doc-1.52"="13pbk3amwpxzrhnsv779pcyf2aiih2iqicbp1ajc5fyyr3mr52z2"; -"nrc-2.01a"="01pczvyzfc2vnrfsab180fg0nz13cmry0dvdxmq3lxzp75ji5aqj"; -"nrc.doc-2.01a"="0l6lpvddg25k8dynqr26gj7fnaq7k6zbzp5p62684sz9351pvz6c"; -"nrc.source-2.01a"="0lzfw45m3mw7yd9sx6lya6cvan696p74wrxgvmqa73prc2lhmbv8"; -"nwejm-1.0.1"="1f33ykxdzgx2c9w97albyaisf3lv69x5d1jgjrnvbd6r3xrwlvls"; -"nwejm.doc-1.0.1"="0asg8g8gvgb290z1if71sj440k4fyiydmvq9420vmh4w11kyg3l7"; -"nwejm.source-1.0.1"="1x47sgablq02j47i1cgin5dl16qcgf0k2qkaabgrza7l3jr67jq7"; -"onrannual-1.1"="0bj29lk2nlsmky82ablxl0r6k6wl627zrsv9g97hydgdmi5nxasz"; -"onrannual.doc-1.1"="08c3xmyiz91623lnps3iahi5ga9941nc6bvxmdihadxhm2lk769z"; -"opteng-1.0"="07a6dja6s7c1759i9afgacx4v0fli98s6mcq5zig689hpkw841fg"; -"opteng.doc-1.0"="1125aj55p7n6b03mn6p6845yvx2jbjkwwldgwiixypklndqsf6cm"; -"oup-authoring-template-1.0"="0bamzc98y8vb7s0sw45ampcijva64j0y7p8v8y7l0rby77hra8pz"; -"oup-authoring-template.doc-1.0"="1z5ac2fxzh5fjrl2d4di50lk39rwrwl36irad6k1jm4zxm5260a3"; -"philosophersimprint-1.5"="1cdnlyf9cf591bqp1dqdxl10i3im014vhxv77m8mviklayjyq1lw"; -"philosophersimprint.doc-1.5"="17j2zh4p8xhf619slqpm6bzycwd9zpr8qj066c4wm63la6fy7lyx"; -"philosophersimprint.source-1.5"="1zdcwyknfjxw3vmlipklrvfadw5ahh4i4ns95kyqs1x57c7wgamp"; -"pittetd-1.618"="1s8865g4fv04ha7vls9frkkmx8dyn0l7z1rqvh3dkyy7fdgq4vff"; -"pittetd.doc-1.618"="1jkdny3kqljfjnf9ywpz7xqvfka8kwi33jy3z2yiq1fvp8k60ar5"; -"pittetd.source-1.618"="07k0ilmwkg3wvgfpqyqc60hn5mlsj8z5lsx8mq8h3igwm4j8krzi"; -"pkuthss-1.9.0"="111qribw5ycq7q88l41cpm25vp7zak6cp29ivim637qx2qxzhwap"; -"pkuthss.doc-1.9.0"="0w970jgsa4a5ahx1bjk3y0gkmrcb576xmasp53z1sr342lr8qbrk"; -"powerdot-fuberlin-0.02a"="1gx04y9ysvwzghy38k6izhs9gm1hzssnb5zh8qjjh8v99mk6cqwa"; -"powerdot-fuberlin.doc-0.02a"="03ci0lcgw777kfmnzas13q75n03z8v2im1wzrd8hpbcwq18mmn2v"; -"powerdot-tuliplab-1.0.0"="08f25qa5fdacsd8i0bs8y0p3k0zjgja0qp4ak0x3bixz7yivg5nx"; -"powerdot-tuliplab.doc-1.0.0"="04b546i32k1cs6armmnvr8aqbfvs0ysarlsjmsci9xdrz3clm5w5"; -"pracjourn-0.4n"="1idcncspb2dcmrfsr8bf1ar413mc51lliq9xgpv0ybsiv91yd4lj"; -"pracjourn.doc-0.4n"="1hks8p9vksn88daqyn7rnsaza4i05dgfb3ngd5yrvvw0v40s3acj"; -"pracjourn.source-0.4n"="1jbicfqvvyi4nnmpqafzlzlx459v5cyv62wmq67c2692am8a04v8"; -"procIAGssymp-51771"="0fc3r6h5h5vq5af131ij5zq5mpm9yl220nnq0hr4q4krxzmc0hnk"; -"procIAGssymp.doc-51771"="0nz98xjwlx1srfakqymgyxr3smqlrk2qgk6ikwbdqs07prpiszay"; -"proposal-40538"="1y5i7xl1z706fcv82s5dyx1ksfvp9dq2m0shwy3an2r94qszcwmg"; -"proposal.doc-40538"="1haa55hhz11j9m3lxp84yzlpyalrc3hlb7wxvmngqhn2j2mi0b3c"; -"proposal.source-40538"="1n3z0rvhnc76grih3jy5h5ax7rffxjwmafd92fnp10jinr9riapx"; -"prtec-1.06"="09izjx2g6gyckmgzrvg9bzlwz1yvwr0nc40s6wsbb898wa6cswxx"; -"prtec.doc-1.06"="1cv2knhl8xrsyzcywypr6dqgdxqss0r9mxl6wv4clpzpsyvmfzbg"; -"ptptex-0.91"="1p3bahmdkxbdgczvx52qhyn2w0wmdzr8061idf0kpbwvl0nkw75p"; -"ptptex.doc-0.91"="1ldg6ljwf0iivd0cxb22sld2q2afwfb83ac5r6jxjcfr5ac7dv0q"; -"qrbill-1.02"="1n8rv168mhkml0xrf1l7vg9a56wqpyn428j8mlpyaksd6imbd95s"; -"qrbill.doc-1.02"="1xpg81mbpaps61cx25cd8dix1c7i2piyqfyvhy7a11z7n11ad6bw"; -"qrbill.source-1.02"="00pfbhadhk6ji7k4fmasqi60ms6pl5w26yamxszbl3j1057vrx17"; -"quantumarticle-5.1"="15h1aflvl5mgcd9l096l3s56pp1ryjjm83xcaqfc67kyxgjxkapf"; -"quantumarticle.doc-5.1"="15vwy9m5b1vv2mr4wwqsfqqx0zrwgffbh6f9q8bbm55xdgshyrr2"; -"resphilosophica-1.35"="00qqwp5n5a8hpz4zpcmh3avbm0wh2csdwdf450hmqnhpv2hn2z18"; -"resphilosophica.doc-1.35"="1s5r4s8ja16vsz3ssqk0klfm1vfxrxbcj45mlszq5r3k5gsa1y5b"; -"resphilosophica.source-1.35"="0nkxh1yc6nnjlh5bmf9w5k6hzg62f4i7x7nbf2019vlwvqn7r4yp"; -"resumecls-0.4.1"="19cw19c4a3zn5gvsngcxj6xvh2qq5n5am0sdmg9zajy9lqqp5nnf"; -"resumecls.doc-0.4.1"="17z14r8yj33mjjkydzaad1bm5nhvrv5154n5n6snjszd13vgdyh5"; -"resumecls.source-0.4.1"="1mm53893g9nqp3wdks6qa22k4pk71v09rg98nm1i1bz5ppn6kj18"; -"revtex-4.2e"="1kph9xdp7ax4pv24ixxrsivhk9xqd5ln23c96cnn4qwvs65jygj1"; -"revtex.doc-4.2e"="1s7i1lr8ra692jwjx2bf61h1jfndqwpqfqjr91v28vh3w7cg0m7a"; -"revtex.source-4.2e"="0vishjx0cymhnb4lsnx05zdghfs9h2bhbz2jwsbdma81p66lx4jx"; -"revtex4-4.0a"="1v1km5grdg72mqf7sha1laprwhhwplrklax9mabhg13q4c9k8dlk"; -"revtex4.doc-4.0a"="1709bsjlka0d8x405fyac8vpmklf92qhw0qgmzvbhynhq4sc85b7"; -"revtex4.source-4.0a"="031vqkbg38iwi92yhvd5xdmmkbjhrr9lm7ncmlwgizf1y0ib7wpa"; -"revtex4-1-4.1s"="13azycwjj9ihirfkcgmjrpvjha4wngmgkm6irh3388zwjs2sh7sj"; -"revtex4-1.doc-4.1s"="057yf32dsx1j3b89wl9jqrafvib8p0x6l3w3zk1c98p9vp8c0lm8"; -"revtex4-1.source-4.1s"="03dy16s50bkgj2l2zkm3z6mzf9qwhrax7cxll2p0rxxwfgvpgh8a"; -"rutitlepage-2.3"="1h6z0p6m4a1ivr57165w48b9rp5jiad37cdp2z9akk3pxdg3ywq6"; -"rutitlepage.doc-2.3"="0d8gi3ks8wjjbc6zhw4gmpsx44pr93iw7bw9ak5xfnm04p9vw81r"; -"rutitlepage.source-2.3"="098n2wkddrc7f74jlbrfvxzvplyj05dr1i7czah2ciw2z93m53z1"; -"ryersonsgsthesis-1.0.3"="0zn3hp9ipjq3624h1kdz1r55wxhawylxkmh6fi7v6cz37cnn36wx"; -"ryersonsgsthesis.doc-1.0.3"="08bylz7p9ygmzy6m8h7w33l4lch9iqnaqnb3nxw30d5gp0rsb3j9"; -"ryethesis-1.36"="18d9lw5inr4fxxk4x4xjxnnvbp2agz25c9h328gi1c3afsmi4lsr"; -"ryethesis.doc-1.36"="1jy3vsin13lpd8q5piia1klc08nfmhnx0hp9hl8gnz86h53mc5xa"; -"ryethesis.source-1.36"="0chmpps2q20bkwf7p0yxwp1y6mak5hga459vpji5sl754nzbvxb6"; -"sageep-1.0"="0yavixnkhy1y69l38xj6pbihzm83ncvnsl6pyr3l310hif6r0wcg"; -"sageep.doc-1.0"="0z2n1511lr2m39vn4bdamw8xbxlw92p5hrsxzrnjlrg39ysymsyd"; -"sageep.source-1.0"="19547avrh6yv2v86w8f7b0pbvh8xvwa5z8q69bxcvhwj0jqjicps"; -"sapthesis-4.1"="05lql3yqxpld4f1j0745aglvnfn7jr3914m4s5579s5q99aa2m5j"; -"sapthesis.doc-4.1"="1vjmq2r7a55v1msj2ca1lpz855zbiaiv485204bwh3hq6k3vajrj"; -"schule-0.8.2"="0qvq3029ghky49vq85wkpdd58ha20gag33drbmahnbmfa541fqb9"; -"schule.doc-0.8.2"="0906b4pl0rkkk9nbp4p0ds16zdw318xr9gh8al22yjf31f31dww6"; -"scientific-thesis-cover-4.0.2"="1ggghh7w9grb1l1r7xg1igdw79jswcanyn49rpnwiq5rj4a09r2j"; -"scientific-thesis-cover.doc-4.0.2"="1slsn30sbhxlvr73fk9infwjkw66p5sgv0ydkmarkp1ncybqzr6s"; -"scientific-thesis-cover.source-4.0.2"="1qlxpsy3rdb10xxv1nsn817srdfywq6z1zgb4vb0hy3qnbd2rjwv"; -"scrjrnl-0.1"="1p858dfbqas8x4ddpw81mf59p47iqj30yban2g70rims1wqy4f45"; -"scrjrnl.doc-0.1"="1rfx2x3kir9qxp74halcwrn9zg8c4lm72jljspw040gpvjpiydm0"; -"scrjrnl.source-0.1"="0b48zv36kn7bg2n94yl2dzwh9ba1fx7phpzljqpn44ybj1ng966w"; -"sduthesis-1.2.1"="1i8rdk8m8bc5lk35p7qd4pqddi3knpq1ylbxv67ij7g8sgrl9xwg"; -"sduthesis.doc-1.2.1"="0i7f9zjxs297hx3hd6cm70hkkc50wb1pcr83xk54cy72yqiq119p"; -"sduthesis.source-1.2.1"="1j6asblirf0x4f5zp8zbmpm7ak5nsilqf4ksxr4bgrca70vfava3"; -"seuthesis-2.1.2"="0yfan3cpx7h7hrnqncn152ccawlrsaccj0c53kzza0wnkr3hc9rc"; -"seuthesis.doc-2.1.2"="1hnrl455lz61y9ybhmrvxjb66y5816sq3yqb76zszrscxh5a8h5f"; -"seuthesis.source-2.1.2"="0dw7ipk6l0mwgrwrj9sxg8vidwmmy22vmpwm6j2ksnznz0238yf7"; -"seuthesix-1.0.1"="07vjbiycd00r1daqg8m0b6g9k97ja0wn3s4zx7774av6p2hdhllj"; -"seuthesix.doc-1.0.1"="0j1vphdi9z6anvw7d3a20nasrdfgg8vrn9jh9wi787f9vy2xzdlz"; -"seuthesix.source-1.0.1"="09qpilk53k37c8dzc3q3pgvm6yf7i7a09ln0yn586wslvm2dmmhr"; -"shortmathj-0.5.0"="19rscnl84f9x6r7kajj6wjh80di5y1mc4g4nybafnisap76r3c06"; -"shortmathj.doc-0.5.0"="1kzzbkv36hj2wc9kz1wjr5dlgx3r21vlyj7sy8m8i72yfnmajgbx"; -"shtthesis-0.3.2"="0kyhf8pb542mlpf1jd14lral76vlkya1iv3jyw59x11vw9c911vi"; -"shtthesis.doc-0.3.2"="02xqm4dkikb18ha2z0r63i41czjmxm7sr2gzpcgcvf7ql3n49cp2"; -"soton-0.1"="03vldli7z2bsvznmqw5y6gi81ln5v54jbiqm53z464v76kp9w29f"; -"soton.doc-0.1"="1i7b5i8vv88cjxvcm1adlxikqwvbzpzkiiksdn36in8msj23vjkm"; -"sphdthesis-1.0"="1a0a4mwf14f4076gwiqhgdq436l5fxw588rigif0mcpnmmmlkxwz"; -"sphdthesis.doc-1.0"="0b6cgkwb4v4v78nvwg2n1zgc3ww9fnkh43s4qb3g3pdjc399dj3s"; -"spie-3.25"="11s8phbfna7wwx1gji1mpl93arvxlgfpxif4c46xia5spn4i44ji"; -"spie.doc-3.25"="05myxi72wcagb55fk8p8461vag4yl79ilyhfri8il4i72419ip22"; -"sr-vorl-1.1"="1qvq1pb4hr8gqwjcjy71p9mqina8d0zp8gqq2xgnc9p0kgch4wa3"; -"sr-vorl.doc-1.1"="16xbvgc2cyxsbbxg3xi0p8v6p9zcw6wj4l6rsns4hmlnljlgpsm7"; -"sr-vorl.source-1.1"="174bmffj961fsyz8m35y6ps634612sv8dn0ihvlmbyxx7apbj4bf"; -"srdp-mathematik-1.9.0"="1igzl2ws9lg0nbnq20j48zb2zaaay8k8x2bhw1gdiq98qpc028pl"; -"srdp-mathematik.doc-1.9.0"="13gh9xx6qd45r6a27bsr4v088fnrljvba61b74wn676vx87028sl"; -"stellenbosch-11a"="07j555jrcg91nk6rgr6c9dq8y9b3i0677j339hlcb6mk7949nz3m"; -"stellenbosch.doc-11a"="0xrpmbzaa4y3v86zzdws9al13v723k5yjbxgnd9l985fgq5w21bz"; -"stellenbosch.source-11a"="16mmz7pq4y9blxskrxjq8w15zq9vrbcr6nj8ynfy13b7wxvqqrcn"; -"suftesi-3.0.2"="16ys7hdias3f5si5pwk60af86mpdbvmnpmyxnfvj4va6427qf84v"; -"suftesi.doc-3.0.2"="1rkwx6aiq8mip4qyf9aq1fqsp63wz3203mrkny0qgkmgcb07hc8w"; -"suftesi.source-3.0.2"="04c5r1rk628f0fpdxmya47rg33x8jngis44z10apkc1grsqszjf0"; -"sugconf-58752"="1x2nrvqnl65jk3amclgwrk2x1dscncxajdf074a2d410w1vikrck"; -"sugconf.doc-58752"="16w8nfyixsr7l2dn1lbwcscbs6m4mczql9gmg9wi16nr8d7pm8si"; -"tabriz-thesis-1.1"="1jrxxmd38369qrhg2a8w4j9m3ldp08wrblbpmc08f35zwlrackbs"; -"tabriz-thesis.doc-1.1"="1rzl7y6p7n46r7ljcycr4k40qxbih06bli90mdjwn96vn60m1jym"; -"technion-thesis-template-1.0"="1w004bdgaag02kqhsdksw7qy93lyjihhlbxiccavp7m2aj1h9xly"; -"technion-thesis-template.doc-1.0"="1fa280wcainx6z15w199fbvzn8ya3zplgfw41mmvp8cv3y2njnq6"; -"texilikechaps-1.0a"="1z9nvv2y2nzpkpxyf18p426wcl0g6gbg7qppq70b285kdbczbijd"; -"texilikecover-0.1"="04bljvhvmrxh1a4sfqw57yysaw03c5ldi1bq63mlqqvd9p3hmyck"; -"thesis-ekf-4.1"="1liag94i7zc29m4j5vcilzwv13bspwzgslhkf92w807r1k20qi7c"; -"thesis-ekf.doc-4.1"="1ijgnpikan6zk5pc5b5x0sxi7rg8zbyw03q93m0pkd4lz4wf6126"; -"thesis-ekf.source-4.1"="00zchl3hj4a3ir226ph4521x9phpfwbw2jbr9sp1qfyy5vj80fnd"; -"thesis-gwu-1.7.0"="16vb94z3svvnsxmv43d3xy6rz8ki3dmk01iz553q949f4dfig1l7"; -"thesis-gwu.doc-1.7.0"="0xfl7s0i4ni5lwxlsmlldl96jnhfxjyay99w3qc3vc4az9vdqfmc"; -"thesis-qom-0.42"="1iflj5y6vlgrgibp3mrafh3xrz5hzqd5p1iyqc8q10lqr3b5qfyb"; -"thesis-qom.doc-0.42"="1cz04c6qnd88cv2s5qfg0bvc4qcbzhdj0hkxx4xhskqjjj17vhxj"; -"thesis-titlepage-fhac-0.1"="1s9g6h020ahv404mxsfvqic2im68qnvb425cyvz0bj2rwn1fwnc8"; -"thesis-titlepage-fhac.doc-0.1"="0pjvm3d2l9715q50nbbza5l6vzhj6zaf9payimk1lr6k94357v1s"; -"thesis-titlepage-fhac.source-0.1"="0bhf68pc8c41ih92sajva48m9fq7a05x4y9qqanbidvmb6jmvhbn"; -"thuaslogos-1.2"="0p5xs731fjvd413rg4lcp289ijk1lxa5f0c9arj949f6s0pgdqfj"; -"thuaslogos.doc-1.2"="03a24gn5zzr6ma9q391s0vsg7qqn53kbmpw86a3wlyycsrz9ipl7"; -"thucoursework-2.6"="18f3gbydg1z6hiaidqw3j9yqybzvcp9ykq5a7frbd3ww051rz9xq"; -"thucoursework.doc-2.6"="0pq5i3kd19ng122nf1gd97xsc8gd58l5gplg7iswfjykdk5zv562"; -"thucoursework.source-2.6"="016r76nsk9lnr2zkkwz27r2i35j154rlnk5izd11rlmsyw3ix7l0"; -"thuthesis-7.2.2"="0ck6z0fkcsrw22f3qh3lpdw3gma9gmq51ppi4rwd2qnayl2ffs1h"; -"thuthesis.doc-7.2.2"="1xr0m24dxi6i4fbhh5mjs2b54xnpd0xm00ssix9sqv366skkaxg5"; -"thuthesis.source-7.2.2"="0ncw054rzd2byc4sqj83pmg4yyxsckr2bh0rp2spc8bp9j49zir6"; -"timbreicmc-2.0"="0inffnb824kv9lswj46b8p0zb36f4s3pfix4m7x7v0d216xa75pw"; -"timbreicmc.doc-2.0"="05x699cyrkfnygbwfifzz4ih0g5nm7pzlj6ygkh6pysyzxkb5w94"; -"timbreicmc.source-2.0"="0hznll8725wbjmayxilg0hvjw2vf63wj4cxmznvfly9lk8z5zh5m"; -"tlc-article-1.0.17"="1kzizgzmi7swzhjq9dasz392wga0w1qdb4x3x812lbshzg235vyh"; -"tlc-article.doc-1.0.17"="0w07p4rv12ila4ix4pymysbig3yl1apb6cxmb2cp9ziwv9c2184j"; -"topletter-0.3.0"="13ggrw7s7k476sp8fzbj5if20wa1x75m68ip17f1srihnfks3903"; -"topletter.doc-0.3.0"="0f45rz9n6fsg2c429n3hmzqx4cqv9jvrhwgmbfhznn6zrlip3qy8"; -"topletter.source-0.3.0"="0p6gvk4xj7bsazb7ipfgp6by60br9lyha53lj0z7rz16f7f2ar0w"; -"toptesi-6.4.06"="00qd8ap3dgrj16g831458m2kp0jivvbvmya2xzcyp560njsvqqca"; -"toptesi.doc-6.4.06"="09hnbj0g7x76m9lnn47z3cjjnlbbfmapmln3hi6ykb6lh534c4wa"; -"toptesi.source-6.4.06"="1nr54n7hsij9rjn54wgnij16xgay0dda2h6vl2qc44s8yz892jc2"; -"tuda-ci-3.13a"="0f5a9pxrflq3y7q76xscfp5mnzx5k5jv2kqx193r98azzsp958js"; -"tuda-ci.doc-3.13a"="02z3mp8jcks8wbnsq9z8v0n4p89m7i4bywp222wc7p23n37813dk"; -"tudscr-2.06l"="18ajhs99l6f6jh76izkn6g3xllnc739hcdgz0qqr6q4d5i36xplh"; -"tudscr.doc-2.06l"="12mfhhri2pp9cc1pc2sqhx7jbqrcq5js6frsilnkar55v7jnkd38"; -"tudscr.source-2.06l"="16wj8pwsm3f5fcgw498qay8icq0hqrajp1n9bilybc56h5b5m1c5"; -"tugboat-2.24"="1jq8zpm76rbamkpq1dhsj7il40h46bfpxhmh7mrfd2a9pxkzviia"; -"tugboat.doc-2.24"="1s2b5zs6b7dvwwq4gwwb03vjdmdwmyfhn8n31wqdjs338ia7ndsz"; -"tugboat.source-2.24"="0idn2zayjwa00hyhlpn16mqvm7aa04n2gcqk9mx9cksrydhj7733"; -"tugboat-plain-1.25"="1nq7lzyxy4nazdbdxk62jcsk76ysvqaqwi9vb5iwkl2c6bpgw3lz"; -"tugboat-plain.doc-1.25"="1bvgxf460pdxp312n0yv9l95jiq5hr0mkmphf7925d2w3n724rrh"; -"tui-1.9"="0liczx2jcdks6r5040r7dqcyrcj225xq0035ccdb9kjmp0rmc90b"; -"tui.doc-1.9"="1m73fc2nj7qsy144fmbqhld3hx431ry64jv5p7h0r4p0giadwxgc"; -"turabian-0.1.0"="0fjqr88a51699p57d9mpkpf2hn9rrmdchsxhpjng8hkx3yjl647g"; -"turabian.doc-0.1.0"="193qbhcgh63kfnrivzjyyk8vp66wb5k4791qdii7brp59xsy6l7a"; -"uaclasses-15878"="015wxmrjfykv7j2bvmb42491i137h513q826f5czmcf1c8gk8bl9"; -"uaclasses.doc-15878"="0x6krd94wrdwc1zkyvqzznwvnvxx4agwinr5fhshav6r8jfsn4rg"; -"uaclasses.source-15878"="06nsdpmp8qqsrcbbcdpm82gcc3z8y5dlhv2lgwr4i01srwkd91r6"; -"uafthesis-12.12"="0fj2rfdzldav8m1ac7wv8n1k8pcgj4yy4zxx0g8sg1mb5i7if0k6"; -"uafthesis.doc-12.12"="0g096y6dvxfzbjrvvwpb92z4hrxp1p9jvbgkap5gra61msacqawq"; -"uantwerpendocs-3.2"="0cfgvai7y520h99ljxi3jlavis7sl5qlgkw49xk8ng24v6js93d9"; -"uantwerpendocs.doc-3.2"="1ra4930lc9bx36qj3l48lmx7dbi6mk58xwci15l6mk34wbxhvq0r"; -"uantwerpendocs.source-3.2"="1h473sc1g98sca046jv4hs3p8dv6md1hvyfzang8yipm6yp4m6cq"; -"ucalgmthesis-52527"="17pqf8p5wq7szg81iqmimgz8hac49yqlla40g5lf9s8f2pjagjmz"; -"ucalgmthesis.doc-52527"="1fzb7b9v81y0q8pqpvrpsbrk64831pf393hca1j17amsnv5al0c2"; -"ucbthesis-3.6"="19g7wv3iypbkcxhlybizkis6yivgn6z0mvz4rgsi72zaahpxmg7y"; -"ucbthesis.doc-3.6"="0nlpc0vm12h7pni3lw3jqq7fsh273nc63abw8yzw69crh3fspyqg"; -"ucdavisthesis-1.3"="0kdrwdk7mg3yd7hm2xmq63kgikr2p2izibfgw1whai921za4wlm4"; -"ucdavisthesis.doc-1.3"="1chajx1i2zmfh4ypnf8jspwr8kjwbfv7z07qrfasrf73r775yxnh"; -"ucdavisthesis.source-1.3"="08525i86hrv1387jn9ayz3mpwnh4z8kvjvb590y7gqv3cdvrsa2b"; -"ucsmonograph-1.3.0"="1jkcyhrh5zf8p205xgs10azhp69vrz613ln9ssrb4485b7a25b3d"; -"ucsmonograph.doc-1.3.0"="1hhr0z3sy8vn6cv2i7g8nfpnsdpyrsbqrclc8j8g6qidh83x2y5q"; -"ucsmonograph.source-1.3.0"="0x465kyz3chdcj705v9gc8s0w3pmawaza93pcm8nxy3k7dwx920j"; -"ucthesis-3.2"="1mqj65aps995issvi1vgn7f7pvxq39pwxaqqwh7pxnki26k8czrv"; -"ucthesis.doc-3.2"="1hv02nxak4laz9az2kr5lvd97l4mcnixdmpysiz6xqvc13ivkjl7"; -"uestcthesis-1.1.0"="0dsdzhf9pp2x4xbprii9rvl0h0jwwwd03va8mg7c3cjgr2nvy1dl"; -"uestcthesis.doc-1.1.0"="11z3ac2pnxg8qqy4shmdks7h33257nbkgj4h1rq49gc2ssqmp8pc"; -"uhhassignment-1.0"="0pb7hw9krpri3ky7hfshjkkbk36cilf31iv00l5iynsnrw70lwyy"; -"uhhassignment.doc-1.0"="1106wbx02mbnkgzwwiypfz7fg1a3rmwyhlgnsxf4z081q891p3fm"; -"uhhassignment.source-1.0"="1ck8c7jx3qkxnm0a82qfql92s05bg5p352fw1yv3y7v86z2kh6ad"; -"uiucredborder-1.00"="1zklnahb3inyf5qnavccqvkc02iwqw8mz7w1iam0lz2jmzgc1c41"; -"uiucredborder.doc-1.00"="1lxyssdc3sxsfhizm3f74lxcgpkaskljqpybwl1zw8m347p1qf85"; -"uiucredborder.source-1.00"="1rbxxliaaggn4rk6093lhmndas1xy111z9bjrgjrhjhxw19lc0ib"; -"uiucthesis-2.25"="19fif7a2xb3qrmkg8yfjg1hpisif4znc64765d6jrqgb9fqqzlnz"; -"uiucthesis.doc-2.25"="1w20kjwdgppl39axgwks373j3dsnidamhvqy1wn3yilzfb9vjjxj"; -"uiucthesis.source-2.25"="185mzcsh598dxnf2sb4mmvc3qy4pi43qrlim5jhn3n90qvwp62cw"; -"ulthese-5.3"="0wbdhwnjydq4v66jlfrjz0d9845060wk847z6y0jx1q69gvcn3qi"; -"ulthese.doc-5.3"="08l2769vnkzbma0p97i7sdslvnd31fcxv6sadcqmqww3vdn1xl6m"; -"ulthese.source-5.3"="023vd313y72i3zqv8rmdbxah580id2vgi4i91nh4fqrmfkm7n8zw"; -"umbclegislation-2016-6-8"="1lsvsxjhjlfxlqvlmy4pqbgsr2jv3imzgv7zfa2p3gj382hj1qlb"; -"umbclegislation.doc-2016-6-8"="1a3cjb20ycjs1nsghc9fsiz4kc8f6awah0bksqyh2ik4fnkydxb2"; -"umich-thesis-1.20"="0k1jl1v6nqyg4ld1f470x96pjm68hs5fnl3kab383363mly5ypy0"; -"umich-thesis.doc-1.20"="182vclnb9yja2jgh6j2b2f7421w0xi567s0jrzaqvbnaik5sk5x6"; -"umthesis-0.2"="0iby3d7f8mm4p5z4jgnxzqnfmwhsws6hg3yb2l0mrknlj98ww4yx"; -"umthesis.doc-0.2"="0vf8ikxi8706hc0sv1h53wzpd4mfiz607hzbhwq607k4hc71iz8f"; -"unam-thesis-0.5"="05lb63wclgxqr7jn7c38plhg3r806b7888zyifcivv85q143j191"; -"unam-thesis.doc-0.5"="0kxdr723xvg0lzhmzwpyik9vxy584y41pmwy8bi7197gz1hgdlzz"; -"unamth-template.doc-2.0"="018vpcbxfzch8qsrrqakcxxir53nalvj39l2kn45kn26p5nfkfbn"; -"unamthesis-2.1"="0wqi46mdjsl06q7hyvy4wpihvrr040f5g23bgc6lm6lq11jadj6l"; -"unamthesis.doc-2.1"="1l71n80psc2hzjs1lnfgpfpg13355sk9ld86104dkyrl645qx07r"; -"unifith-1.2"="02s92p2c57iz05dsc9al1f83scd2cxarxscsg9zn38yy1kbiqf31"; -"unifith.doc-1.2"="1daj6hs3jsawp08mw3071c3sb9w60dkb0w8bwav177s80c08vd7z"; -"unitn-bimrep-45581"="0vv9vc9cvw3bjfndlfyr69kpziymlgalyvc11av9kq2x5b4jlc5b"; -"unitn-bimrep.doc-45581"="1wyiar6xjhsjcfnxhlz8y1l9xvlcpgmkh360am85llfqlnar5w5f"; -"univie-ling-1.13"="0qpcgq3myfcm6zqn7vvl32hs4v9miqv2ryl29dkwq9rk83rkih6k"; -"univie-ling.doc-1.13"="04cw8kg5zhgd2fsd44vkgv1isb0ca1726mfpr8j5qha1kqs6wha3"; -"unizgklasa-1.0"="0clwxzngdy6n7iwk9zrn21i1frmahdf0s9qq2nqlhk4h6rxwb8jb"; -"unizgklasa.doc-1.0"="1q7q2fpgpjdsmbfj9zijccqpl2m6n0dch72wl05a64hxg117jbl4"; -"unswcover-1.0"="05nkk3xgpjcdlsk8xrj0mn5r3kwzi15awish2hd205v1rnbjiaz6"; -"unswcover.doc-1.0"="1jsxc55wrfczcc9mnf5yl2yqbbzbk10jcdly5z5nyfvg51427adw"; -"uothesis-2.5.6"="1wgs3fxg01cxcpnhk43ik12sjdip77fkxdaik6w4w926i8z0np7s"; -"uothesis.doc-2.5.6"="1zmpx6biaxlm7fys5a3qahglpbqgn6ml07z6q8vplyqgn213hd6d"; -"uothesis.source-2.5.6"="137c9av6i6b6hg97wmqd2iwqzd1dq6lvg2992wnbm2bp2m9r20zl"; -"uowthesis-1.0a"="0iv9s5dfmbrhxbx4kqbhxjf23rln4ymcx4kkk5fmc67qi51i8jnq"; -"uowthesis.doc-1.0a"="1xcqs2h6qs2lca74mg1jvqza77xrph53bk9dwkk0bprhkxn1all1"; -"uowthesistitlepage-3.0.1"="17xh2myc3xj2zwbc7jjdmnfqhmhzkqj3dwwn2q04hcyr4bm7vnfz"; -"uowthesistitlepage.doc-3.0.1"="1gm1clfvd0g45fpgf6h4nmyy2vrc0d9lqfy9h3nn2pnh0ki2z0ir"; -"urcls-2.1"="15hnqy2fxqblr9db4h2r38v1h4iwhk5kcm8qm9war1c1pgwg2a6l"; -"urcls.doc-2.1"="0axb3cpbqbksrixhksdhbjyqyic0176lyxxk5di268jbr58203xp"; -"uspatent-1.0"="043az1c7bs194w7frr768pwaliiaikfibxh6zqiznc85ax6q3d94"; -"uspatent.doc-1.0"="1q04i3q9693ykpgsx1fl11w0y0kxffqyljns1qy04935s5b8vskv"; -"ut-thesis-3.0.1"="0ras7l4xhd4smys0fwp8hymzadrvyh4js8k1fcclvci3aprhh64y"; -"ut-thesis.doc-3.0.1"="0mm90mryz38kw3zjbmgc9lhknkzjmgglf69q5l9g1hsk1djgca7a"; -"ut-thesis.source-3.0.1"="15y2hzfgzg961lp4zmwivl8var64d392kzs1rvv89d1axf0k0xl7"; -"utexasthesis-1.0"="0j8jjy8i5i9lgy7m9wnvj36ms597amnvb9a0ac2a2wh7vqf3dxgd"; -"utexasthesis.doc-1.0"="0131pn2531bwmsv3ak1kf9nc4v86icxjg19d28sqfmlnfvl73v4y"; -"uwthesis-6.13"="0x6j9savd25v7s1nxzs0yqv10i1bbd89pnb0ldjmwilrfr78yw9c"; -"uwthesis.doc-6.13"="1plbn6dkqwl4bdvsyskzylww9j8akxh120yrnkfamk56ij9dd0py"; -"vancouver-0.8"="0vsvg7aplpj9gjlgn9mcx6r2fzli53bqmd2cdjf8l6kv2b9smmjb"; -"vancouver.doc-0.8"="1zm7bnlwns945nzngv7x851fcmbzc400v81d52fg9p1q8k5f8458"; -"wsemclassic-1.0.1"="0zpqx8gi2yf8cm5rmvchz0jprfwcc0gjkwcrygrvlqhqqn7qmc07"; -"wsemclassic.doc-1.0.1"="0h7vz6pza8bv8y8ihfplbsq8ip9ds2z63s7j7qh84vf325ci5chm"; -"wsemclassic.source-1.0.1"="1522cvwkw0ryvhgdqqd7k8lrbrayrmm3h31c77v7x8a81cry2bj9"; -"xduthesis-1.00"="08cxhw5lhklv7vxl30fhwmlgq4kmv53a8qppcmsap1v8jc8vjrdk"; -"xduthesis.doc-1.00"="1j8pqz4l85qiziry85w7a23i6s577nb2cpbq4v5jgvp5l8x8lhzk"; -"xduthesis.source-1.00"="0zdlq46z2l3y5zydal9nsawv7nhhp113hdia15d9fd23j8gq4jdp"; -"xmuthesis-0.4.1"="05z3pbc9gqfnzp4y4a5p6bmprsr1r63w9l442hgk3pshswc2dflp"; -"xmuthesis.doc-0.4.1"="0dqmbdz0ydlq1hkz0s3lr12sia1qj7p912carwq4pjg9rrw98z7s"; -"xmuthesis.source-0.4.1"="1c3a90gpb2siww65yc2l3kf91bf5xvxk9iq1s9cnx1ngxjbs7835"; -"yathesis-1.0.7"="139kcsylhr597r1jga5izsr1ysj29asjawp7z9d2sz85qf9hapyn"; -"yathesis.doc-1.0.7"="0f2lkj60gqyps85ajvxz59ncb9pbcv2i0cpmcncq5cv5x66irl97"; -"yathesis.source-1.0.7"="15rz47rdjs6br84jvj9i5nvng23d009d3l2a3dr0gw1w142iq0zb"; -"yazd-thesis-0.3"="1bhjqd6k4lqk4sypssmrsjl9lqrbha9d0n42qbaq1mg5whpl2b8x"; -"yazd-thesis.doc-0.3"="0krsm9s3ym6f3d323scvxn8cf1wjqppglhmzbxwn0cpjq5nl01pg"; -"york-thesis-3.6"="04c8g1wkl795caadm8kqfy6kdqqgwlk46lijpmyiiykbb8z54wq7"; -"york-thesis.doc-3.6"="0zp6pfr3giqm4nbsidg06q0c3x9gr4bk3g8qq7wxl9a2pgk3z45p"; -"york-thesis.source-3.6"="0105amrybkm78pwb9hrd7n8r69sj6lkh1zm7c9sskibb13lqrk9p"; -"texworks.doc-54074"="0n0ydn8v42q3wcxmhjv5nwmmzf5yfg77qlc1v5bmkpb04dn4055y"; -"arabxetex-1.2.1"="15c8nmmv87x87dbjwm1q0acf7pbbh8w9gpiw77fs2i51gab592xy"; -"arabxetex.doc-1.2.1"="1ns1y2lf87gspaablh4lm3kj33ggpfp7hcxbdv4vxf8hhfc4pp7d"; -"arabxetex.source-1.2.1"="077r71723zlzfjmc471a8hbxs1v2g6j2xpiim3g2klxsj589bxfn"; -"awesomebox-0.6"="0bjnvgqj4g1i6djzzzdjdrnlvli3dm1v2w2mi59s5s8pyc5pag60"; -"awesomebox.doc-0.6"="1m1cjic1dqf2zvym1ma83xy66b5irqma2fb6fy0qnl31f9bfg6x2"; -"bidi-atbegshi-0.1"="0lcg9h78shrfk11dqjr9mccyh8n2264vyl4fnjl0cyc0ccsciv25"; -"bidi-atbegshi.doc-0.1"="1xzb3v8fc82p2s3hwkfxz7jz1za2cy4slyp490dbwzq9hrrvs5wl"; -"bidicontour-0.2"="1yj7vl5z4xh8i420y1ycz21rw0yy83z0v9nlvi8k3ph2qis7lp8m"; -"bidicontour.doc-0.2"="085xfi5w350vbp4vnq8kgbilnz3jxwf4g0incvziy5hxh4isqirz"; -"bidipagegrid-0.2"="1nh14lla3xv9zikqqpnw7nb26kshjd186ijlz9snz19nkgddq28x"; -"bidipagegrid.doc-0.2"="0jgd9mfwar486gl7imm1m87a167c06cdhxg9qqp8m8nk6xdys8f9"; -"bidipresentation-0.3"="0kpwhs3dvmjhpv2n6kjly5cpj56gnwv3iyhiiwffd4bphzyrnyjb"; -"bidipresentation.doc-0.3"="0hp0zbr5mpwsrd4rh3rc8qmy4srp93838k38phmsm6dwgqkda2z3"; -"bidishadowtext-0.1"="0jpz5a5q9c9c569ssyzk48y77msvfkd5csdvv0cd0r62ivrai5jh"; -"bidishadowtext.doc-0.1"="1bcbz6fiydj6dx8xzkrdsrm2vgcvn1jj4fk2jh1333la6rygvvav"; -"businesscard-qrcode-1.2"="0xv56yqqj8y4270955srbiw7qy8bm9r3ih0zazlkrxnrxyh82jlk"; -"businesscard-qrcode.doc-1.2"="0nfvak5730q4ci88dyqln97ljhjbwxn3gk34rq2b5rk5cy2inabi"; -"cqubeamer-1.0"="1r63ahd6m6ll0phqaxc02hnbrf3f6xjdghrhn7wdqxnf8n9k34ff"; -"cqubeamer.doc-1.0"="0rgfjw69is9i06blv1dr2ki6d8lgfwg3w57r3620r7yffj7z9hpy"; -"fixlatvian-1a"="1qm1jj803a7zgqbjn4q4sg4mn3pvd600pfkqabjvp0ck24r1pw1p"; -"fixlatvian.doc-1a"="160bb2khxfhl4g48a5cbj8xdxslgxvav1c0wiq3w1ajla278qj28"; -"fixlatvian.source-1a"="1zfdr8kahxgkhxzg925lgls50prcgyp6hz1vhis1241f9rd6r3qs"; -"font-change-xetex-2016.1"="1xjxrpqfxll7wfkgm5ksjfavk7zr5a36qfjm5aw5a92wgqzpmbrp"; -"font-change-xetex.doc-2016.1"="00ikhz2nafa2ck1j6vb564ij61lnqa64l9xnl4h7v12g11j0h2k1"; -"fontbook-0.2"="12dcha7gkyl4ycizd2469i628l8qvh1xzacg7bv7b55q0dip2hlb"; -"fontbook.doc-0.2"="1ywxxp2ygc6xjrjsmq1ax4p9v0z3hpmbcgsnqm3vdnnda1c0gn33"; -"fontbook.source-0.2"="04ny0n1wgs27ky6fpf0i8ivhkj6ypad537mlx7rz39kkjpl6mz96"; -"fontwrap-15878"="185mzghp8xckdq7z6cdwznrg1pswflvfy61bhsnpaxx8wagny1zk"; -"fontwrap.doc-15878"="01knmxqj88g87ljvxmf8rr72i2gh9qdmx7zsbwyjmibiw71l6pcm"; -"interchar-0.2"="040zhi6rq7l8s04zcq2vfxricbvakkxnx0bzihbj1ss21pmyrv82"; -"interchar.doc-0.2"="18lpyq26zc9b2ypcb98k578wyg2fp1fllsfyrp67b4v9lnz1m7q6"; -"na-position-1.2"="1amvifgadhq73avh1dq9mj2v4s5r3hlr6a3z4wcbhw32jd31ncbx"; -"na-position.doc-1.2"="0pcn0r0p0z7lxyfsvcnl9skm5aa5xi6362vydpx9kv8m11gl7pjb"; -"philokalia-1.2"="08z5hrp8a0551s0qfj02l79cpkdnsll5k60di132addymsl2p0lw"; -"philokalia.doc-1.2"="0pgy5y3b6ramrkr8r7bvw5byviy50fprjsj4cj5h3l888inj8kkx"; -"philokalia.source-1.2"="168r0ygbvwbwxlqvjqqma0q3w4172jpif1sr8p54h70crqx2310j"; -"ptext-1.1"="137amhihk598rhaf0qmbahd9spqivzqrmi53y6q3mlzhlrxg0p1r"; -"ptext.doc-1.1"="12crg85znvmpr5yhvr4yr6riw037zwcpwpavp1vb1nnd9zy99ya5"; -"realscripts-0.3d"="0ph678nf5k03xl63z66gkmg5f8agxy201y6bvabhdnb1zhvfrfmm"; -"realscripts.doc-0.3d"="1kmlaym3vxb9mx0jp7wvmsk13i30wyyazhny5zzk14bwx8rk3kf4"; -"realscripts.source-0.3d"="1qzqr2q2bkq4pchin1xivg8gwx5qkgip4kq74rswfz5a5iimyh0n"; -"simple-resume-cv-43057"="09xsryzpnq33wja6fkrxy4ajrci6xcn0bx0mbsw37h0q0h65rp9z"; -"simple-resume-cv.doc-43057"="0gbf0rg3v1ivw631yl133iamh7kadclr089rby72al50xwnbi559"; -"simple-thesis-dissertation-43058"="16byfnhfd1j14911xs1448yampvvplxy8l54by4qwq01wp7pjjmf"; -"simple-thesis-dissertation.doc-43058"="1wrxjkgbvps1wyicwlhkx59xwb3vcy1n0wf7r7dllw11r7hdg6f4"; -"tetragonos-1"="0l8b3kjk0jk70mmmv37zrdb16id6yrjvgsgsmji7pzdqiixy7jh5"; -"tetragonos.doc-1"="1g2zcx3b1pfc9dh76p5iprdgsxp0yndp7rn5ksbq4s9k4m7ikpzp"; -"ucharclasses-2.4"="1w04lfm8bjgrg9qndfz2zwhd7yakrlps1kk29ldvvd0200ns7db4"; -"ucharclasses.doc-2.4"="1arp54hwrfjm7x1d5cz5qvc4r83x9kdla5z81p7ld2zixjdsbph5"; -"unicode-bidi-0.01"="1prl0i2a9dg5yc2yl1x1k0zmz9lww051w1zwy8cbyvk3rd765a72"; -"unicode-bidi.doc-0.01"="0ab0gym9sjllmqdclkjfbc4fh9n20999mv7z2gylfybirm0n7i7c"; -"unisugar-0.92"="1dx088b21apj2rpij4pxa9srx29irzsfmlp9vn8fjpm1ag60md98"; -"unisugar.doc-0.92"="1mnpbd68i0112hhcgiwc2j5jkwffrfdqlrdl896ybd0cpwq5d8sp"; -"xebaposter-2.51"="058zna623x9x87yb9wgdkc88gigwapxbyff3dwsdqaam28rakm0h"; -"xebaposter.doc-2.51"="1lgzp70wr3rfw552dniwnlqf4bqpjvfmacy6gjiyj4blf3wgni9p"; -"xechangebar-1.0"="03d1wmvldpfk6y52sd2pvw3ipglbl8cc851rqlz5jgk82c2frxg0"; -"xechangebar.doc-1.0"="0cnc62nff1vljwkk6gb6r0cwxq17b2yl4v9ilb7kxapaa6apbp14"; -"xecolor-0.1"="0ws34zr158nkpghiwlvigb44zzi5qymfqxzsnayw78i6zpqal55x"; -"xecolor.doc-0.1"="0hz9kk36ap7szbsd0jp6a59lnaxgnmwl0jg8gmz8s1pjf77jf5ww"; -"xecyr-1.2"="1qqfdi6pxlkx6pxi2q61i0diwmsy9n95x4bvj9r3pgaf851p7cjx"; -"xecyr.doc-1.2"="08b2xahg1agfczvqpdkvi3641g3pd2w2yc245bnyk0nccfcnf3k1"; -"xeindex-0.3"="06ipq7m9mnal497j3awdspqim3fs7v695pf2x7v4l92vqz3hh1sa"; -"xeindex.doc-0.3"="1pa1fa8vjgbzmgphx3fmm93dd5wr3adxrrld5xibk2qrp7fgkbsr"; -"xesearch-0.2"="1rszh3svj87vw5lskxv8bvnkzzj6k9rbikl6rr87ry9apmymsklg"; -"xesearch.doc-0.2"="0cb73d981aa0s0hg2ynrg3zybsaw28f5b29zmqgvzqidi8vxfbhl"; -"xespotcolor-2.1"="0w7nns136gfz1dvq6iplk0jbza85lpzlpvsxf1bzjhqw5sk6v4p9"; -"xespotcolor.doc-2.1"="1fai2v8x4g9cmda5m6nvf6g8w6qg64qfdq1rvjlz1qiqmy71c8jy"; -"xespotcolor.source-2.1"="14yachqawnmpldkwc3f3q4krj2sr1kad7wzy1lfxwqggvpbdcjkh"; -"xetex-itrans-4.2"="17476frf0r4w50bfbk6g6ic40kv3x3i6qpl642glb3vyzyjd5dbg"; -"xetex-itrans.doc-4.2"="0bs67djfa9pi1k2900y2ybnv6lgjd031cyczks0jjzfnav2g4df6"; -"xetex-pstricks-17055"="0i37r4lk1l36cch6kjz12mfzgpg6hd7n903fzbj9h7mwmjwnrylk"; -"xetex-pstricks.doc-17055"="17kiv64h94hf83ailbw29wf15r7gv9yq06h3l53c38rn0n20vdz9"; -"xetex-tibetan-0.1"="0r8xgnagsqrkxr0ij0mcv30vhf7c3amyf9lk895lgwsvz6cysmma"; -"xetex-tibetan.doc-0.1"="0p5l36zb8l3h4x8sjk8cwxj5psvfa4j0kg6jb93sj1ln3yfrwfr2"; -"xetexfontinfo-15878"="1sc0lm5w94320f5abv2hw2bzqprhk73fjv2lkv380fgkpdfi7pdv"; -"xetexfontinfo.doc-15878"="14mc9snykdwzcmq013bs8vzn5w80lblpg05jk57g7fl2z9x6xl38"; -"xetexko-3.1"="1q2kzx54b3fshqsdblw03kx2qp57qjnps9hf3cbdm3l4gq2h0qcx"; -"xetexko.doc-3.1"="1vlf5raawir2bi9nnpa1q2d9fxaq1cf3ixwfmhcgpqa1kd55ynzv"; -"xevlna-1.1"="16ayk70kxk2s23r6nxva1hkb1z7aw7zz1zhmcis1bsijx657kw25"; -"xevlna.doc-1.1"="09aaf3mpbh07mix5xvr20zybbbrbgbwcmkd5q0rfsd0ac8cm72fh"; -"zbmath-review-template-1.0"="14fpdxb26lcyhfiy189a4135i8x5vb7fq6d35vcj13vjrxsk5np9"; -"zbmath-review-template.doc-1.0"="16chwapj61zf74ma9794i96afnhnpm8h73lx0rj4rbkd6d37zl00"; -} +{} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix index a42b384803..a0714b2fba 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -16,97 +16,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.3a"; }; -"Asana-Math" = { - revision = 50999; - stripPrefix = 0; - sha512.run = "e1ee08540790685aab85c8acb407526f5936478c37d86b266728fdf39bb906bc7f6566bf5eae90b631eb59f59d65d414943a6faab922681199af76102078ed4f"; - sha512.doc = "69a6615dda5f7e47fdff1b0b1afc4211f749a929b81f19a554246033e6f5f4a482c3c03a6903b64d83c4daeccb70983dacb35467047a467314637e65a19c917c"; - hasRunfiles = true; - version = "000.958"; -}; -"ESIEEcv" = { - revision = 15878; - stripPrefix = 0; - sha512.run = "79fe8175d0adf25ebf30421eca323f9042bc98792290763b06ba53978bf4962dabab228b9aa6220f859f64356eabd2cc94e71351aac441e64afa3fca8f73f742"; - sha512.doc = "85d731182d5284da69254744a7d9e23326f5344a6585ae95410671cd5721961958480fab4b621d58fe01ff9bf0a602b3f94089dafaf5614fc8d57ad243e9b223"; - sha512.source = "a63bc1de05f659d72f9fc297436e7aad36db6124f22c2a29c65418a1233c37a0a995bba3267fca6fc83f04efa119315c25937aff733b64b7c78275313209d42c"; - hasRunfiles = true; -}; -"GS1" = { - revision = 44822; - stripPrefix = 0; - sha512.run = "c71acefcb0ff1cd97792c27435e7eb4f4e32f072a275e5eb7dd13d7b9928ca00318d0acdf605f35cc4a3d7099247c290155d6963ac1560f4b11f37a123fde0b6"; - sha512.doc = "6e714b1087d228923f38dc3c8680e57de314eab79ab15f0aa247ad002a3aa6a9dac2a253c5688c904408c8d14dadbe307b3d3446b38db767a650989d5ed9e878"; - sha512.source = "3ad67dc4bd1033f828cbc11196a6ce9a25b2abc90348f727423effd6d97acd7fbf617b88740afb9050f481fb403401033c3dc60c3b9ac326467697f9b1d09a49"; - hasRunfiles = true; - version = "22"; -}; -"HA-prosper" = { - revision = 15878; - stripPrefix = 0; - sha512.run = "330df0a8d9b7b7ed5e4d2b74c626576ca8ac852cc84f9c79296141b14892819869cbd0e7f68050b4f3e5d107c43f9939ec9c9248c19ddd20da8d16ee2c25104e"; - sha512.doc = "55822b9703d44481ae62dcb690adaba29cee5432b5b8b9f549884f55e943b1575064419712745166a6c0fd0fdfadac60473c6642816e1efac92c8e27c2cca76c"; - sha512.source = "646cea88f8d725e30257c15bcd198c0a2c9cd6477b956279a38443d5b22ac4c64e795a2ded53649b3d1504bbc66639946c331ba978e775a5fea33696c9bc6c2d"; - hasRunfiles = true; - version = "4.21"; -}; -"IEEEconf" = { - revision = 15878; - stripPrefix = 0; - sha512.run = "bd35025cabe78886f78333cb4ff186d0363480ea0c1f825456e9b6debc08c0a2dbfc7c703fc9caebaf2a20c47925141cb090d50146f054a76e1aecd861408517"; - sha512.doc = "0316a52d380555afb04358cadd56e6fabe23293bd3b6dd0f0d4e4df9db75e26708dfc7df4c280a8a9759e4c8518050805f197357b2efa43664a984f56dfabb05"; - sha512.source = "18d0204a051b8c1d0ea034b7c3357228b0dd2f40d44ffc059ee270fc22f284a833eec72527874be0c1414e01ca91f403726c801f75e2f6cd2d0a2b097db5c53a"; - hasRunfiles = true; - version = "1.4"; -}; -"IEEEtran" = { - revision = 51065; - stripPrefix = 0; - sha512.run = "7db183824e4a62a9f90046d62d33940573a25d2ebe72de0d57a68340e82e2b4b21fe74e74608cc73fe53b0d889019884aec8e1b11060849a38107280e0fce2f1"; - sha512.doc = "0fab8351fce31d36fc1cee91feea7d09e1acd78d80b0500d8c3fc7f3ce322055b952423e7f39d09f86e99b22aa24405ff5a0f00207f88a3cae8cf39593e9b326"; - hasRunfiles = true; - version = "1.8b"; -}; -"MemoirChapStyles" = { - revision = 25918; - stripPrefix = 0; - sha512.run = "83455766eb557edebad28b73c5decb0a7a23f097bdfb795cad9cc0847af916ab012fd044a63dc9893932ce0f161e831a2a8e7c0138a2157e0f1f4f2211667c16"; - sha512.doc = "32b171486838a762b2cd49af46d3f2a152e9d592735a15a407784cde02e5be9281798302eb094f0c045f895a8f6e86464e9c214bd06f9061c313807ec36cbb1f"; - version = "1.7e"; -}; -"SIstyle" = { - revision = 54080; - stripPrefix = 0; - sha512.run = "69bc838535facdc8ba17db91ead53dbc233f7d53e453164611fcd7e194692212ff74f57979023fe14ed8c8df347caeb42d99fae0b14c3cc54c60c8411bdef80d"; - sha512.doc = "6fb33be5371932e95e5e3002bb2696d0707d62425f1a539764d195ee119f37441bf288a502770667624746631bd75227a245bbcc2050c1c2d815ce4c8fa6ec85"; - sha512.source = "f1e23a9d04b637afd72056e1792a0c795f1b02b96ddd0170e6f412a8159389f8cd79bfdbfd2860fb5b6ca6b1794ff5c0bc59fbaabcdffbd8d69d26b205e60df5"; - hasRunfiles = true; - version = "2.3a"; -}; -"SIunits" = { - revision = 15878; - stripPrefix = 0; - sha512.run = "b804d61bcdcc9d6f4559a05d8bfa7d8f7a3c378a618e5cd068b29e2661968b7564c36ce2e3d97f7fc7af15c11e89ac61e88ff25318d8c08536181d1f546f260d"; - sha512.doc = "09c35a6d2e2d90701ac099eaf06116d4bf5b93652c512969dfe2afae74c9c04d70dcda8a5053d707aed0724fba0a8d9c3487a51fc617fd1a757c596a99b974dc"; - sha512.source = "82081b1c503098847bc5f24c2749fb6abd1a739ccd21b01464119b7b6a92bfbb51666d0f5d14aa335e23a03b72b5eae8fefccf9c790819a4f8cf14b37ff297ad"; - hasRunfiles = true; - version = "1.36"; -}; -"Tabbing" = { - revision = 17022; - stripPrefix = 0; - sha512.run = "10d3c274c5838c48bd47f651bfc57aeded8246787e23091307dcabf2794fc9eec19bc3a3af9ae08b812688ebc4fffd295fb01c7be7d61fcd06ccb46ce4f6b739"; - sha512.doc = "1f4eb22039e3bae3897502fe541e595c802fffa94d2cdefed451cf24883e1f41d29e9ea0065d1d68ddee3e166aaa1ba7896dd84bf612e9c007ecc5c1e2d5f616"; - sha512.source = "a4c7b558e6e5ad9eeb8b4e3d81c20edb09d66cd8aaec2b501224fb7f93a40c3771f8e23d2fbfb910158464f98d8172bc691787ef1c2256066fb85e96068f368a"; - hasRunfiles = true; -}; -"Type1fonts" = { - revision = 19603; - stripPrefix = 0; - sha512.run = "858836fc8a955b87f823c25b22fbb4b07f119186ab437e0e7ef7d387bb8295b8a65deb237c649d93afe7d72213745d4cfbe48a51372c69c12d088f5403f22dc3"; - sha512.doc = "5448b85539d29ace8365bd0e197693c0c4c53a145d5182c3f125e11cb3ca8194675ca9553ad53bf7e503b1636f17614ea2e338113f61474d9744dfa91800390e"; - version = "2.14"; -}; "a0poster" = { revision = 54071; stripPrefix = 0; @@ -144,13 +53,13 @@ tl: { # no indentation hasRunfiles = true; }; "aalok" = { - revision = 57728; + revision = 59602; stripPrefix = 0; - sha512.run = "f25d1ac4e5de93e910a445e1830694c8f3a4de7976731a334c2bcb32b6fccac9d4386700b037c6c12556a9f9b575f90616cebc00d05f00f1db0273cc708379c6"; - sha512.doc = "80b48b0a8eb1a75d0860d18d3ee4dbd93df3e7b11f3d22f8ec442bea6e16d0dbd1a4bed74450b7683d5e1eb05b43b1e2ffbe04ca15c52c3b7091746c45cb4675"; - sha512.source = "389c3ad43370e282bf29b0c80fab0324c66b00c2f379404836f91f77113b0c736c502578317a1b56f37dd25da3f89ac233eab5d21e71f1204c9ce159703f264b"; + sha512.run = "9e202d3c3e33c38c1cc7ce5fac9ab9759c2dc684d17c9b450ade236ed392acda87b11a2d028c65da74c6fbca2d962a09b2bbd854b7dc298865791009ee18b1b4"; + sha512.doc = "db2a25f5a83a7e2f85c439186327a7a663156631af38c6c9945a2783b6b7d02539f762dc4c946497368f828f615c31a6a4d392ed78489111230169e18357a78f"; + sha512.source = "856e4b95df45104f0c8e2112e06d2ffd6b878312e6159bfc204c875db1e2c34722b7c9fa4e3e0cc344300263b1639dbb26a43c7db26dede6532b3051f7cf41ee"; hasRunfiles = true; - version = "0.2"; + version = "0.5"; }; "aastex" = { revision = 58057; @@ -191,6 +100,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.9.7"; }; +"aboensis" = { + revision = 60059; + stripPrefix = 0; + sha512.run = "3874fe3b3c1b9d8541ca68bbcfb33eebbe52afe1b7ab26a7c90edf3250eb69d80445a829f638c0f61c4b494a281c1a571c012b2e78e070b6c617c788a50e92eb"; + sha512.doc = "32189a8bd005651ed2b99c367111839acf2595fc8375e1984d8f45f278b2d88d4da3fcad64676baa3dcb91955055f5fd30608f7f7d26cd13a9f10fb5421882b6"; + hasRunfiles = true; +}; "abraces" = { revision = 58761; stripPrefix = 0; @@ -216,12 +132,12 @@ tl: { # no indentation hasRunfiles = true; }; "academicons" = { - revision = 56119; + revision = 61159; stripPrefix = 0; - sha512.run = "87e2c5436f92e288c94d612380a2bd6736a19b7a6ba714c0d33bfad27aaab79cdf264b585e722055b1d8402be5c0001c1d8759ac3b79d6c2759c90d6a36d2f6a"; - sha512.doc = "55f9e0192b8e50126fd573aee69ce5d7f389448f7af9e2973515ae49c552adaadd3eb8f06f019e42d0caa23c2d9a7841ae5fb7f6c0b6eed9a43eb60f7b0dd964"; + sha512.run = "99d9fb8730b61fe18ce7bdc74777f259f6d322895909dc320555e0db9543c6daf63ad3dbe6231c7f43dd531db3b6dab9cd795a37f97ca8049156235831e1761f"; + sha512.doc = "d1e82a45769adb3f000a100523f38a8017f3d060f28cd618792b6ff3df8d782e2fa473c0c7a5f2df5e5c83564aec6db290ab15f0ae414cd82977d1eb6d3aa065"; hasRunfiles = true; - version = "1.9.0"; + version = "1.9.1"; }; "accanthis" = { revision = 32089; @@ -273,13 +189,13 @@ tl: { # no indentation version = "3.13c"; }; "acmart" = { - revision = 56946; + revision = 61233; stripPrefix = 0; - sha512.run = "cda16a82e6416cc92773ad39e1998bace936aced37a7b1208c48857b18447993bb14bdb31a5632fd1700e4fdd9fabd4c3e39c6af27fb355285bf824974e9d2c3"; - sha512.doc = "27e241160fcad9cffb962f0204bda5384f81946bb82ffd99fc3c35d58e95109a15586214c774d6af57a9a12e8a1fc9f230d7c18f66dfb13ef2a45deed957cf55"; - sha512.source = "b8c9b62228bb844373e972a24ec9bea3bbb81a028d0700bc61a42a4298241ac96483ee52cda42744ae3e453e1eaa2e7564299554fa535fae5ba15f77750f881f"; + sha512.run = "1054235daaac6026efb3592fc08ac68095b61ea21bc884ee9af4142bde1e7527864eb64325c21a3bab404bea320ce5fe35e9aefc21bded7360ec43e83bb33f73"; + sha512.doc = "f98d64df2f1cb7c82fb1cd4b99d3e8f1ca102f2ab6dd55ff8da92c42b889ea62dd0269b0f584d251ad5c639cf11ce24114c9409dfa65551b267d1140af0b4b31"; + sha512.source = "8373736287dbbbf0919169c0b4c4e9a256eea82d9f54d821f1cfbddeae7433ece647e931374538a4d1545d626e08c2db6f3c6510f9abbc94189be651ede1bc1f"; hasRunfiles = true; - version = "1.75"; + version = "1.81"; }; "acmconf" = { revision = 15878; @@ -562,12 +478,12 @@ tl: { # no indentation version = "0.2"; }; "albatross" = { - revision = 57416; - sha512.run = "78f4df49c5d7e4bc942ee80e1e9e7282d3b90b00af2cb946c52fca223b224dbf26c385f81d7a5c05e27e8e52b8de7c1197667e6ee699f8e8834d0d8739bc5f83"; - sha512.doc = "3501da3f5dd2ed9830029f4880e59ec6a837ae6063fc7abf6b3d2cee0357c2fab2c7747676a0a1d719e68cb512e680fd0a2eb77ba09993f86f5e32ae5f8e40bc"; - sha512.source = "fadc69184b89a4d664f9fc8b3d7d18ca3bf9cfc49c62ada68f7b265cf3cc9b196e06b086058bce2f842200f754e8c5f1eb16b5c4f17a9cfa00166d3ae64ceef1"; + revision = 61175; + sha512.run = "8c3556c5c59c049a295790042f72b929484962b622a00c3a3dd39817978fe1cb2f56ddee9863f65429b507350c197740306fd0e28be322d26d6f30ff8d77c10f"; + sha512.doc = "beef301cbcccedda3b3a625a87a572fda75d8c28a6d76d45bab4333b17a1a581e1fc42abb169b6fbc8b461334f9b83063f6fd26e445ef42f56904c051b65d311"; + sha512.source = "69b966e2cc59ad0f5f46500c4b2a21e3ea4e627f03b2b7b99e5e313dbdb35c5758762821cf3d776a39a9cdd930a80b964ff70bb956b8fc528113c354a88b9934"; hasRunfiles = true; - version = "0.3.0"; + version = "0.4.0"; }; "alegreya" = { revision = 54512; @@ -655,12 +571,12 @@ tl: { # no indentation version = "0.1"; }; "algpseudocodex" = { - revision = 56125; + revision = 61230; stripPrefix = 0; - sha512.run = "e1cffa46708ef8d6479aeabca45e5d17bf14edfb25973fba5e3e006c0067138a432adfde0ad76f6ec0bafd327d1b2d74dddaf1b131732b5aa267b7fd898b4ef7"; - sha512.doc = "5fa75ffc7847685bdc124faabf54a9bb45a8cc7dfda7df07f9d6c5180038be318190b20ad1fad3fa6d1f6b2e3a267ebf82505e7ff1626546b3846dcf935cae90"; + sha512.run = "c0b39409522f8a1785aa853f57f4a770bdf4c1502212e4cea6054d77db371b83652b6d076c9274a04ff6204a5dea7ec0a9fb0ceeadb8184c8bb6f0c99044a7f4"; + sha512.doc = "adbef4ce83faa9383a6030b2feb7e64ed5148ebd2c0dff60c4e8d4fef76fa3ac6c09fe5417ab2d1a46557fb3304f4c673d481d9cf7043e7857021bc42a0c94a1"; hasRunfiles = true; - version = "1.0"; + version = "1.0.1"; }; "algxpar" = { revision = 56006; @@ -738,6 +654,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.6"; }; +"alterqcm" = { + revision = 59265; + stripPrefix = 0; + sha512.run = "6af82517cdbc64453b7e546afe4886ba6816d44492ca4fce9cec98035166b45bc432503db0c09c44e2e41f3bf8cf18c33a37199025a6f09dce6fdd2849973fcd"; + sha512.doc = "f16c2591c79aa8d9f98f36c613617b3068495f814db73bc330d11f6a52b4a6b394a663040de328e6251f16d21acf683adb6cc80a5ce6524c09fac8397439f8b9"; + hasRunfiles = true; + version = "4.42c"; +}; "altfont" = { revision = 15878; stripPrefix = 0; @@ -833,11 +757,11 @@ tl: { # no indentation version = "2.0"; }; "amsmath" = { - revision = 56514; + revision = 61041; stripPrefix = 0; - sha512.run = "6cf5b39f9b94f5f9d0ffeb021422ee7c04a15c6cbfc0e29e58386c386f356cb311b4cea9134c5211a6aa9e8b6f8a6d7af61960c6aa378887754d2450261b0665"; - sha512.doc = "eb71c5f8e5a05b76cc5cc1eb554843160d6592e4c802f8d0c4fa009489966350698b7fa37fd1fcac1a70e0ecebafd08dfadc81d069bd1a1867e09dd09295128c"; - sha512.source = "2566262754978f25ba0bde06a1d6b161ff60e3306400a40e054c0408d932499ce54933e7b0a39875c0bd54ea8a88234e2503bee8a319a5b12388193eab1b0eda"; + sha512.run = "7e1fbc02ed67b0d881900776c78e13f18537b778c22308d66e59094ce8e3dc3163de3d9544951db618103caf604e71b311c036b2979fea3242566910837ee534"; + sha512.doc = "f57674e0cbe84d2966bf822db1772259c3d0bf747304ceea67234d3eee1eeb4704f73d3a78c0b3a4b1746cd1ea4b1e42525b49e0086e5c3e9d6ac9f54d861d23"; + sha512.source = "2f1008185aaf06af9a770062da6ffa7602f4c1bbe2ddaa0cb97fb06226045a369c806e91f34b63e1de6109ce96680d61324e24098e5b59b7f96d4ee64d1d37cd"; hasRunfiles = true; }; "amsmath-it" = { @@ -875,11 +799,11 @@ tl: { # no indentation sha512.doc = "2d35f87da43f957d7ec3d1e61d052d14b4dc207207fc2e6dc4de08b699e5211db17a84f0305888294ae163691e4dee2d067fb1c3a29fadcc34214033fe8e22eb"; }; "animate" = { - revision = 56583; + revision = 61019; stripPrefix = 0; - sha512.run = "29739e0c995ef6c00efdaa730a1e866b13efdb4005db8b8088ce4f1826899adabae41e2b7c0659df256817274ee11dfb7a033eb7b2f11302591a1fd541e1c1be"; - sha512.doc = "95fc8d11094fc1e339ebe7c7db4ea88237790358bbd9bbec8420e3f53bac986ad2b8e6dc5e962c2d0c3f0de348b7b1cbc39b0289cee26276009e914e3ce15943"; - sha512.source = "68a330fe39398265a10c25d452a6a26da8f4bfb28fd0826293c710e90259a401d55dc2b5adb1f29301bd809ccc2176a2e8b4e82a324a098fb9a29ec7f17bd8dd"; + sha512.run = "e3f2fa0de9986b7cd50088dcf4c325636e4b42d0668757a6e86ae60caf4550da231f9b46d4a5e35ad1646e63200949923c60a8ee5f9350707bd3280fa0d63b9b"; + sha512.doc = "9703ee826860bc0022682a29d9e192a09331ded997d6f650706dbd466ee74108d9642126ebe989f10102b5e34be4b9121dc146f61f8a27045a08429fffb90cd6"; + sha512.source = "03710b40488d70d07653938e3ad3fda38c3373d084582d1c3d2f81de23f3fb5f1e0dc3475a5c33f489af714615c6114ecc456818e36a18aec5d2cd091813d21c"; hasRunfiles = true; }; "annee-scolaire" = { @@ -996,13 +920,13 @@ tl: { # no indentation version = "1.0"; }; "aomart" = { - revision = 56102; + revision = 58855; stripPrefix = 0; - sha512.run = "5b29c240180a4bd2c19ce3ac7d59bddc3e394b8eb92d0723ab044058e06b9ad8ce415f230e3d929c0425b70e544a2b9ce98168c594093113e6bc7574b2e1ba95"; - sha512.doc = "b32c3bcade372d00f78c8e97e0061a882c3773ccd1730180fcb09a397c635075445b0d5e0584c42531e1352df721d2db77870e965ecd25b55b252b380c1d7ef2"; - sha512.source = "67636895d4fb4bf64130fb021953117ed29dd69a82b991ba05d6f40a2cfb3653d11c78d0ef60023cf00a7c44de87cb247d384231ef44265dfdf85083e0a49643"; + sha512.run = "ed3914fe0a5cc10f93b4ee248e7b2300fe9bc7b816d0a803042cfa9d035879f34f2a45de5e317c0ee9f4e18017a5f06ca7f9c6d69d932c8019a68ac158739a87"; + sha512.doc = "19b8331437c2678668e46ff3ac8a2522cc5cb98ef29a04799f29cea76020187b340db5063e44ba82387d03ace41f00ebdc0601eefcead9d4186c702ab87db855"; + sha512.source = "47d0a4f4cbd7713d7913b5197e66d00a14029da2b1a71e3c3c442bdbfc0c338454eeae4e00f7cc97dbf4d82dcf151cda14bb1eb2824b1091da85989087196b8c"; hasRunfiles = true; - version = "1.24"; + version = "1.25"; }; "apa" = { revision = 54080; @@ -1031,13 +955,13 @@ tl: { # no indentation version = "0.3"; }; "apa7" = { - revision = 58787; + revision = 61110; stripPrefix = 0; - sha512.run = "f061ae445a26f93d4e9eb7144a29ef394edfc9ec9b7f011e08299335fab1390e9294315b6eb922dedb7e2137b7bbe1fd5d5fd15f68018f1becf8265590e9d96b"; - sha512.doc = "a2ff51ac949c3914589ea6f71c1b992b92276edf6775275b6cd89c899c4b3b9cd0a161c67fc28da29ffa877956e656f6370f6e86eda1b7009a09046bddf92a39"; - sha512.source = "7ec37970c094c7af02ce371b83905006b92e25c2056d2172e27d4bd3ba0a91920021e7d459c79a9996ddc277248eaca706461e716a9fa3c6d56a01ddf8f61848"; + sha512.run = "12d161bcf16690019766e5bdee9d043dde811a7983bf0143d23f58c28673257463e03b617ab3b7d22d6e7d20753b32c8dd3ba62b94c7ce0b62a8c5481f0f668b"; + sha512.doc = "71c6326f67344b4bc48a3e79f3ba5e60a170634855fbff881da5d58f527cec77c1fa9b1095860f23b82fa8b3af00a92a2b2dd262d96741d57bc5529f10946e6f"; + sha512.source = "594271b545da974f3a8fd01fc31054aae21fef5b5e57d28e08284c29da0fc1119aba122b1506c9c169d2b262344974e2f10bc614e581765ad5617111f30090d9"; hasRunfiles = true; - version = "2.11"; + version = "2.14"; }; "apacite" = { revision = 54080; @@ -1048,6 +972,14 @@ tl: { # no indentation hasRunfiles = true; version = "6.03"; }; +"apalike-ejor" = { + revision = 59667; + stripPrefix = 0; + sha512.run = "b04f10bb77365327f326f2bb6c67347802fe6f9628644711d72b85576f59e06ec9fec168ba382a187f51cb7bc2d619b2d971d55024e4ba82d7f5e3c73f556bc8"; + sha512.doc = "a9e091123eaa359ef7ca22d47ce3e069ebdd9e74835e54dc2abbe92073edbb9989d408d5f52f5e83b52f7137b4cbc50fc38e56606f72541ee46aaabbdafb3a40"; + hasRunfiles = true; + version = "1.2.0"; +}; "apalike-german" = { revision = 54080; stripPrefix = 0; @@ -1109,13 +1041,13 @@ tl: { # no indentation version = "1.0"; }; "apxproof" = { - revision = 56673; + revision = 60412; stripPrefix = 0; - sha512.run = "0a81e01bc885b8e7d4bd69361b185beb8cde62f7a10db4e5441312dfea15c0da7c352a4cb412102bdbedc60d974ddaee6f44451042283f577b9a4b4f54a263c1"; - sha512.doc = "a6131b7889d7882a9bfe253f3bfd380498310dc9f0d13ae382d786e3604201c887b98b8555d69cf62067b4c6d5975b16f14169dc10cf4ca5933af3fb843b60b0"; - sha512.source = "0895ef3552dea3685c529a2adbe8efc7a7010e63b277b8e3740d1a123bbaef1609f05d2085887d013ba9f75155108397153b187f13b6bea8e49954bc75938a2d"; + sha512.run = "7ff4cc55770d1b713e63bc6323e6c55b8ddd13841e2410a28b4135b26d8d5d1aac1c5e443820d85fa5502bae4aa60082714a912a3aa975235e5336ae300ad2ba"; + sha512.doc = "3d27042dfeb73eca1dff70ca554bb6346d881a027d59ee6f241d57f32e611baf7238f815abd9eb660d8ad62c488954f730b19374bf6d90a4a48aafa32398d7c6"; + sha512.source = "2730ef4187d1f8fb5bda8cab3b807e523faad855267204f0059302cbfa585d22857681c8c482620b9861839b1240cc4290d99a97053aeaf33e13cc0f7863c4fb"; hasRunfiles = true; - version = "1.2.1"; + version = "1.2.3"; }; "arabi" = { revision = 44662; @@ -1133,6 +1065,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"arabic-book" = { + revision = 59594; + stripPrefix = 0; + sha512.run = "ac60431be9ebb42e2329c954805ecaef988bb6724eba7638ace659a973de3de9dbffc9ee85b2847531c3fca44e97e7099b1d9412ec754d9d27bde1432480f133"; + sha512.doc = "5ed647dc625397baf5db5cd05c87b2ce5dd44b4acf67ff6337b96989aaf210775f3870b5f1f376219cbbce96e486eed5dd24dc893684aeb7d3490ae62df15f14"; + hasRunfiles = true; + version = "1.0"; +}; "arabicfront" = { revision = 51474; stripPrefix = 0; @@ -1151,10 +1091,10 @@ tl: { # no indentation version = "1.20"; }; "arabtex" = { - revision = 25711; + revision = 59150; stripPrefix = 0; - sha512.run = "2dedbd482c223f65e13aae104e2014d2d28bf9f4ae6b90f1a4cf0718eb245d8a94899982f15de326f2eb19e2696045ba8ca9a19a6d903ef7c3e9b575a01d6bbc"; - sha512.doc = "f20af64239df9bdb82b7fdac6c5f6a222f1277eb877fa1907cbadd4ec6e426745b40733fd2ae726d3050e6f992b14cc91d6386ee02e2bf841d1f249d09df0c71"; + sha512.run = "1266c1824595e29a96a00f21da756d7ff12ab361bb9a719ff08f2d10c341826757965dda77c32cf03bb565a3ec61ef991fe2b5cf97d26f4ff89bf35dec65e3d6"; + sha512.doc = "f878af124d3e7f65a09e681e9d66f4b9c6bdf678d194f130a944de3e3c208574388411a5f47e849518ce7be78d88c8d9e462667573e9517db953b0b9faa60a91"; hasRunfiles = true; version = "3.17"; }; @@ -1176,12 +1116,12 @@ tl: { # no indentation version = "1.0"; }; "arara" = { - revision = 58764; - sha512.run = "e898d9e3ba290a4bcc136307f8bdfd21b3500de3449c6971f832b42e984abb7acf81efc350b0f9868bf3a1f020ad6c1f9904aa2d48c14e9c58d15afcc1c9d5b4"; - sha512.doc = "8832a9e0c92100505af47653510c319964edf07c4ee228608b7797dfa297c70347d5111320e57e6ad96cbefbeaaf895938d785fee0821156bd5db6bf6bad6b6d"; - sha512.source = "3fee3982b1f18fadabd062d95670a9950d912fc6d3859bdd0d0b08aab5cf5be4ebe45d410326fadf0c21693fc1938d361b8f451feadd6ee3221cc1eb17eac414"; + revision = 61370; + sha512.run = "2d32be197013bd1280c5bd1475847e653f29549c2776b3cbd353796a0c2eb86a08dadaa80b69f7c40a68a5670b69e33ca44e4c0a468f84b336a06959f2c05a11"; + sha512.doc = "82218fa054ba54b2e3a33f85c236970a42495d3948a89e0385110679aef541b4cdeb33f05cf1813a83d3218e83ebbec4176ad5ef006100d23b444f749c19b70c"; + sha512.source = "487aad824c0feabaa06c2b3a2ab3e144c0e5cc1da9fa77d069d2afa1be22c186c7b7a346574cf37d5c4fc69f8253926ff00380947d717e982aaed86d174d2400"; hasRunfiles = true; - version = "6.1.0"; + version = "6.1.5"; }; "archaeologie" = { revision = 57090; @@ -1326,6 +1266,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0a"; }; +"asana-math" = { + revision = 59629; + stripPrefix = 0; + sha512.run = "2bbf3e139418db06578af5fc8d3925d96bbe1bd9d472a82d428a059b1a206db131734f1b0e762ca49c896f403faf279b2e47465061dc5bcf0eaa8058474017a3"; + sha512.doc = "86b064ede8b8d77b9722d967de612e4a0e8758a29a6a3909b625fe2fa8ebe9551359a442376e8ee8a9dadf5d295d197328914411144c6f94e0b0fe16692eb128"; + hasRunfiles = true; + version = "000.958"; +}; "asapsym" = { revision = 40201; stripPrefix = 0; @@ -1394,18 +1342,18 @@ tl: { # no indentation version = "0.2"; }; "asmeconf" = { - revision = 57833; + revision = 61412; stripPrefix = 0; - sha512.run = "c9a11e0e1d2fb5ef9c674b571bf8de631fd1b329fef165cd5a1a0028f80a9447757bb769b743c69e29405b1688ae292110cf958f6bfc9092026a3277bcd78b8d"; - sha512.doc = "11db98dc9a9556e7e03b5b5e5284b19ef97c295ba3f21a9e3e0ee2cac712d81a9bbc485b27133f8f2bba158037d4388c1bfbf4dde241715a2386b564a51c45f0"; + sha512.run = "17ae6017f0f6535a9448592a7f515283fdf859453ee93a7bc20cc5b9b4dacb0d9201666a9035366a2344493131a931635201921feb8888d49920a924db6b87b6"; + sha512.doc = "604fb5e989c1cf9f8007fbe04947cb1211a2f009e4f07b96e2c1435d4dca295db0bb05ddb8f1c3e94c9326c5f9b8475d1445da1b305dff079ea75a8475e58d08"; hasRunfiles = true; - version = "1.26"; + version = "1.27"; }; "asmejour" = { - revision = 57598; + revision = 61388; stripPrefix = 0; - sha512.run = "9453ee840ea08b6987c40df52f5b011f57642b5e1ee464a52308febbed71c3c3fb8953d2bdf98bb575900005aaa0cc6ea4146b930be5fb2f309474ad5002f39e"; - sha512.doc = "2322b31e9c1d619c0e4eee7336aeb37a22d9d3c86684044c318762a3a2887c02bab2a7eb86a512e222f22955c568b587442c15c79e77c205dbf50914e8b9c682"; + sha512.run = "417d78b244f15b4a4687954a8011a7c955f125ea2d04a4cf33585daa8266aece1f02ea5e9e92d1b7c5a2519427126f1881d6275b0e8633a677defbba8a3f20b0"; + sha512.doc = "dce1af7422529f34bd9451a3a90fdb64784d59d027f2077556b517a00b26e1d8eaa5f45a53950d346fe9f4ecf63d72e655051813a458b8bdaa5552721c202275"; hasRunfiles = true; version = "1.15"; }; @@ -1639,10 +1587,10 @@ tl: { # no indentation version = "1.5"; }; "autoarea" = { - revision = 15878; + revision = 59552; stripPrefix = 0; - sha512.run = "81a6e2d2c241056cdb5ca7e54b33b523aa3bebe08d83e3418080659d316720a6bdcbb63d82c337175e6f0591a81ea322289333c5b8f125360c5ed4ae99843c4d"; - sha512.doc = "8b3cb3def1945ae63b7d29614b868d07c64fba6ef50e266f92e3f1de1aa536084f5af5ff095bd467ef83d33701f780dcaed8a7d1c60dc68dcb5323444158b3b3"; + sha512.run = "dadd69326335b6fe6e425a867e2e62a0b1df2f3179801bcc726c6ceebc15c24e3a7c9ecb3034209e25e503be47a9ad8639addfb628f720bd0c0d64c15177043d"; + sha512.doc = "1b0f6ab0c7b1c69b7a802e9685db50e6b54361acf68ce2c2803419b165be1dd01f52a5b3fa9ccbe273e859509f7b7faa0c7c6b88bfec8f51f0bb66adf7b94e90"; hasRunfiles = true; version = "0.3a"; }; @@ -1689,6 +1637,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"autopuncitems" = { + revision = 61381; + stripPrefix = 0; + sha512.run = "c23d52218f03abe396954e3eb4685f2f66c4c7da0f57ae8887e4f518fe27134c02eb0e0ffa7a89b7959fe17b70885e0994d165d8cd843c63371c9adcd3228eea"; + sha512.doc = "0fb4c362a6d0312d2d48d35c0389625c9b73da16271703742fea55a1178407dbe6e10b7568e944935ed8f86d090b6c5cdf9f35557f8934e5f465fcd0ef622308"; + hasRunfiles = true; +}; "autosp" = { revision = 58211; sha512.run = "67587e8b456257be9b924a5bb8c8f4def22fa9aa9678663975ef74e346dc186ae7848a9dc043733cf1244f254750ef4f34204575f62195d4b966ed8336781bce"; @@ -1753,13 +1708,13 @@ tl: { # no indentation version = "1.0"; }; "babel" = { - revision = 58684; + revision = 61186; stripPrefix = 0; - sha512.run = "d7a08a9733b008436529ca481535497d0e6bf53362711224dcc4cd2449b3041ea71f1cf94bf86a45a9fcfac54ed523f06afea91f0df42775a0315af3a2f6390a"; - sha512.doc = "66e09bf630ea04e94158813baddc8aece0afe65d5f2a713ed6d9d59c3c494d11245c2467ee17a180075ac7e5468d0f3006e5e4defdeb0f5d86d29058aa3803c7"; - sha512.source = "18ee85e8865f065fcbb36e1232c5f3bc5e97a40e97504f6baa7c7f59099260998e257f21a8f97608c819d6279eb4823c2791668c2fb46bd564e007f729ecf99f"; + sha512.run = "092fbe0ad51a12b48d5726b7be1e5a5261d10eb69e1a7c4f45ff3447ef4bed8a8b65833a062c4375acc02c5530c7f11821600b60753bd123d41a2a21f436f6e0"; + sha512.doc = "b46c03ba4611cfba32a7748c190afc5f0a7db7e62cc170063879986221988488e2f727af1e4948fac70a63ac0e2667bf4552e0be4850bda7e176da466c599ff7"; + sha512.source = "21c55ddba7bb6ed1d90b3e51fedaacec756b4cd8a3597a5a6c02cf5c921949756021d63f50262482c4eeba1c81b93ae87d28e71d96f2a07f527a92b8b7dcbaef"; hasRunfiles = true; - version = "3.56"; + version = "3.67"; }; "babel-albanian" = { revision = 57005; @@ -1861,13 +1816,13 @@ tl: { # no indentation version = "1.3s"; }; "babel-dutch" = { - revision = 56827; + revision = 60362; stripPrefix = 0; - sha512.run = "4bdebadb6dabd378fb52eedacd8181623e40bd0a8215aa77c34f7a051a020d6c60230fa0203c2d519bfffcb9a374702ccb1d7c6b0482a232f1eeda5ff52f6c1e"; - sha512.doc = "92bb3f2df9706bc6af7d20df200174a4b3f0b3237a8f1d9259886272deeab4109e85245a0cf6cf5b43bee93b14b581b1fe5e0d4f7198b88a77e2fbf0c8156090"; - sha512.source = "5942ba0dff02c632f0a09e240b3576eb425ed1c74924c007572b2a7b8b95701777bf20b2a943acd0028682d5cf422988c51752c3c80806413c0227daf2f8fff6"; + sha512.run = "bef13adf26cbbd16604af041fc7af866c82e88cd9d7d05318abd10f7d6f0ae718e1186f5527b4b38f1f099ba5da3d85b5e2f6d1ac0dfe8fe64ea52fcf6f06df1"; + sha512.doc = "a78535f95bbbf6228014471a473a7e38b2cfa2da0160adb906b8f75c803b3e9396ca52322100102bebc179ec1e863a78c1b102ae932ea324ea58fd57bf9e9b06"; + sha512.source = "724746e2e05c5de5184125068b2637c14c58c83f86fc92d75521089298a26290ecebbb6f0c61f7452da659dbcbfa1c36789e428aba500fa2211e354747fb017c"; hasRunfiles = true; - version = "3.8j"; + version = "3.8l"; }; "babel-english" = { revision = 44495; @@ -1906,13 +1861,13 @@ tl: { # no indentation version = "1.3s"; }; "babel-french" = { - revision = 56607; + revision = 59997; stripPrefix = 0; - sha512.run = "eaf680b5828b069907c0edf2b62c49475648f973f1ed220e47f6c05907e4b813021b0b18f66b3926ddea4266654dc91055913f3d6be1a799ef0bb2ac8241b9e3"; - sha512.doc = "67c54e55985a756ad52c6c904271a0b54b95e36f2da793d8804771c1606a354c075c8cb547d261c291fb70996fa818573f9f4e0e2c6f0e4a72be0ce71b65b724"; - sha512.source = "676c38f93a87b0fde0d7527f5a4e7db38744cd72e069dfa093e1bc91e365a219fe00a2d523ba06522f31aa106df1f391c669215bc4617a59df606f1cf3df179c"; + sha512.run = "50181d5bd1766b6a9d8ee20cfecd96ae6c4464528d450eaf3ee3a61e7ec08fe0d4d112794bbb2845ff3164c41030e35f6970634b8e17c98af7799e297c4fc8d4"; + sha512.doc = "4753dab0c5ba92f99d9de2b33cf46b859bad541e1aa8171c7efb959da406a346b1448a41c4f2f0ac698b921316929d70b0ba0adcd9333ee9cdf30b2dd888fd0c"; + sha512.source = "79c1254e16c2043f334733e0041e1b5b7b90a306383f532f0ec1d547c762a9194af9d35a927b7055fd6a9f4735a5d7eda4f4adb172ef5a643b14471a77301482"; hasRunfiles = true; - version = "3.5l"; + version = "3.5m"; }; "babel-friulan" = { revision = 39861; @@ -2038,13 +1993,13 @@ tl: { # no indentation version = "1.1"; }; "babel-latin" = { - revision = 38173; + revision = 59800; stripPrefix = 0; - sha512.run = "56ede1f441e96e3f17c165de65a7703c8e8897c17ef775fef1e30e1d2382eee0738ba91c97717694edc7e932ee0dbbfd1600d16ff86d6bbea1ccd5cfcec82ed2"; - sha512.doc = "6dc352b57346f0caaebc0832d12a9c1f13743e5cc39285b4d81edc23cd5f21692165040becf4ec12ca6d1acf6c19f1b2ab1da8d79e3e82ccc2dc865322bfaacb"; - sha512.source = "9f04205ee8e5c18a0ec6e20fdd7ab0d89d4e1ea28d5c3ad819ca9d09358466215b4d0c2b18d77ba5cca604b3997814ce39b33fe7f438b5b554500b5f4edd783a"; + sha512.run = "09a08dd3f90f83490867b786870b9591cdb3fc8d83c0e68446e2c97ba665a70f45c8b2553cfd6d965d31e6b2c435876ca569f4c24a8ddad4188ebd8b27b261b9"; + sha512.doc = "5a57f5b070cc86950002c40c5dc35407b0ace14ebe8ce64662260615bf5ae069237f5b0b6ae0fc795e72d9d1d3d9bbf7b30fd9cb762e56595058bebe436e5b92"; + sha512.source = "e7444e7c98837fc989a5db187a5769bffa993487c47f56ac5a686a92fc1b25f084966b411340de869a8325dc13fb6f85ce22e65c43debb63a2dfab2568d36cdd"; hasRunfiles = true; - version = "3.5"; + version = "4.0"; }; "babel-latvian" = { revision = 46681; @@ -2109,13 +2064,13 @@ tl: { # no indentation version = "1.2l"; }; "babel-portuges" = { - revision = 57644; + revision = 59883; stripPrefix = 0; - sha512.run = "d415a75ca4504cb219ac55b7a03b9b00667747fa39dfd4650e2f93ef7919cb79c701e52d947823016151b340a66f52550a0903a861540d0d6474e4f4ecda6adf"; - sha512.doc = "3b3c40f55953d3ba46ee96ab05789a86a42fb3e806b06d9938a57f2e5d210b2f38745273cb71e224a7c251e2d6ce96c4d17bdb089a4d9180cbabd5bd8716259d"; - sha512.source = "fc1b7c2c116e23612475dfb657dc167bec59bd81bb44d925faf6a5ff4103459f2e34de49aab8422eda69f263033923b7a4ae3f102ab9dab0fd9e35fbc76c10bc"; + sha512.run = "8b63140bf59669873f55ed65925eff65cab3bd6bb404b7dec962b7072243c2b2be8d2918e379ba02b557f7e07d1d490b3cd0bcf3756bbfc3f4e63ff540e73c28"; + sha512.doc = "1fd6cdd08c2c00340b04ddaf078d1e9f0b1c51dee22f805f00bb46e63c46c4461fe4d9df174c2844a6ed01f7b52333a6290cd0c8aff3820a1659839668308b91"; + sha512.source = "863f5c222f11288cb4f041a04cf543494409bc69df67a65b71ccd79411e4a292653a6bc48644d3b7700c0a01d1a456fa56c0ce867d6177983a8b7c98b5e66aab"; hasRunfiles = true; - version = "1.2s"; + version = "1.2t"; }; "babel-romanian" = { revision = 58776; @@ -2162,22 +2117,22 @@ tl: { # no indentation version = "1.0g"; }; "babel-serbian" = { - revision = 53140; + revision = 58836; stripPrefix = 0; - sha512.run = "7c2e8e6cf0cf320f5907d3f39c21072c1d478ff77ed78b6ab461fabfc38e2d93fce7c3cd93ddb66adb768bb10c64dc69f2f83709e36163f9376f89811c77eb97"; - sha512.doc = "7acaf09d1583c59fc61ad05009e4829b0f1c320529fc093b749408bf1ffea347c1f440b1174c6340d4d128ff7ff1017b28403cc55dd4aebf3467b629f8f46171"; - sha512.source = "5038823f38991cc0fc3977ef719347d394cf7eb6dea84a3a79fb98de8ba1f5039d2a1992659ec90914d823984ba71f5d17bf48ee7d832705aa7cfd9cead12a9b"; + sha512.run = "d754a40fa68732f70582b6ca548f4ce8ba43af39ed299dba4a4cad5b10afbacdfea2bd79d332ab29a2a0a81422d6784fa5beb57e5a5a90c6a29c88407c8e008b"; + sha512.doc = "371cbe277b92b229816dadfc417137269a06cc49a0c7db3eb4e50cc21be01afe215bd2f378df89752600c8864c95126950ff42b0a3abc85064a4cdfe8b788352"; + sha512.source = "2f96e458d6dc3770bac7319d7ddc5a7105a3809b5a85523c1465da7a07443c5c61fda4034485202f1f57db5251de72cea1e32e58303552ceeb8e2ef3dfacd337"; hasRunfiles = true; - version = "2.0a"; + version = "2.1"; }; "babel-serbianc" = { - revision = 53139; + revision = 58816; stripPrefix = 0; - sha512.run = "b449ff8aea679484585ca92e47c256efc589657333818f2a4dd47344b4df8926149718520fce18a99ff2c37809873f112784b0b034abf73b1fe6c0410843bcc6"; - sha512.doc = "a692cbaf4f42d6829bc89972dfab6a7045119b9e7f75c2416aa15492e73bcbb51687d6a3a9b7a860ea618602573d0fbbc6251068fe59e91473e9a8cedee7295d"; - sha512.source = "8457f2f0b79989905ea8eb706fea487018609ed03c7cd70764beb0c940d32a3de642bb4bfd4032c974ea086ce31b1cdcb75a092fac29c66e92161c495662e931"; + sha512.run = "d0c1abd87fc2d8284bd3369398b3bd5d22d8bd6453aa315c4100fbcb88e3a7166e639c31876677fb656a8123049324a87cc9a68a227ac771951a3249fe0d68dd"; + sha512.doc = "e025cd674a8fa6c9c14a311c8132c98db6e84ebb2391171f8441683fc3ae1eddc0a3905d73ea48231ea9eb0eccacf168acf48413d60456fc8a30b81d451f88b2"; + sha512.source = "470d88336301b2a95beb6f854924972be2c54067d02307629b635288c64baf542404c17833d60782a2a2c4e3a832766bef1f35602567a5942e541a034d0e6c21"; hasRunfiles = true; - version = "3.0a"; + version = "3.1"; }; "babel-slovak" = { revision = 30292; @@ -2198,22 +2153,22 @@ tl: { # no indentation version = "1.2n"; }; "babel-sorbian" = { - revision = 57646; + revision = 60975; stripPrefix = 0; - sha512.run = "a19f913f590ea66b411a2215ac555590b3ac9f23480096236ccf9c84714bc7b64c0649c1bbeef36bef4f1e56b0e16f3d2abf6c929992fc4accd708ecd6f54681"; - sha512.doc = "36c648ef7a2671bf06511d56fef32a7dad13ad176cf5689774807291b5908a23724c7d26a18d5a21d9d9cb5d9ae9864f321e8703e8ea55cb65cc424e79747bc9"; - sha512.source = "146b868a32adbafaf82217db99c1d260874ab1192fb50cf1ca670981d0bab116dd2d959fc77b496adfbcfa898253e91ccfa9837a619292dec7ad50abbbb7915f"; + sha512.run = "629a4f09de7ba1a444af0fc4e6db9f53635b0e000d375296697096c2debd782496d7b36f7745af42a8a19f6cc24c6a832595bc6c89ae20d79701c7181d1a5d68"; + sha512.doc = "ebb371730cafbd37a4c54dd0ccfe9d6e187aae747d1b6de9202fd09a85b5b38f8814e0bd27cd86e51c5aa62e6816ac725e28eff9117d6dc474a9e32f3b6fdaa3"; + sha512.source = "57d29eb253398abf3210acf390cc80e97b444c370718bda75108fd1d70c1c7d2fbfb43f6387751cfc90b9cb9020eb4222fca0821d10c4d52750bfde05a2557e1"; hasRunfiles = true; - version = "1.0i"; + version = "1.0j"; }; "babel-spanish" = { - revision = 54080; + revision = 59367; stripPrefix = 0; - sha512.run = "f71d329928253e6a1edf34fb9406473b83a5c8120982a4aca7b1caee76e261e78f94521716eecfb59171912121314dabf0ce164938e5fe83b722ff7eacbf9b1e"; - sha512.doc = "fe60634e76d9e539df4813d5c6a240f36e017a5926016189d23da56b723ba92a317e85ef2912ad76707943e0ec0918dbe1a1dba62acee7ea2db99dc7ad69c4f5"; - sha512.source = "0ad444d85a0c93b3e484701ffc8a934dbe85d3e2bc2e5bf348b33e0247682071ca366c438177beaf192f6c687e4847ebfcc3c325e2e28c15f67ca34d08671395"; + sha512.run = "2da1b62772f462c8e058edac7d305804be6234a720446288fbcbe2e574a1cd9f905e4220b4008dad64c0e59b15194e2627cd1e295003c1bcbdd523c8498fa26b"; + sha512.doc = "9c3e87e7de6fa46b0c6b9da65d4c23e31640628fd6fce844b53d896ad85813e9b804fe4a36c7c2c1cf26550a51551b39150a12467e26fad4f9bb9094dc0af817"; + sha512.source = "48e4293f6c7aafed829e273e0e5ac2709a082e648988bb40e5bd0b36aba6d84aa036d07108a2bc76c65b4ca029a9652ab38268b7e7a87abddc03f00ad55a7fec"; hasRunfiles = true; - version = "5.0p"; + version = "5.0q"; }; "babel-swedish" = { revision = 57647; @@ -2311,14 +2266,24 @@ tl: { # no indentation hasRunfiles = true; version = "3.02"; }; -"bangorcsthesis" = { - revision = 48834; +"bangla" = { + revision = 60159; stripPrefix = 0; - sha512.run = "3d8dd2648361f74ec6af8727f0895ad1e1008ce0e8612d879634b196d5e4cdadff20e33e60e27d9812d7b6fe3762026ee46139f3ade3a3a3cd5d27a941355a62"; - sha512.doc = "97c98bb791018631b7c5bb282aa3585ae68ab1d2d81f56e1be91ad92d6dead30885c478856f59651b533590eca2f80e3596d09f0277ea6dbd6ec44b97ed64fb9"; - sha512.source = "b48f9e854297a3effe72c3e4f5b26d1a48b5023b25691727ab6c735379a092f8a6ce1b7dee1eb87b5cdc10866591b35c83df579147d3ecf36e6a27356d50381c"; + deps."charissil" = tl."charissil"; + deps."doulossil" = tl."doulossil"; + sha512.run = "adeed1b1f42ef1c76406c376d5f672870feedd4ccdc8db382b057dea6dceecca6e53de7d2c0ca154def6b0be67c05aa46e959c89829f564a3acc6805462bb4bc"; + sha512.doc = "d62d6a72c268421033767b3d2c131583e62e0c139ea3e101094752616498111badc5f0544294e836715dc7b3fffd5da9d9e4d3a4103fd2090f38e7ee31afe5be"; hasRunfiles = true; - version = "1.5.3"; + version = "2.0"; +}; +"bangorcsthesis" = { + revision = 61037; + stripPrefix = 0; + sha512.run = "da60a3d264abf24f91f2a4a0bd12c99962dd618324e7b26c59c4df1a57456691fcd801ba234e5cec305c4bc1eb05f3beefe1ff1ff57440dae6c97a4c70531426"; + sha512.doc = "b8d12c8f2351b615d94a5da9a46b6ed4a9d28d23decc1188f7fba36dc6166ac0d0a6247a7caadca8409a52cccf643e21e6a80f25833feeb9ef0782141ca892a3"; + sha512.source = "2b652b8cc16285d7a367ea07b8dbf3e77503b6f6efa80ced52219816d80dd4f9ff6ea2cdf6326c5ac7888546f21dc009709e2b43d35558a29be599a300d7770f"; + hasRunfiles = true; + version = "1.5.4"; }; "bangorexam" = { revision = 46626; @@ -2498,6 +2463,14 @@ tl: { # no indentation sha512.doc = "ad841ac652a7985ab907572f66462091b1c40f7cdab2b00086209a2d96056e0a9e32842dfbc22c829b27799882252da95e3d10d4a9dd174f487327d5f3ac3899"; hasRunfiles = true; }; +"bboldx" = { + revision = 60919; + stripPrefix = 0; + sha512.run = "4414cca525a587cee177ad7629b5ae3ab0317b5ca9266c49da852bab595c8f076249908ef071c91f398e2f1441904393b0d0baad3a92fb53da5a34fd729136d9"; + sha512.doc = "85d590c60b708bc35924259bbf6e670d70abd48548f02ef1520e83be9fecfe3cb34c2b6e3f0c4b72384d062829aae7b4255c15e0f35a9f0e98f8dbc28882795e"; + hasRunfiles = true; + version = "1.031"; +}; "bchart" = { revision = 43928; stripPrefix = 0; @@ -2515,7 +2488,7 @@ tl: { # no indentation version = "3.1"; }; "beamer" = { - revision = 58537; + revision = 60801; stripPrefix = 0; deps."amscls" = tl."amscls"; deps."amsfonts" = tl."amsfonts"; @@ -2528,10 +2501,10 @@ tl: { # no indentation deps."pgf" = tl."pgf"; deps."translator" = tl."translator"; deps."xcolor" = tl."xcolor"; - sha512.run = "569d6ce4661185964583f9be628df4ce898d70d198c2cbfd0f687f60e38b59beac6b7fbe4db49b16a0ba7d5dac837f62df33d38131d8c729044b320c3ecc041e"; - sha512.doc = "2b74cd7cb7c4481d2b9070e93c7c265244b9d8b9168470754c6a0df5d457e412c00e041e4643f644f942189268d360121ac01c001a2fb55760df326e06be940b"; + sha512.run = "9880737a29ef84dcb4f7e987e6e0672330aba2aa01bf82bdfb7051e9603576fde1c6c559a8c897e2edd8447309df2dd8bc9ef52f2debe8a7b967448efdb6e80e"; + sha512.doc = "ceb5458b1fe57a9ed366db89cfda611cf6187ee77a7cd8afed7a4dfb30a4c9d9f23781dcaecee616183bd6771c14c29abf880333bb45250f7bfead17fd4722ec"; hasRunfiles = true; - version = "3.62"; + version = "3.64"; }; "beamer-FUBerlin" = { revision = 38159; @@ -2541,12 +2514,12 @@ tl: { # no indentation version = "0.02b"; }; "beamer-rl" = { - revision = 58513; + revision = 60262; stripPrefix = 0; - sha512.run = "bb16a10b5c5edf3df3163bb5f177eaff4e1235263d758528691aaa49b3388412c380721239ebd73f965d4306860b1de95b25b7c1eade36d216da1e3974563e9e"; - sha512.doc = "a7032533474476f480a685decaa62da74ca37100a8f6f15ce56ba5ab8bafa3a8a58499023de2bef5eb3e7eaf4afc978287188ed57ff4fb02906254211713fa88"; + sha512.run = "d077e06a2f7a9f70cbfa31b18f13a055d230c1b1bd6d932f8715b723d6db9773d3954519e29326a843daaf7bb89d3c8eee749a61ec9b3539c06dbafa5e3c9713"; + sha512.doc = "0af0108749a6a8c9ae2c3b3eb8aca832e68fe8dd3a5cf0a23664f762b20779d8c32ed6b78b754a16a8bab40e157be8a85904aaff23a5dee65d2317f1a327f5fd"; hasRunfiles = true; - version = "1.4b"; + version = "1.5"; }; "beamer-tut-pt" = { revision = 15878; @@ -2630,13 +2603,13 @@ tl: { # no indentation version = "0.2"; }; "beamerswitch" = { - revision = 55441; + revision = 58873; stripPrefix = 0; - sha512.run = "7f7851b146d4dd5db03f372b0014c3bc60f253a302ed157643ba0dcab31c966cecd2b80cf341208cfb25d885bf58dad9c6487ef0e36d1ef1dd86c235156dd761"; - sha512.doc = "2e87e27d88297b74a6c5d9c17059134bc23d6ec4f0aa987bc7e72269ed153c0dcd9a3cd86ec17b8a6e8b0c280cd89cc40a9209732ebfe192d7b6c763fc2882e4"; - sha512.source = "22b7e89d43ac5266189c47104a6f5da3e2a489afac705b1ca83be0825fbee29818ecdb3c893f04001e48ad95694cf21e1666a90a1fb27701d0d0ef9ee40fb59a"; + sha512.run = "9fff5ac8406dd4bc0e76f3b01678c1c2d4dc089ba819e873121b6ae43054356a666101c0e044fc06f4ce40a49468c08b1436370a0836f54705da4df610b610dc"; + sha512.doc = "59e94176d8d2197be538aead029ad03d77632fa062a1fcfd911fdf7a2e1f27e54cab4b816f36ce4b4c6b63c7244333e2d0ae8448fb3f85edccc79309e76fb5a1"; + sha512.source = "c81324917cb69eb02ceef698c5b2f1efc42a055328c5a67882ef2d315769388e311c5c58f3a532f644d166af28aff98830cc39ed94bd8851d79247aaa68c1af4"; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "beamertheme-cuerna" = { revision = 42161; @@ -2663,12 +2636,12 @@ tl: { # no indentation version = "1.0"; }; "beamertheme-focus" = { - revision = 56967; + revision = 61258; stripPrefix = 0; - sha512.run = "b3b9be62e244fe4288e77113aa8488e24f83932d5e2b31accd30d62ced1cc8bff4b44183fe2be375e69375862237f18b6f0b40c6201f1199cd1423b09c2a60f4"; - sha512.doc = "57e8e51ac4a4eed778796c916713420e9372429fe7d310d9acae988c6d540ee516e64ca290dc6feebe28ad81877ee7e8919b1145e626821c4ef72c226b3cdbde"; + sha512.run = "8dc4696a6276fab4b86697e294a9c22dde3f27218499affa985dce72692356ebab3b58764ac05bff2eab10397643a989dcab56b12671a65465783b47e1acfa44"; + sha512.doc = "3d95d14097caeec36bc971f04b69a7f1af2ee95aa40bc4af22620dd5ff6589d89878d415f7270a73bdb62a5d03f6e634cbeb06b69e33ee67e1d29d4961a2b897"; hasRunfiles = true; - version = "2.8.1"; + version = "3.1.0"; }; "beamertheme-light" = { revision = 49867; @@ -2719,6 +2692,22 @@ tl: { # no indentation sha512.source = "6cd3ed424b3a724e397de3fb7b47de33a5c9f0c5ac0e0f8b26bde55ef69b66015874dbd438912c682c9aa1c33e4e916fb895458964dea11fe228e29c1afc40e8"; hasRunfiles = true; }; +"beamertheme-simpledarkblue" = { + revision = 60061; + stripPrefix = 0; + sha512.run = "c75bb4c0f0eecf2aea0e24d30410ca1edcf645c323d88433bc6c12adf116740f2f6bc7d8517db764b0b33d9d9227db93ddddd1c521dde3343fce6d807b0e642d"; + sha512.doc = "9f8f642ebe4cafed03699377be6bb647cbdfb80f99e075e2863b69a4d6b6f59cab6dd4dc831b0fb015302b3737b32d08cf37b3034365b021e8fd9f086f7e6ddf"; + hasRunfiles = true; +}; +"beamertheme-trigon" = { + revision = 61020; + stripPrefix = 0; + sha512.run = "f5c1d49ffb30e06b7494d07fb8762e8eb9499f2960d0775b0067ab524817ce2a7092993438e8dfc4aa243ba057a545179b042762a2116c9afad73b65e53a7f15"; + sha512.doc = "763f9f0b3739995950dfee6e3d5c262c29781f9c1b0ae77f4dcda33022889a80091010b706b8cb3a52ac091ccad8abc2b7de510d7c3f78605a5fe19180b6fc33"; + sha512.source = "406f580ac238dd70047fe1c2bf54fdd7579d37bceedd2da38a1f0b034c42937b9c7ab8402b19ccbb04b5fa056c134004d51daa2285e331a53cb6e2ffa2e55c16"; + hasRunfiles = true; + version = "0.6.2"; +}; "beamertheme-upenn-bc" = { revision = 29937; stripPrefix = 0; @@ -2768,17 +2757,17 @@ tl: { # no indentation version = "0.2"; }; "beaulivre" = { - revision = 58503; + revision = 61338; stripPrefix = 0; deps."colorist" = tl."colorist"; - sha512.run = "68117aaa40fb49c0fa7da73fb4f5cd1445191efadb4ed1ad08a12878fc1681cea13804fbf949484a63834cb0a14b3d306bb6def553e3dfe2420ef7e2b84614ab"; - sha512.doc = "263b5b5bd27c13db1247354429ccc93953e522213a2b154c08918489eb4c2ee3fc36f5a2922a901f1113b2bffd11301b4d3d71f90876886c32e07a38f28e30b9"; + sha512.run = "3a54eaa79fb61977464f32553aee7b32c873b17fc40145756d7afd9244f81a3aaf96c18aabfc68c6239f2cdc327bbb304a146fe2faa5fd5b9ffd326f40639926"; + sha512.doc = "cfa878fc8055c35555e0b0db494f5b0da312406cc76586aefa5fbe87dc65f1643c0636e107c04bed9ad3c28dd27a5638b12a641bdebc61b9bd96a944a37038d2"; hasRunfiles = true; }; "beebe" = { - revision = 58697; + revision = 61345; stripPrefix = 0; - sha512.run = "03ff9ba89d188869abf6a610ba7064fbdf4fee229149aee49b00ba4ceeab31c4b991297a75b9c4d5e795155932080aca4894c0b8b738b5edf0a0ad8a923c767e"; + sha512.run = "d95597c7afa63585202d1f415073ec6b004d5481bef3fb0307ec10631d18b43a351b7d8b06ed5d92014ea5fc076611b5091a968fb16387974ac2fb0b92744a10"; hasRunfiles = true; }; "begingreek" = { @@ -2903,6 +2892,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; +"bfh-ci" = { + revision = 61397; + stripPrefix = 0; + sha512.run = "8904deed16eaf205b0adb9e8c169301da6a7e9584d326e911a57beb7d1c8d260aaf5c77dcdad9a44036b1245924ff3343957bd6ac6f80ce783d0ba79097d4583"; + sha512.doc = "cba4417ae2ed8397dd2e0fa700e8d05749fab8bddc66c7fa38d8386eacb91fd0fafeb5511b0510ac3ed2cdd23edc2f3aa7b8510d0c205d071f99fba06243be24"; + hasRunfiles = true; + version = "2.0.0"; +}; "bgteubner" = { revision = 54080; stripPrefix = 0; @@ -2939,21 +2936,21 @@ tl: { # no indentation version = "1.5"; }; "bib2gls" = { - revision = 55811; - sha512.run = "a4b697b6f4a2b809699081b6992b702b736bb82883a487f58b6b71cbc0e12cbbab5340001fa96e30075a823b4b6a7f37e514fcebb591a950f814658682e2fb2e"; - sha512.doc = "8f6c1e6647ff35cf167072d89af35930d51eb62968643aebbfcc189446d76b10f49d0db270c43b0c787889069decc1ef844d79bae5df38c3619a92904aaff8b1"; - sha512.source = "fbce6911efaf89c5a734c6a56bf9656bdf52f40e795f57e5997a93b1b83b8543b35330368697a7e8054648d52f0814accf57fbe059570903f092abb6182276fa"; + revision = 61134; + sha512.run = "00fc6245cc46f70c379aac828002ce6ec5a84a3d09125d987af086da35f6dbb7e0439e4ebddef48d011e90fa87f67d0f447c70f60985955f5d7de5170d7f4a77"; + sha512.doc = "ce3e00941d2c67ed581bcc3c90da84ec6d864106c16fe77795eb8e7c8a637ab1bf5745c766f2dfaca9aec4c475f751daa3be35f3394f3c5edff0b1efb06fa7a9"; + sha512.source = "aa19fd66c5d3782a4d0d4de2f1dcf2d0d5aab6fbe421f54cc59554f10b37f99ba693716b266e8d216f33223aeef27ec40addf85baeaac1441fb999772c6c2579"; hasRunfiles = true; - version = "2.7"; + version = "2.9"; }; "bibarts" = { - revision = 54080; + revision = 61242; stripPrefix = 0; - sha512.run = "2e85d46a2d27d1016dc6e304eeb47a1a6927d38cd5105916c61c86415d8fd92ebdb8a48b5fe4b5bb58856202b5d3ade4c0997e238cefcc67a879b27f27cbd27c"; - sha512.doc = "7f77175f1b9cc2dbf9957ebb99d2b471e51965c5861e64c6841e3a88eff033d3a9e0791b93919346b3c0d26c1035482b1e5300be2232b69d988e6a4ee5bd96df"; - sha512.source = "724de91be680017f04a2255e25cd3158c5fdff39ae1684ccdba2421010155ea9e2fbedd4ca1baecc8a56514c5b8fdfb964fddfc0b14d9e48a649d4e7da8eeee3"; + sha512.run = "87795521571e106ee08d611c8c4baa5709150aa146b17065aaa6251493906065ffae78408034d2954d0e37768c27b54b75bfe8139e62105fc93ffecf5b28c84a"; + sha512.doc = "e735b3bbcb43501451633d8eea303db52d82ecf56b919ac284476ea8803bfdcd87732b564732959005a1d52c42f7cc48922a3841884f7878ddc06f45a588876f"; + sha512.source = "0575256f662942ccf3a93a31e9f66c4cc461b03b01ef25c7223119d0bb2e07c416bd671dd547a0dd8faa43074f20cf03cb64f4341643ccde79e03cba2dbfe609"; hasRunfiles = true; - version = "2.2"; + version = "2.3"; }; "biber" = { revision = 57273; @@ -3016,12 +3013,12 @@ tl: { # no indentation version = "2.6.2"; }; "biblatex-apa" = { - revision = 56208; + revision = 61406; stripPrefix = 0; - sha512.run = "59ffdb263b02b4934955037f377164297871b10ab3794dd8a11b70cecaf9e773bdd2b3b2aef24d5085672614a51956ed8083866c6f56c72a8c8eb4c1ef6a775a"; - sha512.doc = "eec8f6cfd0244639f91142b3ac45be28eae14e10881a549d97f0711235cc46b6c25983f0d7742ec1c8894dc8c3c189070138874a6215f630f5e3fb710516290f"; + sha512.run = "ca4a3692e206075f07f172c2aed183ca61e900dbf297cedf5c28bd4a73b65a7e7149db60a6f67c57cbbe5233dfb8df571c285a4d279c0614187c428ce39a37c6"; + sha512.doc = "63333edc1f627c14ddd6b0172776167868cd8480d79d47ab659a74318998e7e49c02bfd1b37a340b20ce97dd8f251e2ec70ac3998dfd5a9811c66dc112bc4a87"; hasRunfiles = true; - version = "9.14"; + version = "9.15"; }; "biblatex-apa6" = { revision = 56209; @@ -3104,12 +3101,12 @@ tl: { # no indentation version = "1.1z"; }; "biblatex-chicago" = { - revision = 58715; + revision = 59772; stripPrefix = 0; - sha512.run = "27d9ce6b00b71ebf751a720d42ebb16c3f7d6bba7b494acb3acf2232849342b992aa7fb9de35d7de4c12ef94956aa80be8a5d61366d9ef897257a6c4e26de6d3"; - sha512.doc = "adb23e2fca96e703aef93385c48e82279e411e266b4a0d147be34fbf4b2fc781dd93ed4323b044a51660a94a2fd832f02f5ff16cfe13389b6058805190c881a1"; + sha512.run = "382cf692c6faac9b72966b90cebbb7573a29f03fd8630c74bcd3f74cc8d885bfab3f6b6bc47c654468374a0856bf4a799452980a5c51180b99a847ead78421d9"; + sha512.doc = "c9e658e4f29894ed32f360ba044aa13442f7e86f7dea21dfb88a268ae3c55846bfaf22bedc49b34c2d25c77ef6ab73c9f97330402e55514d2cc9c27d2752865b"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "biblatex-claves" = { revision = 43723; @@ -3119,6 +3116,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2.1"; }; +"biblatex-cv" = { + revision = 59433; + stripPrefix = 0; + sha512.run = "d034400abf6c0342a37e6e5de09d5eed252e80cfb93b4707f6e879edf6e190180046d28830fe382a6240d6000bcfb9277a66bf2e21b92ce9fe9deff0596f1c03"; + sha512.doc = "23093f0e8f472eac5db45026266c17b3337d478af6dc1776515417a2539ad671a67dba4ebee9f83407ee4c126cef5a6245106916188093ced89a52c44afba339"; + hasRunfiles = true; + version = "0.01"; +}; "biblatex-dw" = { revision = 42649; stripPrefix = 0; @@ -3136,12 +3141,12 @@ tl: { # no indentation version = "1.0"; }; "biblatex-ext" = { - revision = 57979; + revision = 60379; stripPrefix = 0; - sha512.run = "77af6dc892d2071b1124af08d2eb6de4c95782c2599cfb9f6c018da51637ef3c43d3451185379a3ce6677ab504681c5a48dff073891097c96b70ad7e02a7687a"; - sha512.doc = "2a47f80356c2cfd770e05f9bde969b8c8c694a1acf8f3f3a8292851ea6ed12da5107e5a2053a301a6131a9fda72312646ed885b22ae869b0e3af75a4a2306f82"; + sha512.run = "5cdd74fbd738385a63f9fe78185e4e883f0ea1a7957dee30783f93bd3549eb179d44ac1d0f4f13cd66788ccd78e83ce512f6b1cbb955bdd195d9f08398ac2c9e"; + sha512.doc = "f782583a1f77c361dfce7abb03679bfaf18e4574e7670cd910840051db316d8f74bc190c1b2aeb6e9870302480f33c9a5e792b07e5013f541b700ea704265ab2"; hasRunfiles = true; - version = "0.12"; + version = "0.14"; }; "biblatex-fiwi" = { revision = 45876; @@ -3152,12 +3157,12 @@ tl: { # no indentation version = "1.7"; }; "biblatex-gb7714-2015" = { - revision = 58753; + revision = 61274; stripPrefix = 0; - sha512.run = "c4bd497d3ea4c27fe8f9382ac54f865da57576b08fadd28e10d93a7dbabb935a877e4c45058f4055dfe319e3e29df3995b8fce7496f12765b9c1c5120943c6a5"; - sha512.doc = "b88722523465025454afa64841f00df9cb8cdfd9aaa81dfa75cdcbc9a7362f980b9d51d874dccda310a0afe5f25f1ad9955dc6ae6317a4d0bba2deb47fda02a5"; + sha512.run = "c1229f94727c82d0cd8d089cfa5dfd8685e1953b4b26983227483eebe250387ea05d2ccb3089a2b949811334349281befd2b3596111adb77ae56fd0377474d8a"; + sha512.doc = "1ec8fad46855d2b069a26c7e45cece0c9968f1b04a358900aad3399ae9f57f45aafc18576557aadf04672f03d4ea7d580823f44cfca86a2b4511ac8ccaf1800c"; hasRunfiles = true; - version = "1.0x"; + version = "1.1b"; }; "biblatex-german-legal" = { revision = 56939; @@ -3168,12 +3173,12 @@ tl: { # no indentation version = "002"; }; "biblatex-gost" = { - revision = 56790; + revision = 59135; stripPrefix = 0; - sha512.run = "c9dad05fd20f6147215805df07cbcea228d023b2051a2b8fdac28e55d0d3424d81d71f48d7dbbd679f3a306c1385dd2d1c50d8d128432d3d64abc9fa96373350"; - sha512.doc = "90220ec8159d1621e54ffd83c587d111bafdd54ed3d104146992cef5340d55093166283367e4dc3cb21ea2621122b4080d0a849f7ca2b116f262b96b6d177ce1"; + sha512.run = "72da076da250a07f89364ecdc65649ab845f7ec90eac0207af902beb42625c7ef69612d444628a0c9472063ae9485d9518cd6934ce1124d25549a64a0eab91d6"; + sha512.doc = "4cb101c69ffc07d14d653cbd6bcc33deb797987dcae399535bea5bc14d1149705cbf6b1e21a7fd95d9edfc7c558eaf744e1715157a62fc2e1978476db0af4e75"; hasRunfiles = true; - version = "1.21"; + version = "1.22"; }; "biblatex-historian" = { revision = 19787; @@ -3184,12 +3189,12 @@ tl: { # no indentation version = "0.4"; }; "biblatex-ieee" = { - revision = 58716; + revision = 61243; stripPrefix = 0; - sha512.run = "2348c59f6b68e7846f3da93ef008f856b899173281281a1d061f5d98bad3c2b18216987e4aa366c2a2bf9f53f6daa6b29aeca202ff385058676572b8f3702317"; - sha512.doc = "70efd20bcdc08f1872242e77a389c207e048921b9a9741e11c4e81298fec1ff1a2c724e0485da5e3adf218ddc5171930170f9e4bf6e2503088a1fce5287403fe"; + sha512.run = "2f4dd68ea556dc56fde888294bd9a3368efcf4099b95b0c90e60225c3b99181de52b406a7e40a09792b6b58410174d74d774a0aeb1feb4c8bef69fd513861303"; + sha512.doc = "ef24c360fd211b79538aba8394a831a48c4b518bcecc516fee91191aad5b2eef06ce9e0e2e033134499a94dac4542803c32a207b2b71d48b14401b20f5aca549"; hasRunfiles = true; - version = "1.3e"; + version = "1.3f"; }; "biblatex-ijsra" = { revision = 41634; @@ -3231,6 +3236,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"biblatex-lncs" = { + revision = 60303; + stripPrefix = 0; + sha512.run = "4eb20f0094dde1739568f8dafd47e861c4e440f9f34021e889c399e27c72247c04f8ba2711750a41450db52bbfff7a001100d5cbd81842d00357b22597b953fa"; + sha512.doc = "a454a1b4237070aa0f939b121dfa4e03996b2db922659c8db2fb86de83847d952fc28481c4271cb251380428af403b453de1f6108e94ee792765fe6ccfaed7b1"; + hasRunfiles = true; + version = "0.3"; +}; "biblatex-lni" = { revision = 49935; stripPrefix = 0; @@ -3256,12 +3269,12 @@ tl: { # no indentation version = "2.1.2"; }; "biblatex-mla" = { - revision = 42445; + revision = 59529; stripPrefix = 0; - sha512.run = "b6e3f7b5323e0246c1b2e1ee1c767b624e59d4d1ab9aac4bc24d59c15d1f8228695ccc072b30bbe1f4a2de24fb6eeee3c81095fa572f3e27a09f0de7c5b3994e"; - sha512.doc = "87e9b73615b404f8b676b8a4158edac551f8dd3712e1f6ecaec473789df884c85d6ba48eafad428eebce10ff6f0c13b382fb4e4c79cc960b860565bedf7f935f"; + sha512.run = "3f9ce622de66c8bc936954e9f29381fd8a604c5ba94ce425c577ec5850a4099ee5f09e6b5b2bdf05eae9c4fa6549878b3061c25da916ccc0041d302534512623"; + sha512.doc = "1f9ee8d696dcc31e56d47edcb9e53fac525fe1ff5408f0d649ca090fcdce5d132dc3191c82f43aff94e02ee34e3445b2dd0be3513a21b963f72ef1f2ac058d5e"; hasRunfiles = true; - version = "1.9"; + version = "2.0"; }; "biblatex-morenames" = { revision = 43049; @@ -3330,13 +3343,13 @@ tl: { # no indentation version = "2.2"; }; "biblatex-philosophy" = { - revision = 56493; + revision = 60976; stripPrefix = 0; - sha512.run = "bb17f04a770a28ae5f136ff0849d18526fdf740bf47fd30f0149cf91c23e2b321b2dd4bc4c0bcf4db45b3985610544fb0c577f945d000475751a3903fbb1e595"; - sha512.doc = "aee20e15d7daf56cea581c7a71f93edf0325607642e78664cc7e12861af7539c3b28c51b21a7ff52e09576c0c743cf1120ae2e8ac8804c1f94cc3dcee598c04d"; - sha512.source = "a5be7057eb1856a63ea5d89e51f19f586e038967c718475da65afb9441d8f6e56a862e7f42fc045dbb3aa85026d80b3aca73d6e554df32cb1446b026a0ec16bd"; + sha512.run = "64d77f351906e62d7192172e5f13de33336eb4a3103a283102f2dc5e101b9822813bec9bd7d6bd5b4e1a3c568b735fb3135290ea91457bdecdfbeaf62815ecda"; + sha512.doc = "3044dbec27fb4016d7e93645d648b4221662a6d8adc8277cbe7de4b8aaa847d6bb806010d0e0b402f188e014ec7c8f4dd89f46e7c9db9e8583f95fe6c3d4dfa0"; + sha512.source = "9422513b22c759bf016a0fc8b10fff153b5c484752b94ce01f360058521383c6d458e8ea3c31bed90793511759e37504a552d24aac8a00f71856657f48c1982c"; hasRunfiles = true; - version = "1.9.8c"; + version = "1.9.8f"; }; "biblatex-phys" = { revision = 55643; @@ -3347,12 +3360,12 @@ tl: { # no indentation version = "1.1b"; }; "biblatex-publist" = { - revision = 56392; + revision = 61302; stripPrefix = 0; - sha512.run = "dff83dc4b8ed279e2b5ad3a0d8e995500df08f3f21c72853ccf392624e40a20e058d06310fdb1384cf2bab319e93c9004cf7641a212aabeed21e31e50bd76934"; - sha512.doc = "a5dc972074b40eb402076bcbc570ca36470a856317f7618643b8281f0b7bb8ab1b58c4ef7fa1141cde6b5ea5ab98c179ad9607b621eb43b52d172bb2e730a4b9"; + sha512.run = "65718066f32eaf114b9e00a2ca0ccdef328846594eed522c6fad7438be0d382623a4182d0c284763e83a0c77c43cfedddcae70a8cc4af42eddbb5cc4c682b2e4"; + sha512.doc = "4cd41e01c75b897f88d78a56a0909de3a8df6511ca89c4f7cd68925a3bb88c8324f1dc9763d4eaf4d5bc6cc6cc8238868db66c838a80ad0b687b689698b70640"; hasRunfiles = true; - version = "1.21"; + version = "1.25"; }; "biblatex-realauthor" = { revision = 45865; @@ -3363,12 +3376,12 @@ tl: { # no indentation version = "2.7.1a"; }; "biblatex-sbl" = { - revision = 56853; + revision = 61295; stripPrefix = 0; - sha512.run = "b13fc1b54270fd7b79c3dc71388152b9dd81ee868ce382063fef690c828dcac8a11127dc3cb1c02b138a16d17dd5a5e311d8639efaf8f84e50aac4de6cebcc93"; - sha512.doc = "815f16ab2f6edc7767fc1bd95f4e792c435e605ddb777e65ed54f66f8cea4e15b6cb80938276b1fa30184a498e628d32e2c226d97b7afa99b6022c6f6eb2522b"; + sha512.run = "fa48d7e3455e1500254d3b3dc5f2c27b7d3f8a4ce29f9e9a63ac512e28ddb0e56ccf42d97328db1fa97534de0aca1a9c1f4fb6a64b0a33a5addd73b0a54ef2ff"; + sha512.doc = "a7c0b00c36427be247812db4bf1a7f94cf28b0cc87a4bb32d0b470d7502c01c1e0077d2ed7a927f03305ea8e69116d04dfe91e367e8a85f8a225bec2597a615b"; hasRunfiles = true; - version = "0.12"; + version = "0.13"; }; "biblatex-science" = { revision = 48945; @@ -3411,6 +3424,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.4.2"; }; +"biblatex-spbasic" = { + revision = 61380; + stripPrefix = 0; + sha512.run = "642ab8915e4b94f7c57fb9ee27577f41f65c118c60e44476935386fbb4806a4b5f30d54f39668b698ef310c53a48a22d02da8681c3439de1da89a1851a9a0f57"; + sha512.doc = "9a7681c9528d74c70c5ccc1eb11449cd8a3a17a0799bf37ed2f5685182655fea80eb2b387fc399562d8403851d9857c73cb2fe4c8ab4aa2110dc909d65f4b168"; + hasRunfiles = true; + version = "0.03"; +}; "biblatex-subseries" = { revision = 43330; stripPrefix = 0; @@ -3460,12 +3481,12 @@ tl: { # no indentation version = "0.1"; }; "biblatex2bibitem" = { - revision = 54030; + revision = 60890; stripPrefix = 0; - sha512.run = "4d27fc2bc55a031f571096fed58757de74e5fcbdbb485b327d8a34c8033b2a2ac316b7257ea369d41373d887152a1a84201f28c817abdd2ca84716ebdc4e111a"; - sha512.doc = "b7f37db4271ea7fe0b6208cca2dfd66f7c2f70966081c85fb35d34f927690ae435574f566accdc0ee358c9f74920f18916bf558f3d97cc1f6a27f540d337d90d"; + sha512.run = "33cee5b052448e46173eee2622c5b4aabc20f0590f6d17d450359e8a13704bdc79d209de49ba112243b50f820e69dec8fce79e91c12a296b9f0222dd007a6cf3"; + sha512.doc = "60605625c4c8fe1923fd415e1afc827348d1e3ce59ed94f2f916f29d9a37dc8c17380e5153c8f591655b369b8feab3fc62d2b0e7032c6d0f3b479fd59634fd44"; hasRunfiles = true; - version = "0.2.0"; + version = "0.2.1"; }; "bibleref" = { revision = 55626; @@ -3558,9 +3579,9 @@ tl: { # no indentation version = "1.6"; }; "bibtexu" = { - revision = 52851; - sha512.run = "9f1e27f1d7a76700aaa4f0f19c4e999070dbce873203b80e3ce5d2f4ed14c9b685515b6c648ece8942ba429d698f66f492b58373f348bcfef2523ffec270f466"; - sha512.doc = "0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4"; + revision = 60002; + sha512.run = "e7b804373bec6e1d001a1cea5a2d846560213e424a25426d604b719d56f9cc9f667641ea0a554f829f042001bc24b5be158cbf8b03818afbf5ed61c614496cc0"; + sha512.doc = "69d1a4cacd85dfb93b89ae7aaef4ec551467ad8a2cde4674180cd3105a7bc963574d6d0138ac2794397f7a49c9f7560c503de96d7eecebfa4fe7e4e6be9647f8"; }; "bibtopic" = { revision = 15878; @@ -3671,6 +3692,14 @@ tl: { # no indentation sha512.doc = "46799d5c6758657eadca7fb30d214baf47c237b63655a71ad19e188fd54b664397babbbc5cf6d9897e81decd027dea1e0d1a6fea97384461ec8976fc19c7fd8d"; hasRunfiles = true; }; +"bilingualpages" = { + revision = 59643; + stripPrefix = 0; + sha512.run = "e7d92cd1e11e1604f94b3a825953ed1f876a39dce3dd383e7ea1e4e166b9ffb21786911f4b408ab5d53e6f770225176251096ca9df0a187feb530a27ad167b5c"; + sha512.doc = "bcbd9f48dad1b84c96fef7d6b5e0a343a261a20ff35434c5e01d4b200229764adff383f2a718c6cbd89e4b208e6de1c403fd7c614dc1c247bc5a344cd3f3d504"; + hasRunfiles = true; + version = "1.0.0"; +}; "binarytree" = { revision = 41777; stripPrefix = 0; @@ -3721,13 +3750,13 @@ tl: { # no indentation version = "0.1"; }; "bithesis" = { - revision = 57388; + revision = 60452; stripPrefix = 0; - sha512.run = "71f653b8fc691e24943605f2ab3bc9ce86c399302283382f34be8364ad4ffb39edc64a7e17e1b3ef81d34c3977290032739d4f38702397c70679693c22cae577"; - sha512.doc = "4c39f70287765a61ec3819223bf61aed3c3035b646c9a00df456160307dc5be962bbbff64383c79baa903cabe566405639672d669fc505efe6883a64638f8b66"; - sha512.source = "681c9cda9aa111f809c33fccffd567c846fd13afddd5a09bb81d69390adc0ff6d1870b68f4a141e5ebbd7d83846423a0c1d21f43350b0c55cde1973fd2a9437c"; + sha512.run = "c7e3b1d0550c8f9fe33167d01fdd531c7711592de2c1bead232f00a4175c12d542785c18d66dfbc63916fa1668516339a7f3d9a29de4a9f688333ca7ad8fbd6c"; + sha512.doc = "9eef61914627c4c0fca3a7c6847853ae6b21685777cc0a0c21218a41c179c0a4a25c1c94c4dbcf9481206bc253363b6498d1388f6769f83ab8a9573d65b23063"; + sha512.source = "93486e82d66f648a7adec186377adad47282abf6dbe624d18bff32b638947c36a273fb89aba5325eb4a978b72dac0349f71399a39644eae40d9a25d49ad5394c"; hasRunfiles = true; - version = "1.0.1"; + version = "1.1.0"; }; "bitpattern" = { revision = 39073; @@ -3763,6 +3792,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"bjfuthesis" = { + revision = 59809; + stripPrefix = 0; + sha512.run = "e017032edb4e87ae31318179de5da789cbe2164ea5679d69e928a138242adb1afa8dfb3f8b9b7796bc6d5bf21c143f51e931656439a451ddf868c77c7a7ac559"; + sha512.doc = "657e45d4faf201c2d878c5323e3fd7a283bbe4bb4f868b1413e9b8eaa1db00d03771a4d4211e23549121c5dd480cfcfd8ee8e0edd7e56615a3c941c100465c44"; + hasRunfiles = true; + version = "1.2.1"; +}; "blacklettert1" = { revision = 15878; stripPrefix = 0; @@ -3837,14 +3874,22 @@ tl: { # no indentation hasRunfiles = true; version = "2.51"; }; -"bnumexpr" = { - revision = 49643; +"bmstu-iu8" = { + revision = 59576; stripPrefix = 0; - sha512.run = "c4bf69cf261c8545aeffe69c22e0a018afab5f919aa186efbdae0d0eff6728f36f0ca94831cbef7828e9df349bc2e7eed22c284cb41924b83464efa51418b22e"; - sha512.doc = "2e1430651869f89d3b1ecd146858b004ea04e6506cad29bcc131761b975a89671504b22e7bbe8bdd9e6be1d513f28f85e073a0f123e21e12584782db5242a50c"; - sha512.source = "25488522b3ad578b8c2fe5e418c5a6d1bf6295de7f16e743dbe90417ca36a8888309a8b6e56bcd93f72c89b02841f0b1326351f6d47840a1fc59042d11641186"; + sha512.run = "5bbadf510d8b3880603e9f45a93a3f126175c4b6825a65488df95ba15bd138d37a7511b845dc6c93095b405189c876427a6dfa883a7b4b6d2c1d99824f33963b"; + sha512.doc = "d7decc544efc16600ddf75c5cffbc8602230379a9e86553f2c532732e5874450c976ad562e37b06a023fcaadfea88571f3b0bc36f2c38f6947e76936c7acb466"; hasRunfiles = true; - version = "1.2d"; + version = "1.2"; +}; +"bnumexpr" = { + revision = 59244; + stripPrefix = 0; + sha512.run = "a868239dada7f16d52c5d16705ad796d6bc536b1943b5c0bb9538fc72242f3fdbe2cd579367e9230e20e2b3e53725ba8cf25d7d2aaca660a338d7863f4661d46"; + sha512.doc = "a367968a29bfe0d1496a8d444d6809a1ddb6f91031f1aafed30fdd2cd8ba929972554b186dfc897b273cb347f569922b7d59d3c472b385bd2ac1fadfadaa122e"; + sha512.source = "447c6dccda5a51d86be058cdbfbd7e38d46964754df21f155f8a41892dd0492efab2fb391b7144a0c5876cc5852176fa14310f78cf4fc8e4ffc9d28fe9f75e87"; + hasRunfiles = true; + version = "1.5"; }; "bodegraph" = { revision = 20047; @@ -3854,6 +3899,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; +"bodeplot" = { + revision = 61092; + stripPrefix = 0; + sha512.run = "6c9b59a70f65588af78c36675063b85ba2336c8ade9708d2e699ed64f522a94df7650c4f3adbaf279d78da0c211a53d177b1e7090dae013c196f2ecc291a00ef"; + sha512.doc = "4dc0a31631809f10ec08d284bb75cfbb159518cd3e2fea0c60ca67758e090dbfab100edc3cf476d864879531121642bdd0a96d09d9040d9be1288c05b78c6765"; + sha512.source = "fcc50625372e7c41f3a691cd85c7619b6548caf1eebe60298bb83faf9016ac2c4b9508ddd9c08a7426e3c96792f52b5d260590972d5e32bdc7be2c230b55d224"; + hasRunfiles = true; + version = "1.0.6"; +}; "bohr" = { revision = 54512; stripPrefix = 0; @@ -3911,6 +3965,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.1"; }; +"book-of-common-prayer" = { + revision = 59742; + stripPrefix = 0; + sha512.run = "0760350b49c1487d35ae04ff0ee57d552f6ffa0c7df9d02c7f74147d3c459926881a0252fd95d5b7acf3064fc63eca92f72aa088f8fca418d86f5e6f9b9febca"; + sha512.doc = "ae73dba4c8bd043772ea4bf78ff9cfb0fa210d3de15b2e045356522349f11930e34dede648022be75d015893a91ecf9d57812b19475352f59a4f84de5a520055"; + hasRunfiles = true; + version = "1.0.0"; +}; "bookcover" = { revision = 57326; stripPrefix = 0; @@ -4115,13 +4177,13 @@ tl: { # no indentation hasRunfiles = true; }; "brandeis-dissertation" = { - revision = 54758; + revision = 61215; stripPrefix = 0; - sha512.run = "26dde7d29bdc60ae3b4c70b14b6b6c35b0319422cdcbda1ed1f4beec7a3056e145985e7a1b3aa4870b8fcc1e6d75da2e5d879b9a5c26ab85de59710d322647ff"; - sha512.doc = "49b84e3fc0264f2a74704dbfa90c8c6bea44f436afc88387ff5c7cbf01d5feb207b1ba77e661f6db974e28cc41e3d8054524eed35f948aac3af4dbd24cdffc14"; - sha512.source = "18cf0e74d51021dda950b2fa0c95807550aa69b1de57f5989b88ed1236c433483291dcb7158beccad9fa72903708212ea50c606d187199ccce589010b02915e3"; + sha512.run = "fc8d06b0d5f7e24680e6c08f7ac59b59b19b2232e61175092f63e3d19bd43e080b84777e6305d1ec3a110b367b135a80e2d7bc6e13bbb875855b732fec796bb5"; + sha512.doc = "219fd04d81a64c85b1bb6d26d2ce1dba07fdb07d1df370e01e7683d7bb29da90dbde18ddb509415ab55454e1b112b7053a6b3f179ba32b362ec19a43433caf4e"; + sha512.source = "c545f4d71ed630207492f68fc79a054c7a57121335aae12449106a1cc5554631d247b8a5a1cffb03f8288d3b3ceef1f45bad561a1a1ce0da67cceb12d7391f01"; hasRunfiles = true; - version = "3.11"; + version = "3.13"; }; "brandeis-problemset" = { revision = 50991; @@ -4132,13 +4194,13 @@ tl: { # no indentation version = "0.5.5"; }; "brandeis-thesis" = { - revision = 54758; + revision = 59832; stripPrefix = 0; - sha512.run = "8dc788bdd5d3b0e16b525f217de177e711abfb5c558382b12e4328fb690e2a16cf1d9fe403b40c392b9b745d605dce30e1c297d5f694cd977b992f585e50e6cc"; - sha512.doc = "a56e02eaadb1bfe1315d4813fcbab0dc73202de0126d8fc64ee947770ac1866857194ad842fff7a47dfff4650c6f6aed8ab711eed6a47b0b6e8e93b421a8fe1f"; - sha512.source = "7586d766af63eb1797cb35b0fbcf87ad78065e4564c138eb2159c475ce7e7dabe09a0d1140fe80c0fabed5a00713d23869f3071be8b834c1a503463e215a3827"; + sha512.run = "f1fbb296da700ba3cf4c9e6818898624576b9a58803754d77909031e7bf3b207790f4818e247fdabade5927687e8c6a186e887f595f536c1c4a8ba8e1ba03ec7"; + sha512.doc = "51bfa4fbc6d5900d92b3c7d5530b166dbd653af2017153c5ccd18d9ac49e124178378d1a2ecc867ece7ae758812f5c030dac00d55c46275e79c2bf4e9cf77c78"; + sha512.source = "b5a5b294470869862855b4e9ddfaa6c7213d91ea69ee99834b5eb2e09c595d12fc5df0742cf52e19af156bf1db29744b9a320ecacb036843f2169891fa42fd41"; hasRunfiles = true; - version = "3.1"; + version = "3.2"; }; "breakcites" = { revision = 21014; @@ -4165,13 +4227,13 @@ tl: { # no indentation version = "1.0"; }; "breqn" = { - revision = 56422; + revision = 60881; stripPrefix = 0; - sha512.run = "ea1df2ebb14d755225368fafac24e2068b317b56c4a42fb10011f1fb9f233a7d40bd83b0063271ac8efcac67725f32e12e0ef63467cb045bd460abe5f84638f7"; - sha512.doc = "9e5903493b727972dbc5b18b1be6179ae72d23e59eb047c41562461e5800d5c66d83eb017f410b73f42fd12c219d09dfc95e4cd3375f584820ad0e600cdafc91"; - sha512.source = "5640578e4a42535331094955073d42db502299d25e6f69b4a9caa31b5dd858e2860372bfd123614243b5d1d370eda791c178cb0b6d8c036655febc7c1ce0fbcb"; + sha512.run = "c280871916bf0689794cba9640a7666a0f7b295635b85d99d08f04cc0c4cb7ac82552360b0c8b3d677b138779239c4ac4a2583db26fe194870c0c97a9a53395f"; + sha512.doc = "70ab6500b714c0e91c597b43d934942c39c23cfc9993702b6eefa19b8c9027aa0e7eaa55cb48413e2cb42e468167492e7a401380c1cb4a711daae364ae01283b"; + sha512.source = "aa4922ba1ebcbfe00716b02b567da4b17ab1b0d22cd5fe8332d147496f93dbe0a94e9e38964b13b6b4944ccfb2ce49bfb32ed5602ca1f147fc99163eaedadf46"; hasRunfiles = true; - version = "0.98k"; + version = "0.98l"; }; "bropd" = { revision = 35383; @@ -4198,6 +4260,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"buctthesis" = { + revision = 60708; + stripPrefix = 0; + sha512.run = "015f93fe7b7c5aafff34a0a24166022b9e1d5cfc6f983bcacda2da5b4ac8a5315fc00320708dab53da32d0573859fbe3e0d692966d76369dda11f2c08a9c2cf7"; + sha512.doc = "d94312d06d2228f97c0a5c05d004e53dcc8dc0c6ef80f56d08d41cfd4c88ab38aa4df8b6cdf07de8aa6b5b6e9a8afcd86e9824d193f317eba380f4656f810c1e"; + sha512.source = "b35809ecf963481cdde1ef6dbb0b215a306ebc5595b988b883e70b06d8f0f6f80079d7bf3d340f8c301330471444af6614cf5588347c22e896651d43de9917ee"; + hasRunfiles = true; + version = "1.2"; +}; "bullcntr" = { revision = 15878; stripPrefix = 0; @@ -4312,12 +4383,12 @@ tl: { # no indentation version = "0.3.0"; }; "bxjaholiday" = { - revision = 57025; + revision = 60636; stripPrefix = 0; - sha512.run = "e062446514cdcf8e817f06a33cd02a29cd1985dff450a89baaf2e230fd9dbe20e92d3a34b661ec12c764c5a6230b1fede49034847fcac2d2db2377eb7d4450cb"; - sha512.doc = "3b44cf93b4afbbf97263b091509a5486bcbc6fc7091bc8a583be73f35487962af93f071547a78895231fb576054e440271abea20a7b07d111c197382b52ee746"; + sha512.run = "4f5dc4081f989b73e5334d62af403922e2918424cff24480644f1e9016e3e20fb044cb22da91a035b198aa92edd0a51e985fe791a4c99ffbde2d339ca46a3918"; + sha512.doc = "6d3ccd7c279e9dd8063296d843dbb6b42af90359b16f421eaddc7b2ddf23e2dc6077d4748abbef3c67c9672536d58a20746848237525a4cf8ec87ed19117a618"; hasRunfiles = true; - version = "1.1.0"; + version = "1.1.1"; }; "bxjalipsum" = { revision = 43369; @@ -4328,12 +4399,12 @@ tl: { # no indentation version = "0.3a"; }; "bxjaprnind" = { - revision = 45291; + revision = 59641; stripPrefix = 0; - sha512.run = "77f754e9d9cfc643286df17c7102685ee4c893b5b99308da7a8a9033fc043a7ac95a34dc4a253da4f5e6ed29b35a04376eba1635abbbbe6a6e2670d0d47f50b8"; - sha512.doc = "0010c6e9d1041013401f59820795e338d9e0f852b2d29212fda0c66cda3e2dbdf59593547a8d83d9c6d78d48fb0372a4335976ad1fcc190c3c71a3b5607a47a4"; + sha512.run = "90d69860d7017c414cae328806e4d6e9a788dfe46f7a6a5792a0e8df563471b5d60aa6b7d2ea45caea3caf954a809f64549f24105d9856d6b89f96d366a02fcf"; + sha512.doc = "40c81a58de05b25b5ec537ee6ce8feaa9476ce64898e7ebc67ff1d5497e53eab341734438160e578487753ec9bb747d8c69cbd4365895326b081588b92f6677e"; hasRunfiles = true; - version = "0.3b"; + version = "0.4a"; }; "bxjatoucs" = { revision = 52509; @@ -4344,13 +4415,13 @@ tl: { # no indentation version = "0.2"; }; "bxjscls" = { - revision = 57625; + revision = 59253; stripPrefix = 0; - sha512.run = "589b5b44ad6a4743a039b427d8caabae51c070591f808218f432a21df4c442df9878fd5fa882d6e5090ed808c0f689ecb8d9ee11e131415c7dd69ef992e6d898"; - sha512.doc = "e999fa0ccac37f7f5793e5f0ebf096615ef9c92cb1311e885edfced06ddd5c21ef3220bc5ac760e99dc4b49dd8d4d1d4b612d4f686433ce15e73a7222b8605d0"; - sha512.source = "27a1df36d928544d84ac322104c723cddaae3eada19d7b205150463c6c6e2c4da33d87c34547b02fc06b01eae4b67f3356c31132bbcb1538ec8b4cbd495855c3"; + sha512.run = "55dd819a17df692beaeccc41eb9c9258b2ce6df426eb476457eddea117551698ecbfb5a34c339891e276fe0c98f8ee0a676640d7dd066778d0f6e74b6c5fc9cf"; + sha512.doc = "6c922c350ba11095dfa1c0ca9ef6b7b3b23ff7b3a265246cd4938bc85c9c98589d1d423136194341ebc888b57aa8f0a0503ab4283f9ecba023ecf19c728bfe40"; + sha512.source = "e030c2a706035e6bf894f7c92a5f5fbbaf5c5a887e654bc33769fb27412265dc8ac84ea5f283131e7071287244c983cd72e3cbebfd73d3f6b17ba12b41b8e948"; hasRunfiles = true; - version = "2.5"; + version = "2.5a"; }; "bxnewfont" = { revision = 44173; @@ -4400,14 +4471,23 @@ tl: { # no indentation hasRunfiles = true; version = "0.6"; }; -"bytefield" = { - revision = 56821; +"byo-twemojis" = { + revision = 58917; stripPrefix = 0; - sha512.run = "a36c81313224ac79fdd7d51f954aef437f011314061473455f0cc2be0cc52659c83400140a3b924a75c76d825b14ce3135e324438d9bf8830cf40a1c4d536a32"; - sha512.doc = "1aa94c8da8ca322cac0360205fc2724a9108aa0ebd3332fd0cd749123d7a1fde7467006595240e65937e0a6deb78a810efa677ce27b51ef62f5f15ebd620e593"; - sha512.source = "be5993e9addb0f22a0e618b934ba77e4169f5dac3f07ca8e3986ddd4a001c7483b52fb5b3f1575c5b07339c9227891dc7794653c9be5fe531c7375dbee43ca30"; + sha512.run = "5d9330d36bef34d5deb7fae5413741de09050bc9a0fb3bef7874b0d44f397e900f626fa64b8903038d3131e5b9ae66f121a1dbaa6f25668f73bdf7d3aeed409d"; + sha512.doc = "a0329476031945d9fb694522b3bb08cfded7ee117033f758ca7a9d1dc423d66f8ca749b295e1d420b737da886b57b1bf2dbbed20d3bacfbef94d57061a22f4bc"; + sha512.source = "7971ba8678358883fba70f2394417f2cbaef639fa0a1fb13f1cef8d0cb182c91fc3097450bc29011c4b939afe6cb6ae5ce3c8c50f183fc92f10f3d0a46adc3ad"; hasRunfiles = true; - version = "2.6"; + version = "1.0"; +}; +"bytefield" = { + revision = 60265; + stripPrefix = 0; + sha512.run = "6f128c419989627e6ba7329932588121f88a63d89761d5cc912b8d53371ee5c80651dd6a3e0f8e9fb16d77ef3818baa65c317b1629b954a45743c993849732d9"; + sha512.doc = "e7a496c61fde7af9d5ffb96b4dc1c2dfff8dc3883b07ece63007b2987f1ecb5d0d751daa001b0d2c045c9ca5be9ce074d37aefde8981fa88a2c9e91f7c3bdbe7"; + sha512.source = "e017a2d0ea3b04682a2c5e8c0f1fc76d3d45f25161c00695f134947da31d98fd89967be43785c307893f34dee0f29ecce99c3aa539370463b31093c03b2e78ab"; + hasRunfiles = true; + version = "2.7"; }; "c-pascal" = { revision = 18337; @@ -4418,11 +4498,11 @@ tl: { # no indentation version = "1.2"; }; "c90" = { - revision = 54074; + revision = 60830; stripPrefix = 0; - sha512.run = "9ad45614fa33b2272b0975cd8a044342d7d59d3dcef0b051f7aa49b5821764f838d1ed3f2b69e577a3c5cad1c471f412d4a312ad884ed4f9f29fe0a0782eeb02"; - sha512.doc = "8b92590067d8c36b9d91a035c1eb88510327bade43f2458b12c64a74d6f0d74f23a33b61fe9ac8949d9a05137976a22e8a513ed3c6d40bb6138ccf3975ab0b8d"; - sha512.source = "bd250ed720d900551167efe6f17844e2ef89005e9f8014d46b50e6abde74fdf84f0960ae452befdf018d6b39f3efb58dbe600b73261c935a4c35f0228a3d0b46"; + sha512.run = "2350e99bfd047ea514586894d20bd37dc778c74fd4c1848063ba7d53cb59ed5df36cd20fd51140ede8af7f32ed7efc44e1d4f3db4a0baaa7d1439941ed5297a9"; + sha512.doc = "9561381312a2e3fcd6a03da1082e9bdb5a2c30e241078adbb70d06060a21674fc8a40c5cb81ce87d31ff99c168d73e9b4074cb3a6114439d5a441dd0054cc682"; + sha512.source = "774c2aae917343ba9dd78785d2dc9123bf1dfd0920b638ee991a92a9a87199205fea04ea36304806c7213a2bb4ef06459f385558c9691a7dddff69cfe4d35fa0"; hasRunfiles = true; }; "cabin" = { @@ -4593,11 +4673,11 @@ tl: { # no indentation version = "0.1"; }; "carlisle" = { - revision = 56753; + revision = 59577; stripPrefix = 0; - sha512.run = "679a07121b01b5ef1ad15b5713bf2b38374d49458d754eb204c914bc02dfd4ed429e30826efd980be0bfd1cefad7607804a04e8a820980877bea68286b23961f"; - sha512.doc = "55265a53e2ae899bb6f856626f155c96084328b7967e6c599e56d53faa5b746efda2f98b6f9b4571d7473da8c664799c259d2f052776b4da218dddc03265df2b"; - sha512.source = "350e30ed75ab3f6b3e33d4d0c16f84cc7cf887b022175437ab11bf561698c3d06d624f02971652ff370de1c4e6454e0a3cdbb75530e08bbf141ba9ef7298b942"; + sha512.run = "345c61b7eb6637e73a66b5f9183ec39188d4e2ffdd418f12d8ae70394f447eaf8a5d8c62e1adfa515ab7879e1afac4163957ae0b6facafd9ae6ad6f300acbe03"; + sha512.doc = "54c785d458a5a2848c2ae5c730215df4a66a7dc523605d3a9a8985cbd65677627a2a5f5800f055da65ecfaf096fda609f4a7f3a5ce22339f0ee6bec635250ec7"; + sha512.source = "9acfe2c47c7a6a9ee358bc79482f2b21f6ab735fe25696e04a996cfad798a0461dcc0bccf6ee7fff9a6b9e22307f5312e26f9c4fba46a03f0289b8031a6bb97d"; hasRunfiles = true; }; "carlito" = { @@ -4614,14 +4694,23 @@ tl: { # no indentation sha512.doc = "284d9f740d1e4b1a4c989b527bac80e54afa74013d1234bf9e1c2d42ac2ca4387c3b0d24004818e1fb92b001582114a4432480804c721cc7df0bd3b85835f111"; hasRunfiles = true; }; -"cascade" = { - revision = 55759; +"cartonaugh" = { + revision = 59938; stripPrefix = 0; - sha512.run = "2c108ed478340c3605848c67dced82eb09040632e63dc59aa00c2ff52d0a0ff9c174240adb096ffdfbce8449c4b612df4ad0da05e41bfdf0040ed4e510a0ea19"; - sha512.doc = "f3b650bc8ffcb089b09a94bdeda3e188df26c5494cbcc515c095670e6f13be31e6d18a19b781d98fd78ea9df7144f9d5e8bed13a79da99de1f2d0329079438f6"; - sha512.source = "3b5b9fc20b90dee62d281ba4d25953e660b52488271a812e595215f255c7947131ae33d3cbc65036242d25996bdfe40a980650cd942af2cf6029e408f0f7f915"; + sha512.run = "354baf8e8cffc0849494e4f79a64111bc0fd4a63e2454b4d4763bcf0c25511e4fe70caf048c628695a90c55c04fea0fcb026a57e72131e746f9d795fbf54fc82"; + sha512.doc = "3811c97d39d7738ee26cc40f839eaf9f51d798d7f14a93c5906ea977a20ff864f84772adf3815216827894fec67f21c488797b4cf0b4db3c7ef6c551637d0493"; + sha512.source = "9e417dd74451cf07d406f0c085231c175ba5bed083456a06cf9e0e3539ff32b2c6d596190ff7421b879572f0f568fd775c66e4eedeb776e69d6e5dff461dffdf"; hasRunfiles = true; - version = "1.1"; + version = "1.0"; +}; +"cascade" = { + revision = 60310; + stripPrefix = 0; + sha512.run = "261849263f2e07077ce67daa2ac5f7e1b05245a45386473e91867e30f071d7d0c103fabaa04b02b8033aff42169998193b56728ea2bdd98beb1851ba010c1f79"; + sha512.doc = "08f630b077b01b3db0136446b65ca5dbd53d7814187e792e86e6f678663c2bd204db3f92f9e4937ca22645933fea851363a5bb897f6d44072d02a48f9f27d8a6"; + sha512.source = "7c8fa6fcb3a1543cf7b5ca000c59eeab7924f0a68178b0825abc4d720b09e0179087299bde63540bc3f5faf8664234a1135d32b4f7b7b19b005c63a991101182"; + hasRunfiles = true; + version = "1.2"; }; "cascadia-code" = { revision = 57478; @@ -4683,13 +4772,13 @@ tl: { # no indentation version = "r0.2"; }; "catechis" = { - revision = 49061; + revision = 59998; stripPrefix = 0; - sha512.run = "2fb8f8ae6f9e597740edbdd0e686f9715dbd4ad2df2cf9d3737b09d1ef496582e243b8e21414fab8cb89d3d5a8ad30a4d82276551ad6fa548895c6cbc7612cb9"; - sha512.doc = "2273842b6b0222c98736fe6338eec505e5a75ca45d180c259bb3073ed47a5d0bab65fbb95630076f764db64d978ad8b3dbdb6a12775d2af3ea730c9d1b938bf6"; - sha512.source = "bd78292392877d0694fc085ab92e64ea47df555103ac745c8a0751ac445d0c74a034bfa9be1b39a3e16c0578da7bb68c7635a359f3caf69a2dd3d03ad21b51fb"; + sha512.run = "3994f92840c261d92ad8ebcf3205491146ab64cc65b7685557d2b84e3ef73058f3e968726b157d13e986a5ca40aeac2a9ffd48d019664ed2da4f01589ef4f0df"; + sha512.doc = "8b44ed2ca1ed8abbd5acc75074a2e297cc72632cda43a7049009631a79e459052808e51b169bd0be7932245ea2539223587b38cdc6d06e67c16da457b7036560"; + sha512.source = "43827e136677ad8523499d0b102a7ad4be3b95a9818a8720065d98beb07c5cf1a7f6b36c0985b7f4c6fef43fdb233a6980a5899697297cf3ad39e0da6db6c33a"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "catoptions" = { revision = 35069; @@ -4776,13 +4865,13 @@ tl: { # no indentation hasRunfiles = true; }; "ccool" = { - revision = 56636; + revision = 60600; stripPrefix = 0; - sha512.run = "4571aa4b0d83f6651784f43e5b9b982a9d42494f9ddd5006a794d4eaa94c4217ef0e85ec2170eb2502c243c02b7b67f0e8dcacdf2ad2714f70e7f6cbbc24aa3b"; - sha512.doc = "99c777464f24e2cc5775a342d682f43686d13dd13db606c30126408de8521cf68ae62acdeecf351dee510ab6550b247100bbe6cfdc2e04cbd183270fc91c62af"; - sha512.source = "31f6f051fbff8806df6bc84c03fbf5b33440800cea7083b8d6d36e585140dfe24e7fbb192531614dc65d27f23f53e46349b0c020a2cddf4817fe9d3b7b23be44"; + sha512.run = "2b125b2e1fa1bf91abd3968749d422873993a6d34df66bccd2fdf8b71338cd6039be8e584f801fa12cfc90a59e32b3ca0de53ba07bdaeeac745aa2a73d05467e"; + sha512.doc = "05db77b09aba0d4ccb3712a5f5086c93de9ce70e067bab00030e96a23b058b76b69f54b379ac0ad8d03e68a3986687b1ce18a980d9ee5b7e4cb80dd2064294ef"; + sha512.source = "dad84e19fabb04f783276ad11c389c9ab0425d81fd1e91eed87b6659247613bf759064e94de39904d13148393ec34ed0567e2d680c8b794113e844feb86d8932"; hasRunfiles = true; - version = "3.1"; + version = "3.2"; }; "cd" = { revision = 34452; @@ -4802,6 +4891,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"cdcmd" = { + revision = 60742; + stripPrefix = 0; + sha512.run = "677fd271bd209933428d0b655529b7e6c4bfd6022c37c3ef5456e1ce6fe25c599a9883474c28dc9510e293a2ee5e87a49b797bb562b750e888c622bf6ac6d37f"; + sha512.doc = "bf6d3bb4422dae82e06d440713518dafa98ab7ef7b527268050ebe51880f90e45b76281c1d693f1b40e85f07d7f6d395f51ce2c642094e326c3b1d08534fcba2"; + sha512.source = "50a2f50cc7432505c608aac180f7631d831742c8047a8f3da25bbdf6e83efd9121fe3b5256a2b139b1c3a29da4b2003304148f5f48c745734b811c1d853016de"; + hasRunfiles = true; + version = "1.0"; +}; "cdpbundl" = { revision = 46613; stripPrefix = 0; @@ -4845,12 +4943,12 @@ tl: { # no indentation version = "1.1"; }; "censor" = { - revision = 49168; + revision = 61389; stripPrefix = 0; - sha512.run = "03b94dea9f5f69f0fde8dbd198e73a1ccc1e7b118b26c8272b217bfe76b7cec7eb0c8706dfbca7dd2a9438ea7337482cb55d631d3cabfaff3dab19d1cc565780"; - sha512.doc = "131b995300b302f482359820bb9dab62188be11f46470e2c9d25753a22d6b81def5e272cdca4f2057adbacb3bb9aa777e758ebfe8a95205db7de36b378369bdb"; + sha512.run = "1d3aec8389a5c2c85a68ceb5b69cba5292f7f53913c2f1c79fa1dd3e1d37c2368401d5bbb58869ad281f981a663d55a8dcf792e71fc2440278d58f9ee65f4b3f"; + sha512.doc = "78fccd2b3e36161eb80340134978017e0091c085aa53d58ddd65ea068e77eb4e7d54d2ebb50496feaa12d825c3580563e145d38ff903376a36447ab6b50687a3"; hasRunfiles = true; - version = "3.22"; + version = "4.0"; }; "centeredline" = { revision = 50971; @@ -4930,13 +5028,13 @@ tl: { # no indentation version = "1.0c"; }; "changes" = { - revision = 58773; + revision = 59950; stripPrefix = 0; - sha512.run = "946a37d1b66fd2fa900a6683d08ccdabc88304c9dcb9d48a3f6b2d83208f73cb3b9f7d2c8e86565db16356e3a1b128e53f5d8ddfc6979129ed30e56f120b9442"; - sha512.doc = "a653f0e5f3b03252d30d24dec3a6623621858b433734c437a3ae6bd56e293ab00503fb7e2a92e51a0f88ed906fc0c05484577fb09c5348a44248eb7b12f41cf0"; - sha512.source = "a74ee0bd131301f12a674155d87ffec87b88916e242e80a4daa18fca251d8479e05dc8ddd343943c96055cb3c54fdaa37f91198c8daab1a0c85eb8029d8f9f9b"; + sha512.run = "4fe27f5c76d1ae374b1d3f3d75cb7e61a82baff34ea0fbc6c7ea87eede785f83dff23f3f56fed9323b9d364cc2bdc533640552c8b454f7a821a80e830244f97f"; + sha512.doc = "f35b3e0eb4318a97bc09361be9561a3b195678559f8311fb0d2bab4211f86853b1210e515e02e6312a8d46e52d7534ad9573b9bb3ed5611f1766a55e54d22c3f"; + sha512.source = "a8ee2f4efa5caad223bd543a0bcad42eed02d2aaa143826ebbb13000d820083ed416cd7399d07c8865301708fcb87febc5d211ae8b0a6a6f08b5b9143d8c430c"; hasRunfiles = true; - version = "4.0.2"; + version = "4.2.1"; }; "chappg" = { revision = 15878; @@ -4957,12 +5055,12 @@ tl: { # no indentation version = "2.0.1"; }; "charissil" = { - revision = 55920; + revision = 60294; stripPrefix = 0; - sha512.run = "c12562bce62a161bf261cc3a899c16f71f2c26091531a30626f7a0021cb0b321e1068cb9b2ff48cfd0128f1502d4e7012c12847b303295abe6758a970a759d3c"; - sha512.doc = "ccaa2f0bfb3c76e9fd6ba2fcb35e926bdaa70ddd65abc14b2ccd2ab5db9eeef8ecdd4aadbf245fea4674265f6c616e7c42a2b1251214548f91bf72cc881bdcbb"; + sha512.run = "71c215dbbfc5d846ef00c9d4f40e22904dffb0b28587630527fddc7cf0cc40d4c68b7b913b8494a2fdb782e56048f5cc352ddc9b33ea2a2c9b7c3c97a4328507"; + sha512.doc = "74d9d178c12d85f91805d46bdd6fb07f1367a14ae75f00377b97455c904b1436b068abf3ae52a4d9c6e2e7886e2f2211f09a2733422c05eef4d71e7a8a925b38"; hasRunfiles = true; - version = "5.0"; + version = "6.0"; }; "charter" = { revision = 15878; @@ -5060,12 +5158,12 @@ tl: { # no indentation version = "1.0"; }; "chemfig" = { - revision = 58014; + revision = 60135; stripPrefix = 0; - sha512.run = "ac0f3fff6f24fe83c3a1cd7bfd456cf187c57ae66776c672aab980d267d9552b7b480b0244e3d2e1c8d9f39f1d6524f9e882fc8a71be9fc8a5c0263d4899f718"; - sha512.doc = "c8721852c551909c7ded202793a5c1c999d522f3217e9c4fe7a9c4307b7ee054ca360ae72d0d12ea09ac3b538445d79a5d103493c7e14f669762debd2eb92536"; + sha512.run = "95a57f962e6f15d5e2bebc00491c60ab904afb739a0ae438346c57ffc47ed23109d436ff0f1f0ec2226d6e215d185a39e014ed24413066157c2830a1fabcee2c"; + sha512.doc = "f94ed7e4133a3c7122580f01a415922480257110e6c675ea816c15eebb3efe0ce40675bc6d6c99f02d3605dcb53c63426c6fbe23373336aeb29979a75f323e31"; hasRunfiles = true; - version = "1.6a"; + version = "1.6b"; }; "chemformula" = { revision = 57206; @@ -5101,12 +5199,12 @@ tl: { # no indentation version = "1.3a"; }; "chemplants" = { - revision = 52863; + revision = 60606; stripPrefix = 0; - sha512.run = "271a8f113b9c722f08c750d77aa6d70c5342396c6bfee815f94e90cbd7f6ed7f9793dfcaed9f5ce49612e15924298f2e995b2b5f504b975c8081338076a61272"; - sha512.doc = "18eb6cbbab95af45040cbf66384e32701e83e509c62bc3a68b82e760f131827740a16d5da35175eaea20810d4a66e8b1cc586baa10f372f1ad2a043c8f9f3f54"; + sha512.run = "6d5794cdacdf71db6cef86b9bc99af2edb1a13f2b209d7693a7f37cb5161596de37b656b3e4ae690102cc64cb7245b21004c72943fb8f5e08fc1ed1479d98947"; + sha512.doc = "50cdbc24501b61b81c2cde97c851df785599f5c2f5c3e4eab75bdebd2a81501edb9e3223dacb2042682a066f5640e8b1377c43ca61ec643b342f6de2972ec4cf"; hasRunfiles = true; - version = "0.9.8"; + version = "0.9.9"; }; "chemschemex" = { revision = 46723; @@ -5195,13 +5293,13 @@ tl: { # no indentation version = "1.01"; }; "chhaya" = { - revision = 57508; + revision = 59566; stripPrefix = 0; - sha512.run = "55d70033c02029065f6a619249a14febe37b0960e25c248cdd35fdc7e0afcb6d7e128ae9113001e19c2cc22172aa19002d8f06f0671628edd4bb811edfc92f29"; - sha512.doc = "eac6b06915dccdcd74cb98cdf45073c06cd63fe48ac88fd50aa652ededaa1df36efc8604ac7dd335347b56bf10339d8397a9ec2db304c55e6c07132ff18a0b4a"; - sha512.source = "f6117bcbfda21aebbbe90db0932f93792fb343fb0831d8b02c4c61114cc3d10631c3b548cbd2ea12349e4dfb694597f657dd2a2c0b3a126d01b23bf19b228ed1"; + sha512.run = "b5b85d8a65922ebb610bb49ae574138f93efb4cfd0bb5bf0610ebaa6f31fa14e393d47a27b831b6e894f4210222809e5d5d50f0e6df5cdba377f9d8695db38c6"; + sha512.doc = "c255cd6183edd207ea269f32bde1a3f613b39cfe460695527957bcd42228ba97844eac4fcbb691affb91718e3c3720226cf3e60ffd8b49875644089ac7a7b8b2"; + sha512.source = "3034b556c8932cc645fba70bc5a00b2fef63922c47a88c19dfc1d9c11793abc5ce24be30e420ecce16053970bab82df624c47bf964b20d6280690dabeeae6f2c"; hasRunfiles = true; - version = "0.2"; + version = "0.3"; }; "chicago" = { revision = 15878; @@ -5382,28 +5480,28 @@ tl: { # no indentation version = "1.1"; }; "circledsteps" = { - revision = 53382; + revision = 59608; stripPrefix = 0; - sha512.run = "f8e34dbb7167f4d9b6a9585c856f57cadcde9ccbde1d28a1918ff3f4c04916fe347acd2377cdfc5d0cb03ca2a8f5ed3389ca134e8621084da6504e0a5fa10622"; - sha512.doc = "b7a50fa849e89393ebc6624623743ee7be737805c7807dd57957c05bd3489d908731c37c87d950615e5d6b835035169717a2648ba876ae458a0d4b0f779f0eea"; + sha512.run = "a677f83e00e92f11de361cfd4334a73ec915a1e242d4ee0ab5c3a01992b34b3872d7801ce552ddf926187c8198dc93daf8f814b27ec16c0d1cc9c23ce3927225"; + sha512.doc = "1a0fb47608b126519576447b648dbe6153a64ecf428d1d2a74eecf88985c97b3905f09ec010ce185dc5da3aa85970c2409feb45a7f3902c77f36a6208bbc208e"; hasRunfiles = true; - version = "1.3"; + version = "1.3.1"; }; "circuit-macros" = { - revision = 57308; + revision = 60690; stripPrefix = 0; - sha512.run = "38e9ed7362e27f836d3a364ea50f54593aac93f30b7a2b90a7bab9f0dd72f28a14cae86fd5d3dad2f47c00ef511afb458c2da29c5da203c3d65c9829b32aad52"; - sha512.doc = "44251146179c9021159523d00acc93969c1caeb92bd0efca9701d95804fe57c8ba218f41cdab878aad8b942cdb21ace7d0266ed7c7c9373d0eb9676b9e636492"; + sha512.run = "1487a935b764969c641e308aec9dc82c0b68df03f427dd2b9871b1035728303e7f16cabcd6f48d5a1c9289ef4541038b8a73cad66f77a7cafb8ba5b125afb406"; + sha512.doc = "1f7d2dcbff417fbdb3a0f3208339236bbdc2066c1fa94520ee006f0f326faaaa3bb5f037a70a3c7eaa04e7a07319c58c8346613da8d0170bb36abd2aedc6e3f2"; hasRunfiles = true; - version = "9.5"; + version = "9.7"; }; "circuitikz" = { - revision = 58757; + revision = 61231; stripPrefix = 0; - sha512.run = "bbe6be9fb82ea663e25e30b7ed4938f68295a3b69e4a1586cf0baadeb0e31e92d2f775927167704a2145d0f495a546a378ba9b0cc62b8c13422e7bb8f9af8b9c"; - sha512.doc = "08644573bae57d53903c1ab41962048201e84cab9c075670c568b20a5afb4ee35cb00346f329136827f377451edd8b2eaa11c68b2ad2df7af3cd9adbc124b801"; + sha512.run = "d67f5c1285401bb8bee981b943bfcb248eb5f184fe2682dedd9639a391dfda0129c940a28f05542869cf1a211ce6e6f4ac8504c82d8111099e11f080fe133194"; + sha512.doc = "8af04c7a0b5897b20179270e31c50dd4b0a152cd309a3201c60cb0447e8544b51dc7d0621bfa913e312b28017b19d407b266edadca3648ebb225e3b70c75fea4"; hasRunfiles = true; - version = "1.3.3"; + version = "1.4.5"; }; "cite" = { revision = 36428; @@ -5446,7 +5544,7 @@ tl: { # no indentation version = "0.2a"; }; "cjk" = { - revision = 36951; + revision = 60865; stripPrefix = 0; deps."arphic" = tl."arphic"; deps."cns" = tl."cns"; @@ -5454,27 +5552,28 @@ tl: { # no indentation deps."norasi-c90" = tl."norasi-c90"; deps."uhc" = tl."uhc"; deps."wadalab" = tl."wadalab"; - sha512.run = "c35be1fc1d9f9d44e78effd6e7e539591020d785ae255a1cfa0d7e2508fcdd496d94e4bb0096bc7a281ee93b0b8e461efc6724c82f49d589dbcbdda35143c811"; - sha512.doc = "d598d599d02ca95b1375b8e989649b441980ae6467348270c366a670d79d606b1ca79801febdf5c8c636f2d1c7fa30eb87bd87f90f75b5b4436443ecdab53b73"; - sha512.source = "bebcc4f77716c92fdff317d926b0ab47ff32efc8b235f721d7d3d1808dff5672127b4c80bb729aa1023f25949cee2c4d508adb40574a3d606f3d5840642eb604"; + sha512.run = "b13712912e479dab68cab9027042be8cb11047ebf9c034f532c857e83d28f19dfea5a1748685cfe1847c7372f2d0982f79736525694d937c88962c5262094585"; + sha512.doc = "a8c6b2d4d0899b841ccc32b378855d61bdaa65d5f68fd408df3894d386bcde18f384410f34e6f33ee2a5ce770e1e663a05ab038d9b7483012a3cb414739c3705"; + sha512.source = "88be587328daedfed3bdcb289b1a03343bd7257ae180a9e0857a6b00f173f601eccd8e5978dd29c2d95fbab180fcfd5135a682c5218325fc6b664f2cd505213c"; hasRunfiles = true; - version = "4.8.4"; + version = "4.8.5"; }; "cjk-gs-integrate" = { - revision = 57081; - sha512.run = "f2b8db61f861942df199cdb6e51ca7458f22d385396382bfda6291d2f2abe5555b6b35102629c4c0d478dc01b873ae917acf10b150bae7972a6fbb03ffd03f41"; - sha512.doc = "80f8054e0841bc5605faf0abd3b17ddd16919d0228d520af00c4117f884e1105e6b818d6ec92f312b38246f591f0e6743a76ff02ac05a9e93624e8f4bfaa31f4"; - sha512.source = "5d26311844626499997323d15806a31e5144b1dc6f6c18fc5dbab10f898382eff33dc316ac8429a3d76f57867720061cb8594d5c80510b7776dbad8970f0c0da"; + revision = 59705; + sha512.run = "376a1b287955a801cb223c761fc9bee8af0f587f27f8c3e6cb32ef009fa575fdaf54f5e3847d7b4ca414e3eb4d58d3611ee2194736dcfafe8afb2dd6230c1999"; + sha512.doc = "c1165f2ecd08b279cd0d0b028682eecbb3953659426a1885bbe5aab9838a90107c576a3b9bf80b0d54dbe3fc438c8af8a8c82f5faf79052c37d2c5e85ea9ae42"; + sha512.source = "ee53a480230824eb7aa1ff270652eba4f39e5f160fdd091d596b9da610d8c8c211db3aa3d89931ec16edd36b2662d07a93513563efb3bb5a9ffc9dba0d274ee4"; hasRunfiles = true; - version = "20201206.0"; + version = "20210625.0"; }; "cjk-ko" = { - revision = 58081; + revision = 60079; stripPrefix = 0; - sha512.run = "5666ea878afe5ffec519ea1bb732f123a8e1dbe539d1b42919f0d0e73efb26f66850c446bfc3be5aa9e34138611da5701adf43b1f474e590dfe20a6784b3dbbf"; - sha512.doc = "3985b243f47a964dde86cea55ff35bef042fe4f66171188dff03e7bebfe06369604fbad9dc0acf551778bcfffb7fed77250035f28b1f033b5f64e5577960aa44"; + deps."cjk" = tl."cjk"; + sha512.run = "7a41d66a62eac6cd97479da22481c57c85f12f65ffe18995a22ec56a64b03d95aee3e6b3b0d0edcfeab89b3f3d64e95f26b8910905b9085b55c7f371b1b9c1b7"; + sha512.doc = "4d81968baa644ee9966e2498bcb788920b013d0ffbbaf3df8b09b40c6b2b286a5e749d19c11c0f5828432b376f3acc480ea5eb0c8fe8db9ba2413c7077a64b39"; hasRunfiles = true; - version = "1.9"; + version = "2.2"; }; "cjkpunct" = { revision = 41119; @@ -5486,11 +5585,11 @@ tl: { # no indentation version = "4.8.4"; }; "cjkutils" = { - revision = 52851; - sha512.run = "84ae942d24c6a5b6dc8a5ae9a7aed0e1da511e68a2730c26d022d935974869c810600321f4ec1b8c5aeb00d17c6eb360d2735b2ac529bee6aaf85bbf4e44ec2b"; - sha512.doc = "f135a594a95a0d30262a00bbe8279a2d58c6549dba65533b6d1032f99b517b9ff91217ff3ece3768bffdd086e50ce99b56db494aea24dc460c7b077771e97921"; + revision = 60833; + sha512.run = "36b0d0ef4bae2a9e5f2238c5c9aa125eabfca509462b65a159f66cbafc690939e16760a86e7e7dcce22ffda2f301c039059cdff1af8ed862017f18552e13e728"; + sha512.doc = "636e6486f9661061d22d248b0b7a8debdb81cd08c56b449067782568fcc7db58922f7c9d40fbc992bdd008908f22a6733af4a8115d85c0572556d01e925c5587"; hasRunfiles = true; - version = "4.8.4"; + version = "4.8.5"; }; "clara" = { revision = 54512; @@ -5557,6 +5656,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.21.4"; }; +"clicks" = { + revision = 60539; + stripPrefix = 0; + sha512.run = "b7fd97c8d60387f6da26c8d5bcbae3f31a212a6fb7dea4ebe2ca6d6f101432a61fbb462ccf9eb3a0b919e0fe90d1ee47de8c439ccc8d7503ffe2afa5f35962a6"; + sha512.doc = "08418330a9359dce285969996f8ca57d955b2249d398be8064c6f814a3f9bbbae50a661829c8dffd29383d26dd42adf01ab74559ca09fe86f6b77c15b7f2c309"; + hasRunfiles = true; + version = "0.2.0"; +}; "clipboard" = { revision = 47747; stripPrefix = 0; @@ -5573,10 +5680,10 @@ tl: { # no indentation hasRunfiles = true; }; "clojure-pamphlet" = { - revision = 52082; - sha512.run = "a420e5548af550ef91103a82c5bf8e43345abfce69bb438d488ed9a3a62db1e6763ea1c17b246ef307cc62d28b5c575b5da07d5857241e21ce7d789e9a2a055d"; - sha512.doc = "23f6cd97dc5d521689555ec95a695db0f9cae8873d28e2bac2969f07e9e8d2f7ca9a6c8105ca127da202d811717b3c1f4219fe15f9af01036800a083f065cd09"; - sha512.source = "32f90dabd0e73206930f589a97e8630c25ce2f95f1657d08ce71cd36241bafd6c2a79c483805f7574ccab29deb478d1ef8837fdf2e922592e6d8f18f43121a14"; + revision = 60981; + sha512.run = "67047118c74e1d19426d99bd3a716d6076d977156f1e686bbd991d6b1cba464897f662e950c86218910b485300d40a5cb80d8d43868fb7920cc99a6d7f1c5735"; + sha512.doc = "02ab33398a87a47c76fd34df9eccde47b60b028b3a659294968b35beaead85908d958ccd94b8f706f6f2173c9af3d7f7382c510134dabde4bfab9be20f85998d"; + sha512.source = "5848f7ace83c5bbf5017f7a760fdc464e848511717f5fcca5e17f95421429a5608c590fcbc1e7a0d49bb5996def552f16515edfbfa5a2673fef962529141e5a2"; hasRunfiles = true; version = "1.3"; }; @@ -5614,19 +5721,19 @@ tl: { # no indentation hasRunfiles = true; }; "clrstrip" = { - revision = 53537; + revision = 60363; stripPrefix = 0; - sha512.run = "34893bc3758fa010c34523284d73e18d347cc51a46236599c5e6df7bde4ea196da4ae8731b316c13cb9d225d353f1b3ee9bf0357ba9f30e400a9f16783a6bbe5"; - sha512.doc = "8a18217808e2dbe8e6f96fff8c93458c14fa8bc97e6a8d460eb75c051b982bb2f423d46ea5c4b77bb45942896b126b8782bbbe1ab1a0f5fdc4831a5b8435d59d"; - sha512.source = "b5cfa0234c7960718b4d201dc1896c8a92c437cdcd531e8decc783470df2e1a932f923a49ee3434dcf540263c9238374e455a14a0f64e84c41cd3985e1f21084"; + sha512.run = "5a26232ede7efdd9ebb4ca89adaa2f0c507cb4eb883fc59662abca448a9bd09894cf52e850a0f57af101fd22ebf239ef82d4fb4a761b11448b846a82858fee96"; + sha512.doc = "9d52efc5bec01766d81240bc4087d76b08b1a07c1b89c3a197291e7f7b9e1d4e10214ba7640b591cc82c67406c487c39b571ddcc89adbdf377a3e3fb4063b21a"; + sha512.source = "db0be0ba5c5686846abc9eabfffcbe24c1b3f0e62554328c254126f7b0450ad0f066f7b3da20aabd83c80545e3400d0d52b639cc23b55a64e6b5735be79ea21f"; hasRunfiles = true; }; "cluttex" = { - revision = 53698; - sha512.run = "e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d"; - sha512.doc = "d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c"; + revision = 60964; + sha512.run = "35c8ec3711963131bb50fe67ef95705a1d40a6dfd831a33d863bde16f16e66086e204725154d0deaed13e94fdc28dd59497561673542151c1574f7fe87f516f9"; + sha512.doc = "c8e395e087f9ca511db96b96dee3de4a51fdfc9374ddaf40703db0980724000f1987298dc8253d0c5a8d7c97e46cc2a8165b7cad6560fa560213cd5ce85205de"; hasRunfiles = true; - version = "0.5"; + version = "0.5.1"; }; "cm" = { revision = 57963; @@ -5698,10 +5805,10 @@ tl: { # no indentation version = "8.1"; }; "cmcyr" = { - revision = 39273; + revision = 60630; stripPrefix = 0; - sha512.run = "452551d8563b53408a058f847a4a8d3738ac7f0de1da15aea05208c030c67f904b848d71bacca2f6f5ec3e882cdf0be58a4037ed7dea7c7bbd2aeb08776427b9"; - sha512.doc = "748c60e2e54f49bc6afd2867574919003ad6412d721613dacf6f8dc48cb187ca915b1a5e7286a47db7087fe1133c8ceabd998a8c60b91e4d60264b6fc6253190"; + sha512.run = "ecb1662bf6861744fa07126fa9cbcccfc0d53a1a9c1bd6b91a3c5482ccd83ec45b1dc17976d2d6c9cffc1dfb6aeb8ee583d753c427eb367b2c294defda98f519"; + sha512.doc = "8db204fd976f23f99871dde1523ea0d46c2471ffd55f7bc1dd65e6728bd09be609b659f2044e5650d8f4c89c169569b4a4ab5535e975f3bb824a1faddb8a97a4"; hasRunfiles = true; }; "cmdstring" = { @@ -5827,12 +5934,12 @@ tl: { # no indentation version = "0.3"; }; "cochineal" = { - revision = 58717; + revision = 61309; stripPrefix = 0; - sha512.run = "51596bff44f2aeb5720d6723283cd2c7a4c81419b0391af9aeda3231fd429c8bb8a6342278fab7f1cf17ed4cb752a25bd7c55c085671ef205bf9a28c429cfdc9"; - sha512.doc = "930c4bcbcec523c8800f3c52b286197758f7721aa511a7f0617fff68f2e1a86cabc7cc9f8ba2887f64edd0e61fff9c17a05eb615043d0a2de9a56e03e72b5e65"; + sha512.run = "8dad7837aaad184ece6f54ee03b39e1e988693d64b2cb31b370e2577b20a10bb2aa14c8575150ae71c218626f3d3f75be2d9a6af59eacb564860406d4abdeb1e"; + sha512.doc = "76dccdc0895a2f69bde1fec39ccc8ef5af68241c4938e49f69d8647f30539b21cedb58629ce136340f4114b78a0c7b1384d17f1e073332d4f0b077090f4f0656"; hasRunfiles = true; - version = "1.066"; + version = "1.074"; }; "codeanatomy" = { revision = 51627; @@ -5843,6 +5950,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.4-Alpha"; }; +"codebox" = { + revision = 61415; + stripPrefix = 0; + sha512.run = "1d5ac25299755e3fff1adf6e0d06daf87d5f2885ed59f65374c97a89f3060f83353fe53eef5cd9c73c680b817d8cb8b4cab090d702e0e98875f8fb5565c508b3"; + sha512.doc = "335ecc7cb568e2f06be995148a1da0e979e3fb07e294c734ec7298b9d4ca70eb270a5bcb01dadffc3bd33cde298bf44ca33009caacfc66df8a7a1edbd9ae7d8d"; + hasRunfiles = true; + version = "1.0.0"; +}; "codedoc" = { revision = 17630; stripPrefix = 0; @@ -5851,6 +5966,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.3"; }; +"codehigh" = { + revision = 59173; + stripPrefix = 0; + sha512.run = "715c81105caba420b192d9223fb4be038e11a2a434dd73c033280ce9908de91659b41faea92299eb656b7d3974ad7f29393591bff8c87945d6ffb1d9199dad0f"; + sha512.doc = "147abe790b005630f48f84f589453e526f2b92b81ae311eb29a2be3304cb97c546b35a311b55a45a51e5d7b184469ace286cbdd90b20a6034335fb60dd436e75"; + hasRunfiles = true; + version = "2021C"; +}; "codepage" = { revision = 51502; stripPrefix = 0; @@ -5885,6 +6008,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.005"; }; +"coffeestains" = { + revision = 59703; + stripPrefix = 0; + sha512.run = "7a8213810b8bb30c0b863ce996aab92a9031dd9961513d25822904c6e71dd2fa1b79f050f1840e8d88e8f8e8e87c7736369f3fa7a6873cbaa57fb8dca7c71d47"; + sha512.doc = "fab8a2aeae8dd1c6f0f501d894f90d5b6f7785bf8b3fcf86837f4bc41da8002427c69094676870ea7dfe9186b3bb92433f5c66f0cedd08f57954487db8bb162b"; + hasRunfiles = true; + version = "0.5.1"; +}; "collcell" = { revision = 56291; stripPrefix = 0; @@ -5904,7 +6035,7 @@ tl: { # no indentation version = "0.4b"; }; "collection-basic" = { - revision = 56569; + revision = 59159; stripPrefix = 0; deps."amsfonts" = tl."amsfonts"; deps."bibtex" = tl."bibtex"; @@ -5939,17 +6070,16 @@ tl: { # no indentation deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."texlive-common" = tl."texlive-common"; - deps."texlive-docindex" = tl."texlive-docindex"; deps."texlive-en" = tl."texlive-en"; deps."texlive-msg-translations" = tl."texlive-msg-translations"; deps."texlive-scripts" = tl."texlive-scripts"; deps."tlshell" = tl."tlshell"; deps."unicode-data" = tl."unicode-data"; deps."xdvi" = tl."xdvi"; - sha512.run = "39ff4680cb002b6e29dac2fd5005d0d63b279deab21f025a87a7e860110a7eba04748adc11c9bf12f580cfc991380d2f301819801c32f681353c43053f98af48"; + sha512.run = "4241bc3a3ef21502faa9a2e0b16295126c357fc15813a625306552b40f9da804164abccce642f4ec1e677092f81d61381958b87fcf515120a12f9b7a19055370"; }; "collection-bibtexextra" = { - revision = 58437; + revision = 61166; stripPrefix = 0; deps."aaai-named" = tl."aaai-named"; deps."aichej" = tl."aichej"; @@ -5957,6 +6087,7 @@ tl: { # no indentation deps."amsrefs" = tl."amsrefs"; deps."annotate" = tl."annotate"; deps."apacite" = tl."apacite"; + deps."apalike-ejor" = tl."apalike-ejor"; deps."apalike2" = tl."apalike2"; deps."archaeologie" = tl."archaeologie"; deps."authordate" = tl."authordate"; @@ -5984,6 +6115,7 @@ tl: { # no indentation deps."biblatex-chem" = tl."biblatex-chem"; deps."biblatex-chicago" = tl."biblatex-chicago"; deps."biblatex-claves" = tl."biblatex-claves"; + deps."biblatex-cv" = tl."biblatex-cv"; deps."biblatex-dw" = tl."biblatex-dw"; deps."biblatex-enc" = tl."biblatex-enc"; deps."biblatex-ext" = tl."biblatex-ext"; @@ -5998,6 +6130,7 @@ tl: { # no indentation deps."biblatex-jura2" = tl."biblatex-jura2"; deps."biblatex-juradiss" = tl."biblatex-juradiss"; deps."biblatex-license" = tl."biblatex-license"; + deps."biblatex-lncs" = tl."biblatex-lncs"; deps."biblatex-lni" = tl."biblatex-lni"; deps."biblatex-luh-ipw" = tl."biblatex-luh-ipw"; deps."biblatex-manuscripts-philology" = tl."biblatex-manuscripts-philology"; @@ -6020,6 +6153,7 @@ tl: { # no indentation deps."biblatex-socialscienceshuberlin" = tl."biblatex-socialscienceshuberlin"; deps."biblatex-software" = tl."biblatex-software"; deps."biblatex-source-division" = tl."biblatex-source-division"; + deps."biblatex-spbasic" = tl."biblatex-spbasic"; deps."biblatex-subseries" = tl."biblatex-subseries"; deps."biblatex-swiss-legal" = tl."biblatex-swiss-legal"; deps."biblatex-trad" = tl."biblatex-trad"; @@ -6063,6 +6197,7 @@ tl: { # no indentation deps."geschichtsfrkl" = tl."geschichtsfrkl"; deps."harvard" = tl."harvard"; deps."harvmac" = tl."harvmac"; + deps."hep-bibliography" = tl."hep-bibliography"; deps."historische-zeitschrift" = tl."historische-zeitschrift"; deps."icite" = tl."icite"; deps."ietfbibs" = tl."ietfbibs"; @@ -6084,6 +6219,7 @@ tl: { # no indentation deps."multibibliography" = tl."multibibliography"; deps."munich" = tl."munich"; deps."nar" = tl."nar"; + deps."newcastle-bst" = tl."newcastle-bst"; deps."nmbib" = tl."nmbib"; deps."notes2bib" = tl."notes2bib"; deps."notex-bst" = tl."notex-bst"; @@ -6104,10 +6240,10 @@ tl: { # no indentation deps."windycity" = tl."windycity"; deps."xcite" = tl."xcite"; deps."zootaxa-bst" = tl."zootaxa-bst"; - sha512.run = "0a0b978dcb21f9c26e0931c14b7faf7b0d8b5e1229d4180127c6b53899e001620246f2c0a7b0f6f1dc81639aee94701a637ac7af4ab20f144b661686c7d321a3"; + sha512.run = "4a1af72d2fe5b01c48edef29cfda816dfeb9b5f7b247080bd93a590b7829e17863698b1a5e3c714837da6190072cfc5cac8927528c6c80923c422ea06a4151e4"; }; "collection-binextra" = { - revision = 56352; + revision = 61328; stripPrefix = 0; deps."a2ping" = tl."a2ping"; deps."adhocfilelist" = tl."adhocfilelist"; @@ -6169,6 +6305,7 @@ tl: { # no indentation deps."match_parens" = tl."match_parens"; deps."mflua" = tl."mflua"; deps."mkjobtexmf" = tl."mkjobtexmf"; + deps."optexcount" = tl."optexcount"; deps."patgen" = tl."patgen"; deps."pdfbook2" = tl."pdfbook2"; deps."pdfcrop" = tl."pdfcrop"; @@ -6198,6 +6335,7 @@ tl: { # no indentation deps."texlive-scripts-extra" = tl."texlive-scripts-extra"; deps."texliveonfly" = tl."texliveonfly"; deps."texloganalyser" = tl."texloganalyser"; + deps."texlogsieve" = tl."texlogsieve"; deps."texosquery" = tl."texosquery"; deps."texplate" = tl."texplate"; deps."texware" = tl."texware"; @@ -6209,7 +6347,7 @@ tl: { # no indentation deps."xindex" = tl."xindex"; deps."xindy" = tl."xindy"; deps."xpdfopen" = tl."xpdfopen"; - sha512.run = "6c6b6344f7d294bf74f3601850f036543ae6f8dc78bf01e32867d46d7c20089a388f779c445173c5d54e874278e718b697691eb94a5a2029ef64acdb914461ae"; + sha512.run = "2c43f846d80779eec53041c31be14285a361f5f7087f2f33856084875f1b3f941bfa6a9968731d53e28aeb4a1f0a2777b8d8a9a8a7fea2eea28f22f474b60664"; }; "collection-context" = { revision = 54074; @@ -6255,9 +6393,9 @@ tl: { # no indentation sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765"; }; "collection-fontsextra" = { - revision = 58253; + revision = 61165; stripPrefix = 0; - deps."Asana-Math" = tl."Asana-Math"; + deps."aboensis" = tl."aboensis"; deps."academicons" = tl."academicons"; deps."accanthis" = tl."accanthis"; deps."adforn" = tl."adforn"; @@ -6277,6 +6415,7 @@ tl: { # no indentation deps."arev" = tl."arev"; deps."arimo" = tl."arimo"; deps."arvo" = tl."arvo"; + deps."asana-math" = tl."asana-math"; deps."asapsym" = tl."asapsym"; deps."ascii-font" = tl."ascii-font"; deps."aspectratio" = tl."aspectratio"; @@ -6295,6 +6434,7 @@ tl: { # no indentation deps."bbm-macros" = tl."bbm-macros"; deps."bbold" = tl."bbold"; deps."bbold-type1" = tl."bbold-type1"; + deps."bboldx" = tl."bboldx"; deps."belleek" = tl."belleek"; deps."bera" = tl."bera"; deps."berenisadf" = tl."berenisadf"; @@ -6431,6 +6571,8 @@ tl: { # no indentation deps."gudea" = tl."gudea"; deps."hacm" = tl."hacm"; deps."hands" = tl."hands"; + deps."hep-font" = tl."hep-font"; + deps."hep-math-font" = tl."hep-math-font"; deps."heuristica" = tl."heuristica"; deps."hfbright" = tl."hfbright"; deps."hfoldsty" = tl."hfoldsty"; @@ -6588,7 +6730,7 @@ tl: { # no indentation deps."yfonts-t1" = tl."yfonts-t1"; deps."yinit-otf" = tl."yinit-otf"; deps."zlmtt" = tl."zlmtt"; - sha512.run = "27d3200f8bab180da6c0ce7b6fc9773950fa0755d8f7ae3b43b76eeaa7f960a99ab1941793bb50e3d7eaf0b2b3fe0bd6b5261ba9ed645d839cf8a3075b2aaa2a"; + sha512.run = "e539f0113027096949bb29bcf4d05d6baea025203689ad9031df999357b72aaff2caf655bb694f759ab88f24fc76446f58932c351daab6dd66199fae564588c2"; }; "collection-fontsrecommended" = { revision = 54074; @@ -6630,7 +6772,7 @@ tl: { # no indentation sha512.run = "eaa6e54780a0813a88102258ee3bd7a4640787be0b89eff4ba2c9cc19298bf3e2799ffab4e03e49f20131d07fbac9f601a7223fc1b47257dd0feeb04797c56a8"; }; "collection-fontutils" = { - revision = 57089; + revision = 61207; stripPrefix = 0; deps."accfonts" = tl."accfonts"; deps."afm2pl" = tl."afm2pl"; @@ -6643,6 +6785,7 @@ tl: { # no indentation deps."fontools" = tl."fontools"; deps."fontware" = tl."fontware"; deps."lcdftypetools" = tl."lcdftypetools"; + deps."luafindfont" = tl."luafindfont"; deps."metatype1" = tl."metatype1"; deps."mf2pt1" = tl."mf2pt1"; deps."ps2eps" = tl."ps2eps"; @@ -6650,7 +6793,7 @@ tl: { # no indentation deps."psutils" = tl."psutils"; deps."t1utils" = tl."t1utils"; deps."ttfutils" = tl."ttfutils"; - sha512.run = "9bc0964c2ce55e4bcab2b2ad0ae1c784a49ffc981620ef3cd549052a5e2b201325ddc444d9afbe57da6dc64d1890d61be5e97caa2c9c63ebbafc5f5d0322acae"; + sha512.run = "430c95b7e104cb837b7424ebb17ab7ee1aefd99d70aaceefff8a1924fa949329aebe0d5a28b939fabf28d3c5dfc2dcb466147e1396514d5dcf4f64af231db8a7"; }; "collection-formatsextra" = { revision = 54074; @@ -6678,7 +6821,7 @@ tl: { # no indentation sha512.run = "7700a6cc293a1d45208794db34a276d5de5c975fe91cb00e5b1896515f288b05437344f00997501a54ad2af515bccc983930a75ddda55c6951edc625cd6bda35"; }; "collection-games" = { - revision = 56623; + revision = 60276; stripPrefix = 0; deps."bartel-chess-fonts" = tl."bartel-chess-fonts"; deps."chess" = tl."chess"; @@ -6690,6 +6833,7 @@ tl: { # no indentation deps."crosswrd" = tl."crosswrd"; deps."egameps" = tl."egameps"; deps."gamebook" = tl."gamebook"; + deps."gamebooklib" = tl."gamebooklib"; deps."go" = tl."go"; deps."hanoi" = tl."hanoi"; deps."havannah" = tl."havannah"; @@ -6699,6 +6843,7 @@ tl: { # no indentation deps."jigsaw" = tl."jigsaw"; deps."labyrinth" = tl."labyrinth"; deps."logicpuzzle" = tl."logicpuzzle"; + deps."mahjong" = tl."mahjong"; deps."musikui" = tl."musikui"; deps."nimsticks" = tl."nimsticks"; deps."onedown" = tl."onedown"; @@ -6718,7 +6863,7 @@ tl: { # no indentation deps."sudokubundle" = tl."sudokubundle"; deps."xq" = tl."xq"; deps."xskak" = tl."xskak"; - sha512.run = "654787f158be7c9d7b019fb7091b8c9f7d4319262fc21f5e324c52e7484b4bcec3a6f211a60a2b13abfe964e09f7eb69b94ab8ef8a3a598fd50dcb587e3ca813"; + sha512.run = "18d6ed96d053855a6aaad235f953a77bff3717aefdbdaef7782aa9144255ce26be628accf440b2b4c5d2887b74abeebd47923c494bb8a844e1a3adf0312a0cdd"; }; "collection-humanities" = { revision = 56575; @@ -6779,13 +6924,14 @@ tl: { # no indentation sha512.run = "8239a85051576d691f7a367b2858dbc191e0545d88e0f193107cf68ccc527c7f4980a6a18cd14bf7735277ea2552955d7be50520290a96a24ff3bc856a13742e"; }; "collection-langarabic" = { - revision = 56215; + revision = 59594; stripPrefix = 0; deps."alkalami" = tl."alkalami"; deps."alpha-persian" = tl."alpha-persian"; deps."amiri" = tl."amiri"; deps."arabi" = tl."arabi"; deps."arabi-add" = tl."arabi-add"; + deps."arabic-book" = tl."arabic-book"; deps."arabluatex" = tl."arabluatex"; deps."arabtex" = tl."arabtex"; deps."bidi" = tl."bidi"; @@ -6809,10 +6955,11 @@ tl: { # no indentation deps."tram" = tl."tram"; deps."xepersian" = tl."xepersian"; deps."xepersian-hm" = tl."xepersian-hm"; - sha512.run = "3c9a530b444eb34dd9c5a1a0b49e662edda54868820633e281c0501146a59b0d0671a61ac6407049913640320d28d4c6e2afbf6907b152176de55d865da5fafb"; + deps."xindy-persian" = tl."xindy-persian"; + sha512.run = "3fdcf41fafd94373254281f3f7ee9f2a2e136cfa1adc1dd38e4b5cd6f90d0364e6a20d3284fcf255f245158352421e28cfb794c673b8b96399a20343ed991fc2"; }; "collection-langchinese" = { - revision = 56196; + revision = 60575; stripPrefix = 0; deps."arphic" = tl."arphic"; deps."arphic-ttf" = tl."arphic-ttf"; @@ -6825,6 +6972,7 @@ tl: { # no indentation deps."ctex-faq" = tl."ctex-faq"; deps."fandol" = tl."fandol"; deps."fduthesis" = tl."fduthesis"; + deps."hanzibox" = tl."hanzibox"; deps."hyphen-chinese" = tl."hyphen-chinese"; deps."impatient-cn" = tl."impatient-cn"; deps."install-latex-guide-zh-cn" = tl."install-latex-guide-zh-cn"; @@ -6836,6 +6984,7 @@ tl: { # no indentation deps."qyxf-book" = tl."qyxf-book"; deps."texlive-zh-cn" = tl."texlive-zh-cn"; deps."texproposal" = tl."texproposal"; + deps."tlmgr-intro-zh-cn" = tl."tlmgr-intro-zh-cn"; deps."upzhkinsoku" = tl."upzhkinsoku"; deps."xpinyin" = tl."xpinyin"; deps."xtuthesis" = tl."xtuthesis"; @@ -6845,10 +6994,10 @@ tl: { # no indentation deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; deps."zhnumber" = tl."zhnumber"; deps."zhspacing" = tl."zhspacing"; - sha512.run = "a3d86f05a7ed20b18321709e4fde225977c37f409aa701467c9c0a13008957755befc873bd1aacf2db7dd8eea1e43e0c610864ddc1acfc5a0eff8e51444aa4fb"; + sha512.run = "37c2d9098d0436881a60f5b23506cd973902b6cfd61e21d2d60841b41a939290fe4b03c660ceb0b9698b5be9bb0603e819800a6b1cc80afa2ac63f21e8996dc6"; }; "collection-langcjk" = { - revision = 54191; + revision = 60595; stripPrefix = 0; deps."adobemapping" = tl."adobemapping"; deps."c90" = tl."c90"; @@ -6864,8 +7013,9 @@ tl: { # no indentation deps."norasi-c90" = tl."norasi-c90"; deps."pxtatescale" = tl."pxtatescale"; deps."xcjk2uni" = tl."xcjk2uni"; + deps."zitie" = tl."zitie"; deps."zxjafont" = tl."zxjafont"; - sha512.run = "d6186e42081f4a1c2e15cf196de053108e7f8e046bab631e122b3d44ad8217bf83aeaf915c4fda7ebcb1d4be2a8f6dd1fa7027ed8624d31f16257ab8357d4a0b"; + sha512.run = "c8ac36a28cf38e9cab5069a396777821a07ad58bb9b00eeebd8520971933ae57a53ddac267805196687993ac0403f68d1236ffe6de9321c2c0a3c659a1659ffa"; }; "collection-langcyrillic" = { revision = 54074; @@ -6941,10 +7091,8 @@ tl: { # no indentation sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67"; }; "collection-langenglish" = { - revision = 58290; + revision = 60687; stripPrefix = 0; - deps."MemoirChapStyles" = tl."MemoirChapStyles"; - deps."Type1fonts" = tl."Type1fonts"; deps."amiweb2c-guide" = tl."amiweb2c-guide"; deps."amscls-doc" = tl."amscls-doc"; deps."amslatex-primer" = tl."amslatex-primer"; @@ -6958,6 +7106,7 @@ tl: { # no indentation deps."docsurvey" = tl."docsurvey"; deps."dtxtut" = tl."dtxtut"; deps."first-latex-doc" = tl."first-latex-doc"; + deps."fontinstallationguide" = tl."fontinstallationguide"; deps."forest-quickstart" = tl."forest-quickstart"; deps."gentle" = tl."gentle"; deps."guide-to-latex" = tl."guide-to-latex"; @@ -6985,6 +7134,7 @@ tl: { # no indentation deps."math-into-latex-4" = tl."math-into-latex-4"; deps."maths-symbols" = tl."maths-symbols"; deps."memdesign" = tl."memdesign"; + deps."memoirchapterstyles" = tl."memoirchapterstyles"; deps."metafont-beginners" = tl."metafont-beginners"; deps."metapost-examples" = tl."metapost-examples"; deps."patgen2-tutorial" = tl."patgen2-tutorial"; @@ -7000,6 +7150,7 @@ tl: { # no indentation deps."tex-nutshell" = tl."tex-nutshell"; deps."tex-overview" = tl."tex-overview"; deps."tex-refs" = tl."tex-refs"; + deps."tex-vpat" = tl."tex-vpat"; deps."texbytopic" = tl."texbytopic"; deps."texonly" = tl."texonly"; deps."titlepages" = tl."titlepages"; @@ -7009,7 +7160,7 @@ tl: { # no indentation deps."visualfaq" = tl."visualfaq"; deps."webguide" = tl."webguide"; deps."xetexref" = tl."xetexref"; - sha512.run = "6d8bd7a5722a0720003c831c38ddc66c4af4fdc465c676050d71fb2bfec9c66791044b8d7c62399953ec4017c1935062ccbffd4c66028df79c9dd59fe42073b3"; + sha512.run = "b5d9f13c65fb79f647204e5dadb7cbf9c72cfa8408a92fec25423400ec238e823a851b7a83f24c2482cfcd58e81ff92c9bd6f352c2a09b65181c6e85135fe52a"; }; "collection-langeuropean" = { revision = 58626; @@ -7084,7 +7235,7 @@ tl: { # no indentation sha512.run = "a1fe7a0531b3a0581591988c62cba7c3032bab5ed8291edbff2c8573adae0ce96ea9087c7f4b018ad0ae341070a826501fb6a92d768ae939a632bae41c0d84f4"; }; "collection-langfrench" = { - revision = 57491; + revision = 60273; stripPrefix = 0; deps."aeguill" = tl."aeguill"; deps."annee-scolaire" = tl."annee-scolaire"; @@ -7125,8 +7276,9 @@ tl: { # no indentation deps."translation-natbib-fr" = tl."translation-natbib-fr"; deps."translation-tabbing-fr" = tl."translation-tabbing-fr"; deps."variations" = tl."variations"; + deps."visualfaq-fr" = tl."visualfaq-fr"; deps."visualtikz" = tl."visualtikz"; - sha512.run = "da9bc3d0e81b2848a4517aecefd8dbdf98b04f46b3a9631c3d7f07256a9454db59e9f80379fbb07827b3c178f671b21b087a0e2fd780e1e10611cbc8ddfbad3c"; + sha512.run = "1c2f420219068bafd0ef9050514b070e932de1e818666409f87985b92fbaee75e54e84b117c28982fbd0fc9791267d8e7d494386393935944722975d6f652642"; }; "collection-langgerman" = { revision = 55706; @@ -7313,7 +7465,7 @@ tl: { # no indentation sha512.run = "2d93df728d34137c8f9a884aa2871a2980e806672006f2c5f0c5f79412d5789c6f94958363cfc9a78b5a97a7d76bbb6cb157b2cb2a8a283f7afdfd838fa24883"; }; "collection-langother" = { - revision = 57757; + revision = 59564; stripPrefix = 0; deps."aalok" = tl."aalok"; deps."akshar" = tl."akshar"; @@ -7329,6 +7481,7 @@ tl: { # no indentation deps."babel-sorbian" = tl."babel-sorbian"; deps."babel-thai" = tl."babel-thai"; deps."babel-vietnamese" = tl."babel-vietnamese"; + deps."bangla" = tl."bangla"; deps."bangtex" = tl."bangtex"; deps."bengali" = tl."bengali"; deps."burmese" = tl."burmese"; @@ -7374,7 +7527,7 @@ tl: { # no indentation deps."wnri" = tl."wnri"; deps."wnri-latex" = tl."wnri-latex"; deps."xetex-devanagari" = tl."xetex-devanagari"; - sha512.run = "0594347c16da942376cecee568ca57700245e744b84eeec39b5381025743de24f4954005fe5778dca3f0c44a5e2cd918eaf5f38db1c8771e5850a395e3040f7c"; + sha512.run = "3db7709c3545df3713dc0a7df73f676f9f34df5fdc157c6a2d6a124a5bbd14f6f5f1f2938092e76be19417f9dd5ff4f84513c84beddafbe5c9747abd7fa597c0"; }; "collection-langpolish" = { revision = 54074; @@ -7498,13 +7651,9 @@ tl: { # no indentation sha512.run = "0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35a0e5c77fbe41bbb6fa33610321f2620624264d99675e2f88e72f9d156693143a7e"; }; "collection-latexextra" = { - revision = 58777; + revision = 61415; stripPrefix = 0; deps."2up" = tl."2up"; - deps."ESIEEcv" = tl."ESIEEcv"; - deps."GS1" = tl."GS1"; - deps."HA-prosper" = tl."HA-prosper"; - deps."Tabbing" = tl."Tabbing"; deps."a0poster" = tl."a0poster"; deps."a4wide" = tl."a4wide"; deps."a5comb" = tl."a5comb"; @@ -7529,6 +7678,7 @@ tl: { # no indentation deps."alertmessage" = tl."alertmessage"; deps."alnumsec" = tl."alnumsec"; deps."alphalph" = tl."alphalph"; + deps."alterqcm" = tl."alterqcm"; deps."altfont" = tl."altfont"; deps."amsaddr" = tl."amsaddr"; deps."animate" = tl."animate"; @@ -7558,6 +7708,7 @@ tl: { # no indentation deps."autofancyhdr" = tl."autofancyhdr"; deps."autonum" = tl."autonum"; deps."autopdf" = tl."autopdf"; + deps."autopuncitems" = tl."autopuncitems"; deps."avremu" = tl."avremu"; deps."axessibility" = tl."axessibility"; deps."background" = tl."background"; @@ -7584,6 +7735,8 @@ tl: { # no indentation deps."beamertheme-phnompenh" = tl."beamertheme-phnompenh"; deps."beamertheme-pure-minimalistic" = tl."beamertheme-pure-minimalistic"; deps."beamertheme-saintpetersburg" = tl."beamertheme-saintpetersburg"; + deps."beamertheme-simpledarkblue" = tl."beamertheme-simpledarkblue"; + deps."beamertheme-trigon" = tl."beamertheme-trigon"; deps."beamertheme-upenn-bc" = tl."beamertheme-upenn-bc"; deps."beamerthemejltree" = tl."beamerthemejltree"; deps."beamerthemelalic" = tl."beamerthemelalic"; @@ -7598,6 +7751,7 @@ tl: { # no indentation deps."bibletext" = tl."bibletext"; deps."bigfoot" = tl."bigfoot"; deps."bigints" = tl."bigints"; + deps."bilingualpages" = tl."bilingualpages"; deps."biochemistry-colors" = tl."biochemistry-colors"; deps."bithesis" = tl."bithesis"; deps."bizcard" = tl."bizcard"; @@ -7652,6 +7806,7 @@ tl: { # no indentation deps."cclicenses" = tl."cclicenses"; deps."cd" = tl."cd"; deps."cd-cover" = tl."cd-cover"; + deps."cdcmd" = tl."cdcmd"; deps."cdpbundl" = tl."cdpbundl"; deps."cellprops" = tl."cellprops"; deps."cellspace" = tl."cellspace"; @@ -7680,6 +7835,7 @@ tl: { # no indentation deps."classpack" = tl."classpack"; deps."clefval" = tl."clefval"; deps."cleveref" = tl."cleveref"; + deps."clicks" = tl."clicks"; deps."clipboard" = tl."clipboard"; deps."clock" = tl."clock"; deps."clrdblpg" = tl."clrdblpg"; @@ -7690,7 +7846,9 @@ tl: { # no indentation deps."cnltx" = tl."cnltx"; deps."cntformats" = tl."cntformats"; deps."cntperchap" = tl."cntperchap"; + deps."codebox" = tl."codebox"; deps."codedoc" = tl."codedoc"; + deps."codehigh" = tl."codehigh"; deps."codepage" = tl."codepage"; deps."codesection" = tl."codesection"; deps."collcell" = tl."collcell"; @@ -7740,8 +7898,10 @@ tl: { # no indentation deps."coverpage" = tl."coverpage"; deps."cprotect" = tl."cprotect"; deps."crbox" = tl."crbox"; + deps."crefthe" = tl."crefthe"; deps."crossreference" = tl."crossreference"; deps."crossreftools" = tl."crossreftools"; + deps."crumbs" = tl."crumbs"; deps."csquotes" = tl."csquotes"; deps."css-colors" = tl."css-colors"; deps."csvmerge" = tl."csvmerge"; @@ -7764,6 +7924,7 @@ tl: { # no indentation deps."datax" = tl."datax"; deps."dateiliste" = tl."dateiliste"; deps."datenumber" = tl."datenumber"; + deps."datestamp" = tl."datestamp"; deps."datetime" = tl."datetime"; deps."datetime2" = tl."datetime2"; deps."datetime2-bahasai" = tl."datetime2-bahasai"; @@ -7809,6 +7970,7 @@ tl: { # no indentation deps."datetime2-usorbian" = tl."datetime2-usorbian"; deps."datetime2-welsh" = tl."datetime2-welsh"; deps."dblfloatfix" = tl."dblfloatfix"; + deps."debate" = tl."debate"; deps."decimal" = tl."decimal"; deps."decorule" = tl."decorule"; deps."delimtxt" = tl."delimtxt"; @@ -7911,11 +8073,13 @@ tl: { # no indentation deps."erw-l3" = tl."erw-l3"; deps."esami" = tl."esami"; deps."esdiff" = tl."esdiff"; + deps."esieecv" = tl."esieecv"; deps."esindex" = tl."esindex"; deps."esint" = tl."esint"; deps."esint-type1" = tl."esint-type1"; deps."etaremune" = tl."etaremune"; deps."etextools" = tl."etextools"; + deps."etl" = tl."etl"; deps."etoc" = tl."etoc"; deps."eukdate" = tl."eukdate"; deps."eulerpx" = tl."eulerpx"; @@ -7956,9 +8120,9 @@ tl: { # no indentation deps."fcolumn" = tl."fcolumn"; deps."fetchcls" = tl."fetchcls"; deps."fewerfloatpages" = tl."fewerfloatpages"; + deps."ffcode" = tl."ffcode"; deps."ffslides" = tl."ffslides"; deps."fgruler" = tl."fgruler"; - deps."fibeamer" = tl."fibeamer"; deps."fifo-stack" = tl."fifo-stack"; deps."figsize" = tl."figsize"; deps."filecontents" = tl."filecontents"; @@ -7994,6 +8158,7 @@ tl: { # no indentation deps."fnpct" = tl."fnpct"; deps."fnumprint" = tl."fnumprint"; deps."foilhtml" = tl."foilhtml"; + deps."foliono" = tl."foliono"; deps."fontaxes" = tl."fontaxes"; deps."fontsetup" = tl."fontsetup"; deps."fontsize" = tl."fontsize"; @@ -8068,6 +8233,7 @@ tl: { # no indentation deps."gmverb" = tl."gmverb"; deps."grabbox" = tl."grabbox"; deps."graphbox" = tl."graphbox"; + deps."graphicscache" = tl."graphicscache"; deps."graphicx-psmin" = tl."graphicx-psmin"; deps."graphicxbox" = tl."graphicxbox"; deps."graphpaper" = tl."graphpaper"; @@ -8078,11 +8244,14 @@ tl: { # no indentation deps."gridpapers" = tl."gridpapers"; deps."gridset" = tl."gridset"; deps."gridslides" = tl."gridslides"; + deps."gs1" = tl."gs1"; deps."guitlogo" = tl."guitlogo"; + deps."ha-prosper" = tl."ha-prosper"; deps."hackthefootline" = tl."hackthefootline"; deps."halloweenmath" = tl."halloweenmath"; deps."handin" = tl."handin"; deps."handout" = tl."handout"; + deps."handoutwithnotes" = tl."handoutwithnotes"; deps."hang" = tl."hang"; deps."hanging" = tl."hanging"; deps."hardwrap" = tl."hardwrap"; @@ -8090,6 +8259,11 @@ tl: { # no indentation deps."harpoon" = tl."harpoon"; deps."hc" = tl."hc"; deps."he-she" = tl."he-she"; + deps."hep-acronym" = tl."hep-acronym"; + deps."hep-float" = tl."hep-float"; + deps."hep-math" = tl."hep-math"; + deps."hep-text" = tl."hep-text"; + deps."hep-title" = tl."hep-title"; deps."hhtensor" = tl."hhtensor"; deps."highlightlatex" = tl."highlightlatex"; deps."histogr" = tl."histogr"; @@ -8098,10 +8272,14 @@ tl: { # no indentation deps."hletter" = tl."hletter"; deps."hobsub" = tl."hobsub"; deps."hpsdiss" = tl."hpsdiss"; + deps."href-ul" = tl."href-ul"; deps."hrefhide" = tl."hrefhide"; + deps."huawei" = tl."huawei"; deps."hvindex" = tl."hvindex"; + deps."hvlogos" = tl."hvlogos"; deps."hvqrurl" = tl."hvqrurl"; deps."hypdestopt" = tl."hypdestopt"; + deps."hypdoc" = tl."hypdoc"; deps."hypdvips" = tl."hypdvips"; deps."hyper" = tl."hyper"; deps."hyperbar" = tl."hyperbar"; @@ -8111,6 +8289,8 @@ tl: { # no indentation deps."identkey" = tl."identkey"; deps."idxcmds" = tl."idxcmds"; deps."idxlayout" = tl."idxlayout"; + deps."iexec" = tl."iexec"; + deps."ifallfalse" = tl."ifallfalse"; deps."iffont" = tl."iffont"; deps."ifmslide" = tl."ifmslide"; deps."ifmtarg" = tl."ifmtarg"; @@ -8154,6 +8334,7 @@ tl: { # no indentation deps."keycommand" = tl."keycommand"; deps."keyfloat" = tl."keyfloat"; deps."keyindex" = tl."keyindex"; + deps."keyparse" = tl."keyparse"; deps."keyreader" = tl."keyreader"; deps."keystroke" = tl."keystroke"; deps."keyval2e" = tl."keyval2e"; @@ -8170,6 +8351,7 @@ tl: { # no indentation deps."labels" = tl."labels"; deps."labels4easylist" = tl."labels4easylist"; deps."labelschanged" = tl."labelschanged"; + deps."lambdax" = tl."lambdax"; deps."lastpackage" = tl."lastpackage"; deps."lastpage" = tl."lastpage"; deps."latex-amsmath-dev" = tl."latex-amsmath-dev"; @@ -8235,6 +8417,7 @@ tl: { # no indentation deps."lua-check-hyphen" = tl."lua-check-hyphen"; deps."lua-physical" = tl."lua-physical"; deps."luatodonotes" = tl."luatodonotes"; + deps."macrolist" = tl."macrolist"; deps."macroswap" = tl."macroswap"; deps."magaz" = tl."magaz"; deps."magicnum" = tl."magicnum"; @@ -8249,6 +8432,7 @@ tl: { # no indentation deps."makecookbook" = tl."makecookbook"; deps."makedtx" = tl."makedtx"; deps."makeglos" = tl."makeglos"; + deps."makelabels" = tl."makelabels"; deps."makerobust" = tl."makerobust"; deps."mandi" = tl."mandi"; deps."manfnt" = tl."manfnt"; @@ -8361,6 +8545,7 @@ tl: { # no indentation deps."niceframe" = tl."niceframe"; deps."nicetext" = tl."nicetext"; deps."nidanfloat" = tl."nidanfloat"; + deps."ninecolors" = tl."ninecolors"; deps."nlctdoc" = tl."nlctdoc"; deps."noconflict" = tl."noconflict"; deps."noindentafter" = tl."noindentafter"; @@ -8408,6 +8593,7 @@ tl: { # no indentation deps."pagenote" = tl."pagenote"; deps."pagerange" = tl."pagerange"; deps."pageslts" = tl."pageslts"; + deps."palette" = tl."palette"; deps."paper" = tl."paper"; deps."papercdcase" = tl."papercdcase"; deps."papermas" = tl."papermas"; @@ -8450,6 +8636,9 @@ tl: { # no indentation deps."perltex" = tl."perltex"; deps."permute" = tl."permute"; deps."petiteannonce" = tl."petiteannonce"; + deps."pgfmath-xfp" = tl."pgfmath-xfp"; + deps."phfcc" = tl."phfcc"; + deps."phfextendedabstract" = tl."phfextendedabstract"; deps."phffullpagefigure" = tl."phffullpagefigure"; deps."phfnote" = tl."phfnote"; deps."phfparen" = tl."phfparen"; @@ -8486,6 +8675,7 @@ tl: { # no indentation deps."program" = tl."program"; deps."progress" = tl."progress"; deps."progressbar" = tl."progressbar"; + deps."projlib" = tl."projlib"; deps."proofread" = tl."proofread"; deps."properties" = tl."properties"; deps."prosper" = tl."prosper"; @@ -8562,6 +8752,7 @@ tl: { # no indentation deps."schedule" = tl."schedule"; deps."schooldocs" = tl."schooldocs"; deps."scontents" = tl."scontents"; + deps."scrambledenvs" = tl."scrambledenvs"; deps."scrlayer-fancyhdr" = tl."scrlayer-fancyhdr"; deps."scrlttr2copy" = tl."scrlttr2copy"; deps."sdaps" = tl."sdaps"; @@ -8617,9 +8808,11 @@ tl: { # no indentation deps."skrapport" = tl."skrapport"; deps."slantsc" = tl."slantsc"; deps."smalltableof" = tl."smalltableof"; + deps."smart-eqn" = tl."smart-eqn"; deps."smartref" = tl."smartref"; deps."smartunits" = tl."smartunits"; deps."snapshot" = tl."snapshot"; + deps."snaptodo" = tl."snaptodo"; deps."snotez" = tl."snotez"; deps."soulpos" = tl."soulpos"; deps."soulutf8" = tl."soulutf8"; @@ -8649,6 +8842,7 @@ tl: { # no indentation deps."sttools" = tl."sttools"; deps."stubs" = tl."stubs"; deps."studenthandouts" = tl."studenthandouts"; + deps."styledcmd" = tl."styledcmd"; deps."subdepth" = tl."subdepth"; deps."subdocs" = tl."subdocs"; deps."subeqn" = tl."subeqn"; @@ -8671,6 +8865,7 @@ tl: { # no indentation deps."syntax" = tl."syntax"; deps."syntrace" = tl."syntrace"; deps."synttree" = tl."synttree"; + deps."tabbing" = tl."tabbing"; deps."tabfigures" = tl."tabfigures"; deps."tableaux" = tl."tableaux"; deps."tablefootnote" = tl."tablefootnote"; @@ -8685,6 +8880,7 @@ tl: { # no indentation deps."tabularborder" = tl."tabularborder"; deps."tabularcalc" = tl."tabularcalc"; deps."tabularew" = tl."tabularew"; + deps."tabularray" = tl."tabularray"; deps."tabulary" = tl."tabulary"; deps."tagging" = tl."tagging"; deps."tagpair" = tl."tagpair"; @@ -8700,6 +8896,7 @@ tl: { # no indentation deps."templatetools" = tl."templatetools"; deps."termcal" = tl."termcal"; deps."termlist" = tl."termlist"; + deps."termsim" = tl."termsim"; deps."testhyphens" = tl."testhyphens"; deps."testidx" = tl."testidx"; deps."tex-label" = tl."tex-label"; @@ -8709,6 +8906,7 @@ tl: { # no indentation deps."texments" = tl."texments"; deps."texpower" = tl."texpower"; deps."texshade" = tl."texshade"; + deps."texsurgery" = tl."texsurgery"; deps."textfit" = tl."textfit"; deps."textmerg" = tl."textmerg"; deps."textpos" = tl."textpos"; @@ -8724,12 +8922,14 @@ tl: { # no indentation deps."thumbs" = tl."thumbs"; deps."thumby" = tl."thumby"; deps."ticket" = tl."ticket"; + deps."tipauni" = tl."tipauni"; deps."titlecaps" = tl."titlecaps"; deps."titlefoot" = tl."titlefoot"; deps."titlepic" = tl."titlepic"; deps."titleref" = tl."titleref"; deps."titlesec" = tl."titlesec"; deps."titling" = tl."titling"; + deps."to-be-determined" = tl."to-be-determined"; deps."tocbibind" = tl."tocbibind"; deps."tocdata" = tl."tocdata"; deps."tocloft" = tl."tocloft"; @@ -8768,8 +8968,9 @@ tl: { # no indentation deps."underlin" = tl."underlin"; deps."underoverlap" = tl."underoverlap"; deps."undolabl" = tl."undolabl"; + deps."uni-titlepage" = tl."uni-titlepage"; + deps."unicodefonttable" = tl."unicodefonttable"; deps."unitconv" = tl."unitconv"; - deps."unitipa" = tl."unitipa"; deps."units" = tl."units"; deps."unravel" = tl."unravel"; deps."upmethodology" = tl."upmethodology"; @@ -8861,9 +9062,11 @@ tl: { # no indentation deps."zed-csp" = tl."zed-csp"; deps."ziffer" = tl."ziffer"; deps."zref" = tl."zref"; + deps."zref-check" = tl."zref-check"; + deps."zref-clever" = tl."zref-clever"; deps."zwgetfdate" = tl."zwgetfdate"; deps."zwpagelayout" = tl."zwpagelayout"; - sha512.run = "b4cfddef7a005b82ebc5892a23fe214155794814301008fa66215acfe8d93c484a6d75765a19614a7a6ab193aae70b032eddbf8cee5cd2073ba32868aae6e1eb"; + sha512.run = "87e0f99ccb8a1c83daca15bc5922588dee935eecd6e30a8d4841113a6077a621fa71a73937022ef6d5d1c9bde8f8915bd00d678c7c8402a95cd388b1abd774a2"; }; "collection-latexrecommended" = { revision = 57862; @@ -8943,7 +9146,7 @@ tl: { # no indentation sha512.run = "f763ff9a6832abce7a148bc5e8b9e5860f883ce0a56ad2119d9e18e7fb4dad794456fdc07b3ea107dca17d4174910ebf1613f1072b946a80f29d291ae513d097"; }; "collection-luatex" = { - revision = 58124; + revision = 60764; stripPrefix = 0; deps."addliga" = tl."addliga"; deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua"; @@ -8969,6 +9172,7 @@ tl: { # no indentation deps."lua-ul" = tl."lua-ul"; deps."lua-uni-algos" = tl."lua-uni-algos"; deps."lua-visual-debug" = tl."lua-visual-debug"; + deps."lua-widow-control" = tl."lua-widow-control"; deps."luacode" = tl."luacode"; deps."luacolor" = tl."luacolor"; deps."luahyphenrules" = tl."luahyphenrules"; @@ -8992,26 +9196,35 @@ tl: { # no indentation deps."luatextra" = tl."luatextra"; deps."luavlna" = tl."luavlna"; deps."luaxml" = tl."luaxml"; + deps."lutabulartools" = tl."lutabulartools"; + deps."minim" = tl."minim"; + deps."minim-math" = tl."minim-math"; + deps."minim-mp" = tl."minim-mp"; + deps."minim-pdf" = tl."minim-pdf"; + deps."minim-xmp" = tl."minim-xmp"; deps."newpax" = tl."newpax"; deps."nodetree" = tl."nodetree"; deps."odsfile" = tl."odsfile"; deps."optex" = tl."optex"; deps."pdfarticle" = tl."pdfarticle"; + deps."pdfextra" = tl."pdfextra"; + deps."penlight" = tl."penlight"; deps."placeat" = tl."placeat"; deps."plantuml" = tl."plantuml"; + deps."pyluatex" = tl."pyluatex"; deps."selnolig" = tl."selnolig"; deps."spelling" = tl."spelling"; deps."stricttex" = tl."stricttex"; + deps."truthtable" = tl."truthtable"; deps."typewriter" = tl."typewriter"; deps."uninormalize" = tl."uninormalize"; - sha512.run = "9534a3381a1dcbe324bb6a7f01645c92a2e922dbfe5787692ae8b10d1668be87120419e4cac48f68db9fe0d1f1c3dd396792ddf221253cc290b86564b87d322d"; + deps."yamlvars" = tl."yamlvars"; + sha512.run = "525f00fc9e24e6b20fd7933061f3456a15cbca6e2df6ea9666dd62edd8d006c247f05492236de64bae5bf9517e73997af6f884a5f03d63e28bec631fb94d2803"; }; "collection-mathscience" = { - revision = 57759; + revision = 61288; stripPrefix = 0; deps."12many" = tl."12many"; - deps."SIstyle" = tl."SIstyle"; - deps."SIunits" = tl."SIunits"; deps."accents" = tl."accents"; deps."alg" = tl."alg"; deps."algobox" = tl."algobox"; @@ -9031,6 +9244,7 @@ tl: { # no indentation deps."binomexp" = tl."binomexp"; deps."biocon" = tl."biocon"; deps."bitpattern" = tl."bitpattern"; + deps."bodeplot" = tl."bodeplot"; deps."bohr" = tl."bohr"; deps."boldtensors" = tl."boldtensors"; deps."bosisio" = tl."bosisio"; @@ -9040,6 +9254,7 @@ tl: { # no indentation deps."bussproofs-extra" = tl."bussproofs-extra"; deps."bytefield" = tl."bytefield"; deps."calculation" = tl."calculation"; + deps."cartonaugh" = tl."cartonaugh"; deps."cascade" = tl."cascade"; deps."causets" = tl."causets"; deps."ccfonts" = tl."ccfonts"; @@ -9081,6 +9296,7 @@ tl: { # no indentation deps."drawmatrix" = tl."drawmatrix"; deps."drawstack" = tl."drawstack"; deps."dyntree" = tl."dyntree"; + deps."easing" = tl."easing"; deps."ebproof" = tl."ebproof"; deps."econometrics" = tl."econometrics"; deps."eltex" = tl."eltex"; @@ -9096,6 +9312,7 @@ tl: { # no indentation deps."faktor" = tl."faktor"; deps."fascicules" = tl."fascicules"; deps."fnspe" = tl."fnspe"; + deps."formal-grammar" = tl."formal-grammar"; deps."fouridx" = tl."fouridx"; deps."functan" = tl."functan"; deps."galois" = tl."galois"; @@ -9124,6 +9341,7 @@ tl: { # no indentation deps."kvmap" = tl."kvmap"; deps."letterswitharrows" = tl."letterswitharrows"; deps."lie-hasse" = tl."lie-hasse"; + deps."linenoamsmath" = tl."linenoamsmath"; deps."logicproof" = tl."logicproof"; deps."longdivision" = tl."longdivision"; deps."lpform" = tl."lpform"; @@ -9138,6 +9356,7 @@ tl: { # no indentation deps."matlab-prettifier" = tl."matlab-prettifier"; deps."matrix-skeleton" = tl."matrix-skeleton"; deps."mattens" = tl."mattens"; + deps."mecaso" = tl."mecaso"; deps."membranecomputing" = tl."membranecomputing"; deps."memorygraphs" = tl."memorygraphs"; deps."mgltex" = tl."mgltex"; @@ -9148,15 +9367,19 @@ tl: { # no indentation deps."multiobjective" = tl."multiobjective"; deps."natded" = tl."natded"; deps."nath" = tl."nath"; + deps."nchairx" = tl."nchairx"; deps."nicematrix" = tl."nicematrix"; deps."nuc" = tl."nuc"; deps."nucleardata" = tl."nucleardata"; deps."numerica" = tl."numerica"; + deps."numerica-plus" = tl."numerica-plus"; + deps."numerica-tables" = tl."numerica-tables"; deps."objectz" = tl."objectz"; deps."oplotsymbl" = tl."oplotsymbl"; deps."ot-tableau" = tl."ot-tableau"; deps."oubraces" = tl."oubraces"; deps."perfectcut" = tl."perfectcut"; + deps."pfdicons" = tl."pfdicons"; deps."physconst" = tl."physconst"; deps."physics" = tl."physics"; deps."physunits" = tl."physunits"; @@ -9173,6 +9396,7 @@ tl: { # no indentation deps."pythonhighlight" = tl."pythonhighlight"; deps."qsharp" = tl."qsharp"; deps."rank-2-roots" = tl."rank-2-roots"; + deps."rbt-mathnotes" = tl."rbt-mathnotes"; deps."rec-thy" = tl."rec-thy"; deps."rest-api" = tl."rest-api"; deps."revquantum" = tl."revquantum"; @@ -9189,9 +9413,12 @@ tl: { # no indentation deps."simplebnf" = tl."simplebnf"; deps."simpler-wick" = tl."simpler-wick"; deps."simplewick" = tl."simplewick"; + deps."sistyle" = tl."sistyle"; + deps."siunits" = tl."siunits"; deps."siunitx" = tl."siunitx"; deps."skmath" = tl."skmath"; deps."spalign" = tl."spalign"; + deps."spbmark" = tl."spbmark"; deps."stanli" = tl."stanli"; deps."statex" = tl."statex"; deps."statex2" = tl."statex2"; @@ -9217,6 +9444,7 @@ tl: { # no indentation deps."textgreek" = tl."textgreek"; deps."textopo" = tl."textopo"; deps."thmbox" = tl."thmbox"; + deps."tiscreen" = tl."tiscreen"; deps."turnstile" = tl."turnstile"; deps."ulqda" = tl."ulqda"; deps."unitsdef" = tl."unitsdef"; @@ -9227,10 +9455,11 @@ tl: { # no indentation deps."youngtab" = tl."youngtab"; deps."yquant" = tl."yquant"; deps."ytableau" = tl."ytableau"; - sha512.run = "6d82088780ac299028a33232fe067408c2140cb8d17a8d40a2d3d510bb5d29b41f1c11299de31c061701aaa723d85a71b1f26f7bb45b7a4b500168bbd50c91d2"; + deps."zx-calculus" = tl."zx-calculus"; + sha512.run = "c703c298d694651ccd82d803ccf2324a95d84186e889cabad13c12f74c0fe3b8b5081e93917f7ffc9c18ce58ba0b45dd04e857bf5bfa5290b852fb7c142c7959"; }; "collection-metapost" = { - revision = 50293; + revision = 59531; stripPrefix = 0; deps."automata" = tl."automata"; deps."bbcard" = tl."bbcard"; @@ -9261,6 +9490,7 @@ tl: { # no indentation deps."metauml" = tl."metauml"; deps."mfpic" = tl."mfpic"; deps."mfpic4ode" = tl."mfpic4ode"; + deps."minim-hatching" = tl."minim-hatching"; deps."mp3d" = tl."mp3d"; deps."mparrows" = tl."mparrows"; deps."mpattern" = tl."mpattern"; @@ -9277,7 +9507,7 @@ tl: { # no indentation deps."suanpan" = tl."suanpan"; deps."textpath" = tl."textpath"; deps."threeddice" = tl."threeddice"; - sha512.run = "09dfaa35971f85134d0854c08a99c4d2b01ddf08e8ab97449460bb99d1236a38c48643501e7bb56197a844491509af301da6c4f75a33d9286601633211ec7d93"; + sha512.run = "ee47dbed65feb3bb1dd76628eb42508660714984742835afaeceae583bc2c81cb2570d41b1d5e8963f2a5eb6a2c63adb9bd7e9f50b827cc9e57b95aead54b31d"; }; "collection-music" = { revision = 57878; @@ -9319,7 +9549,7 @@ tl: { # no indentation sha512.run = "bc842942513a72c6a0f2346025739f09477ae1e920eaefc5e396e0b68ba53465b745db9d9c4534ec39b70f43410a0ae036c69a4e2226944b8f128b507340cc15"; }; "collection-pictures" = { - revision = 58759; + revision = 61392; stripPrefix = 0; deps."adigraph" = tl."adigraph"; deps."aobs-tikz" = tl."aobs-tikz"; @@ -9338,12 +9568,14 @@ tl: { # no indentation deps."bondgraphs" = tl."bondgraphs"; deps."braids" = tl."braids"; deps."bxeepic" = tl."bxeepic"; + deps."byo-twemojis" = tl."byo-twemojis"; deps."cachepic" = tl."cachepic"; deps."callouts" = tl."callouts"; deps."celtic" = tl."celtic"; deps."chemfig" = tl."chemfig"; deps."circuit-macros" = tl."circuit-macros"; deps."circuitikz" = tl."circuitikz"; + deps."coffeestains" = tl."coffeestains"; deps."collection-basic" = tl."collection-basic"; deps."combinedgraphics" = tl."combinedgraphics"; deps."curve" = tl."curve"; @@ -9391,6 +9623,7 @@ tl: { # no indentation deps."hvfloat" = tl."hvfloat"; deps."istgame" = tl."istgame"; deps."kblocks" = tl."kblocks"; + deps."kinematikz" = tl."kinematikz"; deps."knitting" = tl."knitting"; deps."knittingpattern" = tl."knittingpattern"; deps."ladder" = tl."ladder"; @@ -9410,6 +9643,7 @@ tl: { # no indentation deps."modiagram" = tl."modiagram"; deps."neuralnetwork" = tl."neuralnetwork"; deps."nl-interval" = tl."nl-interval"; + deps."nndraw" = tl."nndraw"; deps."numericplots" = tl."numericplots"; deps."pb-diagram" = tl."pb-diagram"; deps."penrose" = tl."penrose"; @@ -9462,6 +9696,7 @@ tl: { # no indentation deps."smartdiagram" = tl."smartdiagram"; deps."spath3" = tl."spath3"; deps."spectralsequences" = tl."spectralsequences"; + deps."strands" = tl."strands"; deps."swimgraf" = tl."swimgraf"; deps."syntaxdi" = tl."syntaxdi"; deps."table-fct" = tl."table-fct"; @@ -9469,6 +9704,7 @@ tl: { # no indentation deps."ticollege" = tl."ticollege"; deps."tikz-3dplot" = tl."tikz-3dplot"; deps."tikz-among-us" = tl."tikz-among-us"; + deps."tikz-bagua" = tl."tikz-bagua"; deps."tikz-bayesnet" = tl."tikz-bayesnet"; deps."tikz-bbox" = tl."tikz-bbox"; deps."tikz-cd" = tl."tikz-cd"; @@ -9493,9 +9729,11 @@ tl: { # no indentation deps."tikz-qtree" = tl."tikz-qtree"; deps."tikz-relay" = tl."tikz-relay"; deps."tikz-sfc" = tl."tikz-sfc"; + deps."tikz-swigs" = tl."tikz-swigs"; deps."tikz-timing" = tl."tikz-timing"; deps."tikz-trackschematic" = tl."tikz-trackschematic"; deps."tikz-truchet" = tl."tikz-truchet"; + deps."tikzbricks" = tl."tikzbricks"; deps."tikzcodeblocks" = tl."tikzcodeblocks"; deps."tikzducks" = tl."tikzducks"; deps."tikzinclude" = tl."tikzinclude"; @@ -9522,6 +9760,7 @@ tl: { # no indentation deps."tkz-graph" = tl."tkz-graph"; deps."tkz-orm" = tl."tkz-orm"; deps."tkz-tab" = tl."tkz-tab"; + deps."tonevalue" = tl."tonevalue"; deps."tqft" = tl."tqft"; deps."tsemlines" = tl."tsemlines"; deps."tufte-latex" = tl."tufte-latex"; @@ -9529,12 +9768,14 @@ tl: { # no indentation deps."utfsym" = tl."utfsym"; deps."venndiagram" = tl."venndiagram"; deps."visualpstricks" = tl."visualpstricks"; + deps."worldflags" = tl."worldflags"; + deps."xistercian" = tl."xistercian"; deps."xpicture" = tl."xpicture"; deps."xypic" = tl."xypic"; - sha512.run = "929201dfc9a1d096afe3308c3d824031effc31ed8d0cb103f669704dad2109c0884d496c18a6ad07827338d5730533dec6f55360e362122c623c45da3562d61d"; + sha512.run = "b53fb9863bdf0d488c6848967c7787912cf66416e8957e1b301a5b47f45d37534e3425061e24eca1b8d4d49d9abfd9a7faaf2699ffac1eb57797c5e7c224d546"; }; "collection-plaingeneric" = { - revision = 56496; + revision = 59850; stripPrefix = 0; deps."abbr" = tl."abbr"; deps."abstyles" = tl."abstyles"; @@ -9579,6 +9820,7 @@ tl: { # no indentation deps."gtl" = tl."gtl"; deps."hlist" = tl."hlist"; deps."hyplain" = tl."hyplain"; + deps."inputnormalization" = tl."inputnormalization"; deps."insbox" = tl."insbox"; deps."js-misc" = tl."js-misc"; deps."kastrup" = tl."kastrup"; @@ -9629,6 +9871,7 @@ tl: { # no indentation deps."tex4ht" = tl."tex4ht"; deps."texapi" = tl."texapi"; deps."texdate" = tl."texdate"; + deps."texdimens" = tl."texdimens"; deps."texinfo" = tl."texinfo"; deps."timetable" = tl."timetable"; deps."tracklang" = tl."tracklang"; @@ -9639,19 +9882,21 @@ tl: { # no indentation deps."varisize" = tl."varisize"; deps."xii" = tl."xii"; deps."xii-lat" = tl."xii-lat"; + deps."xintsession" = tl."xintsession"; deps."xlop" = tl."xlop"; deps."yax" = tl."yax"; deps."zztex" = tl."zztex"; - sha512.run = "e70cb404a4beb339c772d7d0d1eb6c096abae4715c807791c84dbea0528c95419398f49d32c8889ac50eff1e3c75f5460e067d848272996f0a3e3c059ddb1630"; + sha512.run = "3513b00f6c81b941389c3bb2b2e2dd1eb1d93c63edcc8c77f3aefbb15132e9b49274167b4f799ed71e3618a1b05a58b9074c11a55d681eea2056ed7a0a9f15a0"; }; "collection-pstricks" = { - revision = 54455; + revision = 61329; stripPrefix = 0; deps."auto-pst-pdf" = tl."auto-pst-pdf"; deps."bclogo" = tl."bclogo"; deps."collection-basic" = tl."collection-basic"; deps."collection-plaingeneric" = tl."collection-plaingeneric"; deps."dsptricks" = tl."dsptricks"; + deps."luapstricks" = tl."luapstricks"; deps."makeplot" = tl."makeplot"; deps."pdftricks" = tl."pdftricks"; deps."pdftricks2" = tl."pdftricks2"; @@ -9694,10 +9939,10 @@ tl: { # no indentation deps."pst-gantt" = tl."pst-gantt"; deps."pst-geo" = tl."pst-geo"; deps."pst-geometrictools" = tl."pst-geometrictools"; - deps."pst-ghsb" = tl."pst-ghsb"; deps."pst-gr3d" = tl."pst-gr3d"; deps."pst-grad" = tl."pst-grad"; deps."pst-graphicx" = tl."pst-graphicx"; + deps."pst-hsb" = tl."pst-hsb"; deps."pst-infixplot" = tl."pst-infixplot"; deps."pst-intersect" = tl."pst-intersect"; deps."pst-jtree" = tl."pst-jtree"; @@ -9759,13 +10004,11 @@ tl: { # no indentation deps."uml" = tl."uml"; deps."vaucanson-g" = tl."vaucanson-g"; deps."vocaltract" = tl."vocaltract"; - sha512.run = "653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3dcefbf0238f1b2757297ac37ec6cbd4a05283c0bfc03d6e153e57f4be23ca8f87f"; + sha512.run = "54e2b23dfd58d514d577f535e4f8bab08b2a124c43abdea796847d5c8cdf5c7519c277db49ca65c2d50751c03c9ffaa6ce7493c82eba7863047ae969ee5e1bc5"; }; "collection-publishers" = { - revision = 57312; + revision = 61397; stripPrefix = 0; - deps."IEEEconf" = tl."IEEEconf"; - deps."IEEEtran" = tl."IEEEtran"; deps."aastex" = tl."aastex"; deps."abnt" = tl."abnt"; deps."abntex2" = tl."abntex2"; @@ -9798,11 +10041,15 @@ tl: { # no indentation deps."beamer-FUBerlin" = tl."beamer-FUBerlin"; deps."beamer-verona" = tl."beamer-verona"; deps."beilstein" = tl."beilstein"; + deps."bfh-ci" = tl."bfh-ci"; deps."bgteubner" = tl."bgteubner"; + deps."bjfuthesis" = tl."bjfuthesis"; + deps."bmstu-iu8" = tl."bmstu-iu8"; deps."br-lex" = tl."br-lex"; deps."brandeis-dissertation" = tl."brandeis-dissertation"; deps."brandeis-problemset" = tl."brandeis-problemset"; deps."brandeis-thesis" = tl."brandeis-thesis"; + deps."buctthesis" = tl."buctthesis"; deps."cascadilla" = tl."cascadilla"; deps."cesenaexam" = tl."cesenaexam"; deps."chem-journal" = tl."chem-journal"; @@ -9838,7 +10085,7 @@ tl: { # no indentation deps."ftc-notebook" = tl."ftc-notebook"; deps."gaceta" = tl."gaceta"; deps."gammas" = tl."gammas"; - deps."gatech-thesis" = tl."gatech-thesis"; + deps."geradwp" = tl."geradwp"; deps."gradstudentresume" = tl."gradstudentresume"; deps."grant" = tl."grant"; deps."gsemthesis" = tl."gsemthesis"; @@ -9855,7 +10102,9 @@ tl: { # no indentation deps."hu-berlin-bundle" = tl."hu-berlin-bundle"; deps."hustthesis" = tl."hustthesis"; deps."icsv" = tl."icsv"; + deps."ieeeconf" = tl."ieeeconf"; deps."ieeepes" = tl."ieeepes"; + deps."ieeetran" = tl."ieeetran"; deps."ijmart" = tl."ijmart"; deps."ijsra" = tl."ijsra"; deps."imac" = tl."imac"; @@ -9868,6 +10117,7 @@ tl: { # no indentation deps."jnuexam" = tl."jnuexam"; deps."jpsj" = tl."jpsj"; deps."kdgdocs" = tl."kdgdocs"; + deps."kdpcover" = tl."kdpcover"; deps."kluwer" = tl."kluwer"; deps."ksp-thesis" = tl."ksp-thesis"; deps."ku-template" = tl."ku-template"; @@ -9899,9 +10149,12 @@ tl: { # no indentation deps."ndsu-thesis" = tl."ndsu-thesis"; deps."nih" = tl."nih"; deps."nihbiosketch" = tl."nihbiosketch"; + deps."njuthesis" = tl."njuthesis"; + deps."njuvisual" = tl."njuvisual"; deps."nostarch" = tl."nostarch"; deps."novel" = tl."novel"; deps."nrc" = tl."nrc"; + deps."nwafuthesis" = tl."nwafuthesis"; deps."nwejm" = tl."nwejm"; deps."onrannual" = tl."onrannual"; deps."opteng" = tl."opteng"; @@ -9936,6 +10189,7 @@ tl: { # no indentation deps."seuthesix" = tl."seuthesix"; deps."shortmathj" = tl."shortmathj"; deps."shtthesis" = tl."shtthesis"; + deps."smflatex" = tl."smflatex"; deps."soton" = tl."soton"; deps."sphdthesis" = tl."sphdthesis"; deps."spie" = tl."spie"; @@ -9953,6 +10207,7 @@ tl: { # no indentation deps."thesis-qom" = tl."thesis-qom"; deps."thesis-titlepage-fhac" = tl."thesis-titlepage-fhac"; deps."thuaslogos" = tl."thuaslogos"; + deps."thubeamer" = tl."thubeamer"; deps."thucoursework" = tl."thucoursework"; deps."thuthesis" = tl."thuthesis"; deps."timbreicmc" = tl."timbreicmc"; @@ -9984,6 +10239,7 @@ tl: { # no indentation deps."unam-thesis" = tl."unam-thesis"; deps."unamth-template" = tl."unamth-template"; deps."unamthesis" = tl."unamthesis"; + deps."unbtex" = tl."unbtex"; deps."unifith" = tl."unifith"; deps."unitn-bimrep" = tl."unitn-bimrep"; deps."univie-ling" = tl."univie-ling"; @@ -9996,6 +10252,10 @@ tl: { # no indentation deps."uspatent" = tl."uspatent"; deps."ut-thesis" = tl."ut-thesis"; deps."utexasthesis" = tl."utexasthesis"; + deps."uwa-colours" = tl."uwa-colours"; + deps."uwa-letterhead" = tl."uwa-letterhead"; + deps."uwa-pcf" = tl."uwa-pcf"; + deps."uwa-pif" = tl."uwa-pif"; deps."uwthesis" = tl."uwthesis"; deps."vancouver" = tl."vancouver"; deps."wsemclassic" = tl."wsemclassic"; @@ -10004,7 +10264,7 @@ tl: { # no indentation deps."yathesis" = tl."yathesis"; deps."yazd-thesis" = tl."yazd-thesis"; deps."york-thesis" = tl."york-thesis"; - sha512.run = "22a96671004c2a06fd5935793ee274ec06f3801b18ad6b3af8181667ba37eead921b84e4e1d1206f213a5ea4ccdaaa7082e8fa3b8923c266389bbda4d34e3da4"; + sha512.run = "b079111174e27c874c78f905ba43f30471027a4afaa960613fe894f99e4468dbf3c5cdb3efb0d63c43d7d2c9e48c43b0f927d0180b447e19f9ab2af4086e3095"; }; "collection-texworks" = { revision = 54074; @@ -10019,7 +10279,7 @@ tl: { # no indentation sha512.run = "9bf4c58094748424c1b60a3731d9cb2b1ad1d24764469072da693de26a4e4e857df3bcab6d4c2b5ae7454a69f9730fc596fd156b46b7704eafb1421f6936d66a"; }; "collection-xetex" = { - revision = 58543; + revision = 59742; stripPrefix = 0; deps."arabxetex" = tl."arabxetex"; deps."awesomebox" = tl."awesomebox"; @@ -10028,6 +10288,7 @@ tl: { # no indentation deps."bidipagegrid" = tl."bidipagegrid"; deps."bidipresentation" = tl."bidipresentation"; deps."bidishadowtext" = tl."bidishadowtext"; + deps."book-of-common-prayer" = tl."book-of-common-prayer"; deps."businesscard-qrcode" = tl."businesscard-qrcode"; deps."collection-basic" = tl."collection-basic"; deps."cqubeamer" = tl."cqubeamer"; @@ -10064,7 +10325,7 @@ tl: { # no indentation deps."xetexko" = tl."xetexko"; deps."xevlna" = tl."xevlna"; deps."zbmath-review-template" = tl."zbmath-review-template"; - sha512.run = "a312699117932ac031f6b09fb0456518dec5c92fa046df27cfc0439f686c0dd26a362075b78b3b8d08dfbdf54f073c2ee4643801d63c67a79d728ee52db3dffb"; + sha512.run = "701b40c44e9292bdcad0fc09645d1d7b2e99364a8c54dc84f6ddceee3b512e708d9a82d7c820a8c14efcdacfc8893b8dc0e6c14d697590686a43291a98e5054c"; }; "collref" = { revision = 46358; @@ -10118,10 +10379,10 @@ tl: { # no indentation version = "0.2"; }; "colorist" = { - revision = 58434; + revision = 61338; stripPrefix = 0; - sha512.run = "9787be368fba699437305f4757434ad5e8cd19bbf200bd42517478a46ce01173cef8d7fdef204c1b02fbec0b09f40d44a84a7e79ba98b54705f5864dcbe511db"; - sha512.doc = "e6991e2a45b789f907d4534e86970d6a0abb63e98fc1e281f2568303d83bcde569881f808813ead6c09f598a62b2d0411589355db2529a90e2f48d22594f29f3"; + sha512.run = "bc06f7c4caa41a7bb8c6ebc0fd3c3f0b211d65ef4ac9ab7e39cb4ca63d78afe8ee18bcf1ccc12cdb2d3ef5fb088b5d136d0ee37656f73cd68fcfd07a78b0d0d8"; + sha512.doc = "faff9fe25109e0613096fa4aa124f7b7519bc05ec84f97f7fea9c8354798db7a454274b1b430cb4d235a0debd4b5ea25cabea5065aa6c6924a25606058e27253"; hasRunfiles = true; }; "colorprofiles" = { @@ -10325,11 +10586,11 @@ tl: { # no indentation sha512.doc = "5da762a898a6cb95d5da95f444e862c8d0ac351ca63eca776fc1a9e35e2fb00389d414a85fa1bef357abc3d68b691a36ddac8c6aba20b7ea6f398c9017ac13fb"; }; "comprehensive" = { - revision = 55667; + revision = 59099; stripPrefix = 0; - sha512.run = "57046d6981bcda498ff025644fe915ce67a01b60c6fe58431060754e801b51b9332eb718fca263fd39b9b728b9db6702d83e227d8ed579c03d58f6d653c76a0d"; - sha512.doc = "a2c4c855c0321e2d57d430f6788e762ab1bc8d51a5513fbbf0f6f4b53874d8816b877d9e4d5f3222e1014b8ea8384ff16a9d52742e9bebfc7932e08ab170e53e"; - version = "13.0"; + sha512.run = "9c414012e570fac3a3aee90cc7b6983d6791dcdcda0709722dc5354068815b2407fd4ed9196b8e961164698597324b9da8ff85b741eca86a4962701e0ce40d1a"; + sha512.doc = "24c7c0fdda00f5f5dd7c66c383d95a4fd99b41c5470482d1e53e8f061796cab5955b8043f80a2a57c9f045765ff1d10f0c7b48b10705a2677b80b67d01dafa96"; + version = "14.0"; }; "computational-complexity" = { revision = 44847; @@ -10527,11 +10788,11 @@ tl: { # no indentation hasRunfiles = true; }; "context-filter" = { - revision = 55718; + revision = 60786; stripPrefix = 0; deps."context" = tl."context"; - sha512.run = "cfd8b7f1276464a8593dce148e170105c2da3d20a755a4d197999b2c00610a3ee0227a8820e5eb34c09ac3537381c8cc984a67efba2c3fe8b85f7c57cb13c720"; - sha512.doc = "20279aeab1d574ff034b208d8657b02d35efc7f6ab1a92847bc3a7d0453e152571fec214cbfc90a70cd8e8debd2ec57317fda47183a10f644776949c295fc1a9"; + sha512.run = "294286db1d374f99e49fd249234ca19a5fae95cade586ff08771c2f9ecfdcb9bb729d6a3da546d8c85989104dcd1433568e31359d44fcf2447c8d4a0a0c8db85"; + sha512.doc = "8328312ae81748e38dfffeaef00b9aa20638ef7536357eeafa94cc86c21ac3af4fb908e79f4ef5e61ac2e02414780edb82185b9504181f0fa2393a1fb23cccab"; hasRunfiles = true; }; "context-french" = { @@ -10592,11 +10853,11 @@ tl: { # no indentation hasRunfiles = true; }; "context-letter" = { - revision = 56073; + revision = 60787; stripPrefix = 0; deps."context" = tl."context"; - sha512.run = "12c0e37865f241eb37b46989346e16c75cd49672e76e22f511d2a146ea221e0279c93ebacd0b85e0377cffab0ae07e26515fe3a6abb86bc85df52b87569dec2a"; - sha512.doc = "81e18af260a8441aedc04e48f120c69ea9fadf08fd69b18d95caeb1e98d5de8d0d37aadcb7589273122c4cf8a8b8832ed55675426f5cb29dfa3f9e60dd3012f4"; + sha512.run = "558836a8c95743270f627a18dfe7a29ffc7a2eaeb4cf663d589ef5c07eab4dad6f09db31511379c90a41d1e9e7da5766e8dc3c8bb0902fa06bda4fb33caa97c9"; + sha512.doc = "94e1bf68371f3e8c426cfff5c471f93c86ce51fdd92dfad59669d32cc73d86de606113ece55d13a0f25ac4a26f16916407de9175b84acc79ba107156c20cd20a"; hasRunfiles = true; }; "context-lettrine" = { @@ -10663,11 +10924,11 @@ tl: { # no indentation hasRunfiles = true; }; "context-transliterator" = { - revision = 47085; + revision = 61127; stripPrefix = 0; deps."context" = tl."context"; - sha512.run = "d41cd0ebcb99670bd48f8becde633c21401dd9044bbf93618a031da10c59bb8f6d4d6bbc68eecac75965b26f5052f797609d67d791cd7a281f72cd062d3d7388"; - sha512.doc = "4dd501af23511dc81853ddd48ace2aa572c553aea0ba09cf2895b8bd05c4bdf08a6f5e254eab88d4098d441f1d410c0161b1e8b24e3ebf88a38bf364e90b8539"; + sha512.run = "f919d3f9e6ab25932cfaeadfc07f86ebdbe00d84dc21236e4775930fc3866cee69cf9a25d373e13655f4396a3c395ea6ea103a28ffb4f00a4e95b7ceaec155c9"; + sha512.doc = "8473c1ca7b48009055f5c33031ec60f80d84dc43396789b0c0c7e6d65bcf014a237088dca07211beae4bfb80377f55cf12a9f379995cff50f52143fc4bc81295"; hasRunfiles = true; }; "context-typearea" = { @@ -10679,20 +10940,20 @@ tl: { # no indentation hasRunfiles = true; }; "context-typescripts" = { - revision = 47085; + revision = 60422; stripPrefix = 0; deps."context" = tl."context"; - sha512.run = "f2d43256997cfba2ab2fe0fc8ebe90a3798bb42e6d455fbe84540654a95fb06a170aa19cf11e4f3477517473b21fc05426247b1f1d39c9132e703c0f1a9a5d0c"; - sha512.doc = "de15432472678cd9c7bdc0e2597f1fe02275fa986767f269fb4237e8d0095a1100908e0b46429741c8ffebfa84fcc27272045314cfc185ccaadf5ffbbe030f69"; + sha512.run = "a13d06b9a792cbd2352016df508a7860e45b541d04cef1c9d9c8b5a6199120a71dfd69f990700c4a76ac31ec11209caef431a190b9045bdc46cc44f88cbef0a3"; + sha512.doc = "3d948f22da14b1d481817477235657cee714e4a2a69834729c20e18157f1175890ddc7fce992e8f5f27e26cd6d08186ff1521e2186681557cfff1a4778267324"; hasRunfiles = true; }; "context-vim" = { - revision = 58082; + revision = 61301; stripPrefix = 0; deps."context" = tl."context"; deps."context-filter" = tl."context-filter"; - sha512.run = "47f6ef2dec0048dc5b858ac32bee045f3b0c62ac8ea4b8684f3e219b9df924f507889d69516bd03c582a36d62b1d5d213678871be58bd6792bf19edcd5a9dab4"; - sha512.doc = "f67ae9f7864db3398f1dfaaa9b79cd7faa208d40531d6501c977fc45b4ae45ac2c73695fa7e2e35e446494009f38f5e7b1fe82075cccbaed92a1a312eb00e3b2"; + sha512.run = "788e36df52b815e35f01fe09207f9b8f34021879aad5992d06f20561af6f111458a9e21c76a8f985cc3aa3c4ea344f54e9c283b73b6c325ad38a688714ea9966"; + sha512.doc = "9a8638d773b3d27937d5f9e2a7a1b93a226aa8e95d33bbb6fcdb4e89d14e5b89388838831a47c79e334ba55af5b5f231e7ad71c0d0791abe9f0dd5becd122eda"; hasRunfiles = true; }; "context-visualcounter" = { @@ -10756,13 +11017,13 @@ tl: { # no indentation version = "0.9b"; }; "cooking-units" = { - revision = 53403; + revision = 59542; stripPrefix = 0; - sha512.run = "4182a43bc869dca19d022ae019fd479ac658c609a792677b9cfe5e3271af890ee353974b15b9cd4bb667f39fb38b96ee1a31359ca4a89986a3c03053ffd1974c"; - sha512.doc = "71e7ab3f1a89984063e26d5532eb1c1533efb06b8d8164548b7b46eab966e88e8ce5300ca0c91c639ae896b95bf5e9487c8c149d2f90af7cca0168b674052c8e"; - sha512.source = "8eb0c4698cf35fcb24b4e02db44f284c51f953ce1debc5f334fa514e4cee0ccb3278c74bdded88cfe379a47ac1f32efe089711f11fafa477f7a053e2e45a0092"; + sha512.run = "b49ea95a00d3db95a67f32b2833d4e48feb26cabdf12670cbe7988af51f299c7c60f1f4ad42161b9be533d4e79db6b5fdc6676d99eea290214910f7cf3c6cbf0"; + sha512.doc = "9583096d5d88ba4703aa82c29ecbc28ce917457a2c528e1990add753f179e7a51b2e628719d6a4836e3ff7f6b3389a490bf2d0b029a0c167ae66b48595749a48"; + sha512.source = "4f2cc334c5f1698bd61af7d17f5fff362a4c4138ed90a3e4eb4850a680569f8da2e744b6ce6620ccee90cab787bb9b689815ffe548302acfc14e948f042dd7c4"; hasRunfiles = true; - version = "1.46"; + version = "2.00"; }; "cookingsymbols" = { revision = 35929; @@ -10810,13 +11071,13 @@ tl: { # no indentation version = "1.2"; }; "cooltooltips" = { - revision = 15878; + revision = 60201; stripPrefix = 0; - sha512.run = "c17cb15979b575ece2c16dac8d56991c7cb32d99e165205c099b5058b658c60b393696fee5f7178611d5ccdf1d812522640dee56c1c4c881a73a11edc2ec8799"; - sha512.doc = "6a091ed9c41f4cf31d9db7cb2c1c76a342583f9d568ed89380bb624fba35cb3b788abde47f746b0e8a0402da19171fce72c7f356da2a2e4cb8264452f727eff7"; - sha512.source = "8aad4d9623d41caee76932db0a9436760ee5aef346c68e393e39fbc1ebdebb643b7b5215c232ef04f7968c34e3d0b73e0f4a23d2e060930d97b3a047d1bce149"; + sha512.run = "fde90a48c95ee35a7b9c9dfc1359df09646cd9f5cf1a44a7eba7ffd9aaf98c2bee400dd7ee6796583bea5a874c2693d25d3e502cdd4c3a207949f46ba7525505"; + sha512.doc = "0b9d55f41afb738f1503e232e06809cc2354775c6793c1f5f3f3c65d4aa349294b5e9ad4d223f588dbda0b0f53091cbee4855804273a8d8f21a6689760a556e0"; + sha512.source = "584d4880126bbca5343a4a8df85ca348d397dfb5cd5fe8a62d61224f9c95c5a0aed20f8c522d65ed68c6435506613fd0decc35acd848bedf2bf89de6842a7f27"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "coordsys" = { revision = 15878; @@ -10931,12 +11192,12 @@ tl: { # no indentation version = "1.01"; }; "covington" = { - revision = 58589; + revision = 60388; stripPrefix = 0; - sha512.run = "505e6d4ce7e009173d14eb2288bebd3805d1bdf39819f7c9dc58abea1687e4ea7ec816ed3c2e3c7dcd8c98bbc8cad3f59cba103404457ab9c8726e14cfa1d3cb"; - sha512.doc = "73fdb576dfb6337c9500d8c92a2be2216d84da12fd04b1cfe7044f4e24fca0120c3bb98f18aa4263617721ec3449cdf98a39e441ece77c2adff63930182a1673"; + sha512.run = "f1eb01e6c178fe46c73b119ae05abd8defc28e2e3f8778a364917540961d530d09ce7b5fb3dde7a82882a8c526dbecae369edc0aa1223207ae322e9e9b915a85"; + sha512.doc = "0793a3fb9c025a139420eeaf4cd5c6b2c119f1c6efbe767ec19fdb28cb184e3fb838e3d8a5fa741de709b637fbaf3c62803f1075b3768c60dc5fc169476e6b51"; hasRunfiles = true; - version = "2.5"; + version = "2.7"; }; "cprotect" = { revision = 21209; @@ -10972,6 +11233,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"crefthe" = { + revision = 60961; + stripPrefix = 0; + sha512.run = "ef69535427477153ed4608755634b6c45eed64b64df70f250da79ba98e65ea4f674b17de527a48f091cdcf5508c8c391304c591f489013eaa7018e53f36763fe"; + sha512.doc = "beea700aa21468283615cab567ab199ebc365f15e7cd9d46d149a689aba4f4bc50223a45fb5bf2395147e332a818543a89a7a57951af35ecdcf3e540d9b4cb69"; + hasRunfiles = true; +}; "crimson" = { revision = 54512; stripPrefix = 0; @@ -11012,9 +11280,9 @@ tl: { # no indentation version = "1.0"; }; "crossrefware" = { - revision = 47861; - sha512.run = "351f123bab2b83614b660959e86573845e32b6ac894ddabf24484cc3bbb68d71fef1e543b4d14a3684804f8b4b8e4a5123c8acc46fd813048320ab50f245475a"; - sha512.doc = "cef9694f4e984ee077902852143e2c88bb533739c6b53c010eae74c32b486faf7806010beecee49bfce07d5f35270bd312852f6d5701860073854a5fec949125"; + revision = 60689; + sha512.run = "3f0afe8125298c89ec874acb29577525ddc2ab27072961b3303d51db27ffe78b7a39f18b6a41e86da0bfcde01fc288f160b8b524ccc1b91901ed0f91f32affc4"; + sha512.doc = "3c244948a38296789c812a38b669da9709501a21981b84f569e749b77f5de69e20fce332a0c794408f0efa00adaeb120e6887b8459c3bfc0962af8cfcc85c8d3"; hasRunfiles = true; }; "crossword" = { @@ -11035,14 +11303,24 @@ tl: { # no indentation hasRunfiles = true; version = "3.0"; }; -"cryptocode" = { - revision = 55920; +"crumbs" = { + revision = 60499; stripPrefix = 0; - sha512.run = "df6a8f1f92357f235ce6ab120925c4e833985ba8ec487f8477a06ac8808997c3f34e2955178f505460cc008183966ffb06280b41a9ead249e8f03062cf2f7140"; - sha512.doc = "1369982ed17f6205ed2206b082faa902b8d0b2fa88669f215cc113a4bdb7e027f9e696311a3a0a19e5a48151a858d5c7a151bf4d42eff04a807c32f8559d67bf"; - sha512.source = "e9849dd4382b51e6f2d19bea2e074c2918fd4aefbab9f7add357cc6a122a4b4c35416d50886b7fb68a2db899d00ff8892a38ab91833d1a694969f946ce415a56"; + deps."catchfile" = tl."catchfile"; + deps."etoolbox" = tl."etoolbox"; + sha512.run = "583e335d4501e7cdc15708aea14741d2106a8bb475868a5b283458baf302a818abb8bec702236fbb32da7b0bdc50865d82da1bfdd9f8aa7f1f4faa7dc4baced6"; + sha512.doc = "9183bb7940e9e61bee823ca54eaa36e2905ff236a9f87190d807aa6a97fbb1ac9e87c315e33ea1bd38c6ae5fe5b46850775dfb9aac0ec4f0f2dfa2e798ef2d20"; hasRunfiles = true; - version = "0.40"; + version = "0.3.1"; +}; +"cryptocode" = { + revision = 60249; + stripPrefix = 0; + sha512.run = "d4d85db9f631bd2f3c78654e88b9c77df7af991f304732ec92b58d08111baf2548bd7d27e6187b0fb6dac7cb0517d27ef3973293cb76088ee8824cb28b1493b0"; + sha512.doc = "8516c946f2a72a898a6320be3b9037b3e94ec1e4c4624ac0c7f67f64855308f793275d682e2c16b5566abc17ab58200ec1ddc32dbb9fe2c08fe21183bac2986a"; + sha512.source = "ec51e316bbeaa2a28f7fea918fcfd3338fdff0153325b93309d79300b9df1655620227596cddb429952ee2d9074da8eebe6dd64207e2f300f475215eb33b9f3a"; + hasRunfiles = true; + version = "0.44"; }; "cryst" = { revision = 15878; @@ -11151,12 +11429,12 @@ tl: { # no indentation version = "1.0"; }; "csvsimple" = { - revision = 51010; + revision = 60470; stripPrefix = 0; - sha512.run = "c071fb93d269e27c7059919213a858d82bb5fc381d8a9a0faf82ad0b05eaac808dbfc19c30c8530a98582f3179a01774de78b0f290a15d4ef79e06eef0a9aba8"; - sha512.doc = "da691d9d44e1624ccab48e5979ae9ecb8697387a19280602c28467c8f2aefbafc494067217836a09a6ba1a653c8fd3a7903e3607ca56922ebf47870bea49c583"; + sha512.run = "25c21f971f3315025c7f6d3fb757f77d3ed53755d6e5cbc7dcdb62afee34c3dc2a3539758f048d01caf42c3f777e1a997a12df4765d85f511c2a9e7b3175d8e7"; + sha512.doc = "f419c39966466b73cf7eb95a12853cf9b25b581a23e0c4116cdb905787e949ed5b9aa4be599a2ccf94962fd04d6170c0d011e39e5460365dfd7debedac6909fd"; hasRunfiles = true; - version = "1.21"; + version = "2.2.0"; }; "ctable" = { revision = 38672; @@ -11191,11 +11469,11 @@ tl: { # no indentation version = "1.0"; }; "ctanbib" = { - revision = 52145; - sha512.run = "af03e3079304d24b7cf996158ce7344a15aa2f17efc46378132bedc5e9bb4488f89210c24a8a5ef0c21a293600589aef78b7a8c7a7673ad09ceab2077b0a351d"; - sha512.doc = "1a971e49827476b5ae419189f7acff4c17ab41159d60c5627663d435368b28aa7dc4aeeb5fcc2c4a9f34f648ac9f2de229b250660333ca2f32bfd0808f24e732"; + revision = 59782; + sha512.run = "e885d005007314c5dff56e8e3c96eaf2d4eaaf9ab87722a882ec4fe8752e3c7f909f58d3b92b58ff3f5b0c439f12e82f5eb76f90424d5696dddaf6e5a70d9efd"; + sha512.doc = "237371b1483922498bcc41d0730f7e707f97154044d20c3514f11aecd6b82e1d796602d67a2774a019bc5d13f7790016f759d50a9f1a17e45843e5770c198a48"; hasRunfiles = true; - version = "0.1d"; + version = "0.2a"; }; "ctanify" = { revision = 44129; @@ -11212,7 +11490,7 @@ tl: { # no indentation version = "1.2c"; }; "ctex" = { - revision = 58583; + revision = 61285; stripPrefix = 0; deps."adobemapping" = tl."adobemapping"; deps."atbegshi" = tl."atbegshi"; @@ -11251,11 +11529,11 @@ tl: { # no indentation deps."zhmetrics" = tl."zhmetrics"; deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; deps."zhnumber" = tl."zhnumber"; - sha512.run = "64fa2fd00ebbf9fa5a16f0ec23429f77f48e9d84f8a064e2be475e9e0449c73bb9c5f63a93b574bd3ea7af737f5aea72ad7f0be1b98e2e1c0bdda5061becf6e3"; - sha512.doc = "409173d58ffd65ba57acfc580fa2b0860327d536b8758816275ab0541138af0869ca1460f8fb725e0f185546349fca2d867afe24a19e74c9c147c36175d8e060"; - sha512.source = "7fb4745ff434fa138fba81d2df95269be134caaa130a00e789252c3855dcbfb39206d558f963ed63c3a16072efc3184f6ce075f3bdae2d4ea23e00b2bcf32169"; + sha512.run = "ea740753717aea341cae663253e0d6bd9fcaaf65bee67a30031cd3c09fbc1ff295a5d8c5b317ec423fa51679d988599414868ddcb623e84c1864e2805931398a"; + sha512.doc = "4d8479aebcddc27feb1226c37f194695370ccaae2060584b2564105529821de2cf8764a172a37e9fb775127807514fdcf1bcecf085559d1e937766eca4233bdd"; + sha512.source = "cb31f314bfea2bcae48f30c3f7459e98365abfea4a2a86ab33877d68e51fb850e1028104a898485d3deb3d68661ef9d550a73c31a5ba34060c1801149a428899"; hasRunfiles = true; - version = "2.5.6"; + version = "2.5.8"; }; "ctex-faq" = { revision = 15878; @@ -11363,13 +11641,13 @@ tl: { # no indentation version = "4.33"; }; "cutwin" = { - revision = 29803; + revision = 60901; stripPrefix = 0; - sha512.run = "484c995cd3b18f723899fc04e3af7b49bc7ac90a02448c4b49643b8ebe09c445bab122bc2ca0f2cab872323438fb02af3e5a053977ae8ff6146cb4af96f08ba1"; - sha512.doc = "89b4fb68d949b86eb3b5d90f7d8c828e10df591cf734f5e6908a221aa9e2d50820841e6095dc912619d4461c37b735907504e63fffbfd95c3371602144f87429"; - sha512.source = "0e6fbb5bdf3cc9b1d270979f379e2f50b356353533278495526275bab3211b1e6ef670a5269e412ae87c3fe4ca0ee8411dadfb42e4e2cce6dc200c863532b997"; + sha512.run = "922ab4c0f1158fa699c883e0fd8ed942a077c3b3109b048087756895d0ab6ead05182fbe17ab19310b78691fd77444d1460c7e021689c2eab092ed82974ed6d7"; + sha512.doc = "f37bc538e4affa716aa315535fad7fdb2bb0e5188844d028b8bda4935339965e3f375439ab0abc62d63f2f57c3d439a25888f29cdf3be484092a57ff86c86c72"; + sha512.source = "d3a544d356d4afb5599379a1c767d2aed9ace420d4540a1c62b617cb8f542fbcb225ec4e42ab65f7ddebf91df3c77a6b9bf0f59de9e6a11e06ae68fddd5b21ad"; hasRunfiles = true; - version = "0.1"; + version = "0.2"; }; "cv" = { revision = 15878; @@ -11387,9 +11665,9 @@ tl: { # no indentation version = "0.2"; }; "cweb" = { - revision = 57972; - sha512.run = "84af281f5dd3313b2601ade3c038b67baca43a388e6a40ff079be66e2de6fbee0bfc15971241f4c6021a105d2b26926ac228de236fe13019fd0d8d8c4fd6751a"; - sha512.doc = "e2b13d368b1c338e487c9ac770a8f0da5ea5a58880774b8b6b5a53047a2485d1cc98682808ab1161b308f7480f5a1fcbfd2c45ac39646a3aca8ae92d17db9f92"; + revision = 60085; + sha512.run = "86e23f2f005d23cd1ea1db8d767e61d9cf1ab494174fadb0433d6428f9fd0d216a32f84991bc3acf5fd75fd7190f36854d243b083052d4ee0eed91d7d57a61a4"; + sha512.doc = "e9f96202b01503cb85678e24c876d3f8d2cb184ecd21527e1729eb5b5cfce9438f3402e6e08dd02dcdc74cde31df0734590774aa356482ccb20fac3a3186785a"; hasRunfiles = true; }; "cweb-latex" = { @@ -11523,13 +11801,13 @@ tl: { # no indentation version = "2.32"; }; "datax" = { - revision = 57033; + revision = 60580; stripPrefix = 0; - sha512.run = "f8eda309dcff2ea8fd827cf3dd5c15ea265105234e33f96e27c14316e5e4183ade4c6a240b174df3564fcc1a4046ba3ada482a6fae653ffb5e43e18682852336"; - sha512.doc = "e4257e66220e0048df198d60a963524187d7373ab7394f4b33944251f534f67648110a8cfda588a992500c381470dee55423be6c224a4e3cd08cf4e633bc0d3d"; - sha512.source = "c47641c49bf9c1dc0e47eb8045920cdd0e519c07eb18efa047fb7c2a6122166a4e8bc793adfd3db8373b77be901dc6cc8501f5bc9dcf895ed3bce3a261b55671"; + sha512.run = "d33691c71297f909cc160e1d4ca1bdb4343edc2b5e2058eb7ef3edd58255b72f02d57e5a1d4348cd0de1b890648e6ea529b60d100b84c7cd2ea868570129e28b"; + sha512.doc = "2b30224581baeefdddc50bde5f6f14df317108e7a0be89f0d7add5a2e966f6cd21ddfc5b9278f4c6f1f2fe9337c1789d191099f60244d978261da070558f0b63"; + sha512.source = "00006e1bedbca8b6bfc52818a2add87fd39e7071814cc2ef81fdb70eed628612f3fbee439a7e9fd5c88e984f7b90c760a80be35e77a77eb5d1f5cf73a437e85d"; hasRunfiles = true; - version = "1.1.1"; + version = "1.1.2"; }; "dateiliste" = { revision = 27974; @@ -11549,6 +11827,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.02"; }; +"datestamp" = { + revision = 61304; + stripPrefix = 0; + sha512.run = "dff60190a2504f544c7400850f33f21674fe0c62b0cf6857874fc441bcfdaaa2c1223e251eb24c8905c6f656ab88800774c9d6eba6561f7e4a1525635113a1f9"; + sha512.doc = "896e9165f3710cb5bbff02828e77600061699ce360c80bff7a2474ec6b4d0bf33fd0ac3972093f034e9a75eba306347fc98acd9981fea2bd07aaed18b102a893"; + sha512.source = "7561450d4d79fe5f4523522aded0e2bcdb32a29770718e62838811d91242669a3d62c3a780178d6b8527375bb49707eeedc9e94a790640b8dbf2da306fbac88a"; + hasRunfiles = true; + version = "0.3"; +}; "datetime" = { revision = 36650; stripPrefix = 0; @@ -11955,13 +12242,13 @@ tl: { # no indentation version = "1.0a"; }; "dccpaper" = { - revision = 57522; + revision = 60413; stripPrefix = 0; - sha512.run = "02cf56e0c9d4450382336869d2edc09e543b119b68ff365c52049a7558297710e4089adb585124396d03745ce69b35d230091ee2c7d4e76011e78f6188cc9b9f"; - sha512.doc = "2ed2fcfd16373b2af10f91169b2358b787d66af88374600290d362ca9da9db18dafe2cfbe4b2d057ff88b758b70572197ac037f834b02555313ee759af65d6cc"; - sha512.source = "16764f191263cd3b7ce5a4c128f61b60dff4920b65254202fb0a996e80ca94b206131d9279037fd4948a14fad1f1f007f6e7683373912c7d03ff6626ca3d0db8"; + sha512.run = "7ec4066600126a651170af633f309ffa4f5137879e63335815a33d51cc5a741ee4ba491681b4eadec88f7fd91f54464d29b8a77f892d0f457e17994ecfc71901"; + sha512.doc = "ac292f912fa3539ec383f9d4328e06f4125cf65a52668cc29bc8e80c14f963266e210c6aa7f7326c0ed9e5b55ecb16c152af4b9552499b721aa86a2d7f3783c0"; + sha512.source = "ed6f2527e1b11cbca308d644ad68f2df85c915784e1fd8e9531ca606a31ba4342587de36517b092ba79e709f34e3e40546fcd4f99372c7b7d5a86355a9e26116"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "dcpic" = { revision = 30206; @@ -11986,6 +12273,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.4"; }; +"debate" = { + revision = 60720; + stripPrefix = 0; + sha512.run = "b3935644d4c6da7e527ed170a6497e4411fc7cea7127534737e554cc9a2392c2ff84be8dec9089e45796bfedff7c795d6e06e48fbc8293da5554649a13ce4595"; + sha512.doc = "d77dffe7272a49cce96f6cb475e0d3f34acff173ca647e7c756306dd6d6d79b4e424c6b952f8ec2dd93062a70a26421d00242d4ba5181d997ecf7a014840ec65"; + hasRunfiles = true; + version = "0.1.1"; +}; "decimal" = { revision = 23374; stripPrefix = 0; @@ -11995,13 +12290,13 @@ tl: { # no indentation hasRunfiles = true; }; "decision-table" = { - revision = 57094; + revision = 60673; stripPrefix = 0; - sha512.run = "2e89be9bbbc6a6f0fef9f3eb3caa63a6f8c6b749df1057f712d5153a78d4b15542f1fb30d3d5f5078d99a1b45f4d4e92be44d7c631eb86e349e56b03dcb4c93b"; - sha512.doc = "cdfa48c2835b48f5b0f7d454a4255128613b0f3f9bd2d750b8107c7d8eef1a36aaca3ff6aecc6cfbb1572fd2dca109628d94b4b9419ca44d91cd1ddb12326cde"; - sha512.source = "12f617e0aeedfae0cfd2e2a1fadad55cbfaeb51abdd2faea829fb04c47edae811eacef4a7480cf46533c3a445eadf8a9090dc47aef0d656a3e204eb6f19a26bb"; + sha512.run = "8a0bbe49c3ef76a7a60fff1778bfc06c2e11521e028bfcb190c85e8a38932bb1f2a97c26293a2965ee8d2e4e6d2cdda54dd2954881ac9b1b8e2506529af1ec97"; + sha512.doc = "d5b9301a4308a4e2709b4c82a621fbea2af0cbd767252446f698f269b3ef131502d3db3aaec6d192642b154b546124326280ca4c1331dce64b36517db51c3bc4"; + sha512.source = "c24db9cf19bf41d714d643d2be4bad5e339ba8f57175186793db0ae03b941ddfcc3584061ec4ef2aa2de550103346381d31c19a054d428210b35ef083866ba28"; hasRunfiles = true; - version = "0.0.3"; + version = "0.0.4"; }; "decorule" = { revision = 55230; @@ -12080,21 +12375,21 @@ tl: { # no indentation hasRunfiles = true; }; "denisbdoc" = { - revision = 56664; + revision = 61205; stripPrefix = 0; - sha512.run = "636537275629ba01fe78b5a189e94845898555715ddc879a3558539016e9cbc814ea74d6eed0cc31e42d8062e6ba6c6bb5c00064a14644c236a3c4f48f688e3f"; - sha512.doc = "6e1715fe7ed2c3d0091688ffa4e0e2245a838063a896334727ea87bad566771fa93c66cd0580c3ce1980b217cdf5e6bfba36b77d10d19ea55afe4e8fd92db8be"; - sha512.source = "89abdd37bda49536437063229346ea70655211716ebcc0798a4df87d49df9a2fb38f201e0b80e8d3748a2d847ccc2ce320c29d71f9922d5f2932eb07de3c5645"; + sha512.run = "ac024cdb21534de19fd80999df5e6c133ec49d93203ed411de256fae034958d609ae5b8343599e940d0ae9a76a6ccb178eadffdc130413d0e62d060b73ed9461"; + sha512.doc = "bdcbf28a1721aec147fca04353662bb84b146c24520e52238e187ee4336abd42dc7b51c87e5607295d0dbcf7a6b8b980e633975ebe329f053e8e91e4c282eee8"; + sha512.source = "2b8a3b073c0dc7ab1e13ed905bad4923cb5572e5f7053b47d27b6fa817d9b273c3e1a7d42c7c4056c1adc193e8fb258b8ba82e3db59c204951123ddde5018a5d"; hasRunfiles = true; - version = "0.9.1"; + version = "0.9.3"; }; "derivative" = { - revision = 55890; + revision = 59453; stripPrefix = 0; - sha512.run = "afb3a5e900dd77e4d262320485ef0526c362415cf68e2b0d199c388980211a8c21caef3789fdfe348f290563373823fad4e3881ca3bb11f0974a30fe49f6ecc3"; - sha512.doc = "800dbd742c60548ddab9d66cd97e142b389f81f3719ca34c6027d69ccae2b790480261eb984c1bf3d8775eaab29f607ebfa2eac6d778f36c999f083cf7ded323"; + sha512.run = "0b386fae5bbbda6bdc5124807d8995e7137b48ef04cafbd798f472514ca2c2c29e16066193d305f1e5640eb4ea2d0eba2bde71a016931fde600e00e9bff62a01"; + sha512.doc = "8af91b830d2ae2bc70be524c6c07a8aadb39ab645cbc7c2deaef89469b53b55c3b32631c32329dbf9f0ced7d9066a96ff0de0dd26b842e45a58a99fec3a785a9"; hasRunfiles = true; - version = "0.98"; + version = "1.1"; }; "detex" = { revision = 57972; @@ -12345,13 +12640,13 @@ tl: { # no indentation hasRunfiles = true; }; "doclicense" = { - revision = 58350; + revision = 59899; stripPrefix = 0; - sha512.run = "1f701453752b32f1030dd7cda6f51bd94d6d9d67f465070b613f4ea55857f300be8c7a19c7440c6fab129e3fc1749fe6b9aad13b1fc28b5b61670f65bf0e0a81"; - sha512.doc = "14b5f1cd3bbb3b9c411ab8f461673f1b4028549fa5675925ca6221723e6de3588df495a9a4e316b29d4e5c6836eff845ea3ef9544d2823fa548b4fc54080cd05"; - sha512.source = "d5edb3908034af8d6c9b2e094eee6747398041df2d812b5cc1708223350e91837b5556a58db91897bf044e25a4cf036a0d945eec2db14f807d7e32c89340aaf4"; + sha512.run = "4ab462ed5cea50837f3bf47cd5d43dd9e8f1666e34da55a3c5849b9c9b735962ba94fde97f1682ba8ef2fca4b9c4d985dc16121be28c552ec3a6cbf981872254"; + sha512.doc = "b9221169fae2c21c03b5005f1f35d517cc8a09c664ba752dafb400e00abfa0f85c86244b5d5a5c6a9602d7b190794871675861d433763050bfe9d1a958dca4dc"; + sha512.source = "94e35806027bd1d6c3dd593c57729b84072573a327e61dc57d7dcd054f61cc29471f43714832da224b5d26aa6115b16e1b2bd53385c97b045ed953223d4a99b5"; hasRunfiles = true; - version = "2.3.0"; + version = "3.0.0"; }; "docmfp" = { revision = 15878; @@ -12670,28 +12965,28 @@ tl: { # no indentation version = "1.0"; }; "dsserif" = { - revision = 54512; + revision = 60898; stripPrefix = 0; - sha512.run = "d1f173c1892acb75e319fe3e8702b5c8ba233ba3b236babd368c3a8bb47ba67de222e6d80ed65c17de9d152b98a930b59c74dc82fba619c2b24b4dc8143d5890"; - sha512.doc = "a8a6c9224cb7a55d12d8825d108066038be9ceb3ebf50caf796dc17a84f4d9d615507778934046b8944d235acb3f829e7654527cf485c9bd2562998b376f26cc"; - sha512.source = "01fdb50fc1d1cfc294121882c3d05ed0878caf154f71f2b5dab6e21f3e96ddaccccf9da49d7aaf000a47c69f890a600d1914fce892d5efa485964140486ee950"; + sha512.run = "7fa159e85b370a1327a8cace1a20ed54b37f2413e553dbcd42c6e75cd224da35b47402d89d39971873e888cc9f89117fe5403887299ad8c43e6bf2f706df357d"; + sha512.doc = "e831d9ba6233cd260cd6f212f4f8b3adb360f6d701d121d26f0de95360dd56ccf7e3a5fb6fde990d875e60ca20f7632a4badaa9df8e3b98f16bfa5b176308761"; + sha512.source = "dcdf454c0d970338951b5b458df039ecc0287020fbf13c3ef46d2effc4aace39cdb424937d506783f572ccfd7cc136e9059e9894d4339b53f4b1be4b52d93579"; hasRunfiles = true; - version = "1.01"; + version = "1.031"; }; "dtk" = { - revision = 56696; + revision = 61047; stripPrefix = 0; - sha512.run = "6553c4facf6e28210e22641d10babb0c4073c9514231e345f33aef419c95ea30b6fd744711233f91f90183624d5bd5c21ca7901c4ad46358b7b6335c09059241"; - sha512.doc = "9656de8b3319a84d5d32900a65c013e44ebfa5488761bb31a5d3f84faaf22f648367a842d274b25a19c70bb650e4043dcc18fa0fdeaafd6bc360534c118589d8"; + sha512.run = "1b56e53aca93cbc91f5389d1185375e14f44403d0a540d782d1c63ec7a27f2abc9cf0387cf57e86a0022cbbdf39e7d979056b43a762004e636a8a3c6041d9abf"; + sha512.doc = "9b82f9832c0aa4b80f2e97913e1c25bed32f1e51461c77c64eb9683a4016d487e573d1b449e60e67566111f2ccdf56c6394e77d325e6e28b5f82d4dceea4fbd0"; hasRunfiles = true; - version = "2.08h"; + version = "2.08k"; }; "dtk-bibliography" = { - revision = 58212; + revision = 61396; stripPrefix = 0; - sha512.run = "24d9c6fbec620031e612be1820a971dfcf763bb457ec440757ea3b40e953cca21b2eb5ea550fb7dbfb773663e04b3b37f99fdd83e592e2405c00cebbf558dc11"; - sha512.doc = "8b4256fd9dfebf80f5ee1a957b546746ae34801b552db1459a05a1a80be24bf8e64e968cc47c52226b6f4e0c8ee02876de4aa5fd41fb413389130d23be3f2c0d"; - version = "2021-01"; + sha512.run = "8b96893dad2e70f439a2ff760a99b02aa03cf7a77ffce1e726416690d56c28eb06a232594c612678139448a8bcd631760a1d6ca203a33f18d3a8d29bf27b6bcb"; + sha512.doc = "12f2ff0a1be2cbd81f493396ed5f54c34bd96cedf9b291b9db7f92ab88018e08e7c63e5c71e5b9c15ec1c26c90d037d22bbd18b35375cf0995e5b8cfcbffae8f"; + version = "2021-04"; }; "dtl" = { revision = 52851; @@ -12827,11 +13122,11 @@ tl: { # no indentation version = "1.00"; }; "dviinfox" = { - revision = 44515; - sha512.run = "33b37192832362c170575d1770b0e8da105ab0f9197ee52ff86a9dedfdac718fd7f3ca87d6f3f2075803fcffbc2f3739b806b1088bd7e2a21beca53292d918f0"; - sha512.doc = "f5f84a2df36ee93ccc0a8acb687fa4fdc6441ee6b0c76fe4330cb28ff2e5106014df5f367d5f2821c10864ff16988837099114ce331afe8a303e0f9102d92193"; + revision = 59216; + sha512.run = "d366c28a88f488418405944e299b8e8c681a2bfbe1fb8d37847d89920ab41d3103d52072c7455ecec2451702cbbea02971ac6f1e1d609bde9a2f5e8abd345ef5"; + sha512.doc = "4da7f09620beb3aa7e5a572f31c1d53466607ec0f6401b687ac1da624ea435f0efb3e0e2074252f49a720cb6d53412658a8a45dcba5553315fc9423233755dbe"; hasRunfiles = true; - version = "1.04"; + version = "1.06"; }; "dviljk" = { revision = 52851; @@ -12844,10 +13139,10 @@ tl: { # no indentation sha512.doc = "61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598"; }; "dvipdfmx" = { - revision = 58645; + revision = 61101; deps."glyphlist" = tl."glyphlist"; - sha512.run = "4c5c0773389d13c77b007f9a82e75981ddb331b51c99836c73ff144e04a2289eefed77e7f5c5a7e60ed37aa93d8a0be055a76f1e1347550b5a1242be8cf24029"; - sha512.doc = "c0f571ebbd976d55fe752e9b4c61e8e44e6ccf4086592b16618958d936267777d8825dfc2c9271f6fddb3620f54bcaa045f895131a31112e066152f20748e549"; + sha512.run = "6dd78f4b5cabb51c3bd9988fa46bf90a5a79b3d3293257a4c563a8a76a5a03eb167ce3ec0d4ce6ed05412a551eb201f2379a50a97ac5355ebe833f7b34cee4b4"; + sha512.doc = "00dce9b36eefd1788bbe455b2e5104efd9afc8bd891aeafb2cd9bdee406eeb25ab520e42e614e9d2363eb6a7273232bc3c4805bacd82a22099c5ffc438e852cb"; hasRunfiles = true; }; "dvipng" = { @@ -12936,6 +13231,15 @@ tl: { # no indentation sha512.doc = "e7c474d1d488d95786d5f061412d051c9306cedeb86f6e31915d44e6fb71f09303b8f0e782be393e56dc6887730560825ef29d57af5a20f7bf02d96f77eb554b"; hasRunfiles = true; }; +"easing" = { + revision = 59975; + stripPrefix = 0; + sha512.run = "3ed041546ecf6e921ce60f48365a1ba81ebaa8420f8f6d8e1c9ba1b38b20ea2a8c13392295d31a784bcc2fbf135ae37e5b89af794603b98492a4fac9c6dc6861"; + sha512.doc = "bbd559d63635d83e00924a9d40258f3edc32519524dcdc4bd3d7bce0487eec01900eeb26070cd4abe372150f013ab3206b075aaf530de6d395a938465de072bf"; + sha512.source = "dcbac9aef840277651060def21b4bac6f26572d7a0dbc7524788af224934c6344ac47af13e85a4c4d8f0857227b5ba8b5401081d34b7d5929747f510288dad37"; + hasRunfiles = true; + version = "0.1"; +}; "easy" = { revision = 19440; stripPrefix = 0; @@ -12952,13 +13256,13 @@ tl: { # no indentation hasRunfiles = true; }; "easybook" = { - revision = 58788; + revision = 61413; stripPrefix = 0; - sha512.run = "77ab4f7539d6389298de6905cfc271090a41c4e2b7c75166de700b26fc31770a0b2c7aba0e06ecc496ce0de28018d2b80e47c9391d2f96e59a0134fbf1a2d157"; - sha512.doc = "3cab62035e6a92b6ab7401d07aaecfff709af6969795c8662c76a90d15641e3a45faaa3edc9f9df33b17d128c499708ee879626824e455bfe54c9d775e0c827d"; - sha512.source = "a0db9cb99deb5f0db2259b7611a9a708662a0db01a6d54996edbab36c1d5b95407fc3b22634c44c9dde5bb4e04a4572cd472659da9475eff4c1ee9fb9f9bf72e"; + sha512.run = "c59d18285e07b123028c441322fb1e8afa2ba18994dbc15cd468ab50e70bf5df9d5578fb2e0bef1517cf43a13cfae365f4583ce3c1269fafc1a03541123dc1e2"; + sha512.doc = "680f64ad614ad78b3e51367d41946f6a34bc1edff9029285de66f4cde79fa85bfa7b976be9f0a5fd8ee867f43b81b86209ff8bfa4313fffdc15de7e15a00949e"; + sha512.source = "50222faec79a3e413b2db338aac0662265e0929e85cec6cb5982f96317e788aac0682c7eb7e213b2e01a04bde62054bd4d5f451912040a606338babd433913a8"; hasRunfiles = true; - version = "1.24g"; + version = "1.42E"; }; "easyfig" = { revision = 56291; @@ -13122,12 +13426,12 @@ tl: { # no indentation version = "1.0"; }; "econ-bst" = { - revision = 54191; + revision = 59327; stripPrefix = 0; - sha512.run = "d3b6f06f66c1c6ad618a277c1db2021624d61f32271eebe899de9a6ffa10ff0dd2ecb22da64c1acc1122093a535a3af20b00fc7aa8831a1b0bc18e9032716e58"; - sha512.doc = "13887967396b2058f7120ff3e0144f275b6e642e0da4eb69f51ad064351e02fc0dd362308fe5131120ceba7e6cbe9b4079adda0407fe76179a52e3ce1660fcfe"; + sha512.run = "8791b0d0949d46d9badca09629c9afa5159b9a0a88a050ad8de0d7777addbe6a97f133cda4d3b29ee512cdad282cfe282fb8c3bfa7f981970e72d1f0ac1a6972"; + sha512.doc = "bed7c93ec480e8dda2f98e4790910b5199f893cf2c9ea6013044f2a6d1259ae6847cbb0f07c819db8cc55583931c9004ff5d3030beb7a38c7f8c3098f3ad8b9f"; hasRunfiles = true; - version = "2.8"; + version = "3.1"; }; "econlipsum" = { revision = 58390; @@ -13304,21 +13608,21 @@ tl: { # no indentation hasRunfiles = true; }; "einfart" = { - revision = 58414; + revision = 61338; stripPrefix = 0; deps."minimalist" = tl."minimalist"; - sha512.run = "3e49ed89f9a3653db65cbd6a65f285d918691268d5cc61a20e74c7080cbfa8a5038a1fad197675075df1334bd14e9d52000e18bc3a574e731df002380e749349"; - sha512.doc = "b50e6abddaff2e79e9d89fa9f8fca9fe80ac727849245c02eb8eb879769d48be3c91ce6007cea4716fed4f396fcb06d36e1a9fe24f090284f3eb1e0c72c83ec6"; + sha512.run = "afe9035fbe06dd350c194a0aa0e079cadb6bc80800725323e20fe5b22b71faf469f2adea95f7fc99b96c71effae8dff32567026933383c2d53bd82b320042d2b"; + sha512.doc = "837fde461e705e8df9c18cf42a7e5ff24b43838e7023a89d40fa553d2fd72713c8e0dad908ccd22d9087fc373713ace40eecf54098cb3b374386e8fbb23ae00e"; hasRunfiles = true; }; "ejpecp" = { - revision = 56728; + revision = 60950; stripPrefix = 0; - sha512.run = "ba16daaacf8b7d2b6d9f1bdaf6680b474715ab423959bf1e8fef43c7e823becdba5d6a6e3a094f47cd71c23ee00917cf9bd3b72fcbf1f091d42425535bca6b39"; - sha512.doc = "f44c075fc341b3ef334a8675fb0c2ea3ccdae25cc81fa9df7ba39ebc9ec6ababd3a6657734336539d64a6f8b9ff4380993dba312b58cdd83ef5f0f923196b310"; - sha512.source = "6325f999c4a435b7d2a4aff7b3bc1cf21d7eb0e806f9e7bfe2482e79689617bce54b274cc690f2435fe0c416bf32b2a76c911b793bc1ac0bfe408b9f773758ea"; + sha512.run = "160b09a6c0abc694831cdbcb17c8fdd2feddeb27c82c06d70e31a5991c8488864cfc99b7e5768fe745a09ba811a5cc0c108428c6c7f3dbf3d8da7455074bffe7"; + sha512.doc = "206012655184167bc27c73f4fb3b4cd14e6a85dc2c3faea1eaf98d74c89a8e34765aa1f6c47c6a9aa1bf862c98b1273d19e33ebdf099ecbce674b6f7aa39e7e8"; + sha512.source = "01f26bcc15dc2e3b926524e6e0f1dd9739f7c5333bd947d5a1c83bd285e34e3c997c68acb6b33993a281f0dc81d751a9b8eaaf17753531553c6a366b6b60d635"; hasRunfiles = true; - version = "1.9.0"; + version = "1.11.3"; }; "ekaia" = { revision = 49594; @@ -13330,13 +13634,13 @@ tl: { # no indentation version = "1.06"; }; "ekdosis" = { - revision = 58721; + revision = 61113; stripPrefix = 0; - sha512.run = "58c2cfad3b9269b9a056cbea0465f0af4a4e4bb2647f23497ce2726e7e4f4969f218c89b03e31f99b58afd353eb349ede499445eca3043dd0f25cac6eb5a425f"; - sha512.doc = "b99409ec4d691b74b90b4d73c4f046ff62994743240befa008b0b4b0fb63bebff0f0f1d4c77db0034a8d1ae72e9eef474b5054579881d65c0fe730d75873063e"; - sha512.source = "94d9ee25866c1418137f786ebece9c14bba9467b3df1f88f0595990276522b0e1938948c51ef41f9c6a565b3a87fb34f5b1825db1181bf6740d920eda7ad6f06"; + sha512.run = "6fbc9c1cfbeffa9d950a3a10e0d39286985876b02efb48bd90a5853b006642c9e7042b0a660fbcd4f0a3d7438e0d647a827338bf283326162ca75ef316e53d5b"; + sha512.doc = "bf829e9636940ec6dd9371f12457c306f5af3cde562ea863de3f0f3efa44f8d5c4286f7373927ccb0913c7e2a0bab70b57e03a47081626674c7b4b407784329b"; + sha512.source = "2f24f73fcee8f34ed6efa401939b6bf96e7de6f0e24bcb2352626fd293ad533d249c8a0618a9f1eb3413feca9bc9a26cdf852bb6c69fc49987488739dfb17698"; hasRunfiles = true; - version = "1.2"; + version = "1.4"; }; "ektype-tanka" = { revision = 56070; @@ -13383,12 +13687,12 @@ tl: { # no indentation version = "1.24.12"; }; "elegantbook" = { - revision = 54758; + revision = 59053; stripPrefix = 0; - sha512.run = "dd1f4c8ff1367ef753a869e202bbe34d480e142de46dc91f4755d36c88fc346fd2717628e494eefd9967172e20b6f35b52fc37282237859ffb4944da68c4c534"; - sha512.doc = "5e58435a14eb47a99999e90e957d87ade2f78f952018a76d588cd76f72b94389ccb2414e8061f43797378e4f6213ffa57f3573aeda5c83513291bca158686960"; + sha512.run = "26c1a1d2cc17ea806daf1909eb79d0a568fdedf9184884295c58c2a4841361a0c9da9f1ff766c85ba8796bec9c9d9f800b8b8729b27bae80fdce4635899e04b4"; + sha512.doc = "c07f88027fc66b23cf1709e8096a5f1689904279a0599ee53239ec2f66b289a1196a36a2debfe1662219f82dff5e053fbdda5bacc4e4348945ce12ad23e0f26d"; hasRunfiles = true; - version = "3.11"; + version = "4.1"; }; "elegantnote" = { revision = 54758; @@ -13451,20 +13755,20 @@ tl: { # no indentation version = "0.03"; }; "elpres" = { - revision = 58015; + revision = 60209; stripPrefix = 0; - sha512.run = "eb8a18c29e137e4a11ef1a60e43533fbfdaad0872d0681e301a79cbc2fb7d11e7ecd0661b675aa299ce3439f8a238bf3d233fb60fe978eca9f05dc6f916596af"; - sha512.doc = "d3720f6be437348f1d556e62948a0326a066b3e865edd07a439e641eb75924ff646793171116fa174bf0d1b61ceb7d8b60639a31ed42150039053b8cedda4f0e"; + sha512.run = "6470db4f68936b14fe514828455d7fd96ff9393990982b805e5ba08e2281aa0a98c46551297dde6243e4ee3c5894d87d6fc48fe843177f9dafae102afab4aeb9"; + sha512.doc = "0c3a7e151414e8ecc2ddcfedf55571db3d09e3a3cdf58d42b3cfefc82e160ac2487b6001d6da152b7a7f192a21c2e54b1593c01c7376c359a342f7e5410d16eb"; hasRunfiles = true; - version = "0.8"; + version = "1.0.1"; }; "els-cas-templates" = { - revision = 54317; + revision = 59170; stripPrefix = 0; - sha512.run = "828b0e4a3a4e9df5d4373ad153a7c29e9da177f8c7b5ae796b7b94d1eb4cfdcf1f347f47895ad366524891f81ecf20fc86c3acc7f00d15835784f949f251ddc5"; - sha512.doc = "559c80546aa4ebea603a70b0dbc103869aa3aabc857b61ec1dd958d0da163cc408af643518aa4f9ea68a94dd2ca5242d8f4c46a30c627569a4211394baa99e0b"; + sha512.run = "d022c993c21c40acc3672738f42ce42aad76f3845d30bcb2c1c23f69af877a36a14ecc06ae3feff149a808e86ffadd7968462c75e081b42e50b073aa2d56e424"; + sha512.doc = "1c6bda6c29db8260c06cbb16a2045c889f43196b27e4525a62cfe9f77fa812392825b577cec4cb4d5ffa456db50c86d80e85b5c6eebdcde7848bce01dfb101c5"; hasRunfiles = true; - version = "2.1"; + version = "2.3"; }; "elsarticle" = { revision = 56999; @@ -13476,12 +13780,12 @@ tl: { # no indentation version = "3.3"; }; "elteikthesis" = { - revision = 55928; + revision = 60563; stripPrefix = 0; - sha512.run = "d1aca54ddbcfcc7c6635768cf7012508ea00e775d5dc02ea86054542941d9438516ada2698897f7d97c3807eaf8fb23967db371c499e1919e4b4b9f290b13997"; - sha512.doc = "77481cded400c3dffd86be5090db28954823a92d4e8d4a676ec540d8cbe8a51331722b760a200c8ab84132ce668ed88da4c4e689f18d58528003b1c71f750337"; + sha512.run = "bafcb4abcca97afa1fe1d92913a0ecce4da799d1bf8644fd2eea1acd35f51cbcc935efd7f940463267bb71b6396a0d5a3b5293de9fde4494b4f0fca62b7383b6"; + sha512.doc = "b080cac66f855b99e515ca8f96f493ff1ef148806cbe99ac142fd48bc0d9fa0cf8ee24ccf64101143512b6670aaaba245bacc3d2fddf25c503fc1e3e67f7e4ea"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "eltex" = { revision = 15878; @@ -13551,21 +13855,21 @@ tl: { # no indentation version = "1"; }; "emisa" = { - revision = 57013; + revision = 60068; stripPrefix = 0; - sha512.run = "dac517c5f1f5e475948d519ef46e3639a49ab3303a5d93821707b43b224ccddcdf6edfb8576fd89888cd00705b11abf17054c46008bb288450a0c679cc0ded2f"; - sha512.doc = "7fb9b28f4675a5e14687b569e1e5394f06f25f536eaa6c36ed390d24c634d2a30fc43c558d3e1ca004bdf41436705cd7ce9b59beeb31a6dd757a5fa7421f84d7"; - sha512.source = "3cb1e47c50d4cccbfd1b428ec1193ffd0f489d0284dd095f2f969c8db76f735b854e4102f474ab5e72876bb7b6e6210dd617958e42a851cbc03f5844626030fd"; + sha512.run = "dbe700eed5cb82ed687a5650fb58f07cd588d7a759ef67f0b015a795a732ec1b2d3019f637ecfe39fa240c93816c41084c5448d107371d209d40ce122fbda821"; + sha512.doc = "48529f12758cc7874b45ff5fd418641b322ac33541aee2665ee309a6b0bee8362c97fc2e31870fb34430d60343cae433f5a2793dc785c5a88d4f2e5518317433"; + sha512.source = "98437def2e985e2186bdee4f1ba1200807c1c1dc9882b41e60acf620907933417c774dc217c67e86a667fa84ca66ddb07f9132c7e3e8a105638097bc66b7d940"; hasRunfiles = true; version = "2.3.0"; }; "emoji" = { - revision = 55678; + revision = 59961; stripPrefix = 0; - sha512.run = "c26f69740efb5f18f196742ca927bda5fceb15a9acbc65e6671d569da40dda75cfec188fe198bce4e4d476bb41e6ca383fe0a19b84b15691f791cc4ff6001e98"; - sha512.doc = "caf60c65f653a2a57f3d33641526fc8f80903c718b62113c7425094e4ae35799f0c1ccacd19ceb3a0b39b571ea2d7b099effbc69aaa3f3704062e8e6f22d4e83"; + sha512.run = "5c87970b1d47489027ef1a13bd35958b54c7c8b7bb59f7a97a5293d2156e3acfbef13c3a83b5eac3ce8297aa01b25423add40d3d0e654b5e0007f34556449e5a"; + sha512.doc = "170a8e35c4f4c86751db4d357df39dbc215126465e784829cbd15e9226d04b92aca0d7836312c114d1c699daa5054883f364377d1f355f97024b63741aeede0a"; hasRunfiles = true; - version = "0.2.1"; + version = "0.2.2"; }; "emojicite" = { revision = 55131; @@ -13893,13 +14197,12 @@ tl: { # no indentation version = "2.11"; }; "eq-pin2corr" = { - revision = 57815; + revision = 59477; stripPrefix = 0; - sha512.run = "878bbe22ea7a71b486a38942d11ab15a19c8fef10ac90e06b235a87a15f0e4478d00d7671751547cc0c8c440924c92cc7e07dbce4c816fdfd114468104fec040"; - sha512.doc = "cc1dffd4989bdc5efc76e1ae44a8ee5f7cdea0c9617f98eda3ab0f079d242b408f91d80595a699212c5cf5910cf182c64d98517d6582af14fb1bec074f344eb9"; - sha512.source = "eb0d10e680a935f9919b9dfcae1b137549dfaece3047b62e2ea06280cb3075d3882546df470f05cdae9716eb128f27faa981d86408acb50b85eced63bf104769"; + sha512.run = "631f8dc9f50f7a45a0d03f0c4210af427cf8492d56886cedeff6cb0e9587453976beb1ac960afb53b7a31538a176bb63f55afd330ca2463847f86e57c3d545c3"; + sha512.doc = "4e704295ff398a2e167293178d69edc4882e9b9f37dae4f9debda7edd921a7c2d19c036b4d1424405ac1b9853e57615d9183fbf56a763088dc58919842da2720"; + sha512.source = "eb40f073d1763c59f9a0ed0444930f6698fbde754e213a73bff251df7f83b2c5a730345104d3b947ee8400363d324f968e3ebb7b74ed6f484d0c3589d5134b37"; hasRunfiles = true; - version = "1.0"; }; "eqell" = { revision = 22931; @@ -13976,20 +14279,20 @@ tl: { # no indentation version = "1.1"; }; "erewhon" = { - revision = 58722; + revision = 61395; stripPrefix = 0; - sha512.run = "ba9a24a32010d2f69a3bdfd1f146194d0962f3a2108c1a17416faa4ed331fba5315ce2a30710c1778f75fa6d3a709e52c6b6781f4fc2a4634a91706945fcc45f"; - sha512.doc = "3f95f89b51be6b373448bd2fe728bb55d2a1249862147aff0434ac92d8b2628ac25ae2c9906aaca8d932a2cafb6e6d57b7ea674857934a98063cb717d619375e"; + sha512.run = "0eedf87605020e9e012a44fcbc43eeb88ab87286143b5516a4cb3e9450a859927b93f488759b190059feff7e4dfd45f28a9d6cca81a0e4c9438dae273efd9abe"; + sha512.doc = "140ed114d442bb947627106d6274f05fabce2592fbcb8fe85a82192c9509e250ee484e352b2a5df74bfb6db128d075013ad50fe164592dcb02b7124a8e936ba4"; hasRunfiles = true; - version = "1.115"; + version = "1.118"; }; "erewhon-math" = { - revision = 56703; + revision = 60614; stripPrefix = 0; - sha512.run = "1e1bbdf2bf030e8b8c09c955ced895a93117eeb6c6a6f784ccb62c65d7e3fd6c5f536b23ea86eab3f306f0734fe3c805e22e61dedb5a5a06f41b74b8e89efdde"; - sha512.doc = "e422d287b0fa687e1bf54dc96f8adf1e979c8d2b6cfff2a5ad2e9d3ff8fde95ace136e2317235f6ad6144fe359385401569ec7aa75c273d48c3b7134b4273e74"; + sha512.run = "c82d28bf92bb30b45ba070c620564ac1a94f5576bf51ae85dbe2f6f9e155ac2c0787193e4c3542a1e32d1c3ff170fb9585e8ea3ee5be8b03daa27cb57357ab2d"; + sha512.doc = "ed6be6a52b9e59bc2244e4f54cf52c5f1817af051e164d5b01d1c905559b8d43ce133f7b09fd35ae23e54efb191b8869bd7662fec0b5c1363bc2c64e7f9f6c47"; hasRunfiles = true; - version = "0.45"; + version = "0.47"; }; "errata" = { revision = 42428; @@ -14017,12 +14320,12 @@ tl: { # no indentation version = "1.97"; }; "esami" = { - revision = 47639; + revision = 60730; stripPrefix = 0; - sha512.run = "bbf24974b4feaba88b92b3179af6bdb45b86053ae8037fa41c99d0823cf3c79807283c01370365ea0264ba1eee3c4c289fadc5c2619900e85657366c14920a7d"; - sha512.doc = "d9f57db15517f47d648e4ef91111a843fdd7f0d0706d1a863f5b4f7c65008c00507c552975c01b60c00cc724e63aea24f7a6b40930148bc981e200866cc30ac7"; + sha512.run = "83f00130432776d8eae210c15b6bc171d98b23d636ecf043424248357fee8efce3a025340772de933c8b920dec4fc7451981734439d2b82724af57f343216784"; + sha512.doc = "7e1dfc05961f8635eea0a67aa4b2007029d4f8d9ad629a9dca317c5ec279336b28d01e1c51bceb93814a636802f3ea1cf8d6090ffd81a99050589efcabc8b11f"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "esdiff" = { revision = 21385; @@ -14033,6 +14336,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"esieecv" = { + revision = 59638; + stripPrefix = 0; + sha512.run = "c39e028de2f9cfb981baa2d36335863d6e3252a3bc3e1ef283905fed24daff609a85748dfbd34db0cbdcf7131f4db3aa6d66d0e714f0359b287cb14efb95f568"; + sha512.doc = "8bac60946fe2a4bd5c1ddd55dd314c59dc7fe45ce33a214021de68bbe03b610b8bf1d6ad426e855e10340953176285132017563c41f0326c273f2ca790be4acb"; + sha512.source = "73f00171770070e8d71396540fb8adeb79804b341c7906ac7ebaf67d8d9696a178b5458d6b4d7bbf2949c9d7e3a6d142bf682931763714c5d0ce0a77416bd28a"; + hasRunfiles = true; +}; "esindex" = { revision = 52342; stripPrefix = 0; @@ -14136,12 +14447,12 @@ tl: { # no indentation version = "1.2"; }; "etbb" = { - revision = 56390; + revision = 61377; stripPrefix = 0; - sha512.run = "f21ea49a1404b8a495477d5b4ef440b6f2a363af50e6e93ff1f7ed4c36c88a133aa586ddb409b38a74a1ad7c181d785ce4491d259f5249000fd2cec2e5e73866"; - sha512.doc = "8527190d3f646d76833dd91b9610ca3051f499552f23b06ec88b4601c0b86ba5d9611520bfea49283451911a379b3b415ac5bfc6ac7703a4fa51b86356719f00"; + sha512.run = "0b5165504a2bf40b4f95f1f0d6de547a43f680831e0777ca12f8ce85e0e0514279bcd3d65f4228a61e004c93ad2aad239940364cb9e35927ceefd40c3ae73757"; + sha512.doc = "6beb4f5d4430d11bb96248e77152d06c91077d92b5408c29436546de1001887f860c2cd9475a5a99c476fe4c902c9dd1b2607aa11d15b69ceb2e485e6ac53078"; hasRunfiles = true; - version = "1.051"; + version = "1.055"; }; "etdipa" = { revision = 36354; @@ -14199,14 +14510,23 @@ tl: { # no indentation sha512.doc = "81f2ed72d5cef9119c94c4b0025e31be6739153e36b7b31a2c59b0cbe5a683a67746da8346345d561472fdbb760c07831d1936222ce1388ee12d70c9053ca8ac"; hasRunfiles = true; }; -"etoc" = { - revision = 55156; +"etl" = { + revision = 60998; stripPrefix = 0; - sha512.run = "4000c9627c76648046d647843dbcf93f56111433d0294f8fe448549191886dd4cbea8815910b305f9e27a18b42a85ac8fe8a5999584da60d66a67f4a376d227b"; - sha512.doc = "377963e8ec9af3fd7fe1f164bc2dad566f18d7ff8bb62689d0119641f5aa61fa0ca091f1feed7d968f86db3bfe1035f915de120724a2d2cf912f1787f3eb3be3"; - sha512.source = "d870677e592cdc503c8fdd3b03e568017c7d8f4cbfb9ebafe3510bcadc75f85f613991999dc67ae601db8ead068d06af76c1e0e1636c930313f6f04e080cbd6d"; + sha512.run = "14c5db74da0c3878609323b450c99dbc186c97997079d09acf55bc8fe78a2cf9f7fccf7c89c1fe02ef8fe9d532fc3d33e85d77e374d4f0c601c6251a04472dca"; + sha512.doc = "2a1dca3962826cf749d67799c6d871b7822b16f81c7ff3473628926db217812ed5d85ee2da351245f6ff7a973bb1b90b61951101978693fb92f07bc86425bb2b"; + sha512.source = "1be3c92c55576ea6906f08461f08269fc4840815124c3f1f09ed145a680de3763e3bcd88aae61c46d872e05ea34c302625e439ffdbcbc15d7565eeb250b177e3"; hasRunfiles = true; - version = "1.09c"; + version = "0.3"; +}; +"etoc" = { + revision = 60589; + stripPrefix = 0; + sha512.run = "213333f17e4b6a95217fecb7222ed62f46b60e05a522897481385d28bf12abb69933520daacc5791f36b429bff57b3f05322a8e3b1de8635051544d7ff437749"; + sha512.doc = "85c82e7e7b5cf655aeea010e58a7b7c90801f6626e9dccc8cc555b29220b50deaf1d7f822524f95b5a516fb628f93578c6c605b178b2b2a78e64c6f19602499b"; + sha512.source = "209ec3f7d21153270a43453c7510f72b36a1be33ce4b0d08c28b70dfbb5ee7a09352a9fb019063439527244ddf42157dd374b729ce6d29e53f6ee67d0607eafe"; + hasRunfiles = true; + version = "1.09e"; }; "etoolbox" = { revision = 56554; @@ -14232,13 +14552,13 @@ tl: { # no indentation version = "1.0"; }; "euclideangeometry" = { - revision = 54897; + revision = 60697; stripPrefix = 0; - sha512.run = "62900fe71550594672cbcb6cc22d067aae1e6315e54c76888fbe3db2b79558c25182e05c028e2e0504fa1f19168276d95684d0dcf76c2aceb600720cf090ae1c"; - sha512.doc = "c12dfd05e72c4a081068af962fc223f6391793436ece1e706bacaf205c69ba01ae9a7263e1069b5e10ff4dc8a7ad151558ba188ee6c539d8e297d57dd6e1c45e"; - sha512.source = "35805bde4c06f9589467808497de577b58e8eef5f788671c0a9ccf2603d21873d71d980b07f1acc411d7eaeb9bb7868a6bfe562055be030d802fa88fbc16c183"; + sha512.run = "cbb755602a75397494bf745c62ef1a1f9bb0e0a1635a20e9afb839a0e02c7b2041aa1b8364c8f8c17ca5be1d296831a8444f67d74ab8ce415583d7ddf81f9de4"; + sha512.doc = "2507ea02223d4da14b79e3343f765f65259efe3b6a2558348cf1d2514d0ced1e1e631b84d9dd0b178b3faba455f5bb292b6d16fc9fa9f21e0599d272eaca7f1d"; + sha512.source = "db799a444094b0e0f708cfa7c4d5ec0cc52a1652254bd28be4e8b8e8325d6aad3ff6bde84d0378ad43abe9d008515205def78657ea7b196aa23010cec46d8f23"; hasRunfiles = true; - version = "0.1.8"; + version = "0.2.1"; }; "euenc" = { revision = 19795; @@ -14277,12 +14597,12 @@ tl: { # no indentation version = "2.5"; }; "eulerpx" = { - revision = 43735; + revision = 59905; stripPrefix = 0; - sha512.run = "1dd4c01260b9f2cf7053d7867530b1383a1b1218719a5a58895bb56e61416f9a93199218670e88cb59f0d87e65efdd7f10a218b45a165894c13b99330797296b"; - sha512.doc = "d755e9694d0631e80ccf81f78a2832ae22269ded788fd30f0acd83a4044ddb4ee4308c26ae5f79c0510a2986f146d28847eabe200015bb197805d57d149ba20e"; + sha512.run = "452b92118da3d047d70803719dba988456f04ea3b68ac229c37d8d7e57bd37aee6e548e261996f974289d80ec748fe3e307771e77cd824e5caadcf563a1ea2a7"; + sha512.doc = "c7080a2a50fba165ac6b3d353cc347c46aa7cc7908291c805756843a008f043189421c5d36d0e5a8f4fd4aade85a0ddf6eccdb63a69482664376e4b874c3e582"; hasRunfiles = true; - version = "0.2.1"; + version = "0.3.1"; }; "eulervm" = { revision = 15878; @@ -14318,10 +14638,10 @@ tl: { # no indentation hasRunfiles = true; }; "europecv" = { - revision = 57641; + revision = 61398; stripPrefix = 0; - sha512.run = "9010e3d116f2a9fbc00f9da15b98ef6b5dd894ae94e3ddd82842f088f4d867c9b4fc186597e3885f7acc59d0ae51d9dd75b0a7c8955c2c22bd0295e2298cca89"; - sha512.doc = "ed502dcf747360c2fc2688e2d1d3e90f145f05488925a5cc2afc5354389b41a8916713a31de7fa8f69fd42f6ce104d7404e3bc55b786ea045a430a6119880768"; + sha512.run = "7c9884f1d080659f648454ce2935d1d503a1fa8b54a33534e43621d8808455e4245e859fcd4559ca6af5370c55a2e43b56f5760c783bcf8d8c81e3bddd8e3275"; + sha512.doc = "2860cd7079568d49aeeebc28d49b523dc86b8b76fa1e0d0133808f08b43471d267ccba9cd7dc888ed1e94f3b27fe4a01c093b5e439572d41004d9f1bb32088b0"; hasRunfiles = true; }; "eurosym" = { @@ -14392,12 +14712,12 @@ tl: { # no indentation version = "1.1.4"; }; "exam-randomizechoices" = { - revision = 49662; + revision = 60125; stripPrefix = 0; - sha512.run = "0cb93637dda7a7813f8f89dba62db03cb1c1c6da5ce5dae596a14321fab8c46a5c6d67432c31855b66b37b0eb9086d23b5bf2881bf8fa41e410ed7a4724d84bc"; - sha512.doc = "74daa43aa020898bf2a969e5f6fa09aea190209dd71eab222dde2b30cf2f6e12936b454a62b328aee59f6c3ae13bf5f7005ec3aba66766ade77672f74bb3ee8b"; + sha512.run = "b6650105435a758ab59d705f1b7ec691c56549376f914efae023db2b40bcc290cd080db81a0ab2a304195774b8c6685ca6e78b95519590984ac7d82ea62f3fbc"; + sha512.doc = "898a7ed9df2238b59e956f115b969e74f29649086ca4801e35ab3752c68a9b21b2757d712c75161e5092002dd4b30f0a1f294b86e100b579c0112de547c3b5b8"; hasRunfiles = true; - version = "0.1"; + version = "0.2"; }; "examdesign" = { revision = 15878; @@ -14472,13 +14792,13 @@ tl: { # no indentation version = "1.1"; }; "exesheet" = { - revision = 55916; + revision = 61061; stripPrefix = 0; - sha512.run = "004142161c03b7ab411fb86661d955ed0d401f19e718e353c2df45671042340024695910afd489850617aa28ee63593ddd2e0b5a708d68ee5285a3a4f30516c2"; - sha512.doc = "54e8d5f23dd2cf26440e3b3078b0ecac1f1dbb18d19cc1a0e0b46344aa4dc6e48b7f07f62374a4f58563e3ad924fbd7189295a7747bf54bdaaf2d74a59f7301b"; - sha512.source = "04a35ecae44e9cd022fb23f7c7950288975fe91ca0b5bfceb640e198bef17e6d8cbb70df493b40cfe97ea3ce9bd6b0bab1f1c5c997217426f6bd6de8c25a8633"; + sha512.run = "921af4a07943074940d311ca75afc3949a3bcc2d01584874a0d1fa4e98d830b35f0f100f335a924a99d3f046c64a14100c4a61878c54bcc346641274f369cf24"; + sha512.doc = "aeb8ea670171118f8acd381544b736321c6b9dfaa9e2b5ccae61caed1ad664b78118fe56b766964bd0466c05f2d7d7e30485117e9d84a619da09c57587b0035b"; + sha512.source = "de56a65bafdc5f26278331e4ba2167d163b90e544a476c4ee4c97a66ff9e5154ab249bf5bab7cb5b4868ce1bae5c030d1e40de5a4d1378cd050e0ce0ff6e42f0"; hasRunfiles = true; - version = "1.0"; + version = "1.3"; }; "exframe" = { revision = 53911; @@ -14516,31 +14836,31 @@ tl: { # no indentation version = "5.1b"; }; "expkv" = { - revision = 57247; + revision = 60573; stripPrefix = 0; - sha512.run = "b8270aa4e1b827a6799869584db6e30600a4779937de424548a3dc22511e4bad4d096389038f6423731fd36d3e93be59e789d957388ff243a1e7bbad65bfe8e8"; - sha512.doc = "31182e02595893c756fcac91222ef640e8c39c053ac98140769c470c126bb85d2cf17f9b342bbacc6608e136d13aab5528761650135d64b6fb3b5014547d6cca"; - sha512.source = "2c1ad532623a79222a886706c890bdf5c34b80c58a1d378c54bd4d4ef3d1ed2f38d5bab9b415d4f1b93f4562b47e387bd77463cb0ef849a8029002bd96cb4122"; + sha512.run = "18aa7282095f5c5f3664b9ff138f129acbebbeb16f5f550aad594a62eded5f08dcfee2efa9b34327c1fb5c6976e782361d2c372088c73b48d934bce1febbe068"; + sha512.doc = "2111b0638d5954b396b4e30d5a36fd078ee99477c378fb61537c8fb6365b39c1990965af8f1a3435ad088344374de329659b4822756299951585c6e19749d891"; + sha512.source = "9bddbc840021b8036b180bc8bf28cc2368dd705114e90bc5c511a8e666fc2e182ec3ea6d777ba6f5b712e4aa0cc30c03418a0aa6749ca77bc990a93fef39da22"; hasRunfiles = true; - version = "1.6"; + version = "1.9a"; }; "expkv-cs" = { - revision = 56693; + revision = 61109; stripPrefix = 0; - sha512.run = "128720f96c0801a5db0be297702367a29f9c37363e86071496c69fb5d1cc0641585f01cecebf919ab4cfe34ef93964bb96d84ae8e29ddc91bbe1e844137d52da"; - sha512.doc = "c28461c7bdcd905036507bcada41a720e0b468bf3f431b750672303baf368a1285567e632472610cedfc2de1d3b0941007113e1caee7042593c57e1f0e9fab4c"; - sha512.source = "7ce2d0ba12959c7f8e1a93f175d6637af95de461d04e651c5e356c8428e2a3f7ac2a1f240606e9feb03b4a8032d04400f2fc101c073cf09b242f3deb56b6b10c"; + sha512.run = "eb6b03b1c69ce3a127ed1cb32a117c5a39ae14068baf26fab7978a482f8c5e40fde07c9fff486cfc331b61c27e32a70a374eb91e5e06b142837842fe68307c5c"; + sha512.doc = "abdfb23e0a2862670059dc392b8b15865c551565ae71f5a9053f25b0725682e7bba428138bc545c836af0a264f30215e0a361a1b128bf225939faa21f6e41203"; + sha512.source = "4bbd92d41d84aac9c67a6af5e9a6bf977c8a11a88505cc11cff52e59ec12ee280510a1f97585415569acef8ec2aa03541bd27c5b99134fd41882e7bdcf71fda7"; hasRunfiles = true; - version = "0.6"; + version = "1.1b"; }; "expkv-def" = { - revision = 57246; + revision = 60572; stripPrefix = 0; - sha512.run = "034a3f9dc0672deb9d35a1f6f27c10d77b0ffecd82697e0a09216599472cb6d982855c7900f1b7f39a748478b0d2a1ed8a434ba676293444863e50fa9b30a07d"; - sha512.doc = "b689125035104ac0693297b018f8684503b69e166f23e02e53224454d0319e9f7e6867e1bf8bc3e32498dc7af709a67165f26bfe3e39d86de0a56b0f2c16c307"; - sha512.source = "004efe1983799c06ff03d793ee11e557ad55242ad29c1821680806495c441277d9dc1bce9d01edb558b7ddd7a71ee12e597af63663f72ac728a4d0d68b0a947d"; + sha512.run = "fb18169c900e8e22aa110b4bedd57d06f69bb87d728a4aa92eda0bb734650a6df2bd5de9939f1d4bac34e33329824bb3dc71009fff18212f2632cd4fd37a9a57"; + sha512.doc = "83bec61be058267c276a915aa059cff789e93e890a20f259820e17d350a771afbe28405edb47525ea09f1f904b24417e755cc7fcf955cee875dcb727d64ab06b"; + sha512.source = "3631e9b8e8af27880f7a227f3bc494c2167877dfc3cfb4e9b4a4cc9acc9a37f4b8538a0a30b51bf3698bb4a2a820fe1ecbeb1173a3f2a91bb0467099f81ae9df"; hasRunfiles = true; - version = "0.7"; + version = "0.8c"; }; "expkv-opt" = { revision = 58772; @@ -14728,13 +15048,13 @@ tl: { # no indentation version = "0.92"; }; "fancypar" = { - revision = 49801; + revision = 58895; stripPrefix = 0; - sha512.run = "18a4989c979c7d0b1a5c303b4663484e920962a5090e229d7b75ac5678860fedbc95df530fda954a3a2602a740f7afdae3e41f6a3e07405d77263045a6c62a1f"; - sha512.doc = "98cb690d9096a73523bfedc6a2ea35414e34043d5eef3d73d337c3d4feef3bb98303a22a1933eab53838e78cffc8ca1ee36bc00fdc13a50213849d87fa92c553"; - sha512.source = "dbbc831abfc030a45f530ac6e85cdd449cd411a2e5e52dcf80bc20770801c626cdb308012610ef188b22b7e9c4690836a65ad543ec6022c75e02f72415aebebd"; + sha512.run = "2f4e242eabb151834c6014a15d0ae012949e5e35f87bc32374e12f032bbb0fa21d6562b207ba855afaa28c36497cda3ca51eaefa579956f51283c84be8cefbba"; + sha512.doc = "1d972212b86e56eb692cbcca5d7d47b9454a6c0900803818c286b6cc071df93c5444d36eb29a8035e53c65fc9c30582686a6b9203af8e142e1cf1c31a6e4d58d"; + sha512.source = "3f88c040637b50d49981474b38d50cb5c3ba7baa5b6390b53f98e3315d1f17f0b0c48780f4c719583f3e452041ddaeb36fdfa367a616ce07a2758b11db152d39"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "fancyref" = { revision = 15878; @@ -14772,12 +15092,12 @@ tl: { # no indentation version = "1.8"; }; "fancyvrb" = { - revision = 57488; + revision = 61368; stripPrefix = 0; - sha512.run = "cbbdd7c868e6d238b4e82e59f7e8b1917d64ceef2b75d7da7f95b823544b1fa0d05141a248ff449df52f784100d79ac8f609cf4025b9d3db5b24920dec3f0863"; - sha512.doc = "1de32c07f17b316e0ad8704f3c800d75ecab9a6e3cf80ce8c725c126e77353ed9685a1d8e9dcd61295f80b975814ea8c67c11b62fe5bfae71cc2ebeffb440d3e"; + sha512.run = "1c3dece8b9dad1039bda104bc323b87b17ef4d878134302e7e4e392cab88864541878414d10f9d791bc8f141a3b41955d6ecea499776b077b9be97b96c8c8659"; + sha512.doc = "8bd77db9f0cf500e6b5c8327c3bb1de9aa5d68530dd6095a6174d3a7d09aa247c90cea8f6416b303decc8be42538168d91fd3409a6f725d46420981378f95269"; hasRunfiles = true; - version = "3.7"; + version = "4.1b"; }; "fandol" = { revision = 37889; @@ -14861,13 +15181,13 @@ tl: { # no indentation version = "1.0"; }; "fcolumn" = { - revision = 57428; + revision = 61130; stripPrefix = 0; - sha512.run = "9bd1bff80e03a080f2d3778c89c19478691cc119361229cd66b776e24260ddadc30ba37fadd5a82c631c14b369a2045960123f5b1f169ec699d9ad627ded3256"; - sha512.doc = "fac7e6eae8c6c3d1c6b05eefcca881f08334ef32a10946227f0244c74460f3a66926e6735342dfbf4da80228a0271b10aed8b42fcf66eb72ae41ff74c9f72af4"; - sha512.source = "a343431efc38bb19ec033e0791c7b5712324c2dc92837b9d620b6a35d8a6fcec24faf04cb71edfaaf34d8355ad2f40c7ab51b21f4b3ebe1e4e84cef0c2af6487"; + sha512.run = "5d17c65e0cc6f3fd74857e681fd6ce4bb6f3ad0767d162e3b88c48cd51bbe3f61d4ab7974b40435b909bbbf3bcbfe0ccb709fb3da64756cad5a152a14e8d47b4"; + sha512.doc = "a6951a47758b10603ee69d4bc65b45dfdb0b29ad9986939bd89f74a6fbffa877d7af258ee64e70c7070a71640250701d7e7054a07fac60fd8c72e08a361d1d9e"; + sha512.source = "738bfbcf9a6689ff1fab74d6fe1235285fe1241cf7fde91d51071be5cf7fc2a5bb2181d3ad842389b0343c57f430470bba5779ecef8aeba8ac1d525c78cb9d09"; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "fdsymbol" = { revision = 26722; @@ -14896,13 +15216,13 @@ tl: { # no indentation version = "0.8.8"; }; "fei" = { - revision = 55960; + revision = 59589; stripPrefix = 0; - sha512.run = "6f99d70485a3ecae3cef9af7e545cc15f5a45ae0f84266fe6d2d84f7ae58bc3b7e3138e28f42a577362176a996df05a2c12375aa4f58f14297619ab2f32a3cf7"; - sha512.doc = "822502abad87da654f0cad81ec87bd6e1be92abeba74066a7f96da0455a80697855b783a75e30e3c1b0d740db9fd2880d25ae1668da9802843677c84dd3da424"; - sha512.source = "d72b86ba677a71bf5dca8c2b39ae8bd202544a3320e93f776477e6977aeb3fe3d47f8362467b95ee6667fd46dff3801164380808693b16fa9065a31d694df7ac"; + sha512.run = "52c214fe548e29cab53e508d51fe6b0cbab8d2604507e1f030f87cb8d9014bd91a4e4c9a07f4e41f98313eed4f2cecee214e22b02e5a7a1e5c357f01e0adf840"; + sha512.doc = "6d91dc8b85a6f3c89c8163890c44d62076bd9d411e95f00d902b02ca640c9bca6cee7181c55425943798687af31635af0d73cfb46f3a7e07280346692df3cb45"; + sha512.source = "9883b3e37ea79056359407077f44aa6a3ea2612128ee92103c9a2fdf04ca03ccbefc294aa1a47d5736c5dfe5a70ce0aea32d5196faff0387a4c18d7915b62f4f"; hasRunfiles = true; - version = "4.10.1"; + version = "4.10.3"; }; "fenixpar" = { revision = 24730; @@ -14973,6 +15293,18 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"ffcode" = { + revision = 60500; + stripPrefix = 0; + deps."microtype" = tl."microtype"; + deps."minted" = tl."minted"; + deps."tcolorbox" = tl."tcolorbox"; + deps."xkeyval" = tl."xkeyval"; + sha512.run = "0151738d8bf73bbdeb742ec238038eb63c8dd979ba156ce36cdf509dbbc2e161e80b031e4ccc552a85dbbb09238e634d93bb1835b7068fcbc82b8a6a7539a846"; + sha512.doc = "878e6d0bfe32f4d38f1a0a2710010944dbbcdd29a679f8d66be41df1f31f8212a9d249a980f50d7b7b6d03b214ab7dc8befd07f885c062b55075f280796e3ee6"; + hasRunfiles = true; + version = "0.3.2"; +}; "ffslides" = { revision = 38895; stripPrefix = 0; @@ -14998,15 +15330,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; -"fibeamer" = { - revision = 53146; - stripPrefix = 0; - sha512.run = "7f10c002cd04dc2624f84bd2da11a9331639a33a5a9642a7ebac96f28a4af3fa177c2088557bd966c4250d561a8b8813b042e7fe9c456e5b41629094dffd5c64"; - sha512.doc = "1121bc8f0f7c226bee621cd0bb5f75a12cdb8dfb64540debc6b25a24a34b939d4dbac04cea3cdd97372be5b355fe028a0354bdf2393160b577f10fc31c2ae9fa"; - sha512.source = "50993fb045581fc04281266856a7bba7c2b0c9f4052a01543139a2ee4a0b376490aa5ecf0f4a3ad7a66b48e0bb4817e297dfa6002a27b57d6b5d2f819cc8b093"; - hasRunfiles = true; - version = "1.1.8"; -}; "fifinddo-info" = { revision = 29349; stripPrefix = 0; @@ -15047,12 +15370,12 @@ tl: { # no indentation hasRunfiles = true; }; "figchild" = { - revision = 58759; + revision = 58964; stripPrefix = 0; - sha512.run = "6459b58f74c4e1c752fd25827a45957fda5ef97beb5606575ec045cdf3703343b545898d1062fd6638793d1d6961893fd5500b2b5a9cd2aa04a9620f286eecd2"; - sha512.doc = "0b4f1759cfcce19bc429a46b669114b981b02401b16e2f816801206f3372ba3d51cc3ffa8e23005e76909e35690127548a1c9c3be054741d1cd13d32819f0fb2"; + sha512.run = "53fc2af05bc5f68d1fd14ac999c0ce957feb7e545596089ee06acc64ffc43102bf374957a805664a5443ffee420a9afaee2f912fdf5f6b52442b36ebc1f70879"; + sha512.doc = "87c6e78b3989d5bd9d0b527c79f9c69783319b4dc02754ede8e027e187f8a3c59d3194b23d6a5d8510fe6c3e129c0df1bad272b6d667d292b7510f3c1baa904e"; hasRunfiles = true; - version = "1.0.0"; + version = "1.1.1"; }; "figflow" = { revision = 21462; @@ -15183,13 +15506,13 @@ tl: { # no indentation sha512.doc = "497080fdad8195bdc43bef476f9e678b49d83829f10a6653c9443d327cb0da8505623e941cd3038349b6307ee37a65ce1a3d3eb48e4c6262f9d636d10d96e17b"; }; "firstaid" = { - revision = 58440; + revision = 61042; stripPrefix = 0; - sha512.run = "31e74a644d0b2a9b0f659207195cc39b7b0cdfd44c878caf541869a114ca90990637c04b3da74f9f49e2dbcb30863030fe901a67b200d1aa4a9892ff41defe15"; - sha512.doc = "368484714a5b45d47fe6b86c8025175d034842cc6e64665f574040bdd89cb42b02a739edca6806d3585a484cf55ff083616c0a210a9ca65916477ddbd4678b5f"; - sha512.source = "9c1c4ad607d2c9896504637c8efd0f7dcbb1916e7f671ead11552fbb6bcf0f8af216dc40a0ac771d3e804a02f65e12067082d001f96506d8d5435d93ff513ba9"; + sha512.run = "a36eaab9dce47b936cd5ecaf3a6134d967545b6807ae27f412b4ddb04bb8f6a72116509fdb6c7ad92b0c058ebaf021e1c901a55131e03845e7ca0a7ebf16bb16"; + sha512.doc = "e05347ff89ceb02c154618a0085cc7c2eca0bbc463d47a48160feb35cd61985e55dcd03ac1df6789330851493ecc3d0df1c391e4391f29807aa1703ee36d0834"; + sha512.source = "3bff1166851ff22c1c2c25d5c1b2d3df08d2cac1564b987185f524e72be5d99a9aef755ac2b54b3cd949d5be112b1b6a982c4c3a73be3d3f4aff9488682c351f"; hasRunfiles = true; - version = "1.0j"; + version = "1.0q"; }; "fitbox" = { revision = 50088; @@ -15201,13 +15524,13 @@ tl: { # no indentation version = "1.02"; }; "fithesis" = { - revision = 54483; + revision = 60795; stripPrefix = 0; - sha512.run = "fda3b077f21307d883b6808fe69b7dafc7d9f44c60ce48bcf10ef14e22c03b4c91b73b9fb626a2c1a8171aa3b66defcc926705c70ab5a264c8c64b847c66ab06"; - sha512.doc = "7445bd2d5065db20e62a4454fa4f7bd39bbf7df0681ca5e73af06e21b9121b72c32ce8903f453f5c24e7c82f987726f8c9d3a54f40b44f9e6c5c6e419be9cdbc"; - sha512.source = "087fd64585722b8fac089f7e7a07bd500f712a6fd8044164f1b26293cf18ee58c4f32f48072d08fab3c93af7d85aa5ac40ef7c86ab5c5081a862247675f7a02b"; + sha512.run = "0d6d27f8903035d0ca2f639218d2bd5b3454fce67d10bf480512855570b60cce4ee218f0547ecf7a6af40a3b0949a7cc102100e8703868fb909d59ef9688d890"; + sha512.doc = "5126fcbce3044d53d24cf50c18f965db083d97f7c1ebbafd4866feabfca2a7ec95a90b3e5266a6a13f76ec08f4bc75270f4ad24af8c5c5522e0d9abcc758c609"; + sha512.source = "d27a14c1d837547e05ef32a34f72026a79eca21236faeed51860efb883245a871ffa62516f97e865dc03abe9409b43ccde713c5e412e4771bf2c1439beb349fe"; hasRunfiles = true; - version = "0.3.51"; + version = "1.0.2"; }; "fix2col" = { revision = 38770; @@ -15519,6 +15842,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"foliono" = { + revision = 58877; + stripPrefix = 0; + sha512.run = "e5082c626e22acbaebbc7abadee75a71e3902af989767bcfba5d851fc89e771cf8a331ea540c05e6455b894351fdb6af6c598b5440e55c553662efdcb73cc093"; + sha512.doc = "f03abc88291b2591b509a575735f6fe3e29ffeff52e0d2cbea287efe5426b7668462e6133394374f01aa3b968fec035e6a40a8bee01b12cbacf90fd0bca80b2e"; + hasRunfiles = true; + version = "1.000"; +}; "fonetika" = { revision = 21326; stripPrefix = 0; @@ -15551,12 +15882,12 @@ tl: { # no indentation version = "4.6.3.2"; }; "fontawesome5" = { - revision = 54517; + revision = 59462; stripPrefix = 0; - sha512.run = "2d33d6faae95c3d275fad5e0a962e7e8943ece8e311555915adf6f9cec9864e00a4309d42e7e171220f16c7ce8f7253499513f0d118685f0a7373de98c9fc886"; - sha512.doc = "24c198c2abfc82930b43d04b1b855715c48b7b1d2517d955745b6eaea8b4d81496af627907a3e7d9bb232df442c965a1ea84c427bc1a8c964cc83dc123392051"; + sha512.run = "06a12635f8f847dc6f51e57ab122aba09705418b13b13bb23fc42c4f5f9ae7518bd509e47f4d591847077112b3e7588d7402a3b11d1dd3b93a71aabfc41d9e1e"; + sha512.doc = "35e403c1272908ce31a4d3622747317d2a4b482a2aca8be79df29478e92acd4977ace576d3ff8424005142edca2e4f4c3b125f5096c7f02ddd120f2b3b0799db"; hasRunfiles = true; - version = "5.13.0"; + version = "5.15.3"; }; "fontaxes" = { revision = 55920; @@ -15592,6 +15923,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.933"; }; +"fontinstallationguide" = { + revision = 59755; + stripPrefix = 0; + sha512.run = "c3f9820453f9cc3fcf4323f382a35255d2dc066dd0c090f55d15b2b28d64d8e3935e85b3dc8f30d9ee50408a48aba0ba4278d4985ead454f177ab1d484fe7b01"; + sha512.doc = "785a84a3bbcf67fcbb878f331815fd585093de89faee6f2556727ef820e392131545646242ebdef603e85e22e86b1e97f5369db4e1c565875e79683ff4987198"; + version = "2.14"; +}; "fontmfizz" = { revision = 43546; stripPrefix = 0; @@ -15607,9 +15945,9 @@ tl: { # no indentation hasRunfiles = true; }; "fontools" = { - revision = 58747; - sha512.run = "fed81ca7b52a51cd69be9ea8333ab7eb0210fab3517eb501d08ce933c7d926303a68b095654852de336b0fafa28a11b97517750418793dc61049c85ffb10ede0"; - sha512.doc = "7ee681471cfddf5dfd919057df7016ad097876c92890e68c4e5a01751210997a747192ccb38682a0565070bd90c471c27a6710bf5a09c7a205475ec01ecd0dc9"; + revision = 61067; + sha512.run = "81deb8f801835eba78d496cb83c7ad396192c98112bc6078fab6bb8c1dc35ac907b716ba07a039e6648795ac2ed7585afb1d301d8db1e04f290b25df9e731c52"; + sha512.doc = "8be27ebb9eeaf1826d98d3b7cce39d8fb7076493c525456cc6f2bd65de784e9c30faf131421df9594452975cddea5ce12e0e4752d07089e914e92f11e3b9f235"; hasRunfiles = true; }; "fonts-churchslavonic" = { @@ -15621,30 +15959,30 @@ tl: { # no indentation version = "2.2"; }; "fonts-tlwg" = { - revision = 54994; + revision = 60817; stripPrefix = 0; - sha512.run = "7239ecb9ffb0dea42d339b1f758c3c4c11f18b6850b5265296c04027922d5ec882d7ee2b6eaf4abb0d2e702ff349833adedc36dd18eac492e191f43da267fdc9"; - sha512.doc = "a122c38181cb85964e6344c6652e20444e09943cab0d5a25580aaf4cb691cda33808972dbe3a7cfc7cb7970a7233741111fe52d93d51e3fe06615710be4089de"; - sha512.source = "901b278e652010001b05d485b8a1e1d339c5f69b957965b3bb54791b2ea91d4db5e3ad93d168ae909dde39fe3569b82ba998b372021c66fbd4292bc468f43ddf"; + sha512.run = "3b1894d677b63c88010fe583381ff7c0c8a7c5c6753e62e166ffa8ae7f18d6a521b12a4e57f16634855f3b807605407cfad110eb405a3ad334f8a14bfacb6338"; + sha512.doc = "93de1f1c668d460644f8246ac25c47f10d99e91c878c50c3096e2df373e521e54412c239d89f5372c767cd768f7973b06f97f25705e865dd5c36cc3674496c0e"; + sha512.source = "555a7e3fb1f1202412dda95924b692f21b6ad7d1abb68b5fa789e360667b6a23bc377651d592d43aa67728a8bc9f2a20ad5b1cbca85c412b90ce8a8654b07b17"; hasRunfiles = true; - version = "0.7.2"; + version = "0.7.3"; }; "fontsetup" = { - revision = 57553; + revision = 61261; stripPrefix = 0; - sha512.run = "4bde3744749a14553b1b8a0638584536dc4f7604435597e33ffaf519d136477e01eb410f30e89aa1630c701aaf39ac0ae696215ace362cff002e0d1e4c9b37f7"; - sha512.doc = "a73455cdeb748fff1e6e7a1ef9ef711b5727799212da6e7be37630f6028a9ce10b13206d7e6f7c08529e90239832a72d054c0cb1d057d548ce898195d028d068"; + sha512.run = "382ad3ef0e6b5501313a9c2fdd31555be9391c639fe36f45e5758498587f2d5ee61b16e30378f30389ec10947e054eb127b8ffb31238edacc7afc1fc46d542dd"; + sha512.doc = "4dbf61c2a0dd897f17992770459641bdffb460d46da473ebb6e036bc74f4e68cf49ace575b1816af1570697ce7320e6253702f730e9b480997923431b426c9a1"; hasRunfiles = true; - version = "1.009"; + version = "1.1"; }; "fontsize" = { - revision = 58508; + revision = 60161; stripPrefix = 0; - sha512.run = "844d0b06f0192a9d2a4e1334815f11581450ce29ae03d25955fe3421d6c3532fe0b53ba8496a4eb3c9c55bb5cea191f5ad59412ac37763738c0ddbf1b63a25e8"; - sha512.doc = "5b7c2abc87e808ca33f5b1c6ff1abbb02a4e5b9987f6a44dbe5778ead77ac218def325ce9184b3d300524fe9d0d43c78112c92700b0dcd4a413cba489c6dd248"; - sha512.source = "1084802e6bdfadff2cd373d69544bc906ef5f3f076e1cd8bffe9b85912fd1202b02a3e43eb0ed0115e1915f78d07d7f5847beabbfbe2cb4d31f17ae75cfb6179"; + sha512.run = "8e89cde1cdcc388a5e8ef48ccfeecf6f1f25e938c7513081bb17bb4b65f889c2826a929baf4833b2191554f3ddef2dd9c5bbf50f53ff14fe7463ebd1e494aa4a"; + sha512.doc = "0b4cb325f4ca5b94a1757aea9ab3dc00dc92ee2b095dd35f176e7acbad7e1ec87a7e2b7cdf9ed19bf50095c41f221f8c791c0e7c9d541021768945a84a30e51e"; + sha512.source = "42b9a587d63a2a0190776851b86eb66c4e7e2811a4367ba659ebc996fcdf365b9447c94a4d04af5129a6b95d119e37735df9b26fcf12702f157d61932f64eef3"; hasRunfiles = true; - version = "0.8.1"; + version = "0.8.5"; }; "fontspec" = { revision = 56594; @@ -15718,13 +16056,13 @@ tl: { # no indentation version = "1.0"; }; "footnotehyper" = { - revision = 57618; + revision = 60374; stripPrefix = 0; - sha512.run = "bac7b7ce8ec3f74d85e0182f1d65fd0c365c16426fcc725407e1d8146ebc15422fe2e10f20570e68802ae2ac405aecf55ec3dff45e7e6c1bca7b57059e0dd6d2"; - sha512.doc = "6fb3d09ca9c5dfaddedfa2c332634a0b846ffd95f67c1d00346f2d2dab60354a8678315f8987bfd13427909f0d489653f465e03252e84eac13048dbbbde9e6b7"; - sha512.source = "f881ccb20f056ce3bec35061105f93e520a32565c26a5a8a89623ed5c644d6a6510683e4fb099a32492530f2751f043f65ca29c768b0eb0fae959872ac74b820"; + sha512.run = "24d270cf9fdcec81a91be4084e371338f1daa0a12c8344b850860bddef360c97d66e7475711106ee0d1d2f4df359abdb2f0005740aaca83651ce92f1d6c89140"; + sha512.doc = "605c22ffce3c413a0f9caa41a3ff7a43022a9c7a26e43fb177c107c2bc156c93a75f392b29d46880793788f9b5f0ac9e87cdb4c5075a247c17abec2e41527ef5"; + sha512.source = "77f579a0e7422a98e0fa9898ea5fb36223f66a2b9889a0da1b4cb40736d88d11ca87820503ea934e6b7e41033ca18974df4d4f585d8283a0e62959c9c16ab7c2"; hasRunfiles = true; - version = "1.1d"; + version = "1.1e"; }; "footnoterange" = { revision = 52910; @@ -15792,6 +16130,15 @@ tl: { # no indentation hasRunfiles = true; version = "3.0"; }; +"formal-grammar" = { + revision = 61062; + stripPrefix = 0; + sha512.run = "b780535573e46257b0663e09f7b923b95258adf6424c5134fc56486937bd82cd993fe360c1d759c230224ac53f6edc49f225a3983c4de59f5845580457660743"; + sha512.doc = "1bae850e65fc9ca375a1848b4bf579cf4a21cba2c28d743c61a2ebeceb7017eedfdaf7c713a151887221f69d86944f0bd0f71943fadf10031cedf8767338ea57"; + sha512.source = "9903b5460e12bce7d5ed565751b789d80b6e62bef793dac38bb663673319efe4a3d58d566f28e5f1c492c225dd2a4a91a73e52a63faf73c7b511251bd7a4cc3f"; + hasRunfiles = true; + version = "1.1"; +}; "formation-latex-ul" = { revision = 56714; stripPrefix = 0; @@ -15978,13 +16325,13 @@ tl: { # no indentation version = "1.4a"; }; "froufrou" = { - revision = 57248; + revision = 59103; stripPrefix = 0; - sha512.run = "62879b91bec8db0021f41d8071ba87bf924445aae702eac318e215cad1aa7b612e17fcb52952184264cb37ca33283d1c7430afaa0c73ad8bacbdf4cb3347a8f2"; - sha512.doc = "1d1c4c1fa5f7ce6d88418c89f2cddee2fa520830f32d246814c5a26f6f2c5b675d80082b0d0075ee3a85d0a529974bb8617490f65b3294871e3bf9708a3ed345"; - sha512.source = "84f8126bb7a5bb65f69bf656c9009b57595e057f9293f0c14e90c49c164181d0218ac9f2e307092a79094662aee10eb50168a2bbbb2cfe9e4ded602c36e8d1ec"; + sha512.run = "33efee00b38590de9510689730fa45f1123b5df05fae66fbdb4ffa740e8495309e75c75dba1c7d4d3b58ab7cc1a85d899654a27cc31f3b5eb983f512b5641db8"; + sha512.doc = "4b19469842e5dd7e0b852e531d2f99159acef4b8eb0cbaf3c03a510673a95896abdc2f80209ce164f71acca58c476d593a30449fcc05ae52851f78f76d6000bc"; + sha512.source = "4e06412734c22e9035b311771412e4221cadd00c693f13d78ca221b1e07e895f09cac9ec97c56be02aad4fdf7e7f6aee3e04585856b773e455efc499ad04d763"; hasRunfiles = true; - version = "1.2"; + version = "1.4.0"; }; "frpseudocode" = { revision = 56088; @@ -16128,6 +16475,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"gamebooklib" = { + revision = 60318; + stripPrefix = 0; + sha512.run = "229c7f89f9e0a8111a9191a40820ad3c2c560428e07234d176fda2718d9394652f28f382c2bac908f6272e1a58c81ebc2efa63c7ba5c522d32e8f22019c80f7e"; + sha512.doc = "5cdc51138e162d91c280ce400d8f162f34b1975e6bf9b3f23a27dfcae23ffaacd78e950a22e34a5eb7880e71eec55087fbe901fc10a4ad76d17d7dac16996166"; + sha512.source = "f457bd442aaff8402f793e90556a367a1fe0a82e82af6e9cb01f6270a771c35cde0bd69cc77eed07f04d30fa2aebf9b04b40dafb0ef7569b2c8b429ecc5fb269"; + hasRunfiles = true; + version = "1.1"; +}; "gammas" = { revision = 56403; stripPrefix = 0; @@ -16159,11 +16515,11 @@ tl: { # no indentation hasRunfiles = true; }; "garuda-c90" = { - revision = 37677; + revision = 60832; stripPrefix = 0; deps."fonts-tlwg" = tl."fonts-tlwg"; - sha512.run = "304e330de80c822862725f05da0c800ff8043d73398a48a4d88b9156d5575593aa1797e65f88093d3058594969fe3a288010efd2a13e12de52beb405ebfdbeec"; - sha512.source = "2e2b368b01952c710fa01b68b8b094e2c64905ba9e6375c3d6a5d82a4b63dea5f6343db3898472416ba9e7faa46d660f34bb2f6d3530aca753feb5aa5c1ffa2a"; + sha512.run = "a806538598cae0365968ab20936631a052dc65f9f6056c39197f7b1c7a5aad717a7a8b72ed2a1af347f8ce91f27d7dcd74b758db8f01fc7810a8d658990bcc28"; + sha512.source = "58f62ec8020489b69743c0591129967730f9ad0729f7cca343ab6e6fa6675122a1e37bf73f090cae050cb695a14dbfb3c52346e3c528e660484d2cb576aaca65"; hasRunfiles = true; }; "gastex" = { @@ -16174,14 +16530,6 @@ tl: { # no indentation hasRunfiles = true; version = "3.0"; }; -"gatech-thesis" = { - revision = 19886; - stripPrefix = 0; - sha512.run = "c5928d0d383da4057a0ba00d2848d324624228f1a98f0f254b09fea35ba21e3ce655f1fbe02ecc6291921e43e9dbd2ae954d6199dc22c1390bf04670ca41038f"; - sha512.doc = "9fe1e4342becab8b57d892256bfd0723afea3a3f4ad3edab2b3c374bdf410d14b3105f165aed56479e848939a5cf6c807112788ff3a82099641fa71f4e78b5ec"; - hasRunfiles = true; - version = "1.8"; -}; "gates" = { revision = 29803; stripPrefix = 0; @@ -16214,13 +16562,12 @@ tl: { # no indentation hasRunfiles = true; }; "gbt7714" = { - revision = 57157; + revision = 61282; stripPrefix = 0; - sha512.run = "72021c4eb7e1ee1b9b293801988df67c0e62fb5f46c7036c4dc75357a95a80d040782c4a71e98690858854d572351445fe6c06269ad8f926d62fd668095815a2"; - sha512.doc = "c41fbed87dcb702241f8f8c3004854d725083f9e0dd2b3f1bb92a70210539617b728be086c2a7e823a8be0fc9b906cf965b9202fc5c12f4f05e87d73504444fb"; - sha512.source = "7e7e48208197fe92b939f569cbd0aaa96ba1b6b35821dece635c36572f3309f2af00d86ee70a6db35aa7ed261a4ca446dd857fdc1026bf18bf4c6adeb110ea68"; + sha512.run = "75cad8b2657d4eb23baa95755b573e9ca3e5c8e318dbff805607b5be8179a6e1ab00e50faddf24db237e28b5b408f5cc040f394706560b54686cdee522618653"; + sha512.doc = "7862c027931a3d437c58d69aa5db5678cef860a403f64368d4a1debffad97f2c5e66fc65f299c282569dee48fbc41a6a92af526e94a3eb93b3c90a7c58d8cf2c"; hasRunfiles = true; - version = "2.1"; + version = "2.1.3"; }; "gcard" = { revision = 15878; @@ -16279,12 +16626,12 @@ tl: { # no indentation hasRunfiles = true; }; "genealogytree" = { - revision = 55978; + revision = 60562; stripPrefix = 0; - sha512.run = "80ff65cb67a5d431e316b6cb52d001ba63b346f117251a06c560c506f8adfc81644cc36d113b0a612acbc9b78c8627ead8c75a449486982ec786accaa79d2af5"; - sha512.doc = "708639b248db280a26291d24594c70fdbefb8a4f6cb581ab5e95e1d2e1f122f29a5412ce876604afed42c881d02c4baaaae73aade99b246160895087394b7906"; + sha512.run = "f364f331d9e3769bf25130edce8cef5b9c30db51ccbd9517f1e335ffce0d2d8a362114dbb1471856746bf5737eb89c773fbabc4225b5cd655b1daad6153b0004"; + sha512.doc = "64bbcaecd5cc923bfe38273fbf01bd2dfc2fbfcfb14b2a5cd815704bc7e5f043cc3794ceb891cf018a1735441e225539dd21187606b6188d7eab4862224e43dd"; hasRunfiles = true; - version = "2.01"; + version = "2.1.0"; }; "genmpage" = { revision = 15878; @@ -16328,6 +16675,15 @@ tl: { # no indentation hasRunfiles = true; version = "5.9"; }; +"geradwp" = { + revision = 60227; + stripPrefix = 0; + sha512.run = "03eec24ca7e5152e83da1175ed9873cb3fec1d41ecadc5da4bfe5155b2d90985368f753b6ced659bd34630e3d909654571098ce2cdb679928b43914a140566f1"; + sha512.doc = "e4460ac5eced7da09ad25c89257b47da638fefe95236660fa2a3f69089ead971f71c202c19c03df522670a444a0c0defffb73972e105bb61504ec3be15e970e0"; + sha512.source = "2b2215a676fd7238ce463bab55c1d71e7f02edaab6a3598fb3a48174e8edb6cfb98b45d971049cf1cd5e4ad247af5898a734530e3b870cff9570e9ae92562376"; + hasRunfiles = true; + version = "1.0"; +}; "german" = { revision = 42428; stripPrefix = 0; @@ -16626,12 +16982,12 @@ tl: { # no indentation version = "0.1"; }; "glossaries" = { - revision = 54402; - sha512.run = "e900f8bc7b9f04088a3b2cbd3ff409603babaf232f09d6c75e85e3050ab0bd98b90c6e04e01aebb183e9fcbc4865c34568a7392d8b46ab318b506d10f1972d99"; - sha512.doc = "7c364a8a843d32af396b76a14e3abb97a82638a41538653aac8046273b9d669bc1ada0744435f918eb0c169852fa01025e4f4257783b0101a60231de708fe82b"; - sha512.source = "3bc7eebf8a0861b6236cca948f053d90d550292a7ec9b1694325ffee594a166dca180b4153ba86c711ebf5ed5e81be8e52432b3a1229a3b4d477b6722c1e3e56"; + revision = 60921; + sha512.run = "9e9fd1abd6728f6b42b158542abcd5d35b5205c6452e1900cbc06b664ea2adca2da9dbf375c049227ff955bb7152514b8f358c7a527d5b47edfd80ee1005903a"; + sha512.doc = "0f5dbfb060a90bf677b2dda55a08c2a5a74ac2978957a18e76ec269da09c592ddf97cfd83f4a802255383626a45aa3399fa037ce6025e03bcc258bd96745faac"; + sha512.source = "94d27f11897712f688accb817e1d8d3172f51ca6f109acbdd3cfbfeafd7374d4eb92cb3726994935039cc9724cf15a4d6c646f1c3a1c7c00d6df3f3c4ca17e73"; hasRunfiles = true; - version = "4.46"; + version = "4.49"; }; "glossaries-danish" = { revision = 35665; @@ -16670,13 +17026,13 @@ tl: { # no indentation version = "1.0"; }; "glossaries-extra" = { - revision = 54688; + revision = 61131; stripPrefix = 0; - sha512.run = "6604e11d960693f3a4437a5eae8f4e508057c22bec61be620971f3fa88563fd8630d0b3cedd9cb259e0e024b0813db694bfe23d6fdbbfeed9e6543919f73b20b"; - sha512.doc = "e8fb201968efd7701260f9b5fefab56930441b4240aed8bd90128c4dcef85cdd8d62372b579797a9450b56ceb37e7ee2793049f8098229f68b3d4915cca2ff3a"; - sha512.source = "9810a3934dfdd96bb0ab857ad3e27b9b36b488240f7fb86cdff303f26288a8e3c008aa5eca3af2402660040d6543f33023a47ed8a541290eb553a8adc5305e11"; + sha512.run = "232620a42a6209e01afba4b141068e7edf08791df73db7f093d3dc11116c1007e9b529bde74a93c4657f257ec2d8e7467a417ca4e4fd4e0e44c0b329915d0390"; + sha512.doc = "aff1287df1446ffe31cd079b52764a17b4cf92e72c6dda7d25463a470f59f1f9a56ae48efdebe54eb52cf1cc40bb05858f01abf2bbda01393de1b88de5fd1aad"; + sha512.source = "a08cc6e47c863ff751cc2fae417dc8f0e76a488a4bd31ddaea7c08fa9357033c610b5132ca3bd670a256894d2edaf53120178cba37ff61cdd08c28fbc75f726c"; hasRunfiles = true; - version = "1.45"; + version = "1.48"; }; "glossaries-finnish" = { revision = 54080; @@ -16978,13 +17334,13 @@ tl: { # no indentation version = "1.1"; }; "graphics" = { - revision = 56514; + revision = 61315; stripPrefix = 0; deps."graphics-cfg" = tl."graphics-cfg"; deps."graphics-def" = tl."graphics-def"; - sha512.run = "a04c805985e40b4db0abe1f308fe9f2a0ca4d1736e38d8390294c648935ba1d10ed2c0a16af0eda55736f699359c38e6117487a2c37e2c0d73ce588fbe438e17"; - sha512.doc = "34382cbc4b6d48e60b00ec9eb1fbfbe786d339206e7c7ee3e33163ac41319e0646382745760d546b5946f54ae53882d8dff88bac2c0db117185be66f2f450673"; - sha512.source = "f34cac380d7a42ad97f52aaa07bba40194d88c51905ae8e36b3559cd7dbea0152fb0ab09da353aa694317c360d7abe649b12477f9e2a59a8cb280175df4b5e59"; + sha512.run = "692b47e11cb0f25c3383d64ca8a71bc479da6157002b870e131250caa0539dc48d52409f932ab41cc75c1a9f463524ea3be4f73458bb0fae24059bc9ce828e20"; + sha512.doc = "91e22a03b32d18e25663fc2d940dea620ded99fb0980bf31d9737591a9e1bc13c2507b6e07275714fa1ac1f181e952cd5e13806a5d01dd6ca953d9b691fdba8d"; + sha512.source = "d3fe1e52410fb13f764b5f0d63717f37123935642e2d46398e184a0da5e31fbf6b7e40b1381daa404edd76cf51f60d6a77f69f6a5eb40e552b8ef91adc7bb103"; hasRunfiles = true; }; "graphics-cfg" = { @@ -16995,19 +17351,28 @@ tl: { # no indentation hasRunfiles = true; }; "graphics-def" = { - revision = 58539; + revision = 61111; stripPrefix = 0; - sha512.run = "441fad3649b85fec474e9191f03b63b9e6a9b594db159de8740409f3cf79544a5aa8b9ee6d939f17dcb4b84507d105bb1bbdd7c25239d28096e99d97ea3c9bec"; - sha512.doc = "9ad910e5870eb492921b40ef516f0d9e5b571b9c8129e5dc46f40c01cedc1724b0ab01191e0b37adfab62825857847b3ba6b8acaaea24d0da6b38d4b6191b41e"; + sha512.run = "b0bcab88322ef2c11f2c94552b5d64dd929bb0cc4ae7f060ecf8aa871bfb6ec2756ca47548dfd9f2dc83b9008f919b2a4f006c53320e097585b4b7fc4e27e925"; + sha512.doc = "a860f3ebe751de6b1dd8f0670803ddc85eae7651ec37e3436cea62ef3bdf705d1edda3b8f7f84cafc80b25e9015f88193a2c4cf443ab1287e3469fc8acc36862"; hasRunfiles = true; }; "graphics-pln" = { - revision = 56823; + revision = 61063; stripPrefix = 0; - sha512.run = "cbb87e4d040c6844cb2e677d352f9fdf9dca7848a894225944f52abf4b1ab9c03d6ea2881074b30bb618eee647ebfb70d8baeb2a82c3446bef40a47487e6b9c0"; - sha512.doc = "8051321f777155c8bb81d8e514a15e01d282c8ba73ceee6c60fa76201c1c91ba47299bc2ac3b21cd210a457daa1c549f73d299f94e4a972d2b7467ae9f7b9a87"; + sha512.run = "6e80941535932c4ee08cc8af903cf173de5582b94f97b85d1ed55b5b1d5253e532af2e47657072570283559d429dbd5b56ffd30627dace62af4103b7dadfd53b"; + sha512.doc = "0955c1b23ba1cb04796066252a1aff1b724b2ddaf18a1c8118b5e7d610e9e390f67a6291f6cde4b62a170cc8503c6b910b04d4b74c726fe33dc4ce5bd7e3fea9"; hasRunfiles = true; }; +"graphicscache" = { + revision = 60150; + stripPrefix = 0; + sha512.run = "073c6771d9ec297bf6585f45234fdd9482d8d257b416dfe5812fed0bea6b7b7a7c975c90fff725d67669666d55928844594902da5522ce72a64183bff9e48a61"; + sha512.doc = "628625c4748a209372a89cae78cb377ff450defb6d705d3398aa4dbd961c6ef266be0d3b42d64535b3baa7cc61205c7a987a053ff4e9029ef61d48626b0f2809"; + sha512.source = "0f9999427d54a96c9fe39a6bb35829dc07534ba18fd0e25b451dfb6f87ad44c10b065ed36394596ff4dd5140e74d94b5f95ffe1b1a36e357a1cb8c5d12313fe8"; + hasRunfiles = true; + version = "0.3"; +}; "graphicx-psmin" = { revision = 56931; stripPrefix = 0; @@ -17192,13 +17557,22 @@ tl: { # no indentation hasRunfiles = true; }; "grundgesetze" = { - revision = 34439; + revision = 58997; stripPrefix = 0; - sha512.run = "2fb5c03a405e29d27c929fd3970af300df8134efc584a52dd088adb6e0678979af7c6302cffc590b2471a66e13399f628d257f298f1ffb9689d8aa1d268b9438"; - sha512.doc = "cdf228d38f34810d543b0e5135acb75a8ab12de7b706bda79f2abe9b6cdcf1e7c7ccd3f0ddb7cc4cc2560f5fb06c06eacdebcf06af89500953812f2e7a0c8285"; - sha512.source = "7cd35484acde51219cff50fa78fc202c03ddc761fc2151bca789454e0aa0a2ea4a8088a5c6b9cbe468707f9efcde661c2d4c5357efc161d8454b4749870358e3"; + sha512.run = "f9912e5daab42e6aaec946ea34f420acc194ce88ef75135ebedcdddd5f70fbebc81c250f3368bc8f65cf3952d0229fc450ab40b58bd02473ae4eecee783f3f09"; + sha512.doc = "7dfacbd4686f5296cc1f677b99f42946f6ba1e761454308568ecb013df3eb0a505273e1cc357d11780f7d4762d03007ab44b87343062c50666bc8e89e1512ed6"; + sha512.source = "dfa00982121cd247149768a95ac8555a2061ebfa1bcc154ff944d07843d213ab7c7bf0931cad3dac118cd995abf0fcfe03f12285e2e7fc3e808223939d4c1d58"; hasRunfiles = true; - version = "1.02"; + version = "1.03"; +}; +"gs1" = { + revision = 59620; + stripPrefix = 0; + sha512.run = "d12c13d30c9e0303bf6c6bfb833d673cf673de3c60cb9d637aeff80470d34e04653860e2186c16c55660faa107bf583409a9891ac8d5ebf1612c8410cf60d10d"; + sha512.doc = "b3757db8c56cbacb87bd17d578be51321b0ac06a3cbcd75b136cdf52bc66a046f0db42af84e5fc33bd347fb52950448a352027713ad01263fe6344a75576efde"; + sha512.source = "bc9f08753c9663ecc056de0ca7662dbecdec18ab9346e8590fc1ecd373392bce8af50a4a5f37eb6301a2cebce0dffdf0025a3d036f14ad0f696557abdb8f2716"; + hasRunfiles = true; + version = "23"; }; "gsemthesis" = { revision = 56291; @@ -17310,13 +17684,13 @@ tl: { # no indentation sha512.doc = "268a01f59660e5225c1c21539076e6239381294e6aaa31992032ff8e3d777cb7e4195247c92d9f22efbee498c8bac34cdb915e0a5b0f6cb2b5c0b72c15695d72"; }; "gzt" = { - revision = 57765; + revision = 61323; stripPrefix = 0; - sha512.run = "b09bdcde2891d6d84ca193a6183b4286d1912c98fdd7cf6a7e737574f352d8eea2fa5cdcf71602291e9f1abd8f7aed3ad9fd6d56571f62a59e9d9bc58c875637"; - sha512.doc = "a44bcb21337d7799d6fec0da69784252bdf74be493bfa75fe425a83e7f6d71b1ba46e45626d94b5a1b6234e0c21661cad68e0a95339d19c99577ddaa31a1a451"; - sha512.source = "48073e4390ca1e8c0fdf1c95069439160b77ac2277dd1452b36c48172589b4a5aca1b5a2f040675acba09f5f60d80fa241475c1eec828d13d21f942ded6714bf"; + sha512.run = "e1db9628affe8eebb6f9b79bb386b05d62705fdde689c435963d3b61b017c7f3a10cac5b74473101e69ea1ad0d3deb19c354133ec6cc38242321504ac0a10989"; + sha512.doc = "c599c08e0f8f3ceae669beae774bd0069b0b3050e9109b9cdae3086ef38460aee61fae265d9c735d9d6511bd89e9641af765b7a853dd0a62d4b34798bd77cd67"; + sha512.source = "f9c56d75f787de79e3c888a1b7df2f30190a5ae560d0daf61079061db38b961cd0d1b261e8858c12e8ad1f86c67eac24be63eee320a167fde90a82007561921c"; hasRunfiles = true; - version = "1.0.1"; + version = "1.1.1"; }; "h2020proposal" = { revision = 38428; @@ -17326,6 +17700,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"ha-prosper" = { + revision = 59651; + stripPrefix = 0; + sha512.run = "fc78d9c422c05e4d5b859d39f4b681c5deda4d6850ea383f33b71b0e2aebc5e4740811a831e8e364122c7f451866751d77af8d5e4fd6b8b9f5dbf76f23a7d09f"; + sha512.doc = "939e86ee09351991654d8542cc21667e16d64dc56f0e9d29932b816458319c3ba8e0632e92bc8c17cd104fd10dd7171a89f9026fc9faaa197fd7376c61377d63"; + sha512.source = "0ef051d229ef636232751d77ead251622845f9b973ee32cfcdf67c046423334c0fff283fa1f569464931ff8a6ec139e9fb16acb133874bb56aa11684b7388f00"; + hasRunfiles = true; + version = "4.21"; +}; "hackthefootline" = { revision = 46494; stripPrefix = 0; @@ -17373,6 +17756,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.6.0"; }; +"handoutwithnotes" = { + revision = 60986; + stripPrefix = 0; + sha512.run = "6d633397b97aa5a0a63898577c60dadd8beb845c50928ebbd1fc93153c8dcfffb670da08afd44eabfdec1f66455a9f35f9c83fa8d5cfb7e70246b39e53e61f54"; + sha512.doc = "c2f7d3ecaacec41cee39d65fabd79e3c4313e0034f0044b984ac43713820818a5e51b255903c39b52cf27ed5b74be4b1673fc7aca2471ca18905c47d038ec926"; + sha512.source = "2ba124563c2df167686822d5079cfbc4bb7dbca8369df82068978e7dbd2b59820dad72310f60be560f8ec9aecf5a44e0bbbe626779f6777fd30dd016efc1b627"; + hasRunfiles = true; + version = "1.1"; +}; "hands" = { revision = 13293; stripPrefix = 0; @@ -17403,6 +17795,15 @@ tl: { # no indentation hasRunfiles = true; version = "20120101"; }; +"hanzibox" = { + revision = 60737; + stripPrefix = 0; + sha512.run = "3e87de6b784e75135eb5e22b7603840f025034229b15710fc23bf6711f073e4f2afd552b08114e01a75d4c6812487fb0b24a1e782bc4027e6b5f48025b0e114d"; + sha512.doc = "925c0d75542d143dcf5ffe5a0f0ad0f46da3093e188a4d458af2743740c2a4c32d850d00f7bb0af3e29e7a148e45d50479d32afb25f970e929c4c0315e953e99"; + sha512.source = "7fdb3d9996ac5f615fb66eb02ca24de1d3d85064d1c74eaf29eff358198de04b51a5afe370830cccc94d58b9c8a9007a783fbfd046779876178985c1bb9b7bb3"; + hasRunfiles = true; + version = "2.2.0"; +}; "happy4th" = { revision = 25020; stripPrefix = 0; @@ -17419,19 +17820,19 @@ tl: { # no indentation version = "1.0"; }; "haranoaji" = { - revision = 57574; - sha512.run = "536b8f30134c8ec45e7e55981799520214bc646fe1f8a5525797612d130a9897070fd703b5920a7039192e4411ccdef6d23204c839be2320dc5f557380a55070"; - sha512.doc = "45edaf645bcec4a88496d17e497b39267bdbfd3b112e68bb78aa6c81fc30dc2ff9f14c980526a444e36a9dfef75f7adf3ac33c3cf29fb7b080a7d43c8461adc7"; + revision = 58830; + sha512.run = "13029f3d1a25d11e2f9f04213532910bfededd9c8fc6f13913fd52c0018db493655a31084ca3ee3325569b500de5a641e69337a6f23ed575e429475d66940898"; + sha512.doc = "0e6b2d9cb7afbef675d4a0cff16b80729ac70d48bad26a5b2e784ef6386aa8f8dcd156b51f19d9eacdfc38962da135aeb1a3bf735f38fc7cfa300b9100b57ce9"; hasRunfiles = true; - version = "20210130"; + version = "20210410"; }; "haranoaji-extra" = { - revision = 57573; + revision = 58831; stripPrefix = 0; - sha512.run = "bc4256282c9bd61ef820cbfb337c456f6bbb5db8b3988c5c600b69dd91193478e62930a20f70733a6cd1dcce7d1520f7f1a63be7c0b0ef06b1d11698adb752ac"; - sha512.doc = "3884f3ba53c433f0d7019bc7773c5d147e9947b561d99e66fc2e5218ec167bfd9e6ab0bb368368480045ee665d89ba89ab2913fd920d404946283ea398cd4f32"; + sha512.run = "97d75fa7b631b9319c66c4c9ce7768154efb3ccef02e8d8a0f19660972e171b59ad1a7cb53df976d6f593f7d7e19c897afdef3fdf1a2cc47648e53ee1512884b"; + sha512.doc = "46e4516105a996f0abd7a848e51e98b739d7e525ecf5ce3db2bb7542849219414032db56e304e62a588d6dbc26cb9cce174189c75885d161a06a5dfc6d6c69b3"; hasRunfiles = true; - version = "20210130"; + version = "20210410"; }; "hardwrap" = { revision = 21396; @@ -17531,13 +17932,13 @@ tl: { # no indentation version = "1.3"; }; "hecthese" = { - revision = 56181; + revision = 60455; stripPrefix = 0; - sha512.run = "8a2d32907fd13e505bb0d7a3c2683cca93c3fd40b471adb622ce06a315558c9ac8f991a3fffbcd52a6be93cb027785d4814e0f9364370cc423a30b115ad644b0"; - sha512.doc = "efa6e45840e77b4a9905cae13b7dc3322d85429c5acb4c59d81a86833b0bf0d92f38fdcad00f5befc32e883ee4c530abd6921411ff7c5c2df8dd25507a6e1480"; - sha512.source = "940e0bf6cf217100912e5950e5a345e85baeeee109b3da2c9f0fcd539fa886241a7fa64526c61b0233f06462ddba07f6aba5d3cc3795a2bd17f694178828465e"; + sha512.run = "c7956496814a25dbcd42c7f0034e32cb40746da09e8a7d527b1b5cdc4d557971b55117ad35b60db18e21bd2433f13d3850fdf9e2364184c0dd9e7a248be2896b"; + sha512.doc = "680b2cc373f0b7bb265ff01f3d07fff56c07e5c789a7528a2257b2e4282da510874611a4754c5b65d88ded8b8b32ad1343706dd1d77e8a4594c7291fa5b201d5"; + sha512.source = "fd4318bb47d45336d5010544f0e048a8b23d1a2f33cb0c7c24d54fcca59c20ae62887285dbb128f234170dc0cd057e96793b8012274ff400e2f63da0821dd309"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "helmholtz-ellis-ji-notation" = { revision = 55213; @@ -17562,14 +17963,86 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; -"hep-paper" = { - revision = 57045; +"hep-acronym" = { + revision = 61168; stripPrefix = 0; - sha512.run = "e7422cf1015b554b20d6fa6cfca317fbd2e057ef31f6d57448ba11126c3b6b863fea428c642f15b8cbbf46929ce943f362cb99cb95cbe7d1bfe821c4315661f8"; - sha512.doc = "29f71a395be21b72cfd2c0f167e11475215dbd7005529a89032a316d5802b8e2feffc7670923ea57b6f2bdab4d298b7798f122263ab496f4a4da323f8a44c483"; - sha512.source = "7610edb2223471f6ad729dca66145bb0686e56fdcebfab9260288c3fbaedad0be638f300f789158d824a0a04828297853c5b0774c4c2a96cbb0d48f2d93fd61a"; + sha512.run = "bd4251f8bffd16dbebff48333af4c988938da970af3c5e608f70c048f548eec0a6cfbbabc04f354dc3bbd4bc91580b9eea01e8d63d83b3ccd010f1a48f7545e7"; + sha512.doc = "072efb75240f15595193e9622bfedb3a8f21cf6683a8fe45593b466a5c5f52596dbebc04e231a604f05ce9c147939222657921a405fec81c2af19761a7d7b64c"; + sha512.source = "fd63dbe9e3532c953749a7aee66b057a2699f985a875e974b82a46bae79b7ba5a2afb46f0a4ae780f68c05478201b665df5b01614c9993c35aae7339a040f5fa"; hasRunfiles = true; - version = "1.6"; + version = "1.0"; +}; +"hep-bibliography" = { + revision = 61166; + stripPrefix = 0; + sha512.run = "89a137f3593457d5515634df5dbe2b8d915a99f5ff20e10c9947266d3c7e0ebb6417f3329e284f9173736d5ad822967914d4cd1b29f04e84d096465973b5ad01"; + sha512.doc = "95730188e069a0f968dd9ff32bdd8fc91da82fe7fbe31c06270ba92265d01c3aa71b56d0bf45f53b7fd9fe5189565c47cf3aff52515db898841cf81ae09e9c43"; + sha512.source = "ef2079ce4367d3878084bc399748f729edd9b526e08fe63a3e943ce9b413fbc14e3908a435e5d1035c696276b04ee25755f647398f719efabb60fa8cf5c19128"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-float" = { + revision = 61169; + stripPrefix = 0; + sha512.run = "15fa9118c9ed26b4ae48ad98b4762893bdbfd41d95a71cafeb16b7b5af3fbf83a64a14bbe9400ec3fd24585d99b706513bede28c1e074321e17d7a20106b0cb4"; + sha512.doc = "3e91d4edd87a7fb517626eee0baa279b059731f6c5a9c745643214304da8593d2f2899bcbdcd2e1d195957f11e6895f667b63f83a68bd415561dd520a3cb6cfd"; + sha512.source = "0a18700c119e829fd81d5956c4b31ac198c3a376f2fd9a8bc29779d4d4a923f1094f8e0e45abb8ffc330267f6b2ca450c5b185474f48ad71012b43dc784e0065"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-font" = { + revision = 61164; + stripPrefix = 0; + sha512.run = "eae6a14ad3b6c1becab5bf4e00bbedde2fd4f917299ae761bf4a942df3aa481be53d19bf66e7737b568726f5eeecc22e0b8226e3c5a0bef5091ae889b997a02d"; + sha512.doc = "aab041e7c9b6179e4532f3adb1c8a202b9985c928b947e2046d8f3d2a0090bb3c8aab24fba8ce82ca30f6d29ed95469639fa800095535beebfff17139ff8630e"; + sha512.source = "dbb4f7f562b312e911b7ac6ee7beed8e5085704263e3a1bc568f80cd1b735f5344949e51149707df6bff67e8c6d3d8e2f248ee07728451eb33798f6050a913bf"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-math" = { + revision = 61170; + stripPrefix = 0; + sha512.run = "a5a4455dec4d7b5e1b1cab322bd3aa5168bd828854eed7715bfe02c491b83059f9f77e09bf72913244d44294c800b6c544a86d789eb11b14f3e20116259dc4fd"; + sha512.doc = "af05b99b6adc395ca61db1364aa12a8e2a8ed0ac4a09abf80e5574a25a04b715a006531b6efce23bd0888698b7fde2323e58e9ebf499d7ee270a2701eaab4524"; + sha512.source = "57262758b617224a06a4ebc305a16c7f6c8a6d99c625162be2ed9ff5d5fb0231defc0c47a8dad734ecf229be634d4136d2501bc04701d497bbcc125c043f7e1c"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-math-font" = { + revision = 61165; + stripPrefix = 0; + sha512.run = "921c86cf98717323044cf64547c0cb1f2530affb4745aca2e6ced54b078bdef6cf598ac146e00f06891ad45d38d7332a772a45ddb2dfa2f5f94e29fac20fc032"; + sha512.doc = "f186a9d2db6acb71bd50378a60852f391eb6a7b71abefb63c359f9f4c0fadfca10d886cb6333129701b76daa85971283e0f6b9862145184f19239ee9dd3c392f"; + sha512.source = "65dd0e877a22ba243986f1195a0d8ea667c4ac62cc6c94d776d710bc2654f59bb7ca9f68c4cd6e1caf0fa7b9692e86755743fdf1bb128ce451f234d6c46da4a6"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-paper" = { + revision = 61171; + stripPrefix = 0; + sha512.run = "93bba19d41b10d47511652ae41f25a6e6ae5dbb8711134efa8496943bf7a26dac685cbfc4223e40e3bc26d14da487aff612fc7b58d43b8ec7cc9ec826f838119"; + sha512.doc = "25e729800a2d0b80cae23c6ff421bf2c90650ab962ccbffcb393758fe5677d29d92408d7cb9bdf11f658ce43797f07a260e68acbbc2eca5ad52e7377be7d6ad5"; + sha512.source = "0ee624e372607d8e7dffccb255458bc8e858fe0e027d031ba44fd48616c11e32ba1a459895102c3ed5d93342a19bdfadeb97e1eb6a89bd71118b8cf30261abaf"; + hasRunfiles = true; + version = "2.0"; +}; +"hep-text" = { + revision = 61172; + stripPrefix = 0; + sha512.run = "365998a83777730a2beb7d2c5a70fc66faeef818eed654af3ad52945b925fba9c5bcb221a301e8d20ed654a209624e6b5bf3b14b5318be644daa1da4aae931b6"; + sha512.doc = "1cbe4fe20cd0edcd0d4a4b62b8376bfe66a8f2b5b033a81052499b0b2209c9a61330faf1b7d4c0ce680b82b88ad50d7b979a04a33da1ed5745b75ec5fc114ddb"; + sha512.source = "1eb4a29178a5bce51ea53a70aba0abbe5545c1776d9c03bb32cfcb9facedad8435b13ba5b2f85e5badfd13d7cffa4f085b596e76abe2cf31febad07259606917"; + hasRunfiles = true; + version = "1.0"; +}; +"hep-title" = { + revision = 61173; + stripPrefix = 0; + sha512.run = "026db8e4b5945399b8f68ca45133f9421e3b75185f0c536144c511afaa0305893a4da02284410568db338cce0679d0a252f3eb14e0c3c5e6984009526d726227"; + sha512.doc = "5c4900b603223483e6a7eee8fc546ebae0244bd801b5bdd07c289f745946b2106cd966dc5b3de55cfcb5cd6489f321da7bce2b44ea19d729f61e19de051b9f8d"; + sha512.source = "267a998e9530411437e9bef9f8eb2c625273f10a5e3408ac10172825f3743157e49d8dc08db5738994915b66c88a131957ca73033d2270745f99f0b0d4925f52"; + hasRunfiles = true; + version = "1.0"; }; "hepnames" = { revision = 35722; @@ -17735,13 +18208,13 @@ tl: { # no indentation version = "1.0.0"; }; "hitszthesis" = { - revision = 55643; + revision = 61073; stripPrefix = 0; - sha512.run = "2661153465f8b9fc3f4feaf23859ddd0e0da863d0cdc3c0e8b14997e192260cc252ef58d95082b54b9f7299347ec72a9057e11d6656c5e26c9f3e6285baf6484"; - sha512.doc = "c6d12b3779c8e67050bd77f905741c1a496379f76c001f3348bd9f8fccfb8c25dbb58acfaab76901c1b01fcab260a206ba3a0337411881a21f46b1888b684195"; - sha512.source = "3a39f1bf764f53cf149db0fde6e60d28fa290acb9c2506e5fee8379642532d51b29e3f0151ec577e258bb95160387a1ff0e9346c05e64cf18882e12f9b542b78"; + sha512.run = "b7a3dbbed2d9520aa26fbf88e9fd5f864912dbf0ebdf052cf65fe888676b9d5ce9917d154bef8bed2c5cdbec6bba5ce57cd434bdf3d9ff8c41ca6fc12f07a8ce"; + sha512.doc = "577c2dace816b5356e3a2da21f8e95aa165e55b75f5df0524d5abe6649d6e1879b7a2e97d0da88890e37baa05becfbcd567b977d62c58f17e0f372234cf00b36"; + sha512.source = "cedf9d399434f48032d4bde2fb91088320b2bd8b939629ee71fa98e744e8de1dfe14b4a01787fc9eecaa7ce8931b322bc0fccd7d96c7eb5e24f2097362063fa5"; hasRunfiles = true; - version = "3.2"; + version = "3.2.1"; }; "hletter" = { revision = 30002; @@ -17791,13 +18264,13 @@ tl: { # no indentation hasRunfiles = true; }; "hologo" = { - revision = 53048; + revision = 61078; stripPrefix = 0; - sha512.run = "8d1fd73519f0185db7ae8e82ac62957cb958311a5bded23823591157c6c31557b455ca6baa42fffa39d969e42a5fe87b18186dab7d18097e4e30e8589524ec96"; - sha512.doc = "72a65838829017ca887afe5bdf1f7645209601e267241a5650731a806c08b58670a4934698c4ebf2548d198e0b79619ef33c06d6eccfd5eef9119bee19629105"; - sha512.source = "0fa9111eb2d1dd0ce076cb831466219be1f18b87e9520aafa15bdfea7636df836e77611e393909b6c410f6bd1aee76b76aa4779317fb4159353098aa95921ed4"; + sha512.run = "e825ae9d985c17cba001d2f0b670743b7ade2d32b67b165ed6529b38d0f7f687d6b4eff5cfdadb389c55285f10a37e1038104b7cc9502423fcc98da0a4fa7a6a"; + sha512.doc = "65b67851411c17105f12df60903550be206bc070da37e3e1cfc20fdee50bb0e84bd5ebe293617652efdedcd4b9ef6f86760502bb4edf9d470ff64285136df4c5"; + sha512.source = "c9a8e2a3b4f35dc2da6339f9f2ba8e612398c7fe92455f021b5c006db34ce6e7e7a7a3cba08e5407516b8c171deccb742ecde1de0ba4e341392ded663ca280e2"; hasRunfiles = true; - version = "1.14"; + version = "1.15"; }; "hook-pre-commit-pkg" = { revision = 41378; @@ -17833,6 +18306,16 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"href-ul" = { + revision = 59581; + stripPrefix = 0; + deps."hyperref" = tl."hyperref"; + deps."ulem" = tl."ulem"; + sha512.run = "bb9eed7d5a13e78634ca046eb09028e4fa4dd46b4536d6e5eb9e5237f625a9a452e30e25a74358fdd00138e8b272129fcb484103b75c65b5368c89150ce3a6ec"; + sha512.doc = "afbfc4927a99ff871e3905e0f37294936def9ed499cbba8f327b017975e089dc6eed158f3188ca7989579f1a2a7609485282fe5866b684f7d314cf7722429b09"; + hasRunfiles = true; + version = "0.1.0"; +}; "hrefhide" = { revision = 22255; stripPrefix = 0; @@ -17860,6 +18343,41 @@ tl: { # no indentation hasRunfiles = true; version = "1.1.1"; }; +"huawei" = { + revision = 61028; + stripPrefix = 0; + deps."biblatex" = tl."biblatex"; + deps."cjk" = tl."cjk"; + deps."currfile" = tl."currfile"; + deps."datetime" = tl."datetime"; + deps."enumitem" = tl."enumitem"; + deps."fancyhdr" = tl."fancyhdr"; + deps."footmisc" = tl."footmisc"; + deps."geometry" = tl."geometry"; + deps."graphics" = tl."graphics"; + deps."hyperref" = tl."hyperref"; + deps."l3packages" = tl."l3packages"; + deps."lastpage" = tl."lastpage"; + deps."libertine" = tl."libertine"; + deps."makecell" = tl."makecell"; + deps."microtype" = tl."microtype"; + deps."minted" = tl."minted"; + deps."paralist" = tl."paralist"; + deps."pgf" = tl."pgf"; + deps."setspace" = tl."setspace"; + deps."svg" = tl."svg"; + deps."tcolorbox" = tl."tcolorbox"; + deps."textpos" = tl."textpos"; + deps."titling" = tl."titling"; + deps."tools" = tl."tools"; + deps."ulem" = tl."ulem"; + deps."wrapfig" = tl."wrapfig"; + deps."xcolor" = tl."xcolor"; + sha512.run = "c7a23661204b27508b186b622f057eb1844e25b8df22954a22300c17978902ef2b8c44e77c0d893e2c83142a1e2176c35b0fcaa88bc1c7e2d766a4d1aaee0ba4"; + sha512.doc = "5a131c28b9a729cfbce3a5afadf3dd5970b7b009605c2d03a47778fc72a4648fad0398505eebf256fe03bcef596c1e172d7699b52ead0fe69ee6fc52a2b3aacd"; + hasRunfiles = true; + version = "0.13.2"; +}; "hulipsum" = { revision = 56848; stripPrefix = 0; @@ -17879,20 +18397,20 @@ tl: { # no indentation version = "1.4"; }; "hvarabic" = { - revision = 55643; + revision = 59423; stripPrefix = 0; - sha512.run = "be0e943f505edd7c8e0138ccf101a821791fc7560a6e5afd41c57236fe6fd632c0813162bd9ede8ff021cd5583a739ed7871cc6453a3bae8c0c917740bd06f48"; - sha512.doc = "1e08c4864ef4ba5f083500b55521995fbf4dbea9c53626ff36bdab438db25f612d5272a2d05b72c7c6eb3a72a946179819b4ab52c7eb79ec699ce69d112b2cc8"; + sha512.run = "2f9af35f3e3ebf6d90ed05a77fcd6d6c079d3a476c26e0704e6f6b74899badc3eb0cc79d37f5f9e8b6a2846edb869bf57fc5b4bf14e834629d126bc71b77e42a"; + sha512.doc = "8508cab70c4cc87665790dcfd34a4465fa22002ca19a41d2d24e21ae0a2ed833a7f3c0e346d36e8c95411ea925ad3ebda8b6d1ee4179610ce0e3f673e6226246"; hasRunfiles = true; - version = "0.01"; + version = "0.02"; }; "hvfloat" = { - revision = 58411; + revision = 60587; stripPrefix = 0; - sha512.run = "f4c92c223eb209c3dba56f708ee648d35026658f6e252956b9de2c4d83e2c0069a43ef80bde88556be7a85cd76da3f07954ffcb2376b3b86de7a1f65fdd3bab3"; - sha512.doc = "2cd49a5aeaf51b185c3c83a02dbb0d76b1c100a5abae8e7a16e9cedec3189431a009c2dd34d36e8bc32f9da5e0150c6b1248c77f96a6049dea90c7af51a59ad1"; + sha512.run = "d629582a73c825cd47d4b5052e12422274267b792f639856d8868732dba2ef34987ed778b46725728a183120cbf8f8c3311f5a1ed284bef2b9b98e619bae023d"; + sha512.doc = "5df6bcaf09b681f036362442ab2aa4910752b3c79078d482f0e950609d3d2018e39187095a494355e78258a55f2992d331676f201619707dc55db523d5dc52dc"; hasRunfiles = true; - version = "2.19"; + version = "2.34"; }; "hvindex" = { revision = 46051; @@ -17902,13 +18420,21 @@ tl: { # no indentation hasRunfiles = true; version = "0.04"; }; -"hvqrurl" = { - revision = 52993; +"hvlogos" = { + revision = 60236; stripPrefix = 0; - sha512.run = "3f52fae550f92e379b76bc91b6a4b8fc25cb9ad6bc19c744c6f9ef0948d6590c1289f267681339fc7f596a7c328adaf45eb7c94be45e5f327bd77db5e366e315"; - sha512.doc = "2f9c4772b34ebb6096da22ffb10b41eef091be66513d1dbb20c4f224c2e471493fa30e63432e19e47b03ca7b248ae178a1a729517ed3108ef406cb30abb6cef8"; + sha512.run = "b869b0c559a2494958d33585f22ba64ebbcdd0da14695f94439baca964f20d51f51716838482480b971a72b78871b3b87d06cedb0f360c7e4ad74eaf468a41ef"; + sha512.doc = "968bcd1e98be87794d71e37967d64105c27b5dcefac97fe4fda2141ec88067f081cf2fce1583573257875b91bd6d69483346eb5c1afdc5dd206a26da8f022676"; hasRunfiles = true; - version = "0.01a"; + version = "0.02"; +}; +"hvqrurl" = { + revision = 59256; + stripPrefix = 0; + sha512.run = "472da0c72999f672cc6d21e35e9adc7c25d1202b8f4eb4a75f9498ae8cca5ea7aca7102dece9943e2070002390a3ced018d12358523d52cb2a32c6e6b9012126"; + sha512.doc = "0c7de4ea0173e754cdcea91b56681c4681c05d591f3176a0e7973c5b1f9d819a737d6ab14052a94a8dc48919dc2b98c7337274770a115d598667852cb118f69b"; + hasRunfiles = true; + version = "0.02"; }; "hycolor" = { revision = 53584; @@ -17927,6 +18453,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.7"; }; +"hypdoc" = { + revision = 61077; + stripPrefix = 0; + sha512.run = "c658c092b34c95e81c488fd839ee96e6b2225e92e8f8eb3d752ec7b6f43d7b5ef621097ddf2a0986ddf4c68eaad029e09a8dcc34c73b398e3791dcea6721243e"; + sha512.doc = "1239c2766d9e150655bf185091da1e8ce7b55da3acf023121d19dec284a4ffe11fb0053ecff85878aaf2beefcce90ef14de7d1b631563676088c2e7fae9d43af"; + sha512.source = "cf58301db498cd904a14e72267b2a91e98418edd5760884ed931741b7b86e83321b5c9ea71112486d6ce87ab7d3897d43fbe781e879b07d416846d0fe5ff9842"; + hasRunfiles = true; + version = "1.15"; +}; "hypdvips" = { revision = 53197; stripPrefix = 0; @@ -17962,7 +18497,7 @@ tl: { # no indentation version = "1.0b"; }; "hyperref" = { - revision = 58024; + revision = 59511; stripPrefix = 0; deps."atbegshi" = tl."atbegshi"; deps."auxhook" = tl."auxhook"; @@ -17981,11 +18516,11 @@ tl: { # no indentation deps."stringenc" = tl."stringenc"; deps."url" = tl."url"; deps."zapfding" = tl."zapfding"; - sha512.run = "00c82f1b64272ee6fd3728e29edf8e399a08eb3ffb9fb4fb011f4d0caa38970a351c132fd7096954a32ce9c730d798ba606f59f0ad6bf1754e43462067dd6c49"; - sha512.doc = "9005eb33d3f8b90199131eb2104fd961fd7d248c17c67af73162a0b90f0b90de1e5f5c79ffce59564f7d19e835765c59b385fb0e9e19ef4935f1de49655b03dc"; - sha512.source = "be6c8585a89c5c17bc38704251c9800073784e0fdfce6441a14ab804e9de0b23cebfcd7ca94f366cdc12e37b20f571f68b309df483691ebe3e065af4a7876f68"; + sha512.run = "dc42b72e2eccdb7a29181cfac8f95a6bf41f1eba9ec7943f2b00fd71b85ff46269d4ad437a924e7f6d5af81e375ae8cf0a1a64dc301e0ccaa327e1d073f41f3e"; + sha512.doc = "3e79668b8e7e032f272f23cb0d89faf420c8354b41a80beb50cda4fc0b914add05979b5de753b38a634d8da5f9c45d8660074d7e23f04d2092cfefaabae8eed2"; + sha512.source = "165969bddfb4d12fe8cc4d646d49369c382ca5369c74f7865462014ab7da0edb188520ca003b4ae3040015a3a2a9c3e0e565c5c811c0b1178a78895e102f45de"; hasRunfiles = true; - version = "7.00k"; + version = "7.00m"; }; "hyperxmp" = { revision = 57004; @@ -18040,9 +18575,9 @@ tl: { # no indentation hasRunfiles = true; }; "hyphen-base" = { - revision = 58630; + revision = 61052; stripPrefix = 0; - sha512.run = "15daa4e0004bb55601db85cf796761c1feca5f4668a5894df820a31d107ebefde74fd4d3a997191d9049ecb0fa3f4678a6a0b1fb6506b17bd24546e942d85510"; + sha512.run = "1cb3099a93b71cf862cbda46a07321032007591f18c43ba4b90a8ff5a41ca2c5d8bbfa0462bc38995e9bddc780049942291262d173f015703b3dbbc9ebae7774"; hasRunfiles = true; }; "hyphen-basque" = { @@ -18238,13 +18773,13 @@ tl: { # no indentation hasRunfiles = true; }; "hyphen-german" = { - revision = 58652; + revision = 59807; stripPrefix = 0; deps."dehyph" = tl."dehyph"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; hasHyphens = true; - sha512.run = "bea7d4605b1a18d3e7845ccaa06951b62178b3abbdc13dc59d3cbece3fa95fc4fba7e4d60dd253cd9fc022f804975cae5c4996fb99d3037c29971ade9984abce"; + sha512.run = "c27389dea67ffd0d45419d484b0c72577b2d5b8234266483add078b970d5d994d41f7cf9a1509ad93efe9489501f986127ea717135c5f57588094393e0d7219e"; hasRunfiles = true; }; "hyphen-greek" = { @@ -18659,6 +19194,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.4d"; }; +"ieeeconf" = { + revision = 59665; + stripPrefix = 0; + sha512.run = "1a0bf2fe8e019b55ac1ed72a9d428c3e90653183918f2c1ff22e9ea468cb3b3fea424fa3de2a46b9534086138f1130105672ac217ba7172354c51bbf384ba20d"; + sha512.doc = "a0133638d4da1822c2cc7c41052fc69d71feb89bfe0351594343166cdb217a62cb849d2a355bbaa3a12e38882ca76c94740f9f4711b42280c81a58bcc9fd17f2"; + sha512.source = "9badadaad5c47d067054176f8c979b4472ff57db1746ec2f2adbbb39fd75856d2145e120de78e51388d064765a018a06a71bcf75f078f3a4a958754c6f565c5d"; + hasRunfiles = true; + version = "1.4"; +}; "ieeepes" = { revision = 17359; stripPrefix = 0; @@ -18667,6 +19211,14 @@ tl: { # no indentation hasRunfiles = true; version = "4.0"; }; +"ieeetran" = { + revision = 59672; + stripPrefix = 0; + sha512.run = "d688e4be2d145652c16b028cccd05ec5f41a94ca190caff0c6b3fbadaa5c859516a28e4555569d072dd1d550c8794c1ddaaefecce49945284dd304938360f419"; + sha512.doc = "241119c6d2848d5f63e2afe8f1e07c263fea526c9c7ef21ecc533f27c92a67b1baf9a33122fed6ff491b2ddaddb0e02ce138164c8b9ff2f5db11d1ff802f73b8"; + hasRunfiles = true; + version = "1.8b"; +}; "ietfbibs" = { revision = 41332; stripPrefix = 0; @@ -18674,6 +19226,25 @@ tl: { # no indentation sha512.doc = "586dc66004dcf4abed254d223394badd45557d79c7e1b56bd20080f41185ea8dca28b3d501e708cc3ed4088f1368f153ba2d2af313d5d6add2d072b46954952f"; version = "1.0.0"; }; +"iexec" = { + revision = 60138; + stripPrefix = 0; + deps."tools" = tl."tools"; + deps."xkeyval" = tl."xkeyval"; + sha512.run = "a00220e8b516556e3db1a676fab6e72f6800bce5e68ef3c6b3c57d99d62285b86df02a7a488713a64e23d63cd7457d277510ee77b3587edc065f5458b1396af9"; + sha512.doc = "56c204e92d1539d6f599de728c05c6f8857393c9e8d577f36ad5f21fa3c64f73e226fad5606272fc00eacd352f9db56984acd115b0ba0f4517196da65e93a4dc"; + hasRunfiles = true; + version = "0.4.0"; +}; +"ifallfalse" = { + revision = 60027; + stripPrefix = 0; + sha512.run = "2117368f9114bfe20c7fcd387c47d27d59cb2af720eb6c55f2a8254067e2dbf7be21b9081a244367d46d5deae8150f915b17431296b02de486f4147e5ade9b87"; + sha512.doc = "c952a3f591c77df2b2443352783606e57ccc35d45769d1e7892b12399de5253af174a739c7283a28463536394430d0582852abb677fd87015bada501b0bde95e"; + sha512.source = "3070c2a5beefc8ce8b29f8216a66b5636aa71f6f68aee9734eba78e487110efa67a405ed4b87d4a550bd3fe45df3a8f3da10ae717d0c31cd98bb2465bb903bb9"; + hasRunfiles = true; + version = "2.0.0"; +}; "iffont" = { revision = 38823; stripPrefix = 0; @@ -18728,12 +19299,12 @@ tl: { # no indentation version = "0.4a"; }; "ifptex" = { - revision = 52626; + revision = 59820; stripPrefix = 0; - sha512.run = "cd06bd01d071c091962451850de4cf78c0ed7604b392e6c0eb59fd66b202ed9f015cac75b6260bfe071b70246cb1d9a70a5bc9f052876469ace54a68ef250e22"; - sha512.doc = "6d6668a5f663aeeddd19c5f8086633d6542316807d0dbfc94e8ed1991136dc2258718e61a450dcc3c1560af3d349519ca2da98a05964741083dbb66ef85fb848"; + sha512.run = "22d50e2dc21a320d759ffadde2b12f667cdc348096eb590f253dd7479477c995998fc54736eb6f9cbd9e37323fd5ff675cd90c41698b795ba3f7808c1a87237a"; + sha512.doc = "70ac1af361369152f3d6b3ecf67007dc1683baab4da92518e4144d9b4c3933169f6643353b4c622b1da6af834e160d95020d5348576784055388d96234e597ef"; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "ifsym" = { revision = 24868; @@ -18887,12 +19458,12 @@ tl: { # no indentation version = "1.7"; }; "incgraph" = { - revision = 36500; + revision = 60810; stripPrefix = 0; - sha512.run = "9a063a51c77ec55136a60a7ffaa259f7c8e2fbc9c71dc2d5240f125be50fc246e2a1d1a6c3379aacc044ad0eb7a754dc27a6445bd12fd63c3d5b2929cdacc133"; - sha512.doc = "1a1be60ab0ee587095ad6e2c74ce356292ce454f3a40fa96e5fab7d48da52b98cabfe9826235b3afae679baeea1b23e5c4fb4d7a4b00279ce0433568a9cf3108"; + sha512.run = "06c7228e1ef4d760f6d7b1d308d4946eef7a55a60ff39bba6bdc6a96407cb6fab9f47dfd2c26f37d4f674d815e0ab7196badf2590638e214c980d26343a6bd55"; + sha512.doc = "3e37591fd1c239d2feb262434a5782be0160104392f6b6c2f330aa30d8e8af5905694a125d29045b403239d67952bb88d1194a1d1e61194e82426405fa11c772"; hasRunfiles = true; - version = "1.12"; + version = "1.2.0"; }; "includernw" = { revision = 47557; @@ -18994,6 +19565,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.12"; }; +"inputnormalization" = { + revision = 59850; + stripPrefix = 0; + sha512.run = "ea1b93d71757875867fb9d899399ad5cf95d2a0560b3caf2569d08480f4d65dcf4a963632dd27b1e28674a9b5c6496f769c17ae08494a6c37ca2d0e6a8fd8f04"; + sha512.doc = "ade22bfe8534389f117f0f99dfefd7e27f84ad653419929ab86ab045ff08c1d08952178c6c8d42b3b22d575e371ad4b77c2efda436e4b8ff89dad2bcb67c7d65"; + sha512.source = "048bcdc198cb028863f2f3f30366ab209f18fa2d3f76cf42ebd795cf34d92734e617fdd7412c3f5e43127a4853f1f2b3fe928c8cd554b5e5fde430b5c9170d47"; + hasRunfiles = true; + version = "0.2"; +}; "inputtrc" = { revision = 28019; stripPrefix = 0; @@ -19020,11 +19600,11 @@ tl: { # no indentation version = "2.2"; }; "install-latex-guide-zh-cn" = { - revision = 57590; + revision = 61190; stripPrefix = 0; - sha512.run = "c5f11472922d7bb05b8c1bfaeac6862af0e3367a7cf7a0201e09ac030b44c15965647e885d3c90a518e8cdf6816756873184d7835caae28423b505f15170ebb2"; - sha512.doc = "e0a934c670f06a175e1c2805efc06df559c3436656df7d0191a204c3be0d0556050757378f9a4b0f403862dd747f783941281af539d534caa5b1dcfc27b0b885"; - version = "2021.2.1"; + sha512.run = "f8259eaa9bbd9f1c8ad2f5de309c64f8f14fcd0629415f70f8b054e395c52cd94be3330fad8d9cdff101b97a18097b1b6c11f2a631d121def82b077215d9f710"; + sha512.doc = "6cd07537b0a399d0a1a3150f6d235f47afaecb8ca99e80e3e951f9e502d3b7eb173bbb68729e1646543b4c43e55d98fbbe1b61408b5713cd0c4fb159f787c88e"; + version = "2021.12.1"; }; "installfont" = { revision = 31205; @@ -19043,10 +19623,10 @@ tl: { # no indentation version = "1.3"; }; "inter" = { - revision = 57213; + revision = 58892; stripPrefix = 0; - sha512.run = "44de293fff8e1cdcf36796db13bba42c7a95f3ea49b48597bb743bc08bacfa504ed5dfac1ebd7a4ff0ed02c88433679f164f2d2e406051b1d0f3e32218df4747"; - sha512.doc = "df5ce5a034ccbcf9a04f89f362a75191c6254f55cadb1abb10f51fccadaead4d9efc160df19e6eb7f81161716d27600a3be5db1a482cf23ff3416c19b3a172a3"; + sha512.run = "fc423429252eeb8878fc9c423c1c51f9d24781b262d0b4e08d10e397a13985507916d50d3f3fd2164f7fea2c5b45e35da415699e6ed424957c9b337b5e349cfb"; + sha512.doc = "aef65d0830399dd9fbdda59f130cb5a5847796d591baaafe74e621115061f04dfc55c6d68d1954251d5d6b63b6e7b88eb16c50842a6f5b045f4a643498fb9c2c"; hasRunfiles = true; }; "interactiveworkbook" = { @@ -19221,13 +19801,13 @@ tl: { # no indentation version = "2.28"; }; "isodoc" = { - revision = 57811; + revision = 59709; stripPrefix = 0; - sha512.run = "b26c7f3b87f4892f6f3c31f62225b43918be6e168dbb85d287fa708069d9560312d00bff1198842ade1a0a542da59dfd5d802d59ba6f62cc1dd15ce75ecde015"; - sha512.doc = "11cc576322712103511c3025524fe068a3f011e726a2335051ec6eece18a6217931071ccae412ee46148d4665cc3526b0a91fc66f4455ddfdae7af9974ae5959"; - sha512.source = "a56610f50bf8e9286e04f8d505158dc2d4838731e667279728edc5e46cb92ced25c4a23b02b6c0cdfd4830fb09d093ed1c87b6292a2917ca5b8d212317b59e3e"; + sha512.run = "5bdd4158aa30923d2f06513dd2f1a729077eef05f8f6e068c1e376f931558b9ad786eea871396ca3d16778692f010bc39f25da3993c74776bd746ed5355fc0e4"; + sha512.doc = "ebf8ac1221592472837590973700603e0cef6b459dae92cc28ba751f5c3c0c49a686b4224c83502b09cec26ba306e44fc00f19b0f9e9c83b26f582a9923f76dd"; + sha512.source = "9240f497398b77b6633f5be4040d13053abe51d64189e6678beccc1110f9e97b24422105bb3a552ade1f33c1af3ca2f8941b5c86548fbf7885a799fa69345b90"; hasRunfiles = true; - version = "1.12"; + version = "1.14"; }; "isomath" = { revision = 27654; @@ -19427,11 +20007,11 @@ tl: { # no indentation version = "1.30"; }; "jfmutil" = { - revision = 55044; - sha512.run = "ba0c853d1624ef00407e9eb4c6051fa9f71f505e0e55ea2a698d4a9f7fee241c1339d46e873d77573252c781ccacb05b9d447b80aa43887ad76da667977c666b"; - sha512.doc = "d4b255cccbe58ec85240be3f0a390dd2fd716fd40c744732494d3e113899747133e99be75f8bab888d240e66e16195dbd2b12188f3551e5535a2cbe157c5bf9f"; + revision = 60987; + sha512.run = "11f0ee88997b197ccb4cf249a92f90ecd08227b0086861b59752c2e17fafb1e1fec7a1cfc701d5df91497d4cb9e61d13f892d776ded07c34d7dab09a2a65eed4"; + sha512.doc = "045b74024de9798fd7c74442404dba0610a94f66b60455d84fc33bfe56e8612b014fbd83cfa3edfb0c3a8acb31c0dece69ebefb58294b2d271dc1dc2e95d094f"; hasRunfiles = true; - version = "1.3.1"; + version = "1.3.3"; }; "jigsaw" = { revision = 49111; @@ -19464,11 +20044,11 @@ tl: { # no indentation hasRunfiles = true; }; "jlreq" = { - revision = 58472; + revision = 60947; stripPrefix = 0; - sha512.run = "1a2118698ae25d3f9a3d9d41c7bab2b3d56e58b9fea73d977114f6cae429d2e9ed0b410a0537531e4eb6559f2a6ebda47eda0e6b3e1d1b8ddbf567dbe1ebf26f"; - sha512.doc = "e88a88d7d70a03e8dea569f198690278ddb2233df7dbca0733c60d6f5d4963ad9cc810c7764365646302cd529ac70a29aa258a577adc2958fed9da5448f52299"; - sha512.source = "143b2d7bb6ce740c2dfcc5295ba568189041091118e6cdd6856b7ce6df2b267ca9a1d7443e752f22cb9d4668971cc559609434d091df94906c04ccce066d67bc"; + sha512.run = "8929adfd3f40c43389371a8deb7dc63b549cf33e0bbae9f72f2148e53248269918ce6be4a9e4359f82a1498c5a682cbdbb31935b9950d7d13fd7766f48c82bd4"; + sha512.doc = "01ba50b1ad1b99297b5c52d5454d1b1b4a1debdd4ea73c42830f2f3ccc3fac0c46b247c6fef26ba0f235cd1a0990b3ad1a9cd5f59facc0e29789df22b5177d03"; + sha512.source = "98b9a5865edecdd27a1ce3fb90ca1a7a9b33b4027eda4940a0784f00a9e8c78b0efddfbd6a09db2ac1b7e26bff4c4c230187624d9e67a2d3a297beb15ec503ea"; hasRunfiles = true; }; "jlreq-deluxe" = { @@ -19540,11 +20120,11 @@ tl: { # no indentation hasRunfiles = true; }; "jsclasses" = { - revision = 56608; + revision = 59795; stripPrefix = 0; - sha512.run = "18c5cd1e63e4fedbf1ec0faf069d40d34dd72ca18af0d634eab16b5c7ce92139cf4892492782f816c0c0deab4706ee1c5a83d052cd122f7d5df35f1d5d2ff4dc"; - sha512.doc = "f9d477ca10dfa4fe83e2f5a981f7584555e06968417c542cd09e223a0ef30074540890b3f5b28de12b9d77e9a45e3bae19590cfec31d3232528db1d854514083"; - sha512.source = "c4b4d11b3684122e47cb3b1ef59001e0163297768743b570f4c64c3eb0ab95f41a6660b44f6048acf4e9d1f4b949eae9883ee97cadec53798d363f3630cc4fca"; + sha512.run = "a479d9fdaf3b966f4e05647d34ea620822d91984fa73abf818cfe5afca2442f21ecb2f1a9dde274ad2528747d32c92c8b5cfd937acbbd9659181cebca339c62e"; + sha512.doc = "2b1aaad257b4dcd6bdf627202ede174fea9ed23852cfa7e65762639299906af1643875e29674907b3e60dab42adeaf7789b4d51c717314f8c123e31ac61541f5"; + sha512.source = "f3f0ee4df438a15df2b77eca0f8d6a39eeda7f1c33558685eade119052663257aa963a5a3db859ba893d67277b87c02b8826f2f6e2c68274298cad0cb6db4d7f"; hasRunfiles = true; }; "jslectureplanner" = { @@ -19707,6 +20287,25 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"kdpcover" = { + revision = 60404; + stripPrefix = 0; + deps."anyfontsize" = tl."anyfontsize"; + deps."geometry" = tl."geometry"; + deps."graphics" = tl."graphics"; + deps."microtype" = tl."microtype"; + deps."pgf" = tl."pgf"; + deps."setspace" = tl."setspace"; + deps."textpos" = tl."textpos"; + deps."tools" = tl."tools"; + deps."xcolor" = tl."xcolor"; + deps."xifthen" = tl."xifthen"; + deps."xkeyval" = tl."xkeyval"; + sha512.run = "c7be0c04597b5b29a23c3ee32c4c0b4d11f5e1680db07eb2fcf447857300fd8a6b9f87edc0562a4851be23f2fa48533180c7689bf7f4ab6099a5a844000a23af"; + sha512.doc = "742a628cdeb7600a69567335db07baeedebc65c8f7e18b5d0081b595310354a4b59508e7be9991e0be34f8f46b61b6d30012b479e7be808713963634e38c9481"; + hasRunfiles = true; + version = "0.2.2"; +}; "kerkis" = { revision = 56271; stripPrefix = 0; @@ -19741,13 +20340,13 @@ tl: { # no indentation version = "3.1415"; }; "keyfloat" = { - revision = 52160; + revision = 59759; stripPrefix = 0; - sha512.run = "3d2be77c6ff60292b3cb50e8033d5f182fa731b6b435e4eec4d6a3f4376e6f0487a6bc5bfbb59da37ba6d620721f3756e42a795bc26547d2218f66b2dcf82a4d"; - sha512.doc = "b678b7e0fac699625b9638b67e3e00b892ed4d0a01d78ef0fb13ce65d2a1e74afea50bbb9f4ffbfaa37b1e80a96dd1cd8f8420e8b1b5f1cbf6f6155d745a7604"; - sha512.source = "32c7cfd96870d94034984b923d47075a2e071df11290f076ddb4def33236aa3ca40118382072b3d17aeb8d8fa263c1c0575182ff5b91a4c410f6c7268100eefa"; + sha512.run = "f13bc22a648934a07fa91ee9ce500f01562dfb6c43883bef82628142f62cbe366a66b0e60ff7d41a9670cffa63601390cf34e331173f8834eba7aa341fb555d0"; + sha512.doc = "cfe525673a6dd8d1918ea41f33a4496ee7a6e9b8e59a3bf0cd18afcc017e8f7733de5c983bf9b0dd75212a0375638a089c1eb197b0f8bd3fa1dcc48c3ac3a0c7"; + sha512.source = "e7803dd94cd8fd0733fb916b157a4f3a3a154fef6594b866911d3f75e3994d585d633c021cfb92346613fbcf1529978823c38f3457444a97e93aed3ed51c6462"; hasRunfiles = true; - version = "2.01"; + version = "2.06"; }; "keyindex" = { revision = 50828; @@ -19758,6 +20357,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"keyparse" = { + revision = 60277; + stripPrefix = 0; + sha512.run = "f3ca8d0b78d9e20bf99e46ebf181d670fe6d936f9d91f1059056820f8be1a9be6eb6278fdda8b118a5f82d376440681dc4cf9a063bb6693df67d5e2d47b3a5dc"; + sha512.doc = "01b6aa91350a1ebad4f37be4051a4bdc97939392a6ec2b7708de77d06a575c14fa3f9bc9a8b98ac5d73428555389aa6bd0f9439dd299c2b34e19b7800eb2a27a"; + sha512.source = "2eb4c90abed3e2676bce4865ad4254b6f572a69edf63ba82a5a9b3c994343f8d3a3523dd465b94d6afe814364c41a581dc84d49c9e21be6dc4231c3f850eafe9"; + hasRunfiles = true; + version = "1.1"; +}; "keyreader" = { revision = 28195; stripPrefix = 0; @@ -19791,6 +20399,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.2"; }; +"kinematikz" = { + revision = 61392; + stripPrefix = 0; + sha512.run = "6f23b8084247aa807c5738468f005fbaaed59559828247f269dcc24e62535984bf7805c69aea27b889d01b2afa04ad67811a0cc8e0ffdea7e263f9ac9c384fc4"; + sha512.doc = "b5fb6a456f042a677866f9fee3bc7a13a8405ab6fcad590ba37dc9d681e61d04abdfe6bbab5009cc1d79f73859a1fdec137c92e6c0d367b1d801ca2d41d69160"; + hasRunfiles = true; + version = "1.0"; +}; "kix" = { revision = 21606; stripPrefix = 0; @@ -19829,13 +20445,13 @@ tl: { # no indentation hasRunfiles = true; }; "knowledge" = { - revision = 58724; + revision = 61356; stripPrefix = 0; - sha512.run = "22b67c0c0833f593ec0ca072744986212d34765945e8e18e0ac37c1ceba26109e98e41ad6535df066cd8091757a55fc644c311159b734fe69952845fcaed1c31"; - sha512.doc = "99b2a1f7bf227317dfa946d0c500f4b3b018d9348b3e71eae188fa3b14df61ad0ea9a63297e186b6555c0ac002150fda71aeedf8abcea20065a13c6c39f0ccae"; - sha512.source = "fe2cef9c5ddc8cfb133291d3340546d75168568211c99f3db5b87d6029fabc85027d382df5210d70e52b782b15728493932b9f15e5673911d821cf656bc56f57"; + sha512.run = "515a9f6a4d4b1df7bdd51994efbc45d62582696b970b616dc3d3250efd1525bb8523e04e8b56a0391acce8c2bff991a477c72078d4ea840dc9d1b377e15facb9"; + sha512.doc = "84b54a2544760cd138ea6f663a3a41899549555c4205b91d5f553c6b4411dfe034b4564bcac0c20e377abc47ccbf723c72fb3e404591b0c8f04a1fd6e16c3b6b"; + sha512.source = "bf30d237fbd28fe29f6ae06dea71766cc74518251247ae6e6d00d754b8bea1a9f6a799b7406c44f4a94a7e16b64b01ff541928eafd49de3428cb6ebb1503ff40"; hasRunfiles = true; - version = "1.25"; + version = "1.26"; }; "knuth-errata" = { revision = 58682; @@ -19871,11 +20487,11 @@ tl: { # no indentation version = "0.5"; }; "koma-script" = { - revision = 58585; + revision = 61108; stripPrefix = 0; - sha512.run = "c7df4ac717c0b1ed2508ad52546b3cd1ba84db401f32888461cb0e558bb434abda933bd91b1a9f01b42ea0db9754fbf230e5915caac823d67d8789ac4f7c0f4c"; + sha512.run = "96abab9a5f44f27b7276dcc4ec4a324822a9b679d20bb48ab9f2d5fc65f08dfdfce1290851ac2add1b4d1a53ee8aceb98b088e6ad8f486c4346fbf5ed72fb98f"; hasRunfiles = true; - version = "3.33"; + version = "3.35"; }; "koma-script-examples" = { revision = 47523; @@ -19910,14 +20526,14 @@ tl: { # no indentation version = "0.9.2"; }; "kotex-oblivoir" = { - revision = 58436; + revision = 60579; stripPrefix = 0; deps."kotex-utf" = tl."kotex-utf"; deps."memoir" = tl."memoir"; - sha512.run = "af873efba59c61bfacad1914a9842a0240b38ce064258a1e4ad0317c396df1a82d62e3372fd4d1386ebcec8c74a552c6a0f9f7f8a950b0b8a4b638b6a518ca73"; - sha512.doc = "921b184ffe6ecb78e44791d86cc622894232d7c4ff439236f2439e501634cd97e3ff1d4432d58fd1750e755010d169ad79c1c9a82941d043bf6dbbf5998d480c"; + sha512.run = "b29afee6d80e081872d470be9c82fea392f05568bd61b5dc47405a8dbe5db03038f9207e960bd1ee8abb53ce2d3954443bff1c5bc6939565f59724ffaaf15907"; + sha512.doc = "01bdd6748c9a8e846d86bb5a30227b1c88fbb1033548875bbb99e8a22d9b0eb73e0857e9d0558d3ffc44aca047d27ccefe712a94dabd7366dcc8520ea9853eb8"; hasRunfiles = true; - version = "3.0.1"; + version = "3.0.2"; }; "kotex-plain" = { revision = 38630; @@ -19945,9 +20561,9 @@ tl: { # no indentation version = "2.1.0"; }; "kpathsea" = { - revision = 58622; - sha512.run = "33e8096a1798a6204c0a6519cd13302e1c80797937aae4ce9e7c4928e4bd75472cd0864cd00ff88d3d6f01fcf1a2e027efbd5d1768024fa5ee23e56094f1b308"; - sha512.doc = "9d34679ffecc16117ed7d1d6207602ab9466266b48b15d303764fc27301eb9dd4621dbf9ad2dcff85bfcf0c1f762316a412b3925e91f6b31e4da03e46ee51893"; + revision = 59203; + sha512.run = "dcfe9d0b853bac7917e87b5783748568cb84a9b6e060dacb720826840aa93dab192e9aaf7799aec9e3c99f2aa54e02470918a72047e67568339aed2e2e3a61ae"; + sha512.doc = "155db7d61fa4011640a3c7e90efeeb8336b970bbb64f8fac5bf69a7f51bbd9132024256d6f57cf649cb83ea590cf9aa106230628196045d3f98bfcafa803ed54"; hasRunfiles = true; }; "kpfonts" = { @@ -19960,12 +20576,12 @@ tl: { # no indentation version = "3.33"; }; "kpfonts-otf" = { - revision = 58435; + revision = 61270; stripPrefix = 0; - sha512.run = "7daa6cf5fcdedce50ad5fac45abe82c69f695d8f42c95bece738ca161b6b494ef4b008a769f3989ac800d9970888e5c205d87ef7c33ba19a56883547f2957c61"; - sha512.doc = "29affa9fa075b00abc05332a214ed6abb5c0a8e79a07527461b813d335ace02e3e2e04e32abf823d2a327721b69affc4a2a065ba6b1392afa04542ab37cd9efc"; + sha512.run = "c8c22111dc087b03b536511509ce9ca5e1fae3dcfa908be969143c14c291b1a937307f5352a968838a2c8f433dc8cc59291ef58ab2b983b0457d87d365ceadce"; + sha512.doc = "2020cb41776e61669ed3591cdb0518ffa46f65f951baf0ba0c9fcc5ffe611789e4a91cd758debbe327c37847405f07538e6cd0aad523f97e2e9b444faf6d37ff"; hasRunfiles = true; - version = "0.35"; + version = "0.42"; }; "ksfh_nat" = { revision = 24825; @@ -20097,46 +20713,46 @@ tl: { # no indentation version = "1.1"; }; "l3backend" = { - revision = 58509; + revision = 61303; stripPrefix = 0; - sha512.run = "4e0fa3710748aef350580d94d95b788dabb5d1ea86b2fe6e70697e9baa0fa7f254d06cad4c4ce4a3f9ec5b5e38be1742887051a16e327c18fd754cc500f74c75"; - sha512.doc = "5255d75a9804c1b1c5505873897145d759aa57c7bbaff7d1c2eeaa3677af6630c984b48984ba397cf77a0c9c564d110f7983c6c024c3623883edf3128e769ebc"; - sha512.source = "f4fe6972053149b04b9b88b4c6d231a04a6b2d6eea5c96b7a9fe7589657917bb330152840b8c008e5e798c54ebf4a6fa7f038530bdbb36cf9c634b5396e7392a"; + sha512.run = "a860287ae480b1c14804e07a5985fb8b45d862cd9ef8250824bdbba5dff2adb010a9a3c61af2945da87a01153df6ba8264248e02ad2c87d45b6161c0acf7d67d"; + sha512.doc = "1422a6feb08107935ffe7646276893f8a2d328a24137368b9bb743723a22881a4fd061ddab34b26cf31d40768d8935b12cb3cf6b39c6b0c5bbbd6d5c968d8929"; + sha512.source = "40e033667381b9824f2e6d4a603007241ef085fe76432fae16203c581db09e2ef0514dbf1cc037fe6d0bad2b09ef91fdfac086f20af7fcb16c6d83adf1fccf0f"; hasRunfiles = true; }; "l3build" = { - revision = 55426; + revision = 61312; deps."luatex" = tl."luatex"; - sha512.run = "1311812fbdba6a8c8d2ff565916ce3da9081229f9129fe8323239eda53ba544686d9bba184112bfda4304c5bdd51c944bdb51e3d6b70c2b2a90ad4ffdf0a6254"; - sha512.doc = "33bf3c01ec1bc38122686b55bea0c6c096bc2332ca1e04b23e582b9c1754a4c76537e180fb636952cafe63639a883592b06ca4245d3e3f38b944e03dc38fedfe"; - sha512.source = "ba5051894ce861a2f833d592156976aa5ab3a1ce9d6c87e8b8eda33f32820c4d1bb0884f193536d8ce9362eddcaf11b113b9cf9ef2ce8b551f739951afe7c4f8"; + sha512.run = "332b834eb718a3e95942c1a293533effa8adf87bd7b0b3ae10b6192d72797dda095766f843ccc72309059c4fd577b1c45530551b95978d4c06a8dd4e1925d6d1"; + sha512.doc = "0e060167aaf50d10e3e68248b6beaf89bbeedac2504ea8628920889a64d1a9f52dbbf4b96ab319a088953f71f4dfe7e50812bc7212ce496d7045ec689f431fce"; + sha512.source = "5360b179f321bd517689bec2290ee126d1e25449cffdd72bfc918b2df7616b2261d901cce99dc36624cb1f594f80d012a0e0b7986f4b6394841e63250f112bf5"; hasRunfiles = true; }; "l3experimental" = { - revision = 57789; + revision = 61040; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "b72f9d154fe57effb38b8da1fa1e32e4343e4ff8eee094794c7d3864a2b89f4ad65f2c744de8033e4371872c325462f5fac9886e5037a965d3a5e242a916a055"; - sha512.doc = "b0951f18b213cbc9796eb80ec688ff7bddb07606a756262a252ea0572e4ae5b4c562af62bc26a13ed4512ac82c92a6eb3505d39eff50df16de1fbb924bf3d499"; - sha512.source = "2a48f0bbb8d53bb95939376a91a08523233f002eb9c4114c36d599c89a8442a960df52a727605a4d8c5ec96e89e131ba7c3cebbb575aaae9d85b0a60f02659dd"; + sha512.run = "a90af320c8be0e8c168d9da205f00326172591efb68f8a3940c4484ed4d782924b8d5e0179b6bc469ee698a1991872fb0eac15a4417faa4f2b3f9bfcc23c5dea"; + sha512.doc = "811efb82fd5022de46d4411b9ca5961c3932715e90c157ae3b1caf0001bc106bfa7c140a6d53ed64b4a1a52fddbfa69920070f67feff2b9f9da800dc4a37e02f"; + sha512.source = "a8f08cdf948db1b81ed2d9c87c4f4e174125379d9131e62bbe01aa1b9d40b488dda470b20167e8b2098364cff26a6f5237487f985263f9fc547b842d75adddc0"; hasRunfiles = true; }; "l3kernel" = { - revision = 57789; + revision = 61121; stripPrefix = 0; deps."l3backend" = tl."l3backend"; - sha512.run = "6cc0245c0986c964ba8a41430c4c1a794196f6c534fffa8bb87a43687d60a5f7ae686cbe09e36845898e60d13d6503448c81a6d549c7793f799c241013ef41b6"; - sha512.doc = "70150363e1f09627e3040aaa7f1b0aabc3a62e5f5d81c00b8991895873bfccf764164dbc7da4a6ff7c5e12513d343a0eb6e38d7a173050e0db53a6c7cb66f6b1"; - sha512.source = "5f8837dd921469ed84e48ace634a00e450cee5fd8306a7236279cdf86b842ed2134f8960ff58bc2cf15dbf26ac7d407bc2a1d1ca48179d6666e88285a210d4b7"; + sha512.run = "a82e2199e56b039b4ffc50c7c8cb02076d182f4a3df1481b1e1a89510b5bbfb1b0aa35504c9df0d781699837c06f1a72d08efe0898b4456b352f45ad19f5972d"; + sha512.doc = "b97c8810586549231879494f8f162f0d5af47fbee459bb1d173f5e0962205c0e107c4b58fad1b4dc73c98f49a1689961eced9d2ac6954b4f9511f07e14d405b9"; + sha512.source = "aa3c5069c5670eaf2a4a8f674c4f67e00ff220ca5cd40d0213fd99ca76937dd8bb7f43ed357ca339769c74cb5a5ad82be4a46f689778d9097ff202c098747a31"; hasRunfiles = true; }; "l3packages" = { - revision = 58296; + revision = 61040; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "9ce87e6667a601818c586a01629ff954bd539075160a11e82bb8f53bf1306255584fca6f3ee36327fed5c78c43d7ecabcecf4db1b09410a70ec77496871ba4e0"; - sha512.doc = "782e2a1d9d49264eab0801c625940c3fd993051f879f1e525a685572ba08e949368f429a01574a2f94d9b5dd386db33a6c75aa3eb485c725ec9c8007f5f5def0"; - sha512.source = "b78b37e60af618bd2bb527a7bca77f99d2e977d4baa8a1899275ebd1ac0ec9f71b6553a8a83a1b8df763b6a4ea9533fb5d0bbc64bdf0e7b29c9a0bb850dce59a"; + sha512.run = "1ca8e7484f5d86fd85197e4bb0058444e68f73caf68c04f3ad67ce0a96f29c181d496227f069938604dd5a4dc095e15c0f2addf26f150da0ee7ccf6d48037536"; + sha512.doc = "4c133f7ede9a37057371e838355daa1138b4cc9e1e8714d9f62925cb56b91645d1c9478b3bdf1050005c3a08b2282881fbc84f50c166173c958bf16604630814"; + sha512.source = "93dcfe3b4d04c60a9880d34f8a6d924ae5e800d0cd9a2116726c2e651ae43665b34e7bc232640857c4b4f235eaf3ab25eff62d43f175721e9272b1b65f09b3cc"; hasRunfiles = true; }; "labbook" = { @@ -20206,6 +20822,15 @@ tl: { # no indentation sha512.doc = "846c403f99194a19cd21e4d7367a1b43a8ad608055315bb36a1113fb37dd3d922dd8c5cb8474ae52ed3006be520b7e9023680e85f0dbb17f69a41c8c17e81a5c"; hasRunfiles = true; }; +"lambdax" = { + revision = 60278; + stripPrefix = 0; + sha512.run = "63ce2370079b4b2a286355d05d40771658e35fef085570aaf07d264d81571378a6d76db128e3fcea1c6c27632cb37f317ae28300059027979114e9eefcb5cf53"; + sha512.doc = "203a8ecde6022efcaba0680a507833ec56601887b47dbd563683195b828cd246d55cc9a44b91cb6ec2a3d0b8d7ce6d0777aa9519b93ca2b4b0f96f643df35dd9"; + sha512.source = "2790c5696eaa95b18c4c301d3a72d5aa0a72566cfebd514dab3546738897f2d0aafe55ef96ba51073fd07e98f0052eaca4cc9bd8d46f5fd9cf7b544b4f103c64"; + hasRunfiles = true; + version = "1.1"; +}; "langcode" = { revision = 27764; stripPrefix = 0; @@ -20216,10 +20841,10 @@ tl: { # no indentation version = "0.2"; }; "langsci" = { - revision = 58476; + revision = 58820; stripPrefix = 0; - sha512.run = "d89c4c372b6caf6b2c5ed76137e8f3d89b984ca67a1c80b0a7b174a99dd68b1c6e1483380023670129e497f90d7a9e5b85d5b9a91344c0c2b047312cdb80526a"; - sha512.doc = "4ab637562747443f5027ca38ae2a77c87e47a627c22cb56bf77d60ab2f9ed72107eb7665db526d2a8d5d0890334424e8f7aedd93fe928a4ee4ae3340a5f40db3"; + sha512.run = "bff440adaa56f45ff5a2e8d84d9af8267dacf1c1835c0ae151aac8b30d08b50a1b9b432343603fc6c5426d157befd70cc6d80e2c70470f85c875bf3e733927a4"; + sha512.doc = "570af6bd6f945aef36cc533d5a7fb05f7ffe615d01c9fbb63d9c1cbe2fa8120444b484ccdb84cc3a1c9805bd00b92c7cf744688b3d02166bb03c735404088a19"; hasRunfiles = true; }; "langsci-avm" = { @@ -20249,44 +20874,44 @@ tl: { # no indentation version = "0.1"; }; "lastpage" = { - revision = 36680; + revision = 60414; stripPrefix = 0; - sha512.run = "adcd9319022ecf2a5b959ede5d5ce8c5d6a3e7efe1aae5f84abfa7d138162e24a403c6d50604cb6bf8bc80a918837f6d78dee60a452397e7a495cc4d15e52956"; - sha512.doc = "2eb7e8457918e2ed51abf6f48d5f5d93157eff19b8e320a782bc204b44c58a684cdeb2dd3b1c28f5a8de7434b6da9af49ffb2d939ae80875234797149a80c2ab"; - sha512.source = "53b1f86deddefe6f61b270ae18cc705a8ec1360a98a5e5338730aa7cb1653383062cede821dc670c5a9db0064e2989961d2604491bd6a5df9fd90f6e18ba0ae0"; + sha512.run = "0184a80cc33e2b067c97bc9be2bed20881d841f2ae1213fa48ae5b67c16855217a166f4c35a1dcb16fac5cbf0aa807c5a5fc7ada7a5ccbf3af77777719b14711"; + sha512.doc = "ac28e1fb9ae05bcb78e825356ba6be73b52c5f06926c446193be9af8ba7e8e7adee7c51284a797d9872e66137bf96cb2ef3dba41cc9624d25155a1ad069f5307"; + sha512.source = "d3ef6af7acd8542a3196b24a9e431907a56a46e96e5d1245ead73cce8b00addddad07acf9e9db656f62e9d2745d557b79da696a6562da2c62f975a9a5ade0f2d"; hasRunfiles = true; - version = "1.2m"; + version = "1.2n"; }; "latex" = { - revision = 57354; + revision = 61232; stripPrefix = 0; deps."latex-fonts" = tl."latex-fonts"; deps."latexconfig" = tl."latexconfig"; deps."luatex" = tl."luatex"; deps."pdftex" = tl."pdftex"; - sha512.run = "3dc7384b2074e86b6c45f5096b7a85a03064b0d9be4e74b46adefbfcc1fe80d66700f38494961a806ccd4710219681e2968fa5c0c071b366b197114af7c798b0"; - sha512.doc = "13b7a880f89a5cb1ea79fe32f8fcc20679ed30fdba4c27837b29a7c861f52cfabd614622bcdaa7805bd0e8f1abbaeea0336d346d3a8b990e94bddb516e093ce3"; - sha512.source = "39703818293b0deb2b337ac23e8ca6bf55c982b71e5753dbebffbc3627729f6334e60fb44e68d372401dae03bcfa3a3afedc0751dadf3934fa8037365a390f51"; + sha512.run = "2aa991c1a343a31aff1e46316f36cd6bb65690d790a567fe705b425371b887070d7bd9f8f9ac8223d46608a1430a01358f19dc77421b2301b22f6f8761fb175d"; + sha512.doc = "4a14a06407bcd763bcd361a89ef8d77e32bdfde63400d79de69ed87ab49f2e240f7de8a3a71e1de5416d56185e2d06ac9d78ea36bf97728f6f30d6577d0d52f2"; + sha512.source = "b466c2ee1a583f661f4563cd6d90d436c5178a656bd793dec9fdd28728f195e31061974683a9db23367c607cc584b600e2e678b680fd62c7028d47eae607cc6c"; hasRunfiles = true; - version = "2020-10-01-PL4"; + version = "2021-11-15_PL1"; }; "latex-amsmath-dev" = { - revision = 56791; + revision = 61076; stripPrefix = 0; - sha512.run = "53089df5f54a43f8e6e4835df89824ebbc7ba53d54a96dcb3419be22fb8151337d5b03dec8db095a808135e83de9739f8dd314befb52d3f3340a7f82d8b0d0da"; - sha512.doc = "ec111f9ae7c306c4a028ece6edd89b205a47d05d82ad9872235ce189354cdb2415f64a401c150327dd6cbb1b84d0ca495236b733000213f7fc9865a9baceb8df"; - sha512.source = "13564f9aa92a5e6577caacd4c912ba7b8ac1da004092dd911bc311818689b9cccdff8c5b9e6ae9fb3cbac4cfb0eca0a008d83603a0e793739f02cf4cecd307cb"; + sha512.run = "94f8395f17bddb61cdd2a61738bad0d9fb177609435e31d15a885ae3ff76999ec08ae36a75f8a4284447ee0038090dd1db37801a4664a01585b2956a3eeab6ee"; + sha512.doc = "d553ea65c6bde91e7a02585a0c3a5302a28125cae3f990b4cdbf05070086ece00db9a76121e80b887709f8d6f0f1b82c3db1eb913fc71000ff44dd33c2c3fb43"; + sha512.source = "41dac01263848e79fea146e928891f58795f7cfc1fdd5ed6818dbf4eeacb0c4333e9461079abfe9459b006d6784e1ae32f5e149af89736cbc147b626344a83da"; hasRunfiles = true; - version = "2021-05-01_pre-release_0"; + version = "2022-06-01_pre-release_0"; }; "latex-base-dev" = { - revision = 57982; + revision = 61076; stripPrefix = 0; - sha512.run = "3507b1e8df4ac9324ff9069f3fde6e5eafa03ce4a13012f8b52f6b8df7a7f2b2d6cc0046282724fa7a564a0883cabba9b2b6c5f1e78daeb8144d30c7a5cfa9e5"; - sha512.doc = "321b6d36ed15df2b17ad5de07e588b9983b99b62b9e4af102f976bfd951f45368449d29c463baec44de02c1167d3fdec0e073367e687607001c8abacf4531d42"; - sha512.source = "3cba58ed6cb3bccf4fba253f0c2757a0097c2dfc0abc1ed8846bc8639d24f53c0ad1fcf0fb35a2b13d30786c016772d483f67ae058be2b814369838be95cc6c2"; + sha512.run = "6261ede2b83ed8c13d66345206d412117b3287115701191e2bc6cc68ba6a4629b0305ca3c8d33b9f0f9ac9a6ef6adc1c45467b9e2969ac841053e8b3d34e629f"; + sha512.doc = "5ce8066cc8098b7946f6756b41476033c42b649f2effcee36feb4b88215e1351ca981d888894124468206a711e8189cdd26e79862478b329d0b4f943f8ea9ae5"; + sha512.source = "6f8674c52cb1bea1ac6352453c7dc0e5da92e96cddc12f97fe3a6ab5b38a60d64914c7d8ed4dd1049e41ec49adc724fa573cd0b8034197d88eb0ff5a0158074e"; hasRunfiles = true; - version = "2021-05-01_pre-release_2"; + version = "2022-06-01_pre-release_0"; }; "latex-bin" = { revision = 57972; @@ -20318,7 +20943,7 @@ tl: { # no indentation sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041"; }; "latex-bin-dev" = { - revision = 57981; + revision = 59005; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; @@ -20345,8 +20970,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; hasFormats = true; - sha512.run = "31c364be709db593c1a1d4e5250a7d8899fe0f5eb534c61c5f67d1a032b4afca9a91c5d2d1a541e96045d294c87d7ca1758a6a59bce8a3e94bf5511e20cf8854"; - sha512.doc = "94474a52fb6a2bb801405c83562d6dd69038cca8d73705f382c2acc6c63d57e057a6b6c1b93556e41f5d0d9f9adfa269f0857c35e6523108eb230985752c3261"; + sha512.run = "5d44e0274f584509e2d600f0c27f6bb395d5c9a9d18cef9df67199a8ebb30b00d32a6a944ad7e195a47ac7bd87e0bd2d8f116cd513678a0cdf2a7d45db8c065a"; + sha512.doc = "f7ac33d09631c9054f8ccb0ffd91a6ab83bedfee96a299ec5727be9ffeae226d2844a08633cf19e5ed45a17fce9c15707e02aeb53778d06281aba0b612c90a60"; }; "latex-brochure" = { revision = 40612; @@ -20368,13 +20993,13 @@ tl: { # no indentation sha512.doc = "c7d7217a9136785cfd6ddb000e51d455e7482bfe395a9131329767bfffc71f918c2349b1426b615a6740263c958530c68c044ee3ae78300a004a8acf20bd8bdc"; }; "latex-firstaid-dev" = { - revision = 57981; + revision = 61076; stripPrefix = 0; - sha512.run = "d15e218f16cef0e7ae518ee567d9d3912b20e1e62781f0aea4d167b1922ad28b5ce946609fd2f2a9e3c2671f096a0e34c0f88d30877dfee466ac37130cf20a18"; - sha512.doc = "870a42973a33fccdca2c176071bb5dc9f52f29c69fbe41633f75097b3b42e63db0185697ac0bbeb487eed0bc35df61507a934f2ab47c413970fa6ee1eeda73e1"; - sha512.source = "d9b97a9c8b659ef4a4ff3a67a4593bf95bf5d01917b0c550017a4a2085d5acb127a1028920d4bee04a7b00c34219f001afbdf8b34c51a0b04bcca2e2c70fc3bc"; + sha512.run = "1d0d0194e3808dac38992780df3ec3f0c7d6085c0fc7751741b22c486222c2bf2df7e14517e20145209e055b2af674b7d9b8876fca1e4f24a4c711f7b2c892ce"; + sha512.doc = "c549e8321a0bd994bd2feed0d4124df593ca6ef4e5394a83f3cecf6f6ecd1af5f7a31d3bc1742c7cc23fb651095a7d2a32673e351d2b84d4654ebdbf523ada8e"; + sha512.source = "da8753ff5ad1df2c267e06e1d353502bc1c08e2f8c8100a2da510f417b30f88e5b8454e3d27032f10195cd226a2d800046f0df9b20ad66d06fcc0961aaa7d45a"; hasRunfiles = true; - version = "1.0k"; + version = "1.0q"; }; "latex-fonts" = { revision = 28888; @@ -20397,23 +21022,23 @@ tl: { # no indentation sha512.doc = "ab9d885c811af3964e8cdd8576349059bd45d660e6b9a7e931697f7c7fa5282c725e044817de8f2648ded59519d1592945e0804ba7cbe0054ce2bd4d44606af5"; }; "latex-graphics-dev" = { - revision = 56791; + revision = 61076; stripPrefix = 0; deps."graphics-cfg" = tl."graphics-cfg"; - sha512.run = "0c92c61b530930e7e1d7d0343bc5b471b340d9bdab2b277afce01140d1bf7c6f7b0d7658309173d480ecffbe764ab0669335d3db9bd3c0d4be10aebd19243133"; - sha512.doc = "5ec398dcd9ba55e35f1575a09b10d6d589238089ded1653f00dfe15e60cdb1f46df88fe8d21807aeee598cedc66791609a525f01bfdef14c1d5225ee4295cd73"; - sha512.source = "db6214e4fec5acbd0c9f23d64f6e1a19e8ffebf2b2e5240498067a1cffb96b66abbc7d53d2ca02cf1b4962ffc34d79ac0ec6c53ba4a250ba5b518b54017f11f7"; + sha512.run = "b87a4ce8f6751cb251d17d976a43d01118dd63e8b74cb24d8d5835d674fdaa50116066f7ac5fb3384e9d5f511ec82ce91867b026f9b1e2d48acf1bee87188e45"; + sha512.doc = "0f0864424a653cd1166e7f422f3740fa777e6b88813d8059041a6dec5c0b4921798060f3d3069b1bd23acc869610fda988693d297f52d99f39f31ef6c1e3e5f2"; + sha512.source = "a71b652ecc00bfb2628fac7d8afeda361bd8f4d87048af29f304fc10d768e9bbc1ecd31f642f1b645ac2ac50d76ab2652d4e0532c94d54278cd9b827ddb5d694"; hasRunfiles = true; - version = "2021-05-01_pre-release_0"; + version = "pre-release_0"; }; "latex-make" = { - revision = 57349; + revision = 60874; stripPrefix = 0; - sha512.run = "1813e8f2c768d7bc33a44d8fa11609915bb392d08da86718ed969fbe3c4284d57619a39284e611ab454d207edd054b36322d5e621cd23e302e85c17c52c5060c"; - sha512.doc = "71111a4f203b1ac200515ff1668831265733c9b7fd6884c4612f1261e65ad6cb1336258e7ef47f51f0d0e12a98f3efe4884f38426c0905164b3a9b8ffd47895b"; - sha512.source = "9aef117c9db4a8e59715ea906c8293fb460ea4026d583d33bb34c3e14ad92ccd536d831cd2e3eb8729eac3b4654236e73419a2bacf84e1c10d640ab9274db2fa"; + sha512.run = "de9a924c38afe1abcd0802a17de4c5fd2cb444809dc81e00b6964cf3d0c81b8d8796a1bfa804250701ac4d71f42bb9d2a9ca1ec0740f59a8feb329d26aa605e3"; + sha512.doc = "aeef6568aec936c43dd0bfada1245a0d353faf2329e6e66e9d49ca8a1a2f9eb738ab1667934cd0a160e074c2e2da85aa8b068bed0bdb1ab1b944cf62f42af087"; + sha512.source = "521a553ebb556cb6df809ea5f830c926101dcd06f147544c19476a0b0ba82154c3b0316d795f4057a906370972648b485a96dd7386c8e6541160af469a74487f"; hasRunfiles = true; - version = "2.4.2"; + version = "2.4.3"; }; "latex-mr" = { revision = 55475; @@ -20444,13 +21069,13 @@ tl: { # no indentation version = "1.2"; }; "latex-tools-dev" = { - revision = 57982; + revision = 61076; stripPrefix = 0; - sha512.run = "0d7ea543bdd7bf257290cf0731497a0eeb6438b28ec2e4b978fe4503fb09b81cc77b8eb33283446b93b66fc76fd255b8f76dfbc9d5fbbbb3d91b8f5cf336d987"; - sha512.doc = "c7653f174ce48bcc10753970cb10140a76f0eae9a7a7b08fc35a107d71fcb6b62adf958a07f319c694cf09d449956bf060416f86bd9f5bc89aad919ee8421992"; - sha512.source = "a20d49e1cce2ffb9f510645e4b5f047352149328e1f5f4092523d5785a0c23739256079917ac636b19acf8481981f6edefe6c6246124a3449521cf53556780d3"; + sha512.run = "4cc4e438acad4ae4e375a3f6f57afcbac85034a174d987d6118c1af2446950e175bcf93faf9a5cf821699d836352810eb7a546271af8ffb9617c306c9d006f58"; + sha512.doc = "815da908df305d2d79aa892d4060761681bfeeae1541a1d6be05c184d49d8fa74fdb653591b9178db3e34e8e3887be90a9bc63fa69738d38439be26a8d2c82a0"; + sha512.source = "a154957c29fd126f29fe123eac281f5b0858187122c4f53ecc5e475526bdb0f88f047b4d32d8d88d3bc5394129caede8c3905955c77af461cd503b5e8af8ffce"; hasRunfiles = true; - version = "2021-05-01_pre-release_1"; + version = "2022-06-01_pre-release_0"; }; "latex-uni8" = { revision = 49729; @@ -20468,11 +21093,11 @@ tl: { # no indentation version = "0.7"; }; "latex-via-exemplos" = { - revision = 53248; + revision = 59977; stripPrefix = 0; - sha512.run = "12760e4866e1796a290bae531205da1cca1f24c51359a9e0f231524a55834a94a357625b775997f065c002da663c460eabcdb5ae22984330427c62e001f49fc7"; - sha512.doc = "5a108346c7653122b37a9914cdf16410e6135f142b1f849d3d4d413be2cc59631d56c3b25d770621d84ff3256cadecbe7834f132b424244353f5889f09dfecf2"; - version = "0.5.6"; + sha512.run = "5e18cc2fcb58449ba2e934e0346dee5c5a589a121b45ae8e93e0c1eb48766b970a475f8e609cb154520d51662f119709893580e94c2e9991b67e4520693f8ea6"; + sha512.doc = "e582f96aa1ae3d1e753f87206e2f309158f16c1f676fdb5492fb95bd457aa680b5a0f882ced8f0ec49f11c6d85ad19c768c3459ec77b9b01f06d1a03a8ab5f6e"; + version = "0.5.7"; }; "latex-web-companion" = { revision = 29349; @@ -20481,10 +21106,10 @@ tl: { # no indentation sha512.doc = "a972860f65d763c6fb45e9726e5dd7b8234509b90634f45b8b25e090da92d0ac577bf8b33ea7b0a0f91e4e5639bf62c07086dc36708ae697c1e16e644acc83f0"; }; "latex2e-help-texinfo" = { - revision = 57213; + revision = 60038; stripPrefix = 0; - sha512.run = "914b0959cd94f13c8c8a9e3bf4ce88988816298853d73e02ef3bef24a03e621a43d6e7e2a33a0253991c32c4a02b87bff7eb6d6a8cec7f4ca80142308c4d79bd"; - sha512.doc = "d659abed2563ca91820af487693cc91919ee3ae10c077c40a27fdbcc5ef1b7fc223007945bfe15ba6e5e8c2522b0f46c78810342cbebf9a6e9a96563d42c583e"; + sha512.run = "dff005a0b80915f4c1ffc520f95f1d1efc6437f1c46f18417c6fb2b4dbb48c8bacbde3d02554d08a149092bf499313c189010cf1963c67dcd55ffab2ec3eda28"; + sha512.doc = "988c25f80ce06dd1a2e192231c2e6bd0faac600fc15fc772d1f88aaf48b7bf1f12f593f34505cc829760c4a3176c243a3c2271a8914b0578b6944587f5360362"; }; "latex2e-help-texinfo-fr" = { revision = 57275; @@ -20506,11 +21131,11 @@ tl: { # no indentation version = "1.29"; }; "latex2nemeth" = { - revision = 54389; - sha512.run = "37065f9916e6755c1a97f2b8a1f1cfd838008b5da2d2131938626ae4eb6872af30e5b4b767ff3204e271a86b7245b54d9146d9fdd8c807f882ca28e1663d2d14"; - sha512.doc = "e2ea8084bec4d41a4b694c3b46788e3170043ba1f7ce4096bf029a4de61b76cb504b532d7e0c454943980d44d1c145a78a9e4a7f20a6654aa9cca63d388bdb5a"; + revision = 60528; + sha512.run = "d245b34164d29fe4380e81ed76bee7042bd102e53dd86dae98d0faf9575fd2c9153b9570946cbc372119b6d6d8810239dd695b2f880043cd0b1561f94482dd90"; + sha512.doc = "1c2c15af443e7b2289fd49d6572818b3268eae1f0bd77fe47d559652ada909f26557180da2f10fe08542e8e65ee977ec8b105fa9361af1caaeb6b12da7b74ac3"; hasRunfiles = true; - version = "1.0.2"; + version = "1.0.3"; }; "latex4musicians" = { revision = 49759; @@ -20542,13 +21167,13 @@ tl: { # no indentation version = "0.2"; }; "latexbug" = { - revision = 58151; + revision = 60609; stripPrefix = 0; - sha512.run = "167fd3afc056f1a17510ff3040208686d71939e2bcb8f09e4d21ebd57420debd0beb315d0c6623ca2525f8ce7d50c063b3761eadd1764a8d369768edabde2d69"; - sha512.doc = "4875fb2f4533d884259ec3191625b252f2d922ce8e992adf3c58eef2f1263e7c24121e6cc43d16e617da2dc66abbc6dbe9899cf63ee1592c42cf61174d77c763"; - sha512.source = "2daca13020e5e605e974dbf4da0e83a1941496202b2908f6e4ac40666d715cf4a8edbc9ced512974d88b05812e62c0f2e856c564a9116b95a530dc18e768a0d8"; + sha512.run = "512f622e48241d25fe38a0c64c9edcf4d20780beb7bfe9fe885e233e4ad880342d60d5b9c1d0f9b1243b51775621afe22b6f289a47fb184eab9b574cc976a800"; + sha512.doc = "2d62931897b2117952de92536a80126ee696675dff7124750a1c332a74a9931051fb4c7a338e87957d044847b4a0023e779979c6fe67e38636367f7b92789ba8"; + sha512.source = "6233bfb8ab6b417236d9796f2595fe54373c14632039fb30c98885bbbdb4fa1578a8d101e7b41624010ddc7010c0bd3ef9db604cc759e2ab9ca35d38798f6d2c"; hasRunfiles = true; - version = "1.0j"; + version = "1.0l"; }; "latexcheat" = { revision = 15878; @@ -20640,19 +21265,18 @@ tl: { # no indentation hasRunfiles = true; }; "latexindent" = { - revision = 58790; - sha512.run = "d33db672ca71557e5a2fe1a59e95c78a4da49ed0d9a73da5b1ecdf9b36d1b4fbb61aa6f9ec47d7ec5bbf8197878692758cec937879bce94d1f8505b47514a050"; - sha512.doc = "89bfacb4bde1abd385173bfa2b02a7f0c8fac437f557dac027e4b7b112a27308b91844217c6fcf46dfef2141f9efd1025c17b244acc8b87b56a72a5595beaf28"; + revision = 61385; + sha512.run = "8c3ca82b20daf3bb1d84ac5070fee9199b1f1df53a6d7ee8e2b61212df3fadaf695db8583c4e25647309cf5c8e4af45e5a5246e18897980aacba307663d4cce6"; + sha512.doc = "2f081821ec57fe1cd7562e5ad8235c491a2f397cce0227f4fbc037d0a4adf64010dd562ef61758733f0e1bab448b2ca8c40a14e3adf51592e3a14dbfc5483389"; hasRunfiles = true; - version = "3.9.2"; + version = "3.13.4"; }; "latexmk" = { - revision = 57213; - sha512.run = "6f27053fe1356cf751b39801a2d1cb208b5309f45202ac11d87a4b8a573291aedabefbffb4e355935dba8755862a89b5d47eab820d939e6f5f851a7009933d7d"; - sha512.doc = "fce0c767ac6aad345b5cbadb31bda92e1483723299e877ba83983c1fb9346bf776ceaefac89be265d45d5348777f8e5d072306432fba9a81010d2cd15944e48c"; - sha512.source = "32d772c91be32f870d11891f4a34bd7bc903b95d27725edb6e9e3fa8a2b163ea4730c09ee4e0f93babad123f5f25c30f5efcbcfcb64837a7793e9c3d51da9ef4"; + revision = 61146; + sha512.run = "e61a7bbfdffdf07f6c2c6cc9e549602ed6900677cf13e605379c3a1be206edefc4b0c2a7f7ba649184650413929b47e82b9c20a9245f788331d528dc833d6c36"; + sha512.doc = "03cb839f5bca7063bb477f5843bf4a30236d12258dbfbd86bf97f54faba41a6bab0c403509ed1d1d466e4a59a94d15030455e337c3cfaf61689ff556d6f02a15"; hasRunfiles = true; - version = "4.70b"; + version = "4.76"; }; "latexmp" = { revision = 55643; @@ -20780,11 +21404,11 @@ tl: { # no indentation version = "2.1a"; }; "lebhart" = { - revision = 58503; + revision = 61338; stripPrefix = 0; deps."colorist" = tl."colorist"; - sha512.run = "9f2e2a2b45593dcbcf57bb5a41b0785c73b3e920d26b2311f25776d5902b325db23931f3d9fb642804c374ac00495b350af5559b9bf7bc7fd367f90919a4e94f"; - sha512.doc = "b3f9af0dd9a4a08034bbe769a3d8a0f76aa741431646ce9be168d6292688c63070d57c3757c799fc2d37391cee12e65828e31062c9abad80b2ca7167ab881f4f"; + sha512.run = "33a117be62734eaaa4c5062e85d28c8ff768f4ee71b76081db2b4f31985ca57b62e42146da417e6ce87e2947ef2523a3709e4defaa0db716ec0b23e9170311e1"; + sha512.doc = "5fd2fb76c7756ee9a033eea1a479858a21ec483efcd964b53fcccebff410de3c48cead6388092f745225f15f705390c702798c8a8a79fa6dc6190d3c98ec9126"; hasRunfiles = true; }; "lecturer" = { @@ -20869,11 +21493,11 @@ tl: { # no indentation hasRunfiles = true; }; "letterswitharrows" = { - revision = 53709; + revision = 59993; stripPrefix = 0; - sha512.run = "4594fdce5a2c6bb4c4405d5111b574076faa247e4b5976596695af2de776edc26fb949d46012ce29663c55c78342d0d234e0a0e0f6a53fc59991083fc3b7e52c"; - sha512.doc = "4bbef8f44103e5155cdcbb3719c80f3a1cd4b24211b3734e4e698b411519fb70742b4cab9ee510bf4db2a6a929550e1f448aeffba311b0fa7904e17ecd44b5b2"; - sha512.source = "ea32a5da486d6c7501c900254f1c76494bc30ca6ab74be7d7f6494abe263151c0a94ec3ebae48d778e7fd21ab71f065a26c56535ae9d2f1d8205cceae13ee9af"; + sha512.run = "dcfd59b7a51100a4e1d856d3cbc0d4f2ac258e745566b278e275d8ebd0273e7f96fa1431b681d42e10b1c7496596f1ecdd92753b8b58df4fe352c51b9b009bcb"; + sha512.doc = "a21ff5d9a4c2e409cd7a32207e1e162b263dff46919fdad25bd5fbc1cca86329efebf847ed24ff7401293d8a318bde9fe7fd2c9def69f39740d5e0686c0ab849"; + sha512.source = "50e2521b55a238cd6e461b3bcde326c5948573363988bf3bdcc428d04341728dbf73e891d09af65ca1832924cdbd0b0320bd94d662afdf78b3d1039ca3519231"; hasRunfiles = true; }; "lettre" = { @@ -21010,12 +21634,12 @@ tl: { # no indentation version = "7.040"; }; "libertinus-otf" = { - revision = 57398; + revision = 60023; stripPrefix = 0; - sha512.run = "12f6bf40c77850714880d7f1e91629e2242d206b2f672b2d9d2f18d567e0e6fe47ef161d03a6351d0e1344048dc8b92b755d53153c164e23177c0dd29ccc3372"; - sha512.doc = "a55175cad1b7a407e827b341ab742f6a7ed3aa92984c4a39d534a76b2c733b4aec939609fc77e0e319f2eb2589f2a96c5bb0f8d2b00ecad7ad74932fd8959bb1"; + sha512.run = "1aee669aaa55ff11c2de760f65597542736b64a4ae52b8d73aa967c92a178ae7013ce06e701d9a3bf3de0e5987abec4d29401480dd4bb845a64c0047ddf66c84"; + sha512.doc = "6c21d100b5ef1bbb8e892c0a0da0cabfe11404b7e1e4606ec04b25bd0a0d22547b1e80f1398573f62a34b4e951cda01466d0d8828cd10e78e8ed008aafecb416"; hasRunfiles = true; - version = "0.28"; + version = "0.29"; }; "libertinus-type1" = { revision = 57754; @@ -21025,12 +21649,12 @@ tl: { # no indentation hasRunfiles = true; }; "libertinust1math" = { - revision = 56861; + revision = 60495; stripPrefix = 0; - sha512.run = "a0720e690aecd6e8239aabacdb815ebd70512b067782d0efbef9da437b8cbed9edc70f5650eae18f51e3cd37b4dc966af472690fac9bcca0dd025faf591b26fc"; - sha512.doc = "d963d7e8541a8a7df1ab8da508cee578abffeebae9d1326ed0d11f1c28831b6f6656429988ea77378477d7a5680aab1fcadd793931908a93cb16548265c7a96d"; + sha512.run = "bfce92d05045e5f9c381a82ccb5cabe9843c9e65ceb6a1bb8028aae5fed4ad1106b94055bdfd38ccf6178bc5b1fc82dd0436d9cb2977fa11cee9e25697a898c3"; + sha512.doc = "9ffef9c46f0b91500494798fcd6558cc5a286f728fa3ccba8276b141265fc2d59d6995283a9284a26dda3e4523bcaf74493b8bc1b85d4c100cd249387032ee52"; hasRunfiles = true; - version = "1.2.2"; + version = "1.2.5"; }; "libgreek" = { revision = 27789; @@ -21095,11 +21719,11 @@ tl: { # no indentation version = "1.0"; }; "light-latex-make" = { - revision = 56513; - sha512.run = "ef43711feb7a776c094dfb0fb87d8f1d64f30bb4f5872cd47ca9f9bcbe7aaea84158b54414ea6e3cfa6a8dc58035eadee7835d175b8a6829b5c7298c33723d26"; - sha512.doc = "5e25885e1a537a435b7e4d71969046918c0221741ff9d90adce0ac03f4ef3208e18af58dd007a95c62261ce4c2506724244d4a3706a0ec9c8c527a0596c0da05"; + revision = 60558; + sha512.run = "10ebf02409748bfcd1f7d2a202f22eafc309ae8bf0633da7b0fbad84eef7e94cad6f716085e953205b7f6aeefc78ea9a52fd5459582f4fcdaab9020af81d965f"; + sha512.doc = "9d7c6c8c11f93fe9019e593d6b63983e7b5235c6270d8940e5de6352c31586bf4afb81cd38b9b0c769d26058b150864c6a19f133fbb1a6249416266f03d07dc1"; hasRunfiles = true; - version = "0.2.0"; + version = "1.1.0"; }; "lilyglyphs" = { revision = 56473; @@ -21119,13 +21743,13 @@ tl: { # no indentation version = "2.2"; }; "limecv" = { - revision = 54329; + revision = 61199; stripPrefix = 0; - sha512.run = "90614eceacd921cfaaa60748ebd342eacc66f580879e0d2b03641b5c4b587e5559242c17240f248bd8ba227976d07a58553cc529bc6decfe40e8fcb3464669a0"; - sha512.doc = "53859b21cbb3786f84c5250a8decc225a5d7208cab54ade8de28026d7a47a38daa841b89bca76e2952240d05d91a63e6cbc8afe401adb721dfad9417e2369089"; - sha512.source = "e140a18b0c7956fda5bca6d75d0d4d89c7035f6cfe5cdf7245fbba47a095323813ca45ef5b9f5dfeb75e63e92cdd48e4003abd23666a8d70d8be8f3bc9a60e6e"; + sha512.run = "14c7bb278113e8d8ec249e18fe7a142f5216984468a51a2c64926b2dea6e79d928310600cee498cb3773b0ae70e97199b4800a8c5df94431df121ccf62955b5a"; + sha512.doc = "7e64c4a940dfb321da2c81ae84e709e1601068935f2531c8e6fdf514b5cbca6407485005f60e4f410a303b97557986f1962dfad976a3c3914d01309c67ae8049"; + sha512.source = "43ab876f14fa2f920741f26252b852e5d579e9394efa1d5e00753f23365b62192293aa48850275c2aeadfebae4c2f8e0a929d4459c5feecedd7176514dbdcc9f"; hasRunfiles = true; - version = "0.1.8"; + version = "0.1.12"; }; "linearA" = { revision = 15878; @@ -21153,6 +21777,15 @@ tl: { # no indentation hasRunfiles = true; version = "4.41"; }; +"linenoamsmath" = { + revision = 60655; + stripPrefix = 0; + sha512.run = "477155ffaeaee4a1cfdbd65446857e30263c6e3eea772fcc900742a485f00a8f8cad9741e6e9c310731e4ba5d1d0f7edfdfd5449b87c114464f6dbe51d848ec2"; + sha512.doc = "66059629489a6930c5827b495d920f4842cc174cc38b9a645785e04983f96471f8031d5ad131e19a3f28d52cf3d4e9d8987da5505bfe0ad2939becf9c742a589"; + sha512.source = "722c65947e93387ac7883e9a0bd974b85e2f40260793cae2b7404d234be219e3326b4a5ae4220525bb1820096d55400189340fa95f097c047e0182d6c3816e28"; + hasRunfiles = true; + version = "1.0"; +}; "ling-macros" = { revision = 42268; stripPrefix = 0; @@ -21192,13 +21825,13 @@ tl: { # no indentation version = "0.30"; }; "lipsum" = { - revision = 58123; + revision = 60561; stripPrefix = 0; - sha512.run = "6d93dbb16d94f7aa199e59b85096583a9e8e7a07b107bbfe1e0be7615717c29d94ecfd308c4adf462062251adb03b171a332cd688425f6854ce442c390c47396"; - sha512.doc = "6d7e7f8037cebffac9a3725b5a7b32eefcb458ebd86cbc9b0380d05d2b1926c3a70e7032629ffd4bede5102c3a36d84e1b2bd21d2b7f9b3e9c642390822fbffa"; - sha512.source = "b2f55edabef986f5e792509c6db58f89f2bfc816cb07968e21f49308df4fb37836798f28d84a91b6020b6003b441e697800c2087b9e3549b2dee3cd1a393c5f2"; + sha512.run = "24697be378aa490bf71194c8622400c11e27d5c6549caf2362250017ac97b4443986a4ad5f8d2d96aa53cfd7bcf5cd7ada0e1ddbbbfd27135e2a23bbad21563a"; + sha512.doc = "ce44b2d4acab295bdcb2d0edcefedea449c4dae7cc4c0d62ef73e36169b0858863003bec1575000bfb78b1ecd9e5413807a89bc464b5d173f05a43313c7a22de"; + sha512.source = "5984bb97fbecbecb5aaf26f788a6879682f6ec39c87e01c834533a779384b20ad02f1825cf5c2339b288cc61ed716eb3a76e51c45ccf80849b4434132e0c4081"; hasRunfiles = true; - version = "2.3"; + version = "2.7"; }; "lisp-on-tex" = { revision = 38722; @@ -21407,12 +22040,12 @@ tl: { # no indentation version = "2.5"; }; "logix" = { - revision = 57457; + revision = 60099; stripPrefix = 0; - sha512.run = "fc499a8c77e2d3a285888ee01837c88077906fc57ac73223f5887796e0f32bf4179b5b2df1a87d4535b59137ca12b6dc9ac1f9084dbd158b038ae622aca92eb9"; - sha512.doc = "b483c80466b883cbc56fdc5807420b01ee5c720d262908d0ec5bd9b61a51a15be5e1de90097026b1d2e87b54d19cf3dcafec33b5d8075edff46f2b4a6bfb6bb6"; + sha512.run = "b1eb3f7d263546089fe5d0e3747d90ad5742b160e03ea2ac67aa158b66398e2c7bea0889ca708295edc4e41814e8966c9865f94417d80efd9f2e21b495d312ee"; + sha512.doc = "59d233c7b148f15475a47790151f13d569b099740d73846e618316229c64a804fc7c4154a4b5942b0ae0b358ac77dd39532c4cbf9905101dad947afc6520108c"; hasRunfiles = true; - version = "1.08"; + version = "1.10"; }; "logpap" = { revision = 15878; @@ -21443,12 +22076,12 @@ tl: { # no indentation version = "1.07"; }; "longdivision" = { - revision = 55117; + revision = 59979; stripPrefix = 0; - sha512.run = "13595c314837df4581f424d753b4afdba62f7d9c4ab4d43d1b756d18ace7cd5a53cb7783366c0e07d237333d5b5eb9e85a91d1041055707cdd7de225d748080d"; - sha512.doc = "71f18b1f4f87def00c504b2dd67e8f7c2d9510f3f2459e8dbf1380948e501eb9b2ba4badaa6cfd2cb6440a0c6d0c9bb048c21664e6b37f85cd49c6a8a0a39d86"; + sha512.run = "d489df0f5ad27cd8755d8387ac4b5ec0f0091e9d27611a7f4810e145dbafdd95cc4c14f6cbdd9843e1e4251fb0d31cd3332657c50d1fac4d17eeed1183aa8aa5"; + sha512.doc = "dd45e2dd888c7bafe5311cb8a541c0eb7c31661da9d69223f69852b022092501f936d9823395c5b7fc7f914233ad4cea32b2803730f976e687bc7a9bc7c74069"; hasRunfiles = true; - version = "1.2.0"; + version = "1.2.1"; }; "longfbox" = { revision = 39028; @@ -21540,11 +22173,11 @@ tl: { # no indentation sha512.doc = "7cd22cad45d7ef2972679cf2a3653c3bbcb1d9bcfe94a65fb9dac23760de05b659470ca45cf8be13513924fa1cbb98599a304a51bc18f8f4d6631f082e662bc4"; }; "lshort-chinese" = { - revision = 56036; + revision = 61100; stripPrefix = 0; - sha512.run = "f78920a3adac063cddd42284e325308cd124d5e0f2f1ca6f92111edec872ad1325b99331615c8643dbc11ec1165ed0b0320c9a8b1e3eda0dabfcf496ae0d47c2"; - sha512.doc = "0f8950630220afd353d05b2f4d146ded4eb24fc163f19510a3d57ea680fd06a1dff064c35a0afb8625b32741d1ab6543cde20d5269a0914e0dcff7c42bfca327"; - version = "6.02"; + sha512.run = "5e87a1c613e57157c77a9401cda424ba0544b1cfd1611e0f763b837ebd172947365a04f8734b2e7d41f84df9ca28500034b3b8f96dbc4d2f8bee59c1f0813938"; + sha512.doc = "ea00f428f8e93067a876de16cc7f8fe09f46398a209f4ec7664f83f605e674558703f05cb4ebb655a29affb3af26615731a284894d37778a5f7fad531fe2bad1"; + version = "6.03"; }; "lshort-czech" = { revision = 55643; @@ -21785,11 +22418,11 @@ tl: { # no indentation version = "0.2.0"; }; "ltximg" = { - revision = 57521; - sha512.run = "9aa5aacc687d31bc76fd81a2c26cef98fb9328b90c1d97c439f323fe7962184eab2b571431fe208823a6e42fea6c036128414474ca815517421989916a94eeee"; - sha512.doc = "5fbf8faf7bfd95b4f35e755ec1507f155647376be9311b97dd7c2924c9958fb0c42351eb43728018bc95e12cdec1b2b8ef89a7a2245e532dc8a49b4c583f54b9"; + revision = 59335; + sha512.run = "0c91f46da529823a96ef441ec88d6d3c077a8bd5997bc291f55012e0d227cc24f00081f846ae127a364cba26498a74f2769d401e6d5fe0057afdb2a76a875f4a"; + sha512.doc = "05f9639a0224c779276a3b7f19450c93e255c70680fd54292e1ad41b3c89aa15dc187d58a73475ed9a8f7279faa0f3a0ec15042e75a52c70d78416ec46255b44"; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "ltxkeys" = { revision = 28332; @@ -21839,46 +22472,47 @@ tl: { # no indentation version = "0.7a"; }; "lua-physical" = { - revision = 56306; + revision = 59138; stripPrefix = 0; - sha512.run = "d7118f61f0a64ccd3e67b7197240a49c841720816f9d438959413c603ecce9b332c9d253f21dbcc009839220540f046b18b4b009d3ad5f35a346d8276be47229"; - sha512.doc = "e3e50f9994656b3f6049f40f0cb9ecce216869b439682560f9f51496fcb43b94f33d14e1b9f0f4a160c9af848c58bf2fa7e6d2dd1def46ea029ebfcc4410f1e5"; + sha512.run = "b28768f63c2b34930a073139be3e6e90a0086a561bdcdb6aa6c8111db4e6def819c0a3a6af2b5b274d009d3c9b390c6da91416189718a67a4e1efd7eb547c500"; + sha512.doc = "52e764b0492aeb423d8c267f43436821a239e9ad019e43f7fcb881fbec31f9a56b690d792f15f954cec91ba7e3d32f70cb567994a82f3030870b44d0490fb593"; hasRunfiles = true; - version = "1.0.3"; + version = "1.0.5"; }; "lua-typo" = { - revision = 58744; + revision = 59457; stripPrefix = 0; - sha512.run = "940664d9898524e99966b6116056bb4f811d39c58a29926afee82846dfe6c77eadfc7e8cc37a3e417401cca1cab7f16043677d84947c51f695109e3f2eb58655"; - sha512.doc = "18485d5b079306fb6d943256453f4643f33b9b6781133a2fb0f1ecc5b87d8a755bb0c60428d565a6e42c6aedd3f23f0d03aacd3af5ac4055e1950289fc99dcec"; - sha512.source = "348aa0eb23bd9a94f50851a8e71633377347c1ce1942d4d84faa3b8d612ff26c2d0be192fa1a14097be6fb8fab3e363de0b1f77c2bba737a027e7ee279c55729"; + sha512.run = "85c217ddc1114990127baae0b4023fc42f2ddf5d59beaa22cf8ab05746d2769699850b60f3623774326265359211597eeabeba304831f650adc1114445bc76ef"; + sha512.doc = "be62c81f33224b98bdec4e0ba84886d4020a05d4ae18c9a4549ebbd13394867a9d835c36615d275fb5a938158dffc4d8b8f4c4a73508d45040580e3cf2ecf3e4"; + sha512.source = "ec1c817294ed0800225ea03180e7cd5361c1ac5fb7396b09f18b313e5bb511a626bbda8995d2ae5a61b1da2ee054c053751e4a5048b679db44db4254f8c45ee9"; hasRunfiles = true; - version = "0.32"; + version = "0.50"; }; "lua-uca" = { - revision = 56414; + revision = 61023; stripPrefix = 0; - sha512.run = "51223bc90b7d9c8da149133b5fc019e968da2d82c089a6e5884cd9c32b5306c3f7e575708229b1e6e77ad2840fcb0d4b01fe1d3973478385579ddc4a2d473096"; - sha512.doc = "462d46a84532e483f7d70a6b16bc9b3f7bbd7623b9fa5ec237b8e5fbf5254de69bece3d7a494e87c73ded77852b72b1b5ef43b7b5b6e02f1e181f82727069352"; + sha512.run = "e6c703b5576c7d66372a3989618609f2fe4a2b41de78c624e15bd0905744559b2adb3f70536b9680f83897a3997a492a558e285818d38b63ee7e99798bf376c0"; + sha512.doc = "a842063786a53c558bcd4bead5b6affbe9e448618d421435f49722e0a55087c28b36bc9d6bbcb874c3c794a9f5b303c62429b4386801e03f78e2f60c83cb1d1d"; + sha512.source = "7bea2f473bf12fccdc21534653f6237ea3b71c57bdaf651b8f543c5447ba25b3ae3bf735c3a0e7840b31907b777aa87215b358d152c1ba29c0e372a2672b0e44"; hasRunfiles = true; - version = "0.1"; + version = "0.1b"; }; "lua-ul" = { - revision = 58745; + revision = 59186; stripPrefix = 0; - sha512.run = "3589ac691c39e8b37a29aa0481547a8e68adc00fc8afe60f362870fb058d76cb8753a1e60df52309093bd2759b9b9f013a37f0f7fc94af7bf4dabf0d2d48fa67"; - sha512.doc = "d7bff6936de4e36c335d9811ad43d107a38f0a6d7a9ed217e7da39890a671d36ff11484949984252858f05961a667fc3f6585620d0cafc6d8fd5e674a6086bbd"; - sha512.source = "301bfbf3f0c4a3b745855f682cbec973d760cfd0273d52a431b7942012677b08e6e4e0c14fbd35acc266f09fe80429fe3e0f06b49bbf839fb8ddd72e1653ce33"; + sha512.run = "e45cbc82eaa8dcab320675cf1f1f1ab515552e1c87f96c46b58e435067a694490d574561d6ade407b498bc66216d3d46b3eb4248644bea742e4ba8b86097eabe"; + sha512.doc = "e436d3a618e368103dca705e0809d0d91b6df6c874a25ae06d249d0eface818bc519b4c19255a613be58b2fc53aa1331553c78731dc6d6e74fbd4867ab9f9ddf"; + sha512.source = "09a1d976065455a47e98cdd3bae7cc3ff2c2dfa3ecbe9177eb5cb89f8be87f9e5da16f11130d492efb23e4e928f9dba243755b377e3eaef63c440db57f4f3b74"; hasRunfiles = true; - version = "0.1.2"; + version = "0.1.4"; }; "lua-uni-algos" = { - revision = 55206; + revision = 60194; stripPrefix = 0; - sha512.run = "cdb671d19ba69f6b2c7a5f55127c8f97973c9d9c962016729dcf2ff0ee8abf649acce51bc45c5ec736f243ecb56e98de7c1d5152827023c8e19af3990ebf840a"; - sha512.doc = "5ec98605457ad145e63186ae1002f6c2fffc9bba2e512a3f982540dfe27539d848cfa05a8db55f26263fbfe60521ad7795bd6b474b6d29880046e1699daca074"; + sha512.run = "dda72953163220a2f0e7bf7cf1ca5500d45d90f8dd877c41a586e89fa60b9a038ea9f680cf1180d982ea843168f905d4775681479351922e52c3400ffb744697"; + sha512.doc = "75c9015411a471aef18480b2aa58754145d01a2364156e56362f0665d4cb841652456b2e4929b550db1dbb33821032d456c7ae39f5aa74c7d2a80afc046a7831"; hasRunfiles = true; - version = "0.2"; + version = "0.4"; }; "lua-visual-debug" = { revision = 57349; @@ -21888,6 +22522,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.8"; }; +"lua-widow-control" = { + revision = 61317; + stripPrefix = 0; + sha512.run = "38fb32d72b52507e64d908f43cdb22321d70344ff96b7cda29214fdc13fb0f5012ef24785825d792590a9c712ce0059f062e892410c57e4bb7432c5399cb0885"; + sha512.doc = "033c6ac77ca441f042578f13d0a6df1421d6e9911d4c5b7cac93c2ac5a00e2ec75b89c16b2f32bd455f2dcd41bd931fc8c14ee083d9c568f74c9c30192dc4f8f"; + sha512.source = "ce31763c29f920cb39b0a73e66e54168049cc88c53094a5d1e69f5c0c4850af13822ecc32ad982dd5ee1f51ad46e391b370127378cbca10903a4ac7295196465"; + hasRunfiles = true; + version = "1.1.2"; +}; "luabibentry" = { revision = 55777; stripPrefix = 0; @@ -21923,6 +22566,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.17"; }; +"luafindfont" = { + revision = 61224; + sha512.run = "3ed857c1297ee8ab9dbf8664b5a7a15c23da5d7e7060fd6bee0be89a0835424e2773b4598a7fc142a754f0b81d5b0825fcec8ef2824d4ea5e7a4b33ddb390e7f"; + sha512.doc = "83bebd7e06d830a23c843a1c2af0a99d4791ceb95668242860c6c2529f84da4743f96bef3865f57088481ee7beaaf86a84351f243a79d96a92f4089102c57db5"; + hasRunfiles = true; + version = "0.05"; +}; "luahbtex" = { revision = 57972; deps."cm" = tl."cm"; @@ -21995,12 +22645,12 @@ tl: { # no indentation sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924"; }; "luakeys" = { - revision = 57463; + revision = 60980; stripPrefix = 0; - sha512.run = "873879c6495479db77cf0e7a0f5ac99ad2eb67088d1d4abaf55e4ec341c07103ced954310b67f5ee0bec6986793f9e68613b7a85c3a8fee8b5697e0a05f1e1c5"; - sha512.doc = "58b2550998915a20226ef4890255c8a90aad9faf248a0c2a880b086941af256d9f83edc2b29ed615da6355a5bb5d95605580824581ebd7ed191d82b92786e8ac"; + sha512.run = "d50f0a0abff49a776c54c31ddc5d8361c4e28d93f5f79792ea95b081b7a352b75ae6f20f3f35f2725b513a1f5af4976e18fa3a3ad4ed5692767818959c00b4e1"; + sha512.doc = "6f4728b77d6ef56a2fe97b7d7418103b550c0a97a1a07430f3357c78ce81d1668dd60cc051f32007ccfc17bba0530136bf5d9203bc105ecf91438a366da3339f"; hasRunfiles = true; - version = "0.1"; + version = "0.3"; }; "lualatex-doc" = { revision = 30473; @@ -22017,15 +22667,15 @@ tl: { # no indentation version = "1.0"; }; "lualatex-math" = { - revision = 56541; + revision = 59847; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."filehook" = tl."filehook"; - sha512.run = "a5568fa178fef7d7348a8e1b72f5671a5dc00c9c8ec59dded7da3fb62105697cb09c2cdb4f0c58fd5cc16b8966a66554cd7ba0650d757cc16377406de35d1005"; - sha512.doc = "41f38f8e1bafbb63b7a83f3087bf8aa0bfd7d946206d07bba2dc93d99049ca101869c575d3f2c8b732f9beda719bdd08127a047700052ed915bffc88001299f9"; - sha512.source = "c06e83d733d9d8e380b2f688c8b21db85cd3d18be8b9cf37cc0af6b9dbf279db70d2f4d12fe879c8ce2628a1966708a117be5c72bc4dd535fa8cd431f8ed88f0"; + sha512.run = "ba37954065b7e61aea353106d3a5374303d75a3d1d1d1e12394112bce2048ac1b70a2f59d55708ea1be0a86c6c7eef54763629734fa4abf451f2b403a43e8a67"; + sha512.doc = "49e74c241db69d6fff8f9b89cad23305c84a363bcf3c47fb2619d2ee65808835295cf8e7744b537a9d48db3aa436b79a564d000fe05e2a18852343eaefad7d12"; + sha512.source = "80cdad65bf1d705d136fcf5960a10703b04c5a87aaaad609c97c130053699653477079beedf8703d11f20f88404756a27fe87adc00a82d9a698a7ca7c8096787"; hasRunfiles = true; - version = "1.9"; + version = "1.11"; }; "lualatex-truncate" = { revision = 48469; @@ -22037,13 +22687,13 @@ tl: { # no indentation version = "1.1"; }; "lualibs" = { - revision = 57277; + revision = 59298; stripPrefix = 0; - sha512.run = "ccdbde1b5b9abd3478e3912ff20b1639c3504f06433eb10cb174a3a413642629ad9eb0ecb3fc7dfe3ee1e7e2dac2e552dd86de98bd89e3a65bc6736bedf181af"; - sha512.doc = "4d3771a5cee5a1ef7a7a7d3d88cf44020563c8bf50328bd6cea42a8ddc731da294e6b300ed9318030b00f0ccecc0de8667382d41727dc02353e68fe635d0aa19"; - sha512.source = "f504562bce245c51567eb54963de87702a4651b73bce71144d2dbd91e6f9894c5d20fc43ae7a7d68c92995f6cc077bcf76875fea7309a09b288e6bdde2d55222"; + sha512.run = "0ea4d3d0e85c2ef77464db6f53c581453f22451bc8f9ecec00f89c59976ae417bab6564c5b3d7d047ac1fa4e53fc2cab4dc0fa5040f064b7f7696f1ee2416648"; + sha512.doc = "b6be707a802905d93bc86135403cd862c86cd829e3a649800a2d5fa273518c4804a76c6a09b686603f16ce49c0972f1d1d1585e168c9d1d7439aa07ad3a2aa7c"; + sha512.source = "45cd732855d88f16398e2aaec439ba45fb4b55c64a7c47f010855e3608805fafd9399c4fdfa54ea186893b74f3a94a14ed99ee97c51513bca1ce50d558506431"; hasRunfiles = true; - version = "2.73"; + version = "2.74"; }; "luamesh" = { revision = 55475; @@ -22054,24 +22704,24 @@ tl: { # no indentation version = "0.6"; }; "luamplib" = { - revision = 58279; + revision = 61133; stripPrefix = 0; - sha512.run = "516d5f55c367bb2275268e4ba8bcf45cdc576986c866dbf435d3ccdba1eeef799db03d704d452fd49cef559bd5a1bc903839a0b04a926694e336a4e5652a07b8"; - sha512.doc = "c503945573406c8176ce8f3461ab9b4fc07762e029104e582be2ae9cee46b4170916426d384b363bc30e12e83f39e0bfaf5f1998e8012b29c8133de23b39427a"; - sha512.source = "f11aca288e535861c365259a1c0e1d0a42137898282d2e6027952df827f4c52ad8a5b8553fc0cd692fc0ae5d0f0c60db58a147bd30919a1d04efad4501580b08"; + sha512.run = "b713b37d4bb2a7c527105de476b66ff9ff7f940e1ebd675016f7b94ab72da8a2e2f110284f4893fce8858ef90d063fa4997cb93c6b3121802e2999efa0b7ffdc"; + sha512.doc = "cddb68e0e74f07732acf873aa15346b3e6a95a157f0b9574b101215d6afcdeb7a9863ff16a72fb6d54b77ff86fb527b317570cf65161270b8366887148b1f90b"; + sha512.source = "b1e1e1b5c5ea54cee1056d80360cb6f1a7a40ad3efe85417e10eff90370fd1b1fc671e9330cde65150213cf3ad9aef927c5bb96a9f5025b2bedb90dce3406e81"; hasRunfiles = true; - version = "2.20.7"; + version = "2.21.1"; }; "luaotfload" = { - revision = 57443; + revision = 59293; deps."lm" = tl."lm"; deps."lua-alt-getopt" = tl."lua-alt-getopt"; deps."lualibs" = tl."lualibs"; - sha512.run = "5b71f8fa12e21c16d1aaac01a2f27f3220b1da0eb6aea77ae3767e25a15d03180b7bf3587eac9aaaa61658fa7359e6fb2c28e588fea80d4f7b46150f55c2fafa"; - sha512.doc = "f900a29ea21b654b03671cdd6166dc353bf54eb761757849da96fb74ea398d6ed9fe33f1d602e0a8e1353395cbcaac9cffb4b26c1acebc8105f119271fe8f51b"; - sha512.source = "d422a64b7251f566829c5603957c3b2247cf112f8c3b30951ef3e9584a78b758f38e4efd0b399f35832f5e2f8e405901a13688c6a62bd86f2892ba44a01dbce0"; + sha512.run = "821a5ea31a6131bea129929abbcc114959e1a32325a42f1b22fc6d37f7213d1dbb2f20cefcdcce38089d82cc366328b7dd80cad192a374694a925506073de8dc"; + sha512.doc = "911f1037ddd942f357c1f9644dc424984e93a483b5c5a10ad279a77287cc3f9cfd94ce0113b3b0d6dc6d00dbb13814cb8b46c113ef6877b0fd0b7093caf64746"; + sha512.source = "0669681ede7befb415e30e96c575efd9722b030f9d5d5973d13a095826900dfc05d3cddcc29eb64257b77d221156031f0dcf5a1c2f3adcae97c61bdb039668d1"; hasRunfiles = true; - version = "3.17"; + version = "3.18"; }; "luapackageloader" = { revision = 54779; @@ -22090,6 +22740,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"luapstricks" = { + revision = 61036; + stripPrefix = 0; + sha512.run = "11fbfba2f47dabd8db58e4cf502d5b033a13d08f248be071d0c8c4ddb81e7940e1b22b078e75fa50910883a17b71670d328fff00b488b9b6d3d681bc5f784d45"; + sha512.doc = "a32552fd6c6038650f2427cbeb320f87bdde17f3ce8a3a07071b22cd71f2a0beef6c730c1af6d7de426403a3793dbc87d7e511792ebd1cbb6dea5fbf4ee3465b"; + hasRunfiles = true; + version = "0.3"; +}; "luarandom" = { revision = 49419; stripPrefix = 0; @@ -22107,7 +22765,7 @@ tl: { # no indentation hasRunfiles = true; }; "luatex" = { - revision = 58702; + revision = 58822; deps."cm" = tl."cm"; deps."etex" = tl."etex"; deps."hyph-utf8" = tl."hyph-utf8"; @@ -22117,8 +22775,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; hasFormats = true; - sha512.run = "c16a8cfa5ce0991d4b667471dd32f692c4e340d1856a36fd684811d40322f912b94125ae101ba095ca6c54b2afa3a37f1ab9af83e4a10328f8c1a1906a02a44b"; - sha512.doc = "0d2492075eb2bb6b9cc8a67b0ed53cf5a8c4c700797d8bce8061a4cf938db5cf19fa4ed6f7adb59b1da0701ff365504e813289dea3c245ad717c82bc58df9128"; + sha512.run = "d24bb6b9ac86d31c6b43a553f8153482f962d42dde813b41f41467ec2e7b5606f065108fda172217cee9b48e8b75237365eb6eda354d16def2bc2919cc0815a1"; + sha512.doc = "9096aa4d630bbad43fb4eecbdcb8ceaca94709fd734fe7e9a3f09a9bc5d57209c922d1359f71e8a2d1cdbcbe127d3c09c2311b96c2d2574d5356ae9f9f6bef7e"; hasRunfiles = true; }; "luatex85" = { @@ -22141,22 +22799,22 @@ tl: { # no indentation version = "1.3"; }; "luatexja" = { - revision = 58542; + revision = 60862; stripPrefix = 0; deps."luatexbase" = tl."luatexbase"; - sha512.run = "be42a930c9b89695ac5e69edc2ac28c8f9956f616012826932e56af54f3aada99a02de72c87f4a285e3553220be1583bb60d98e3741abd3d12d167d26b778047"; - sha512.doc = "667bb90edc5d4f4d706e3f0ca32cecd2c3f63e5b7a10debe1adf3824ff745f743b4dabacd6eac970b328096018b03186c10789adc61daa0d91c4fd979aa5b98c"; - sha512.source = "8472ba4ca610b6579549435da7bf3bee4680a2ef44ed9c2073cbbdc4112f4f1604d30d62e91a894769e98cd1c3d8baddfddf406cde79bbd8539e441c9d2b3e01"; + sha512.run = "c86d8475e8ed95f31e8068646061e08845faee7749d5bac40cd9f55c20b5d7a5410f2af7ab66c91a0b470e1f7048d95bbbcc5182b24541cc470b1c235e00ae85"; + sha512.doc = "dfac6f66fa5248e94e9c0dacd6aca177473563411ad5cb749faafa83ab8fe058184005557495aac2b137c87f2988e85760bac454e8fb3277e4b631ab83f0372c"; + sha512.source = "3571d85fcfb142ec58d68f2a104c375a89088e201ba0f80ddcce0ad381851e60529665e5e1ae3f7fba1d0e4aef7bc7422abdcc80e04adef9ca88747be3329a39"; hasRunfiles = true; - version = "20210319.0"; + version = "20211024.0"; }; "luatexko" = { - revision = 58085; + revision = 59892; stripPrefix = 0; - sha512.run = "b9132deca6c059e3b77ed12f1e8c40b619281836188fdffe01eeda270adf9f1e46c1966a741d7801f7542fc076b20321216b9fbfda2e703396f9f721bc9d10e4"; - sha512.doc = "804571c4ed04b9eae4ee9375c11beca755c02e58b79add2d97ec75e3eecaa3fb267ce9da1fd947e526f0dede0e405da0b29c2f0aa6f96d04bbd8d83d0866a296"; + sha512.run = "0d585cd6c5a5391aa38d3cfb34d0f5f8b86baed302526d61ac4ddd59521f356f4db63d02b0c3f795b8cb7245f41b566a9c180c289e5be7297e198e5d216afbba"; + sha512.doc = "5825f168e592b17c78a2406f27f201705f47684bf90c5916f394edc2f3c9312c4afb23387e07647f90de9e4ca6daf16d38fee9d7d15f0c3fb80b5602803f4796"; hasRunfiles = true; - version = "3.0"; + version = "3.3"; }; "luatextra" = { revision = 20747; @@ -22185,20 +22843,27 @@ tl: { # no indentation version = "0.1i"; }; "luaxml" = { - revision = 57183; + revision = 60709; stripPrefix = 0; - sha512.run = "53c98fe9b23a51e57244d73e5a4c572a14f130da4ee34c441d953d4ec0f3f18900df9f522d7710fc2b1ad25dda672c8d4c49e29e2a0b764c8df542fac024c40a"; - sha512.doc = "9985335dfb4b95482f685af3df692b8763815cf38439743dac4d993fe215a27fbbc08e1193f46a19535ef3a210540b57ba10f1a6fb0f66b4c6e5789354cfb4a0"; + sha512.run = "ebcf0216dfc05291cd1f44096785fa10b4d8f341d0c45c03a4818aaf0ffae1b8a9ee4edc0ab26d1732d651218aaa936099a81c2d732b1ff25b956339f45df8b8"; + sha512.doc = "8f42b46c552b5771058f442e2b962d49c13f31c0b58076770131d6e8bb048cd706db9e7380a43cfaeae815bb02e83709e9165a1057ac9471bcc0fa2ab322cb45"; + hasRunfiles = true; + version = "0.1q"; +}; +"lutabulartools" = { + revision = 61003; + stripPrefix = 0; + sha512.run = "5c2d1b5d712801bf4bd14802bbd9d9b1cb93f51ae9df8102cdaaab463b55ec4a6c5a167a905d210947920f9624c8d882ce4a8fa9bb2fe8631f4f7cff04ae1118"; + sha512.doc = "b4721642982af15dd46e3fcc8d8bfb5576a106a833850f66a9872ff9b8bfa5a996e618d0df7b7150482cf147515f87eef424f7be0fd65182b91bb3ee5316b737"; hasRunfiles = true; - version = "0.1n"; }; "lwarp" = { - revision = 57836; - sha512.run = "7399b81b9388273a19bb24f8a834f084f961907eb55b97c474eb2a741e2847da93fd4a7b191e5041f0346e84d47798f1a4429f9726d5a4800fdf85221d36f18f"; - sha512.doc = "84f55b97be328a79c2248e4ad48ad033ae9b214e39cb7118a0f5a60b860df2174ac53ff82da0c82ce5c82a109705b07df9cd4cf5b36fd7b1ee5c04f95f665269"; - sha512.source = "c5ba17164443f355d83dcf6bb3fc524628de2628ebca0f3a7decd2124360e878a62594a45295ef2bb4a203ad262842201ccb13321da69c84a0d8e8145eb16738"; + revision = 60674; + sha512.run = "37b2e031e75fad5fb8ce276c7bb9acc67dd38558f25394c099519c5535a8a0e27385bfe88c7de25b3435fc308115cf18830b24693c486fa918f87693d254e7fa"; + sha512.doc = "7d325390f3e07ed8c0533ffd39b7bd4417daa90b5ee88be1312ae925a1242ba8f67d14dc9385830d81e21d643c4a9f0bb3caf60f59bb26154c81f12166fcf48d"; + sha512.source = "c7240a571ffc5b5e7a09adede558b0996450789c40217919173244d25dc7565a6aef5cebdc0df1ead8eeab5ad0d996c0f2d1930ae4d9651a0824e22ffede26ea"; hasRunfiles = true; - version = "0.895"; + version = "0.902"; }; "lxfonts" = { revision = 32354; @@ -22231,6 +22896,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.63c"; }; +"macrolist" = { + revision = 60139; + stripPrefix = 0; + sha512.run = "d722a58921aa7f6c5a887c022027df5d04c905f9c1cd7a95df31e1e3d9ad8c583028436eeb35217cb186aee6ea21efff09d3f52fa5284963789ccaeedc3342e7"; + sha512.doc = "21893f581ee47e136a47c56deaee6f9c4e6c5e4380027e22bfb62cf6258502ecb1a647f11dd5468b8687c033e0cc708397efc2499307db320963598228dd3b4b"; + sha512.source = "ee930f3a9d8a909c9c139f47b9022badf50ead0fb95a87a38dc2850e1bf7ea38d346ac362e1aeeb8c2dfb661ce5dca0c3cb78fadaadc0524b080d73d3241d0fd"; + hasRunfiles = true; + version = "2.1.0"; +}; "macros2e" = { revision = 56291; stripPrefix = 0; @@ -22281,6 +22955,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.0.1"; }; +"mahjong" = { + revision = 58896; + stripPrefix = 0; + sha512.run = "697c0a634304e4e94a6165fd033d906209fa6811cf6297868b76389165bf557f3b6abd419582d200bb252365f790ce53c98e1da75c8b6d3d061cb5d6b635ef38"; + sha512.doc = "622a34f880eb02813e7f4c1f6eb7199194c3ee0e62df534e7832530c34f09e2abfa7f1d491b4840310841e230e3ab5080cbfa5370e9366c0f9b8fd9000b0ef38"; + sha512.source = "6b64551b9cf9d4e79875935d2b37af602be7d3b001a3ef441003136b950741adec8d4b8521ca9a49d744d2173c0b053f025af909fe320edf08f1b3d7c131055e"; + hasRunfiles = true; + version = "1.0.1"; +}; "mailing" = { revision = 15878; stripPrefix = 0; @@ -22299,11 +22982,11 @@ tl: { # no indentation version = "1.0"; }; "make4ht" = { - revision = 58563; - sha512.run = "dee613984e389d3d5e85c64bbe99390eb533551b3d03d3f9993cd8d92fb5dc7495456e51281ab204670a0f42139111b27b45c132075eda47c5604e50f335919a"; - sha512.doc = "f153c737e87821a478fbc9712b320647842b3851094c851b4619ebf1e658ca944adeb2f19d197b57aaa649be70cabab9988ba33914a10c3708c75ee5370b2eac"; + revision = 60738; + sha512.run = "9fabde9f3f9bc9cfdcde8dcbe343c4c9a1345573ec5bd8124523ef3b9805903553cf15f69774ca7a3e703168c56883bad72b8dc18d66e2073d402977cbb0f200"; + sha512.doc = "31d4a239804ca2dca178789accfa640d6fbb04e38948a36712a27bc1ad42ae0dd15792df07306e48f235018e18a5349a83aee2749fa7e2fdfaf8c035cc03a133"; hasRunfiles = true; - version = "0.3g"; + version = "0.3j"; }; "makebarcode" = { revision = 15878; @@ -22383,6 +23066,15 @@ tl: { # no indentation sha512.doc = "492d0bb6f44ebc0440998f55b51ec5bce5ad564918296f85245ab10bd9ef67f8a2e441560ed7aeba8af2cdb0a923f225dd867454ee83889252da6be36f89ab16"; hasRunfiles = true; }; +"makelabels" = { + revision = 60255; + stripPrefix = 0; + sha512.run = "4f58301507896c2e719f2607e1e456aeb25cc78913ed02d9eaa12489aeb643e73bccaafd1f219c1c8b485d77aa64e99d64166b63e8a2c7a7c3c8cfb77ac23bc6"; + sha512.doc = "da01e167d1be1d4831c1bd0aca43472aae12a8204ab844f9964e60f57cf22312532c52cae85964f10780aaa0e4f84015f6ceee8ebfa042b184fb1ecc7c174585"; + sha512.source = "588029533fc25c2501cb8a72cd4226c878a0c419e42d6e4269b68224d9992d298a01019c59c794eb1c9cca14b3efaf758f5c97b6ef90451a6e6d1fb56233a5ad"; + hasRunfiles = true; + version = "1.0"; +}; "makeplot" = { revision = 15878; stripPrefix = 0; @@ -22418,13 +23110,13 @@ tl: { # no indentation version = "2.1"; }; "mandi" = { - revision = 49720; + revision = 60311; stripPrefix = 0; - sha512.run = "a22c6cd667b7a256cdb0d1f975d214890811ad047d3eddc96e1289fd22a8ce9035183c5c1f6a876d7bab85bf8bba9626d36c2edbc8abbd060c0ebafca6b84932"; - sha512.doc = "60cc9d6215525424b3e05af173a533d3781d1eed50d1e89e3d31f80274ab2b91033d45254eb419ec9a9a4e7553f50ac9c737ac82daea8dfbf29ba077d69ce5b2"; - sha512.source = "2b05284ec86ac90ae6e136c96b2eeb0215ce3cb7d9b9f85aa14f047c596e7b47c8c618ec5d4ee0a99d624b737fbc8a3f026895bc9a8b2d465fb3dd7fa2ea806e"; + sha512.run = "94f561092ee67cfc27354612be8836bab835cc4f3db4cb0c92db859803429ae29f288f584363128a42fc516c9ceafb65f710777c8d0c5384bd157e2baefbdc1c"; + sha512.doc = "8d2bf11a141d9475ca699245df345418c74185dda498098bfd5540349765c8d59cff4739a731d6220a7eb45811a48a9247d10ecb57cdcae3f468f8da557887e1"; + sha512.source = "803989d743ac0ddd66a922bc61787d9228e96276cd2b5533c2517ce1ee05b93a2972da2a3b9529f0df441cbf0db9efc760bdc727f644deeccb68495d56e55a68"; hasRunfiles = true; - version = "2.7.5"; + version = "3.0.0"; }; "manfnt" = { revision = 54684; @@ -22457,13 +23149,13 @@ tl: { # no indentation hasRunfiles = true; }; "marathi" = { - revision = 58760; + revision = 59642; stripPrefix = 0; - sha512.run = "d3ee0acee2b3a7f7521e3af6406ee747e1af4ccb8b4f53701d753e174f5784df6bbd64d662f25254ada8de9bbc147bedc42d332f0b1643f19cb7c914d0389000"; - sha512.doc = "efd2f3ad9a08022009823700d9afd0f0928f304a363ce2ffbd5485448b40e426efaba8187a6b3cd144ba6ba82476f9efee8c71e8fe00f6c6d9d3faa405ed22ae"; - sha512.source = "f02b1245d7ee3d5516e66f4176bb30ee44fdd47daa4189a2b8cf62359ba12d2cfde331ef901a64f54efbb739bbc9b555d7d94ff755ded64961769f63407291be"; + sha512.run = "c713cf05356582b01440fcd0cded691e7e3c13852888c7911016bac8265801cb46bfa8969f7bac7c8ddc9c60b841f3f1dbac35488a944b6a5ca876c61085d2f8"; + sha512.doc = "f9175cacbdb94c98c91b8e303fda02ad8952730fbc6ccd9516f5d07893b8ec524f747472752d081c47a4ca191118c8bfc4cb0c4899fbeca269a1ae71e09a4a74"; + sha512.source = "34a9dbfaabfedf42a2deddcd2163c8d2048c331f4ea557e3d3f2ab6a70dbb75aa7e49b1da9fe64c2150f23a91f2760d8033a82a5f268f642cad51ca59fa541dd"; hasRunfiles = true; - version = "1.6.2"; + version = "1.6.5"; }; "marcellus" = { revision = 56016; @@ -22509,13 +23201,13 @@ tl: { # no indentation version = "1.4b"; }; "markdown" = { - revision = 56414; + revision = 60667; stripPrefix = 0; - sha512.run = "892bdc84562db375dcd5824f43e93466ca1b833de08ffa247e5e2fc477f6f92832e51feeef8056aac2d5d895e080eb1bff674fffaa0a3d2da8aca3fcb51f0ae1"; - sha512.doc = "b00203a7abce01e87a9e54b170bc68bd19bfa5ec346d37ca8805150013d1327b038be185753a0471574b88c1a4d572bfdb7e2ff6bd7cbfea74aef02b489314af"; - sha512.source = "b8936aae408dec7c7a5d286e0c0f52f8d3d36fbe6ac70da50a3921ea4338689d8f9633f9b22bef36a428ca8cbbd4fc0ecadb98ac9070f3afed02d8ee9ff67163"; + sha512.run = "9e0a0cc36d95aff7567a90c64fe3ab81459175c64fee4a12412184c243820f9507cee87ef1e5c49347473ea585924c24d8d386f8633774ab8360f7394d2eeb6c"; + sha512.doc = "7be13326efc5b437395e13b373e7486909446e1b34cfa965adfa02f634314738077a5ba93d8f2d503763731a656607986b55174a68ad117c57e2a3e8bd625251"; + sha512.source = "1ac3f533a56aa89b6afe0d7b364899f4889a4d08cdf2a00ed0e706ae7e344371225871d81cca1ba56f77cfc29681911bed1c1d37bb86c50f887295e2a4a9abf6"; hasRunfiles = true; - version = "2.9.0"; + version = "2.11.0-0-g4505824"; }; "marvosym" = { revision = 29349; @@ -22581,12 +23273,12 @@ tl: { # no indentation hasRunfiles = true; }; "mathalpha" = { - revision = 52305; + revision = 61089; stripPrefix = 0; - sha512.run = "c6b653e5a0b7788ac36ea9ef6ce07dd4fd19a75a82c4115cac5921849477839387b0cccac469dd74b9f4221315ca741c49304eb76213ecacb97dc7e218ac4cc9"; - sha512.doc = "5a1d993f73d3684ccd8a855cf8e016d35aa29c34fecea0f01f147a0cb108b355108faf43734c83bdb74f59287a7963b4b418894e0a5c0ec4ffd884f3f4ef1d0e"; + sha512.run = "9c56ad5cabba0fc7ff7403882cd46161be0b4d7bcaf632e48eab5170b1350a1c780a9f98ed535466ae7c17a387a461fa4663ffd3c4fac5cb01ecb77bccdcfec6"; + sha512.doc = "5de9923e39ccf9b55f10f0b97067d001ead5598423174808d2a7636c96f8fbd2e8a8e6c0d66140f62d51b9263a736cb6106cf6db0e16e62ee5d9f3887baa3159"; hasRunfiles = true; - version = "1.13"; + version = "1.143"; }; "mathastext" = { revision = 52840; @@ -22598,13 +23290,13 @@ tl: { # no indentation version = "1.3w"; }; "mathcommand" = { - revision = 53044; + revision = 59512; stripPrefix = 0; - sha512.run = "733c1581550772bdeda24b12154709a09f4427776392e86214d273c2eee1df7a80fea4285d21410f44195af30682aafdecff9f678ac43ad5f78a90605f76d332"; - sha512.doc = "eed721d4b0da17c2ae997c7b1c46f19531108db0ecfbb334b648d5931eb2e86eb99465c52093e2adee7150dac3d5c8dc4b9df45ae68f47d0a238c875b33beed1"; - sha512.source = "9d7b9156f28db730c20d1b0e22ea3ff5b90bf34d8d500248f67dd1ef6c12b7eae8e570db065e85f77e61e828277d202e4f73eceedfb79c756a80e2413b14f6de"; + sha512.run = "4be34084705419757f92b8f31be35a606689c25786bc5b95a0531d572ce21601881cbd7548b7d380241089d4473fbfb70debeab9b30633671b3494d66bfbb9f6"; + sha512.doc = "80191b36dd3e34193c2aff764b7ffcf274a4d9fc41b1d19fc92ac807e03809069efbcace953fdbddd481db7d6604a859eab44a2c93024ecd59968c9e24e2630f"; + sha512.source = "99fb6c9f81e72c3b78807ff1d073ff4c6e193a163c3aa6aaa2e45d94ca246933733b1b35a671557cf40fdb33184af6ea28fa8a590b0339db373820ad9c38d514"; hasRunfiles = true; - version = "1.03"; + version = "1.04"; }; "mathcomp" = { revision = 15878; @@ -22725,13 +23417,13 @@ tl: { # no indentation version = "1.13"; }; "mathtools" = { - revision = 58725; + revision = 58856; stripPrefix = 0; - sha512.run = "52801da9fe4f3e0dcedd34cb8e7a4a3dd5220f2437f62f32ddd56b99cccb302c7fc138f058f3528e28aabfb8588735b950d1afaf054fa0bd1766ab997ec03e05"; - sha512.doc = "ed6ba30e370b3a1ef394e4bdb8301e9ac2f101faeaf0c8260443842d16ac88e665a8d6450472fff1c4ada3e3d4ebd41820626704dab37eef465fda36112ebd77"; - sha512.source = "7d433c9d835ed64a485293d68a06953368fa9b16c60da2e20ccc59d116528d83b3a6fd2272332c8cb1c5a359bde5339c869d2a97a6fa3d236bf3637d8cfceef7"; + sha512.run = "ceb283012776179cdec04899c28cd55c76811d9ece89b3ea188ae47619296db94983f8b768dbd0cf0909c9e7da4b0f1b1bae7e3de4a96193249ed57fc987683a"; + sha512.doc = "c4ae884edb6c26c832d920b8f04b31641359fcba68e208b9f0eafaf37ba3ab7f465a39869b9890d0b8431861062414be52d9233836ea60a6255731a17374bc9a"; + sha512.source = "46a21e495a34fc85d59d7952f3089e59f28d5aaa85e980c49c6b61df49c6e7582d98c2da1092be80a2a6191f6186395ad8d7086d3638176933843a6592c2c8c2"; hasRunfiles = true; - version = "1.26"; + version = "1.27"; }; "matlab-prettifier" = { revision = 34323; @@ -22783,20 +23475,20 @@ tl: { # no indentation hasRunfiles = true; }; "mcexam" = { - revision = 46155; + revision = 60481; stripPrefix = 0; - sha512.run = "37637616c9ccbe4e20ebae6b479e076fe87b6bd5f3bbf9124c79b93cef6e992d82bbb4fcfbbec3e4a7dcc187d66742c410c4a6280328c80765495685b4fa2cac"; - sha512.doc = "5d1eddfdca3ebb7fbe28d93ed6e7332147857d7523d3b64e908aa56ef71d9bb2546d05c150737a3401b5ac7f76110a421513db2d8fba906173afbde9e012f7f8"; + sha512.run = "3c75869bd0e65798fa451d971ff441f3a42daa0647c31458631c388cd14cbb36fe4f4dc9178e59fdb307de590d201e8716b1a86dc9b995aa184090cbdc95c9d2"; + sha512.doc = "30a7f5cf9b01e8619c95d63ebc2e3dce27beece3a4da6ed4d68843c171257f37d7883969edc94766e065c5bbdd78a2731d38666d2073fd5d77873d5a88b3f820"; hasRunfiles = true; - version = "0.4"; + version = "0.5"; }; "mcf2graph" = { - revision = 58756; + revision = 61354; stripPrefix = 0; - sha512.run = "2aa95a3df195a72ccba635278db0ac7aea1d382db3aa7bc913734405abbba9b4e98d62991178e3706e6b940caede95a6225ea5535e52a4308e57611e86a02fd9"; - sha512.doc = "e778964cdb0d280df0b3341b4259c40032188c8af2125720cb7d0adaacdc9dbdba03513a419338875b97449901f615db25f2397071776e551d039cdb86ed6e52"; + sha512.run = "e702c5a9c9b3bc1362badeccf71657792ab6412a5291356779d4818e9578a4c90a658e338b804546bd773dd28e3524f0d4460e59fd772831e645211fa3ab8353"; + sha512.doc = "a376540a7911f3be5d34e719afb6be0b15893d3ef078dc8584a9dccfd30ebbfe2f191dd9c4bbb9b47e5e45282b934cb3503c76fb757caa1b89622d2ad4dfea54"; hasRunfiles = true; - version = "4.62"; + version = "4.76"; }; "mcite" = { revision = 18173; @@ -22859,22 +23551,30 @@ tl: { # no indentation hasRunfiles = true; version = "1.05.4"; }; -"media4svg" = { - revision = 57528; +"mecaso" = { + revision = 60346; stripPrefix = 0; - sha512.run = "8d8d7ec31396da81dec9b089c02fa496cb1d07106bbe96e78c762b83f27b7109d6517b85250d7d8440b1f169d1b1bc2f3d64cf56723e20da9af72f6573740158"; - sha512.doc = "ebbee7e14288fa3ac50d77e40056cbcdf53d5228e2accbea579cbd004508b12e562a3a1d2e6e6c5b20b42267335c9ba6d81a34a04a5f2fe8e9826f93de97e298"; + sha512.run = "b240bfbeda5a18fd24625444403f508e3dffc5b3631a8ff6e88db6aebcc97da3eaa2ebb3ebb0d15b0c1bca0d7f62a72511a00c0ca1870f6d0d3e90398bbc5754"; + sha512.doc = "42744543f456f1c77a30be81b4dc47f69b220d2d0abd8cf7f05ec7136bda9f55f98e63a48cb9b2fb65d6fdb3270bce7a31cbcbece15527d4141bac301dd55963"; hasRunfiles = true; - version = "0.5"; + version = "1.0"; +}; +"media4svg" = { + revision = 60815; + stripPrefix = 0; + sha512.run = "1da1c45ca3de316998dcbdaec279cf6d3e97320fca8ecdb0e859255908a6b09ad6a88adc7d30c81e4ce21aee2e60119b8f9b8d6f934030e729e4e0cd4d303808"; + sha512.doc = "c5c2113c55e0ff1c296f422faa46efd81866d6990e109956cbc229eb4c7f97599b6d2e26c50b46a9f7ee4c5b8ddc1d82b14dd6b175dbba97992d427870cdc7de"; + hasRunfiles = true; + version = "0.6"; }; "media9" = { - revision = 58025; + revision = 60796; stripPrefix = 0; - sha512.run = "8074b787eb47d82d9ea38ec1e3261deca554902fdc4acfa140de33db4ed2b6de1b0f9af761f27cfcb1ad90df6a02e6b0e697e2ebcebe718eed6d95ed1c296ba1"; - sha512.doc = "2a28cb6f7b10eb19767ca75e51d16406319fc22967af38b170669f46627d0978065917a028d1f0ac480680175ba0464e27c367fe2181ad36c0cd057cb1beb286"; - sha512.source = "954dac82dc95330b16055b5096b03c784363f34833b6a30d19b785b621289408b8dbd574e8d77e59ad57216af20b65071e55e1c228ee1dbdfcb1d5fb2b9d0410"; + sha512.run = "b0e69e3309359acc85533724fe3bdaf3f5485de7000e51b412281fc1934d03f8050d7cf39cba1a4346cb5adda605cf24303a997aac30f308fba565aedd45b5d9"; + sha512.doc = "0578ae43ab9eb94129cb24a9ed8986d8f4c16dbd5797fa2db302833992a49ebe62e8eef5be665ba93923a90c2a2615631b7e61c10b0de8f09ed97d7857eb63ca"; + sha512.source = "5ee30f8b68aa323bfff2234d45798a713d843aad80146421d7d1fdd997014d23d037e67f73f8267e5b827cc76c20321983f6150de9ce9fe797cba8c25c68c1cd"; hasRunfiles = true; - version = "1.15"; + version = "1.23"; }; "medstarbeamer" = { revision = 38828; @@ -22893,12 +23593,12 @@ tl: { # no indentation version = "1.6"; }; "membranecomputing" = { - revision = 55918; + revision = 60592; stripPrefix = 0; - sha512.run = "78cca23fdfcbce0fb0105559966c88fe9337148035721c803174c828b94a11ca74978125f94e06904e293d680e071a97c48405d490d785a155aba98be71a5dc2"; - sha512.doc = "b41ea7869fa0c1bcd2bcb4ccc305b6af1ba3c8dc539cf5d21bc48fc7123d70e1c6945ef06f18eb8b64d01748bffb64fda0f6596e7683104692698fab496fcff1"; + sha512.run = "4e22153d8c3894275d1b0a9f7b05754db602b3bc4fe9d2d2dd79f11f979bc91dfa3ef2125abe78ef8be5650dcdaf06f161fb9b3abbb90acb469c93e9712cfb85"; + sha512.doc = "1eb493ef0c1133b72299081378ca6e128158c2f11885938364b5270e02b872303b5ef9937912688e75a92a33d5c0e38fc147b8f560e7fddd3a7aa74ba7fb271a"; hasRunfiles = true; - version = "0.1"; + version = "0.2"; }; "memdesign" = { revision = 48664; @@ -22915,13 +23615,20 @@ tl: { # no indentation version = "0.1"; }; "memoir" = { - revision = 58666; + revision = 59610; stripPrefix = 0; - sha512.run = "a09bd87ce8253d6af82c0e8816635c1c1b4986ef51f72f671cdc9a74b7088b41889039b9af174620013d8ef2017a3db660c9fde7c56c0fcf4618bb419ea6e220"; - sha512.doc = "f17446fad66433a0e10287c5c040e6ecb45222c3061dab28d4b2a5541ba1527673e0040e267c8af0bf0e63c45d1d42ebe0e336411e11b8b963caf1147cb5829f"; - sha512.source = "60415bbbbb1e3a42227b24f74617d0a572346ef30cacc366ae07dd887eb8606636e25f6a3ef8ada6f35fc3e5aa7c5e2f57e383d0f6578044cbaf2688daac9576"; + sha512.run = "50709cfca673907333c9844d9199d8ebb7d17f22149bca7a8a5b986d0948c9af8577d4678a038eca4324d30c67917927d5410411d106ca6083143344cb0597b4"; + sha512.doc = "90eec6d9a4d013f952196f7761f7a4b54784739bf4d847a415896240820c183bb22c5a69f25575da400d08d8b1e8cd9503df50a8a478ac9cabb2e618f0521b88"; + sha512.source = "2a28c7038f21b71b29b91732e8872110f5ae5bd3d9f9b5efdf5cdf06b91f98de3305d23a71185a74f363c6e51c802576e8a6c3862cea54ed1096b380e2681c44"; hasRunfiles = true; - version = "3.7o"; + version = "3.7p"; +}; +"memoirchapterstyles" = { + revision = 59766; + stripPrefix = 0; + sha512.run = "0a109f84bc4d908b1d32bfe3ea0591c81f3de757cc5a5cc1aff3e60b1d2fbfec2e8b760fc0d07faf1fec62348933149a03c8c6147fbc5ffddae30b74a131a100"; + sha512.doc = "2f8a20d21dc1db21017435cd58c4ae3ff744b5f5605aafcfef6dfbedb1461a8fbee456ffb8ac1399416f7ae6b8ebec5d59b5d50886182ba5116e22e3768fd530"; + version = "1.7e"; }; "memory" = { revision = 30452; @@ -22941,11 +23648,12 @@ tl: { # no indentation version = "0.1.1"; }; "mendex-doc" = { - revision = 50268; + revision = 59706; stripPrefix = 0; - sha512.run = "2a4b24f7340194fa80160681fb038369e45c1e6783765860d3f57be944c4b79533febc82cdbc65f89b9ad99308cb4ecae4baad37205d0f375f244e5211a87df6"; - sha512.doc = "e8c8e773169a262e9f19bb9ab704c05968440aa0ea5928e329c79851e9e23fec5f78a108188fd2512becf7d78ea1e9f388ffa80b0795bbb4ff8cb81893b4e869"; - sha512.source = "b526ed09c503619dc128721e9ae439b89b5b143ae18d388fa387cb7407533e47f0bcaecb6967380f3ebc067f9e310f596f0302fca5438212734730d3ca7931cf"; + sha512.run = "15240dcab30c8afd330857889ede633c9549fa091899accd3d194a0257e308ac0e8d66892a59390917f3676d9fa4f02905574244526b6321980aa4855aebb76b"; + sha512.doc = "515241f6b1c3285511eacb68d313a926b63b9cd5bdff6a42d933a802413a173b868c8826c5358887a9bfa37cd970c711464c0972c5982ff1c12469c426ffbd0e"; + sha512.source = "a6f375bc6c10866d7039b58dfff2eca7160a1cf827dc6bf89592ce54632245384738ed1f88d81bdff525c6e6d9e78312708eb14644ff70a81287ae959b6c6d1c"; + hasRunfiles = true; }; "mensa-tex" = { revision = 45997; @@ -23171,20 +23879,20 @@ tl: { # no indentation version = "1.05a"; }; "mf2pt1" = { - revision = 57018; - sha512.run = "87df5858f4a383f4915d469479460d55a6975a841d31b9993c9e3c9af422965d5eb869eac82c2dda968c17160e96c794ce85760c56d3d931d09fd13425d3c508"; - sha512.doc = "5320e1d724fde19f8c0c1b85902e57609e938243baadd00edb8294867a1df792ac2f72bcd1bf7350f4a9efab1563c9fea4361e423079b1f75ab9ecdbf2da4b90"; + revision = 61217; + sha512.run = "ca93a3ae439f9cd8029720bd1d90fbe75a403e7ab4ebcbe1ba1e5a7a28aa9269197f90a4aee849fea59d734d5dc38f04eedc140ff1be64fd805a10ab5510a2f5"; + sha512.doc = "6c10831fdcc48d25645be675fbf5da29da945bd79032c60e73e04a39d61c287a64e7b884381ac0b08e48f5dc9b6dec27efea874f6e13d6e4a5e3f32c22fa3ce2"; hasRunfiles = true; - version = "2.6"; + version = "2.7"; }; "mfirstuc" = { - revision = 45803; + revision = 60770; stripPrefix = 0; - sha512.run = "de7ca64b5a32f697ec1efb477c2230ac418799e72f298ee6ac80409952affb35ef6152fb366e822ba1b01e39afe4483d5437c4e9aa22130a90bef79f87ab77a5"; - sha512.doc = "1a2705a13325a97199095fbdb900b94e94f308311d7609ddfbb75efb7afeb1a2634a0f543da517a03d68e974d2b917f94a1b6a7b3d31965d7087ac585b6b0df5"; - sha512.source = "021d1e945d7033ed18d3df4a3a0756c9048e7a576bd5d64f1fa2f963292a9aadf0c5bea95b29e3468117ea4f02e4b83785517516d87a31bd85bfb6fa0133e734"; + sha512.run = "9bf4d7db5094b20b65302face634a10ad2bcaf521e948130f5fda6770e8433074bd8d35b89bf905ad22609340e27e85dba5c50715a776d2c1ac98a5ec3faf5d5"; + sha512.doc = "227110ec17f336a9c443bfdf6294259a45457fbbfd33c14bbc2d7c58d28bfd6cb83182ef6c6a09e3ca89dff6fb98a807304bb41695e1d823bd80c17a1f5a862d"; + sha512.source = "00c4f80df9ad7a6647f5dfa3ac3330ebcbe1041817ad013eccba3faa1631db0a16fe887240eeb6fd0e21b61308b1cf5c9387101bfd9ee01738ea46bf5c87f6d1"; hasRunfiles = true; - version = "2.06"; + version = "2.07"; }; "mflogo" = { revision = 42428; @@ -23301,13 +24009,13 @@ tl: { # no indentation version = "1.1"; }; "microtype" = { - revision = 58394; + revision = 61266; stripPrefix = 0; - sha512.run = "07f2e8f56fe2d18efc0b07fd1493303ac3f3f347550bf8644c2c6782f510eb57683a313bebcf63647664bf3dde6a7ecb1127a14d79d1ed3d0ff9f4d7651cdc76"; - sha512.doc = "7804243348e470dd5fc5bf087daf8292664e378161faabef20d1be8dfbd461b7654fc55fbdba7674d18d4a4d058572968fc3ee05e036b68a67a43d366923cfc3"; - sha512.source = "e7dbf9965a74255e64c8e1f4743fb6acb66ea19b493fc3ae095932bc66ab71e75f090c74a800b4b05c6cc6d20bbfb07376812f3782697737d7166607aa70a347"; + sha512.run = "9750c821263b26667c9a235d2f167962fbdd55ab3719a8a5234be15a47381138120af4a3c40627a9a827e08cc7c3166290894ca17b5c76f6d952e34c663e3897"; + sha512.doc = "c48e763db211d9405b4da181a9ea079cc03c64fc21e7b04b26dc5bd3e70bddf442a92774a75b324dc54044a7f1a300f4d5f93464a0aec3c5764a078bf15465ef"; + sha512.source = "4362c81b57b88291cb8dd11c050a2da56fac0f372b5d0ef592468114ab8f1b6f8580d64db7128d9ce0486d4489afcda7cc1f12fa04e02c687059c02e15c50211"; hasRunfiles = true; - version = "2.8c"; + version = "3.0b"; }; "microtype-de" = { revision = 54080; @@ -23357,11 +24065,11 @@ tl: { # no indentation version = "1.02"; }; "mindflow" = { - revision = 58475; + revision = 61338; stripPrefix = 0; - sha512.run = "05338ac445658a80d5e204b742f3eca75fc460db578227c2418bbd5382fb23afc1fa8ba8658578659a2a617f8c843a4c116cd6159ab05bf6c7fc7283492e9c95"; - sha512.doc = "d887f56208e8ad5c79223a607c48f5deafe8578cde6aaee46761424f251f066d0b9ad59a8a0f073965d418c0a43d08ad5a5a5f10efd9007e9d16d1080ec2ae4b"; - sha512.source = "68b7ac026334ec4fd095476bae34fa6c8f91ccd3c1c7b3faa80026d6baa78559ee50cad511e059897d753311ff469d8592ea04bed9674c3b15382ad066d10ff7"; + sha512.run = "6e71e0613bc99917ee6e9b2cdb0d28fa2171e9a0634cb1f79eeec21b10d589f1d8cb3905248f98ef6ae226c55af88124f070a350f68e3fedab6452ad82f85b46"; + sha512.doc = "e8825858001fe04e667f7c5b6952b816b9ef4cc7443b599b366dc86176d7ce2408dbb39f25360e56546bcd62a3434b0166e498b4a92738ca75bfe2bbecff129b"; + sha512.source = "247c5debf10715249e0d46b4e7330a587cc8c57ba5e3bc0d988dc93b6ebb08115f80a15fbaff1a53700a1efad4df21490a67d13b468d1e5dae16f4b562a2ce1a"; hasRunfiles = true; }; "minibox" = { @@ -23391,11 +24099,59 @@ tl: { # no indentation hasRunfiles = true; version = "0.96"; }; -"minimalist" = { - revision = 58395; +"minim" = { + revision = 59536; stripPrefix = 0; - sha512.run = "4ce14a43f724cb6dea4106e6a25b345cca94208724828383add74386943a1769bb5fb756424290cf2b49baeb4cb93658982d38c43ecbe6fc338bdf534905f4c5"; - sha512.doc = "d10d1a10e2bf8bcc6cde857af2e94a0dfe7edc4c1c1013646273f0add9cae841b92a47313dfe6ebbaabf70132ddd9ee67c3588a606d084357ca937031289df7f"; + sha512.run = "f5a7c16a30f877c0a867b4fa79d00721e48ce1790eac136a474c74310867abacdc14cc5ff62fd6c3a8d856816edf8838796fab90eb4acd776b202422d92414f3"; + sha512.doc = "b65c4714dafb1b5199e51cc294dd5a28f974e217b3d888eaf6b517cae8ecc0c8e39ee70052b46e51fe40e517c6cea423fc33828b99e189fd9b3f5014c71d7db4"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minim-hatching" = { + revision = 59531; + stripPrefix = 0; + sha512.run = "2ef4fdef86cc308d2202fc2a60a410679b6f4974f2770d7e7a348dab5f26059c652a65a7cac0832781f29b5eeb389d7a5ace0ebeedc65a5ba6efce03c705a48b"; + sha512.doc = "2535f5d3958d099a8f1f8be8da0c871b1149346f700b2b9c5c6bab873facf659549491df979c805b7e328bbcacf0e3e679e39ebdab64f9395486099dd39507e3"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minim-math" = { + revision = 59537; + stripPrefix = 0; + sha512.run = "c9d48b920c26b20195e4afd1a8d7f74a3862cf32ded6be1739ea2733ad3e2c1d727271a8caca5dbe7992438ac0f43289f50272615ca63f34f585f730467303c6"; + sha512.doc = "3940f8a9fd61b4c9901f8c69f3bf6303e40ae805aca619f24be14a187d969a55e8a6c73de9c998f987c3375c3f453f4fa0453a9d316be7a1d85a2a329c6cf28e"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minim-mp" = { + revision = 59538; + stripPrefix = 0; + sha512.run = "a98b4db3e303fb993852b92901937e0f8031269e5ce51651fbd59b787574504bc8948522243e3525efe3eae68c2fc00030763dca855b605575c722d5ca89aecc"; + sha512.doc = "a1398b441bb27a3a7e340edd152dffaca406fb9b4151523e64132f8a13c44bbdec22e3aba22208dc60a2d209c0337824cc54ed4f32910ee91d709428dfc029d4"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minim-pdf" = { + revision = 59539; + stripPrefix = 0; + sha512.run = "e45568da0fff7ccb2024cc791cf48303d1368946227cab47474790de647a4215a55f898d9c9c6e402ab1693cc211a77f8d9e3f637ded806ea587fbeccac84ce6"; + sha512.doc = "184c5224f703a7f2713e19a675855921a0effe47aa4bb57b696f232539eab8fb1de35eb8da51f49f9e74b0c903d8f63879f3405087efffe107f500d858a72464"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minim-xmp" = { + revision = 59553; + stripPrefix = 0; + sha512.run = "24ddab94e49752a686822aa10035f93da45b6fbd1612411602238608769bf9675d19aff2de49e74ecfebc36474fc20a2a0120c43cb93a2f8da21b4e0d4a1e6ad"; + sha512.doc = "2f33c23fd359ccfafe7e4679ad6a55bf97a6464f565ce6ef893fa5b0e1272ec2bc4b39baa4fb6cc20c7d19400ecdb1ee3d6ff0f5b6bd6472f32a9c91bfd78adc"; + hasRunfiles = true; + version = "2021-1.0"; +}; +"minimalist" = { + revision = 61338; + stripPrefix = 0; + sha512.run = "1b18601e73156f176f983641d8fc638e5601cc4c167a31caeaccd9d4107727f501bc74444c6720d159a4e55206d1784149f4ce68e89a6fe9dfaabf860132fbed"; + sha512.doc = "bbfbc5199250d06b567d4e47a2b186368db223831bc8c6d64847f2347c40033862ba4415bf5728333951de642508df4e80d8e6b20844238b20214848da34a1ed"; hasRunfiles = true; }; "minipage-marginpar" = { @@ -23431,13 +24187,13 @@ tl: { # no indentation version = "1.1"; }; "minted" = { - revision = 44855; + revision = 61405; stripPrefix = 0; - sha512.run = "5923b5e87e8bb2cf148a480035b906aab4b03b903308e8e9609f98376f82e23fedd529abca37bb4e9211719160abd9d4488f5c73a0283f67c7f11ee3e1f1d5fb"; - sha512.doc = "0187a04f9e42c1bf3e5d961c28b977e527dfc1b57c0f823eda047d5e6c888f3f8da1fed691c8e3128d09b3740deb1b324baa607b9abc20a4fe47ea0a29915e90"; - sha512.source = "1595aac2da1fc9c7b9e50c92fd12eda866fc35e884e335b1f4883188a4b0f9603a39cffa252cc1bb11ffd4a67e16a80b05c5ecf2cd7440c50f0605e5fc44e302"; + sha512.run = "6fcac84b07600e370004d4de702946a61ce1317506a775a2d0adbdd4e0326dac73f385c22b5984abd0787aa4153a0fafb73a0ef8c22b18f8500c129f05d0ac99"; + sha512.doc = "96bb1fd4f584b92c0605cfa65c658fe3eeb38b4bd30cba3d4ad197647567e910f3c322208b0b9b1718599c06540541cf92c7dbc1d82da2b5ea02810601a725c4"; + sha512.source = "be79d451c6612a8c8d6be613cf502a5d2f8150ed21a9fa99a80a2462b687e5d8dc35ba0b4d7494d28a667935e628dcb2129b7e970a8e2457dcd2c811dc206ee9"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "mintspirit" = { revision = 32069; @@ -23510,13 +24266,13 @@ tl: { # no indentation hasRunfiles = true; }; "mlacls" = { - revision = 56878; + revision = 60508; stripPrefix = 0; - sha512.run = "08ca934862fed7674f4b8a77ffbc1e42a043777e6baf8b1cf52ce6cde912899bf92d74df52bb35dc6cde64711b8d375266695d1eb4cb301204d90ad27fbc2a86"; - sha512.doc = "687c4beca93574ee7687d7586eda818d94538782acb9b7cca98ddfae6921af5c53ade7b87a72006d8271bb517d02c7a5575043ad8c94e4894d53c58e2c6f6d0f"; - sha512.source = "46d2f1929f334932409e3a9e04a698424ebba99337c4ce48d4dd2c8d63f828ad9c7b81dc4e550e69ef5ba2d17d359a0e1e4360db7175ecca63456aa1c1213c56"; + sha512.run = "44bb40283c118c638c3cd1b6b7595b6922225ff99dbce4b35c5579377c983c860e275bb7ddd76ce666d1907f59ec6e3dde78491764d4712addd3e5441b4832ec"; + sha512.doc = "926a815427e1f66fc67357e962a7ccef39de82b082e045041b8c44d9ea444005b176ae7251b39763e03ebfc7babff0313f4b3f450e76cea5c4e21efc2171be96"; + sha512.source = "884fc51a22c9e3fc996516c49e250bb08b4d5f5f7c19ff6830b45640d62578d3328b4d5179f750eec2d8086eebe96284d7347f223778674e9250625c36d1dc6a"; hasRunfiles = true; - version = "0.9"; + version = "1.0"; }; "mleftright" = { revision = 53021; @@ -23623,7 +24379,7 @@ tl: { # no indentation version = "1.0.1"; }; "moderncv" = { - revision = 57496; + revision = 61324; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."fancyhdr" = tl."fancyhdr"; @@ -23635,10 +24391,10 @@ tl: { # no indentation deps."tools" = tl."tools"; deps."url" = tl."url"; deps."xcolor" = tl."xcolor"; - sha512.run = "5afe854478a689c648695480bcece97a3c940e1be7cd0e32f3e1ddb1240e823ffae82f53a5b6a127c62f30a1e339f5dcaf9f7ac8b5da361fd3de80feca719614"; - sha512.doc = "032a9ccb6e91fea7db129146292f3e59866019729f056e4f9e6bcf8db42a0d81a181b214240689fc6643d49a63580e2e8c61e0b9a47562f04af0d24f14bd37b3"; + sha512.run = "3ade3aa7bb82b39e63d83f1827fc3b09f324d5c28e07e4d97b2e5ede3c2b6a48b2daa913885678dc35789742e7b6c45081bad2cd54c97c50ce72c08a1b28a72c"; + sha512.doc = "47dc6060ae81ec7da7d1107dd41c2d3fde1d7248739975b07ef51a64bdc049add06b02d42997bd8efc3645a2281416f8f37a614cf010c0df4ef42bfdff944a24"; hasRunfiles = true; - version = "2.1.0"; + version = "2.3.0"; }; "modernposter" = { revision = 47269; @@ -23827,13 +24583,13 @@ tl: { # no indentation version = "1.34"; }; "mparhack" = { - revision = 15878; + revision = 59066; stripPrefix = 0; - sha512.run = "9f050b6ee0aabefe384f4b78678620b8a15a49f0582cf22caf0e5fc2b1b975eb0bfffbfe91165a121aad6d358044f97be410250597fd31b462630aa1e32ae96a"; - sha512.doc = "0f28a6dce33e14636bf5515bc1395a80f9ced23553698d9db766e023715554fd87df292836c669b8492844c559eefaca4c4598fbee94db425c419dea16e90ca3"; - sha512.source = "6c90b951bb47450ce9892a84e72c37083438682edb36393895d25d4499f8d5c071c969f830cccc229851a39811fd04593c6b7425a2b0ddcb134b73f7faa2a722"; + sha512.run = "9a4e5a08320095095538eea8c5c5db5dc6d6c99ca3e3a3f5568228b8b52a4b1de98c1118b09626b58ef897f6810d2b43d2b5b416b3687e1bfd3a01506460bce5"; + sha512.doc = "fc4cff80bbf20460e28f8d5a142e8994cea7e017391b147a47332b444fad0ff8cde1e7bb29159e39f8c14f4c9881ab91dcc0e2f108cca1534d4335f5b6b32a1a"; + sha512.source = "1eda2d1f370141d0a5b0bc15f68dd40b9dd72017e8cfc75c71b19e2fa2ccfef7b1652d5c035c8ab6120e12089bf469b6e6edadd7997329da6409e6248bccc5a2"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "mparrows" = { revision = 39729; @@ -23900,12 +24656,12 @@ tl: { # no indentation hasRunfiles = true; }; "mptrees" = { - revision = 44453; + revision = 60929; stripPrefix = 0; - sha512.run = "c495bed58639226b0552dff1d2e7c5e97a60ad4fb20cef65cfd873feaeffef4e0b7672a33d310576c042a94d6d27141056e8a56c0bd5d648841b860a3c1919de"; - sha512.doc = "38935dd6694e4c731e6ea8e8a1575ac5985a24ad5d1e05d5766168d3b6f82be6e3bde8c57601565be67ebd0d1232191779f973adf5bcb7851154aab3bd6472a6"; + sha512.run = "8eb172f4051125fbe7d812520455e3a37888508754abe8abd539e84a1105575c32c2dbc850dc562a2dfab34811614e527cfa089c9de738b6ac7211f923c61929"; + sha512.doc = "2e7c3837ce93b67bd1604451792cc54842bec27b3ebb6c56b2a9b9d702c3fa999ecb3a2836076c39adb30dabf833a507974e9dfaf19c9166bbcd3428487cf0a8"; hasRunfiles = true; - version = "17.06"; + version = "21.11"; }; "ms" = { revision = 57473; @@ -23940,12 +24696,12 @@ tl: { # no indentation hasRunfiles = true; }; "msu-thesis" = { - revision = 46106; + revision = 59613; stripPrefix = 0; - sha512.run = "e05cdf909d11616692cb175b117a134f1eeae10cd9c62058847cca383b86eb99de675f4e534c3b9d378dbebef10312b773f111de46becf8e4f3c840faaf5555c"; - sha512.doc = "1b3c8266ff9dbd2c757365d30772057433e1ddcb04c83a9f98e55c9c4707a380e5d289496887da9adb922f96e7f4c64b9d3828e2a758aa38fba31e59c39c7d1c"; + sha512.run = "531ac0d958cb9c8912c630f7ca3e74964b91681b27c202e37c4dc80e862758123d41b4a8872b11d372729e9967739fa4ba938418dade78ce27ae7350f1580f88"; + sha512.doc = "844c69a803874331252cdb4a83a7df8eec1d9d1573bcb1d45161ad254be3274f7ba0e4da330c31ce05ee4818b5eac32a4ffea5555f1befc1030f114a9b653886"; hasRunfiles = true; - version = "2.8"; + version = "3.0"; }; "mtgreek" = { revision = 17967; @@ -23990,13 +24746,13 @@ tl: { # no indentation hasRunfiles = true; }; "multiaudience" = { - revision = 38035; + revision = 60688; stripPrefix = 0; - sha512.run = "58610f5b5138f7713fcd3e21fac721d0cc0a796e928bd5bd89e5981e08a0d4d6888f6f4f2dc2c6b9afecfbf0366462109be7a497ff6017e3b76ba83b361fe2f1"; - sha512.doc = "5db8176fc1c40091db428b73bbb8bb3eb2e7b14b8c8a681e7d5dcf04d990873fbe456d389e468456650faae3939e38d1217057485d60750cb29aef89e8e15b69"; - sha512.source = "acb69d29f8f12a205b4560700330d0a94593595056784275a79531351c674ecb560cb453956a5eb088f09a666ba4c72a2bc64a79b954d13263559093d06d33a7"; + sha512.run = "a7d89874dbe314ab37cf42d8d520e234764bfc3fbbb6c89e47be95ef83bacd170c290bae005830286e206da25a68939ed8ee60cf11ad3f5ff9d994d568638b86"; + sha512.doc = "b6023873f5843ec7db13e551417ef4c31a2f622372f32b4ad7af1ab155e3902185b06d6f2fdd432bf582f3da8a5e32e985fde93ae88b7916062db25021a641a1"; + sha512.source = "8d528b7e27f8883846386374cc936118a9537f0dfabc71c3b993f105dee381f0cd2b40e16d5c48df01b9709f902479ba87c6b94278f6e8be98beafbf9dd3e4ad"; hasRunfiles = true; - version = "1.03"; + version = "1.04"; }; "multibbl" = { revision = 15878; @@ -24143,18 +24899,18 @@ tl: { # no indentation version = "1.2.2"; }; "musixtex" = { - revision = 57353; - sha512.run = "890faab60e994520b74081e0709217549d4d91bf0d9cd28bf8b08d33b474edd584b1af8810bd9e8f1899e9de9ab88f4091594ce3ad25671312856b1870711a51"; - sha512.doc = "65380d56ef9403c633f3459192f21191912065d2a6b34efcba1c002dcf836353be7a6c532f66a11478002f34e2f53c35ae9e7d705ff716fb9c4f929dbbd82490"; - sha512.source = "bc2d254ec56217edc6f5fb75229f0484ed8ae494da9dace2e86f494670e49bbc60b962d59397c0dc1ef40e7633cc97c9f75b4ab26ee7ff528fb8169b4e625660"; + revision = 60382; + sha512.run = "907dee947bc659f456a43d668f750a38c20afcbd011591c703564aed9bf8567079b9597fdb2b0fb413b09377b1f711c6404e25f93f4c6b2fb5edadf229603629"; + sha512.doc = "b56296675a479c485ba7f40015e6dda625214958806e338dc3fb6c6fb687e801e6e42ab7cd98b5d532c86fcea3e6c08a9fd4f216ad0c80212c8ee57ae1164f3c"; + sha512.source = "a90c3becf353f617dfa0550136038c3ef0f4dbbc15cdf593a0bc89db7585cd1764d307823ed535f5dc7f84fdf1b6b439e386665dd6fea03f3a3364390c4fea0b"; hasRunfiles = true; - version = "1.31"; + version = "1.35"; }; "musixtex-fonts" = { - revision = 37762; + revision = 60381; stripPrefix = 0; - sha512.run = "9cb72eba919842dcd8f892562a9f6f2c4638a46b4152509ffce1666e3e4243a2686b4feff3d9d68ac3c70c755606cda7b8659ceb1d8347b49bdfc4c0c7f35eda"; - sha512.doc = "6fbc429483bbb7e1382d72622168d692dc5686ee21b9172ddd3a14df04397cdb9a3b45bae57b2ba2851aff401a5819d81894354e2e942d41812ebede75c45164"; + sha512.run = "fb78a536fb7e5527472af46d89d97c6f932f2d72318d285039b7ce8cde842cf5df0e4ab780433319fb65b6b5fb226efa7634e006cf5831a22fae7dee6e9a2f05"; + sha512.doc = "8a102656745eeaed5542a95f5c3c16f4bb4d83353cf7898941c776cadbb40330ded060e7e6558ab47b1fb1a2e1882ee413b60aa73924740d21144b5a1d779334"; hasRunfiles = true; }; "musixtnt" = { @@ -24248,13 +25004,13 @@ tl: { # no indentation version = "3.4"; }; "mynsfc" = { - revision = 41996; + revision = 60280; stripPrefix = 0; - sha512.run = "fbf6a66d9e4f7863b380f6cea43c58bcfb54e458d56fe2867b3e1354cb2489d4a0576e6c392e4825023db33465176161e226d954bc12080722317e92edfb3d0b"; - sha512.doc = "11b2d4647cac4aa2280aeac24abca47b9d92680845eba5a99fdf05fbcd4590760927495ef87b04900084ec64652a8b2e28263d4d1a26765cd3e027393f2d7417"; - sha512.source = "4ca3be26449fb263e32a0302f5b85194e29b1c4e55012881a60f84a81a3498d82447934e60df522aa1b3e20ffc746bc78cba535e7208f88ddc46aa9831ffaf81"; + sha512.run = "6736bcfc3e0285b4def1b690fa0be98da319ce91f3e77978f08afc81289bc64b9a7aaae1d23a535a437c68037ba3cf0c068846ded35e3a6f4a26fbb7fa1be382"; + sha512.doc = "0b8936f3a2f36f68be9b1b9ba7c90f60babf6a6c9c81ab165ea947829ce0cf4230cf9f53d0acef3dde83c2fad10867e7316f9dbee0757a7fb9dac98b683d811b"; + sha512.source = "613c70050fcedf8917d39d2cc212b19fc2b1bc983e442d33bbce4f1fcf99cf73a8ee8a51c44eea090deb76fa57ed6b075b9fad12ed00516b80a2314d0202b988"; hasRunfiles = true; - version = "1.01"; + version = "1.30"; }; "na-box" = { revision = 45130; @@ -24397,6 +25153,15 @@ tl: { # no indentation hasRunfiles = true; version = "3.5.3"; }; +"nchairx" = { + revision = 60196; + stripPrefix = 0; + sha512.run = "3ebdb5c11c57818018172d87f265760039f4de415eff568271dacdccfae4aa1b8b3c646d5c68b4df55b66f631679c0a72c17283d949a35047f1cb8a536f582da"; + sha512.doc = "2c58e3cc770a2180d010688683117a8beb4c8dfc17d0f6502647b5030ec3f6db1131201a352e0ab0247df158b4d5c61ba60995dfc8ffc7fb5e50e6a03b16c2c3"; + sha512.source = "f1621721f65fce09ed2abcee3997dc1d2eecbcedb651641a99922362d4586be53c5fbf3c9d07cf1834ee6dfb79d67d7b20ba070ddb80f6c302d053979e3d59e6"; + hasRunfiles = true; + version = "1.0.0"; +}; "ncntrsbk" = { revision = 31835; stripPrefix = 0; @@ -24451,6 +25216,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.03"; }; +"newcastle-bst" = { + revision = 59904; + stripPrefix = 0; + sha512.run = "183dfc00f4b2a1bf0268ffa9387331c689c53cac297be84b7d93840ea645acb57c311e5a10e13a25843c16aed61104b5114f4fa9c2acc9a7e6b834327a312d5a"; + sha512.doc = "45929373fce2cef1131a9af22b09f5b60f47a40fa90a47fe09c2c9dc51ce73b9c3a6bd3f979562ae418d53f0a442dc3574d255039e5f1f169acb426d8a64abb2"; + hasRunfiles = true; + version = "1.1"; +}; "newcommand" = { revision = 18704; stripPrefix = 0; @@ -24459,12 +25232,13 @@ tl: { # no indentation version = "2.0"; }; "newcomputermodern" = { - revision = 57801; + revision = 61310; stripPrefix = 0; - sha512.run = "65072672488d99cf5d3b66449fc18da0539e75fe009311a7ac1d572888a702f0cee7cc928fc75d552eb81a6b8a5d604089a5d2461df397424259397c8c08716b"; - sha512.doc = "6d2ce6b57fe538c52e57ccf769e30672e2844ec13b2af0cdd66e1aa1983e8966eb3b9263bb4186b0825c6878684377de74371d68819dcb957d03f3bcfbd11e49"; + sha512.run = "98563a172632bf69930afcee577c5d4807677d0f700483818a02bc53f79dd142bb20065d1e10f982ec395270dd13335855ef95d521514263056473d9481e8aaf"; + sha512.doc = "e67e678f37108d9029ddc3a5daac567d1e9dbdc8869e1806361512cedf3478b0de64a7d091a71f595b49cdcd8c2c7e85d57ce47f9f9c6828518333446c1f30e9"; + sha512.source = "3da5168bc378e569742fc66d7264afda91f141c573ada94354e52fad420a8c0643fcf3609f514c43b88a01a32c46301c9df12a209a1ca975ac3ba2c2ada97cd9"; hasRunfiles = true; - version = "3.02"; + version = "4.1"; }; "newenviron" = { revision = 29331; @@ -24511,12 +25285,12 @@ tl: { # no indentation version = "0.51"; }; "newpx" = { - revision = 56845; + revision = 61404; stripPrefix = 0; - sha512.run = "7dbbfd4e3e32b0c5a303ecfeb776793c1b1eeaa13b934e9e02ffbce49ca6d6409f5b920dac798a3abd52ddc87eab7ec9937060f3ddcbff5023005a6cce363899"; - sha512.doc = "49e38fe4adf7291e3c174c9bf91f1f48ebe22639c542cd4fc707bce846e6fbb38a8bd0ed8a459c5dd61de314cb1a8a24aece5efc1f3febd5b0ac467c3051e3fe"; + sha512.run = "8e5391da65c0f37b3f33d54b03896aa3b8740edace54e1233d36109819c1a2ca6a5a32882524a44c5f46013da55bce9b5f1383277ee65d5382d0eb9f59bd04ac"; + sha512.doc = "de3d0142a43eeb416c2694a81a3c3d75fbb27925447598bddd9a569f330c13e7718a7f77616c3d5cb979ac2aaf208784bc518656a4466647f10233f7043591f4"; hasRunfiles = true; - version = "1.414"; + version = "1.503"; }; "newsletr" = { revision = 15878; @@ -24535,21 +25309,21 @@ tl: { # no indentation version = "1.0"; }; "newtx" = { - revision = 58748; + revision = 61408; stripPrefix = 0; deps."kastrup" = tl."kastrup"; - sha512.run = "2ff1eb8ca3fbda170c466e64ad874abcb17d657203a84809fac9e4f909d776eed95fbd69438b9fcdc3f0fd8f76ce5e9e662768e3ee51a2ec22ca4b071fe71b6b"; - sha512.doc = "d6a89d72862332f08134e1a47ec53de58eb0fdfc7191f380ba8eda740a2118be03cb5898f880a1bfa3778e2e107096d5e9062ff875269a698f79e3506043de6e"; + sha512.run = "b4a0df083e9d490bae747833ad505d1f5374dadcbbba63ca9a088104762f0096996b6b5b58cb30f74adfe2ec7ebb40d6fe7ea184389df3faca3fe55a8dd36f2e"; + sha512.doc = "e6616264b98e0ef79f1df3beb0697387262831a4f3fd23dfeede9b8f66cda0c425b61ea50fc788609ce08e0301a43588cfc43047b980ba5d2598e60a9ca67fc3"; hasRunfiles = true; - version = "1.642"; + version = "1.7"; }; "newtxsf" = { - revision = 56527; + revision = 59227; stripPrefix = 0; - sha512.run = "14fdd049243799447b0ba9380cfae1dbe58496e67d30cb7bb3a82c685f449c6f3070e1bce674ac173a9397ebb1a1d40d1dc8db05f04174908dd157e919e7c7aa"; - sha512.doc = "bf4ac517cb79ef6b1e541b2a3eb8b5ebdbfb5e3638234438453f79ce0bb1d87f815d20c761dccf2822e581222cca0439c189e02b307d8c0044fd194aa1d2016d"; + sha512.run = "c7665696fe28a62a2dda826b706bcefb0d468b575232c1e04a69c58a843631e631098b4feb7b93fe8bf1c443e376fa8d8dcdb17346dd188d89b9fa525dcac33e"; + sha512.doc = "98ca9aead749cf70e54acc6414d82d027160ba9d730747a38d0e55479dd4439d198cfd4093e22636e9eca58aaafba6818bb3d3583e41f4a46e0f44b1e10cc424"; hasRunfiles = true; - version = "1.053"; + version = "1.054"; }; "newtxtt" = { revision = 54512; @@ -24626,13 +25400,13 @@ tl: { # no indentation hasRunfiles = true; }; "nicematrix" = { - revision = 58667; + revision = 61142; stripPrefix = 0; - sha512.run = "722540fc909b7053b6146230deb30afaf59dadbedfc0af56a95b8080cd02cc1fa3ef3dbbc8d820780df835941f7517d698e3783b2105e98fb89ce54219e3ba3a"; - sha512.doc = "0dd62f857d50bdf11a23d4553edbbdfb7388c5430bd069d30df3f95a34f1ad3fd6a0a8cb3a126652a7498cd1ca05cc8d135c9ecff25cf57b5777a06f345b95a5"; - sha512.source = "50cd8cb63abf8eb180d0d70b45f46e42fc61ee466daf110322d726ba39c95c6abf3d2ac306e6f53713331764739369263ce9cf37595508f0e3bbf3cef1c0d0fd"; + sha512.run = "0fff589d39fcf7745b5c32829b2a5c0db8737f261fb6f0e3f5e037fb101312eb45e7ea62c63d3bbf4a036430593182590d27822d1ed9cc27699c63191aefb04f"; + sha512.doc = "ba4f5d753b409e79e9d518c8597e9969557dd22a8c4942c4567c371df311b026e566337ef227ee7a32b9f8b82711d199582d1284a03ba057dc0e11c017485c09"; + sha512.source = "8bcee0caae05c1a85143f2d7c7d9b7480c22b1cad8c2d5b87546232891f05da84022c56e17bbb6e45e67fde59ae1ce39a5340e3a4530828203b4b78b93d6df69"; hasRunfiles = true; - version = "5.13"; + version = "6.4"; }; "nicetext" = { revision = 38914; @@ -24666,13 +25440,13 @@ tl: { # no indentation hasRunfiles = true; }; "nimbus15" = { - revision = 54512; + revision = 58839; stripPrefix = 0; deps."fontools" = tl."fontools"; - sha512.run = "6a1e1a91c5b42e568299a850052578897631573380579342a611adaf3d730fa452909650218cc75aba5c92204c01d830aaa2c305939e6b85f9202eba0d5e3fe0"; - sha512.doc = "23de0b8f674692f1eebcce8c1c308e26b0311c12e4fb61fb6f1a925382bbf072d81047097b0a8d5abbf86f641f7b1fc59c64c16dbd8534db7f875d5b64a2d77e"; + sha512.run = "9e39f92dea1fa293d6249d16877dd6b2d990d1d48cfd31f4ac1d66233b97ff178d2b70f428978a084fc9a50b9dd994adb6a8ad29375e54f5d5ccf6ca7ed62f64"; + sha512.doc = "8fb9ece6ca17549572a0d79a541397c6545dc01ac0422a5270314bba1cb83b1451fb0f56e34f449cc3d3de326e063e4ea1f2ea03a0fbda7342e9d0a101fb5ed1"; hasRunfiles = true; - version = "1.013"; + version = "1.014"; }; "nimsticks" = { revision = 55877; @@ -24683,6 +25457,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"ninecolors" = { + revision = 59330; + stripPrefix = 0; + sha512.run = "276b119a025ed809dd17a1f72ff19c341247e5efdcd06d4723b8e489139223cd937453d52231e9bb4a9facb43bbb19135f34030f502d9bf63ab57f3d44b915ff"; + sha512.doc = "b22ac4ee6e32f33b93a2776bf43fb7a1415b5e681de83307e3f793eb516742fed3eec180b98992bce5e2fbe9552074c70109fd5217d6ab10f0abe22064df52b5"; + hasRunfiles = true; + version = "2021C"; +}; "njurepo" = { revision = 50492; stripPrefix = 0; @@ -24692,6 +25474,24 @@ tl: { # no indentation hasRunfiles = true; version = "1.1.2"; }; +"njuthesis" = { + revision = 61293; + stripPrefix = 0; + sha512.run = "599bce07768fd6cf8a3d7ac110b30ad5c5bb4dbef0a9b08e692fd98b1c9b8d116080e8cf30b6bd240ff9e1541fe62837309449b9644540bdc6ec910d717c3c76"; + sha512.doc = "ee2c429baa8429b8f1012b1f61a88404dc593d8e1a5a21ffb7063b3667cad24adf270ba0d5938edfcefcd6b2e4423bcb19c65cacb3aa0aaaa805c91ea9e3f3ff"; + sha512.source = "9a5a398756fce1051dbd3b55a61191a31a5d4bcaf953423da8ba5d7d2aa11a561ea2f6aa1ae833399775ae242de3b3cf182062ec7716a6eb3e3d0af06e646769"; + hasRunfiles = true; + version = "0.13.0"; +}; +"njuvisual" = { + revision = 61179; + stripPrefix = 0; + sha512.run = "385d9dc8153ec75189159eeefd3bb6721cb21c974b9c13b6c622f62683167b18e63c52b1a407189057f0416238ce8d5e303459e51ae2926c21e925cae71d30c3"; + sha512.doc = "0c4528d1f674b1af677c0d755a59c65f74509efe4a0dcc13e7f71476287d4a42864a7a64574502d44a26107ba3356524f909c9f393bf5def4e0ac1384c72b3a2"; + sha512.source = "137eab9b1c65d7db91a35555bf99cfd7d0ace4e66ff60fe47e3ce083036edc4d67f3ccc26dff8df5f086a277cb62eee39e184be17c7552be902f69ad34ca75e2"; + hasRunfiles = true; + version = "0.1.3"; +}; "nkarta" = { revision = 16437; stripPrefix = 0; @@ -24726,6 +25526,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.04"; }; +"nndraw" = { + revision = 59674; + stripPrefix = 0; + sha512.run = "0a3ef1e6654d191c588f8269c674e5d7542785aadd97bf96101be8627f4a4746e443083a0403b8710f2e8036f0d69be1db6d40cfc1865aed89056d84ee4a512f"; + sha512.doc = "0ee7cb24d7cdfc708a3ea7bc4588259ce92723e3c4be295b85d689750ed81ece2a575ceeb9d6959692e36e363bd6ca26615fa598080977cb62de9a641da44322"; + sha512.source = "c97381de546d0e4173c7d34ddc8f9098359a3ec8b84c78d155efc49cba120a3e59f64c3c43eaacc07196df86402a084558ca20a5ddc52733134440e21fc0bc39"; + hasRunfiles = true; + version = "1.0"; +}; "nnext" = { revision = 56575; stripPrefix = 0; @@ -24753,12 +25562,13 @@ tl: { # no indentation version = "2.2"; }; "noindentafter" = { - revision = 35709; + revision = 59195; stripPrefix = 0; - sha512.run = "6037e5b7b36742c2956f39020f7e9bd2072b17ab313f5d7d86e8b0c348b89ef1392571b8cba22190221a14c6f1e44a0156ddafce8f5e2bbf5362e443f590b2d8"; - sha512.doc = "1cc385e0bed9559d66c13967a5ffe83f1d01ad2005e4c7ca92243ca246da4f5f5e9abfde9b244ac54d73de4f874b800dc6620f7c93f6fb03a6d0ac8b2593fc96"; + sha512.run = "8445839068a264cc57df9b0e9cce4562b3e70ef208baf32fb2aaabf7ce95804a31f0f8b65c8ce2f2f0fc809a07cb864ff977af31d8162cf10560c39f9d2b78a8"; + sha512.doc = "95f0e11cc91dce0e970caa703149b602150426df174044b0a2fc7d902f040fa4fe6fc3014bcf49d240bc9612c5c61a5a40124d5b49ffab1bdbabab0cfe55889d"; + sha512.source = "e3a12b14ad4571a3fbaf4d4297da28a69cdba7bcf57a365dddb163d88a0b1f7acd20d600ab6353b4ea110d4a0a72c9bef365a3b1fd866448f65318bb5940dd7a"; hasRunfiles = true; - version = "0.2.2"; + version = "1.00"; }; "noitcrul" = { revision = 15878; @@ -24778,13 +25588,13 @@ tl: { # no indentation version = "1.2"; }; "nomencl" = { - revision = 57263; + revision = 61029; stripPrefix = 0; - sha512.run = "f63b053f8d95a58e2d8ec5d42177f13bdaa49f6cec710e166a96f45187b51cbe12b34c68918c0ec42b12250ecf1af80f5dbb83f4161b2d0dc94d51ccf218391b"; - sha512.doc = "cf29a353af0a32e41d18087d3ae9c8447d52cb0f95dabfbde01150d15637022d53a8576c362bd7489e8110cdc5dc1892159652d67e61f165f25a78b64d8e095c"; - sha512.source = "e64dc93929ebdf9716208bc51af759003b7e3263a95d58dab5bfe740a71c966d4f51d561e4cf2d82f90bf3e081b4cb0c7a50a1e0a657d2b33b3a065a2e88a557"; + sha512.run = "ee20b8a21b03cb02ed2ef37d38c219841d4a07e17ff781c067906ecbb8f5383d8558c20164f7db79af0c8cd11c5ad8d76142b15ea74674593bb52a5a5993b6c3"; + sha512.doc = "1caa5bcde6c1a3ac5de024f513793c52011285e70e32664d6c5d1a103027c74d45c716d01aaf849726b5b7ffac511ebe6cd16ba669bfeb5fdf37addc59e24a6e"; + sha512.source = "0fda8a0c5e46933cf991bb4120e4bdf98a8ba05e1ca96600fc9e6abd5d3a5c78ce50ae9e625fdda956c90a8f9f569f18d9ebd96b6de4e0e5bb0fbd2b5b00889b"; hasRunfiles = true; - version = "5.5"; + version = "5.6"; }; "nomentbl" = { revision = 16549; @@ -24821,11 +25631,11 @@ tl: { # no indentation hasRunfiles = true; }; "norasi-c90" = { - revision = 37675; + revision = 60831; stripPrefix = 0; deps."fonts-tlwg" = tl."fonts-tlwg"; - sha512.run = "d52fb16ee07ef72f6484b784346933a23b5a3357aa2f00ee212bb1decbfd3299153e88cd4bc352cfc2e888dbf37ea86a2bd6442b6393634c5f144f4accab55a5"; - sha512.source = "0170578bca4c4e4a7307fc125a6d845881fe32e2d361c73369ac1bb1b7d510bca8eddae831fc8421b3e30ce996f2eda4d7b2e449873ae6226a7806ed2bbd4047"; + sha512.run = "5f65927546348815b07c93003a2b0922403d274bfa3d1665d4649c9dbc737df924958c2fd61c1d06cd5e7c1862aff392c8d1e9d827f4ae79e70d9b76467f651d"; + sha512.source = "8fb30cc3a1e762ec15c813fff0191b08b64a0d259dbdd21a9edcf70c6eb1b327cff5ef3f48b9dba0b7d99d1ec31b3accef65deca7285e27790261ca659bd525d"; hasRunfiles = true; }; "normalcolor" = { @@ -24888,19 +25698,19 @@ tl: { # no indentation hasRunfiles = true; }; "noto" = { - revision = 54512; + revision = 60482; stripPrefix = 0; - sha512.run = "731e33665913e4e5deab621d44f0fbaa1a9853109f6f76b2d2c65efcd2a227369e17bee3cd18b00a0e3314db61026c2d2138943b3420bb5da29b7eeed10c6cd8"; - sha512.doc = "6ab7fcfa88f6c4739038db08afe172387ebe3cd391180efb9b745096ad0d24f7a80b4866698ae882f34d4e6482ea477b419c9421d2a62e71c79e2b66bfd21d94"; + sha512.run = "1824eeb55fac567ea5bae58363f132e34bfd2ceeff6573c3f0732e58e3c3ecb58666af4d7ef497aa4500f6a9f8d51aa4e2fb15c2324eb083db51df2cdce4e617"; + sha512.doc = "917a144e2a0f081fc611baff3353c517edfd4ab10942ff728d2227a87d78a326e21d2515363ea05a20391e665e130a0e29e4f312f011d5eeee39624cf3866e8d"; hasRunfiles = true; }; "noto-emoji" = { - revision = 53968; + revision = 59355; stripPrefix = 0; - sha512.run = "c681b795a4f2678f5da213cabb37dde0fd604036e59593c34100bfca53ae56e9cbe2f408a2d1a99dd143b07d8a50fabafec0e51d614bb3ee6122b8eb27d6eb10"; - sha512.doc = "c1794f61d4597ad06c504efdf94efaf2172d87b3efc29a289350122f85337f73c319fa7e10b261e7a9bc79ce96b8fdb3dcf4348454a0d2902ec5a47433b95ee4"; + sha512.run = "a6d041f781389bd1fa4e329adb2f0e28e19b003c708ce73e22c74d4a8580d362712a0bc3bef72e6f527e159662c5953dcf7cdcc104dff43329401da933ab4049"; + sha512.doc = "3c94966e2e822047d43c0a999e46729fa801b93d4dfc5c98432479a419d12faadd345df0bc1471ca44b6767316c806aba85e256e031fcb17b3233fdd59c66f58"; hasRunfiles = true; - version = "2019-11-19-unicode12"; + version = "2020-09-16-unicode13_1"; }; "notoccite" = { revision = 18129; @@ -25024,12 +25834,28 @@ tl: { # no indentation version = "1.0"; }; "numerica" = { - revision = 57759; + revision = 61283; stripPrefix = 0; - sha512.run = "2d4b5de317de660b01cf242fa623f5b37bea19cab30c7750b056560c1956718eb4903fcd4bc32323ccf0888ab4340c7d70e9cb8b66bb4aedeaa07a9faad32880"; - sha512.doc = "062ef217d285753caef67842b30e395799236d0f989e2ea943b64b92b468c2426203d41a08f869f0c8c30554dc7391f5a097b99f9e4f4fdd31c1ce038ba33444"; + sha512.run = "9fec18e27d78b81ced365ebbe20ea49aca99c4aadd7b21cc630cede843ef3c191824556ebdb9988c125603760a68e56b8f9b4d0f37d662178af29e9f8182c0a5"; + sha512.doc = "76b65febc8b91f2e4c18dc1b93e3eeb33d70caccbab60f3d34b3eb36e253b4d2a1d97213220d40d662c1e53bee2f2845784793214724c65b4dc19af288b9f49c"; hasRunfiles = true; - version = "1.0.0"; + version = "2.0.0"; +}; +"numerica-plus" = { + revision = 61289; + stripPrefix = 0; + sha512.run = "821e5f200b50097f245802fe7fc272a609988e5c8cee98c07ec1bd562d79bea17b8688cb5886febbd596904498aecee5794845deb83ef25a36c60afcbe8026c8"; + sha512.doc = "f680560ebe7777ccc0e9f04dd209eee90c478c3d5bae3b32f829ab889997c31d9c5f9efe3a57450304aafcebfff09edb02481a596315e7f233b47fe328c6f3c8"; + hasRunfiles = true; + version = "2.0.0"; +}; +"numerica-tables" = { + revision = 61288; + stripPrefix = 0; + sha512.run = "d06b2e85dcba39b2dff338f02ead71149330a711570d4c14ea4c2ca1f6c95d1bd8465967cfdb0e57b0a4b2b8cafff4f56ff585a1b2b2272f225e44958cbd316b"; + sha512.doc = "9585b95c14bfde30d5de6acf47c0f23328c1b986c075b6842f5a6878eb15761c59843806c649bd548faa90cc46ba93d7ecc021ca699f5eeb8644a3d314e5d737"; + hasRunfiles = true; + version = "2.0.0"; }; "numericplots" = { revision = 31729; @@ -25063,12 +25889,12 @@ tl: { # no indentation version = "1.39"; }; "numspell" = { - revision = 56912; + revision = 61132; stripPrefix = 0; - sha512.run = "e3731b00f027319e67ece82e727fde32be4fd80ba508b173f54f89edab3fdf5a98148ea925f68039adec2c09fa7d2284d1809d5a95aebd0e0d364f1b8b82b698"; - sha512.doc = "368b5af91cf3d8142bd243d42a6f3f939a2172aa4837487b78de51caa5ff5801123af307c14aa7b66a32fa791268503bc7ed6ed1cc7ddbaf59c84a57914d615c"; + sha512.run = "4db8e16d137f47681f754cb2bc1b9b6fb404676f57c5696ef044287a3f0052603978997e597a2b8b13393d59e6531298daa127d72a381770cadef1a29944948b"; + sha512.doc = "8bcc1bcca230a7829a106c66904feb70de818dde2d6c4c7be3a5df3078482bba001a35db85b1c548fdb5aada0018cf6f0dee936641ae5959ebb84dfe953b6b9f"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "nunito" = { revision = 57429; @@ -25078,17 +25904,26 @@ tl: { # no indentation hasRunfiles = true; version = "0.0.1"; }; -"nwejm" = { - revision = 54392; +"nwafuthesis" = { + revision = 60187; stripPrefix = 0; - sha512.run = "5a7e400c00bc8d5d607a61d1ebc30ed2d36bbd1b270868c89f654f84fe9f6d4259863b047bed1c1dba9b79a8a1f1b1ac612b95530903f81dae52114e420a32e3"; - sha512.doc = "06da866b9f491a5969460f52f9496f723f8fb3347c7b0c78e48f07987e953994fe658743c6eed5c346277469e89b07a13a3a727d6df7838a8f5e66dead1142dc"; - sha512.source = "d0afd2dadbfe524790f5a96ff37d3304305cada1291311bf724d30f216208f6f9d0ca6b6461792b17d1e91c8a1a13f235543071a2d8589615898a7b9a5407f26"; + sha512.run = "56f9b8f7b3075588b92c51ad680f4be80599b31ac8a5a1b9da08a65ba84c143c2d028c7a83b45915464906c2184da82ccaf3c9c0d9889164ede27626bbda8818"; + sha512.doc = "10c9fab653bedb469c1dad9a554276da52936240a48581a28035e867d76675bd9dd3230afa8d082780c8511efd3a0c0a18809e4d2528c7c7472d4cdcfab86324"; + sha512.source = "b5393c09d910126e8d1b9bccee745848157a2f55fb3d9c725abb3a1311002a3343f6dc5aae6b346909beb485f55b2c7becb38f53a9d26c43066928edfd4a53b2"; hasRunfiles = true; - version = "1.0.1"; + version = "1.01"; +}; +"nwejm" = { + revision = 60753; + stripPrefix = 0; + sha512.run = "6e03bc619a93737c3b83e3a32b60abf58d5f3bb155a3a8c9d4096f036c06ab4c3511ae085724ef509bb70183f9104c71a8b73d43f29d89ded2ebe870b6b028c9"; + sha512.doc = "e19ac3f06b35d2bedc00218daa4d2068ddd0e86a57e163f0db37a74a11447de223854a15815039d9a2cec4a63297a7b4ba68836650c1c2e62076bc71f33b8b44"; + sha512.source = "1c79fa4fa12265d361fc95aae30b300d4a2ab37db12278f16e39466a6e42c43ea5866a85198dc722bac5b491bf743b65f7e9bf23e0a3e8bfbb4f267ddae66d8e"; + hasRunfiles = true; + version = "1.0.2"; }; "oberdiek" = { - revision = 56291; + revision = 61066; stripPrefix = 0; deps."auxhook" = tl."auxhook"; deps."grfext" = tl."grfext"; @@ -25097,9 +25932,9 @@ tl: { # no indentation deps."infwarerr" = tl."infwarerr"; deps."kvoptions" = tl."kvoptions"; deps."pdftexcmds" = tl."pdftexcmds"; - sha512.run = "a110b9f65989da3cb73bf37e09d92a89352177c45ac2b60a98341829e833e9ae3055e979f9bce5fea57f44e751efd70cac0eb5eadbb7efe512d0277f3696dd00"; - sha512.doc = "631f11d270e5bd908b3d1c51d96205046793e529ba18a5e442280e6cbc1cb67850dab25984747f3871cf200dbae340e19cf327a21d5b66fa55140e1d76ae1503"; - sha512.source = "a58f3c55a38ec5e2f373428702a62fe55b2af7db5de59ba53a16643f1b4ca3e52ed8317594e8403f0a95b7705e9213b8400c040329408ad0cdbc77bc8ea54bb8"; + sha512.run = "4769138392168883514d5778ff84c5a2b483daa20b116bdac45715129ebca6f697f42b0a1725f8ba0dda68e4a57c5fbf806d714034be1f3eff2ebb1c8ff30690"; + sha512.doc = "4b1349bdc6645778afab2502e85a5bbcf3d5f4829892d735756d7e65ecf2f8f31131cf5d9aec922cc16b8366e8a25abfd7f808e6b1cfd37ebd83821a323e9a9b"; + sha512.source = "7702209bcf65a6030d92e6b839d3b83ff1f596c1d3b68f82b074fcfcd626d8167323b4923ddfdb769dfacf84e5c7f8c15563fae41bbcaa1a5ec17334a80f5979"; hasRunfiles = true; }; "objectz" = { @@ -25136,12 +25971,12 @@ tl: { # no indentation version = "0.5"; }; "ocgx2" = { - revision = 57531; + revision = 59618; stripPrefix = 0; - sha512.run = "2b09a488d273992f02034b66ffda3ac7a7f9251e8b57c7794cd50d8e68f5bc2d1b55d1388bfab41e3a46ee037cc5de4e1e137a7175b5191fe9d68fb6b3513ffd"; - sha512.doc = "5f310667aaebcae98fdac38c301ba587c00290d6fe21944a0f85f87cbbf393c02179621886409956739696137900d119d3c69cc3b597bc38fe283315af03995a"; + sha512.run = "4b409a298faa576388c625a93a3ec32eacb1810d3307013a6a07407fb4c513e2cb460a566462ff6ba3033ab8dec7554492d72e7db111134d19250d9e0a056f01"; + sha512.doc = "65e87909d7b6aff0d6f43e4e4a96c9ccbf022b4d0d204e8acf6759cde7186b07b286d157d51c315a9dc6c500d27a7b457ca7c40abfb2cf6a841b931710ff4eda"; hasRunfiles = true; - version = "0.50"; + version = "0.53"; }; "ocherokee" = { revision = 25689; @@ -25272,13 +26107,13 @@ tl: { # no indentation sha512.doc = "8a3728aad3cc5ed99305b5fd8e2301c13ff2734c685c506e5cb00c7412c3f946631f1a86fe086277f85a61fbbf80e447438af6cdd67319b5d04f57f02569a49a"; }; "onedown" = { - revision = 52525; + revision = 59010; stripPrefix = 0; - sha512.run = "e7e1ef415ac2e311be871031c008d13773b4a16de491123f46c9511a98fb868624505fa602607a0d48337a19641487ab4ca49332660677c0e956b61544ef8fa4"; - sha512.doc = "cab3a78d993daab2e5c8143d15293dffd0c67abc872c6538342c023843fa94985b6e03f9219c45356d3901829fe7be5cb2be6179189ff600a50ba4d5d62d0b2e"; - sha512.source = "607b06a08b704dadb2669274e50e363c86e037e4b3de1ecfde5a5f9d6c9e3f22bd0240b727ab1646c81bca4b9c5b86feaae7914daf051e457e5f0bee6259b7b5"; + sha512.run = "67110331d1df4b6f454ab23e6af1fa9904689e9a90f3a62652fd81db9fc990aeb527fdf7d4c5bb04064ddc93181f45334a06214c8acf9930497994e2ad0e8002"; + sha512.doc = "06f00f302cb363411756ba0dd17d9a431aa4736bca2c61b2237b466e12a4fe8bd8cf9494ad5626766ca2112ce629aa8fb8409fc19c2ff3f83e4aee088390031c"; + sha512.source = "d7b3eb5dd5192af22735acf5af450ad0d714dddd434d66bff3a40151953ae1098cf8c27dc620f167bed2c3fbba13f86f62724312161bc321b71fb4f14d605fc1"; hasRunfiles = true; - version = "1.4"; + version = "1.6"; }; "onlyamsmath" = { revision = 42927; @@ -25331,7 +26166,7 @@ tl: { # no indentation version = "1.0"; }; "optex" = { - revision = 58515; + revision = 60332; deps."amsfonts" = tl."amsfonts"; deps."cm" = tl."cm"; deps."ec" = tl."ec"; @@ -25339,11 +26174,20 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; + deps."unicode-data" = tl."unicode-data"; hasFormats = true; - sha512.run = "d734139205c47599f3490dfbf13e6f71532ed7c311c3c76b6e444e539f1be6dd1bfffc612f8d019c38923d46ea7c98be72b28cf83c2b00885d787f6f526b0f0a"; - sha512.doc = "285d74614c05d3776a41269da1156930024359eef282b3d5479a5397bdb928357ff3020d3fcf47bc92d8ce4ae37a9c4fd68c9e601d7083911145a2bed2bad4f9"; + sha512.run = "96f6fd5ed9156cc06987d2145443f020cb42f24b183e9798623b2fea40843a1e7cfc9f09f5682623319177c8839303d8f514e2a6932d8d603e4b4155633e3056"; + sha512.doc = "28a8cae2c7ad190c1f512131b1cabec89881188a91b2b5a8d652ec7a72de544e4f256b29c6f6ea1376e2943f04f3080cac66cdf2001a831e0c2f04971410f654"; hasRunfiles = true; - version = "1.01"; + version = "1.04"; +}; +"optexcount" = { + revision = 59817; + sha512.run = "88a35391d3deb37dd6466e903f3cdd7d134eb9fb8c0a9ab548ca2eeee86687544e1b499248c2d0a7aa3b801d9604913e763128309f88f768d0dafb8ac1fd6998"; + sha512.doc = "7f0d33068083736fe58c08dc9e37929efcf65de3b62a3afb51077a21d0e27b473a65ee1b333a0dd31b1d39e7f6ce79cae3343e8b7a9742199fb409e90030f7aa"; + sha512.source = "c62820e25f1251b6baba3095afa41a39616e49147fc88c5ddd00fe56e0eb2d20a6b2a0ab633b01f2578819308fa0f05e53fd1daf781e276b08ade1407024c46e"; + hasRunfiles = true; + version = "1.1"; }; "optidef" = { revision = 50941; @@ -25370,13 +26214,13 @@ tl: { # no indentation version = "1.0"; }; "orcidlink" = { - revision = 58432; + revision = 59560; stripPrefix = 0; - sha512.run = "c4f2ce57c5c6a792f7d1cd0ef835e38cc582eb7df9655ae3d2555e3c9d389787ce0a058973dbc9d453f063247968957b2ba9ec1ed62499ab731b57fb96e0a342"; - sha512.doc = "8b18a107eb786e45fee9a1a16c5e88386e80db353e729e1288377aec3a87ed7433d189d0acbc1e8065a72b3fb7bf86cd8f635fe870735ddd3ebabed5aab8ba03"; - sha512.source = "f1d11f008b85d65228d1284228e4839d340fe9e661c0cfecc2e9c76c2433b0e7ef6a27b0a630ee7458e4f98a32f12d0356d95bbb9756348e2070175b6d32aa5e"; + sha512.run = "ba51e034e90800c402b559fd636acc38a96f0913c552e506e26457d5c690299c7860bf9a1fc911eb2d4e734c90f775e814b8bac52a492ad7743a47f3e89efc5f"; + sha512.doc = "c20f8e77d3c5866f414f0dcc47d84fa3328492a003a81be1ac3aa69f9ebc2bfff7198be5656192ba7bc4330ca7b773c6d319ec389bd0ad9821ebd6159b7d0b97"; + sha512.source = "485492dfc8256d97fd747196bb142eb178283eee98aed5edea689543075fe0992e9c25fa522c9fadd48c9b631ffb31c8600c82be598678b03e78c4e5643b8cb2"; hasRunfiles = true; - version = "1.0.3"; + version = "1.0.4"; }; "ordinalpt" = { revision = 15878; @@ -25411,17 +26255,17 @@ tl: { # no indentation version = "1.7"; }; "oswald" = { - revision = 57253; + revision = 60784; stripPrefix = 0; - sha512.run = "faa9493780681b7485a642e45cfbb71e81ca408e2e65acd77b22f0655a0d98598558e4557737fa0615794eedaa42cd8ccf9bd04323b55a39db6251f52b11897c"; - sha512.doc = "e20776527a53c7da8a07d3c08314768cb3c0e2bcdbae90b30e7407c95546f1187f65fbcb8a52915ca3b1d26ffad2191733f26b9f105403ec574ab4912bcae915"; + sha512.run = "92d4d3a7d8bd09031368a89ab7b49483e653750e1c348908aa3fdb62cdb8ce14ecb7d7a29b37e6774c613e658591622891e4bd6b348492c669716f220b46f9ec"; + sha512.doc = "1f6606c8786b0eb54a4c3aad0220347eac3b2bead83ca5540345737cfae509be42b9eb10f27a5ff1ced559aacad7413b69708eacd215afd47636d17194b40082"; hasRunfiles = true; }; "ot-tableau" = { - revision = 44889; + revision = 59318; stripPrefix = 0; - sha512.run = "f3240c0688276ab6537201b20d6eee422a795d5d994c6bc8eab3f275a037e7adcec7e54c9500a3a5a6d2fe237b44b0b350a7ce6f72c7012bb48a69c9c43f2fca"; - sha512.doc = "396256f0ce1bda04fe1c84cb45928d82651b4f6363928e33bf092737ee6ab224f473567aa5432fa00a8e4cfd9b5a3f7e7ad8448090afaaaf89f97b33ff695876"; + sha512.run = "0a9c219d69f6eec4d9fbf8937e0cdde60b34cf38ce154332147ccc172b0ce90932ee08c7a85a68d4e5163461352745a5c0abdc6b8bdc187be5fce5b121f45c75"; + sha512.doc = "8345d881600cf9f4d73cd2a23d12ff32f11a4d3a66b61262b0eae7dd3bc9039e20b187a6a9e45e9b15729015fb76b0e4e3e76c011e47688df09f4a848e508c4c"; hasRunfiles = true; }; "othello" = { @@ -25609,6 +26453,15 @@ tl: { # no indentation sha512.run = "f21fdeb0423853294f52427bbe1477bbfd49b1a6255bed5f561dfa2156cf8309b2f71d2c09ad74bd64bc1fd69fc73816e3d84e72d975db5925d4c3c4db6fe8ca"; hasRunfiles = true; }; +"palette" = { + revision = 60119; + stripPrefix = 0; + sha512.run = "0583223e81139040de67fa9a1fd93479dd2024c19d34e775a71b9fc03d7b01799c2dd58736d431307cb067d2d3130fb495aaa002425a8c0c80ddbc3e33679693"; + sha512.doc = "16934d0cdc60fe7c1d6d2cbd0dfb640a13d8282d98e322c98853b71ab7fe38a33241857ae98fd8ffd9f2e5c009327889f4c42a89af4370fc7d4608b457b1cb4c"; + sha512.source = "ea0e817ec066450c3bceae8ff9859f9b4934dba86f1ef850bfe8d566ac1da8296d780313962ab63babdfb822d1c72e686dca2925f809baa3a62eb2d744e8e6f8"; + hasRunfiles = true; + version = "1.1.0"; +}; "paper" = { revision = 34521; stripPrefix = 0; @@ -25685,13 +26538,13 @@ tl: { # no indentation hasRunfiles = true; }; "paresse" = { - revision = 56621; + revision = 59228; stripPrefix = 0; - sha512.run = "7be25fc749a18d1cabc6ee720cef15b89e323d4e07716b63aa49a5eb4c89208f730513491a7b6740069f0daec3015ada3d673aed6407b21a8a1ae1dd09f60d7b"; - sha512.doc = "cb01df5ac56c7cbeab0cbfdb99950ddbe58cb432885702b2212c89c654cb2a88536be20a4abfdda5321f2cb36e8528fdbe2b96a129eb8afa2c1e969c0f22398f"; - sha512.source = "50f683ae5a7d46faa5740766e01a7637e9e1f149b6763e48ed0029814add723b551d76fae9baabf562b1bc5268ed015b7619fced2492478b2be2ec4c4f63f57f"; + sha512.run = "1604c9320918893633af8318d049194158daaf458bbafb5ce34b2ecf39896eae4591989117bd1ecdc3a86d4728a4c477f32b82b38315aa0693fb5978a81d2b21"; + sha512.doc = "f25aae5058f765f5f141c1d2ba537db5395384f64b1e0aa803e486eccc1a9c958dcbf6b1dfb0aca331a5d20a798c2107092f79b9e8ec44e342ba52964ed43b06"; + sha512.source = "5acbb82be5b06506d603eb19b01770806e515b1d496a2b51ecbab0a6c5fb4b6a0842764fb76446c09eb9a49a9a9cefb571e5133a0f72917de989814cfb3bd00a"; hasRunfiles = true; - version = "5.0.1"; + version = "5.0.2"; }; "parnotes" = { revision = 51720; @@ -25796,10 +26649,11 @@ tl: { # no indentation version = "2.4"; }; "patgen2-tutorial" = { - revision = 16490; + revision = 58841; stripPrefix = 0; - sha512.run = "4a157b6351e15274fc2972e80cfca740b4abdce0fc643a499fad8588af71441887974ac258627b9ef215ff9be8e33bb045f134554a6c0382b74f6af3275ab04b"; - sha512.doc = "4c375722cc01baaca61acb9d93baae99f7776483a6492d19b7cfbb13038a40ec3c76bc8580cc455e9233e89d0c29194f8c41e51078d3996a3e72431d9113a64c"; + sha512.run = "0db7759a327066df9aa738a977d664b8e150405fd2e57e5532a7f9e2cc6a9cb0c6541cb37b916f8506589ea02e36eb4ca404ec1b8ace3726ae431a6c78f86db2"; + sha512.doc = "5abe4de29113af4db20d85ed0089190f5ae82ef1573d8ffffcb9f5f03a4417dacbea5aebd0b274ea27dc54255f8ac6792c841a9bf77ee39628c8bb1dca49b084"; + version = "1.1"; }; "path" = { revision = 22045; @@ -25844,13 +26698,13 @@ tl: { # no indentation version = "5.0"; }; "pbalance" = { - revision = 57161; + revision = 59331; stripPrefix = 0; - sha512.run = "7db75e950aca473dffc3d3efb419bbe33b5f04d1a0295a73de3d7385883d576f46bf377554ffaef44608cc8c6df3f3594bd0a0e5ed7ca649c7ced5c5834192db"; - sha512.doc = "98828ffca4f1e4dab5b51e45028058cff1af38cedb05f1b0a201bff1ddb508374da6fb0d77ff4d14bdef6ec04a468435dd9870ce0f1e34685fb982f21c982e79"; - sha512.source = "21236f5d7cc9a64472d9f214777331d3b230773d134b0ed5a83d1a3dd21c2d4a76df78f42824012d4edaabfeab612684fa2577bac3bd4070ed2b5956d19272dd"; + sha512.run = "daaf515149e083628cbb8b855d90d0cb0e6499b8338294550db1220b867c9881463c61a2cc1d6fe1eccb3cf2a7e0fae57b865791e4195ee7543f63104c63ddec"; + sha512.doc = "e6a80cc1f71bc8c272db0a5c2a158cf5abd67e61f76e6412aae6d3854b5b030837a063e18291f843cf9d3d91479da8f4a7f74ebe3b539d783f823cdf448cc9b6"; + sha512.source = "384b17dfd1ac15589b83a5b6f95f5494fbb76a54b19d09eddcb73b5250795c70b19e76c29616402b5ecf4c649b9a1e5a3edbb50d1bc8175815eecc70ca27616f"; hasRunfiles = true; - version = "1.0.1"; + version = "1.1.1"; }; "pbibtex-base" = { revision = 40986; @@ -25950,6 +26804,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.15"; }; +"pdfextra" = { + revision = 60553; + stripPrefix = 0; + sha512.run = "6cb9903d116aea1fdb6a00f9588e3815a4dc56b5e4c2eda19e665bdc87511c7e4dce2a94c792d3a87c181e476f06cdeb0c71c02d48fcc265c77472a784faf98c"; + sha512.doc = "398f316661cac3977130970e50970d04fbbaf569ebe4ae6b9434eac4a5a8155fa6b1e45cda929dc19f8cb82991dd8b760c3ece64af54b141efbbe83f570d385f"; + hasRunfiles = true; + version = "0.2"; +}; "pdfjam" = { revision = 56991; sha512.run = "1b1084859a811861e60e27186d67d267d3740152331f50fdbe67ce7226a76b4db24d79b674e6511d2f3de9a711da3369c565d781614f5d0c1a8021bc1ac18827"; @@ -25974,13 +26836,13 @@ tl: { # no indentation version = "0.12"; }; "pdfmanagement-testphase" = { - revision = 58511; + revision = 60347; stripPrefix = 0; - sha512.run = "fa4a79e078e2aa29862db99a336a614387df52a019d0a42b6bbf4ff8d222bf44a16577d3d491ca0f3c8527a0dfd1bab1839db891092dd0a8f3480744fba2fcba"; - sha512.doc = "03503b2f0e4390bcde34266610fa822c192fac1cf5c800edc2ad77c1b925a964e9564d12fe9104f675b243bb757a96a355aac26b0cd95ff701210b3afca2d15f"; - sha512.source = "8bf95f64fdee7517af5f3c312c32f1c705d9b2348cae1ec44c76855b7729641509e6f89192a5d415357fbcae794178767fcfa5eca72e0d688246a6a5c5ca03e8"; + sha512.run = "f63501fdc8184135bb649fa15e22d055a4e17a66e57411c31f6c455cfaa6680d0047eebaf34969c031ebf3f55fcce341ed1f6c0365dccf8bf86c808ff2465b4c"; + sha512.doc = "0107d3ebfa15c1701a0fb2d25fa0ae19c32a38add6866dd262f0db71b59dd194b5c3127c56242c756db990a0cf6af674c9dec67f892aa6354273439b0d98341a"; + sha512.source = "4c45ceb89d8625c7d7a7a264bf1d31eaa89a31f5ad4e5d956f6a312853132eb1e550ccee23aab53ae03850a691c1bd8f4154b8a7273f4b4ac4150735e219ac31"; hasRunfiles = true; - version = "0.95c"; + version = "0.95i"; }; "pdfmarginpar" = { revision = 23492; @@ -25991,13 +26853,13 @@ tl: { # no indentation version = "0.92"; }; "pdfoverlay" = { - revision = 57923; + revision = 60923; stripPrefix = 0; - sha512.run = "abb74e43656273b8b7944ced516239ce7fb33ca57daf137d1576dc3c5d013982a10f26e0196669f821412a58dd2da36411ef1fa8e81e4e61103ae583ebec0494"; - sha512.doc = "2fc549ab29625cbc2876655d6414dbbf211ce935ed9e676561c40c96045822aa128d7d55f0431ca059e3f37ae6d8e68984652381f31809dcba378c85c6f15b54"; - sha512.source = "d89a4cad67a338ecab1c413c36a451018d7ad86452a470c437a91f023019c78392403da4f4c57c199a4487b6011c8b43b5f51607a6a24014b7cd4eab2e063fc2"; + sha512.run = "73a858f3fb7d9a98e828d4a0a03cee8c8d9f6657f641f4963c040c89d58297249fc0b6592b659322477f88146a1ce107032d387c29cc73661feb00365ca6553a"; + sha512.doc = "1eb560459c624426954e2da487f07da6b23144cdef3d0e03ac63eadf297233cb73d803c3b9deec6e90a324c251fcea347c34077e8972cfa5faa69784629b8928"; + sha512.source = "5a35e4f685063e04b7bd1a5f859ee03e55112f121c766ced0d4fa633d2cfd9cac7932b5b5a77d86e949e27e52236e2007cd680a298835ca50889bd1a48b47ea0"; hasRunfiles = true; - version = "1.2a"; + version = "1.2b"; }; "pdfpagediff" = { revision = 37946; @@ -26146,11 +27008,11 @@ tl: { # no indentation version = "1.6.3"; }; "pdfxup" = { - revision = 57166; - sha512.run = "c000299a0f21b6fbc60e23ac163c55414e939f5542006a1508e8f5e143fb64cd40b8b57e986c07d99e4bec8e9f1d0d325955b4d34af08ba73a58f77c1a0d442a"; - sha512.doc = "9ffaa67a311531694f67a88cf41266858ba1d92a6d390fec2885a30a734922a48f4afe390eb6b3ea980c7ac79ff67f0d393927f7bdf3ad0bd3d30e64fd098d96"; + revision = 59001; + sha512.run = "f5b7623c1ecd132bb3646af5953245bc7378901bd5ded2e910487770cd79bb3d248cad426aafd18dd12a28bdd46be0f89b81dc95959f06688fb6a7a8f96dd11b"; + sha512.doc = "23db38fd8ebbd04bf6fed3b2814360cb6d0b736db1540d0298e9ab6edd449894c420078adae11d97998fa1fceb8e7083adacc0048337afbf4b6fbb253c8ed21f"; hasRunfiles = true; - version = "2.00"; + version = "2.10"; }; "pecha" = { revision = 15878; @@ -26161,11 +27023,19 @@ tl: { # no indentation version = "0.1"; }; "pedigree-perl" = { - revision = 31990; - sha512.run = "9adc918e1156b2a14bc144b96b5d3fe2b1272a5c9924e30c67236c564c1a065f06ea075249df21f19ce13b9cc03a885402e120d6b8f40f912d8c6ef4b98fc1f3"; - sha512.doc = "1e645090b3cb78b95bfed3398923c6e4cd39637238e7849bb1d05623307f82115fca87ceb6bac2aa89beb68371d7acd438099675ca33295839e413905b4ae150"; + revision = 60686; + sha512.run = "fa15cc124e998dc3efa01cd7bcec249321b04c574472b413e2363a6655ed3788eee9b3fd93d050594eeca322ce93d8454cdc658410e73733eeb0c65ad47b89b1"; + sha512.doc = "82279fd5b11ca0687e2d6ecbbbc9a2a4a65de790a03dbd97c611ff4a4e45dff569d53602f777c54ed1bad340c3a116500e26ea0f70d48ba68ffde4fa1ec4a8f7"; + sha512.source = "39629590e7b55fe172acc24d5cb90501855e575199955582da2945fcdc10256ccc7ef4590c1729a67a504aff14ca244bc65053a51db353fa2b2b6c7c955ece45"; + hasRunfiles = true; + version = "2.0"; +}; +"penlight" = { + revision = 61326; + stripPrefix = 0; + sha512.run = "d6f1e6d6d3e8ca2fc38905f5c8af74fef1a02b83dab7fcf00dd12802d062a2e0e74307e96ec53f226ad0ea10bdb1efda0638d1af0c6ac43a991a7bad27c97fc6"; + sha512.doc = "78817dadc25de4b7ba7e065a8bf5080747d041de530d0090073b14c4acffc4edb7bf2f2196a0f4935dcf6219d7f846f395b99d5bb980ed1df5dce0672bb648d3"; hasRunfiles = true; - version = "1.0"; }; "penrose" = { revision = 57508; @@ -26237,8 +27107,16 @@ tl: { # no indentation hasRunfiles = true; version = "r36"; }; +"pfdicons" = { + revision = 60089; + stripPrefix = 0; + sha512.run = "cd09de584483a1493648e9f842b743c43d7712b35f9d315ab34871a964b6ea7e8bcb0ff4b8d4399f5ce7d5ebadf41c94e8b88772b15155d4c21e17e4c62ecd2d"; + sha512.doc = "cb9f0ae2a1b7a3c8cbb12f859c9cd9d33e447652ceacec2642e45c7db7a96ec6cfb9bf63ac8f711c1661557308ebc3c6c04604412d09cf16d232e23c805e395c"; + hasRunfiles = true; + version = "1.0a"; +}; "pgf" = { - revision = 57240; + revision = 59210; stripPrefix = 0; deps."atveryend" = tl."atveryend"; deps."fp" = tl."fp"; @@ -26246,11 +27124,11 @@ tl: { # no indentation deps."ms" = tl."ms"; deps."pdftexcmds" = tl."pdftexcmds"; deps."xcolor" = tl."xcolor"; - sha512.run = "da45fe7a5b4e9aacf39c64da1596a30ceffc8751ceb6543b20f6d3f2134da75eff7684a72ce15fee9d1e4404efcf98d9fd3354d9c178caa3881a735be87c9073"; - sha512.doc = "697cc2e2503f3d71cd751530e1e9d8c9ada584690b212f03b7a15808b9f973de532dbbc144ef924b4e806d849cabe2850d1ae802c51b073d84e567349c29fb90"; - sha512.source = "2fc269eea7ef0c9ee04e15961494f4efa6c12a03a6c0a269a400d031fe154796c67ad96e22efc4ae077a87c38802471b4e0add5e1187249a2b939f8e8fe13d77"; + sha512.run = "c02a5b4a0f3aab13d39166c30bd456603de012ce6089662ab0b7c091ac906eb5c1719543246db97ac49cc109ad05c1b1d59330a64a43f82689cddcc86a465d06"; + sha512.doc = "360aaf8f3a2b2f531c9f24c777fdc687bae4a40b2d03f99f081765690a94711f63902abc3e9a602fc2d2d5bf93d3611cf40e7082fab7176fc0fba07876485238"; + sha512.source = "f2779d8172a81882263bd1ff7ec17766fe1273cb824e7fdf695704dfb4575ff0aa3a77ca264e4c57e4c4cb232bfc87782532dcdb69de00eeb1ea3cc23392bb7f"; hasRunfiles = true; - version = "3.1.8b"; + version = "3.1.9a"; }; "pgf-blur" = { revision = 54512; @@ -26271,15 +27149,15 @@ tl: { # no indentation version = "1.2"; }; "pgf-pie" = { - revision = 55342; + revision = 60115; stripPrefix = 0; deps."carlisle" = tl."carlisle"; deps."latex" = tl."latex"; deps."pgf" = tl."pgf"; - sha512.run = "b187fcb3e38b7538b1f0f52b94590198310e5518862c8ed6e0c5a01f66328e15f3a425eab827bef4a045ea7f7e822bca4f213ed5a5bf25c429f00cf0939bad88"; - sha512.doc = "9828ccd5976095450852f2b63dc3937ea24a1a80e4617d9ff183ac80ebe69913ce8cea13a90621e352762e904f338455412148c0fc4159747dc13cae3b2d828a"; + sha512.run = "e6ba22a3cb4b053cfd77c190abf82f71feb47fd172701b91db1590ceab6fbf926ece08af960426ea1d523237468c40d1d0c8518938d1de9461750ed2e3b207c3"; + sha512.doc = "f9b14bf6474c035810c91d7e39932a5a35d011ade63cf1c65699a3466ec0878aefafdf17d51a16242fbfa0731ae8013d86e625904a7f14cc2ecf7e0af8409d04"; hasRunfiles = true; - version = "0.3"; + version = "0.6"; }; "pgf-soroban" = { revision = 32269; @@ -26290,12 +27168,12 @@ tl: { # no indentation version = "1.1"; }; "pgf-spectra" = { - revision = 58467; + revision = 59827; stripPrefix = 0; - sha512.run = "4f1b4a80df4243ab07e52795573a7e3f8e151353042a0a360b01d9b46f44077ce5d71342f187355e74c3bc23bad3984c4d0aae9a970a28ab014d403cfdbf46f9"; - sha512.doc = "e7710b4c68ed835f7d2ebf16db0c9a1405ad8b3a2824aa4aefeb118795eab12ee6b22e0b764e815b6aea8c37d06d2fe51af472adeea6f587717a1b4831667007"; + sha512.run = "b706196e5f4e3a17f1a7ed4c6d28774475da146a9fdea9896ffd668cdf102e32715c3d5163524181735a39e941cf9ca3252d2acba6a926f90fe06ef2db2f4b48"; + sha512.doc = "bbf129ca41d040a9c044f533f948c2e9a750f4a3de3366dd30bec525b3f87f5f185da596952bd92a13f116cf94edec61683236145644fb91033a9c32e26eff0e"; hasRunfiles = true; - version = "2.0.0"; + version = "2.1.2"; }; "pgf-umlcd" = { revision = 55342; @@ -26335,6 +27213,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.0.1"; }; +"pgfmath-xfp" = { + revision = 59268; + stripPrefix = 0; + sha512.run = "c82fdb2b540dc37393610199581416b4256d9cf382da4238625b9ae29f6d7ea6150925c6837ae1f4b55fa10239f8563fb8abd042d5533080de7283246ee69ed5"; + sha512.doc = "f48114bf89d4d5aeca399c44bf6a6fb26567d7692de319e7d457d3b753df8e302871e9901d98bf8697680125fb8fad56ac8675dd339bc420b439aaa4cc93dbb0"; + sha512.source = "18571bdab8756f25c357ceab0cd82f242007c22ae0b6b5cec17ece221137607a6d245ece8dd90c427d0eceda63749f0d75e77c2974e9dfa8509a1bd34768b5c7"; + hasRunfiles = true; + version = "1.0"; +}; "pgfmolbio" = { revision = 35152; stripPrefix = 0; @@ -26378,14 +27265,14 @@ tl: { # no indentation hasRunfiles = true; }; "pgfplots" = { - revision = 54080; + revision = 59243; stripPrefix = 0; deps."pgf" = tl."pgf"; - sha512.run = "65364a44b5950ece4c6b6797b149a147dce134f89e2d9402d9a42e656c4a1170c23cc66c8357599addb8283617061850247d9d679fa2ebdd2ffa90b311492b6c"; - sha512.doc = "65a01a28b2e9e14f5277f3a6c91fcd1dbcd255bffa7feeb15132aa24013fd59fe5f5feb6b7a2521328ca2060c7eb8d2eb70b1433f32452b2f661c5ee7142f336"; - sha512.source = "26eec6b3828e218f34a92b1afd8d457c67340289b85678baf7bb6daf5b9e82db44aae87a2020c41f8abe0f4b515b9c177e2a970c8821b0396164e3d11e62366f"; + sha512.run = "8f4661e193d6b2d9a5e3f488ff7f35849fe559fe4587b5050ac67256aa4b93e24c79948e8f8757eb901e6b531fffffd6597049b1e457d79db36d5043f00e10e5"; + sha512.doc = "998246b7c5415e910ff168ffea064aed80957a9f29b09875f8871c9f04d2a52c50a33f7f3cd490a1195c5566ce310330cfba0a5bb7155eb14b944e05e9d1557c"; + sha512.source = "0ff864f02131b1f46cd03cc01c9c25e841542c42e87599b7652866d8f0e73be9b836e70784f7b77716745a6dc752c7ab9fcf4837a454583e09a6b53a845ce6ea"; hasRunfiles = true; - version = "1.17"; + version = "1.18.1"; }; "phaistos" = { revision = 18651; @@ -26396,6 +27283,24 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"phfcc" = { + revision = 60731; + stripPrefix = 0; + sha512.run = "1d1f6387db333cee296545663bc4e2026fecd0f381cf4e45b42c8b297a4ae9bccfaa8e9791f92cf59bccc428b3f63b944d9173660c3606f1f49ef1878caf2181"; + sha512.doc = "ac10825535fbf1e5173d5d209c26d665a128473c3100e349a63ccd921534c9645ce3c7b7391aac56de70f23657db8e1496f6afc0b2d112a45f3ae84d87220498"; + sha512.source = "31c59c51bb48a722e4962986bef69619ca1ffd80bc25ee1308cef80e78246811ee169ca6a0c9ea5e257626e55fb04bfe40bb1ec53d09c81b2fe636e6ce215a37"; + hasRunfiles = true; + version = "2.0"; +}; +"phfextendedabstract" = { + revision = 60732; + stripPrefix = 0; + sha512.run = "0e1f0f232c7216d654a41ab750477a5a6efd1a2dcb15b2114eefe1ffcb582bd0512bc8592111904c550badef12a3927c5ee2af58548dab5015901165b35a8bd1"; + sha512.doc = "aad67fc68996c032bca758b44eb65288f2245f780e9e4200888fb027b4638963e2f3b9c771a5ec78f8c65fd0c86c8b55b16d8cdad44fdcf9cc6622a766175e00"; + sha512.source = "a5d3ae9a1bc6b8859e998bb3561a63e99d9a4f30da3e3c2dd918ba7f23a09362bd8f123e2bfbe2af4ff7f2204c969ad487ddf389fa04287eacf0abe9f251391e"; + hasRunfiles = true; + version = "1.0"; +}; "phffullpagefigure" = { revision = 41857; stripPrefix = 0; @@ -26406,13 +27311,13 @@ tl: { # no indentation version = "1.0"; }; "phfnote" = { - revision = 41858; + revision = 60733; stripPrefix = 0; - sha512.run = "d542b73d1a25d0d141a37e3bf0a3d4753829efbcfed9745ea299a90026325f82624bb5d4a5075892af758d4a4613e1560824871e6bb784a8ce0030a7fb3f4836"; - sha512.doc = "a62dc8166944e953b8efa49c7ab78b98744cb9948523f4decffee6a553a8e432ce2d9774575bbedce59e5dbd01e9bcc01d82962a19d3878a11367127a7927287"; - sha512.source = "4f83603d837978304673550f1dba78a1aad030392323de2ae6bb0295ecf7fc5f8bd211a14f831b7f3710b13e999e73e3a8b224a5ac44ce67b2ea3faae5fc83c9"; + sha512.run = "ddaea70a5bb3aecdf634b44dcf5f006db479a4d47e44e96f92bd390c2c0e166b741ea31a0f22ac39770ff0c92590a261c18fe5096bf97997743684a95a82da2b"; + sha512.doc = "2dc4e7d3615d8f185bf1bcfeb5a90d51f362538691444355ad6820f8bdcfcd68f1dcc69486c0b630d1141db1b4bc10bd17abcfb93cf37b778266090f29ec946d"; + sha512.source = "15c0614cf6bf41c94513475d0b65f7053970505fcaa3126550d283b8597c49e30b86e716d3b643fceeee2bae37f81a65d8f65859847bee6f0aa4e508102f6617"; hasRunfiles = true; - version = "1.0"; + version = "4.0"; }; "phfparen" = { revision = 41859; @@ -26424,13 +27329,13 @@ tl: { # no indentation version = "1.0"; }; "phfqit" = { - revision = 45084; + revision = 60734; stripPrefix = 0; - sha512.run = "250626ed9e7e33abf0d19c32213236b02849db849f080bee0ddc19370acb7e2e66c838dc1149f8c1194d2534c1e073fc2971fe3687174978bdabc90efc4b7752"; - sha512.doc = "0acdb07c2484e2e5694690536eca084ffebee0f549ead32b3557e368ed85d7a7785c297cc639cee2cf4b41f64f7c2df806b6b27d4ae89769b0b8d99d2127f885"; - sha512.source = "f189ad485482da9e1802b1b2c96120a244a14f7e7e39a1759d7484ad236945f98b8330464223ad63127d9960eb4f10f04145f5eefef25f02775c009184ca4b9d"; + sha512.run = "604093594d05e5f331d27bf5b0d6c40b631934a2872841f2534f69279542a6bd26ad758712b9b24c5490c4e9396ac147f46a9d0790cd29f56c0d2b13d876bd56"; + sha512.doc = "738e5f61c0318f331ea2a7f1e0d5d019969636917fcc18ca19a72ed42b1207f4025c58ea886c4758b64c61cb33faf8ae5b4d5f2f7a55a9ce9758b9fec00508ac"; + sha512.source = "0d0ce4d75bb6d73e24a47c8d66ac0b72a0cfe273a6daa4af1fd3a89f853c3c5c1f856d749321fc9ef79b0e0a9c27465045a48202536b73270971deb2d4cc7a30"; hasRunfiles = true; - version = "2.0"; + version = "4.1"; }; "phfquotetext" = { revision = 41869; @@ -26451,13 +27356,13 @@ tl: { # no indentation version = "1.0"; }; "phfthm" = { - revision = 41871; + revision = 60735; stripPrefix = 0; - sha512.run = "c6aeab1fef49a56a7ab080945199a4f68186b53bd7fd00e4c3d3babcd3f63f998748635edded858d5904b8dc7604007753bec12fdc8ff6a7656cf1ef26c0ca9e"; - sha512.doc = "c2439e7a3e7f1b0730b8fc48f933b9754777e7750a58ee6a5985ac458689c2df96d9e74d09c5ade2b0b8dac49e0be43ca60a0769dedc662e151e1dac5bb18cf0"; - sha512.source = "b189f0320e5b8d1ecbb1bb34972b845d776190ada4ab76e44ade41e21d8f7eb0bfb6bd55a4352aad4d0c2455730b7803384eece70d2030faf9279aef0f70f540"; + sha512.run = "2a608898b9038cc46e4720423a42f403abcd105700e20e90274ca6e01ed3c4428a443466d0e32b0cf0da9735c0b7ea74b82e90a3d0b72583d38fa5a14094f806"; + sha512.doc = "bb0c2da2d17b0c3c3550569428fbdb5532d1fe79b325289d71f35659d749fb952bacfa6140210ebbbdc661dc445ae8add1be6cc79b77bf6346fadc70553bf189"; + sha512.source = "7c234459aaa013a9d2d0c719791d99ad6db252e152a53f7111e6d9e04fed3c718efb4fedc85fd064825d40ef80fec2643d6310e582bf830486b8e43efa27c966"; hasRunfiles = true; - version = "1.0"; + version = "1.2"; }; "philex" = { revision = 36396; @@ -26486,12 +27391,12 @@ tl: { # no indentation version = "1.5"; }; "phonenumbers" = { - revision = 51933; + revision = 60288; stripPrefix = 0; - sha512.run = "79f875543181adada6e60d57adbc225efef89440666aa179ce69eef0118c528bb603436cb7df5dba95c75f60bd57bbe321f169358e247842a42cafee14cffef9"; - sha512.doc = "85a496e3ff30df0bb1a852e1e21cf0fd8434124f3ec1b460fbd3c0da05573a1ac85136d3caec4f4d59993d47ad82fc0f123afcbf272982bd614dd2e1f318394f"; + sha512.run = "9a7f6dd040cafbdc388e5d2dcfb49fc394ff4b7d15889739e0ad3e3da088ba0d6543b68e95f9a420d77d5a1315423bcae7a68a2e1f18f425a1fe156ef26ef4e1"; + sha512.doc = "e4b696978deae4059d8d85e6b21addeb1e84d83b82a87babc68d111a6e0601df305dc69e435546da70a64387c64a4c5928e56e16ea9a3af6eb3c7952330fc7ed"; hasRunfiles = true; - version = "2.2"; + version = "2.3"; }; "phonetic" = { revision = 56468; @@ -26568,12 +27473,12 @@ tl: { # no indentation version = "0.4b"; }; "pictex" = { - revision = 21943; + revision = 59551; stripPrefix = 0; - sha512.run = "ed91f0518668007aab7b9222dd08c7f489caaf084ef915f88d435128012b2b4eb9ba610168154f07bd0d084a34909cefb1dc0c1cfb2186982b4f08f9f6412f7a"; - sha512.doc = "61ed0f632d7f12fca4631b13714994b2cee8e05176262dd8cab672d4f8f7e65a36e0d927e3b803991818d9d2976d5794d48a46ebbbaf8bc8aad99aadec7d3fcb"; + sha512.run = "cca6216568bead5120ef39eb2743897ad97d285b55e7d9b0723b3f6c7fa94ab17cb8cecb946845aefc57eae3c69305de6d839feb9df8212be83d2c7f242c2fd4"; + sha512.doc = "e5bdad8dfdeaf3e3427d37b35641f37c8bb8005aea3773a914967a10b2583e1721fe0afeea0b8cb7f230edfa7b7d33c2d6fe023c229de4a27d6c979f6830088a"; hasRunfiles = true; - version = "1.1"; + version = "1.1b"; }; "pictex2" = { revision = 15878; @@ -26683,12 +27588,12 @@ tl: { # no indentation version = "0.7.0"; }; "pkuthss" = { - revision = 58729; + revision = 60778; stripPrefix = 0; - sha512.run = "34f4fce7ef86327be8353d8a5634c8498007a8b30ee847b01a577610bf1d1a31f862bdd3888888a022563333e275f74f686efdea5ae8d7fe82f99e6d8e71f212"; - sha512.doc = "ee343be7e84257bafd28ed10de0e5724c19c832a170ab8b176a0681da3bd108ba2f914e214e1c7045ffcdb981e72b3ba08c736c6486ad756af736e48e13738d0"; + sha512.run = "0b897615b001db27b81a239671665b230c5ac8fa59ba5b9cba0dec3742e80dbfb243a99d8b6f39414a48ffa1aa49f0ed41c1a232c47b11325ad1413983ff7bdc"; + sha512.doc = "0871f08b3807a522944383ab584bb36a2cfbcb74db39d7c06ae1152253d32204649d9c51d9966a7eb473ba37684b2b4642be964701a73c519ef05a1a78fe55a9"; hasRunfiles = true; - version = "1.9.0"; + version = "1.9.1"; }; "pl" = { revision = 58661; @@ -26783,7 +27688,7 @@ tl: { # no indentation version = "0.1"; }; "platex" = { - revision = 57972; + revision = 61273; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; @@ -26796,22 +27701,23 @@ tl: { # no indentation deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; + deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."ptex" = tl."ptex"; deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; hasFormats = true; - sha512.run = "787554d26ec4acb3811efbe96349a51b517e5b3b4677754d94dfe1d0ce61088d016f21995e5e9f49e1ace76a1e1f2c057c126981a9e340a9e047597f637aae3e"; - sha512.doc = "f0085548bc20f0389d475a9abf294a8713d36184aef1c65e12d5a7621a4f60e26cf8b63f6a1d558afe964f633455fffd9f492e749938c290b91c10e02c6cb4d7"; - sha512.source = "50afb0b5a1b766f89d7f3dda64b74f080a06d25d66618a4466018209fe4e3245f8deb274b22e30b45fac0a8a9f903ae70ec0301bfb72a394ebc3759e065205fd"; + sha512.run = "bda130dcd16365c2a280f9ebcefab940d50de17ef18088076943e70df147e7fa38cd9cf45025c84e7e0d5fa5846a539cc9c7cd5667fbc88a82f41676284f345e"; + sha512.doc = "4b2104e4e19b515bc96aa38a1dd085f29666b3a5aa38005ba35e4e4b94d538475277445241583d326b31ffcc2caa8db16c91f9143d8d247c403118323347ac51"; + sha512.source = "2227e6000b83e889904aca03099e96111be2d0fb054a666688a5908a40ee7f71ec318956cdeb5be88edd9d2d507c3db8dbb27906bd7bc6e6a371caa9e151625a"; hasRunfiles = true; }; "platex-tools" = { - revision = 57729; + revision = 61272; stripPrefix = 0; - sha512.run = "5e5352dd6813ed5f90d1f9f1efd4e4f8bc53e6b6f0a932f2d8d5715cfa0f7b6df96320381daff0728e64f4df5239aebf65c2fd7796310d080ed857875732e7d9"; - sha512.doc = "0834655e25b8684ad5e51dca1e128a07da38ce9b012205063feb7a54aec2412d706cb4560a445cc80734493c84b54d86b912bf659a72baa642f26174e0063875"; + sha512.run = "95e04f312f5cd98a6cb06225a81f1538f14f1701a490b8a437a04016714d56e6d208eef2cdb768f539ae2b867f724d78853701831cb9f396d69b9281dc4140c9"; + sha512.doc = "77476461eebb930f3e9227eea9f277fdb50486e7b4d9e4a9d424714e2d902044607466e0d7e4c839abb245f7b17e020a1719ec5f085f1858f046033142cc8403"; hasRunfiles = true; }; "platexcheat" = { @@ -26822,12 +27728,12 @@ tl: { # no indentation version = "3.1"; }; "plautopatch" = { - revision = 57731; + revision = 61240; stripPrefix = 0; - sha512.run = "df8d83e2c12167d32d114c61737bd4b834ddd3f9851c238ce1b07c1aff3469ab2bbd7eb6b90047b75ff36a26ed4ba53c97782dd7462bd559615075cd38517c0e"; - sha512.doc = "afd9185a9bc5a7f403b24bc948da9ac6939efb0ccf2c9063950297183c3dd1db08de43ff98824e66b0c497a2fafc3689678dffafc67ef92bf035a1a0a2066a4f"; + sha512.run = "7a617df2c19ca483818ad3bfa8421a070d8e9a3a3fbcf91cb686b928194f5adf586d468ec5329e28bd2cdf48947c899f52afbb6f85a552781b80cc6d64b27a05"; + sha512.doc = "f5948db03cdbe43e654ab11c8f1e913a2595b63c0c1bf32025e7f7adeb7b8dd9b148990034f0b4828ed012c24f6955009b1c423549494d6953932527be47fede"; hasRunfiles = true; - version = "0.9n"; + version = "0.9q"; }; "play" = { revision = 15878; @@ -26902,13 +27808,13 @@ tl: { # no indentation version = "3.0"; }; "pm-isomath" = { - revision = 56868; + revision = 60368; stripPrefix = 0; - sha512.run = "095ed443c74eb0693331a6ca3c736f61ed5c34314e207cd379e26e523507f48c160671136b36dcbcb287bc1165da8223048e18261a4312ef07c129b79ad57ecf"; - sha512.doc = "7c5ee2ad9ee1cfcb8e6766de6a0aca29524dade913bd32e54fee1f5645934fb9840764b98542ed31bb94560f6589c5a074c2b3dadd59b7f20515fbc47c8ad981"; - sha512.source = "3f69521a43a3fe5821904adc9c15d7dcb993b1bc8f86c2ea7ff5729945b45af955c47a89e54b031b596d47fc83bf983b6eb18f15e5b1ef3a97786b2e5b80975d"; + sha512.run = "89e11156c2a4b7d05fc3404b4badcbac94ed190db4c215e573c84cdbc8fd46c5775b19272e423df1806e8a38d61d8c071aca7d38380637c79f06c411a05ee468"; + sha512.doc = "92366bb3963f1615de3cba205345d5d799fac04bf4935574868be140109756fe9a9a2d7cf7a685918018919ae2350e9ff717cd898fc0404205f21d56a359ebd0"; + sha512.source = "fac0256323bf26f55e5908c718b8622f4996b2b792ec3770b1db4a31d91ccba84a8e21e839710e1d6305448044c5140fc38a4eab06954783e428dd94008d2fc4"; hasRunfiles = true; - version = "1.0.07"; + version = "1.2.00"; }; "pmboxdraw" = { revision = 53046; @@ -26928,12 +27834,12 @@ tl: { # no indentation version = "1.0"; }; "pmhanguljamo" = { - revision = 54378; + revision = 61183; stripPrefix = 0; - sha512.run = "a4b16b981ff495212daac434123e0ab8d91ac862acf78f92ecab20c793bfc60e1b0e159113c9a5dc15fe06653531c1ac4a4de6208512baf089c299dc7dc75642"; - sha512.doc = "7188c7bd104bb507866c5b793a3da3ed640416847a032b6c2df8eb94a47ec2ff17d11d3494b2f2755c2ce3b01a12c12a2d6abd374c887c2f7418a6fb8c93aa0c"; + sha512.run = "95f9ff1aab6254fe9362d847c4297d9bcad59c15fd59a809c2304e672dd204c0af8c02fc1519f342cfa3160d0afbac962b9d88be7a3ec54a08e6258d5131f688"; + sha512.doc = "2c0cb2a787c73f88e87ce37d1d3237a3f3dc57bbb6d37473d00180927f644a6fabd1a3982fa61f46b1e3161a4f5eaea8086a21834f85d82e3c93615b31ed01eb"; hasRunfiles = true; - version = "0.3.4"; + version = "0.4"; }; "pmx" = { revision = 57672; @@ -26984,30 +27890,30 @@ tl: { # no indentation version = "3.0.1"; }; "poiretone" = { - revision = 56070; + revision = 59125; stripPrefix = 0; - sha512.run = "5eab5174f3f31374fa5095946555ca7389ccc4675e479324f03f1c33e07981d2731a86b516c5cde41a9e97a2e5751c4a5ebd58db4a1f76829a6638d8393e6d47"; - sha512.doc = "07dfd772739d214646d6779311f4e3c4c71359303eb8fbf53ca40b9df628c3205fe16889b93476e3eb74d2786559ab75a66916067ec974b3349f89267d1ff435"; + sha512.run = "535ebe641bc1534c7e711286711bd005660d26ca524646e9d9b198c673e5166e567a5dbaddca178d5d6ef70acca221f043eb169000c6fb20ae39c537f0b91f5f"; + sha512.doc = "4739832d32d02a9e09a15dea1d0f18b8597f36bf9e7f777d3dd7c6862fceb35109552fe6a66d9c65959db04385adc59ef6db73abb87b8002653b9bb88fb88513"; hasRunfiles = true; }; "polexpr" = { - revision = 53633; + revision = 61191; stripPrefix = 0; - sha512.run = "562fbb09aa3eddf5e25d8617eb4d8332eecb20c0b5ea386762de4277ee15e47dd13243be978146b60b147bc30a167e5a00a6970ee0dc74710f13640ddb4da6fa"; - sha512.doc = "7cd3af9fa8d281b780cbcde915cbb241efe8d2398dbc7ea9e1aaf467b9de58325834faf9f9bb7ea7b9f5f5192ff4016f4dffe7d58801860ebe1735dec7ecd6f5"; + sha512.run = "0e699457e9e8b27a1845ad75227271095e03b0b331b74122da868c3b33932a511ac59d89ccf4ab228aa16f8486ef1559ac2c75bb181f4275c1fb25229f701b43"; + sha512.doc = "37de69478cc78e4ee75c896d7bbc41cfceda6e012c0ecd8d57912e0c73373dcbbfbb97b795c86966edec7d03f9dc3e1005a41dddc7504137e2e4e5323e10e80f"; hasRunfiles = true; - version = "0.7.5"; + version = "0.8.5"; }; "polski" = { - revision = 44213; + revision = 60322; stripPrefix = 0; deps."hyphen-polish" = tl."hyphen-polish"; deps."pl" = tl."pl"; - sha512.run = "8d4c05dae9e5cf8ab36bdba5be8b0748d5d283a6a77c7fa18821ab3a20fe5935f302a8ce9b1a1314ef128a20c1011018ba7bd04d34466d017e16fd9bd087e108"; - sha512.doc = "a619719518e3d9814907d33756c4a3f2494c3a94b0a717e6f848e31177622bad6ba2cf595a23ff2efb65ea04b70b267aa87cd87caa56c91bab7b36bef82cd2dd"; - sha512.source = "fe630f5992e79ad211ac4537cb1fc8b40154c2b43f34fb15594e662909077eb0a58f2be41aa05ad647a45d2d00c8af82ecce2afc5eec46c941d1060f2728a4be"; + sha512.run = "24bdb98990f66e89085056e6ad3e0930dd16d0f4bbd07a2c9a49931796e143505276d2025fee21b2b52d927c3b2992d31f4edae4668cdb549f6f00ef43dc1c69"; + sha512.doc = "755e7625d5ee1e4457e7ee518469d585c9c1e566c57bf147c62195555ae91dadb68f469127cb18a7c30cda1468129db09cb09b1974f5273d41c9491a6e1d5ffc"; + sha512.source = "8e216956a95df02134cf411d170a75309c3f167a5bf7d78f77c4e47950c8a5da52e523e367f5ce60492fc0ab7cb205e9b57835b883225752731ca094d7c507b8"; hasRunfiles = true; - version = "1.3.4"; + version = "1.3.6"; }; "poltawski" = { revision = 20075; @@ -27018,7 +27924,7 @@ tl: { # no indentation version = "1.101"; }; "polyglossia" = { - revision = 58444; + revision = 58869; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."filehook" = tl."filehook"; @@ -27026,11 +27932,11 @@ tl: { # no indentation deps."iftex" = tl."iftex"; deps."makecmds" = tl."makecmds"; deps."xkeyval" = tl."xkeyval"; - sha512.run = "30f5fef2ba34bc8b22e5a5f933f4566e1e28ab0a161bcf01f7a0143dc906e6f46b71f0fa379f42ce057128f69536d5b6e7987fe2fc9f36ab48b64036f5ee4b8e"; - sha512.doc = "4a5f24de1d1f9abd64db06d0df75752d44ff8b3d0bc476b50fda71be41bea07eef678d5c37334188b1989228e75ed1cdd7ff17a9b302b8b8a65130a4576d7e72"; - sha512.source = "342227a34b54cada465436a7866940473452039a8b1c12fb97254d01ab12ca9ac373398d74188dea00d396f8ec117a369791930d185d505337bb815afc7db39e"; + sha512.run = "cc76a010e93e9aafbc74d4894b1cb44cd8a569eff1f42b1017d49a0f86fdf577334e8100e2ce8be68c5bf430b6895f80513adee5aacced508244e1f5d5e5f0f5"; + sha512.doc = "64147a6df9eb9f12f0c74792f3b7e0d9c465354a3966d7b1279aa64432021d37d1bbbfc2a310c1a27fef92723ba5803bdcb25995ce930e134553383c3b766904"; + sha512.source = "1f534fe32af11b3b83a7814c5615c046869c66e3af0781cef6730dfefecaae093e08eb53c73ac2a417d34aeed0f4a9f8dfde5debbb552ecba1ae00359c172de6"; hasRunfiles = true; - version = "1.52"; + version = "1.53"; }; "polynom" = { revision = 44832; @@ -27060,10 +27966,10 @@ tl: { # no indentation version = "0.8.6"; }; "poormanlog" = { - revision = 52080; + revision = 58966; stripPrefix = 0; - sha512.run = "39524ae2c1cfec8aeb09afa4c195dc2d4cd9445483dac4a99a6669e66fd0b236b99831b9212931930b7f821891f421fa85c363015996c2b5be35be8a82ff993a"; - sha512.doc = "3d624c5f870f4fdd8fd3df91ca6f80471223f00ce7407eaae6d0e98ba2da26f497bc149cc1beeedf5afbd0353e3f7fc9667ba3e4336262d3e7a9877981866a20"; + sha512.run = "a1d252b99f78e6cf0c11310079b392a7a557fdc78233bc870859dc8325bc7c1a50655b52cae052e4edbd2e2b333b409f0929d696b93cd8015c66f14ddafa36fe"; + sha512.doc = "6ae369601d824ca7f62c10327415c48cac9e58ff495238ddb2f00f71920df1b5f3a0c948c2a5eaf418f688f10e547c945d5fd726ab93eb5c106848c3355c8cb3"; hasRunfiles = true; version = "0.05"; }; @@ -27092,13 +27998,13 @@ tl: { # no indentation version = "1.1"; }; "powerdot" = { - revision = 58730; + revision = 59272; stripPrefix = 0; - sha512.run = "040d634225ba154fb76145815b923ef9e266a48bc41f245098b70634d6d8fe7890e65a943c44a694d889252de3f66ea49bdb7d56ad7c8ec0e1ac563469138f97"; - sha512.doc = "8b3076cfd45d3c6774e0061b54d63bf89245b16ae704b0c7541ef61b62e0b4972d28b31493fd8e4c167cf87388d87b74ca5b8335b106a310cc78a4c8175330bb"; - sha512.source = "e1882bf2cedb5a4146cfcdab5a89618a986c5dab64ccc4953c90157060907c18429b834e2b4dd0cdd38969c30697a354f024bd6e2c4dda88a40acd664350ac2d"; + sha512.run = "c8ab1d65e2ac0695cac0e8a0a683fe712ba51e8aa028316901e1ab6e31b0be68348066fcf290b03321c0bacbf5c0b16265b28022ef38137a3d89bd25aac58dd7"; + sha512.doc = "99e602f4f96d6b805a8cb255d72f49c62e75543df2348471e31952a2588125724dfac07cd82865e9559220ef98a7b8847ab9ebd1ab803d5e155804f3669abe3b"; + sha512.source = "cc32d07b304d6214fca1244823154290c68131111c2144592fb1b4134c59dcd0ab110542bcb64e7462c6959bff1bc9d1e2706bea66b0bed2abfde9c80255af4a"; hasRunfiles = true; - version = "1.6"; + version = "1.7"; }; "powerdot-fuberlin" = { revision = 52922; @@ -27211,12 +28117,12 @@ tl: { # no indentation version = "1.6"; }; "principia" = { - revision = 57902; + revision = 58927; stripPrefix = 0; - sha512.run = "2e9857cf6eb9c7ae733ad781d3e50668ab76a940a26051a61ffc1d1c33ca020f3cd9c6fe3051b89ec9e28b1d2032239e34e782221ee1e65a9167abaf97b5e478"; - sha512.doc = "b581402582c1d48300b0c6f59adcfb00e349381e5a646ce7cb4003a6ed9cec850c66458dc7c5057666bca79935743487854dd3d7619e5c24faaeb62a141f8f38"; + sha512.run = "d56a9031a7bc81fa62f99bac5ca88b12570720a51823566cb61845c7c0b73232c9a8d94d453585be72b2c2fb5565c7bb257a7d0533fc17e956b976977dec3b56"; + sha512.doc = "c5325b70a14725c9cb0d2368b0b6018375c91ea5be663731d4c016d945aef001f277fbdc0938f3c457e7328f64187bf70d79bfb37a1631f742b14d53a6ac4682"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "printlen" = { revision = 19847; @@ -27267,12 +28173,12 @@ tl: { # no indentation version = "1.1"; }; "profcollege" = { - revision = 58710; + revision = 60999; stripPrefix = 0; - sha512.run = "f9929b2fc8194df27deeba118cfe1c922c42c602df949999154fa5aa37251c6f5dbeef46f25fa9816a97aa2ad37f4dfae52427bd3381e5a2abb63f6cde49f8e6"; - sha512.doc = "fe78de237160707ac036812730a6460a3a63343a5d11df45e1c793a15d8316886f8565160a8fd0db9b7c10fbd519acaf182a7dbb7323f88d1d4f9df292341cd6"; + sha512.run = "47fa6b0691d64f2396799dcb2eee0a9fda4bbaa32a0cac8bb149ede2c25c6d8957bca229c334c82b6f36332ada04c8cbf2d96ae50733fd3cb4d1cabb36e6c167"; + sha512.doc = "e85d86712f18ff279467787faa7a7c336a4d5de40b476b5d225f40cad11b1083c0bc37c7ca2700ab3c0ef4c6c3c83a329dd82274748cb25bbdaf7c9271e806a5"; hasRunfiles = true; - version = "0.98"; + version = "0.99-i"; }; "program" = { revision = 44214; @@ -27298,6 +28204,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0b-4"; }; +"projlib" = { + revision = 61338; + stripPrefix = 0; + sha512.run = "24db5449be1b233520950d78ae0db7d31fc02e18e6bde757d8f90d7b92b3df7b425fd0a8e34d7a3d834fbaabaed2eb7d3826738cd4ea1c34d015f994c3e785fc"; + sha512.doc = "237e6a2237a824bc83ea9761f65bce4c4da0ad749aef6c90363dc90438f22aa3795ba8a6c5ca1cb2b83ab35f992a7fbd999b32f7540996a62255c2084013dddf"; + sha512.source = "fb35ee3d6b0a8390340ff4de3d4a052c9ceb203af6e8380818c50ed58289297b257a45eed8fe8132724eff242be3188a60a70a59aee3c8d6653f0b1d1f6ea69d"; + hasRunfiles = true; +}; "proof-at-the-end" = { revision = 51194; stripPrefix = 0; @@ -27500,12 +28414,12 @@ tl: { # no indentation version = "1.10"; }; "pst-3dplot" = { - revision = 56758; + revision = 60619; stripPrefix = 0; - sha512.run = "6b12d6273f5025b4afbb1adac35e73f60a1ca6430b24c40c145af1a50e35150a34cc70ff14e9904caff34be6955146f358f4231785aa8b7ff662978a846857f2"; - sha512.doc = "615081d1b54074e8cff1dfc9eadee490526fa22673204fe8f37554474cf89688507989c8701e3633275558165fe91e6684624ebcb0c2b2983cb38c5a2d55d014"; + sha512.run = "f20bc26a1a346b9b1c33238cb25209a9f573cddbf86b8b58ae185e5a2eb33f03fab122b8b1490563f5da3b525a0c5f7b04c6183ffb099543b56aa6fbf3e1c264"; + sha512.doc = "4c4b1f1cffe7b3a2144eee8534352083ce1a91637ecc8de717a3b033fad130e22e135ab2b8881467bdf2706eb76122d858ea9c36f84b81da5613ae44e47f4b7a"; hasRunfiles = true; - version = "2.06"; + version = "2.07"; }; "pst-abspos" = { revision = 15878; @@ -27534,12 +28448,12 @@ tl: { # no indentation version = "0.02"; }; "pst-arrow" = { - revision = 41980; + revision = 61069; stripPrefix = 0; - sha512.run = "3400d901f40b9dc3434f107dda5480e0f8e37548b2ea0bfad5a38ff90e1d99aafd43d44d6cb6c0594b0574f781d94ad57e53074d28b10251f6ab8100f2814354"; - sha512.doc = "bf97ebd12c09ba4ec3dfad4107141054abc9f04b1e1408017ec038b656bc04ccf09894c5f15a8a0344f358f2e43acdcb7509cc7e0ce686303a62bf175de7a3c7"; + sha512.run = "3e928de0ec8f1c9dd80143e35e3dcc9d51ff106fa12193798f5d2a77f49b3049f042273102b3dfd1460de68814ab32a3aa4eeb14daad846d729e7f6ddcdaa5fc"; + sha512.doc = "19878f237410d2db75096be382efef2ab1c5d169b4bf48b393956bf13a697d2c96b0da528c1044ee9b36ca8231ba4ad2b478bee24402033ebbcdf2778e4128a4"; hasRunfiles = true; - version = "0.01"; + version = "0.05"; }; "pst-asr" = { revision = 22138; @@ -27600,28 +28514,28 @@ tl: { # no indentation version = "0.02"; }; "pst-calendar" = { - revision = 15878; + revision = 60480; stripPrefix = 0; - sha512.run = "541e353dcb33239f2230cd220bf7918051cbeb3bf8386bb9da045199a80decd68760a34f0461bb7e644f0d1545f2712969c79584a813551ee433d3a2bec888d9"; - sha512.doc = "02be7b99bf8fafb00994327e737a5a050601dd141ff4e3482b42dc3c98c9ecd1c62ee64488146e3a7e1017a965ff1cd41b7487acdae65f5c09e259753c2d2ac2"; + sha512.run = "0e9bece02b9deaf677ef2d6f02999d3b4b7bc7028ec768fb57e69fcd3c1c26d1ddee1c261cbdce8eb8cb18c647dcdbca1448860d6139f01e17f234b3a8a0e793"; + sha512.doc = "07796be64b64e6c8eff2797d145933bb45c0e3ec0ba50e6fb41974d2dcabce09f2f781f989a62a5c5fe6295af3ddbce10ab811c2abeafe2d8b56b7a603f27412"; hasRunfiles = true; - version = "0.47"; + version = "0.48"; }; "pst-cie" = { - revision = 49422; + revision = 60959; stripPrefix = 0; - sha512.run = "4967785a229c9cd316b36357fc94df53e7ebfb216ba5bb222d208a767828aac22184914e2e3744e2726738920dec05f3ed7ab9ce1e30321017f43fa8f52cdce8"; - sha512.doc = "f2554d76fc89d58e4ff61ac5e5635b93775f731e33e384a3113ebcca53c26ae0e4609d1fdfc5f093abb8945bc3f02a77041bce072c29340ff9623a580e0ce352"; + sha512.run = "fcddc7d04c259132a45fb30850c02b613ca71e9c3df26729166b142e953e997d3c618d835be472d98c0aa7a50caeaebaa5631cfa64cf132aa35c2d29be59c63b"; + sha512.doc = "431f1d8306bb623834ef5f5d732e8fc413947b5f3d31d07874fc9d7ad0897046a4cf919e6e2e520b23eb9f268cfbdaf547dfe7e8e72d44ba92ba9cf3b7a4fabc"; hasRunfiles = true; - version = "1.06a"; + version = "1.06b"; }; "pst-circ" = { - revision = 55289; + revision = 60464; stripPrefix = 0; - sha512.run = "ff5ea04128d8d7646484849fb0539af8cbd8638442de65f9cfebfc874a71f85b534488ef516129346984d31a01e44521c29d7c5293c30ea315a986fde6a953bb"; - sha512.doc = "a3991c3c7fb781f6735de799c325bc19ef82cdc4ef31f2d4b5ec22ab3961e2bc450084285176172bf583869ebc2d7d35800ac75caf0caa99ed3c050c48f49960"; + sha512.run = "2335b728be1227d4631e09c3994e9e1f559839e871e29854e700ed74b9031a7d2ea58cc744d20b459c99f1954b7faaecc2ced19c449e98b97fe26b2fa71755da"; + sha512.doc = "c2eb37603cbba656eb1282130e112d0c3bbb49d4b3703c3d9b19d0d250d272d31fd19d2790c97cf8cd5226b0735e8466eab824a35754f41d7584208e606a6ce7"; hasRunfiles = true; - version = "2.17"; + version = "2.19"; }; "pst-coil" = { revision = 37377; @@ -27648,12 +28562,12 @@ tl: { # no indentation version = "0.98_Beta"; }; "pst-dart" = { - revision = 46579; + revision = 60476; stripPrefix = 0; - sha512.run = "f5d41ddf7c5934a00fe8bbbc6dfa468d26e8ac0c06975301f17f31f168c6bf7499dac210f08f815cd01c05eb4a9a376d5c49cd96195a9df56bd3f1156d9ac6b7"; - sha512.doc = "668648d06ab3047e45737908bca5f901b4815f7b7b6745e9bd5387b6867b1fe6dafec3633295e8c164e26cbf06dab2240516a71e3b766a52b9e1ac0e64d1d93c"; + sha512.run = "f8d2665eefeb791672864ae5fe17aebe6b83ca776a6170c46672cce02ab639fcffb011afd922b1dc9abb98a70d6f81cf4b00321e2b69542d532c3c72341e28ac"; + sha512.doc = "a0c747f8736607f920174b2a80ab07563d1cc7114d6e2e751f7e2d9835eed9f656f4b57b7b9061ad8501f4d6ba26c1fad37825b3819be1060782050ece94199f"; hasRunfiles = true; - version = "0.02"; + version = "0.03"; }; "pst-dbicons" = { revision = 17556; @@ -27723,13 +28637,12 @@ tl: { # no indentation version = "0.01"; }; "pst-fill" = { - revision = 15878; + revision = 60671; stripPrefix = 0; - sha512.run = "69401352ca7e08d6d61ce7ae89f1201f186cec6221ac3b9c2cec61c6033df03b8151ee278ab2edab6a661c49f0867d7f9e764bf45e9dbf32feed655e12239688"; - sha512.doc = "061dcab012577f3d6e30008c15127f2f70469340598c781a436c0c8b1831d36dfce86a8cd0b802a6f174d3510ee2ed1d9269b4c894793f10d79eaf8b6d0c1ec8"; - sha512.source = "35540e2a923b28393b68da71fc2c15166ec6e57ebed065dee8e8c9acdd7f10eb5327224e7422851b5a32d895eca29f19755bfda2cf1e0fb569deb473921c6d63"; + sha512.run = "5fa4ae2e862a9297073bf0559dc46d44109d1153571eb8538650410c96f5c43a9a8c85a379690820f63a5198ac1983fdeb514bf4b1342349352f1a16ef3ee375"; + sha512.doc = "ad51d3aba8d9ee19b4a53081a5956e8cf26f2673faf521af088076c6a356e321ca2fb9a0b504e61529c5a2ae49480b3918bd12235a66ad5c45035ce92e2eae92"; hasRunfiles = true; - version = "1.01"; + version = "1.02"; }; "pst-fit" = { revision = 45109; @@ -27766,12 +28679,12 @@ tl: { # no indentation version = "0.04"; }; "pst-func" = { - revision = 58786; + revision = 60933; stripPrefix = 0; - sha512.run = "5e609eb9600894ad217c6fb7af7a134447bec166527caf9041c15394666caadce094b1a68c0b365c8863974ab2a850e881666e685943452d12f4008198bfc9e5"; - sha512.doc = "86bf5a719310809cf9ec4222c667960ed1734a8d2f9a340c287ef241929ecf26048dbc937bc0aad9ccd5179f3918ae65706759757b32b53381be1a3c3395fe4c"; + sha512.run = "f33d9c983c7b79fb6d8f1a8e473afda6f2a4b23e133ab004f2fe4633e4f8fc3fe885034b409f90842c4a4cb81c86527edef445e1408a57d78aef1a006225e85c"; + sha512.doc = "7d0ce738ecdb79eb4c630a5bd51ebc47d92f6ace9b35ee60928520c51c96254ff1f554ff08d8d8addfdac2b28b3d7dc3f90afb73838abacb3f1d8af0fcdf37ec"; hasRunfiles = true; - version = "0.96"; + version = "0.99"; }; "pst-gantt" = { revision = 35832; @@ -27782,12 +28695,12 @@ tl: { # no indentation version = "0.22a"; }; "pst-geo" = { - revision = 46273; + revision = 60387; stripPrefix = 0; - sha512.run = "2b559409de635cd04e9b128bf44ef5f92ee765d4ccaf2132e3014d9a75ee61867de1724de2c36752bcc600014767f058c3799a5387aa4029268d5fa9dff4e0e9"; - sha512.doc = "762140a38d7f39875d2d4d25aff57187d32daf017d5be19f7fde14c482d9128c4b2e911f67446cd47a28cd655ebcffe485dc4b6326d41bf3b0693072647cac0e"; + sha512.run = "4e97b80679129df2cf52a8998e1b131b7ed5ebd21046219843af1ca81272a84c3a8fca72810622a7215385207eb541cd2bfac65b791920da61c233f969423c3b"; + sha512.doc = "7dde4c2584eb3c538a21fadfb9c49db02ad190b0778b64a4a51be7b777b4971302151a4f6ee7c5fb29f6c156c34a420b1734471f550d541bd2eb87877ab1543e"; hasRunfiles = true; - version = "0.06"; + version = "0.07"; }; "pst-geometrictools" = { revision = 45319; @@ -27797,13 +28710,6 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; -"pst-ghsb" = { - revision = 54074; - stripPrefix = 0; - sha512.run = "53f608d40c000f69ec0ac8d4b04799a581296765e8dd0a083a604aaba77eb456fd0f733435455bffc702e19d5083788b12d3bec3476a24f03fdffddd51f1b479"; - sha512.doc = "818108e58ff02cb7733ab00bc9d5112821dfe22b62836c3114154d6f4d26f4fb8e2c9baadfb3c4600cc32d667a174c1992f44260208cc295310326893f806174"; - hasRunfiles = true; -}; "pst-gr3d" = { revision = 15878; stripPrefix = 0; @@ -27829,6 +28735,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.02"; }; +"pst-hsb" = { + revision = 61322; + stripPrefix = 0; + sha512.run = "0deee202545f52b65b4fda752da7d43608118f33c9d3f520963b27229e9ec7b6d0161dc490b9ee6e356887b152f5ecb86640bc335d902070b1bda3744d9fb5db"; + sha512.doc = "924a7a4a1aff03e308d5c8342f9c370669c8dec48a75c782beb887f2a05123369d5365ea86e2d2274f3dd930160d7935356cd5e9b4a6f8793bc83007cf48f841"; + hasRunfiles = true; + version = "0.02"; +}; "pst-infixplot" = { revision = 15878; stripPrefix = 0; @@ -27929,20 +28843,20 @@ tl: { # no indentation version = "0.65"; }; "pst-mirror" = { - revision = 32997; + revision = 60506; stripPrefix = 0; - sha512.run = "edb6796eb96047fe09833056c409527df06d63dd69e9c2b600c1301b43b6e5c858d1061e9a138c89ab47657682f9ee67995a02abfab5251356e2eb8de68f5316"; - sha512.doc = "a9e22f2e00f67f12c69df3a6dd4377d25b8c130c4afa8c995c8961ba426f69f0c286460925c7c782a30b2a23ca5f2d4a46a5dbfaf72955952f561df2545c38b8"; + sha512.run = "316a6cd32fb2b8c59f554a49695ad097627e641982d1a6a8b1e5db12949c2cc84dd150a190834604d57ca10735779cb09983c28e7339e92f3cb82d642dc9b61b"; + sha512.doc = "f577868d1cf76a372a3c248f6dde28ed423beaa5e445a6a343d9b5e4c2ab9f737e4266c12702fcbf6dda91a6639624ff99b4cba29d65ebd4c7a0c3f3ce1323b3"; hasRunfiles = true; - version = "1.01"; + version = "1.02"; }; "pst-moire" = { - revision = 49223; + revision = 60411; stripPrefix = 0; - sha512.run = "7ae5693ca401b037482c4b8d7173a03b677ee1a8dc62ceccb710264b196a20240f310c26cbf9924dc2b4a9fa2869257843cfe4c87c26616a0f790ab444130a13"; - sha512.doc = "442f2477e9eaf122249b3a06fd2755afc9e701fe4333102274de3635eee398231d422b8077764465fa42041acc6289d00b4254505b591f055c6dddd41516d0e2"; + sha512.run = "60fb7e65170ec16f08f4109794afd657436fbb42a18feaff2997fdef20e18376810c3b34e0e341a5e577a6d08d6bf6314adfa51611d83a4e66245f112581d678"; + sha512.doc = "f24fb6a5a34a09f7b519f864c40d4bb4afd4b37f12280877fa9e6edae48a655c12bdf13eb7d13e9ce43ffa849a183c6a81b8040f61d90e9ec514b07352fced3c"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "pst-node" = { revision = 54687; @@ -28046,12 +28960,12 @@ tl: { # no indentation version = "0.01"; }; "pst-plot" = { - revision = 54080; + revision = 60620; stripPrefix = 0; - sha512.run = "7e784c8c50671da1b2efbc191a4afc91739718d9c117aa49740e869296a415287031c91c79f750eceb7f90b36f8a6bd5b37c87dad7d84b6776a014cfc6a4f88c"; - sha512.doc = "9f486e767bddf56647583d598dcac7b64c1ad390d94fea88a285d3aeaaa32d8151883b438c48e0d75b3ba41fef21b38cdc2fe7dd724978827b55dfc6d3bd54c0"; + sha512.run = "b389155d1bb56cee20cc035dcec1551974d9de57a7acde79b40d1342e621454e879e760d150f5e3d71e28d7f379442c32a828ce2f9b2a9813fafcef9476e4af3"; + sha512.doc = "b8033d9879f06a995bac06a1849e3349dd1e9c675279520c7e1c563cced38e58612b2a826de285d8abc2ecf1312faf17c2424d38a9cbce22431219da79245828"; hasRunfiles = true; - version = "1.92"; + version = "1.93"; }; "pst-poker" = { revision = 53482; @@ -28200,20 +29114,20 @@ tl: { # no indentation version = "1.0"; }; "pst-tools" = { - revision = 54518; + revision = 60621; stripPrefix = 0; - sha512.run = "b6f1432b44483470d2dc740aaafd254d0f7051e37e9b8675aa85fc50812b9f19fb8b021cb00da405734c25a3dc6b9645d25981c7b603e3a01016421c2d1b4140"; - sha512.doc = "57fe008fa8ab2f8ab0682d29a6e3b7c285a84c54eb7bef068fa2ba1aa363792f6a497a548cfa6ad171990e344215db7bc5a7d297bbfb17026b80601ecc977edb"; + sha512.run = "591dbff503faef5316eda8364a422d8810524775e6c6b59569d24928c8702c54463e4433a3c28953d2f36c873aa6a6e52c71dd9cdcce5bb0c362ab2231f5a165"; + sha512.doc = "f61816b6be166d85ae238cf5651e2e1960a5303b3bd3c643e4fdbcc779b5e59f49ffbe53bd6e2830b2bc28289baad3b089eb01ccbd7bee4eb9805728cda4309c"; hasRunfiles = true; - version = "0.10"; + version = "0.12"; }; "pst-tree" = { - revision = 43272; + revision = 60421; stripPrefix = 0; - sha512.run = "1148e0e571d68d8c95c0049313b244a6d6d77bf24a453121fd462a11e51d51aa21cd7eb66e9bb7c936fa90bc888912385814ce347cf911563206f520d2bb1850"; - sha512.doc = "d68059216626bbd3a33ec6bed2e6d2f0f78db2da3ae56cf947367608033a156126685bb0d162f95fbe7150c950c3d5d20de01fd0ab9b6bf77bcb2cba31bfebdd"; + sha512.run = "39d6f88d9b0dd4280cd08cad6524fa693cf727bdbacf16063d76e100e16f957602124ee71421e88f389a7ba5070a932d779a2abbb64d791bbc071398f09a8708"; + sha512.doc = "6ac862eff40eaa1a8cacc5c1a1d4886e82dee53046d3fbf631ec23bfb59490fe89bdde5f2767cba35e8d0439fa7b7688669b50ba3ce81698c34bcfc9d010a7e6"; hasRunfiles = true; - version = "1.13"; + version = "1.14"; }; "pst-turtle" = { revision = 52261; @@ -28243,12 +29157,12 @@ tl: { # no indentation version = "0.83"; }; "pst-vectorian" = { - revision = 28801; + revision = 60488; stripPrefix = 0; - sha512.run = "3ea49c1da6238c095dc2ee095b21dc95fca19c89b0ae473e73f9ea67ca9377cc8e696362f2cf859d87ad69350c7b94a1049823fc0b5329e36e8e31291cdcfef1"; - sha512.doc = "787b3b16dd0a73d96d16a8f32e26cc40f84706fd8abf48df23eb94a5dd9dedc0f9c9b7d8512894910ac96c8ec5e879a5f0d24f6f19e2d9f231ad66060e07565c"; + sha512.run = "e3898a6b489afe685bfc657760702bd5e2e44fce2ecf6e4af28c1a6eb36173fc653e003af7b7879fbd3a342adfb89b8cf47168b1f1868815fa44050495d15f54"; + sha512.doc = "6bdc368c391d12e6fb54740867631c7ba62b66a889e11dd40668dc7bcf5f9846e4414f84b706010505d3032b132735a9247e25193b952bd3272590d47d59172b"; hasRunfiles = true; - version = "0.4"; + version = "0.41"; }; "pst-vehicle" = { revision = 45320; @@ -28290,20 +29204,20 @@ tl: { # no indentation version = "1.5e"; }; "pstricks" = { - revision = 58731; + revision = 61084; stripPrefix = 0; - sha512.run = "9d7eddbede84ccb7cab9024f4ebeff688707f189012c3f71ed3a57963bacb13fb7aa6ad2af136d11b9e530ea4b1b74b9c06563954b81a1cd41c65f3a2c8e5fd4"; - sha512.doc = "f3decc60f9153b5eca7a71c72518cfa9501c5e970c0d2957dcd866296c883070aac3fc11016e74e6e703927bec7bf1135bd2a20d5a8a5d937ce7d95e8410fe13"; + sha512.run = "6aa799e9c28a11324c5a979059af293ba45c559e62d422d9f6928feb402fb85f927d2052bec1037e1a44502e5283cbd8b1f325da82a2a8246441297fbb6e8a87"; + sha512.doc = "89de2d39bb24b21accd0d4092bb830646b91b66ee053469b10dd18a69759b6e2f8c1812c04044d8717626c55b20a878dd108d27d8000f694d9de0935e116be43"; hasRunfiles = true; - version = "3.01a"; + version = "3.11a"; }; "pstricks-add" = { - revision = 53763; + revision = 61407; stripPrefix = 0; - sha512.run = "cf73863537b9058961d4592077dabfbd0e76ff0f07dbc7b17520945bad42286483da11ebbd44abe403845a9092cfa6415ad881ab19d323527f1b979b9e0163be"; - sha512.doc = "7a7639cd2dc128ddb203de7aeae23eb50adba49702b5270c6c432a159f185dab78bd0b6ce9925b6b803c200403fb662a9ded85197f79711d6880a1641cd53996"; + sha512.run = "85c329cfe915f85e3caa93296190041a0dc6078a1c7d7fdd3ded149ce1faa610780c962bda91ae6c0b0552ae131b0a679ab2b75334009cefd852c7dbf2957a75"; + sha512.doc = "62b7f8dc64a071e70c358f1547dc3bf07bc3b336e0a2085806cc9390e41c5a77710245db515dd71064c08df0755cd3553e69088e083abf14ac5693acc285f755"; hasRunfiles = true; - version = "3.89a"; + version = "3.92"; }; "pstricks_calcnotes" = { revision = 34363; @@ -28327,7 +29241,7 @@ tl: { # no indentation version = "p17"; }; "ptex" = { - revision = 57972; + revision = 59502; deps."cm" = tl."cm"; deps."etex" = tl."etex"; deps."hyphen-base" = tl."hyphen-base"; @@ -28336,23 +29250,23 @@ tl: { # no indentation deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; hasFormats = true; - sha512.run = "d59108f06a06b7ac46195ef05c0ba6fb4873a88d327839a6143e94392faf3df73ae7b128548ae1ab69915f9883bad554f0e2dbd8d36b8f8c959897210895fba0"; - sha512.doc = "4f863d89fca4c137a84fe75365f600da96f3901d29dd98e9d5733523648b746861a22284707c6e9df90a9939c83adc7bcdf21b310785b8d403459d65294d1133"; + sha512.run = "4183d235d990089401faa180297940df927621d5c0846d7e4e1e04a8c82257d75f0dd868590e724568fec92fba09ba1c9a0550673dd24c5484de562e8079d8b6"; + sha512.doc = "d05bd8a2379392db485e6d544584513983d4fd598e49848df2daef8b76f3ecfde23445184ba902cdb311fa3bde648c66629a9bcea2b65f10d85e5985052e9bbd"; }; "ptex-base" = { - revision = 56487; + revision = 59406; stripPrefix = 0; - sha512.run = "37809d10840c61c7b5c17be0174708b3c66d7fb0b48c58f46aabcaa2e44abf30abc3aa437131ba1148f11bdee3e2fec1b8ab0787310e8924acc7d90cb33c0d84"; - sha512.doc = "98844a87ac2a83d55c04bca34a53e1cc5c222ac5d359d3c24648a8c849443c5c8829bb0d911d54de76fefcd2d0c4d537feff5effe7591657de629b2ab24e5c2b"; + sha512.run = "d968a0515ea4fe0948734f610212a7dfc2d5eb97d7ca96faa7de4350354b5d4584b9032129a6b4815c2c65c79694703342acb86455114a49dbfa0d6c765c7557"; + sha512.doc = "ba2ae608c1aefb62e34710ab7251528f54569b978477a90875329de5cac2ec85271b2593803a28e6ff65e6519d75d69260e87e642ea84c36f6d48e68f968fb28"; hasRunfiles = true; }; "ptex-fontmaps" = { - revision = 57239; - sha512.run = "168de4ff3435d1148bb718b15953dfa79172c6829e95824d998d9fff193c27f7677ae014ba54c507840b9b630dea12168f9a70d30a4cead922a461a52e63d8ab"; - sha512.doc = "42e7f0eeab1000b2c49d714c40405e008cc7b08648bdac1bac8f5459bc64eb3fd6fb526fabbbc2c7774a1b12abd37396e389e7c90351eba92a5aeef53ac3e558"; - sha512.source = "f7875a39315715c60069521903a103e5ab12ec52970ee00f3b95a498075d39e68d6f5b12373b4b31f6681a31561d740b584a65ba566d1db5ffadefdb620cf1da"; + revision = 59711; + sha512.run = "16afa97812d830b2b98f657f67ef690da420afe63ccf6f002131101f3ce9a03ff6e5170db1b316e9db521e4cdf89c7aedf26c57be162bf1c5b48fa4226e5e029"; + sha512.doc = "affd6dde30276fa680a0d99d0a51650ee95260535dff717801d61ccb8165c5526047e46ad6478367a439e9a84721500128062b8cb6a1f33a25a65fadae4547f1"; + sha512.source = "eb450119b3897f9e8374d29a3a9512819a05263d5829c81d56dc00dd35995133d1a3cfcadc59ce2aea52ac8b5bc195d27446f159356e63b433e235d1098e93b5"; hasRunfiles = true; - version = "20201227.0"; + version = "20210625.0"; }; "ptex-fonts" = { revision = 46940; @@ -28362,10 +29276,10 @@ tl: { # no indentation hasRunfiles = true; }; "ptex-manual" = { - revision = 57128; + revision = 60158; stripPrefix = 0; - sha512.run = "ea2bc5648ea4dfee37b9df34ed786ff2fd400644defa7b2623435d4e448161b8bf45f07d5d2caf18bf280008d5e4253a4ad2f62dc88375500b635bab1c201491"; - sha512.doc = "162b7d40353fc0c892b257170cb5a335930936c776ff4b5bb91fa41d27a859d43bcedaa053aa5c2ca7d732993212c470670e1abfa4b1149c0867cdcb4b68011f"; + sha512.run = "47c365cd1e802afb5a456a890e5045d30098908310aa3dc15c997e63ab5fcfc34f642604200318e5a6b6c27c4bda6ded2e615fdc044bcbd15e9455db2b87a4fa"; + sha512.doc = "24c183cd00423def3871ba2f18eb5b7de418e5c3110b593c9739e98addb9791418d30165fa9a85b2f67ee66650832487265e40a857f9cacb80996c13aa0932de"; }; "ptex2pdf" = { revision = 58632; @@ -28438,28 +29352,28 @@ tl: { # no indentation version = "1.0.1"; }; "pwebmac" = { - revision = 58478; + revision = 60979; stripPrefix = 0; - sha512.run = "5b8b6825d84e6addce3491bdaaf30a6127d0becd26956066dbb2dc482d4942087b9423affe02654f28d5f7b1bd0e7743fd731ac2201b394630bf089deae8de59"; - sha512.doc = "6078a4a0263f3c342c9814f3ac8d5028f6d73871e89c64859e86a7c694a5a6392873e592f5daba7c6c2b89c3eaf6bdf1a745618999bf448edc8007d3d5a541a9"; + sha512.run = "0d0c14f1e623aac1258894a06f9e92eee51c209afe9e230f4e3b9cb69049221b9f3955504127386ff4ec03ed458556250a0a9b03ec0edb59c157c32a42fac094"; + sha512.doc = "c4f73e463dc63c556d02462a63de51beb1b4128b19eb3e98ed6fa006fbe7bd1460ee95097d5359b67916f69145b1480f797bc2740bd7e4280498dc25f0b65af8"; hasRunfiles = true; - version = "4.6.2"; + version = "4.6.4"; }; "pxbase" = { - revision = 44756; + revision = 59473; stripPrefix = 0; - sha512.run = "e567378515039b55eab0a12ca645ba5ff17c2dbaf56309c3273beb0d05c7e6e2dcf3d7d22091907df5636451df8e91d09673607918dd9ac091908cb6ef1e4de1"; - sha512.doc = "d6d87123dce0a2afe3380cf32fffc8954e30d22e9822d0ff89500bea6a455c70a6699576265cebad29ba33c0fa5e7b63a40f26f7579d1fe9dc0cbcb528c45d00"; + sha512.run = "a75c8932fc56c11e4afeaf30c91ad6c67622df8eb93b0700257472c22a7de6ee7732be8a67d1d53f1e21138bfecc64cbc6e8d8800c08ee1c5cbeb7bab637df4d"; + sha512.doc = "4421d659294e02b2d0268a4b0d56b037c321c69abc856bb00917b61b79bf78462fb4a5c9c8616d773e7267137de0f6af88cef02dcb661259c7ed7247317f7aab"; hasRunfiles = true; - version = "1.1b"; + version = "1.3"; }; "pxchfon" = { - revision = 56537; + revision = 59449; stripPrefix = 0; - sha512.run = "0883ab31076052a9f970e8a2704d6fe69e4cc4d98e5e58528b48393c4878177cc206baa454539a6f228252c82199a409333ba9dc250b6c79d429e00f8da26cc1"; - sha512.doc = "4bfdcbf0eec187e6726978dfc55dab1217f00a06063d43fdcd6ba640739bedc72fcaa9f5d51f9471173f6d55085076155e7dd2f549739fd15cccf74bb03206f8"; + sha512.run = "816c45ea035ceca853795857e93cf064d94ac0937ad9774b3bf2316f6e6e15e58df64814116a0fca5a1aea3a986e31982f80d365a53447fa86e1e771a4ffa429"; + sha512.doc = "72e778b111639ef592d23d5f6c19f109654f26d81794e9af685dff38bd77056e29ace46d2b5e6dd5efc54efc91fd88e43ff2d9b1c28bf075d008994f8480f116"; hasRunfiles = true; - version = "1.7e"; + version = "1.9"; }; "pxcjkcat" = { revision = 47266; @@ -28486,12 +29400,12 @@ tl: { # no indentation version = "1.0"; }; "pxjahyper" = { - revision = 57950; + revision = 59508; stripPrefix = 0; - sha512.run = "42b0383d98741bf3cbce1267b4ab4e32d48039b7497e87587f3adefc2da5e7316587e5b138758f0a6816f49588aa774bc4754f9509f7211d7ee3497c8f178324"; - sha512.doc = "00d954e31c1ad90f2953f9565d24112a8b108ed1d2ed43304813b36c6c3c0c05c10d44d02dd514f4cac055ae45889db8ae91187ace305870eee8266aa48c28d1"; + sha512.run = "320e75cfa1b821e1e4cd61db12b907025add9e5124256959af1c1c101c626b3566e56425b9d65efa22c2db299ce69ad282451a93fcae203a17afb83a6faeae3c"; + sha512.doc = "d7d683d7b9763c5e1a21c1208034610f4da6410dab0eaf4254bf7ba19bda5cd25756bec630e4374a29b9cf755163583ec1e2c36dbd8b5b4e1fe04af912c7b384"; hasRunfiles = true; - version = "0.7b"; + version = "0.9c"; }; "pxjodel" = { revision = 55006; @@ -28510,13 +29424,13 @@ tl: { # no indentation version = "0.2"; }; "pxpic" = { - revision = 57445; + revision = 61294; stripPrefix = 0; - sha512.run = "f187fe6370e817ba7d3b6d7c0899bceaf898685d2ed2e1707ee18e0623d95489dbcfeacd1482ec540307ce5095f903e1499b4c01fb1634071f3edac626551c1e"; - sha512.doc = "1ca68d3e7752fb37482c32cebaae0753c31284e593d3e161a46bab54d98ae564857ea80553e3937e3b7710036e722acc3eddc23fda4941079e050f20bf0ff5e1"; - sha512.source = "a9fbf50b12145c2169de1733862dbbec0870c0863caf3544117b8c87bb0dbe4d637ad8b8507102ce83b1f4fe2e6c03a704d289c8c7e15e74b8859b6988240a3f"; + sha512.run = "efd2fcb2d28a3fbf3a10cbc4034c50fb35189d8896c13caef8b82ff8d62206d663de02d552116f692d3bf9c399e87f53580acb30ff0fad708c45ce3af5d48727"; + sha512.doc = "b54caafece80a6e233e5f19fed0896e0c29b2ad8ac03d712431cac90ef3b159eac148aea6b36dbf55bb771b89c5eb4595130e4805809e1f399e4ba4aedfd34dd"; + sha512.source = "ee66f6f447671ec4fdad29648e16409885b046a6824f85cd6d01009281566c3083318e528ed8c8bb965659bb66d9d842463f5b2958e3c62e96d78155e24d617c"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "pxrubrica" = { revision = 58168; @@ -28536,12 +29450,12 @@ tl: { # no indentation version = "0.4"; }; "pxtxalfa" = { - revision = 54080; + revision = 60847; stripPrefix = 0; - sha512.run = "6d03f8d9be9d07643de2ef1f35fe30981861d6c230793912b3d093334260e53b3bae9ff178e97442425e527d1dbd0eac366fad16b0276d44378511ddd97eff52"; - sha512.doc = "0ed329847a91c8164883b873fc7a98cdb1571cc733d9d71ddd9bbe52b591a71b03cf0d6bfe83d63e41f6524e01f38a91c67d370c661e02816622dd56eacfd462"; + sha512.run = "33dfd01f714a662f351fbd3a0e0f36c413360adac666ca5665c628bf5d3acf732cb61e18190d340d144e146fa04116373259403b9eca314f48dba5ea4e6aa032"; + sha512.doc = "f547cbd3cc4a0e09034e98a27bfedf41e2e2ab9b6561e441d7656b99b6b883bb51f9fa24d731d403133358917428c53489eacf8c7ede08a963ff06c3d0404c1a"; hasRunfiles = true; - version = "1"; + version = "2"; }; "pxufont" = { revision = 53733; @@ -28558,13 +29472,21 @@ tl: { # no indentation hasRunfiles = true; version = "0.10"; }; -"python" = { - revision = 27064; +"pyluatex" = { + revision = 60977; stripPrefix = 0; - sha512.run = "85c300c969fccdff036e2da59ada1040bee6f25c6a8ec3c173ce44084fb9fd812aab79b8fdc0b9fbe2ffbf9485abca57fc5d82caf4ac5a3ff922501b46dec164"; - sha512.doc = "8f88b9bc84a71c430486e2e3d2b33a4436cb1ac1257b9ea5629708438b8ac7488839d52fc138e4959575fe13388aa475770a62ca070b4746de8b78c53d5119a1"; + sha512.run = "4fa1b2f21c620bbe8a0ffaf8d3637fa4e722b72a0263dc9d265f7e7f609d295681abe4676bf620de790a23084ddbd997139a0ebe049c4e2b72237e8fa10a09a9"; + sha512.doc = "f4a371a9fec20b21e5e7d0e07684cd01b375cb65106a40ad1646ce1800eec3fcc29e0c21b4f4fc13d77ab2d62aa00ee2a9bd12bfed04fb9ee6fe0a3e1a0b54fd"; hasRunfiles = true; - version = "0.21"; + version = "0.4.0"; +}; +"python" = { + revision = 60162; + stripPrefix = 0; + sha512.run = "3b2b55d1c8da0c253711ea5d6434ffe3537baf273d8a6798a5455b3170601aec0dfbb418969bd9d79f47ec502a73fa5bcbb3b74bbdd77d242859c0f7496bf8d0"; + sha512.doc = "c6785b22dc6820a84a9edc573e308a79991b4a67ff1c5b17553c05a75155ea9b981380098335162a6a7c3c25d2dc20665e35b9cf74317b5c865bc6d4fbed7a8b"; + hasRunfiles = true; + version = "0.22"; }; "pythonhighlight" = { revision = 43191; @@ -28574,12 +29496,12 @@ tl: { # no indentation hasRunfiles = true; }; "pythontex" = { - revision = 52174; - sha512.run = "27a3196f89ae04eb992817800f30dd26b275b65a2f9272907a2cc6a66708ee00290c3e0083bb537f0ee0152c93aee50728ea1ddab672aa08dfcef5f089bcf2b9"; - sha512.doc = "cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4"; - sha512.source = "9acadbf5a18d56d24bd1300ff4b713325c43f163d2ac27e190461fbb74bbe023e31b2a3cb0bf3c6ead42c1275bfcbcbc8cc87914f623537e05773e9e641b7b03"; + revision = 59514; + sha512.run = "2e67beb9974eb9a567726d8a68f7d565aeca97d20484ef6e36312100411eef9d9de937297399a98f367a756f6679314cc1a25201ff11936b8a61f8f1f148830b"; + sha512.doc = "3ec2fe0f095384734575c2c9fd1bc9d485b628485c8ee75cd8fb9ebd6d1f56edbec6f378c7c9e1d5ba9c10c4bbcc3934ddb957dc47a258ac81ca89b5ce3a2e92"; + sha512.source = "8a3cf562716df588d4ada0273c3340b73e16a01524e02a9c83c4ca781b8dd1763a1deb9e303635878721831e0d57b780c0666b694629106650f639061d2f32f4"; hasRunfiles = true; - version = "0.17"; + version = "0.18"; }; "qcircuit" = { revision = 48400; @@ -28613,13 +29535,13 @@ tl: { # no indentation hasRunfiles = true; }; "qrbill" = { - revision = 56190; + revision = 59232; stripPrefix = 0; - sha512.run = "a0b85af4d872348264b7a8ac673bbfc3f4e0a7c36fa7edfa2fba78ee144bdce908adff6d3c363182693bd4ad8a75c0cca978ecd52c1442656ec1cc72f1506f0c"; - sha512.doc = "9aeafdc2506e7a885dbd1f54bc827f72c86b994bc766ef570ad82b16e960f54547bb6f970772dcd58b75304ae33c00d0d339a969c902fc75b8431037af9dd9b9"; - sha512.source = "9849b7e74ce53c526b8d28122852ec9c5ceb9873c1f57d067aaa8bfe09f09a6d996a45695a6e564bf395275b0b0e3de039651669e2c287cca1095cc628bd27ea"; + sha512.run = "d48352eb7f3d52b9cb567eb8cf4aaac8543d6cbb300b01c9b27c7eb50aedd1ef7c2ae31f0145c0b9b395edce1cce5c7012b97d705e26dc58f9dfd0c932a1caed"; + sha512.doc = "87b9238e3c1652c551464653149ac36de2c4ac39932d7c39d49a16c57fd2c7cef6950ef97072163f2e6ae019a3b093ddcbecae4fa33ecf9539f30d9cec09ddfd"; + sha512.source = "5ed0929c0e31673099f8733bc3cfe29f9eb8e56ee814436dda804047f12b997e507b10a6fac844b11ab10421417db0b3a0603f7f60446f3be56fd6564f831cf8"; hasRunfiles = true; - version = "1.02"; + version = "1.03"; }; "qrcode" = { revision = 36065; @@ -28785,13 +29707,13 @@ tl: { # no indentation version = "1.3i"; }; "ragged2e" = { - revision = 57638; + revision = 61313; stripPrefix = 0; - sha512.run = "716cc6067273735be2f4c9922b043441076d37f7d08fac0603564c9cb8f082f5dd91bceb336ecb3ad69e6d9a88367067c71fd08678c1ff606c21109daa66a140"; - sha512.doc = "ecc36350f01e86f63ca54a2ae5ca1ccd17851756731af3997d9b172753673f39c05e82d9b3f736896b2be1c971bdd0c700678a6d44aec2226a7f57bcdc085e51"; - sha512.source = "2a9a755a3f3978c3e9077e3c36eb642e18895e3bd5fce44af71d2fb094f1a46c3e61cce21940eba5b6d7a3d51aadf6229fd9e0941610e9bc42dfdeb67ee49514"; + sha512.run = "cc443dbb4280310eed2e4cab7a5801df47db4d5f920c19d74cddd6de35d9206cbcd1afe2fe42812c423f6c1ac45f9d220f0b265af79a2c3c853a58f90b4b63e8"; + sha512.doc = "0b0c412d7ba7d55e7bf2d64c98c2d4da50faae7a6bbc4e2d53b144ca7ebd91e5cde7d21a948b427184b773ac7f9fd3b32f7c8b6700f353ab80130de46c1b0306"; + sha512.source = "fc316bd0aa7bfd137079ddbcd0cbb0bc9392a85b885ce7568be364364ae63ea6f0a6e84f8547ef8e7e9e067e06820de68374667dd83a07f6cb3dab95f174136a"; hasRunfiles = true; - version = "3.0"; + version = "3.1"; }; "raleway" = { revision = 42629; @@ -28802,11 +29724,11 @@ tl: { # no indentation version = "1.4"; }; "ran_toks" = { - revision = 57520; + revision = 59515; stripPrefix = 0; - sha512.run = "01bb17e3c2713e482670d3229878ba85bae5405476708b18367f0bfa85766b72b82471a8ff47993f88ef2bea72b1dc4019ed874185c94fab3171fe02f984c4c9"; - sha512.doc = "607924d3e8f09070318a5ef2354acd12fd0c57b3e7d42f45b84048f2cd0693b72811abe0485dfc45aab224c500fa4731111ae66c3e3aa25eaf27e1976b63d938"; - sha512.source = "5aba0e7472f214e367dab1a664f61fddc4b2a4b3eeb5737f2b476d6a196f33ccc4d28a6d3ab00f85c41291b27ef0699f362460fb6a0fe60dd28db67138b9560b"; + sha512.run = "25b78e30d7e6a2f082a7740fcdb968cd4032e6fd612bafdbeb58613f45882e788809457d0fcf29af76d3eb82c57d8772960ad84f9ed5940fe670f8662853364d"; + sha512.doc = "7e837aba73d0d578494845f038f7616a64eaeecde059655c8ce3ed5a5bc2c5910086c955b6a16a42abd09dbbafb71409387959eaf2378618532d2e494bba42d2"; + sha512.source = "ad77e0842ddd144f49b26a548846f2058611336f51d7540e96ad63258ee46c2f0a139b6945c0fea1f26fbf61b5e1d21ec45f87a9f68009d87ea6b9b5634a2895"; hasRunfiles = true; }; "randbild" = { @@ -28859,6 +29781,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"rbt-mathnotes" = { + revision = 61193; + stripPrefix = 0; + sha512.run = "15e5b0c52a70b406cb6de6ff55740206dafb75c8cc20dd45820059dcdb112c03ea0df0884b6caa12db0f792b97e0507f90d06644a8f78cd7569f9489a896b3cc"; + sha512.doc = "effd703a23c4eee3ecb385cf8ca891c50e373fdb91834f45f7ba414d6e69b5fbef8a1833db4cf76e27dc316b734b714926078e4d92de08122dc79948ba928f77"; + hasRunfiles = true; + version = "1.0.2"; +}; "rccol" = { revision = 15878; stripPrefix = 0; @@ -28903,12 +29833,12 @@ tl: { # no indentation version = "3.0"; }; "readarray" = { - revision = 42467; + revision = 60540; stripPrefix = 0; - sha512.run = "34a1a576a560ec5a66fd8b358e9f594e1971124023e9f88e67e5dbf7ff775e3950071c5f4daa004f8e59549f245934e4dd8a82e4a2928bcb1e9fff99f2b3bdd9"; - sha512.doc = "61bf2960c1a0058a5a64a679b4c17ac0e754f09f2ca1847fcee4cb0b0b9a0dd07e252a534768fcf3b098217afc4c52a8f65120dcf43e69f0907fff9b8638af99"; + sha512.run = "615f0be7efb7cd6954d36ad1dafc9f0f0a1632159247e7d6feb064e272c5753b26c5e07af709240a6e5f8bd7ceb7ca2c2c29842a5bd6e9e9efae2470f7a94107"; + sha512.doc = "d9f87dc14d40c33b06591b611e8a79df95fc62c32d16f72cff96222e7fe48f4c09c95bb0b02a6acddc8b4630158ed61c9375dd370c2f2d21ec8a9328f63fff47"; hasRunfiles = true; - version = "2.0"; + version = "3.1"; }; "realboxes" = { revision = 56291; @@ -29081,13 +30011,13 @@ tl: { # no indentation version = "1.0h"; }; "reledmac" = { - revision = 58763; + revision = 60935; stripPrefix = 0; - sha512.run = "9e735a11d0538d2590ef9f4daa93df54fa40678e668129b79aad193c65374895f4a11a519b714c7c3d65174af054853bc777fb4d5bdf41ef456c7896028b0d0b"; - sha512.doc = "7c4d169751893332c65cfcd25b4f9bdc902ddd5581d9df9787149762cdb623e63c580f959bb40c03c5d18c1356d461b94ea13255faf0fc75f49ee35fd6e68acb"; - sha512.source = "ec3823d10f63ce6bac7090acfbb8f1965704fddb1a8164b435f355090490ecb69beab7af79bac9f30abcb21276120e6cc86f05057a30c5884baecb8f421b0035"; + sha512.run = "d1984388cabbb16e9637c3de854ab63485740eeafd5c59a6e72e68a0a15590b193e3d1b86693fd27cd3df86a4806e30aab924b4691f349d2e0251375242d336f"; + sha512.doc = "d4547703161915730ac6930c98c15a8604c6b1601583203b99f1e917cf68193e60db43f5ab7734871df6e39cd90bd00dea190d6fb98e36c8c65e70fd2f2ecf07"; + sha512.source = "ae8956dc707fcfe8b3f66f628c192b12f48ac1f86ae0d33b578b2f546d0fea66cb2ea6776cbb20f2b6602771b7b16f90443c314c3108e07928fef05668db998d"; hasRunfiles = true; - version = "2.37.2"; + version = "2.38.2"; }; "relenc" = { revision = 22050; @@ -29122,12 +30052,12 @@ tl: { # no indentation version = "0.01"; }; "repere" = { - revision = 51363; + revision = 60946; stripPrefix = 0; - sha512.run = "4bcfbea44ee34209ce95d6a64de3973eed864ac0e2453ab0afd8e1e05faa2d97fd8d90e90f4d2e1c8f1eb337321cba8c10b03975e1cd75aa32ec5c7373d54316"; - sha512.doc = "8a68f168573fa33ea635578aeeeb51060c3eae9f09ddd7dae1d49aca6de2a8eab7c857336eee1c17e2d4e1a7bb5f2440cd1901bf9aa61961966f727827cab38f"; + sha512.run = "f4c1f496375a1323b1682857d0947fed11c8c4032ea9c0cc3fd98b05f4c055f261b3e577bf880814a7407c5b6cbadb461dc1ce96faac41818816acbda8403ec3"; + sha512.doc = "cc1f0b3269f6284b17a24a3c18ba301bb3aecd07d020f763f309a6140e9ddc7e6fcba9710fc05f4626e1512994b83b1843bfa8fdceee19c8aabaeaeda8d8d3e0"; hasRunfiles = true; - version = "19.06"; + version = "21.11"; }; "repltext" = { revision = 56433; @@ -29192,10 +30122,11 @@ tl: { # no indentation version = "0.2"; }; "reverxii" = { - revision = 24976; + revision = 60973; stripPrefix = 0; - sha512.run = "fa6efb9655cda15356163a93ca89f2b6a114ea5bdc151774bc99910fabd3306781319f92a5b5728f29df136c73f994f49011e31ea9c1c01b4ef2fed10af10a93"; - sha512.doc = "ff6b03b426de5508eb31fa5b2fe615fd5b7f0a6721e949bb48e1954c28cb547faa079461c0b1f885163bcba40c7f7d2a3fdc7dfb3946c08c308f5c37d33605a2"; + sha512.run = "e503c6a2944ed4a0c6857618a1824c1358beb8d2c1a051f218d9873d6a1fd2e752080c01406a7551e351bab6c457cfc74843d5385e186caf7a084b32db0ca816"; + sha512.doc = "689f259353a1c3fec6417dec8a4c7fd8dc2bb02cf8a037e7d083e333d25f2db3eae4f834d27d8a1302d57ed88b665f04c0f52d3d39e81a1cfc7e797575245878"; + sha512.source = "79595ee0fab3c30931f3fa8b1ac86170adf0218a16a89859955382151e2a67a05985541660d77df1f9b9feb01e54d23970206298b6924974d72738c278e22eff"; }; "revquantum" = { revision = 43505; @@ -29433,12 +30364,12 @@ tl: { # no indentation hasRunfiles = true; }; "rsfso" = { - revision = 37965; + revision = 60849; stripPrefix = 0; - sha512.run = "ce6e600f2fd5ce1aba31092c43401feeadc7927d22ab630f0fb28f421bdea858fb9e382f4d0e36036f6f4ecbd1232265216c29b2edcd44583df6fb3340ce468d"; - sha512.doc = "ff045c68d70079df6d2b21368fe599beb9ac1ba0e339a8c448bd75565774c237520f79fd0e3d119209765eef29f5891dabf689c7756791a91bb7c7ea1d3dcf3e"; + sha512.run = "7632b0cafcb0d28f5f4b742f8c457634a9cd1ec7fd59e61e01fd5f3da3964ae941fdf2fbaba94b0d0934270ba56a2224352e11075970e28bcf16bd9b6f97f236"; + sha512.doc = "ccb3ce73add1f2a4f269728b8189569637327d85cd1a4d29a03904872cff10ce3057bd01a9d74a94373c3aaa52afe74a98d07bcad248fd18943efb0bace6db36"; hasRunfiles = true; - version = "1.02"; + version = "1.03"; }; "rterface" = { revision = 30084; @@ -29504,12 +30435,12 @@ tl: { # no indentation version = "1"; }; "runcode" = { - revision = 56594; + revision = 58908; stripPrefix = 0; - sha512.run = "f7f9aa70a4a7201841eeb20e173c8f550ede9716d4608c5c2e762c03945fa8b279da9b2081ca1fa1a15ae19a75860507a51c78bcb13cef48d2ff37a1d9d169da"; - sha512.doc = "eb9d3cb287e94da44d921c471e429d3ab0e70e74df2a7f7b19fe4efe514641d58f8fe5a74facbcccfd6b4c45ab2af95121912980d61e57e3ef6a3ddabc861359"; + sha512.run = "d3ea947106e824d697e15f82466a36e36215a6a3b5c954cfd6250cb3a896e2de2ba6163cf9be5510bf4250a57809d27ae8c06915d9f601057608e7d57e08ea1e"; + sha512.doc = "48e8847f7a50e14c809b08244cb9851c25a367799aa3ad673472a8e1b66aad2e4dc0ceaedc56fe2fb106c610f4fc825c10b05665a385ef7347bdc87a85338a0d"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "russ" = { revision = 25209; @@ -29627,10 +30558,10 @@ tl: { # no indentation hasRunfiles = true; }; "sansmathfonts" = { - revision = 51356; + revision = 59673; stripPrefix = 0; - sha512.run = "71d70b034c7e0da6f8e1876c40ce2821e05cc814e5d8e1194f5a76c4b490d8d191bf6b3c9bb7fe880d0273ec8e1f3211bd335b526b154116d7ccdcdf0b61d0d5"; - sha512.doc = "e61cc601588681dc29113391426cb345c207eefb04562ea6eb8369cdb8ec4844b0bab586ed91bb2a1506c49c5a60661748de95cf792b07fd52ba23cbe58d254d"; + sha512.run = "d94d362ac6bac44177f61d73baeb4eebff6bd1309fedf0d152b422e1b5f2bd2014c4b95876cce75033d6f6a7835c277b6e1cff2beabdd510be3e32ac7501f393"; + sha512.doc = "0aa7efe2afcf020bcb15e185fc402e6a8c65cb7c8b563217cede4ca23f58a5ce4bc3028cdc140a4d9354b62830471d8a8e49f23c8c6e48c161fe859fc60306bb"; hasRunfiles = true; }; "sapthesis" = { @@ -29765,10 +30696,10 @@ tl: { # no indentation sha512.run = "027a1cd0dd4fc5da2427864bb49fc885a00bec6e8a74da24ce9cd781c69bf4288ddfc3c790307ed48052a8fc00c1989d3939b253da6638370adbb1c43348749b"; }; "scheme-context" = { - revision = 54074; + revision = 59636; stripPrefix = 0; - deps."Asana-Math" = tl."Asana-Math"; deps."antt" = tl."antt"; + deps."asana-math" = tl."asana-math"; deps."ccicons" = tl."ccicons"; deps."collection-context" = tl."collection-context"; deps."collection-metapost" = tl."collection-metapost"; @@ -29788,7 +30719,7 @@ tl: { # no indentation deps."txfonts" = tl."txfonts"; deps."wasy" = tl."wasy"; deps."xits" = tl."xits"; - sha512.run = "2bc94138102c5c4926b4199e09afc0ae66ed32de5030ac9f64290b8b98ce1c39a2197cbc3361d4eb56614552af21c0a67ef9f3dd0af0767f4e1f91d6023e5206"; + sha512.run = "0b041f3c27ef88e7baec105b7cb24fa65c4b1f092f155482d584d9041ced4f329251f0b0d32f7019c15fff3c57b4d17f057cf39781f8be16a4e8c0ce4838163e"; }; "scheme-full" = { revision = 54074; @@ -29836,9 +30767,8 @@ tl: { # no indentation sha512.run = "bda507842fde5239d7f45169ff78690bd96066d1834cdcc6a0dcbd3e3439308c694ce4be6a91d1f155ebe5e29d46173fe13c83bcd4356969da95fb7cca1b4e38"; }; "scheme-gust" = { - revision = 54074; + revision = 59755; stripPrefix = 0; - deps."Type1fonts" = tl."Type1fonts"; deps."amslatex-primer" = tl."amslatex-primer"; deps."amstex" = tl."amstex"; deps."antt" = tl."antt"; @@ -29860,6 +30790,7 @@ tl: { # no indentation deps."cyklop" = tl."cyklop"; deps."dvidvi" = tl."dvidvi"; deps."dviljk" = tl."dviljk"; + deps."fontinstallationguide" = tl."fontinstallationguide"; deps."gustprog" = tl."gustprog"; deps."impatient" = tl."impatient"; deps."iwona" = tl."iwona"; @@ -29871,7 +30802,7 @@ tl: { # no indentation deps."tds" = tl."tds"; deps."tex4ht" = tl."tex4ht"; deps."texdoc" = tl."texdoc"; - sha512.run = "57928b06ade27a28ae171e90cbd60c315393adb38cfac93f61f4950cc344340f0837bad65a04b2a3bef08e9c5773509caa1302eb8c299e1327fd3a418e5f0a36"; + sha512.run = "2b3e2e3d31c8fca7297729e910ada06a0d0282b618c92487b7a0da686938dc1f6f3b0881c7d1f8f3d002806ad8860c25802637c77919e21ca54ae8a23ef08ae7"; }; "scheme-infraonly" = { revision = 54191; @@ -29968,9 +30899,8 @@ tl: { # no indentation sha512.run = "6267151dd73cb8b751ad47b79f9c698b465ad5ae5494d462cf5b3b4e7446a3c014a715381bc6a79eaacfd1ba6efb37c6c1bafbd5e1f82e8db751bbaa9a943013"; }; "scheme-tetex" = { - revision = 54074; + revision = 59715; stripPrefix = 0; - deps."SIunits" = tl."SIunits"; deps."acronym" = tl."acronym"; deps."amslatex-primer" = tl."amslatex-primer"; deps."bbm" = tl."bbm"; @@ -30022,6 +30952,7 @@ tl: { # no indentation deps."pst-pdf" = tl."pst-pdf"; deps."rsfs" = tl."rsfs"; deps."seetexk" = tl."seetexk"; + deps."siunits" = tl."siunits"; deps."subfigure" = tl."subfigure"; deps."supertabular" = tl."supertabular"; deps."tamethebeast" = tl."tamethebeast"; @@ -30030,7 +30961,7 @@ tl: { # no indentation deps."tie" = tl."tie"; deps."web" = tl."web"; deps."xpdfopen" = tl."xpdfopen"; - sha512.run = "44bc102582ef5f6e0499efde6d3190b86988def41aa062a6239075b9371f6c9deef91e4f2bb299b3cc831dbcee9289fafd4c1c6d2a55a747d340fb580ae918e3"; + sha512.run = "fe8b53391733392a72be2e2c80892ec68fbdb749c70636c307825c8bfd6284945c9961610fd19f8b5d6b03ec50f0a1543c7d159f5f2a19534d71b221addfb708"; }; "scholax" = { revision = 58733; @@ -30041,37 +30972,37 @@ tl: { # no indentation version = "1.030"; }; "schooldocs" = { - revision = 55838; + revision = 60560; stripPrefix = 0; - sha512.run = "baaa044e2e70c65c91acbb5a2d1add045f24be9361bc4b1c4761a09974b070223144ed9b41a9e5c41cb1846a271cc3338b1f44ec7b8af35cd82e7cb7ee490236"; - sha512.doc = "6860607cbaa4205b41d0e4145c3579f6a40ba27a4047c1c614a2134fa2c34aae16fd4b56dce0720813f62ac7473711a32a2ff74d7cd5288694810942d99f9ca8"; - sha512.source = "078875026c92538b9086945c6b3b4d3a8121e834b81156baba3d454f3f6bf199b484718c3da7dcca3da837bc345ca80ea311448680720a87150c40f2f629062d"; + sha512.run = "295228025ce4884ae987ecf329d957ad220306c7bb44369e40c6d42a2564b78194a3cf32571f4f188e9557f9db7281bcaf1ade341b39e3eee300e58fbc278213"; + sha512.doc = "f62105d0f0c130d718db6b91fc3768d81e97b6ee24af4ac1eee00cd4e5d3ea605f2168883340e5662b18b2791fc3aadf405f8287a0562e9e13a254776878448e"; + sha512.source = "c7717a15ac1170275cf2dda3905f0f6cc504e8b3eaeb6a41ae58c32e2a8d22fb752aaad588526914bfc28905bc4d2af77fdffb3df6881467415c78131d34c60f"; hasRunfiles = true; version = "1.0"; }; "schule" = { - revision = 56683; + revision = 60210; stripPrefix = 0; - sha512.run = "7125beaddb825fca0c9ff686ab97fbe7cb3744b74bde693107e26fc2797ac9bd29146683174ac6d7703370cf7f5f09809165b2f371c56a8b27ae0de8980ab467"; - sha512.doc = "11aa5b1eb25301e61f2438f4607cfba35721dcbb0904ce3fdb923f69f71b1f1e1ebc3a50706b09e306e2b9197194a3c6ebb12a1fa7dc27b94686df11be3501c2"; + sha512.run = "01d62151d01b00dedaf63af9a2adcb91f293372064c43cdc0353f207923f471a45958f60cc9c16bdbaf4b78bad65f4ebfa7b8e2b851f307eccba60f9171e9207"; + sha512.doc = "a626078e2c8a268663bcd0148dc8c7d382a7e6e29e2f14ef0e34d75a1f460702c09042625378bfec482d8055e34b6661f137982e328c8cb21ddd29a0e9a69cf9"; hasRunfiles = true; - version = "0.8.2"; + version = "0.8.3"; }; "schulmathematik" = { - revision = 58359; + revision = 61347; stripPrefix = 0; - sha512.run = "283c5541f876edeea48201cff842d0d4b73ed1fff33f419371c9fd721cbd1711203f3449874d57573285a8e0e9a7386fcf586444030fee3c587b9d830ca2235d"; - sha512.doc = "1f360107f14c7261c25c3806b4c5b762ec65b0d1818c4cc450784338119f0148b0319cdc3981c7cb29c776aa309f3b90782f28abde3c4b5cffe16e51bbc28f39"; + sha512.run = "e24ba267da9a9fd00b1de1ef6e878f36be2df2e5860d8e8af65a2c3d91ab04dda143f1aa69bfefc2ccef1970e2149a4fcf2a8ba0d92a0f062a71526d19529795"; + sha512.doc = "b648305dc48871c5ba4b52af333bad7873038cae7740559383199715fa10e6ed0bb23d3972d80081b9d57857bde80d12fba55730b9af09f6733b0397d9f416a4"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "schulschriften" = { - revision = 35730; + revision = 59388; stripPrefix = 0; - sha512.run = "baedf984b1d1cfeae56af4b9530b81d90653eee334a90f2a9a83a871240592ed6267668b6974033cedfc1e73166232201eaae8e4876d38b9fd94919e8262336a"; - sha512.doc = "b43f16b38c0417b074b7f45bd42290f3434275c23c6031f293101d907c2004805168d86137190300daa1ca62dd1b25cd2f795e712868b36e454cda134f680bbb"; + sha512.run = "d24778c0ae93d06b42bc8d7eb8d84ab6e0f42b33352f2dbd79586a4ed9bb21fe99a61dc0eab375e56a20624fa5ad63ade3446d685dcf063d46c0f60264c431f3"; + sha512.doc = "c9b6b43bff7a90f158b0a10c431cc52e65c4c2d49c773aafe7e54d1283d97c3badfca5315ff982cf0a524b514594faff5666063164483987973ce60d2edcadb8"; hasRunfiles = true; - version = "4"; + version = "5"; }; "schwalbe-chess" = { revision = 53305; @@ -30117,6 +31048,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.9"; }; +"scrambledenvs" = { + revision = 60615; + stripPrefix = 0; + sha512.run = "075792b5d0fc5201d672e622a958c600ff479caba2920a32ed3d3f469c525d799d8bdef20b3a08391a22ed3eead6ab3f30cebbed36c469e423e2ea844c170651"; + sha512.doc = "339d1cd398e62d65c1c92927a07dd4bed740916f2a98dd8ba2d913976d69a70b0340b9cab35250ac3ee862f4572438f87562cb6f7b2031cbe0252d8cc781009a"; + sha512.source = "1a605abf62adf986a933b6d1723699e9920df07fe383527b5d8491aee5431b5f91354052a0810d8a0f8cb2b8b853a3945d38041fc6e9e573c159e7baeaf356dd"; + hasRunfiles = true; + version = "1.1.0"; +}; "scratch" = { revision = 50073; stripPrefix = 0; @@ -30193,13 +31133,13 @@ tl: { # no indentation version = "1.2d"; }; "sdaps" = { - revision = 54678; + revision = 61017; stripPrefix = 0; - sha512.run = "506507e08aa6d3e4408c50bad4541feed8bd491f668ba10de131b4ecece0b23ed6666a117e6b5826e7a2e7e0cbe6b64072a5ed5b090d9c2568354ea7a50922d3"; - sha512.doc = "8c98eda0586c02497fbf4a2a0125064b1200f1b16506c720d8103b88b2256e517eb5553d2027fb4a1d8fd711e640b045a9e3a90f152e957b5c3dc6df53509424"; - sha512.source = "3c6687e548f86f4a96f88264841e33b670d6dcbbdf7debdda2e1d8751ba58abf1e56005f3ac2160f3bf88bd113fee7b72a186ebba3b30c40521ed0f52e7dbbcb"; + sha512.run = "9ae34647cb380cffb4ac55593339b182dc136d4649e4dbc126df322a478ee16fa59c635619c2b48c62c70b2efcf29ea8af35eb0d687cc9ea5beb02003a22c2a5"; + sha512.doc = "e5e2895f47f43f974aeb0a14e574956ff920efdec86156912c3a9fb2e71a9bef7783c455cd518fb87e6cdcb7548c3893a278f7f55039fe7f63a805ae72a7932d"; + sha512.source = "cf0bd7d81bfd73b480bdbbfe77782532fd48f430680676cde0fe369f62956d3ba6dedb295d4b40065ff95458c4ab75ee84dba8b3b6d04b17fd44082c08fde06d"; hasRunfiles = true; - version = "1.9.8"; + version = "1.9.10"; }; "sdrt" = { revision = 15878; @@ -30227,11 +31167,11 @@ tl: { # no indentation version = "1.0"; }; "secnum" = { - revision = 53657; + revision = 60365; stripPrefix = 0; - sha512.run = "8e54eb92f9f9c2a07f50e11fc3c68bc39fe4da3eabee3658f24b76c85e8effa8c4cf72a26dc30a8fff9a002a5f66fa1cf349f2ff5ef1dc51eec7c1ae3c0ffe15"; - sha512.doc = "e9c44b617d479f9850ad0e408c1c2edc36025f2e1f1e812ecc8370586b22c9aa05f74381e0fa6b1ab39f239bb18e53cc4665482f2b1f3f3057fbeac0f01945d2"; - sha512.source = "eb4e6c55332e822b4e0b36fcafbe9fcc8a52e3cc5bad9abf538aa87ce6e0318123c0030f5b6e041701b07abc5cd6ba95a7629eff07c27f220e2188c8f6e4b7e4"; + sha512.run = "78d92a6e4fca2e1a8c24f9f94f0872afc8bbbd3ecb64c5bc15bccc8ca2a04fc58024ba436820f399aab7f7e1a243d89e72c902d0167df5b286a7a5160bee0289"; + sha512.doc = "c0cc2998f191759f32e5ea5e7faabca63de02493a355550f53c004c66db1ae82c5d89cbf9655e33ff878acde8a0ecb1208b5aae1a72dd7f74bbe296225c595d2"; + sha512.source = "4a49082da28d518fad99006c7612b5318f875d70f184de07ea3f9851841a91e894709bb8a1915674ed88f1648b9cce960d4a24e2b69782919632536145a8bf79"; hasRunfiles = true; }; "section" = { @@ -30306,13 +31246,13 @@ tl: { # no indentation version = "0.302"; }; "semantex" = { - revision = 56863; + revision = 60312; stripPrefix = 0; deps."semtex" = tl."semtex"; - sha512.run = "d09b5dc2e6b8031c03b59254b442a8c5502cacd2d24c91f47ae6243cf5908062e79ab0e7a521c2208848ae7f9acb147716cd8a399b362a91a5cfdec87e213814"; - sha512.doc = "829286b336f1d05afa9561d3937fa526b6062b03950b3f350fb4fc586f45fa253d93939b6432685a08c967eb85c053d07c6fe3e08126869ef63fb43bd0acd992"; + sha512.run = "e4e6656d2126cdfa9cd58042a7aa28cd7b8bbc0cd5b891e8edabc1749a7b34d45a109139ab88f64cd115a62a5c32871187209865d76659fd1b80dea6721e0a38"; + sha512.doc = "d801226caef1e9e7720eb02275196fdb300670cfbc8aea01fd17a959ed030532f844fbe8a8de0b802eb81515a9414f14922c3310fbeac0adb5354861635e0747"; hasRunfiles = true; - version = "0.463"; + version = "0.513"; }; "semantic" = { revision = 15878; @@ -30347,12 +31287,12 @@ tl: { # no indentation version = "1.0"; }; "seminar" = { - revision = 34011; + revision = 59801; stripPrefix = 0; - sha512.run = "63173000935f741b7d1e7dab2fa0091bcb758ba36dfca0b6c745ae165f6b5f3aeea7972319078f175e231d3e0ebd3454d2241a2bc4f0f36ee51bac7bb7287a56"; - sha512.doc = "0bc4ea04a561c8a8c17f4f6ea493fa98e12e93cefd58b0aeeb0b09823f2b97028d945f1c9199fd1a5ab10e0b695079a8d97608474a4d04640496737640a9993c"; + sha512.run = "28795c64e4af5296e228986c28115305cb76087d241e91312cfff351f7e51833a0d76b2acd667fc5f7616dcb1685cd02b2d9352ef7f0e36d5bffdaa5f421e6eb"; + sha512.doc = "8b7364dc568d1fd78cce21ff1846a6369fe3fccf07bf16ece8383c941492404d6fdf3be1607aa2279a10d670803536474d7cc318b9b3dda24142fbcc69fe69e0"; hasRunfiles = true; - version = "1.62"; + version = "1.63a"; }; "semioneside" = { revision = 15878; @@ -30674,13 +31614,13 @@ tl: { # no indentation version = "0.5c"; }; "showlabels" = { - revision = 41322; + revision = 60877; stripPrefix = 0; - sha512.run = "4d805bcd319df51219c956fce18fffe3b91aad3f468f54f5b6fd9ca15f8c24df10e1092252ba6870fd406c024deb054c60d7f64dfef7194c45b92a8a78a9da1d"; - sha512.doc = "0a8cf29e85526e92df738364607e31927223458a969c117d40a0e9cf3470e5c4050107b9fe915ad2a23720a2dd4f5faa1d43d9737b9b7a6f6105de3a36e9888b"; - sha512.source = "eb0dd894327bd6f4591a3a57c52af10e73ae07f7d933ff3310012d46b09d1572adac0eb6a8a22ff03ced5f7832a017b58ef809d5fd914103fb569b42cfb2abfa"; + sha512.run = "4d619e52b40b06a7d31ac0627ec00a19f38c4ff56551279e185d1b86461b776dc75d711d52ff5d83ab9ddf04dc3828cf0302760e71cba2dcaf4c284c8c65ff6e"; + sha512.doc = "154da3583e03b13794e366926bf4430961e8159558bddd86f8d080f53f12bf3936c4caaff8f4aef131e7d84685145ff5fc8d644134f5c982367cc106ff505066"; + sha512.source = "9bc00b8a250e10c0f2eea3aa93a1fd1de32d11acee1c8163a0160d2c1dc14aac30cc30d29437f083dd990194b5a2d5027580698f622889e63cf0bb7390da7f61"; hasRunfiles = true; - version = "1.8"; + version = "1.9.1"; }; "showtags" = { revision = 20336; @@ -30837,11 +31777,11 @@ tl: { # no indentation sha512.doc = "f5bf92ed89cfc83f306cd4b2599446a11b73f73a0b82afbd0f441e26d837e6f436913bd2df18585c5e215fa0504bfee3d5d4f5ef4da8925161f85c70c14045e6"; }; "simplivre" = { - revision = 58414; + revision = 61338; stripPrefix = 0; deps."minimalist" = tl."minimalist"; - sha512.run = "cdcaa2083a2005e7b3dfb3b2e931a49da6f18c7860fad8dd0411bf88251a799836b6032382e661611487f6cd549a1d916977542f448ac689d976dd194c0a49a3"; - sha512.doc = "8bacd8834d8b54707d564b2a16a4f7d177205e9ab9704d2a47a42be399c0bf5e0ca1728f1b44e48e3957a69285615587df40d3ce9f98147bbb692ec06ac7875b"; + sha512.run = "495195229000b74ded294ea807922bb8c1448481bad07eac676b6ce3e5ebe7de2d98d44c88e12aee53e0816f85eb4507d3a283b750031fb964d2c239c1344772"; + sha512.doc = "99575208b92d107bb22b23f947b918dd920c8d34f0f5e42af1895731cc84faeaccc11231115198f01d4a0461416bf984526a974ff82f17bf775be6b99002ec58"; hasRunfiles = true; }; "simurgh" = { @@ -30852,6 +31792,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.01b"; }; +"sistyle" = { + revision = 59682; + stripPrefix = 0; + sha512.run = "0423402d3fea5dbbb60abf6c763bd037982479557b84b6ff38f795168234cd3dc6eb0708fb7b5e76abb1f68560a884e7d8b4e3a256d78b23aa81dba9b6e70d4d"; + sha512.doc = "94fea0a472ccd43396921d957544ce6b0a1d6b9ca5ee63a01fb0f1fdd61e1cafeeca4c85366302117d852f20798c51b76966097bee3c2d7f6509e339720b744f"; + sha512.source = "bda83997fcdebffe1792ecf0678cb8065ec0f4dc37b2662fb515c8f314884799650a38efafea97e4103cc915d421b9cbc60ef9c4c81bc34a6b083548ebbf691c"; + hasRunfiles = true; + version = "2.3a"; +}; "sitem" = { revision = 22136; stripPrefix = 0; @@ -30861,16 +31810,25 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"siunits" = { + revision = 59702; + stripPrefix = 0; + sha512.run = "01b2b83edba4482a6d0434efd4590b3b0fbbb596da6075632a215d60a16cc48d66f0f47d3ca61a0e73290e933952cac15fa2048f6ac12112dc603956f123f5b2"; + sha512.doc = "d6c34f20671b68a1ffdf47b32e037d7660b660fb8a8e3768083ee7e33b08e7c313eb5f2c585657dcfa258f85574bf6b13a86ef81e49c2ed1b407e4dfc8dc5d04"; + sha512.source = "8cd5d556cc4c6abc503b9882a7c2ff19052a9004d703b37383d6a6c6ec671ea434b03f6f1df362aef2fec06dfeefb7b231072c975eb946262b71b15131f38daa"; + hasRunfiles = true; + version = "1.36"; +}; "siunitx" = { - revision = 58714; + revision = 61216; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; - sha512.run = "7f43171d9d2f4074af2f912de20c5953cc2dffd45a6540907dc1e2924ebf03925190eb120cdbd37b59686f0547c0e545f5aa1db0607274bf0b61b4db94c722eb"; - sha512.doc = "f668ec1ca464eaa50d698397f03372b2a300e304a640c65357f42d612cc13eb498533ecfa4842a3bf65181402c1a324ea997fa5f438a5837a7b3131ca276499c"; - sha512.source = "b288e83b4fc610a1a2a85a6557e6bd2e1dd1732ee2b6e90739ad15c5436100ebbf0e95eba820f74d079465f62898ca8cd608f9b6231e0b0bd84d80ef0a930fc3"; + sha512.run = "7c326ecec5031ea93eed4c2c94c63a3907422b6e1e5a90bd3314c7fa4964d66e366ec798eb1b0ccc8c8b29a96a9cc9ece8da130e20f5d989b14045118714a004"; + sha512.doc = "6ced0f90a64f6d6cfeca304852ac00fdc8c94930176115c0f5c4b3569eee3bf7ea0bf2c131c123f58602a5c19856969e4a53a079f1d825ddd89a1f6d9d6116e9"; + sha512.source = "a81dd931a41995b23952bee644febdd8390545eaecfd8f127cf73e0bc7a371d440f41f68a8c7f5fd68b3f0eb520d8ed73b0d9588d95439cd7dc3d76f7db86e15"; hasRunfiles = true; - version = "2.8c"; + version = "3.0.37"; }; "skak" = { revision = 46259; @@ -30987,6 +31945,14 @@ tl: { # no indentation sha512.doc = "ca62aa29f6ad62f149dd9c5077ee2b14ed69d8a750f33d3de274ae275e5d1528482e58140a78b0917cf02a879206194e24a6beecd33060544abb50dd6fc564a6"; hasRunfiles = true; }; +"smart-eqn" = { + revision = 60178; + stripPrefix = 0; + sha512.run = "6c86441ebc231e92b5ed5663b2ebd59783e05afc6cf8bba91d69f7aaf5386f32b0f37779488057be3e01b2dccfaf9bc764e408d47528bd71d73add32bca817e3"; + sha512.doc = "3f4e0eb5ab5f2a40604f4d93657ae8b118f41bd6b37ea61740c64c9242e6bf3d664be6d120371b85fe47f44f2c80cd4a65fcaeeeac84ee1eb42b917e394316d3"; + sha512.source = "6be5d69818d3af289514d1dea73726bf65e45383ddb65e4c25202f38e621b53eba957b1576a74c2667cf83edff1f57a21f3cab740f091e8c90112354277f2bca"; + hasRunfiles = true; +}; "smartdiagram" = { revision = 42781; stripPrefix = 0; @@ -31012,6 +31978,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"smflatex" = { + revision = 58910; + stripPrefix = 0; + sha512.run = "3723047537c97c42f23eaf15dd95941092300a86a5072cf261c2d9a4fdc09d17e3c09cefc6a1f632996b45300cfc5e3266dba4130decf4f6d33063b0b7f45d0f"; + sha512.doc = "a0ead1f76c26126c3cf00bd735ae8002648ac874511de92a73b756197328af3d81d66697c0fb3d210047570dd267b5c975b26a7c6e42b0fa61b9b77a29bbf113"; + sha512.source = "99a45d290c450301108b032830b02c81d3487ebb281f19f17826df8ed267dada23b5bb039874f97de29850c1d33bb775097d53d7e4d8d4373de9143219aa57aa"; + hasRunfiles = true; + version = "1.6"; +}; "snapshot" = { revision = 56735; stripPrefix = 0; @@ -31021,6 +31996,13 @@ tl: { # no indentation hasRunfiles = true; version = "2.14"; }; +"snaptodo" = { + revision = 61155; + stripPrefix = 0; + sha512.run = "10d9e3d154a3713c1f494ae626c61a1275b902892ad7cb34f41c65a36335a7ea21bc9d7d77d00845c2e5f270edc91d1be5bfdfa34189a2ac6bd88ab83e78212b"; + sha512.doc = "ed3df0276b44e2539b9b8cd0b5f6b46f86b18723d0913ed29fba45e30a132b53f8e0206add2d31bc152c78f319b8f7671ea000a1f344dc7f7d80ad9de32cd66b"; + hasRunfiles = true; +}; "snotez" = { revision = 57147; stripPrefix = 0; @@ -31072,14 +32054,14 @@ tl: { # no indentation version = "2.4"; }; "soulpos" = { - revision = 52663; + revision = 60772; stripPrefix = 0; deps."oberdiek" = tl."oberdiek"; deps."soul" = tl."soul"; - sha512.run = "1187494b2c65535c47f88f2387df8cf4f835222ad19718a4fc6ba7c4dd9a30d7d6aeb972f35b5c9350b873056b87a6a93ced5f69ded272c6aac82e467da6cd81"; - sha512.doc = "10a6999a68ebe21d4e9621a11c63154dc720332cefe8f64728b51dbabfdcda2f638e456c517374bf892b21354f3fca8a746c1539e5745ac42a0228d900b19700"; + sha512.run = "2b4d2fcaa687ff7d229706e563f739356a450a8ef02180f3c98432b11d027cd097fa895c3c971a944329b8657c74b4d2cf566110919e511e6883706561332678"; + sha512.doc = "9577aa2c77e9cafea54eee0ee032acd7c1343d6eb66b76fc25d694b524630bd2f41043187671cd444c9cdd0ccc8b9064e6c71365492cbdbd46517a061efc87cc"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "soulutf8" = { revision = 53163; @@ -31124,13 +32106,13 @@ tl: { # no indentation version = "1.4"; }; "spacingtricks" = { - revision = 56840; + revision = 60559; stripPrefix = 0; - sha512.run = "9cb9ef080cb14f9a4c7004221cdf8f3d5b90a74ba90a37960b6efa3a33aed501a68e2d8ae23d3262e8fb17816e4565e26722b78e1caa14b7455199e52d8fd3cd"; - sha512.doc = "d5ab0e38687f00099830015bc469060e6e7a96ef5a199b0352e4a6ce82d50ff6df0b04de20bd683a03d9980a3c45c63905043177fd8ca9cf1f009e978d5dc12f"; - sha512.source = "dcdc75265a9cf0131cf90beae018f35a54fdd201a641368c5380f82258e7c1bb5a680d1b104146c886df56f148921db0ca304063b2cc9532b0aa32b3288812c7"; + sha512.run = "0b8c685eb4ea6748e00b3bd2d23bf71a0b5309fb5b89a0e02d767beacb8b4a29eee5d874453a57461ace4d9c1d2e3f7f376fde00b12564e8acdf2a5bc1b968c8"; + sha512.doc = "fa91577ffd949619f19deab17f6e9d1d4949aed4477b2ff870642edc03b5321eafc50efbc046308d664f1a391b0f414d1ecd542b6a0ace210a32b6dab1f9f44c"; + sha512.source = "b40a242ce6fa0b425a5a9ee0acbae8ac407fab0def30a9783e72fd4c8c3841931d21d773cb1569eb8fe662c51a441fed59c58849bd2a2b827854a3d1670be486"; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "spalign" = { revision = 42225; @@ -31165,6 +32147,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.4"; }; +"spbmark" = { + revision = 61383; + stripPrefix = 0; + sha512.run = "ada1d4db0c3b59170eb7f5fac544ae628bcb81ab4ec5dea3ec4d1ed235ac4d4ada24f6ff6837c0a659e9e8d2da37c70af529fedfa578ec0e53f47acb3646a87f"; + sha512.doc = "fcb1049bbe587c0f4c77476d5780d2f9d4cc4be9f6a58ef200c1c0b85c5a271a8d3e80bf4dbd047a71ab3470e876ce53d2627d45a7c10586022ec0547b6a7d07"; + hasRunfiles = true; + version = "1.2H"; +}; "spectral" = { revision = 57296; stripPrefix = 0; @@ -31173,12 +32163,12 @@ tl: { # no indentation hasRunfiles = true; }; "spectralsequences" = { - revision = 50072; + revision = 59992; stripPrefix = 0; - sha512.run = "71677e3cba37f228acc096ae916793cf214f90d30809019efc67ba0793b5176da1a3fe8fab592ca80a077164948c4be777237f71e895515e519f399534cc0cd6"; - sha512.doc = "80eda3718c3cb2daf9f3a96a6def78011be1d7882eb50db692c2d34332a5aa79a44e0201445f67d1623bcfc3618f79f6d158a98a91572796674071143f017789"; + sha512.run = "6865ffce4891cadcffe77b43572f0073a5e53c257b660e3e6ee6df004b2560d7e98bffad70195150c87952152304439e5602c9dae7d0d5e763c81fb8694c8d3d"; + sha512.doc = "99529e9a783df04be7ff4d02b9579b82a1e4ba98b04fbb5bb89df7e34a338a1a0188359942dc4ab3a61d5928f496417465c6615cacf6a0f3923ced35135b59ca"; hasRunfiles = true; - version = "1.2.2"; + version = "1.3.0"; }; "spelling" = { revision = 30715; @@ -31279,13 +32269,13 @@ tl: { # no indentation version = "1.0"; }; "sr-vorl" = { - revision = 39529; + revision = 59333; stripPrefix = 0; - sha512.run = "135186b501bcf2a9b338ff13e330401ae3ca39db4225f639549cc929991d2177804b44ddbaec805ec1cd56982b140cec4625e7564fad7f4de89d2c2e06ad60d8"; - sha512.doc = "a65dc0b7a12b5435d753aeeaca7643747c94463835cf1706e042710272cc0eef66d4f5f827c99034f9126bcbbf7e41293196f9ee29ed3f9961b9af27e2879747"; - sha512.source = "f41d126426035fa0d1cf6564d9eb4966618a1c8f805bca3097a5f7e72c62a12c9d8e39b6830f9b1e356940b67bd99803e869d849949854a1a17da4c7ba971195"; + sha512.run = "8a9b0833bc518b12019d2d474a70760e3b44766751485215c746b8a7c3b9ee1f9e92a5cee09c5f961fe97387855627c6a385b7484564556e0901c08c922410dd"; + sha512.doc = "774c91361a95510a356fb7fbb70f753954d30d1ac309c1cf09727a2c9ea647b65f046d3eded8e631b512190f5705eab020abe8b7923ee9d6230c6c9fd782dea5"; + sha512.source = "fafacdaf874ec094aea5451962c3c79584da5fdc1e0aec34b9965b9c8531d19538d362b68ff1d07073aaa3c24483214168b942b6b4e0391384c69c690620d9a7"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "srbook-mem" = { revision = 45818; @@ -31311,12 +32301,12 @@ tl: { # no indentation version = "1.0"; }; "srdp-mathematik" = { - revision = 58734; + revision = 61382; stripPrefix = 0; - sha512.run = "c6a37c722985c09980fb6487f46603a2b7475ce1d2bda4ab9eaea36c106fe19146b6b961e9406b76aea626ef0d09babb25193340a87bf4fc428c0a3314e04f34"; - sha512.doc = "7886d6da7321cfc19f364b730a54def58250138d81538a74512416a8adceea299a36b517a0ac0b660041b85a9f9f2ef2125d613f3efc899b73d6717d69d81163"; + sha512.run = "136e82abbe636476439596ffc746539ec587adcb3990111d8d3a6da6d9fcc8232809f75f269921b04b21f4494d26a28f542253a982b3735dc98e31d84c87b99d"; + sha512.doc = "d1ed31b68c9ba52fde6aa1e676a7cc74ed1086447bdcc3190fab8e64e9c32dc30c348a6e0a36306d0b3d31f5fe7dca47da0016990648a00e4416e291dd3bcf28"; hasRunfiles = true; - version = "1.9.0"; + version = "1.9.3"; }; "sseq" = { revision = 31585; @@ -31343,13 +32333,13 @@ tl: { # no indentation version = "1.00"; }; "stackengine" = { - revision = 53843; + revision = 60019; stripPrefix = 0; deps."listofitems" = tl."listofitems"; - sha512.run = "13ce66f2a3335c62db5bb2872596480572e106e1cd594d8b787684f1fd3ea4b57ee015737e7e5dd053b526bf52b6ad20a84f4d4db49d9b888f55ad5b637894c4"; - sha512.doc = "8a32a4a5e75023ab1750a6e85cb23b919f44ee838d24c0883fd4b8945d57a9e3a91b456503642544676eb4100de68a0ba4547d8e2c45a0ae90b3ab7b36acaf6d"; + sha512.run = "15327eda5a6eda2b58055efc419ef50b8d8cf8c35283bcc41ee85e354f61ede6efeabf5e75bbb4cd022b95e52109bce1ee2e28fc701c5940723f3b15dd44c75a"; + sha512.doc = "a0edeaed3766af88d1c5e0508fd285382850bfd072cf4f6fdc1c329c8ca9f5e1eb5fe75357d9a86dd8b2476381747c9a3f7cd7dad0d7c32419bef0d37849928b"; hasRunfiles = true; - version = "4.01"; + version = "4.11"; }; "stage" = { revision = 53915; @@ -31521,12 +32511,12 @@ tl: { # no indentation hasRunfiles = true; }; "stickstoo" = { - revision = 57193; + revision = 60793; stripPrefix = 0; - sha512.run = "5da4a3d412ee4c015e0f15939edf71bd8dd16f218ca3d8d236cb071554af2dac9fb4e71de4b18626578134e94262582dfb62071c1cc4af5ef2fb6111b6430d92"; - sha512.doc = "0a36ffbe112993a90054e3ba413725abb4259e10a3f439eff694c05ce8b99592e7d1001fda13cf49d1ce0e89f388e1726962b58e74e13eea4b918ee85303b24a"; + sha512.run = "aa2ede628a273b4fc0796153d243bf89dce6d3c1b0097b29327bf21836340d11f6e6368f312d76ff726030c05d012c3890f86277ac7eef79d5c5ca579f47cea7"; + sha512.doc = "e1437dd3b47c8799b4a8a60fcfc215a303f1eb289e0424e51d29fad78c9fb4cc4890896baa77251681d000f2eb08365f9f16a2fbc1c37881b852790257432088"; hasRunfiles = true; - version = "1.034"; + version = "1.035"; }; "stix" = { revision = 54512; @@ -31579,6 +32569,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.0.2"; }; +"strands" = { + revision = 59906; + stripPrefix = 0; + sha512.run = "bc902fcd06413468d2dd3f23aa774824602a910749bc2b2cc8d4c24decc184a088190422c0f2ea58995fe627f855f6fa6e0b5ad0490b1084fdd122abebb77cef"; + sha512.doc = "95cbfbe360a515fa94d0222eaaffc2cb5920a8a2f5b0ca0a052f29f7237b58214c8f39288d08db88e97ba0694f3ac6793c7c8c90d47295841e009db46b037b91"; + sha512.source = "7e95d4132e4d1c4bb319d3ae2f4ddb10b65ca7b30d2ba6942274e0169a8d69f39d7d552c7470adadf006ee0725bbc0862a1c1190f425643bba108542bd8e4b75"; + hasRunfiles = true; + version = "1.1"; +}; "stricttex" = { revision = 56320; stripPrefix = 0; @@ -31606,11 +32605,12 @@ tl: { # no indentation version = "1.24"; }; "structmech" = { - revision = 47859; + revision = 58985; stripPrefix = 0; - sha512.run = "4efa9a978eb0bb92dec5588107588346ba1a22a34e12bf43b811176d42871f415ec58adfa50a4a4bb9b72ef482395c374b9e7b979f1b779e672422bac2c91c6a"; - sha512.doc = "4eb7e209e5034c6809f8e746f63b1a5f3ed62c85cede4fc989ad6d89a9710bd15ee3e5622181ea9a450ea2b8430ae2c51ccc845851cd9fffa582e3b91b656457"; - version = "1.0"; + sha512.run = "4b4bfc5962b57792e34f22f19f8127a048ffc4428eccded53452b165d11d798866f4dfb477dc87f3be52e074ffef9e13e496894bb14e4ad1876b09852efc7f69"; + sha512.doc = "48623a95193f3613d16b82a0df650b1bfcbf62bb1fc7f2fbe2b878199eae01d89a5ca9d151931ae16eceeb1d47dd835086f3eb46b0b3bd36133835e797eee4a6"; + hasRunfiles = true; + version = "1.1"; }; "struktex" = { revision = 47931; @@ -31622,13 +32622,13 @@ tl: { # no indentation version = "2.3c-0-g7d3fc5b"; }; "sttools" = { - revision = 56774; + revision = 60736; stripPrefix = 0; - sha512.run = "d9707fc22ad26d291288debdb2d9bb492175dade76ed398c3c0ffd1d4ba256d8c691bc2fb9d537ff01af4de7bf1352d4b1f62cc6c54afa8c02eea8b69185382b"; - sha512.doc = "b32bd4fa10599b3ace5bc8e1b2dae79750aace26a98806de275fdd358554b6f26fde48c9e7b0fbb108de0a771728a68f6c09fa9c568a5e2fce7b9aaa1fb1f58f"; - sha512.source = "56a096fbc8f28a0ea2f1ef31ebf277204319eaf6fb9bfcbd5449d24b2689a111f192ee1c723adcf8800c9ca2069c934cde8d0bdefae473e6eced2b043b7fd8d8"; + sha512.run = "4e52219c4d3d668dd52d9a1e8e0de4f547871efb9f5515851b44e1c968cd564080c87c631d8cb53c76cdcfb8df884af0e9ea1492228929098a390b6184f5ed37"; + sha512.doc = "c07922c52f57ffeeb57a9bf3b444e251f01f859f2218933889112b86d9dadc5791d7d926091eb3a2753a6ebebe439bc7037ef857b6d19a1e6e7b516fe879f4d4"; + sha512.source = "65616cdefbe3d5b53f7f888412f8ada24860d33c2cd5babff26a3ae71c6c56a4d1a5eb5dd355d557c8fd947db82401746a4928a16587a88c3dfcc19f712f5e59"; hasRunfiles = true; - version = "2.1"; + version = "3.0"; }; "stubs" = { revision = 19440; @@ -31653,6 +32653,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.3"; }; +"styledcmd" = { + revision = 60430; + stripPrefix = 0; + sha512.run = "176121c22946936653f73b73d87f0f9f82219520d02ff41786a6214a0c12eaf436a62a8c35a5c26ea0e6ee1289327e6fa36847ce778652d4d0668de00727241e"; + sha512.doc = "cbaf65be3e9edff1af87b834fdc47ed82ce9cb58fce83e1033d18f1f2b70f26ebc79c2b64ea201277c85de30d97415513508a237c6de5806928db249bb908442"; + sha512.source = "66f90cedbf82676099c0bd5530d2c7f2514e6a3b171828c845340f055b0ea51073236fb75812598e9994187cf02c2aa824c20cba9132c1891b0afd5aa8c9ea0e"; + hasRunfiles = true; + version = "1.1"; +}; "suanpan" = { revision = 15878; stripPrefix = 0; @@ -31799,13 +32808,13 @@ tl: { # no indentation version = "1.0a"; }; "suftesi" = { - revision = 57650; + revision = 60991; stripPrefix = 0; - sha512.run = "831ef011581a27693ec114b66e1f5a80f0605f4228eb31755d9ca202a7b1881530be2ea89b1ba9d0b71ddca88c109da20919d65e5705adac143fb381f19a4180"; - sha512.doc = "bf83d581ee054dbc74c2f685c9461bf6233b674a49d2b4d7a989c51f28728b25f3fff7c2f9c53110bb00b91a10b5f978ecb9180d2d5ba93cd6cd01f0be0cc4ec"; - sha512.source = "8c4ce79fefe4ad379cbc97dca4d6e046c266c5abc46e2e8422abe145e74199c7518d0c2523015a06eef3f1350880dc2a259c488c60c1a2610b10fdb372dce342"; + sha512.run = "12f9eed31e58856352c2625daf0ffe51d8df084a4ee255c8a19c17d1debee06873127136a49cfacfa3941e25546811216eb943e17717052ba369a3f34811687b"; + sha512.doc = "01fd5a4e862960a219619a57adfb7b34ee71fd953f79178e6c77f6c27b404d9c11eecc7d302c9a8a23b4f746220acc9ee1a465e1b921dfeb3a9119d45b96b8fa"; + sha512.source = "d0a66c2920a9f7e0ad2a54b47015b89e7792b8f0fa39011414ac80a58a826d038b29e5d0170803be3f00c61347dbf287c9608c59f1354895bf94a24a08d506f8"; hasRunfiles = true; - version = "3.0.2"; + version = "3.2.0"; }; "sugconf" = { revision = 58752; @@ -31832,12 +32841,12 @@ tl: { # no indentation version = "4.1g"; }; "suppose" = { - revision = 58736; + revision = 59281; stripPrefix = 0; - sha512.run = "ff890a2809a19c63733769d545a908c05f1145762edc240c4aac8f18b6f0ef66c01f70d7be51c83eae298ea640af89b1c8b506ca0befbe5b461e8724fbcbb9bc"; - sha512.doc = "834bf055ae114b1c1f01375b066281b96c8faaa9be1a7b31fd80718dc25b0a418f69c916195ae98a40b5317a4aed46e0d0f6dd8bd535f562fb26760424b2882e"; + sha512.run = "b78fab6e7784cec1ad8c44c0ea6b2dabf7aeed133ae5dbf9c8044a5fd8af8509b68a1fb615a8bc33459676e4eb6f6d13f097cd689c35acf37beca4750ee09c36"; + sha512.doc = "c59de255274f2a8fb961b57e4c59e7020f990b15a54ef008b251380b63d3564cfab7ce434a3782d3f467561557eca9884745e12f3886416967ad26b0a95b1f5a"; hasRunfiles = true; - version = "1.2"; + version = "1.2.2"; }; "susy" = { revision = 19440; @@ -32038,6 +33047,14 @@ tl: { # no indentation sha512.doc = "8c30658eab02eb576963a6a2f722b143444abf5d286473f165b6cab84c75ef703462a1841121a5d12cf822b150ce8c23a96256754a2d662fbe6c451a058333ef"; hasRunfiles = true; }; +"tabbing" = { + revision = 59715; + stripPrefix = 0; + sha512.run = "dcb4bf112afc6a2221030ee7cf0f0b3043dd12a178195ba57afd10702b3efd65948d58607334dd9445270cf69862011d97b72a0f8ca5868748174b1462988132"; + sha512.doc = "e056f857e62c1fe3f6b0183c0929e617525586068c62beee604b904695274d4c271d4b973a8a8c9b046792227df389a61591b528a8a4c1cb5c9916618206de48"; + sha512.source = "7ed54e677b3dbd8e10e85e84c69791339fefc223a753164c0e9aa8c47301ded6c0737cf62b25cd9d3b152eb63bc32406d9a8a86a620b0e8e00d562ee795f6aa8"; + hasRunfiles = true; +}; "tabfigures" = { revision = 25202; stripPrefix = 0; @@ -32072,13 +33089,13 @@ tl: { # no indentation version = "1.1c"; }; "tableof" = { - revision = 48815; + revision = 59837; stripPrefix = 0; - sha512.run = "3eb5dd3a3399825a85280c79c9f013dc9615a534e475d64777ec84924c9257aa930b7fe677a85c32b158b4099d5b61f306ea54f610fa1c9db42764fbf5b683da"; - sha512.doc = "609011dc53d37fbad2abf84531ab99d8f60b636222debdf0466b33ed85964326b688a7e5d957500a970e1e974d5fbcf1dfc198e146360b6d43b58f6f3d67c845"; - sha512.source = "b55b6834b7dcc3ba83f3e8620ffa9ee66b0a6962a4c1b95d7b74ac164300334db89f432af7407268d00190e79333fb3e305074feaf116344957a5a986c842d17"; + sha512.run = "e577e1e8df3fd1ad12a2cbfcd05ffb1184fcd3555124986481c62a33ed7f5789bf1858a1370888887d2aae0d2a508a891e5e67bb0a4a1d9a924b3817c2d9e234"; + sha512.doc = "bd568b16c6e708e4d0ee9810ba97f8363c842c22156dc90a257fdb0319eb49cab4f6ac9faee0700687a8a6ee54ea02b9660635cfeddd5275365d9c7f38218784"; + sha512.source = "5086e314c042757a5e90bcbde9fdbcedeee689f89524df43ab390eefc7bf10eea6a9c5bc83b359b00c3ae351fa10f8e8a64b356adb8e7131d48568e06a8ed0d3"; hasRunfiles = true; - version = "1.4b"; + version = "1.4c"; }; "tablestyles" = { revision = 34495; @@ -32189,6 +33206,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"tabularray" = { + revision = 61200; + stripPrefix = 0; + sha512.run = "b73fb6fb0ef945b79a41438d0a1282e367848de551daca4b274379c9906b65af0d49397f7e040c430753818ff967c5b5f148653c5807e4af33b2294cedd7eae2"; + sha512.doc = "c3d7fc1a32ccb649d00019804212ec592d5a7b474547aa61362ab6a403c6b8407f9240aa1bf390f199de80371369a7d555a96bedfcdd7963f98e0d9ce0636c5a"; + hasRunfiles = true; + version = "2021Q"; +}; "tabulary" = { revision = 34368; stripPrefix = 0; @@ -32224,13 +33249,13 @@ tl: { # no indentation version = "1.1"; }; "tagpdf" = { - revision = 57954; + revision = 60366; stripPrefix = 0; - sha512.run = "ed62165f65bbcb159d727a41a02473ba32523f2d8f256a7ada5634fab4cfb1d037eff900dbbf271c7efbad78b306c71a9104dad1fb47662fee85f850afcaa450"; - sha512.doc = "3630a123d98ebe9efd15729beb88e5a7d6c92fa485d416d2023a9d732feaf54548649551a9b428ac1fa25824cbbbfcbdd11b5920509985847a0e8f922f433580"; - sha512.source = "9bef63a003833525c6b1a6e983ba53f362eb818b0ddc1006a0eda80a27ee46a1ca90b321bbce1e5cc83d67493f74db04d63f6d50b90863915b574c1ab0da7300"; + sha512.run = "30c433b859248ad73c87daa65abfb816d464f8e1f3335aa6cf8d12a16d330b5a25140537dfc428b22540cab93d1c867e3b2dbcfc1b591ccaa41012a9510df8a6"; + sha512.doc = "a874989022eb3c75fb9c43d3883e960b9e9c56ad055edd90364292b0c102b04657addcf289d28303bcb6e8b1a9b7c0697ffd7ef7fc834ce2613ff0c063887ac9"; + sha512.source = "9ce6b3b72c14c620e05a0575c09c5cf871bd1041704d42e535a6b38ad2daab3896fb928031e19a16a02e91796cd10bfafe1a022825a7376038d356d237171f6c"; hasRunfiles = true; - version = "0.80"; + version = "0.92"; }; "talk" = { revision = 42428; @@ -32290,12 +33315,12 @@ tl: { # no indentation version = "2.40"; }; "tcolorbox" = { - revision = 56610; + revision = 61358; stripPrefix = 0; - sha512.run = "70647656ee420fcb3c832e8552c2340229b0586a638f7c55404f96f20dcb3e8fd2c561a44ece09e6f507a3c4e2be189aa4cb3a3c4d8bc338ca4396e5d4b9416d"; - sha512.doc = "5ec6c748b48b0166555437e0f75203e616e43a8b15787890b00d36df7c86de1971d2a876c5e7228f60f9ccd2e14c7b30ec061f35127a76f6194722c7103c9c0f"; + sha512.run = "c0e45202f18657a68a2701047f95325ed34b103a4798fa167ed6513b21c4219b886a4fa82ac7015c88a5b2ebfbf459934f80fdb592cae4616de9756df396f2c6"; + sha512.doc = "fb38e16b3ab149892c97071d4693ad1a61e0b75816313977081c9424f6af625e302bb84ab8b02ac709e5fac51231c3d4b8e03564ae3b3723891e98002687febe"; hasRunfiles = true; - version = "4.42"; + version = "5.0.1"; }; "tdclock" = { revision = 33043; @@ -32435,6 +33460,15 @@ tl: { # no indentation sha512.source = "56c1396e90a4c1db5dd28ae96c6f3ebe0310c163d7fdb2cb4e3ade78b522b349fba0bd43556165c282bedcab167241033b065feaac4c4a5e3dc2d8a8a55dca61"; hasRunfiles = true; }; +"termsim" = { + revision = 61414; + stripPrefix = 0; + sha512.run = "132615cbdbe257f2c7643414ef4b577053425e457a2e2ee2a9b4d8d56a7e6758db587b7f5223ef1a324931f5468ac5365b7dde7b971312bc8b8ea069ee5efb9e"; + sha512.doc = "af5047a490608fbb5769b6b4d3dad3fac6b9b20abb5dbaf20d08a633045ea45ca1a01f572d3f0701567a91a8429ae0c7279fa82f054e6fe0802d413765c46ccc"; + sha512.source = "45ad375a19ca939496f6f6546c9d2568367b3cd49c11fe1b2d94785448eb679d3e82c41a3282df054027636ca367b86b82dc3d937b42056398c23622ffa6e34a"; + hasRunfiles = true; + version = "1.1.1"; +}; "testhyphens" = { revision = 38928; stripPrefix = 0; @@ -32445,11 +33479,11 @@ tl: { # no indentation version = "0.7"; }; "testidx" = { - revision = 52213; + revision = 60966; stripPrefix = 0; - sha512.run = "003179c0efebe0bb84cf1ddc80db6d905af6cbbbf59753b4102e5f7a760b5e7c90057976e2d0aac138b001e2a211da8758f8e2285866ac34c8287e1d3b82d1e4"; - sha512.doc = "deab83c1eb6f77b379b38bc81e680e18b9fb02a4b147363e05646849af1fe402249c50a8eb41e6ecf60fb1cc505cd82593ae90c356cd4bf43fa5685cf5162f44"; - sha512.source = "de09a92aefaff5ad23898b7b5c4ef447280c3664eb468c433161cc82bb040f2c3fb265ec976f4d985914804a96422748b2dc20863805e066cfefb976110a1a6b"; + sha512.run = "e4179ab827eb21f27fabdd06674302ac141b6abf889e87c4183b4d86253ae35b5ea277ecb8ac36e66d51a4e25556fae092f98bfdd768d34728412f3bb8b5faf7"; + sha512.doc = "60761fa19984e3ab2a0b5420320a43b84c1174a4e6722c75523fcaff43206ca2bd01f24af74ee307b5cd7d12196238f86539f8cfafc27168bf134df74e2736df"; + sha512.source = "358c712d4073983f872dc9664bd6e138c7c66a420d1253ec36646cefa584c9148573fd978026de87d98806c71ea8f8f45c1cd0160b3be738d6fb9cd535d774c1"; hasRunfiles = true; version = "1.2"; }; @@ -32538,11 +33572,11 @@ tl: { # no indentation version = "1.0"; }; "tex-nutshell" = { - revision = 58471; + revision = 59448; stripPrefix = 0; - sha512.run = "63075927692bcb796c0aaa29303682f9bcd0984e41a344a4dbe7c21ac467ea2fbb5ea952655373e877d8125c676b867f8f26786bc3e40eafddc446a0e92ba4e6"; - sha512.doc = "0e73d7735132f81ffe5aec90254e640e3da839da8fa6b5e72afbc45266cdd806f0c1ac5ef0d88b1a2e606164f37ca5086082f1e12af28726847e39fd5bd61387"; - version = "0.6"; + sha512.run = "87db8b6801e09084f619bf20576ae68f94998934736eef07c9bdf18895624e5964bcdbb505a6a9b7a936dedc09b3e07d4f2827f3e7acdbf0bc99cdd67a75f96b"; + sha512.doc = "c62d2c448a6cda88efe7ea10c56367fcadefca423def8ff67f5e81fa62b0a64df2f9a524b4d2e3b2b579aa50c386005727eeb71462b9ee5415cca6e08aaf83ff"; + version = "0.7"; }; "tex-overview" = { revision = 41403; @@ -32571,17 +33605,25 @@ tl: { # no indentation sha512.run = "b9358f50caf39d274c1684d4514fef0439e015588431883955f7aec63d35f7176ed61671f72cda7ae28125b2a977f25ae66b028b21017f106d8f78bbfc7df109"; sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee"; }; +"tex-vpat" = { + revision = 60687; + stripPrefix = 0; + sha512.run = "e68812733ec787ad7fb7f80ad589fb0d207520a6fe6904060ce7c383d7d45805d206d3610e31c34dfadd011a32c81740f0fd91330b30a24ba2f64fbdab1d5f96"; + sha512.doc = "909865a736bc77a01e9ebf78c0650dc598acf0d2d078226541d5d236d72f08fede27343f15c0ca832fe17d0eaafe4749431974b062daa7076980e94dc104469c"; + version = "1.0"; +}; "tex4ebook" = { - revision = 56878; - sha512.run = "9ef3a2b820f1f7015b61b8cff017affbf8cdc07fb1d4c39f629e46e2457a08875dd83252526e75465ec75a42d6580b7ec75b085455e5ba62dd14dd13a898a8f2"; - sha512.doc = "0a01620564aa41d076a998910eff5a1fc45b7a0f2a3b2f606191e1442c49ed6685c8ac51a099834da2765de030d2f099a79fd03d6aebe08f78837f18638bc9d2"; + revision = 61012; + sha512.run = "6493b58680c1e2437f8c8f964722fd45b860b577d1090356952dc46b5ea7d1349c526f41ee0254655fd1d33df8e427d83cabcbd237696e95950c570970dd291f"; + sha512.doc = "b7a226a5249496dafac9ad09252ab8172f7c383a7f0cc82fd289b3831b7fc1ac53d76c8bedbb26c662c41ffa7502e773dc3f79dcbd3a2e26e62fb5d73efa21f8"; hasRunfiles = true; - version = "0.3c"; + version = "0.3g"; }; "tex4ht" = { - revision = 58348; - sha512.run = "240ab6f520939d3c9f7ce640740d6934e586a295eb959c503e0da6788833f3ffeab71215ed69dbb73c2b9feab09c169faa9b044576d629a43108ae97876cc8bc"; - sha512.doc = "1654ce5b2ff1099bf19c62baa536b8c54aff53ac59b0289eab869820bc105617e68240e8e87e635aba063734c765ad9b46075c2ee1f119bead2c8ffa6b6159e8"; + revision = 61362; + sha512.run = "624d0cb9c86d0a9b7f36a44fab3515ca0d480c843fd319347670d5bd2ef5b8c15974579debc3d674f23314e81362282d7b099568f4513f0b1deb4be8efb8ee7c"; + sha512.doc = "1c7f345d6666d4f474dcf3d38d2077dc739e532e1112880e5c63514300363d5c826320358cf666c5f291391c3f5dfad53d3b2648124717a84395ec427c57831e"; + sha512.source = "6d7a2b5e75c0e185aca7d67ca2813619e7101c0ae9af7a2b017462c3e6a423f9948da702395787e44a9c21b9cc939b7eb218807770c5dc0fab71a8c2ffe12b44"; hasRunfiles = true; }; "texapi" = { @@ -32629,6 +33671,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.4"; }; +"texdimens" = { + revision = 61070; + stripPrefix = 0; + sha512.run = "737074790de5c16de0e30dd6f708d6b8ec43e8d387ced2dc6b16b64f38854fad7367884abeab71fd41eaa79dc0c5939904314deed97331f9919a1fbefb0108d3"; + sha512.doc = "3ab30a8de33cedd4bdb9aa0a84104eb5b02be164de9f6fb81a51dbaa6caabe0029228c311970a3287cfbcf270a5430d6883756e9c28fc924a3286d76bb71217e"; + hasRunfiles = true; + version = "1.1"; +}; "texdirflatten" = { revision = 55064; sha512.run = "3cd6cf4d9ff3a1a3daef0bd5a998417696f6645cb54679e99e5424ebbe3926c45acad7b999ee4371392a7ba13fe3f2899438ce66efca7829c7aa1eaef84aa6e5"; @@ -32637,12 +33687,12 @@ tl: { # no indentation version = "1.3"; }; "texdoc" = { - revision = 58477; + revision = 59283; deps."kpathsea" = tl."kpathsea"; - sha512.run = "ace120045a48c29b207e94fa6a08956b63f4994374fbe5572a1e655046408126d094c0c89f9bb0350a6619b54912a89f4f72bd177451c84a9c3d182eddd9b5de"; - sha512.doc = "ac14e4a9f5bc96d8d3baf1d8ff41dd1c996838cb6e8e5aad5c6e9bda0a93af9e7c5a86d6da7b5bd6342e866c48babe76023c659a36234a2a0b5787a84c389c4e"; + sha512.run = "1504bbeb86a1329632fad25b98b967bad8c68fe8249f1ac9f4c017a50fc1c79994f58f3545681741213fe28d94b568bf4afb8b2010e93198a7df2c75bc3cebeb"; + sha512.doc = "bb79a2cf6c9a013a9b3c4c11597f86617043c8abea84b86f11a9ad5093655d68e0ce8d04e59b077f832c513c25e407d9ec06bdc412c3427d9ec43bb5103ea42e"; hasRunfiles = true; - version = "3.3"; + version = "3.3.1"; }; "texdoctk" = { revision = 54557; @@ -32661,11 +33711,11 @@ tl: { # no indentation version = "v2r3"; }; "texfot" = { - revision = 54246; - sha512.run = "9565c8106738793c9c14c8f42c750857bc64c324c190344267f99ee3e383f8052ff5df100298f4d7963ff44953c3af01a58ff8cfeee5237e0f07035ee6066be1"; - sha512.doc = "1779cc8d4a6dd35acc591f959500e155b5ce155b75383c7b7478e934d00c508aa84f8acf13b07a2e67f529bcd125c7868d3a30d851f293ea149cf5a56d3cfcb6"; + revision = 59040; + sha512.run = "101a37bb79e58f25c2a9198f1327ca911ab292578fb7d80769cee8d0b4459bec9e3b49addd64ac1064523de0685a595c4bce86cb272fd02294d3168b3db28bf4"; + sha512.doc = "883a70368bbc9797e7e2967a4c451f6ab735cba63d92d1ec65ce954cfdf7235ca2ad4291dd2fb50cc09eb0e6c3831e6befd67839ba9b9c522f1199f995cae772"; hasRunfiles = true; - version = "1.40"; + version = "1.43"; }; "texilikechaps" = { revision = 28553; @@ -32682,17 +33732,17 @@ tl: { # no indentation version = "0.1"; }; "texinfo" = { - revision = 57911; + revision = 61024; stripPrefix = 0; - sha512.run = "9bcff364b4f7e505f4301d54f8acd5fa248dabafe246c649abf4f229ad12c2e041935684741717e29f22a02ed3181b5619a3ddfe6e2047b16f928ab69b1b4295"; + sha512.run = "1b2dcad2c8bbb0f6c9e2487921beae4791407594e45ed07d111b476619985b863f20fc077b5bb3d8108407b652ddc3f79d852367f8bfaf70027f4fafd8c3f668"; hasRunfiles = true; - version = "5.1"; + version = "6.8"; }; "texlive-common" = { - revision = 58055; + revision = 61281; stripPrefix = 0; - sha512.run = "c6118e4fc9264f731fd05c59d2b593f05244e247cd177f5e30f32bc9bc57b680317ec6e74b6cdad8053711522dac3a6a4fa26878de68bcc3279e1acae4a21883"; - sha512.doc = "b137633217b0ebf37f97c96f589534fc9755d266a1f7fa5f2c11e4f1da2fb607eb4970769c19893e0def1a6a2e19b9a3c05daafabac8171b200aea733429a924"; + sha512.run = "98e8b947bc399ea0ce4c5de8aa8bb811c57e9486fd419066ed323b151711f1cf92e7dca7e9e8c0f6e8e96bed8a38d1b51af8a0cb9d98636b1e44ec3a5b2cdb6d"; + sha512.doc = "ba7d2425d50de29f0c0dc4738b27b5eea24974bdafa790d301e223e4d45d44a1b53c7892fdbe1add59261cf41d1a65795faccd63dea7b76d5c48994dd5edd022"; }; "texlive-cz" = { revision = 54496; @@ -32706,16 +33756,11 @@ tl: { # no indentation sha512.run = "eb70ac7400ce4cbc18d3ddf2c37dffa175d0af2a8eb36bfa17b9868e606d1be7b1994496143e1a1444d17f2e2ac1c20cade92485cb846aa16a52974dd9692a6e"; sha512.doc = "d51df93981312475c5c4b4976e4de00441d6ed4ea9e51d30d5c8360e314417f9b33c5804acae3c6d50c714bc76966120de37095b3ef33c78c06744ca17e3855e"; }; -"texlive-docindex" = { - revision = 58780; - sha512.run = "817744e5fafb65fab41232df0a2648c0b8962d8e7d5ec997fe349b806479eb93cef89d9c8f713da58ad028fe493b04a446c3438a819f849c73c01dcb42fac6b0"; - sha512.doc = "27c5144b49bae0a71ce33ae1aad7221a3ce8e0c1a338df5d47100d7a7b0f67ff1c173b98ceae89a0352ad84058f4771cef32aaa9c1713f989b3aff4c2fc168de"; -}; "texlive-en" = { - revision = 58572; + revision = 60536; stripPrefix = 0; - sha512.run = "e154b4236933f7f11f6a47d2dd06916ca363d3a49ddba6f93cf330e4a159c7dcba7a98fd331a1e294b89f4cd241eca7c2170f2db3e3efaa08015d440e03c497d"; - sha512.doc = "0e1d621ee17672a2ddc99502224c578297dc80a67361f7ae859d5b0703fe0c16547ac30a58c6ce83b374dd0d783f37d9f499a7da11945d9e347ba68fa5171584"; + sha512.run = "eac0677660ac137244e06125215f8f04a58e361e990fe219a50381a1d4e3bebccb58b0c1ee4530b90672aa3c7f364511364887026bd2a355ea70c1b9c9091a7b"; + sha512.doc = "fb985ef820a525e7b2ae7a8b67c49fa798c8ea333513f458be4e0369765f56ef4d68de00aab6fe0f93caf7d68fcfe18fffb6c06b6fc161a0f0be4674ff68611a"; }; "texlive-es" = { revision = 58221; @@ -32742,8 +33787,8 @@ tl: { # no indentation sha512.doc = "1445ec4257d202f77452df48e70105e423e048ae9150ad70acbcfea350f8b8686ca395e9452d40eedbd6824df7a2d8560c5c761fc867cdda0d2ba9182eba5f16"; }; "texlive-msg-translations" = { - revision = 58781; - sha512.run = "6a6b677189e276e62e37b904563924821b9f85eb2faeafae9b3399f68387a999ef3998238d90b025afe0d7f4f31f45bb1e50435aab7740f737cce01cd8553aa1"; + revision = 60760; + sha512.run = "2d9b5040eda6606ecb6050452d0485332f6265b7876169f1507c629d59d587a5c74a9b7bec606d8e028a1cf5f5bc9e0a92d30d36588ac637bfa1d9508e862f47"; hasRunfiles = true; }; "texlive-pl" = { @@ -32759,15 +33804,15 @@ tl: { # no indentation sha512.doc = "40e8b29f29ed61addc2b9e7ce4b73d12bf2e59f1c50c65e59e9c8cac5e6c3ef264ce2071b0d54e15f5029c101a51d0efcda0144e113aaedc714eb1300aa9635d"; }; "texlive-scripts" = { - revision = 58791; - sha512.run = "c0f8f816ca1d149bdd493a7275f8de532e5a8d6f8b4603e7740c5510db4eb5cfb3e6d3838bc496aa9f8f1176ef9c1a7b1beb17edfce5c0a7cb9b4b684d2bc0c8"; - sha512.doc = "9409e9d7170ad1a9c8cee2f65a31f538c81d4a2945c91978ed5a6bca32d1b9d2033ce6a3f7ba999ba8e78f4bae370cae76235b99e898c64bb104d8290c63c9ab"; + revision = 61410; + sha512.run = "d416567a07229a424dbc3fc7d8ca3333eebd4a176d6ded56e31648f7d94bd2ccc100996566236b598942e680973471efeb3dc8f242990f1ff8e3390460c5a52b"; + sha512.doc = "e1103262c70e3d92f3ee6bf8f5b0a5ff740b5fc165270d0b11f5b63870cd6cd71b3b77ee86c8f23a4d511990e52ec3a35b82185e1e2f28793ecc54698571b2ce"; hasRunfiles = true; }; "texlive-scripts-extra" = { - revision = 54744; - sha512.run = "e46691aa10b961d2359359fdf00ebc86a1b881b3d1126c52f3863343d21eba00110cd9500fb03a4a9544a3d8fb443bbdc90aa2f6216b8e62a3edb0acc58e4c75"; - sha512.doc = "56f9be73e3318ea684c536b90645b572caf437b16339104bcedfb7517c94745a514a8e185033c2338aeccae868a123a5a137b9b07b20d661fa473bde2c28797b"; + revision = 61101; + sha512.run = "af3078fa1914b69fe66374489f117201dc7aeaadb839656892970865afce2e2cefe8d6e04f28447036fca73aabc61e7536da915a05ef798cb6980de2a82794a5"; + sha512.doc = "275d9ee5d858fad06d63d3cd9b1a4c1c9b8d26a312544fbb3346bb9eb337436a74ebe3bd9ca23dbaa51c582d7d8d0825c8965c6e497a206b63b66abc49e509ba"; hasRunfiles = true; }; "texlive-sr" = { @@ -32802,6 +33847,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.3.1"; }; +"texlogsieve" = { + revision = 61328; + sha512.run = "badcd49c37d94e74b342512fe441b552d09347749ae210fd9d4a01be4cb019064a20759ba323466ee358e61da3eb190a87560f6cc7e12baa77dd8520924cc7f4"; + sha512.doc = "e3ecd023b1ff72e5347ecbe5bc1c148e9ae2cba41657129fb501bbd0d7cd24841e0221e27e5f3c1211bbaf92e118ba58090e8a9d6df07b49b10600e95551df11"; + hasRunfiles = true; + version = "1.0.0-beta-1"; +}; "texmate" = { revision = 15878; stripPrefix = 0; @@ -32845,10 +33897,10 @@ tl: { # no indentation version = "1.7"; }; "texplate" = { - revision = 56083; - sha512.run = "dc7f998438ad699af41d1a83214ba5b62399c5390ad1672b40ecaf9bc48fd04ca91bf4ceb1bf75c89351d612d8c9f0acd3bd145b5560673bb864fdb4c18375f2"; - sha512.doc = "620f820e08f000032608280ad4e93d5aabbcf6e42008c1f74d2b876d5fd67724ca1d6ce22d6046184cd4e0ec205f4aad767a24db79d11e6c40269df32b5644b6"; - sha512.source = "e87854021487832cecab1cb8a5585d44c25a80c52ed4d020cebaae9b7c1c938c3ffd43ed51a1910442440131e4d8f6acf2af095b58d2a119ea279e3de78736b6"; + revision = 60096; + sha512.run = "8a373115e5826f1704d80288d4a56803c0ad577a5745625c5cfa3272e3c77543cd7fec1cb761fcb1d6a58e7b5a4b37dbba9a7b4387e8abceed8d526fa18d0e19"; + sha512.doc = "8c3e0b7a3606dc9665db06138b7f7aeff0c4a822afe85c7509f0bfc0072898db8203a931c4713b455aac99c850c908d6c0ed8d68952a87b574f8c8943fc97dd4"; + sha512.source = "e1240d690d0255cd80cf28bd1f44e2269873df8a8e85f8129992726c530baf7fb3e202696b3a30afbad7010df4e3c0fcc695ba91271e1837d88cb5322ae754bc"; hasRunfiles = true; version = "1.0.3"; }; @@ -32891,6 +33943,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.18"; }; +"texsurgery" = { + revision = 59885; + stripPrefix = 0; + sha512.run = "39c270382bb228beeb9ec61f744f66805c76a7fb1522158a59daa5dbbf29b3f4151c20d7dbadf404cab8ca023456b9988d45e53f65a1396da9259832390a0980"; + sha512.doc = "76fe49291714772ac56097e5869f82868d149959bc091d3e9b1810013c92440c05825e2d585841a3e7fe015d66e09c3e8a92847fe7fbb8bfbe308c62919e8c26"; + hasRunfiles = true; + version = "0.6.0"; +}; "textcase" = { revision = 52092; stripPrefix = 0; @@ -33018,13 +34078,13 @@ tl: { # no indentation version = "2021.03.01"; }; "thalie" = { - revision = 51789; + revision = 60616; stripPrefix = 0; - sha512.run = "193f59cc9fcad15ca4fd52e011152a08066329ed496ad55d4245f232a701692b8c3a33f24d457358d696ec540041beb90ef37696a77b1685f22f15031665585f"; - sha512.doc = "104972514a171a25557b5a0ba6501be9556f77eb7fdedc60843797ba7fc53873b75cbf4e470dfb76866e6042f77c5c39ae86367a119f64b34a18183eb0ef1be8"; - sha512.source = "31b0a6d7452e3b5b8affa9e4e89146c90b7e9f2af60eb7f741d4bc5722147c0ca2a902fb61b23d9a47c3bc32e2e5b38a170f3a194049cd8a1009a7d4cc199995"; + sha512.run = "0168959893d199a5d777f59fc292e16e218ae8f0f30845ccd25f33f0db9bfcf1f4b76c1e9eaa5a50e587908c1f4eba397233a2fa01cb09dceb3a76fcf2b41858"; + sha512.doc = "01b0ea91c0bc1f54ecd87fa4a48d276e218c5e92456db25728ee6c337646a5138951d3137ffa775433f30634fc83a8011815496fd44a40e91f25971c6c4af5e1"; + sha512.source = "19ba8bc1713624d6a944cc97fe3267b1614dffc5ee5104263105326feb3ed5dc55c9d8f7f86bcb85342147715503f7ddbb561951f216188eb72c0edd46431a7f"; hasRunfiles = true; - version = "0.10b"; + version = "0.10c"; }; "theanodidot" = { revision = 54512; @@ -33062,13 +34122,13 @@ tl: { # no indentation hasRunfiles = true; }; "thesis-ekf" = { - revision = 57207; + revision = 60228; stripPrefix = 0; - sha512.run = "34f9f72bd8ef813c0ef6a01956304ef99f8a0fecf17786f9aa51fc6aac4655f5a76aa030509379699f6dcbe6a7245cd1d01f2fd0df8fd3bc77e5f8ddaa0ffb8c"; - sha512.doc = "48989f4df56a2820c048651831b598fd3c956ffb2733a9d3e8a68891e7c410a72425ba3a32a4a0ecd6f7640f7054d85016c7c9dd129ad59849588cdc09547548"; - sha512.source = "45c2329fa7994a119e1c8c2d3e777b4ab1083496c538edcda3382d2321a4b7cea97daddde8efd75bad12b79d95d635f45bd79f1db682a384ef320d4b000c1ec1"; + sha512.run = "7ef62e88cf25c1b7c37dcbdba00dca0fe522727cd6d1b5bf27cdea73e4638defd2430c2440879479427b2faea91315203179b8f45224d68067ad46810dfd6da0"; + sha512.doc = "50220e7cdded7a36703fe4e0965d19e18c6aca7a8f738b4808efc28d472f01522b456474bfb6c4d43ecc61d81173f0025918b302083829e849059fbcac5e096f"; + sha512.source = "a479e92491a962f549ba9a2863504efadfa5a1515d209eb26a541ad88a5bd8657ee3f3492e99068f3dca869e8394ca9008a074c17d139e2a22325364b0a7d89b"; hasRunfiles = true; - version = "4.1"; + version = "4.2"; }; "thesis-gwu" = { revision = 54287; @@ -33160,6 +34220,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"thubeamer" = { + revision = 61071; + stripPrefix = 0; + sha512.run = "8391507179c7237588645f08c0611ab441cb4f426808bece8122ddcccdec8c94457efb8db75f7078b6b2adb6430350d5279bf9efa091cecbc263d31fbbfc11c4"; + sha512.doc = "fb2383dc358f2d0990a3f697746b6941a04116af8f184dbc37cccb100bfb19fc72ecd876bc581234c6dafc2c897576992fe8f741fea07ee0889bb1f51555601a"; + sha512.source = "775b719a02f4ce703a37844cbff77e476c35dc105f8c370e6213f157053a397ac80295cf67c84229ff565e997bb89d89f7db209c7f84d8e47b4c92acca98ff48"; + hasRunfiles = true; + version = "1.1.0"; +}; "thucoursework" = { revision = 56435; stripPrefix = 0; @@ -33203,13 +34272,13 @@ tl: { # no indentation version = "0.1"; }; "thuthesis" = { - revision = 58750; + revision = 59411; stripPrefix = 0; - sha512.run = "96dc085764a25d523d12cf695c5aea632b26b32229f2c5e02ffc9f2bf3836c12275dda9b99d0e73255da84ab26fd5a6a77f4523dee3051097e84cf450cac0bc5"; - sha512.doc = "f8e4d36746018a60dec5295d34c319122451ba771965fe51a85ae99704c52a2e71b9aeb4380361b38b0f91e6369dcc1f29cdc7f2490b1cd82b989a446479a6bd"; - sha512.source = "03a297ecedb3b5ed980544d0afbf47a4ca0561f3323451a4bb4d5e80e9ba55c0830db81b3d2a5012ee088882ce05d58991fbbd37ee9d2f793e3b7fe2d2ae8be2"; + sha512.run = "e11e9fe9cc1c9739a1ae2f34a3a628145b8898834a03a96aedd6d6d354c0519137d16e8e3fd3090e44bd3caa9f173f1df4053c3139b6ab874d616f6c141130b6"; + sha512.doc = "f7a6fec40a8768e94753a0391d39201721985d0da219a830caaa2716d9fcdecf4e32fc56734e52e2c77ba64d93f206c476490684672e11044991ce1e854d189f"; + sha512.source = "df772cb4f627671e2d74bfe571156dc81214bcd40b5db3b278d21740b1dfcd971d051edbb917ae51bb8bcd5309d8251ee6d84c5e01d6ba5a264254f0479ef43d"; hasRunfiles = true; - version = "7.2.2"; + version = "7.2.3"; }; "ticket" = { revision = 42280; @@ -33242,12 +34311,20 @@ tl: { # no indentation hasRunfiles = true; }; "tikz-among-us" = { - revision = 56820; + revision = 60880; stripPrefix = 0; - sha512.run = "70eb06187c5146c9238e2074acdc39df7b40b9bef3cf34cd820d925ed482df07a1b3042b3f83e6cece15eefda4d28b483888c1b9628a55fb57cc0788ca263746"; - sha512.doc = "c272447fed242f2d6539c665684732b0953587924e4b921872bc420ea09a2c178779903c5f44ca72bf7a310ac03c6367fb5e801f4c30000406dd93c8a43098ab"; + sha512.run = "13e082734e52205e78e804b708c920836c04e9b11dac23e49a8e86d40209ce1e074ab5ff30d97b528c027fd45252824a41daa850d1a9669987a7a59210f7b2cf"; + sha512.doc = "6146f3ee670400e39771a264eaa81a9b4b701a47487c7a4f9ec26ef26a93641062bc61893f71c4f66c8a035d52d763aa94740d9a00f5ce5b402272d67af93ff7"; hasRunfiles = true; - version = "1.1.0"; + version = "1.2.0"; +}; +"tikz-bagua" = { + revision = 60785; + stripPrefix = 0; + sha512.run = "a9fbe763711c464dc5875548eff6fa34481529b5b463b187e7d73fd43387fd3c6cbd23db1c25575d4e7b4fe8e480f7cb025290cc379dac474a6c66e94baa5c63"; + sha512.doc = "5476a904e14b6ed139ffcc585039aa17a3203ffc3cc9cd8c4f9372608cf336c44d9ba3282b93307f8280dc896d2ffb494b2d0e1f0e2e898831e5c3e074ef22bd"; + hasRunfiles = true; + version = "1.0"; }; "tikz-bayesnet" = { revision = 38295; @@ -33266,12 +34343,12 @@ tl: { # no indentation version = "0.1"; }; "tikz-cd" = { - revision = 49201; + revision = 59133; stripPrefix = 0; - sha512.run = "3fbfa7731eeb6d2b9cbe67cbc4d5470e235f6f990b76b3c82961df172fbba9a8f62ec6055743098cbdb2d3d8aaa3b94f5d4dd8f735624c7d9562de6aa72fdda3"; - sha512.doc = "63be72c0d55112e8328d40ae4fbd1e3c92133615e28f032f9f5efcf2432b6cc440b3c4de4ba46f3eb9e65725caf7de3623a8b49f3b9a87ef780dbeacc536df46"; + sha512.run = "abe5952a90172dd74ddfd02834ec9fc632f26da00450c310eab2528d5b52750e80225219b75e778d1f87b2279e654bb743804da19ec7da91f12e4105f9ec3447"; + sha512.doc = "ec354963bf8915a0c0b68fa0223c48ac48fc0450aff936c34e4c95fe15641319b711b753da7da542352e0fc6e9bbeec627de5a3023b4b90828ee05a81ca5d255"; hasRunfiles = true; - version = "0.9f"; + version = "1.0"; }; "tikz-dependency" = { revision = 54512; @@ -33333,12 +34410,12 @@ tl: { # no indentation version = "0.4f"; }; "tikz-karnaugh" = { - revision = 47026; + revision = 60750; stripPrefix = 0; - sha512.run = "aef1c5e3fe96191d0dbe55ea9f2307b05c328b92621e9dcebf4f8fb862ae501bc6dabd4f96915a800532723b447632e21110cbfb9483bd73dcef928b102bfec3"; - sha512.doc = "b17971734dac21649b75c140dc1dca832de35460ba5de9e83f8907ed075fbd0fc2872edd39da7aaa5631b126ca0d59d1ad440e4fb2e68ad277d7ea4bb8975440"; + sha512.run = "46687db5ab1ca3789ac98e438e14daffdd3b64db2ab3dfd7e6110b0ce752901d2e46f54bf10af19e5947750c568e2924ea9886d78941528dfe0a922a44b1b492"; + sha512.doc = "2bb3b177a72aad086cbc0ef263fa8a99993327afb55d414f03a79126f2353e0abdbe743b946cb0ccce67da4ea933edbd866b2a3ef6698d3ebe692751f9edd888"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "tikz-ladder" = { revision = 46555; @@ -33445,6 +34522,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.1"; }; +"tikz-swigs" = { + revision = 59889; + stripPrefix = 0; + sha512.run = "f1e10c9cc4625fd2e61113f7d5c1cd637efd35ab9b0ccb4308837af3e384ae412bf068140a0924b0bad29e305fd4ba5a0770fdc1467e82cf85dd8eea8289190a"; + sha512.doc = "3ad431f150914461149b85fbc7ce05213c5176e6eaee553ecbf8d150644bc36fdcfa2d836e5201d9a8aecb58751eedd8b98a06ff305c60688766ce8dd00c817e"; + hasRunfiles = true; +}; "tikz-timing" = { revision = 56291; stripPrefix = 0; @@ -33456,12 +34540,12 @@ tl: { # no indentation version = "0.7f"; }; "tikz-trackschematic" = { - revision = 57300; + revision = 60767; stripPrefix = 0; - sha512.run = "3936b79ad3e687002ea2d52ef03bcd468518bf67e24a9e6eb83e9c5379bc244dadb3acbefd3bbfdaa84a5811f32b89a7bdca2bde4861ef6bda2021e7ee289828"; - sha512.doc = "0fd357b0e571c0bb9b0954338ab45147748574143c01c413700d7bda39d0171f037eb207770fbde9b366618fe60f5cff82d17900295ec14322373f2fe0f919ea"; + sha512.run = "d293ba361fc713c616d48c146cf3eb05b0933c1d0963c6a4a7342843833ec339033bb48b17bcc23bbe26948b3e2888f2f4dd940dbd1c8b212688d651c7264b3d"; + sha512.doc = "ad6da1f9789d63690f13e0475c743504d3a16ec12701b2c777af4716e29c482d90ea9c8d8c34a746479a1814525095d0b0ac2bb0c38737edfffb87f293bf6b31"; hasRunfiles = true; - version = "0.6"; + version = "0.6.2"; }; "tikz-truchet" = { revision = 50020; @@ -33471,6 +34555,14 @@ tl: { # no indentation sha512.source = "88a3d1ca19871e0329e40165b35ec90ce65b1565d42b4a678bfe611311a0cde68a6a8c67ff3ebdf78a1bafed1fec875a4f221efc6934724a265a3402d4970832"; hasRunfiles = true; }; +"tikzbricks" = { + revision = 60234; + stripPrefix = 0; + sha512.run = "be1ca46d4c88928f624921b56e8b21a85b75706673800a3f1d9afe29fbf39f84f7e8b0cf55212153554b05e8026f6fb7f625ec86eff7f8ec01d790e11740627d"; + sha512.doc = "a4178b3def5a9106521e3a5839edd99ca7517ef805661a4b99c45849501088b1aaeccd8b0488c4e03f2d44d3c22a48615ec93190a438f853e3aa68f573b964fb"; + hasRunfiles = true; + version = "0.3"; +}; "tikzcodeblocks" = { revision = 54758; stripPrefix = 0; @@ -33497,12 +34589,12 @@ tl: { # no indentation version = "1.0"; }; "tikzlings" = { - revision = 58469; + revision = 60181; stripPrefix = 0; - sha512.run = "14b75aaf46f45208d6bcf31cfecabbf3432c1ad1fdef3fe9db674688c2924d8c6cb3c0c27d5fcd8ebd1409974789c9b5c73af5fb51b29909cb79b468c742507b"; - sha512.doc = "434f9dd2a4f5c8cee62f04f68b50a4df416efa6262e0708b5b1acbf310ff7240fac2d0ddda119cf1a37eb1c811a38516070d412b81e1a809d31ef4e2ba96ac40"; + sha512.run = "fd475905e247156f3817e0bfd576532f00d4499cc1d282c1fac12445551d43a5f259697f102f8d5a4f967a114494e29ca839a74b80e5c4fe9579972f8bb9a688"; + sha512.doc = "bc7941d397031b9f50e584bcd14aeb86fc736a135264273efe21cc42b8a235f9eeec74ff3217f9fd4052c6d77ca7885c79eb614dd237d3fc24aa14c25f7a9cb2"; hasRunfiles = true; - version = "0.5"; + version = "0.8"; }; "tikzmark" = { revision = 57843; @@ -33581,20 +34673,20 @@ tl: { # no indentation version = "0.2.6"; }; "tikzsymbols" = { - revision = 49975; + revision = 61300; stripPrefix = 0; - sha512.run = "6061fad290f71257b2496faabc1a11721518274964a18dc1d31d1e530de029c7418668444f868e6b660eea5d85bc440dbb7796fbf6cf181ec190ff34019b5aae"; - sha512.doc = "b688b3d4e2ec3352000b7bd8842736bbf52b10b5215725fba7970e048e4e823c0d522d753adf8c65be3ab6d1c091ab9b01b68922ba2796c012c4d948e3958f77"; - sha512.source = "c7a3d6290a1eb7da4fff7f7f9fb2ef4a8c128c742023da966444be2b662bd98a20e7d3d82ac77637caa0067c2b5ec5ddd84ca224bf793e5b65eb637e8ebbc814"; + sha512.run = "4e1a479e6e238026dfbdcf152d63c8b67419919f74bffe3c259828a5ab6bec62955cfe5f5a7f407646fc2e5b742fd009280ec4a57cf708317bd9dad95a35a1b2"; + sha512.doc = "7219e48fc2407bd44992378b24c5a1fd0b9c1a9a9c408de2734966657f83735b8cda336d207e9d1593afe0fc58aff7d83213a9ca4be61201df98757e2e4ade75"; + sha512.source = "546f813ef97e1c6d286b4c79e2320bae75e2d94e43d9a15b9d4c6786bab9027c2aa86ba1ff5f94149849f7c11834408106623929b732f8b54697dd7f2916df3c"; hasRunfiles = true; - version = "4.10c"; + version = "4.12a"; }; "tikztosvg" = { - revision = 58737; - sha512.run = "826b6cc6489db99d4b7651afdaf68117840e8aab4a19235110128af63cf26108fe409fba341acd26ef1ce2ba6276d368bd00e83c7b5954b1937d50b4d3c3fe8e"; - sha512.doc = "1418c505769ed1fe835f713cc546305a25b6a96a16a7e6dbf9938547824b59fbf4d638c9d40ec7ed1c23fb110ffb482062884eefdd432db1e57b9e567ac299a4"; + revision = 60289; + sha512.run = "0957b87c9a06771afab350de769e3fa9f97ec0aa09e4e740d0f916992948a65740a96446a0f8ac144273e94f228db2c6c0ddb22bd01ea9f0f66abe5adfe0125c"; + sha512.doc = "3d90c0963c570a115390603bcd5f39a224a155faea8ac6eec511b9689ab98383386d3d6e92076129e0f704d69bd18da52cf2f89f5db024a4d5c34a75c1edf279"; hasRunfiles = true; - version = "0.2.0"; + version = "0.3.0"; }; "tile-graphic" = { revision = 55325; @@ -33654,6 +34746,15 @@ tl: { # no indentation sha512.doc = "c69333d9a7d335fb217dacb00610b9f0e5eaaf78e535d69998fc600fe53f0ba61c7e3cc1e82d75f52b435cd6945044560b2d275476e96d84d611ab4978c02e3f"; version = "1.3"; }; +"tipauni" = { + revision = 60669; + stripPrefix = 0; + sha512.run = "38ed0adc940cbbc1008079b542f5207341b7ee47da571a309c6786c43b505c9afd73ebe08e20200d914de30283c30897be1b139de1a828c52858b0543631e766"; + sha512.doc = "bef81b313c0e9e738bdf6c9bfce2d4905c8dc886203c392c55a4b90796df91b40a9440e7e23f63cc76b947df1bfd9cfdf247291ea27d9fbec9070ed380e36048"; + sha512.source = "4c73876a8fd9e465249d712cb2d4ebe29eba59ef4c66a2e58353feb303bad6a2e4abb640814eaeb6b4f32def15a5b464395bff1a28b556d5c6a6dba24778c155"; + hasRunfiles = true; + version = "0.3"; +}; "tipfr" = { revision = 38646; stripPrefix = 0; @@ -33662,6 +34763,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.5"; }; +"tiscreen" = { + revision = 60551; + stripPrefix = 0; + sha512.run = "5f3506fbb5952be7477f9c29bedc6a1ef229753ad12b484e1c286c6211bb5fc62df69f9985b44740f12728e067c69140ac064d764ca034d1edae099f623413cd"; + sha512.doc = "c964f4b02f2399bc1bab1753681442076099c2f7377facf62241afc13a2db877287692b3020ca39d9a56370b13a8148d45317a4643e1552b7a436dc87c2da0f0"; + hasRunfiles = true; +}; "titlecaps" = { revision = 36170; stripPrefix = 0; @@ -33699,12 +34807,12 @@ tl: { # no indentation version = "3.1"; }; "titlesec" = { - revision = 52413; + revision = 59845; stripPrefix = 0; - sha512.run = "bd1538a4596c55a6e0a542df5587f4466795a59ac55472340bcfc400670b79a04f0b141ad5705c826789ce0094fa4b106b5917f4232167a66047d8e6edd4998c"; - sha512.doc = "34623133da534fa15d491f3ecfeb6ee6736a580c12577d7ef313efb341c97ffe1cfac49f4c94b90f8f519847bb7b0d37b003ee485c240d1dfab3b68426563dcc"; + sha512.run = "50af3f379bedf55c3c53809dfa5dfa8fa4ed072e232dde83f4a257b12d7b4bf06f041eb6891b95fd0efdf9420a5d252cb9688c28b91161036eee7f45516a8b86"; + sha512.doc = "04ca9fb221b3c0c83ef5c3728b9a40eb46a4899b83837c90017c5436468c02740dfb861abb42e9987dabf63858730f4accbf060c67ee8954ed7481f334443798"; hasRunfiles = true; - version = "2.13"; + version = "2.14"; }; "titling" = { revision = 15878; @@ -33800,18 +34908,35 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; -"tlmgrbasics" = { - revision = 56221; +"tlmgr-intro-zh-cn" = { + revision = 59100; stripPrefix = 0; - sha512.run = "d75c3eda16591cd7c6f3ba2e7e615a854d019ca850fa4d9428df9efe792764d885df642b65eb538b0bf6ecd9e4b5f4e41d82292647e24980b65987dfe7332ce0"; - sha512.doc = "4f9eb5189bdc3599e3b691ae69a5bb89894b9b60c7838772a41b9784a6a33323a634ac6892f88234762219fa99665a2079df5b0127d98bb396a66844ccf8cb11"; + sha512.run = "a89c2f99ad63c8352462ef7139b36e8563e1db815dcb06bd2e0f8b96554c380b574f7d856aa6bffb3c972bd68e9505d7864d87cfb7bcfef1bdebacd10f14a96a"; + sha512.doc = "2b5a7672c600eb2f4cbfb2810090e4383a7032d851f35a74e36c75914d9813566603019f232715e2e39ab6d2f8a60273c01e5cbdcb345892b0bf8c99995e3d4d"; +}; +"tlmgrbasics" = { + revision = 60588; + stripPrefix = 0; + sha512.run = "5b20d1fb4c6493f0da80f529832c3f45d70ee37bf970ffa1fa3ee56d7ba344b5e22b71c304eecc21d5b0040280d66382057891b39a3541c9ca08bce0ee779277"; + sha512.doc = "1af96e3a29ad685781c0ba03583f3091f2c6e1c0225456beda207f9f212f75c93c03c76f1b5ac401fbdc2e6cf9a6077193d6f59a37dc791e63d7c505ce5c47aa"; }; "tlshell" = { - revision = 58792; - sha512.run = "e1b8fb26778078e3337ff8d779499e4ab2297eb9b061652ca3e565810c171e09adbc987c64433fb572e89e7025575a4304c46ca208043779d74b29e0be66a787"; - sha512.doc = "60378a288e8f00d4e15dcc35919836623958ff47ae887972c01e38fbbb534cffd619e2e7e60e85352efc36f089f89ecaea971b4e2ba19b3186693ab9011017a5"; + revision = 60747; + sha512.run = "adb0a38914e4611652250670921e718a2173685892f9fd2943717c9ff31aa40e6661d445c89f6c0c5f091751e0f132c3713eb97cf081b02185364c084c17c98c"; + sha512.doc = "6900792b8bdfa659ade7e0e6bef48a8baac5830ad38a933f97f05e35e0351ff7b52267dc06cf2cc4179f4a36e144322fa2a2a82263768d658e08a81cd3212d61"; hasRunfiles = true; }; +"to-be-determined" = { + revision = 60582; + stripPrefix = 0; + deps."soul" = tl."soul"; + deps."xcolor" = tl."xcolor"; + deps."xkeyval" = tl."xkeyval"; + sha512.run = "e2b4f84a8ded4d7bedf5c1fd0104f5f585a52a5a44ebb9f2a679bedd6fa9f4c68b8d9dd3a36463ad7952ef0daef46841bdb21630671938defcb98a226f4e057c"; + sha512.doc = "031aad45963ddba396e004b21f4d773625fb6c2be7257c37873bb64ca94fe63f4c79fc3ec74b279da21573bfd125cce9349ed70c8181efcc9b5e503d898184c1"; + hasRunfiles = true; + version = "0.1.2"; +}; "tocbibind" = { revision = 20085; stripPrefix = 0; @@ -33858,25 +34983,25 @@ tl: { # no indentation version = "2.142"; }; "todonotes" = { - revision = 56166; + revision = 59465; stripPrefix = 0; deps."pgf" = tl."pgf"; deps."tools" = tl."tools"; deps."xcolor" = tl."xcolor"; deps."xkeyval" = tl."xkeyval"; - sha512.run = "a58ea15caf11a535b1d01114160f28a5df0c81677939355caef22b1639053b2dd4ec716a2a67a6342565e50ad7681d660a84b391fdb8c34278ef0dac3cfcda99"; - sha512.doc = "89308d95e71809a7ccdbf0f425b536e975fd1f86b04ec5cce041f3f61420a37ddd0863df9ebab2f714e8411649a848d59bfaa2951a62bb47ec875382b31145ff"; - sha512.source = "d4241c1f94390d8c2d4a166b5bbafda1e93338a4da82c72581ef2d488b41699040255d775b26289183a7848081d5fbcf27233e735a5fcc1c29a35feedf70ebb4"; + sha512.run = "78f84bcaf613003f694dfaddff2631cfe34c081ec5aac576a267f99940abcca1c8c71dc801e8df295c585a4db06517e5cce4671aef4188b81feba4be1ed6eccb"; + sha512.doc = "89b61bb5630846a7cf739f39cc43a4e08890a4b0af06c884a60d9ac30068044c89cb99578aefe3b08c5761a412e524dacd79b028e69430d87ec17493b42ab7eb"; + sha512.source = "e7bf0b61f1ce386b727f54288d1c6486fdb784fb7d7fe42e5a86f0815766df33881214579051c57325d6963fa7e073469ce488aeca816f7566275318e171fecc"; hasRunfiles = true; - version = "1.1.3"; + version = "1.1.5"; }; "tokcycle" = { - revision = 58254; + revision = 60320; stripPrefix = 0; - sha512.run = "b65bfd661b170277c89db47655a64f47b61b90da9ae6ace0f6de1264c109aa5c9900b2098ab3ebbe1c2284a4c0b725e876f272246f353648b78247d7c1b29bd6"; - sha512.doc = "2bc13594efa21656bc136bcf6d7358d3cf8a3eb61094d6abe427e958eef26a6731959c01e37b1a0985ee0a9eb7e22f25ba065b697718e2db6a968aa861c5d7d9"; + sha512.run = "fa7beb7d6dd1ee5a6caaa968d425143f946426e98a164d1f1b44288105a6c8f57d94931782616c3926493f0af9709c5836bece10aa7ed6c2f1623f8301ff9bae"; + sha512.doc = "dcae2b95cad3150dc8879061d8c546074116af04a970a7c2ad9a91292597f3c859927ebf56ffd58aecb995a9968fc8221b6250efddbdce80edce96fc9c906b48"; hasRunfiles = true; - version = "1.3"; + version = "1.42"; }; "tokenizer" = { revision = 15878; @@ -33886,6 +35011,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1.0"; }; +"tonevalue" = { + revision = 60058; + stripPrefix = 0; + sha512.run = "052216e492b58a5e8ad4cb3f346815924291f3d24c995d42f22f189e6601a7b4236d434684d5777ea10d50a3d77f033b02ab76ad1550c0ba1ec275a6d22bf4e4"; + sha512.doc = "b9bafeaf2a089f3537767a51923ecb6d7008009f4fe2fa74cff71f7d7358ab52afe4f39951efc04d29e2bca5cfab4ae70cf35a9f1e895377be4cef2ef0c523d0"; + hasRunfiles = true; + version = "1.0"; +}; "toolbox" = { revision = 32260; stripPrefix = 0; @@ -33896,11 +35029,11 @@ tl: { # no indentation version = "5.1"; }; "tools" = { - revision = 56514; + revision = 61041; stripPrefix = 0; - sha512.run = "2598798421318513c028a6bcd9be4eea18b7cf8fcf20444d860b2954d81895cfbe9e8700fa3cd052fcb50353cb1bd926a047026d8fb07e48aced5d8338a6e464"; - sha512.doc = "90d85bb6e877d8d8b1ece806e62c6179ecbbbda3497c4c4f16b67989448d1d2179c50c475a1dfe57bf085ee30fcc09a962586dc089565dfd0715b8fa4eab608d"; - sha512.source = "aca34a4532b188cef91484f36b05488a627582882f56d48b35020872c48dffdf3cd3be9ca8c6073c45db564cdf390b80689cefbb12c5eaf2370deb75646006ed"; + sha512.run = "d17f28fe020b584dd10713ce937720cf849a185fe7ca8b69590f3472d5f01e765d13e6dc6aeb7c02261cbf2ca2cb1e8f6bb9d7a8be5125f2ba68437cad813599"; + sha512.doc = "38b6b4840b14b326df9c60ac8428cbe86a34251e975c57c5ae571d79dd359b928fb24c41a53e313f0bb43a57726834b368fc180ff8e4d8348528e0bffefdbbce"; + sha512.source = "edeff6fae4933f7b51bb1f1835b637aabe05433abcbcc0c32a24ce1dfb9244a908d640d35e71bbd35604033f47e0d21fc03f8a6e4101faf72e37923f37bd05c2"; hasRunfiles = true; }; "topfloat" = { @@ -34025,11 +35158,11 @@ tl: { # no indentation sha512.doc = "58773adb7493e6ef31d8fd3854a51cd37921dd331f56f1d9eab5283c121fa8c3316ffc41242356a87af04bb6da68761ea15829e5e8555d2e6cdbb68833c8d313"; }; "translation-biblatex-de" = { - revision = 57508; + revision = 59382; stripPrefix = 0; - sha512.run = "7e77035b714c1cc7596d1fa48e5d285ef573a0332b5fdb78e77b22742954f6c401d531de3175ed92ecf43ac4afbbd5a6a11a8ec95409f7227ba7995d5645179a"; - sha512.doc = "83a35f07b954040e99fb072670a65c0343ef7f3739c476e347ff5ad85c0e4ce900c26691960293c99e1da7c9d97daec2b7daefcfa78cbe25f1b3759ca4e2d8b6"; - version = "3.15a"; + sha512.run = "6256a868d6f6ea53107245574d3d7fe3f1b646cfa67dd456f88abbab980b4f9060c752faa14f185957762b76c159aa8d52b3ab8908c53c5938e415fa8e4d5f7d"; + sha512.doc = "e7e634d9d581f781f33ebcad17f4f496738d6364725dae75d7dae6d357bb7deb08a5e01de0e1ac6aa32cdc09ebefbf0190d9f6f11b286a20ce0fce23c0516fef"; + version = "3.15b"; }; "translation-chemsym-de" = { revision = 23804; @@ -34094,12 +35227,12 @@ tl: { # no indentation version = "1.10a"; }; "translator" = { - revision = 56052; + revision = 59412; stripPrefix = 0; - sha512.run = "87eb30409270c63236f5933a52d7815b529a4aca0d7ecc2cb7cb69199d0597684cd48e25b2f00be80024f734d2f4067650adf457ef942aa8477359a6be20d886"; - sha512.doc = "9fcaef407ea8149e35eb4ae2d4ea30a3a865ed31992bc9ed4e046059d93445db32a912e05698825df1c720903fdbadf4550d6fba7ab38990ca85d6dcb078fbea"; + sha512.run = "5700b0b8a95b244c93f17c5e1bfc74d4defec842892eec358b308dc55f45ffd5bef050a1ed938c9100cad771ce5ccd53bfcc917083a9ba23a60a3b339d241f2f"; + sha512.doc = "abbe08cb16a39395b53d01f85172a11e339cd18f2c7f9dde8ab1d0cf353649c181f442fcb94c9add913b2b807ae9f6ba1ac54e9a6fed147cba1af335b6b73d8d"; hasRunfiles = true; - version = "1.12c"; + version = "1.12d"; }; "transparent" = { revision = 52981; @@ -34176,6 +35309,14 @@ tl: { # no indentation hasRunfiles = true; version = "3.6"; }; +"truthtable" = { + revision = 60717; + stripPrefix = 0; + sha512.run = "3ab6a30d6c964a810cb27cc13b314fd9b8b881427a8a1e8dc047038669e9480bbd258ce5380eab648d07669b948feafb420a16e3d599f227c3e7422e4173020b"; + sha512.doc = "3333d8ac206900fdbb4aef6777a5ad840a9d9b0b43c62871b24683c41d58b78b36b97062fc9fc4d84e71a7f6728d0fa6320bd38e1f7de4aa660bc6e7b79156c5"; + hasRunfiles = true; + version = "0.0.2"; +}; "tsemlines" = { revision = 23440; stripPrefix = 0; @@ -34199,15 +35340,15 @@ tl: { # no indentation version = "1.0"; }; "tuda-ci" = { - revision = 58661; + revision = 60754; stripPrefix = 0; - sha512.run = "a0b1ff24435c3c03618c9d9b2213379acfc0fd9184357ee209725de660f25260a81e3108e41bc8f425c06e11ffe18e0ea5fa3fdbb5404caf0edc36dc950da6e7"; - sha512.doc = "4804e96ae31d171bbc4fae0ea23d6d04601e8fdb8963ad4cd681099538e35bbb3b4624d8d1a7e8fdd86a4657e391707bcd3418c7ba44c004779bc3535c94aa64"; + sha512.run = "4a9ae40df9c2f9165aaa23bcbc1065c4f78023e0f4284e14093140a35daf7b630159d8317812a7a7207aa5899cce9dc8c80541a7ef0eed33a13226083e21a75d"; + sha512.doc = "60d971063b6a4821a49a7ccfa8add4dc2e9171fbd2a95b777ea2960bbcf0dd60fe007c3fbf687ba499557d33cc50f14435448c6a40854616e6e1e21b24c74f24"; hasRunfiles = true; - version = "3.13a"; + version = "3.20"; }; "tudscr" = { - revision = 58713; + revision = 59942; stripPrefix = 0; deps."cbfonts" = tl."cbfonts"; deps."environ" = tl."environ"; @@ -34224,11 +35365,11 @@ tl: { # no indentation deps."trimspaces" = tl."trimspaces"; deps."xcolor" = tl."xcolor"; deps."xpatch" = tl."xpatch"; - sha512.run = "16ae7a0ca2544007dfcc1f2720080ae7f8453f535a696ff1edd252ed6a9d6eda9da48c80420c6a64e9b36c85322215c41477269871e285239707c17ae96b6960"; - sha512.doc = "0e6d42d4bf8a7e2af363243be7a75d93fe489c7e99cc1c731e3e233aff96f2f7f00787af8a5e86419c8d5cf3c7bef9a593aed546e66c565343793f081f34b7d5"; - sha512.source = "68651ed041af40431be9bac615e3fbefc33330fdf0be33d4cbc80d3cdf4080ba6e7ba5147cfb64101f332af0386cc29d44198fbd3594eb2447e680fa097206b1"; + sha512.run = "60dbb8cdce84091ea30714136bb8f454de8c2f0851dd51c00681fcaaf7ff0aac6e1fcd2d8de5879143a050340d70cedc1a4d5423aa87cac1e3f1c812891cf457"; + sha512.doc = "b35204d8e24089c9d7a864afba587cffefb2286812626ffaaf7854a1e8933291d86677487dd8f509e0ed6c6f69155c44c9a6d698a951e8eb0ce26fbb52891d58"; + sha512.source = "48581c09674d065bf068333037469b67a2092d39513ac1227b6908e5ae881b0c820b464d7bd6d8b40b63991b3d1bc0984ad0c8501969e8946011f3d4e500f866"; hasRunfiles = true; - version = "2.06l"; + version = "2.06n"; }; "tufte-latex" = { revision = 37649; @@ -34245,13 +35386,13 @@ tl: { # no indentation version = "3.5.2"; }; "tugboat" = { - revision = 56942; + revision = 60755; stripPrefix = 0; - sha512.run = "1a58d5dbb3c68ae1abc78265f5583943dbbe673efe5fe81aaa4f5b66e18afe573a2e135637e24b0026d68de994a143d2d9ea172c1bfebf4adb15927abf5f74de"; - sha512.doc = "7db84d7657506ef2837eae7a8658c64cb0c6e6d58d5638f7abd936670166c0e75c6822f9deb6ab5916ef0d51f25a3bbfc76f0906c086dd6edb703140b68d72e5"; - sha512.source = "9cf55ebca59c961ec144fe53d73dc01501b8f621716d20655661c133afbfa2b4e4e4169868d9f419f968787bdce3f6fadf66084dafcd542cb505aa1f7acb4e3b"; + sha512.run = "2df00878d432d436475a8c883178b57b189bca81173a8fca72e11418438e6d3e7b395e1270e4bec9ec31737a1a92cbfaa3982d3adcbde71c5c659f466942321f"; + sha512.doc = "1f1d09cb93c07a0db5b00f0d673cec142275b5e1fd93d7380412074c903f93e8da60f482e16e55b25d2a31f431bbb67cebfa580b45c78a6fe2c70c75cf4dbe94"; + sha512.source = "651e1d7a30f672a46915c698a5cc20098096420b0637b83489be29103c874626b89b4a3ea8718e8dfa5123627a2166379356fa1b6e528787f28b0c275b629e91"; hasRunfiles = true; - version = "2.24"; + version = "2.26"; }; "tugboat-plain" = { revision = 51373; @@ -34311,12 +35452,12 @@ tl: { # no indentation version = "1.3a"; }; "twemoji-colr" = { - revision = 55675; + revision = 59957; stripPrefix = 0; - sha512.run = "0de16660597961e0a221924b8cf453f1e81c837f44d1f7c662b55e29839f1a0d5c105696140a445772d9c8b1714850d2b3618aedb757404dedbec46c1a212c37"; - sha512.doc = "07e7485b6201d63954161e898f6f25cdc6f26332f6f7e9ee1b29c88e02a1b048fe22721bc3ce856d66ca255a1058cf080df86d333720c92af13a52eb7f2bfb6d"; + sha512.run = "7e186ffdd023c84419ec704034872805c81bc729b2f828a61af2c1f4cdb3ac40720315967ebd2ceb0349169ffae6ff6e202a1d9196f8c0c0811c66844bae5dc9"; + sha512.doc = "368ef5dcfa3609359b154d31d753c89cbe50f377c254cbb40a30beb0757f8bf177eb3bd48ae751f66bdc8c5f95238d514653a6381984a1c9c22ed99266272b42"; hasRunfiles = true; - version = "0.5.1"; + version = "0.6.0"; }; "twoinone" = { revision = 17024; @@ -34466,13 +35607,13 @@ tl: { # no indentation version = "12.12"; }; "uantwerpendocs" = { - revision = 58669; + revision = 61030; stripPrefix = 0; - sha512.run = "45f3e26a15fa98f8a2bd890b8ef63124e135c57b688327f3baef90711e5036615cc832d83b72c91fe10d567a866aec79206932c8aa4c5de6a51af05ed76bf184"; - sha512.doc = "f93a96eb20dcb6c5be91047a3ceaee5a7fc232fa250c5fb0a15bdbe1f2f13431aec352d7bb0f89df91d4c536915d59f719fbfd78d1748115308d1d9726636bb6"; - sha512.source = "93d0a3ea2d323958d15b714fc392cb2893d899e03d28d75c25272c355861244f5860f3aa8020663c20a51b7e8471c24815b9431646eaa552b2e44a125e3a07d1"; + sha512.run = "ed58bca363ec8f53a55af5f5c0816cfd534f22a631d2bfd4d74f579749d5d391341b63a706e1d9b556c812db0919bd6dc4c1bd0634323dc67f43fbfa46a70b53"; + sha512.doc = "f0ae53e8546e573d7414c12d2776c1ca6d051699b6fd7f51895928a4b1516ba5a5ffb7e1ec1de42d47145464a7a318ddb86887502cefa5e5c673d499ebd605b2"; + sha512.source = "44cb3bdfdb5b3dd79ae24dc5830ca9e07e65a1d4bb491f405d1ddecc08f5a978fadd0c1af967498639c857991732f8e5301049f323f06ba8fd0cc9a981c4319c"; hasRunfiles = true; - version = "3.2"; + version = "4.3"; }; "uassign" = { revision = 38459; @@ -34638,13 +35779,13 @@ tl: { # no indentation version = "1.1"; }; "ulthese" = { - revision = 52972; + revision = 60217; stripPrefix = 0; - sha512.run = "c2a3d8a837ecda20bf50c496b8506e6c7dc7d6308fa058e51f4b1dba858d76c391ab3b9faaff9cbbb39fea3696fc5a1c7daf9417f3c18b3eaef9fc7eb5383195"; - sha512.doc = "adffed362b6ebe3bab7aa04563ca0de114917199893dd310578d372f6e4e67b84bae7e50658ebfd7bde270d4c3158ef9dda57c0c6855787fa3cde0102ef4153a"; - sha512.source = "652cd812d9916f855ceb5983b1cfecfa9a7fd724939933ef0159c6ee4dd9199e9923cd09511598b30c8f5355845fb3764363e110bd69d02df4f62c6f69ebbc99"; + sha512.run = "23a9ad74b214612051104fb111808caf9c6bb2056f129265e77bc76370c293248a7903a5bc99183998061bb18409d86508cd488a4e82487726e17599f5948101"; + sha512.doc = "f7e062e470c524746898e88e2f07cdbcc58c1bd3dd5c04b1f0f1e7e7e6c9fe9968ff68ef2f2a95f25405c7901d937a32ed92b752b6c74fa228237b08645a757c"; + sha512.source = "545c1b5e53c093a1ea29ca73fdd4c3c355dc34a225651d774c31a6dc64acb2dc20d78421fc939bae4d324d6c6e5ce2e4f82ddac6ed935ec8de7e1f530aa5f30d"; hasRunfiles = true; - version = "5.3"; + version = "5.3a"; }; "umbclegislation" = { revision = 41348; @@ -34726,6 +35867,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.1"; }; +"unbtex" = { + revision = 61277; + stripPrefix = 0; + sha512.run = "9eb086d5db37274fdfe6219052ff118055a6b8993b9b896c40eed7cd0617d5df0a124e4a48d5f3a913786a865010ba2db5ceaa22f746be7e1ec2b6beeb392a09"; + sha512.doc = "4c52022fb261fc878a6ac20f7bd83833a567a1d49560d08a92dc0d8dc6c2aefada41321410466f36ce8ff343a31856312ce5a4eb6a54dc5f81730a1952c1520f"; + hasRunfiles = true; + version = "1.0"; +}; "undergradmath" = { revision = 57286; stripPrefix = 0; @@ -34779,6 +35928,15 @@ tl: { # no indentation sha512.doc = "6173d49bb64c9b162763ff08af445e518fa650fcc13e02f5c72454d335285d9c82347cf79f945fae94429f3a9d15f9c9b58ff1d175c8f59ea7b75766cd279303"; hasRunfiles = true; }; +"uni-titlepage" = { + revision = 60924; + stripPrefix = 0; + sha512.run = "ac5bc2d392c635f8f59f0aa0dc713a57c78159f70285a04147d63feb38918e1ea11fd383d7f30a174360d8498454ef5f2e598180a21cafc4403e91d1ed1b2c5e"; + sha512.doc = "9073091ed24656362d232b4083f5b350054a6a71ff85aeba4ca7e0814a28c34d8b71dcba42a44952458bb401aaf7d42bbcfa65a19de0b0d4324416edd003f4e0"; + sha512.source = "50e85efa5691d2227c1f4804dcefe6bfc34f14ed13314ab3d48a8dd45917c081dcc7e3f2ee8bf4ac7f51c2790c083bac3fb57eafd42708c9d507466cc23cb053"; + hasRunfiles = true; + version = "0.7a"; +}; "uni-wtal-ger" = { revision = 31541; stripPrefix = 0; @@ -34811,12 +35969,12 @@ tl: { # no indentation version = "0.01"; }; "unicode-data" = { - revision = 56768; + revision = 60516; stripPrefix = 0; - sha512.run = "f966d643732bc6d9743d54cb2981e6420dd5bc33a3c2f43bf17f2f14afdfccf0ddd8068a13ce9547d60c8ee77559834f3cce97df8bd5d7252eebf978a3429b0c"; - sha512.doc = "1093c6e78d8f8716cec8ed34444d5e95628c2d0be4b61cb3dae72563b2e3acfc1596b5e25dd8c101dbc8ffe15b7483a198c30f459eb76418381be3dc6caadbef"; + sha512.run = "6b1ca4dc7d716c1013f809a7c22863a02b82e51db2e126cad97b08a15b44a38bda11358b7877bb2438ab1d087254858a19a10e810a96796fe80b71cf3a661e81"; + sha512.doc = "42bd2a27eb76e2be45cc7384cd84de26513e2ee577bda14bc20bfa7a83e1c53a121310d75bd3e237cfcc9bb7e9da39190373db0bbde44d66894e7d7df7924fc6"; hasRunfiles = true; - version = "1.14"; + version = "1.15"; }; "unicode-math" = { revision = 56594; @@ -34829,13 +35987,22 @@ tl: { # no indentation hasRunfiles = true; version = "0.8q"; }; -"unifith" = { - revision = 51968; +"unicodefonttable" = { + revision = 60894; stripPrefix = 0; - sha512.run = "bf288fc67865b2440b7b62633a04779e0172ed139e6ca4f1f88b21ffc84147663c143867d204b54d49f0d0f4d1aa0f3ef689dbc36881198398512aeb735c717d"; - sha512.doc = "f185887da8604b1e24d9dcd7581b071e65dbdce6e61ecb435e99c19fe969a5912974af8430eeb22e090a8d2e1100a3457ece22cedc84aa10d589957e0cfd61cb"; + sha512.run = "e74461a4f98c4794dad68cb5d2f3611f64f42028d7759a4b86a13b2758759f90050594a30fe152b207e3f1774103bd34b5cc575955558787a95570d639c89f03"; + sha512.doc = "87f92404623c46244e05f921aea0700056ddd2069c66d03877173d24c721a29a9b1e001ef592ae723ee5f78032ba5700412058cf20c86ccfa46b6920b6fbe007"; + sha512.source = "586de7c1ce10c127d14d31bb34321235470020cca4c5a80953d2b058e087feaf8decd4b7cad214c153eda8592eb77dfa215a9217488bc169958a1ed8b85c7521"; hasRunfiles = true; - version = "1.2"; + version = "1.0f"; +}; +"unifith" = { + revision = 60698; + stripPrefix = 0; + sha512.run = "98eba02a617fa5d4349c5b17bc971cc0241d6d41fbe82af1fcbca1bf44faf901e5b13e786e62f26413805acb8efc941c3f1481307c69712aff55cf17b100b5d7"; + sha512.doc = "82620cf7a81f8502876edcbce06699a05f0e580760caab77cf56db89a145a3264202c8ab193a5a56df2f07b2b29d7d814b851dec7413fe0285124920f54baae3"; + hasRunfiles = true; + version = "1.6"; }; "uninormalize" = { revision = 57257; @@ -34870,15 +36037,6 @@ tl: { # no indentation hasRunfiles = true; version = "0.01"; }; -"unitipa" = { - revision = 58749; - stripPrefix = 0; - sha512.run = "968af9eed2e188e0bbb816911ee734a74b29c2f3b42b93df7e7844d368737593f925d846be464bc0334cd216709e6e8582a291dd1c9cbc3287cb7b3144e9a609"; - sha512.doc = "b770d4ae25c99d1c22842ac6581a29a66a43d48912daf4e8d7ee9ce4da0d562af3d54e2741a4720993a3ecd2c676e6ca3e39969c0b0d576d3a820f84434177b5"; - sha512.source = "e54fc2dc346384041fd571c6435b7cdde73baa241b169e941ddb7040c5efc1353d6312502bbab296a38b89735e8ca08b2f111287c2438ae09da8e930760bb276"; - hasRunfiles = true; - version = "0.3"; -}; "unitn-bimrep" = { revision = 45581; stripPrefix = 0; @@ -34921,12 +36079,12 @@ tl: { # no indentation hasRunfiles = true; }; "univie-ling" = { - revision = 56913; + revision = 60937; stripPrefix = 0; - sha512.run = "d4c0a0d760fc6d9c5fb2a56a7040b37a2fd5e20c13761374fb8e83763e0e01090ba3079a589cd6544c707148c17c389e377598f420d73cb942da591ddeffb943"; - sha512.doc = "ded1f91665ad5a8e13bdbc5b01fad86f73efa77d144b946f8049fa6876b26cf237f645250137899e06d93bb19117120be9fd8d9651857bcc0a19df49ce87b664"; + sha512.run = "b65a9b854f9b1fbbe679c5c3be049336daba41e70db1f90dd474b1d3386fadb200b24c0e580f1a10f34cca848ff1ccd5864d6ebc607eac1d02cbed4a0347fa15"; + sha512.doc = "23efe505ec0c76d846526778c448885f0e1d5b15d34645fc33f8a9eab0421fa45fa81a7dc31e2c24753e041bc9bf50468c9035a68875e6b67ac8c9d59c2dd1bb"; hasRunfiles = true; - version = "1.13"; + version = "1.16"; }; "unizgklasa" = { revision = 51647; @@ -34937,13 +36095,13 @@ tl: { # no indentation version = "1.0"; }; "unravel" = { - revision = 52822; + revision = 59175; stripPrefix = 0; - sha512.run = "e31da53c07ddb60491412e94f50444cd3178879180426cc2d8f78d5056a05c091a36d1c5b9107f0e3714acab1f723e90ddfc0250319bde07d67133bc50543f4d"; - sha512.doc = "5fc7618723ab27f57c14b0b81cb8d6f1b141ac6582cd73143a5c1543dca0f307ff5eaff006dd0a55c6f84887f0b08dddda5651b9c0938716262894cb3b8aeda0"; - sha512.source = "2c7336dd1033f87a10ee48e699c0c782e5f2fbf52102580f396f8d7ac5805fbd665ece0370bd72cd191fa9df6fefa8b27d07ace58710e1c8d04aa45f3bfaa5e3"; + sha512.run = "26ff88b32e91fd872dc0286001b58a7084b38e5497125793ccb90e60e58ad19a78b780162d505aa0be9bf07e9656bc60414a55a0d6419e8d9b33d8c0e8e53d9e"; + sha512.doc = "206f3d794ba1323f9a6fd8fbed98190e376a91e5babc94aec236c46be783b0b01d80fe45394a1e73e2e29c5b19279d28430b9350e1f216369c4be707ebf6dd7c"; + sha512.source = "ad9ebde05f2194043d75d25faa249f786e154312b4c3d6688ce766cba4092ee157a405ef1eec5654b1b6852b5bf2f994c77ddd78d284c573a07539403bc69e92"; hasRunfiles = true; - version = "0.2h"; + version = "0.3a"; }; "unswcover" = { revision = 29476; @@ -34986,7 +36144,7 @@ tl: { # no indentation hasRunfiles = true; }; "uplatex" = { - revision = 57972; + revision = 59450; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; @@ -34999,6 +36157,7 @@ tl: { # no indentation deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; + deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."platex" = tl."platex"; deps."tex-ini-files" = tl."tex-ini-files"; @@ -35006,18 +36165,18 @@ tl: { # no indentation deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; hasFormats = true; - sha512.run = "8acef423a0359136795301e1deaba156c702ee360f309d1884a90b3ed89842389bcc015e70c1461611ebb4a21fb9d5853db5ef40226ce0f61eb11f2a424a70f4"; - sha512.doc = "7cbc40c770c1e04114add004fc4920e3c7dea62f959d06fcbfe54b9fdc45893214ef3e960ac685cce258b07fab424aa7a242da368aa1ee0015ddf8579d582820"; - sha512.source = "9c1c1d0fec518410938e6642123f64242a6ff0bbb6425945897c10754e436fbd82d6739d31717152d183da385800a569d9209f37dd38c8eb77767842e0822a67"; + sha512.run = "6d9c990c0458138c3753cb8ef1d0ae075ed8322cfdd1e4173374fc37f6918b951152f3e2385b3d24f0278e20c6d0da9a256fda2db3d0a3869cb000ee9f8a99a2"; + sha512.doc = "e18c72acbbd80445b7a45d91a40230bf57a806c6e0c74387d20cba12261fb43fecc9b2183dc7e754905ef27a50e2cb209099761adc91144077b5661db3f661bb"; + sha512.source = "e567fb0b2a557f2b1cf441fbbe80b0341e31a71bb848f5aa924ca3602db9df9cffd023ac10d1eb388bd3b31aaf88f9f6fca323d0eb8ce774872cb20f3d34eb65"; hasRunfiles = true; }; "upmethodology" = { - revision = 54758; + revision = 59878; stripPrefix = 0; - sha512.run = "848e1a982a1d0667082b12970a057f639bcb8eae0c55f984508ace27e98bb0b2c9d285a3730c4c7eca4a1ff361e3b2e6908f85c0e0768e9b4e8ccd66232ec4a6"; - sha512.doc = "856e798164ec708da8f8695f9f166cedb36973f6747a01b2cc10cb5a8d124cf4383a625db57578666d1fc4658516dd8e9bf94221967b1829cf5356314ab121bc"; + sha512.run = "c5940e7135468b197916213ed949a8a56d1304453b79b4452257aeb1b1c04a3dae6767fbb49ab0a3b982fb20a5d1ee893c4efb9dfb1cfe66a3bf896c33cb9a16"; + sha512.doc = "5f91c9882b90ac90e984d87edba2eb22d5bdb798aa41c62edafc3ead8e5a4696dc2d05876006f646f4d513d0bbe2c36787cdc2a09e5e9cb2e14e9fa9ff59efa9"; hasRunfiles = true; - version = "20200406"; + version = "20210708"; }; "uppunctlm" = { revision = 42334; @@ -35037,7 +36196,7 @@ tl: { # no indentation version = "1.3"; }; "uptex" = { - revision = 57972; + revision = 61107; deps."cm" = tl."cm"; deps."etex" = tl."etex"; deps."hyphen-base" = tl."hyphen-base"; @@ -35047,14 +36206,14 @@ tl: { # no indentation deps."uptex-base" = tl."uptex-base"; deps."uptex-fonts" = tl."uptex-fonts"; hasFormats = true; - sha512.run = "1ee2679e7531fe4406fea72f7efc482f7900da50cb74045a62c0b5e5596862011509c3d966a795bc13538170afd7db26e8cf4f406391a746e45804414f26cff0"; - sha512.doc = "06a3459702bc9838f2246aad7af99c427413a43356d88165e68a132bf8b926d9ab668e6dc10127c27eaac6526085c3fa069bb9709833cef241c94d0f4fb3e02a"; + sha512.run = "4237df16758a5495555936a94d3e075bd23a53bfa12da26bf04c9da852bf3daf5847b055327dd5eaed10dbb45e09ec514640138ec7a2cd4cb358bfbc2e1d29f6"; + sha512.doc = "fd8ace9f65be4a636bd39be9acde4dc23eb4214d54a51f8773e5232fe8864fdd36d34af4c892e12db4cbd768e52d5f0fd6271063e4b3ceb740448ffaac3d3bdb"; }; "uptex-base" = { - revision = 56832; + revision = 59407; stripPrefix = 0; - sha512.run = "ad62a640e04807f62f9efdd67720f57c7dbab0190fcfea7a82109f4f8223138b8d413c49e878c70ea04f733576828a4bdf475ebd1b6ed471268cb21bbfaebfae"; - sha512.doc = "dbfd62df1619e9a5814fde01796203180f77fdd48fe603cc1fb6701b2c2763d507eaf9925d2555a9fa6281e9dbf35c7218a9f888d325b628bc2d8036bb393637"; + sha512.run = "060758b358587a4b4ca9a07b7fbcc61a1ec057fad8c676bdfdd1d0e16473295f18b81e54adad2303a1f99e5509e93dbc3ac9cabb0b878030821e67e070de14a9"; + sha512.doc = "35a29955e5348baeaccc38714c1861802147112e1a3c9419584f6a9745f3748a028c10cb0eae5e74e6201ce7753bc127794906945ed65bc3240d6b2faaf93751"; hasRunfiles = true; }; "uptex-fonts" = { @@ -35148,13 +36307,13 @@ tl: { # no indentation version = "1.0"; }; "ut-thesis" = { - revision = 58661; + revision = 60331; stripPrefix = 0; - sha512.run = "fd5ba4022fca6b40bed994692b04b007d30fb659c5439ca0fc86e664ba8f2f59ea42655f34873da18154ffd998c9880e314020712f1c0c7a30bccb34249ad8b2"; - sha512.doc = "8d300fc610b1132257cfbec10fbc1fb6c1eee287bd792102c8a114a518359a5f1bc4f31f1118c26e86d4a66dee0fb9117d15777dc91cf955fca879ad7e125c7a"; - sha512.source = "6e3bd80539bc1a5ef94d800519b6296d776a702c69190e213fa51e23d108df807a69a9161e95485f8288c184fedfed8131db3ee96e704f7299113c9bcfd4a820"; + sha512.run = "10cc7477b07a495a80277cb0a7633eedbf738bf15f8d6a63adf55a8483bd301a2f2c592bc47aa2e87f819a3aaf2256e3c9e4785a8032d9e0c43ddcbe18c9e5f3"; + sha512.doc = "bb30beccde671907f5627b4ad25bfe4833bc47299b06149aeb4bd6d8d29005920654ce406b411e555971c66209cb4dec5c9e3de8fc28fb409e303b8939c999aa"; + sha512.source = "25b973b62f569e66c90635da3a1d105edbb8e934b5bf79ecc5209f7b32d5175571f16e86982e007c53cc017861cfd55eecdd62a38399a37d191c97eb1c08d57b"; hasRunfiles = true; - version = "3.0.1"; + version = "3.1.5"; }; "utexasthesis" = { revision = 48648; @@ -35165,10 +36324,10 @@ tl: { # no indentation version = "1.0"; }; "utf8add" = { - revision = 55291; + revision = 61074; stripPrefix = 0; - sha512.run = "38af66fa77e637a5bffce68d816cf6aa4e34ce5452b690874de91d9c10199316d60ead3736c14e7872cc4562ba1fe4d953c4fa7887767327d06547b68f85b81e"; - sha512.doc = "f521642270b8cf26f609c050eaf412f2fcc53fc0b5b3e1873c141a5b5039fff9d0387b0ac83d0d831d22be256d3eeea4db51c67da2642372831976555eb6600b"; + sha512.run = "988d720d5f4dac3d15e7483e1ce904f214055407c41c19ee7c2683db592ef870cc9a87d28f47092cd062b5ac5bd061b68738046dcea919b0aa9573b0c31a04c3"; + sha512.doc = "c1f41ca0ea536db11e2e6c1df561e74f8bc51da3147410f7f33863d0be1d38948bcb64d0f4d8c41737278435d2f88b8ad758d2c48f1672b682169de5e0099b70"; hasRunfiles = true; }; "utf8mex" = { @@ -35193,6 +36352,42 @@ tl: { # no indentation sha512.doc = "ba60eaf55cc08378560048ebc6f735e743449a18d2822e6027a86e595a9634461713ceb37d15b9f0c8239f1935f910bbdbd9a0d0d6fa1683174739f91c16a504"; hasRunfiles = true; }; +"uwa-colours" = { + revision = 60443; + stripPrefix = 0; + sha512.run = "c2ec752b4cbf80f35787db83a0d227306689b1ba9bee6339bb6c2940fd938ce33daa995bbad2c58ed9284143ad3f45aed6668dff88134878cf115968c6820a3c"; + sha512.doc = "42745187e02211f149c74c82e0046f42eb5c1c6b01c39fcc8f0a52ae50613646b216355f29d0af0b6536558c2689b2eb83f31c84d29bc007de4c8f9d78ea6d43"; + sha512.source = "e03bbb8bf8f7684c02623d9f46187cd0b4ba282b1971679927b633ad2b987748c3f784caa6eb01054422f91f2703e2733dca0bdf2c89902ef61321875e2e96a9"; + hasRunfiles = true; + version = "1.0.0"; +}; +"uwa-letterhead" = { + revision = 60635; + stripPrefix = 0; + sha512.run = "9277f935e5769bb49cfcb1e90a8e6040da4bff341f82bc673076d0ecf0778d795a3ef480d94373d28b7e14e5c2083ab8e01737dcbdefa87cd042448d7cff3a32"; + sha512.doc = "1d778538ed1c9f8b1f2fda030a1c37dad0f3d8b6ebea71a3b5b784f695ce636414e5144402f50f10279df599e5698de157a9549edb77c2a788c68dc0cf869072"; + sha512.source = "1b0a5d473a5deea6355cf021ef62e564216792ef14b8eeeaad18da441d2e42cdfe7356972b165126cec9e8d239aa5fb14222e1b6c93fdcc7a563b00a1a2024cf"; + hasRunfiles = true; + version = "1.0.1"; +}; +"uwa-pcf" = { + revision = 60641; + stripPrefix = 0; + sha512.run = "96a5ef7a7b016e48ecbd80210a8737ff624e30ae7814218c4bfac89f527caef238d5651f700d5cd1428aa4ae3e30fcb8225420d46043f0f1280e3ea35645adf2"; + sha512.doc = "58bb43df7b6e36da128848c0ae8c1526eba889b628e6de987ecac40f25a0e359a257a7b9e0713d8422fc4f2f045615e52374691107c5b02af3a02a737e91ade5"; + sha512.source = "8f0a0615e36b2f745e44cac73b853e906e9956651f8614313ef95ecfef977b7a456432c6710b2aadca47c695a030b2339ee1a10c0d728a798d269aa6578e58bf"; + hasRunfiles = true; + version = "1.0.1"; +}; +"uwa-pif" = { + revision = 60640; + stripPrefix = 0; + sha512.run = "728907dcd2ebfc289afdd798a83081d3ee357635efd36f757b7a29e3ec49911c60462fa2cb5e9988b86c9cd22be74f71a92e1962b2c1d1a20c860f8c6c66eeb7"; + sha512.doc = "8891ef73abccc06efe541cbd5b68e5c40fff48df12dd008b3a864993af0ab3ab46e9514ac261a51daee93cd53a74c884e33c0bce1d21c9625acf0ef0b0c046a2"; + sha512.source = "b10a63d7b7e7fc39440a53dfee84385c2e6e4d574fe98814eb3340ef9ab97a142aadff54efdf55510f16a38f70745f456cc2fb4990434a2ec41607b08d3bdf60"; + hasRunfiles = true; + version = "1.0.1"; +}; "uwmslide" = { revision = 27354; stripPrefix = 0; @@ -35216,20 +36411,20 @@ tl: { # no indentation hasRunfiles = true; }; "vancouver" = { - revision = 55423; + revision = 59192; stripPrefix = 0; - sha512.run = "2dd41dd96607ecbb4c4bde1f6ff3c63a3e79efe7d025fce510e1b0dfc5b8d5bb19826042c04819f1d84178fce7d077e8f7b25fa9beccc4ed88db2683e716444e"; - sha512.doc = "18069bd05809a9c8dc6a5e45af304dc74f40b5304c34064c7de67a961804d540a4cd892b4de380cb6c59a334b09cc165c2aa81749be1d4b2fe56e7fc7528e0f9"; + sha512.run = "9fd38e4545902a8f715e2912ce2046a679476f0a91ee76af74213b65689c4e2c01aa68ea8fdb09d93442097695443a2be0d6169dd50fc8ec63a7f9fe424ea739"; + sha512.doc = "4bb074a9ae48d6e565b1b60dfcdec4b6fe35e367639c3737e68e4cdeb9ed9017b17d57ebe895865b6b0f63bb7d66df5af08360d149aa5f2f7c604bf90faa9859"; hasRunfiles = true; - version = "0.8"; + version = "1.0"; }; "variablelm" = { - revision = 46611; + revision = 60014; stripPrefix = 0; - sha512.run = "e58a1c5a77861ed3a84f2fb372d6c3560129b656257e23a935fa9d7ce18c83b59f9863e29ff35c45c6ab800cd09aa2fe7bcb1fd01edbbe2e75112809c17faa9e"; - sha512.doc = "58611f636d5aea5ee2935c75206e0d051345d7138d04668ec7875b3ee0493e39bba54b1941aaedf33abfeb7636602fa6ac7fe7e750837b425678eae97b7495fa"; + sha512.run = "1c34d4afa65db4993f3098cb32b604c68a75bc2c0b56b026a6d50c2de61392d4bace210dab2fb5ca0c15253e7486406aa3aa5084e2296bd5e8f1e9c953419627"; + sha512.doc = "56bbeff2f9cb4a99c05416d7fae7cea8cef81e712092ae8b5d1ca644769debdd95c443fb6af7edc034fe9d778147e1b37da50d951278a7f64c407dead5f6e7cb"; hasRunfiles = true; - version = "1.1.2"; + version = "1.2"; }; "variations" = { revision = 15878; @@ -35280,12 +36475,12 @@ tl: { # no indentation version = "0.4"; }; "vcell" = { - revision = 55191; + revision = 59039; stripPrefix = 0; - sha512.run = "7ca3866a8341d756cc567f3b71122cc1a9a5060399f3258b9de809aba2c0d2944a140a6d0d76a4dd8593cb314a8bf469829f5d5d383f3718f5e8422f06f5f8b1"; - sha512.doc = "568ed02cc71370c3a77f468c43cf6cd72b79e9572f463c7aeca663ab725dff4c7db1a630ac7eab7f71063b115fbe3d8299190129c2d50cde859061bf62fdc385"; + sha512.run = "39d8f934a07095d21219d58fb41fd3e939391d5c68c51d8b9ec82a97522e55fc09a23195c8b5ae48cc3e9d9bb9a62a0b22123f467627784c767321140356d6b1"; + sha512.doc = "f13e941e7327f4369112f59387cae9c49f10197a2c7c4016cbcc5880759d89fe88535266f5f753b48b547deda24a3ad959b42f864b9ca2764cd593bacbf908b4"; hasRunfiles = true; - version = "1.0.1"; + version = "1.0.2"; }; "vdmlisting" = { revision = 56905; @@ -35378,13 +36573,13 @@ tl: { # no indentation version = "1.3"; }; "verifiche" = { - revision = 57766; + revision = 60269; stripPrefix = 0; - sha512.run = "db44ee3db5e17a7d8508eed3fd93781bd2ccb1a29ec04fcf2a28b91fdeaf4130b8ea5f09c0be79c5ed9da9b3ea729eb9b31b31374ce82e9602501e4cfb26cf9d"; - sha512.doc = "d3477629537881fdc6d8f7b739daa14178de3c5f9a4b35c97829c6fde2de82a85b960cd408cf2126e87a16423d985c2ffabaffa56a891893006d2ef8c9fd04ab"; - sha512.source = "b4aa0ec88ff81d9bef8cb59cd3ce90f1d5fc08c26b9224a5d561c54ff144af2719affeb32549f5a5691c2894f77d23c941d960413e69a3af3b5ca27c944d19ef"; + sha512.run = "c0fd327c6d720ee95501137bf7592881bf07aa91843222815cc3ebac33bc752658ded93a2f6005acceef5d67b2ffa2d31ee51c2599e9d144da113527fee69fab"; + sha512.doc = "16f755fc9731b062810cb4dc6d1354c2c29e2355423209da9fc58f4891078af1b449dbd530818afc6c06ca5612574b82e9dd943eb5ac0a18fc21f44b988e35e6"; + sha512.source = "d949b96ff65fcd4a3d021496a77d219b8619687ca12868c7ff1d036ed960b3b213958149647f52c0a13c6a8c8404bb69056de1495e337a57f0dc878a664b1992"; hasRunfiles = true; - version = "4.1"; + version = "4.2"; }; "verse" = { revision = 34017; @@ -35438,18 +36633,24 @@ tl: { # no indentation version = "0.1"; }; "vhistory" = { - revision = 30080; + revision = 60124; stripPrefix = 0; - sha512.run = "f1747b1c112c69cdc506234c571335647b365eb92a4054c70cb08752dc1da92ac4e84d533083cdee76f6398f5f1bf04b20b94cf38ddf13947d4086c5599529fc"; - sha512.doc = "60a8100cc10df177b04eba8751208c515eee9601806324184f737491707e1e4d453a92b0d12a16d6cc1af319a55c79afc8922d1378f8714990c97b5779540763"; + sha512.run = "8581151902ec4954f09277c8d4485aa9b8e98f8bb34693a1e6e79f769e8a47e8a8a3f797f74e7b236b3c24cc3efcbca85adc538bd5509f17244de46f2d1ae1b1"; + sha512.doc = "5a253f13fd4ba05af75275a080545392d3b92dd63aa56b768a4eb20db062cfbc85472c8933e2528fcff8e7f01b233a4b61dc0c22487f790d2e09a16eb7450abc"; hasRunfiles = true; - version = "1.6.1"; + version = "1.8.0"; }; "visualfaq" = { - revision = 38647; + revision = 60200; stripPrefix = 0; - sha512.run = "6b88343feaf39cd314e9453452da245054d3192f02ba0b2eb6e55a9bbca434e9b74cb16ad0902a6f5352d9ef945a4176e2e1998a7f0bd1cd75d2a3da7f4a203a"; - sha512.doc = "eea0f022741d52ebb3613e977948c0428ddbe5b7d41faa659e888b48b7bb4e655a0e693d1dfd92d40a52a67e6df9ad386ac64d2ffee7c2732feb2077d4b24f77"; + sha512.run = "16bd8f010035e9eb0282a119ec6a7699d2c8926b6a7cc997235ab242d19f554523bb766845dd2385858694aa06653be7ee18bd406fcd578dbcff7fab1d61c0b5"; + sha512.doc = "3380785d5b4fee8a68e8e1c16aa514719ae2e7275cc1cb6ecdf9b3ca6901c9c85a686b61eb3a763b2ad6bb99d246aa79c54906284da85d548316aa2e7b29079e"; +}; +"visualfaq-fr" = { + revision = 60273; + stripPrefix = 0; + sha512.run = "6a2ae768985a6ae59bd70fc137164fbedfb6c99ac137a81cc40d86b2543bd98f29ca1f9beac47220ed8ab69039684ca7dd90c3cd2c5d9a2b90e4a8c5c2a3e3a2"; + sha512.doc = "7ee33b3544ce6b8a5bd905f518036ff534c4bd677ecd385dccf004d874a59d108bc44a1779a61fe7cbcb6e97588587be1d38e4e96f048db70de042848d3e312f"; }; "visualpstricks" = { revision = 39799; @@ -35632,9 +36833,9 @@ tl: { # no indentation sha512.doc = "933ceaf7bb2400fff1bfc5ec26f60d750e0995680579fe487536ddcf8eca670e2b6d3fb6150b4ad659c6fa594b9db540523a878c74e9aba9be7710b5380e55af"; }; "webquiz" = { - revision = 50694; - sha512.run = "725ff4b81203704a5cbf066c48d25a959031f89eed094da4d6a9b07ad059d977b2026b5e6a1e704999cf3b1b8eeaefcb5713f099f016f9cf17206ec1c1183dac"; - sha512.doc = "6b25d04e4cff7db299c4f13ceb55525fa3a4ff2d094960fbe8171b3822ce2917d6d868e62ed3a1d2083d78b2ddb839ec211b5ba00a6fd894c29ab2d3a6ca7cb8"; + revision = 58808; + sha512.run = "04ce66027089c2be815380a10540e6c12040d33a33b1de9c6a98985e82a65e87f58a19b6cbf2b0ad7bc8e0a1e500bd21a80e2adbe3ff395ec4be1ecdd5b5adf0"; + sha512.doc = "58faed1d21c5f0abe004d5aff0ef6f754012722dace25948e236c940f3e9f3a49d4f661d6692afa0bbd0a654424017e84611c32cdd99a0ef60e510c4b2fa01e9"; hasRunfiles = true; version = "5.2"; }; @@ -35664,18 +36865,18 @@ tl: { # no indentation hasRunfiles = true; }; "willowtreebook" = { - revision = 54866; + revision = 60638; stripPrefix = 0; - sha512.run = "36df6eb6f46857ac84b2b0ef4fceb265c6feaee565eaf201ad8b00552a1f1e37d6f4d5a8e9dbbb21ee0df3013dc8aa72cc0cdef85c9b5c400aeca89f9b851c47"; - sha512.doc = "32abc19949630800649038ef395a8c51568c4395b5ea2495205fab557669c40c3eadb6c272e9a4747d504c95f02df50056e083c4bcaebec50a5b5df7d5d10668"; + sha512.run = "835b19d0927b01e4acf9da483148d3fa45b1c12eecebe39802ee4bab7426843710dd67306b2a8946c9c2b51d4c1864eb054f440c3ea021ae124bbeb6e4908b33"; + sha512.doc = "9e5fddf4765325a550e6dbea529d110bbbfbcdf89e1dafcfe62099a4e8fa6ce2bf3384ef9e1b2453f1155b6e6d3f48d1d1675100c8295362653aaabec35aaf86"; hasRunfiles = true; - version = "1.01"; + version = "1.03"; }; "windycity" = { - revision = 57577; + revision = 61223; stripPrefix = 0; - sha512.run = "fbaa3e635579ee9025675831d3a26e0d1451badc509da4380aef8cb0040e25456e0b655387252103cfc32a92f63880c2c385b08d6ed2ce85b63233220377dd33"; - sha512.doc = "b4536fe6706adc34a15cd9e9f19ad11d5a59fa004844c946e5e536297807edfc729807f94a447d67e0c5868962a2e93da826de9e6ddffb2dc5571c1c304c992a"; + sha512.run = "718ef4ce03405443de94581e45f8866053ce4b5d6b7c6e4576c4664d42adcf50570240fc8181f795f59733b94c648e15cc98ef92e4ae59843093663511829c4d"; + sha512.doc = "58107956e367dc318cc23320818c43f3fa91b75f69bc186b107687293f52c1c0cffb04912959e1a5c8d8abe3bb848c69da38ec621266e7a94b378a11d4c759e2"; hasRunfiles = true; }; "withargs" = { @@ -35735,6 +36936,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"worldflags" = { + revision = 59171; + stripPrefix = 0; + sha512.run = "128274fc2cdf34b956987c85c4bd00e25673879a3c701965db5ee7d240916df79133843991ea69e0924fe15a3f88140e8bb1754880bbdb1d9eae157ade92c260"; + sha512.doc = "8cab4b4abf08a0253a3ffd1682be2de6fd5a32adc48c4e195b76899074d3fa415ad77ce347a17afaa812040de59a3d0947e35c6f3872c98edca0fd218fa79f20"; + hasRunfiles = true; +}; "wrapfig" = { revision = 22048; stripPrefix = 0; @@ -35777,12 +36985,12 @@ tl: { # no indentation version = "1.1"; }; "xassoccnt" = { - revision = 55876; + revision = 61112; stripPrefix = 0; - sha512.run = "f2a2c993c465afdf21920e7f4cd7ed81f40fec1bc485cd89d919e5a942284e2219194d349ecc4da81005a7dbd997ed176ca8571c92ec159b69a98dd1068a136d"; - sha512.doc = "a20c3a3f10ca5a2fd785e4bfb92d3d60edcbee74f6efd2dea5fece63b01ff3d67905700be0fc48dfda9bccfa386238e77592cb04208ead19dbdb0714d6e891af"; + sha512.run = "4b3934d7a4a219fca3f276b26b893706ed8a65682425ac40d6722734f3e133099837ea8aebf214bad32c0d6b415121f73ea605dd851f0f2542dfb0bc38744313"; + sha512.doc = "020a2fb86c86372302e68636d727203625ddfbf63cf8eb5b3055502fcd073c54b52a44f8c7bfcb2c3c73a206082e5d285f05cf762b9857d2e16c43fe36f8fb96"; hasRunfiles = true; - version = "1.8"; + version = "2.0"; }; "xbmks" = { revision = 53448; @@ -35793,12 +37001,12 @@ tl: { # no indentation hasRunfiles = true; }; "xcharter" = { - revision = 58755; + revision = 60749; stripPrefix = 0; - sha512.run = "47ef79da9f019c27758e90be80ca7815e93ec3044da88b133685f4cf32655d1be2c591e17a6730da45977be5e06a3cd0c29da2ee798e5667d741f5161f2de723"; - sha512.doc = "574a4ba5ec45569668ee9e3b26055d1677fb2a95f28bb4b8e2b21589aba116329fbffeb74e4b391dde94f93547aeb1d689560d7050976db533be28c9cf6b6948"; + sha512.run = "17fd9af030ccd69b9f1a3b4760518f3b84d1f944b2bc4297a2fedd25691b81b249cb003af28ab07a60cdb2d14d6e9b5bab5370f78654bcf4efc281b50a673d57"; + sha512.doc = "2dbaf1200619859fd8eb5d758f87c1ebd0c7921a47b7500ae1e6fb0437066e5ca115db8caa0d804cdfd35b7777f64a26bb68f2f58424e0fe76ed04a8006a526d"; hasRunfiles = true; - version = "1.216"; + version = "1.224"; }; "xcite" = { revision = 53486; @@ -35827,13 +37035,13 @@ tl: { # no indentation version = "0.5"; }; "xcolor" = { - revision = 41044; + revision = 60925; stripPrefix = 0; - sha512.run = "9fba18460e4488cf2836082952ffff6e5e481b964570ee515f503aed3c8790778e054919e4e24070ff6cf608e21c1356859341eae5704558b1293b01ba8c0925"; - sha512.doc = "65f15207df8a112a4bccbac1c5259053364b52da3f0d2fdf566e1e734f61e0649ae6cc674c96f775d8c668cc6238dad2993f06b81153d38713ebf96e747e0353"; - sha512.source = "236eb7d2f94c297e743c2b0508e55910b00495915b7910dba7e0bc107f2ee37b24e3975242bb11c2c64a99f2abc5a55bd799277b9fbcd98058ee8add005d2be7"; + sha512.run = "399dc73f97a9c8ca1eae50f0f30fc900427adb48cecc4c01ed6609f741e267b6494ef40f2ad29a40d0257eddc43e7e27e82e42b9bead66f9a87468890c372525"; + sha512.doc = "0fe7912bd9a47a16bd17e72fec9e4d06d88a579bf3ab7e3602f110c23f628bf594406a2d83f221fcc826a89da9bd0503de86387e90e70d34981d48c30080b15d"; + sha512.source = "fad460b174fe565d975ab0250cced26d1272f564033c9320bfe1118f03509058a4b7ded71535441b0981813b00be1ab07d3ce0b5765307d12333226f5414522b"; hasRunfiles = true; - version = "2.12"; + version = "2.13"; }; "xcolor-material" = { revision = 42289; @@ -35920,13 +37128,13 @@ tl: { # no indentation version = "1.0"; }; "xecjk" = { - revision = 56711; + revision = 61287; stripPrefix = 0; - sha512.run = "6a318c27555cd58be7f3f8893ef4345f37b619cab2088a0ce5627000eb8375724a1e3e8df741cff2558143ad58a3d336d67aac4ff2dd8ca226b223ec103f9d3d"; - sha512.doc = "72446201ddef073b1b37686ecd0ff7569db34d3240b549b5e9ac2c5e6fbcd7e64a070afdc6ee40e83a4d95172cce37da092e463e4c55e5f293b92c39cd4817a3"; - sha512.source = "32c1905ffe53dca84509cf51fd4f2b2eff1ca1d03e97bc1f03009d236e476f8d8573ef3267e6466eb63e18b70207ba62558afcd1a64d9a1af79a7a6cfe5c050f"; + sha512.run = "7b2a43e2523c207a19ba688912bc832ea38431acec4dcf29218f863e7cf68d2057eca1e30e0fa1851cbd44fbedde06889390cab72c7ff9329a0778d02d059625"; + sha512.doc = "a2c80e3907af4723925a52c20c6ba2b7b6cf2f855824cb403f65c53f771c97523e30f97f559ba4a7a42f39c06079b82bd4454697104cb5ed3b044b3f271e916e"; + sha512.source = "2944d3905021933eae4dc940cdcefc6cc6d49494ba005ca34d54f8d2ee3fa88ae575a9cbfdca5541de65c5f172ecd2444c0dcc7c837e439016b072f9995241ef"; hasRunfiles = true; - version = "3.8.6"; + version = "3.8.8"; }; "xecolor" = { revision = 29660; @@ -35962,7 +37170,7 @@ tl: { # no indentation version = "0.3"; }; "xelatex-dev" = { - revision = 57186; + revision = 58842; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; @@ -35975,13 +37183,14 @@ tl: { # no indentation deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; + deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."lm" = tl."lm"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; hasFormats = true; - sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; + sha512.run = "9b8998710f85dc6f685cf3b423f34b08d0945c90e5f94bca141e40248acc641d6a687d39e91cddaca12aa51475fd4120cc482650b7536662cf3d9f07d3409680"; }; "xellipsis" = { revision = 47546; @@ -36028,7 +37237,7 @@ tl: { # no indentation version = "2.1"; }; "xetex" = { - revision = 57972; + revision = 61114; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; @@ -36049,8 +37258,8 @@ tl: { # no indentation deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; hasFormats = true; - sha512.run = "dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6"; - sha512.doc = "544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa"; + sha512.run = "c5cd9bcd20cc1ea6765d8c2adcc9aad2d2c6d2cee54998f4d27bcf2d2ceb58766bf125ecff6957e0806204333390be9ff646bb0523e97754c7056f80ca0e9d99"; + sha512.doc = "470d453c9fd81cc88b7a7de3e115c2ce6c83f770b5f7be2af40cb712bb62004f2e093dab0d8a373383ffc85fdec6ca1ecd9a7ee7440e8235e57c29de3b330d4a"; hasRunfiles = true; }; "xetex-devanagari" = { @@ -36098,12 +37307,12 @@ tl: { # no indentation hasRunfiles = true; }; "xetexko" = { - revision = 58633; + revision = 60444; stripPrefix = 0; - sha512.run = "53643a489cedfbb6d5898b45e1b70f7426a734fac6470d9378a196760af1d7a4793a6feca2c1508051d6f696ec0d780e25fe99c32ebc2b1504a4cd30652f9650"; - sha512.doc = "3410649caa3624f432477367e85b340469804306f4d1e8c33839291367a13b1775d37542db05d39bd5d3e7a103e30b124aaf8a786c10f3a9ee9ef7a1a695e05e"; + sha512.run = "460d2899cccaafe3f98eb46c5aa32ae4dfff923e70f997193ace6e502910d82635b0a949b4ed48cd10cc35405a41fb5704f988328f1ccb97b3dce065cc085d39"; + sha512.doc = "48d281ffb0268d4d6a08680e4eb022108a3b18a78a9de908e781477d670367f1ae05cf7666e0edb72bc4b7d3c1bdaefb1ecf63842e72d7b60075094e191fecdc"; hasRunfiles = true; - version = "3.1"; + version = "4.0"; }; "xetexref" = { revision = 56291; @@ -36175,27 +37384,51 @@ tl: { # no indentation sha512.doc = "50322d89f494d07793d964fe515b8a0bacb74bd5706a6da80f6860771a8e3cad35c7d06bf398217a7e4364594d54f4dc490f39980194804a04460047ff5083f8"; }; "xindex" = { - revision = 56295; - sha512.run = "e8a858e3fe056519eed3f85dc21291881fdbf057ece76d503fd863f66c51331d689fabbb7a1ba3728c3010c45a9f0663fb75db2b609716ee5dd515067bea07a5"; - sha512.doc = "f755500e75fa45d14110da45bd43d10f4cf170cc907af7743673a38e1c823612fce9131eb16a03e59a1a821b1e4b3580e6a2e6a68e759f53f9daea4f88e4f09e"; + revision = 60997; + sha512.run = "c34ba1d358204e117e5ef1ded4d9bbc2b745ca2f711a47d9fff6ead4de03d6fd782025e24427ff528299921fa00827dea9db70f3162aeff4851acf0a51fa1039"; + sha512.doc = "94c7b56000e161b09aa593e20841928e604665fdc1be466ff3b933f5a55e646cb1a9ef7d52d90d2ebe232f876a5554b9e7304116f86b692bc58af77992e7136a"; hasRunfiles = true; - version = "0.28"; + version = "0.34"; }; "xindy" = { - revision = 55330; - sha512.run = "8a2db7333ee39936892ad83eed0d31de25cdc48533dbbcb297e3a8714fefa6d7973b9e9eb7767a50f11be89afa7eb944bb56064a14b71d23bf8161f7fddf8d7c"; - sha512.doc = "4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23"; + revision = 59894; + sha512.run = "0abfc9c3d4f4418fa63845df092e074762f215b334f76016814988f5243bbb184768256792779c65f277fa6a48c41d762c33be6c5cf25ba292efcf9f0554abf8"; + sha512.doc = "3fed723b6115fd7e05b84c010ded501fcd8440af72353b2b7ccb6df39082515b5de33951821c8546b65ba2462695971695caf2ce88fed67c9bd766db9d13e859"; hasRunfiles = true; version = "2.5.1"; }; -"xint" = { - revision = 58738; +"xindy-persian" = { + revision = 59013; stripPrefix = 0; - sha512.run = "44305994a39b6d0a0c517445bf554f1decaa8c1bde5eee2613010308308fd606790409266e9af0803828df00693ac5e1d015a8cef90d112553762eae97f8ed53"; - sha512.doc = "dc65101c1196c68a703d1e6f8f1b69c554bc3841fbde860cacf11c3547f6fe45928d371deed05ce1999f7afa1bd65368df626199a0f2dd5392c4d67e924a51b9"; - sha512.source = "75fa7fe493f9bd393cab448c7bbac43d56f67daf547281cc410d88db54e8b6ccffd86171a2ef5ed54721e73538c61b6493e41fca4a503775ff8ed0cb7bac968e"; + sha512.run = "07313253d80b5ed6494e1189088908e03590424c7d24038a437dcbe83637db9e426fa0989fa202f25f62e112cc77df3c4acef111bda6c8b44dc2b2660af959da"; + sha512.doc = "3868c7f2c20e22cfb3b1ffc61c830581d774ca909c4fc450586ed0bc82a091546efc46540a883e667ac5ac7d292a4786019384afa741599634a2fc05975c36e7"; + version = "0.8"; +}; +"xint" = { + revision = 59930; + stripPrefix = 0; + sha512.run = "465e330c07643ec8a934ebeae728fc6d4b35bb6ea79a8db88e10c5d90fbb8d0f7cdf23eb941dd41541f0132fc8479f9bae049c2ba1d6d8e793cc8530f6f63317"; + sha512.doc = "54ee68f457653c787278f1d2f8acc5eab1e814c94ccf79b5ca4da524f75a3921fb8d905979138bdb3dabc4a8ce76f27be79c53ef4c0e6f91e6ec924b5b37a681"; + sha512.source = "9a415b9c473cf788cf8135db1ecdb7d85dc3f9525fabf8f7273c604fc39c3f04387dd0f0c03e0b525cda23f130ee996fbd4bc8d3d09dc97ab892e1aeb17056f2"; hasRunfiles = true; - version = "1.4d"; + version = "1.4j"; +}; +"xintsession" = { + revision = 60926; + stripPrefix = 0; + sha512.run = "d1e279e733e37d6ef163a1dc537f5c02119403710a930f409cc6cfa55f1c08d9dd30bf4aeb14b68e4080442137a7352207ca8dc9bd7f859a8d19cf9205b68c1d"; + sha512.doc = "1a99ce3ce5e2a311e1dd4086f416738c48cbd42ad0b37c372fffcb0a4f035b3384f1b4963cccd2b602164f256e4bcb8d9b1d3efc56c99382e284d6d97e20b7c1"; + hasRunfiles = true; + version = "0.4alpha"; +}; +"xistercian" = { + revision = 61366; + stripPrefix = 0; + sha512.run = "e0b4db57c0c3b819f1c653f097c6adcad1d2b74409926d5e0652fed4aced3be5b82ec5f663d85769261fb62e89d16bbe36ed87e6ca2352ab9548fd322c6b7b5a"; + sha512.doc = "673d6a01619a36fd8db88ab056a8560200e03de519799b867583d6fe0226a25661245e4942a1e2b13a23d2913a137736f6b10ecb25962e0b4afbec8e2b568cf5"; + sha512.source = "8c305d95953774aaa5e181a3ab2f904b6faceb2387a6b4c9dd4f6c11eb3ddad4e31088a11db48d2ca2a0a72911f5cff1d3bf5bf37a933ceb76805a6265d3c816"; + hasRunfiles = true; + version = "1.2"; }; "xits" = { revision = 55730; @@ -36288,13 +37521,13 @@ tl: { # no indentation hasRunfiles = true; }; "xmpincl" = { - revision = 15878; + revision = 60593; stripPrefix = 0; - sha512.run = "8d9a895a1efe8ce5eac190b8242c7f3e3bff7e433e1336aa7143894fbc5691c7b4fd791bae67fcefe97d16ff131b533f8b0c629580d7b5f9420e9216e932b860"; - sha512.doc = "2757de1bfcbfe9df02d5e667564b1a69205ab86c31f7bcc8ec3f37db0fb1a1f4bb21d7360dbfd771aeafaffa4599becc801df81e339b6f49adafeb38bc1ff5af"; - sha512.source = "92cdd556f60d8a4186f64800ef5c8a27e331e394ac0120d3e07065688d454ea821839eaaf167bb15980223552160e161cb3c559feffbc4d6657af1019f7c14a2"; + sha512.run = "49777de1160b2ef53d845ba08fb0af29eb5f06c6fc534da4856bd0f02dbed2dbaa73ac24c45b1e787ea44d08199b7d1c462dc21a972cd1815fcbf65a08388f26"; + sha512.doc = "b8750478957f6b33163ef546d7be0c0ba4e5906d64a72cdf3edda33c663bcf7400eaeebe3119a175f21093a1b00bd2626df0156c8ebdfb9cdd076bc8d7953ac7"; + sha512.source = "48d8805d763169bd3024227edac213a5e57d207e63895492cc6f0a25ef38b82fe9d8fee76ea5309344bd397e4c5b70f8b72892d4054307bf758fb81cc8af3bd9"; hasRunfiles = true; - version = "2.2"; + version = "2.4"; }; "xmuthesis" = { revision = 56614; @@ -36424,12 +37657,12 @@ tl: { # no indentation version = "1.5"; }; "xstring" = { - revision = 49946; + revision = 60007; stripPrefix = 0; - sha512.run = "82254f103053d91eeea4c6230142de06138c392542cac63731c7b34fec5130984bbdebc29ac3b56998717dca11ad444c44f410215b6b89e6748029721a9daac6"; - sha512.doc = "c0c17b82ad0d5aad95d312935e0214a7e5404a23b9a284a56ac92ec9ea936a9bfd3a68a5b01e29c131b7850a3fd3922ac87020166eaf0a7ed9d695dc80d0a931"; + sha512.run = "d02190c624808e5c5814f2c2a8c8ce9f28197a165bc988c02d6eac6fa8a22e3e1bb5c3b41b9b3a3db38917377097a0f97e65ae41ddd9422a97501c6c7a2d2668"; + sha512.doc = "dbd3711d0e6ced0346feb8af281779cb3669bb849d8a04ea9d184961f473aefd3910bfbc77cebd9d150a409489fa1db65581f162cc37bdc2b36482474b439e6c"; hasRunfiles = true; - version = "1.83"; + version = "1.84"; }; "xtab" = { revision = 23347; @@ -36539,6 +37772,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"yamlvars" = { + revision = 61327; + stripPrefix = 0; + sha512.run = "1c0f473b95db6d4eed19d60e457271acda699a36d9d5de84f70e7f81411e23779a235b7237354b57c786e4b1af9e8d09294f55271da36c26dc42c93816c3b589"; + sha512.doc = "1f9613b9463616b38a34ad8b913e599e9c13124bf7e457ca541eec4aa67a3e2b95cc3869c7a4fc012e150afc1fc93accdda89b05340e3d4484a5b0a4ca9986d3"; + hasRunfiles = true; +}; "yannisgr" = { revision = 22613; stripPrefix = 0; @@ -36547,13 +37787,13 @@ tl: { # no indentation hasRunfiles = true; }; "yathesis" = { - revision = 58683; + revision = 61204; stripPrefix = 0; - sha512.run = "199abb5d02a37420e1c382916880428d5426eacaf007e3e264bf257710823d8380fd0bb69c40065d7259e28769dff4d6c90bd55a5fb931b6497d64b106e9c7cf"; - sha512.doc = "1beedc083923302c094a4f2c7091743c87188292b8633646877c575e1bb724f42b171805f0ce39f615c7485769f191676310e1f5257c0f4c03aa65ec3309c4cb"; - sha512.source = "7c99e72a3ef76aae6f5e4ea77d78cd6cd2c98c7163b468e317f4de72734a3e4e8c2698b93dbc82df20f5b8197905f9f253b5d652debd6fa0c0d5377cc2015611"; + sha512.run = "c23ecab7e0b886ce54d6bf5d4382595f131dd733e285d2e49869fe505546db27461ab81d1ef9951a439e19a74eecd6d39ce7729305d306fc51faae0e9830097e"; + sha512.doc = "1aa656169a6cdec993ef7d03e8ab508e9ef2e3cbb91ea04616bb476817c6d04acbf0d757ab2f256b6ec53b6f6b62209d101a798ea36535d3511980876a357e67"; + sha512.source = "52875dc80b92861c85c0b3e321c33f3b5d27dacd1af8a4a98fa32ada32c40d263b7a0270a130e660c5bdd2441353afa4f95371074d40ea29f2120df09d8ac1e7"; hasRunfiles = true; - version = "1.0.7"; + version = "1.0.10"; }; "yax" = { revision = 54080; @@ -36646,21 +37886,21 @@ tl: { # no indentation hasRunfiles = true; }; "yquant" = { - revision = 58712; + revision = 60420; stripPrefix = 0; - sha512.run = "90c4488ffbb6a2ec49297b7584c27416044220253fb7f20104402062e57df415d0f89dd4545b4964e5c3ca28851cc4762301151963d0be74200f7809ec31f494"; - sha512.doc = "ada2f983ef92968da06bbf21371b58ce02a257992160e898ad75a66fbb7aae3fbb00178d2663e1d816e3928eb187f44b50c812239f0c1b5861786ad9d5ccf812"; + sha512.run = "6d5d8c48e2103d2f97ffee6b367a27a3a2fa4477f7b08c2ee4e77b74bd93485c7a0f39d03124ea890fdc469289e7eb0b28e62cea84a413418445e67019240f33"; + sha512.doc = "22388a724c3c669087c1eb350705efb76fa70aeef735fb20fe3a66a308b940f11824c43d3ca72094588ad98ec9104c389ea30f712d56e14ee1abfd7a4dec46fe"; hasRunfiles = true; - version = "0.4"; + version = "0.5.1"; }; "ytableau" = { - revision = 27430; + revision = 59580; stripPrefix = 0; - sha512.run = "2d9528c47b516213d0d8ea6341edc1772aa4a88a7db60d4506cbef107be034bcb9036b18f61a12e042e95bd9d0aea51b0ee696565841d2efb12b442756c48a30"; - sha512.doc = "47db377bfecce43d97e573360cfc65936664b5ea886b5bc0042b39e3a879becef0e9894c364a31cb4cda7420ba672c8f55e7936ae5b1d291259d8deb7a6d9f9d"; - sha512.source = "02c2aff53daaec5161a9715de2e633d03dedc85664868d73c49dc0edc5c8b0bc696e3e8ab6d25f3420663fcff830581a7b2fdd0718a3c4928aa808ca3b1cbde3"; + sha512.run = "23bf33f11e295f5f36149bad2b801ecfee57b386dd952ea93b16e79f85c54e1edff741bb7d6dc7faa769062ff81277cf04ff06cb2fb92e9a7542b4dc93eebb0b"; + sha512.doc = "b98b0da2e5e0eb964ede56a27067b7ba862b63dd1b0dc6771e432abb16e924fda5630d067c6bbb05fdf6a37aba07c61396d47612adcfcccd5886ff3fdd47b7a4"; + sha512.source = "264f983cb28ddd4f2089b4d170603172cce27b463999e4806173106e384bd4c3be16ada6f0c2e3c176dc450c53c2e50e43f993c893880ccf5c9454b84a062ea8"; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "zapfchan" = { revision = 31835; @@ -36675,12 +37915,12 @@ tl: { # no indentation hasRunfiles = true; }; "zbmath-review-template" = { - revision = 58543; + revision = 59693; stripPrefix = 0; - sha512.run = "aaadb2179f8c8c3b48dca8f4d021a51dd34863f7f3c30cb6705c07026218684038f398468a9b4a779d8a3cc4ab2520dadb81890690b173b20b1f5baf3644886b"; - sha512.doc = "8bdf2cd42ba8cc24e55fcbf8061a2cbbcdd750d77f5ad3c613d721eec2ba164cc69a73a85382d5a2893121300ce2657f291d181c92d4b0f8a7b574229d6f97d9"; + sha512.run = "c9685b151679e7516e146f3d97f4242c7cdf084f84a7ac857a8aa27031c60950d0da07d66b7b57d7bdec384d3501c30b339231654cf845bbed2945b0ac069368"; + sha512.doc = "470ee6c9895effd3c6bcac5a9faaa3862380bb137044411dd0013f4f465dc923dc1de507f2d1d087fb4b4178cb2f43f435e71b090d55744a8be6e59f8cc010fa"; hasRunfiles = true; - version = "1.0"; + version = "2.1"; }; "zebra-goodies" = { revision = 51554; @@ -36756,13 +37996,21 @@ tl: { # no indentation hasRunfiles = true; version = "2.1"; }; -"zlmtt" = { - revision = 51368; +"zitie" = { + revision = 60676; stripPrefix = 0; - sha512.run = "b60e880508e08fc0a3f265b7d85c7ae8667c0a16264148a2944184a598f690f337149348157dc7b7b11f1cac59d44117425b50a26bbdaa0fbf1dcebb023093e6"; - sha512.doc = "22e301f72e0b62078d7b6fe7d7740e0477d9b18beb59ab55b81dd65c50cb250ae711886f01944cdfd25f82d0dd2089c41e662cb2f16eaa0252d70c1006eed8d8"; + sha512.run = "10769951705e67bb929643e39d5480c4c2337a68f59ede2d77b2f8ddc3e2d6363c873d0e8e480a85e02f2062736570fa74171c862e50af73efa941a4d93cdd58"; + sha512.doc = "84f8e20beec5ba5ffbd79c6ffa68f0530b285761a8de6ed53e621ef39c0c14f59c33d76373581f94f10b1149a9fe5c92c1c74bbe2c4d6b8aa589d3a574bd9153"; hasRunfiles = true; - version = "1.02"; + version = "1.4.0"; +}; +"zlmtt" = { + revision = 61379; + stripPrefix = 0; + sha512.run = "3bde356a92ced2170521dc1ca606f02db31467d2584064d7d2faaf518af8a3d8ceea6a6ce6195d280230188395b27399da4b92dfcafb04348948ae2c44e92f57"; + sha512.doc = "810f538e57601f8dfa1143acf1803f5466e42d7705a5e5cf9aaa63ebbbabede669801ddfd24a6008f6d059b1a2e23f48f1baa07a546837027e52e23199f09ff3"; + hasRunfiles = true; + version = "1.03"; }; "zootaxa-bst" = { revision = 50619; @@ -36781,6 +38029,24 @@ tl: { # no indentation hasRunfiles = true; version = "2.32"; }; +"zref-check" = { + revision = 61359; + stripPrefix = 0; + sha512.run = "8695bf0fd5a1d4c94219aefc7a7022a7efc2eb315c270689df726e9727bc8e38709c816bde2ec41b3a61691b96b0e97ac101c09b7af7cd5edc4f3855a94241e3"; + sha512.doc = "7906814e90d8ca6b35c9153e086dc66c34cd5432ca600a59b5bf1c4969d3928e6e0f494dfd0ba124d264606e6a1ec2fc0782df1e10d198bc6b5ea60b3d8de32e"; + sha512.source = "141ea6d6a296b2bc7effe6ac90f831a68484f1bbab3fab1add2985bc4d94b6d3fdba98ef80d5cb4ba284738c8c5203d252286161a59ba7713fb5447c39dd7beb"; + hasRunfiles = true; + version = "0.2.3"; +}; +"zref-clever" = { + revision = 61246; + stripPrefix = 0; + sha512.run = "65f66f94bb2dcdb470cde4c0cea5f947359956726db46acc59a5c963e3601f350b2d6ea50fd0276f69d81b48086314ab4a6a1fa3b76d9c2746ff231cee047c2f"; + sha512.doc = "e173be442a3ecae85c24005ce99c141e29900b5f0178d8dee3db6874e1e91068839ef4c1f4e98d0ac49e41ddfc1e4dc8f523238555cb2ce8c0a66282d38b7a72"; + sha512.source = "b3cd945a1ad1e86b2042abd88354877b2f3834a65530f0e58704b36f1ae6a2cc3e06c292f0c2971d063ba3b8e18c96d9d06cb2773af1cad155fe8932c8d5cf79"; + hasRunfiles = true; + version = "0.1.1-alpha"; +}; "zwgetfdate" = { revision = 15878; stripPrefix = 0; @@ -36796,6 +38062,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.4d"; }; +"zx-calculus" = { + revision = 60838; + stripPrefix = 0; + sha512.run = "17854656622c012a3c0a4711e9c38d2c100a156072e7556b3ba3d6ce6edf1463c69078073bd72b83d3136e96e72e4adfff3982a73d4fd4d66fa98ff6823eafb5"; + sha512.doc = "076a25ef96775d28fad2e97027ef69b983f1cc44f11866b7f6db0408bca45759b8ed0f3914516712f235ee4a670bb3fcb28954a2b3f745786e6d6f8f7c06cde9"; + hasRunfiles = true; +}; "zxjafbfont" = { revision = 28539; stripPrefix = 0; diff --git a/third_party/nixpkgs/pkgs/tools/video/vnc2flv/default.nix b/third_party/nixpkgs/pkgs/tools/video/vnc2flv/default.nix index fdaf2ee274..f32078f0b8 100644 --- a/third_party/nixpkgs/pkgs/tools/video/vnc2flv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/vnc2flv/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "vnc2flv"; version = "20100207"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index 16a7ecffa0..846e2ee279 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+36lGLpNnTQnwwmXoVNPt3RMcnE46AdXOpghvhP0Bq0="; + sha256 = "sha256-b65GY08vykVp/PUBmBXKIfykyPEJRgGjgu7zBoXx3K0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix index ab3c9b1e71..2497cc6a9d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: +{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; }; - buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; + buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix index 2921e3858b..0e3d382a11 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix @@ -1,29 +1,54 @@ { lib +, stdenv , fetchFromGitHub , makeWrapper , rustPlatform , vulkan-loader +, pkg-config +, udev +, v4l-utils +, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "wluma"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "maximbaz"; repo = "wluma"; rev = version; - sha256 = "sha256-fqBEJS+SQoPNNEw6jyoiZjq/chY73bQ+cM21F8RdNPE="; + sha256 = "sha256-H5ohAawHTvZoFq4t5dUgP4Tr5qNyXEP4SG738Bo8mxc="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + udev + v4l-utils.lib + ]; + + LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; + + # Works around the issue with rust-bindgen and the Nix gcc wrapper: + # https://hoverbear.org/blog/rust-bindgen-in-nix/ + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + -isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include \ + -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include \ + -idirafter ${v4l-utils.dev}/include" + ''; postInstall = '' wrapProgram $out/bin/wluma \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" ''; - cargoSha256 = "sha256-dZBA6VeJRHmqpazRwjLP1kYcYYN5LCFWkIaXqp4/RkQ="; + cargoSha256 = "sha256-xLmDDy6qKXo0mLW3R4hQfZssg6lpo0G018TonF1uS14="; meta = with lib; { description = "Automatic brightness adjustment based on screen contents and ALS"; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 861d649d07..49c0c839bb 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 + airtame = throw "airtame has been removed due to being unmaintained."; # added 2022-01-19 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 alienfx = throw "alienfx has been removed."; # added 2019-12-08 alsaLib = alsa-lib; # added 2021-06-09 @@ -100,6 +101,7 @@ mapAliases ({ bitwarden_rs-postgresql = vaultwarden-postgresql; bitwarden_rs-vault = vaultwarden-vault; + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # added 2022-01-12 bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 @@ -118,6 +120,7 @@ mapAliases ({ casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # added 2019-12-22 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25 + cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # added 2022-01-12 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 @@ -180,6 +183,7 @@ mapAliases ({ cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23 cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 @@ -214,6 +218,7 @@ mapAliases ({ desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 + displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # added 2022-01-12 dmtx = dmtx-utils; # added 2018-04-25 dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 @@ -234,6 +239,10 @@ mapAliases ({ ec2_api_tools = ec2-api-tools; # added 2021-10-08 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2021-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2021-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2021-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2021-01-06 electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -250,6 +259,7 @@ mapAliases ({ euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 + evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14 exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 @@ -302,6 +312,7 @@ mapAliases ({ gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 + getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 gitAndTools = self // { # added 2021-01-14 @@ -314,6 +325,7 @@ mapAliases ({ topGit = top-git; }; gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07 + gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12 glib_networking = glib-networking; # added 2018-02-25 gmailieer = lieer; # added 2020-04-19 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 @@ -336,6 +348,7 @@ mapAliases ({ gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 + gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # added 2022-01-16 gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 @@ -375,6 +388,7 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15 hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 @@ -415,6 +429,7 @@ mapAliases ({ kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; + ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # added 2022-01-12 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15 julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 @@ -492,6 +507,8 @@ mapAliases ({ libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 + lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 + lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 links = links2; # added 2016-01-31 linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09 linux_rpi0 = linuxKernel.kernels.linux_rpi1; @@ -561,10 +578,15 @@ mapAliases ({ lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 + lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 + love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 + love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 + love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 m3d-linux = m33-linux; # added 2016-08-13 mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21 + mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 @@ -576,8 +598,10 @@ mapAliases ({ mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 meme = meme-image-generator; # added 2021-04-21 mess = mame; # added 2019-10-30 + metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 + mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # added 2022-01-12 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01 mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 @@ -620,6 +644,7 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 ncat = nmap; # added 2016-01-26 + neap = throw "neap was removed from nixpkgs, as it relies on python2"; # added 2022-01-12 netcat-openbsd = libressl.nc; # added 2018-04-25 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 @@ -639,6 +664,8 @@ mapAliases ({ nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 + nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15 + noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05 nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; @@ -743,6 +770,7 @@ mapAliases ({ pidginotr = pidgin-otr; # added 2018-01-08 pidginsipe = pidgin-sipe; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 + pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # added 2022-01-19 piwik = matomo; # added 2018-01-16 pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 @@ -764,6 +792,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; timescaledb = postgresqlPackages.timescaledb; + tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; cstore_fdw = postgresqlPackages.cstore_fdw; pg_hll = postgresqlPackages.pg_hll; @@ -796,9 +825,15 @@ mapAliases ({ pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 + pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 + pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 + pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 + python = python2; # added 2022-01-11 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 python-swiftclient = swiftclient; # added 2021-09-09 + pythonFull = python2Full; # added 2022-01-11 + pythonPackages = python.pkgs; # added 2022-01-11 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 @@ -834,11 +869,13 @@ mapAliases ({ qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 + rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 ring-daemon = jami-daemon; # added 2021-10-26 radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25 + renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # added 2022-01-12 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 rpiboot-unstable = rpiboot; # added 2021-07-30 @@ -972,6 +1009,7 @@ mapAliases ({ telepathy_salut = telepathy-salut; # added 2018-02-25 telnet = inetutils; # added 2018-05-15 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21 + terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15 terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 @@ -1020,6 +1058,7 @@ mapAliases ({ uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; v4l_utils = v4l-utils; # added 2019-08-07 v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 @@ -1201,6 +1240,8 @@ mapAliases ({ Its new location is obs-studio-plugins.wlrobs. ''; + multimc = throw "multimc was removed from nixpkgs; use polymc instead"; # Added 2022-01-08 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index ff2ae20870..76227e7560 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -315,6 +315,8 @@ with pkgs; deadcode = callPackage ../development/tools/deadcode { }; + deadnix = callPackage ../development/tools/deadnix { }; + each = callPackage ../tools/text/each { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; @@ -970,8 +972,6 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; - airtame = callPackage ../applications/misc/airtame { }; - aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { @@ -1085,8 +1085,6 @@ with pkgs; eterm = callPackage ../applications/terminal-emulators/eterm { }; - evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); - foot = callPackage ../applications/terminal-emulators/foot { }; germinal = callPackage ../applications/terminal-emulators/germinal { }; @@ -1110,16 +1108,6 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - lilyterm = callPackage ../applications/terminal-emulators/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - logseq = callPackage ../applications/misc/logseq { }; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -2195,8 +2183,6 @@ with pkgs; bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; - blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; - blitz = callPackage ../development/libraries/blitz { }; blockbook = callPackage ../servers/blockbook { }; @@ -3108,6 +3094,8 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; + ghidra = callPackage ../tools/security/ghidra/build.nix { }; + ghidra-bin = callPackage ../tools/security/ghidra { }; gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; @@ -3398,8 +3386,6 @@ with pkgs; midicsv = callPackage ../tools/audio/midicsv { }; - mididings = callPackage ../tools/audio/mididings { }; - miniscript = callPackage ../applications/blockchains/miniscript { }; miniserve = callPackage ../tools/misc/miniserve { @@ -3490,6 +3476,8 @@ with pkgs; nrsc5 = callPackage ../applications/misc/nrsc5 { }; + nsync = callPackage ../development/libraries/nsync { }; + nwipe = callPackage ../tools/security/nwipe { }; nx2elf = callPackage ../tools/compression/nx2elf { }; @@ -4662,7 +4650,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { - inherit (pythonPackages) mutagen python wrapPython; + inherit (python2Packages) mutagen python wrapPython; }; dirdiff = callPackage ../tools/text/dirdiff { @@ -4891,6 +4879,10 @@ with pkgs; s-tar = callPackage ../tools/archivers/s-tar {}; + solo2-cli = callPackage ../tools/security/solo2-cli { + inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit; + }; + sonota = callPackage ../tools/misc/sonota { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; @@ -4923,8 +4915,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -5581,8 +5573,6 @@ with pkgs; geteltorito = callPackage ../tools/misc/geteltorito { }; - getmail = callPackage ../tools/networking/getmail { }; - getmail6 = callPackage ../tools/networking/getmail6 { }; getopt = callPackage ../tools/misc/getopt { }; @@ -5815,8 +5805,6 @@ with pkgs; github-runner = callPackage ../development/tools/continuous-integration/github-runner { }; - gitinspector = callPackage ../applications/version-management/gitinspector { }; - gitkraken = callPackage ../applications/version-management/gitkraken { }; gitlab = callPackage ../applications/version-management/gitlab { }; @@ -7594,8 +7582,6 @@ with pkgs; mailsend = callPackage ../tools/networking/mailsend { }; - mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; - mailutils = callPackage ../tools/networking/mailutils { sasl = gsasl; }; @@ -7699,8 +7685,6 @@ with pkgs; mencal = callPackage ../applications/misc/mencal { } ; - metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; - metar = callPackage ../applications/misc/metar { }; mfcuk = callPackage ../tools/security/mfcuk { }; @@ -8530,6 +8514,8 @@ with pkgs; page = callPackage ../tools/misc/page { }; + PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; @@ -8841,6 +8827,8 @@ with pkgs; poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; + polymc = libsForQt5.callPackage ../games/polymc { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -8919,8 +8907,6 @@ with pkgs; pastebinit = callPackage ../tools/misc/pastebinit { }; - pifi = callPackage ../applications/audio/pifi { }; - pmacct = callPackage ../tools/networking/pmacct { }; pmix = callPackage ../development/libraries/pmix { }; @@ -9594,6 +9580,8 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signald = callPackage ../applications/networking/instant-messengers/signald { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -10200,6 +10188,8 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; + timetagger = callPackage ../servers/timetagger { }; + timekeeper = callPackage ../applications/office/timekeeper { }; timezonemap = callPackage ../development/libraries/timezonemap { }; @@ -10696,7 +10686,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -13249,7 +13239,6 @@ with pkgs; vala-lint = callPackage ../development/tools/vala-lint { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_40 vala_0_48 vala_0_52 vala_0_54 @@ -13479,6 +13468,10 @@ with pkgs; io = callPackage ../development/interpreters/io { }; + ivy = callPackage ../development/interpreters/ivy { + buildGoModule = buildGo117Module; + }; + j = callPackage ../development/interpreters/j { stdenv = clangStdenv; }; @@ -13524,11 +13517,8 @@ with pkgs; lolcode = callPackage ../development/interpreters/lolcode { }; - love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; }; - love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; - love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love_11 = callPackage ../development/interpreters/love/11.1.nix { }; + love_11 = callPackage ../development/interpreters/love/11.nix { }; love = love_0_10; wabt = callPackage ../development/tools/wabt { }; @@ -13652,7 +13642,6 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python = python2; python2 = python27; python3 = python39; pypy = pypy2; @@ -13661,11 +13650,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override { - self = pythonFull; - pythonAttr = "pythonFull"; - x11Support = true; - }; python2Full = python2.override { self = python2Full; pythonAttr = "python2Full"; @@ -13702,7 +13686,6 @@ with pkgs; }; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python.pkgs; python2Packages = python2.pkgs; python3Packages = python3.pkgs; @@ -13769,12 +13752,6 @@ with pkgs; pyradio = callPackage ../applications/audio/pyradio {}; - pyrex = pyrex095; - - pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; - - pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - racket = callPackage ../development/interpreters/racket { # racket 6.11 doesn't build with gcc6 + recent glibc: # https://github.com/racket/racket/pull/1886 @@ -13807,8 +13784,6 @@ with pkgs; inherit (ocamlPackages) reason; - renpy = callPackage ../development/interpreters/renpy { }; - pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; @@ -13888,6 +13863,7 @@ with pkgs; wasm3 = callPackage ../development/interpreters/wasm3 { }; + yex-lang = callPackage ../development/interpreters/yex-lang { }; ### DEVELOPMENT / MISC @@ -14104,10 +14080,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_3 - electron_4 - electron_5 - electron_6 electron_7 electron_8 electron_9 @@ -14449,6 +14421,8 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; + cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; + ctmg = callPackage ../tools/security/ctmg { }; cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; @@ -14643,6 +14617,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dura = callPackage ../development/tools/misc/dura { }; + dwfv = callPackage ../applications/science/electronics/dwfv { }; dwz = callPackage ../development/tools/misc/dwz { }; @@ -14907,8 +14883,6 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/embedded/arduino/ino { }; - inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { }; @@ -15273,7 +15247,6 @@ with pkgs; r10k = callPackage ../tools/system/r10k { }; radare2 = callPackage ../development/tools/analysis/radare2 ({ - inherit (gnome2) vte; lua = lua5; } // (config.radare or {})); @@ -17279,7 +17252,9 @@ with pkgs; llvmPackages = llvmPackages_11; }; - isso = callPackage ../servers/isso { }; + isso = callPackage ../servers/isso { + nodejs = nodejs-14_x; + }; itk4 = callPackage ../development/libraries/itk/4.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -19131,7 +19106,9 @@ with pkgs; openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackage ../development/libraries/openbabel { }; + openbabel3 = callPackage ../development/libraries/openbabel { + python = python3; + }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -20200,17 +20177,9 @@ with pkgs; gnutls = gnutls; }); - v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ - inherit (python2Packages) python gyp; - icu = icu58; # v8-5.4.232 fails against icu4c-59.1 - } // lib.optionalAttrs stdenv.isLinux { - # doesn't build with gcc7 - stdenv = gcc6Stdenv; - }); + v8 = callPackage ../development/libraries/v8 { }; - v8 = callPackage ../development/libraries/v8 { - inherit (python2Packages) python; - }; + v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; @@ -20767,6 +20736,8 @@ with pkgs; packages = []; }; + rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; }; + rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (_: {})) pkgs; }); @@ -20781,6 +20752,8 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; + alps = callPackage ../servers/alps {}; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -20951,6 +20924,8 @@ with pkgs; gn = gn1924; }; + ergochat = callPackage ../servers/irc/ergochat { }; + etcd = etcd_3_3; etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -21060,6 +21035,8 @@ with pkgs; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; + home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; + hqplayerd = callPackage ../servers/hqplayerd { }; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; @@ -21696,7 +21673,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; - inherit (pythonPackages) buildPythonPackage qpid-python; + inherit (python2Packages) buildPythonPackage qpid-python; }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; @@ -22913,6 +22890,8 @@ with pkgs; sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; + sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; + sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -23275,8 +23254,6 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cdetheme { }; - charis-sil = callPackage ../data/fonts/charis-sil { }; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; @@ -23617,6 +23594,8 @@ with pkgs; libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linux-manual = callPackage ../data/documentation/linux-manual { }; @@ -23736,7 +23715,12 @@ with pkgs; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + noto-fonts-emoji-blob-bin + noto-fonts-extra; nuclear = callPackage ../applications/audio/nuclear { }; @@ -24026,6 +24010,8 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { }; + tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; template-glib = callPackage ../development/libraries/template-glib { }; @@ -24234,7 +24220,7 @@ with pkgs; alock = callPackage ../misc/screensavers/alock { }; - inherit (python3Packages) alot; + alot = callPackage ../applications/networking/mailreaders/alot { }; alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; @@ -24451,7 +24437,13 @@ with pkgs; berry = callPackage ../applications/window-managers/berry { }; - bespokesynth = callPackage ../applications/audio/bespokesynth { }; + bespokesynth = callPackage ../applications/audio/bespokesynth { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit CoreServices CoreAudioKit; + }; + + bespokesynth-with-vst2 = bespokesynth.override { + enableVST2 = true; + }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; @@ -25369,6 +25361,38 @@ with pkgs; }; }; }; + gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python3; + }; + }; + gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio.pkgs; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradio3_9Minimal = gnuradio.override { + doWrap = false; + unwrapped = gnuradio.unwrapped.override { + volk = volk.override { + # So it will not reference python + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + gr-blocktool = false; + sphinx = false; + doxygen = false; + # Doesn't make it reference python eventually, but makes reverse + # depdendencies require python to use cmake files of GR. + gr-ctrlport = false; + }; + }; + }; gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -25399,34 +25423,6 @@ with pkgs; }; }; }; - gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python2; - # Incompatible with uhd4+ - uhd = uhd3_5; - }; - }; - gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs; - # A build without gui components and other utilites not needed if gnuradio is - # used as a c++ library. - gnuradio3_7Minimal = gnuradio3_7.override { - doWrap = false; - unwrapped = gnuradio3_7.unwrapped.override { - volk = volk.override { - enableModTool = false; - }; - features = { - gnuradio-companion = false; - python-support = false; - gr-qtgui = false; - gr-utils = false; - sphinx = false; - doxygen = false; - gr-wxgui = false; - }; - }; - }; grandorgue = callPackage ../applications/audio/grandorgue { }; @@ -25484,9 +25480,7 @@ with pkgs; grip-search = callPackage ../tools/text/grip-search { }; - grip = callPackage ../applications/misc/grip { - inherit (gnome2) libgnome libgnomeui vte; - }; + grip = callPackage ../applications/misc/grip { }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -25606,6 +25600,8 @@ with pkgs; desktopName = "Firefox DevEdition"; }; + firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; + flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -27085,6 +27081,10 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + mepo = callPackage ../applications/misc/mepo { + zig = zig_0_8_1; + }; + meshcentral = callPackage ../tools/admin/meshcentral { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -27187,7 +27187,9 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; }; - monitor = callPackage ../applications/system/monitor { }; + monitor = callPackage ../applications/system/monitor { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; @@ -27381,8 +27383,6 @@ with pkgs; n8n = callPackage ../applications/networking/n8n {}; - neap = callPackage ../applications/misc/neap { }; - neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -27464,6 +27464,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul { }; + pijuice = with python3Packages; toPythonApplication pijuice; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; @@ -28042,6 +28044,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomotroid = callPackage ../applications/misc/pomotroid { + electron = electron_9; + }; + pond = callPackage ../applications/networking/instant-messengers/pond { }; ponymix = callPackage ../applications/audio/ponymix { }; @@ -28358,6 +28364,10 @@ with pkgs; rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; + rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { }; + rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix { + rofi-unwrapped = rofi-wayland-unwrapped; + }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -28379,6 +28389,8 @@ with pkgs; jdk = jdk8; }; + rstudio-server = rstudio.override { server = true; }; + rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; @@ -28502,7 +28514,9 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { }; + split2flac = callPackage ../applications/audio/split2flac { + inherit (python3.pkgs) mutagen; + }; spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; @@ -28600,8 +28614,6 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaByDagoma = callPackage ../applications/misc/curabydagoma { }; - peru = callPackage ../applications/version-management/peru {}; petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; @@ -29016,9 +29028,7 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { - inherit (pythonPackages) wrapPython wxPython; - }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -29397,8 +29407,9 @@ with pkgs; }; code-server = callPackage ../servers/code-server { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin) cctools; + inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; @@ -29741,11 +29752,7 @@ with pkgs; }; xiphos = callPackage ../applications/misc/xiphos { - gconf = gnome2.GConf; - inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; - python = python27; - enchant = enchant2; }; xournal = callPackage ../applications/graphics/xournal { @@ -30248,10 +30255,24 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; - displaycal = callPackage ../applications/graphics/displaycal {}; - drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + + eureka-editor = callPackage ../applications/misc/eureka-editor { }; + + eureka-ideas = callPackage ../applications/misc/eureka-ideas { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + fava = callPackage ../applications/office/fava {}; + + nux = callPackage ../tools/misc/nux { }; + + tts = callPackage ../tools/audio/tts { }; + + fslint = callPackage ../applications/misc/fslint { }; + ### GAMES _1oom = callPackage ../games/1oom { }; @@ -30274,7 +30295,7 @@ with pkgs; blockattack = callPackage ../games/blockattack { } ; - colobot = callPackage ../games/colobot {}; + colobot = callPackage ../games/colobot { }; doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; @@ -30369,7 +30390,7 @@ with pkgs; amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; - andyetitmoves = callPackage ../games/andyetitmoves {}; + andyetitmoves = callPackage ../games/andyetitmoves { }; angband = callPackage ../games/angband { }; @@ -30382,7 +30403,7 @@ with pkgs; armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; - arena = callPackage ../games/arena {}; + arena = callPackage ../games/arena { }; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; @@ -30396,17 +30417,17 @@ with pkgs; astromenace = callPackage ../games/astromenace { }; - atanks = callPackage ../games/atanks {}; + atanks = callPackage ../games/atanks { }; - azimuth = callPackage ../games/azimuth {}; + azimuth = callPackage ../games/azimuth { }; ballAndPaddle = callPackage ../games/ball-and-paddle { guile = guile_1_8; }; - banner = callPackage ../games/banner {}; + banner = callPackage ../games/banner { }; - bastet = callPackage ../games/bastet {}; + bastet = callPackage ../games/bastet { }; black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; @@ -30491,12 +30512,12 @@ with pkgs; inherit (import ../games/crossfire pkgs) crossfire-server crossfire-arch crossfire-maps crossfire-client; - crrcsim = callPackage ../games/crrcsim {}; + crrcsim = callPackage ../games/crrcsim { }; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; - cutemaze = libsForQt5.callPackage ../games/cutemaze {}; + cutemaze = libsForQt5.callPackage ../games/cutemaze { }; cuyo = callPackage ../games/cuyo { }; @@ -30511,7 +30532,7 @@ with pkgs; }; }; - dhewm3 = callPackage ../games/dhewm3 {}; + dhewm3 = callPackage ../games/dhewm3 { }; domination = callPackage ../games/domination { }; @@ -30559,12 +30580,6 @@ with pkgs; eternity = callPackage ../games/eternity-engine { }; - eureka-editor = callPackage ../applications/misc/eureka-editor { }; - - eureka-ideas = callPackage ../applications/misc/eureka-ideas { - inherit (darwin.apple_sdk.frameworks) Security; - }; - extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; @@ -30593,13 +30608,11 @@ with pkgs; factorio-utils = callPackage ../games/factorio/utils.nix { }; - fairymax = callPackage ../games/fairymax {}; + fairymax = callPackage ../games/fairymax { }; - fava = callPackage ../applications/office/fava {}; + fheroes2 = callPackage ../games/fheroes2 { }; - fheroes2 = callPackage ../games/fheroes2 {}; - - fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; fishfight = callPackage ../games/fishfight { inherit (xorg) libX11 libXi; @@ -30645,8 +30658,6 @@ with pkgs; }; }; - fslint = callPackage ../applications/misc/fslint {}; - galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -30665,9 +30676,9 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - gimx = callPackage ../games/gimx {}; + gimx = callPackage ../games/gimx { }; - gl117 = callPackage ../games/gl-117 {}; + gl117 = callPackage ../games/gl-117 { }; globulation2 = callPackage ../games/globulation { boost = boost155; @@ -30693,13 +30704,11 @@ with pkgs; gnushogi = callPackage ../games/gnushogi { }; - gogui = callPackage ../games/gogui {}; + gogui = callPackage ../games/gogui { }; - gscrabble = python3Packages.callPackage ../games/gscrabble {}; + gscrabble = python3Packages.callPackage ../games/gscrabble { }; - gshogi = python3Packages.callPackage ../games/gshogi {}; - - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + gshogi = python3Packages.callPackage ../games/gshogi { }; qtads = qt5.callPackage ../games/qtads { }; @@ -30713,14 +30722,12 @@ with pkgs; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled {}; + gweled = callPackage ../games/gweled { }; gzdoom = callPackage ../games/gzdoom { }; harmonist = callPackage ../games/harmonist { }; - hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -30761,7 +30768,7 @@ with pkgs; enableGPU = false; }; - klavaro = callPackage ../games/klavaro {}; + klavaro = callPackage ../games/klavaro { }; kobodeluxe = callPackage ../games/kobodeluxe { }; @@ -30783,7 +30790,7 @@ with pkgs; liberation-circuit = callPackage ../games/liberation-circuit { }; - lincity = callPackage ../games/lincity {}; + lincity = callPackage ../games/lincity { }; lincity_ng = callPackage ../games/lincity/ng.nix { # https://github.com/lincity-ng/lincity-ng/issues/25 @@ -30797,7 +30804,7 @@ with pkgs; liquidwar5 = callPackage ../games/liquidwar/5.nix { }; - lugaru = callPackage ../games/lugaru {}; + lugaru = callPackage ../games/lugaru { }; macopix = callPackage ../games/macopix { gtk = gtk2; @@ -30809,7 +30816,7 @@ with pkgs; mars = callPackage ../games/mars { }; - megaglest = callPackage ../games/megaglest {}; + megaglest = callPackage ../games/megaglest { }; methane = callPackage ../games/methane { }; @@ -30829,11 +30836,10 @@ with pkgs; minecraft = callPackage ../games/minecraft { }; - minecraft-server = callPackage ../games/minecraft-server { }; + minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; + minecraft-server = minecraftServers.vanilla; # backwards compatibility - moon-buggy = callPackage ../games/moon-buggy {}; - - multimc = libsForQt5.callPackage ../games/multimc { }; + moon-buggy = callPackage ../games/moon-buggy { }; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; @@ -30854,6 +30860,10 @@ with pkgs; lua = lua5_1; }; + blightmud = callPackage ../games/blightmud { }; + + blightmud-tts = callPackage ../games/blightmud { withTTS = true; }; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -30875,16 +30885,12 @@ with pkgs; nexuiz = callPackage ../games/nexuiz { }; - nux = callPackage ../tools/misc/nux { }; - ninvaders = callPackage ../games/ninvaders { }; njam = callPackage ../games/njam { }; newtonwars = callPackage ../games/newtonwars { }; - nottetris2 = callPackage ../games/nottetris2 { }; - nudoku = callPackage ../games/nudoku { }; nxengine-evo = callPackage ../games/nxengine-evo { }; @@ -30913,8 +30919,6 @@ with pkgs; portmod = callPackage ../games/portmod { }; - tlauncher = callPackage ../games/tlauncher {}; - tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { }; @@ -30941,8 +30945,8 @@ with pkgs; static = true; }; }; - openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; - openttd-nml = callPackage ../games/openttd/nml.nix {}; + openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; + openttd-nml = callPackage ../games/openttd/nml.nix { }; opentyrian = callPackage ../games/opentyrian { }; @@ -30964,7 +30968,7 @@ with pkgs; pinball = callPackage ../games/pinball { }; - pingus = callPackage ../games/pingus {}; + pingus = callPackage ../games/pingus { }; pioneer = callPackage ../games/pioneer { }; @@ -31008,7 +31012,7 @@ with pkgs; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; - quantumminigolf = callPackage ../games/quantumminigolf {}; + quantumminigolf = callPackage ../games/quantumminigolf { }; r2mod_cli = callPackage ../games/r2mod_cli { }; @@ -31035,8 +31039,6 @@ with pkgs; rili = callPackage ../games/rili { }; - rimshot = callPackage ../games/rimshot { love = love_0_7; }; - rogue = callPackage ../games/rogue { ncurses = ncurses5; }; @@ -31059,7 +31061,7 @@ with pkgs; openjdk = openjdk8; }; - sauerbraten = callPackage ../games/sauerbraten {}; + sauerbraten = callPackage ../games/sauerbraten { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -31132,7 +31134,7 @@ with pkgs; ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; - stardust = callPackage ../games/stardust {}; + stardust = callPackage ../games/stardust { }; starspace = callPackage ../applications/science/machine-learning/starspace { }; @@ -31234,8 +31236,6 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; - tts = callPackage ../tools/audio/tts { }; - tumiki-fighters = callPackage ../games/tumiki-fighters { }; tuxpaint = callPackage ../games/tuxpaint { }; @@ -31290,8 +31290,6 @@ with pkgs; ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; - vapor = callPackage ../games/vapor { love = love_0_8; }; - vapoursynth = callPackage ../development/libraries/vapoursynth { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -31378,8 +31376,8 @@ with pkgs; xpilot-ng = callPackage ../games/xpilot { }; - bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {}; - bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {}; + bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; + bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; xskat = callPackage ../games/xskat { }; @@ -31428,6 +31426,10 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + hhexen = callPackage ../games/hhexen { }; + + wyvern = callPackage ../games/wyvern { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -31457,8 +31459,6 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - hhexen = callPackage ../games/hhexen { }; - hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; @@ -31678,8 +31678,6 @@ with pkgs; last = callPackage ../applications/science/biology/last { }; - lumpy = callPackage ../applications/science/biology/lumpy { }; - macse = callPackage ../applications/science/biology/macse { }; MACS2 = callPackage ../applications/science/biology/MACS2 { }; @@ -31704,7 +31702,7 @@ with pkgs; useMpi = true; }); - neuron-full = neuron-mpi.override { inherit python; }; + neuron-full = neuron-mpi.override { python = python2; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -33207,7 +33205,7 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; nix-top = callPackage ../tools/package-management/nix-top { }; @@ -33258,7 +33256,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; + inherit (python2Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; @@ -33589,7 +33587,6 @@ with pkgs; buildGoModule = buildGo117Module; }) mkTerraform - terraform_0_12 terraform_0_13 terraform_0_14 terraform_0_15 @@ -33849,8 +33846,6 @@ with pkgs; wxGTK = wxGTK30; }; - wyvern = callPackage ../games/wyvern { }; - x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -34018,17 +34013,17 @@ with pkgs; discord = import ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-ptb = import ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-canary = import ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs; + inherit pkgs lib stdenv; }; golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index 2c2c5d5fb7..d86c9c6778 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -164,4 +164,11 @@ let self = rec { xbmcswift2 = callPackage ../applications/video/kodi/addons/xbmcswift2 { }; + typing_extensions = callPackage ../applications/video/kodi/addons/typing_extensions { }; + + arrow = callPackage ../applications/video/kodi/addons/arrow { }; + + trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { }; + + trakt = callPackage ../applications/video/kodi/addons/trakt { }; }; in self diff --git a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix index 758c8bf06c..fd302dfa5a 100644 --- a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -33,6 +33,10 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do header "checking Nixpkgs on $platform" + # To get a call trace; see https://nixos.org/manual/nixpkgs/stable/#function-library-lib.trivial.warn + # Relies on impure eval + export NIX_ABORT_ON_WARN=true + nix-env -f $src \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; }' \ @@ -40,6 +44,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log + # Catch any trace calls not caught by NIX_ABORT_ON_WARN (lib.warn) if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" exit 1 diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index ab1c8704fb..feb412e320 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1281,6 +1281,8 @@ let tcslib = callPackage ../development/ocaml-modules/tcslib { }; + terminal = callPackage ../development/ocaml-modules/terminal { }; + terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { }; @@ -1372,6 +1374,8 @@ let vchan = callPackage ../development/ocaml-modules/vchan { }; + vector = callPackage ../development/ocaml-modules/vector { }; + vg = callPackage ../development/ocaml-modules/vg { }; vlq = callPackage ../development/ocaml-modules/vlq { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 5d19c70f03..e8416f9110 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 + cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 @@ -87,7 +88,9 @@ mapAliases ({ python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 + repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 requests_toolbelt = requests-toolbelt; # added 2017-09-26 + roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 3808da50d7..34507b7a5b 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -22,10 +22,7 @@ let namePrefix = python.libPrefix + "-"; - bootstrapped-pip = if isPy3k then - callPackage ../development/python-modules/bootstrapped-pip { } - else - callPackage ../development/python-modules/bootstrapped-pip/2.nix { }; + bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. @@ -143,11 +140,6 @@ in { # it should not override the version of pytest that is used for say # Python 2. This is an ugly hack that is needed now because the hook # propagates the package. - pytestCheckHook_5 = if isPy3k then - self.pytestCheckHook.override { pytest = self.pytest_5; } - else - self.pytestCheckHook; - pytestCheckHook_6_1 = if isPy3k then self.pytestCheckHook.override { pytest = self.pytest_6_1; } else @@ -318,6 +310,8 @@ in { aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; @@ -458,8 +452,6 @@ in { allure-pytest = callPackage ../development/python-modules/allure-pytest { }; - alot = callPackage ../development/python-modules/alot { }; - alpha-vantage = callPackage ../development/python-modules/alpha-vantage { }; altair = callPackage ../development/python-modules/altair { }; @@ -634,6 +626,8 @@ in { asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; + asgineer = callPackage ../development/python-modules/asgineer { }; + asgiref = callPackage ../development/python-modules/asgiref { }; asmog = callPackage ../development/python-modules/asmog { }; @@ -1246,8 +1240,6 @@ in { blis = callPackage ../development/python-modules/blis { }; - blist = callPackage ../development/python-modules/blist { }; - blockchain = callPackage ../development/python-modules/blockchain { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -1607,8 +1599,6 @@ in { cjkwrap = callPackage ../development/python-modules/cjkwrap { }; - cjson = callPackage ../development/python-modules/cjson { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; claripy = callPackage ../development/python-modules/claripy { }; @@ -1833,8 +1823,6 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; - cozy = callPackage ../development/python-modules/cozy { }; - cppe = callPackage ../development/python-modules/cppe { cppe = pkgs.cppe; }; @@ -2002,6 +1990,8 @@ in { datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + dataset = callPackage ../development/python-modules/dataset { }; + datasets = callPackage ../development/python-modules/datasets { }; datasette = callPackage ../development/python-modules/datasette { }; @@ -2128,6 +2118,8 @@ in { dict2xml = callPackage ../development/python-modules/dict2xml { }; + dictdiffer = callPackage ../development/python-modules/dictdiffer { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; dictpath = callPackage ../development/python-modules/dictpath { }; @@ -2752,14 +2744,14 @@ in { fastjet = toPythonModule (pkgs.fastjet.override { withPython = true; - inherit python; + inherit (self) python; }); fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { withPython = true; - inherit python; + inherit (self) python; }); fastnumbers = callPackage ../development/python-modules/fastnumbers { }; @@ -2791,7 +2783,6 @@ in { feedparser = callPackage ../development/python-modules/feedparser { }; fenics = callPackage ../development/libraries/science/math/fenics { - pytest = self.pytest_4; hdf5 = pkgs.hdf5_1_10; }; @@ -2803,6 +2794,8 @@ in { fields = callPackage ../development/python-modules/fields { }; + file-read-backwards = callPackage ../development/python-modules/file-read-backwards { }; + filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; filebytes = callPackage ../development/python-modules/filebytes { }; @@ -2823,9 +2816,7 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { - gdal = pkgs.gdal_2; - }; + fiona = callPackage ../development/python-modules/fiona { }; fipy = callPackage ../development/python-modules/fipy { }; @@ -2897,6 +2888,8 @@ in { flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + flask-gravatar = callPackage ../development/python-modules/flask-gravatar { }; + flask-httpauth = callPackage ../development/python-modules/flask-httpauth { }; flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; @@ -2917,6 +2910,8 @@ in { flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + flask-paranoid = callPackage ../development/python-modules/flask-paranoid { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -2935,6 +2930,8 @@ in { flask-session = callPackage ../development/python-modules/flask-session { }; + flask-security-too = callPackage ../development/python-modules/flask-security-too { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; flask-socketio = callPackage ../development/python-modules/flask-socketio { }; @@ -2961,6 +2958,8 @@ in { inherit (pkgs) flatbuffers; }; + flatten-dict = callPackage ../development/python-modules/flatten-dict { }; + flax = callPackage ../development/python-modules/flax { }; flexmock = callPackage ../development/python-modules/flexmock { }; @@ -3473,7 +3472,7 @@ in { graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; + graph-tool = callPackage ../development/python-modules/graph-tool { }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -3738,6 +3737,8 @@ in { httmock = callPackage ../development/python-modules/httmock { }; + httpagentparser = callPackage ../development/python-modules/httpagentparser { }; + httpauth = callPackage ../development/python-modules/httpauth { }; httpbin = callPackage ../development/python-modules/httpbin { }; @@ -3960,6 +3961,8 @@ in { insegel = callPackage ../development/python-modules/insegel { }; + installer = callPackage ../development/python-modules/installer { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; @@ -4010,10 +4013,7 @@ in { ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - ipython = if isPy36 then - callPackage ../development/python-modules/ipython/7.16.nix { } - else - callPackage ../development/python-modules/ipython { }; + ipython = callPackage ../development/python-modules/ipython { }; ipyvue = callPackage ../development/python-modules/ipyvue { }; @@ -4055,6 +4055,8 @@ in { itemadapter = callPackage ../development/python-modules/itemadapter { }; + itemdb = callPackage ../development/python-modules/itemdb { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; iterm2 = callPackage ../development/python-modules/iterm2 { }; @@ -4776,6 +4778,8 @@ in { mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + mailchecker = callPackage ../development/python-modules/mailchecker { }; + mailchimp = callPackage ../development/python-modules/mailchimp { }; mailman = callPackage ../servers/mail/mailman { }; @@ -4873,6 +4877,8 @@ in { matrix-client = callPackage ../development/python-modules/matrix-client { }; + matrix-common = callPackage ../development/python-modules/matrix-common { }; + matrix-nio = callPackage ../development/python-modules/matrix-nio { }; mattermostdriver = callPackage ../development/python-modules/mattermostdriver { }; @@ -5066,6 +5072,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; + mongomock = callPackage ../development/python-modules/mongomock { }; + mongodict = callPackage ../development/python-modules/mongodict { }; mongoengine = callPackage ../development/python-modules/mongoengine { }; @@ -5443,10 +5451,6 @@ in { inherit (pkgs) notmuch; }; - notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { - inherit (pkgs) notmuch; - }; - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; @@ -5851,6 +5855,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; pebble = callPackage ../development/python-modules/pebble { }; @@ -5953,6 +5959,8 @@ in { piexif = callPackage ../development/python-modules/piexif { }; + pijuice = callPackage ../development/python-modules/pijuice { }; + pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; @@ -6042,6 +6050,8 @@ in { pynuki = callPackage ../development/python-modules/pynuki { }; + pynut2 = callPackage ../development/python-modules/pynut2 { }; + pynws = callPackage ../development/python-modules/pynws { }; pynx584 = callPackage ../development/python-modules/pynx584 { }; @@ -6108,6 +6118,8 @@ in { python-tado = callPackage ../development/python-modules/python-tado { }; + pythonfinder = callPackage ../development/python-modules/pythonfinder { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -6330,6 +6342,8 @@ in { psautohint = callPackage ../development/python-modules/psautohint { }; + pscript = callPackage ../development/python-modules/pscript { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; @@ -6406,6 +6420,8 @@ in { py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; + py-tes = callPackage ../development/python-modules/py-tes { }; + py-ubjson = callPackage ../development/python-modules/py-ubjson { }; py-zabbix = callPackage ../development/python-modules/py-zabbix { }; @@ -7554,22 +7570,6 @@ in { pytest = self.pytest_6; - pytest_4 = callPackage - ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - - pytest_5 = callPackage - ../development/python-modules/pytest/5.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - pytest_6 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle @@ -7688,6 +7688,8 @@ in { pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + pytest-logdog = callPackage ../development/python-modules/pytest-logdog{ }; + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; pytest-mock = callPackage ../development/python-modules/pytest-mock { }; @@ -7810,6 +7812,8 @@ in { python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + python-benedict = callPackage ../development/python-modules/python-benedict { }; + python-bidi = callPackage ../development/python-modules/python-bidi { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -7844,6 +7848,8 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; + python-fsutil = callPackage ../development/python-modules/python-fsutil { }; + pythonefl = callPackage ../development/python-modules/python-efl { }; pythonegardia = callPackage ../development/python-modules/pythonegardia { }; @@ -8381,9 +8387,7 @@ in { inherit (pkgs) libarchive; }; - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; - }; + rasterio = callPackage ../development/python-modules/rasterio { }; ratelim = callPackage ../development/python-modules/ratelim { }; @@ -8457,8 +8461,6 @@ in { reparser = callPackage ../development/python-modules/reparser { }; - repeated_test = callPackage ../development/python-modules/repeated_test { }; - repocheck = callPackage ../development/python-modules/repocheck { }; reportlab = callPackage ../development/python-modules/reportlab { }; @@ -8581,10 +8583,6 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs.qt5) qtbase; - }; - robot-detection = callPackage ../development/python-modules/robot-detection { }; robotframework = callPackage ../development/python-modules/robotframework { }; @@ -8633,6 +8631,8 @@ in { rpdb = callPackage ../development/python-modules/rpdb { }; + rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { }; + rply = callPackage ../development/python-modules/rply { }; rpm = toPythonModule (pkgs.rpm.override { @@ -8781,6 +8781,8 @@ in { scipy = callPackage ../development/python-modules/scipy { }; + scmrepo = callPackage ../development/python-modules/scmrepo { }; + scour = callPackage ../development/python-modules/scour { }; scp = callPackage ../development/python-modules/scp { }; @@ -8851,6 +8853,8 @@ in { sentinel = callPackage ../development/python-modules/sentinel { }; + sentinels = callPackage ../development/python-modules/sentinels { }; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; sepaxml = callPackage ../development/python-modules/sepaxml { }; @@ -8928,6 +8932,8 @@ in { showit = callPackage ../development/python-modules/showit { }; + shtab = callPackage ../development/python-modules/shtab { }; + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; sievelib = callPackage ../development/python-modules/sievelib { }; @@ -9092,6 +9098,8 @@ in { usePython = true; }); + socketio-client = callPackage ../development/python-modules/socketio-client { }; + socialscan = callPackage ../development/python-modules/socialscan { }; socid-extractor = callPackage ../development/python-modules/socid-extractor { }; @@ -9142,6 +9150,8 @@ in { spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; @@ -9162,6 +9172,8 @@ in { speaklater = callPackage ../development/python-modules/speaklater { }; + speaklater3 = callPackage ../development/python-modules/speaklater3 { }; + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; @@ -9713,6 +9725,8 @@ in { timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; + timetagger = callPackage ../development/python-modules/timetagger { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; tinycss2 = callPackage ../development/python-modules/tinycss2 { }; @@ -9771,6 +9785,8 @@ in { torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + torchinfo = callPackage ../development/python-modules/torchinfo { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; @@ -9937,6 +9953,8 @@ in { types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-freezegun = callPackage ../development/python-modules/types-freezegun { }; + types-futures = callPackage ../development/python-modules/types-futures { }; types-protobuf = callPackage ../development/python-modules/types-protobuf { }; @@ -9947,6 +9965,8 @@ in { types-setuptools = callPackage ../development/python-modules/types-setuptools { }; + types-tabulate = callPackage ../development/python-modules/types-tabulate { }; + types-toml = callPackage ../development/python-modules/types-toml { }; types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; @@ -10335,8 +10355,6 @@ in { werkzeug = callPackage ../development/python-modules/werkzeug { }; - werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { }; - west = callPackage ../development/python-modules/west { }; wfuzz = callPackage ../development/python-modules/wfuzz { }; @@ -10407,10 +10425,7 @@ in { wsnsimpy = callPackage ../development/python-modules/wsnsimpy { }; - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; + wsproto = callPackage ../development/python-modules/wsproto { }; wtforms = callPackage ../development/python-modules/wtforms { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix index b7d9d4e95a..4a15b64da0 100644 --- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix @@ -6,125 +6,135 @@ self: super: with self; with super; { - boto3 = callPackage ../development/python-modules/boto3/1_17.nix {}; + bootstrapped-pip = callPackage ../development/python2-modules/bootstrapped-pip { }; - botocore = callPackage ../development/python-modules/botocore/1_20.nix {}; + boto3 = callPackage ../development/python2-modules/boto3 {}; - certifi = callPackage ../development/python-modules/certifi/python2.nix { }; + botocore = callPackage ../development/python2-modules/botocore {}; - chardet = callPackage ../development/python-modules/chardet/2.nix { }; + certifi = callPackage ../development/python2-modules/certifi { }; - cheetah = callPackage ../development/python-modules/cheetah { }; + chardet = callPackage ../development/python2-modules/chardet { }; - click = callPackage ../development/python-modules/click/7.nix { }; + cheetah = callPackage ../development/python2-modules/cheetah { }; - configparser = callPackage ../development/python-modules/configparser/4.nix { }; + click = callPackage ../development/python2-modules/click { }; - construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + configparser = callPackage ../development/python2-modules/configparser { }; - contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; + construct = callPackage ../development/python2-modules/construct { }; - cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; + contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; - cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }; + cryptography = callPackage ../development/python2-modules/cryptography { }; - decorator = callPackage ../development/python-modules/decorator/4.nix { }; + cryptography_vectors = callPackage ../development/python2-modules/cryptography-vectors { }; - enum = callPackage ../development/python-modules/enum { }; + decorator = callPackage ../development/python2-modules/decorator { }; - filelock = callPackage ../development/python-modules/filelock/3.2.nix { }; + enum = callPackage ../development/python2-modules/enum { }; - flask = callPackage ../development/python-modules/flask/1.nix { }; + filelock = callPackage ../development/python2-modules/filelock { }; - freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { }; + flask = callPackage ../development/python2-modules/flask { }; - futures = callPackage ../development/python-modules/futures { }; + freezegun = callPackage ../development/python2-modules/freezegun { }; - google-apputils = callPackage ../development/python-modules/google-apputils { }; + futures = callPackage ../development/python2-modules/futures { }; - httpretty = callPackage ../development/python-modules/httpretty/0.nix { }; + google-apputils = callPackage ../development/python2-modules/google-apputils { }; - hypothesis = callPackage ../development/python-modules/hypothesis/2.nix { }; + httpretty = callPackage ../development/python2-modules/httpretty { }; - idna = callPackage ../development/python-modules/idna/2.nix { }; + hypothesis = callPackage ../development/python2-modules/hypothesis { }; - importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + idna = callPackage ../development/python2-modules/idna { }; - ipaddr = callPackage ../development/python-modules/ipaddr { }; + importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; - itsdangerous = callPackage ../development/python-modules/itsdangerous/1.nix { }; + ipaddr = callPackage ../development/python2-modules/ipaddr { }; - jinja2 = callPackage ../development/python-modules/jinja2/2.nix { }; + itsdangerous = callPackage ../development/python2-modules/itsdangerous { }; - libcloud = callPackage ../development/python-modules/libcloud/2.nix { }; + jinja2 = callPackage ../development/python2-modules/jinja2 { }; - lpod = callPackage ../development/python-modules/lpod { }; + libcloud = callPackage ../development/python2-modules/libcloud { }; - marisa = callPackage ../development/python-modules/marisa { + lpod = callPackage ../development/python2-modules/lpod { }; + + marisa = callPackage ../development/python2-modules/marisa { inherit (pkgs) marisa; }; - markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; + markdown = callPackage ../development/python2-modules/markdown { }; - markupsafe = callPackage ../development/python-modules/markupsafe/1.nix { }; + markupsafe = callPackage ../development/python2-modules/markupsafe { }; - mock = callPackage ../development/python-modules/mock/2.nix { }; + mock = callPackage ../development/python2-modules/mock { }; - more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; + more-itertools = callPackage ../development/python2-modules/more-itertools { }; - mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { }; + mutagen = callPackage ../development/python2-modules/mutagen { }; - numpy = callPackage ../development/python-modules/numpy/1.16.nix { }; + numpy = callPackage ../development/python2-modules/numpy { }; - packaging = callPackage ../development/python-modules/packaging/2.nix { }; + packaging = callPackage ../development/python2-modules/packaging { }; - pillow = callPackage ../development/python-modules/pillow/6.nix { + pillow = callPackage ../development/python2-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; }; - pip = callPackage ../development/python-modules/pip/20.nix { }; + pip = callPackage ../development/python2-modules/pip { }; - pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; + pluggy = callPackage ../development/python2-modules/pluggy { }; - prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; + prettytable = callPackage ../development/python2-modules/prettytable { }; - protobuf = callPackage ../development/python-modules/protobuf { + protobuf = callPackage ../development/python2-modules/protobuf { disabled = isPyPy; protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 }; - pycairo = callPackage ../development/python-modules/pycairo/1.18.nix { + pycairo = callPackage ../development/python2-modules/pycairo { inherit (pkgs.buildPackages) meson; }; - pygments = callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments = callPackage ../development/python2-modules/Pygments { }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix { + pygobject3 = callPackage ../development/python2-modules/pygobject { inherit (pkgs) meson; }; - pygtk = callPackage ../development/python-modules/pygtk { }; + pygtk = callPackage ../development/python2-modules/pygtk { }; pyGtkGlade = self.pygtk.override { inherit (pkgs.gnome2) libglade; }; - pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; + pyjwt = callPackage ../development/python2-modules/pyjwt { }; - pyroma = callPackage ../development/python-modules/pyroma/2.nix { }; + pyroma = callPackage ../development/python2-modules/pyroma { }; - pysqlite = callPackage ../development/python-modules/pysqlite { }; + pysqlite = callPackage ../development/python2-modules/pysqlite { }; pytest = pytest_4; - pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; + pytest_4 = callPackage + ../development/python2-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; + }; - pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + pytest-runner = callPackage ../development/python2-modules/pytest-runner { }; - pyyaml = callPackage ../development/python-modules/pyyaml/5.nix { }; + pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + pyyaml = callPackage ../development/python2-modules/pyyaml { }; + + qpid-python = callPackage ../development/python2-modules/qpid-python { }; recoll = disabled super.recoll; @@ -132,42 +142,40 @@ with self; with super; { rpm = disabled super.rpm; - s3transfer = callPackage ../development/python-modules/s3transfer/0_4.nix { }; + s3transfer = callPackage ../development/python2-modules/s3transfer { }; - scandir = callPackage ../development/python-modules/scandir { }; + scandir = callPackage ../development/python2-modules/scandir { }; sequoia = disabled super.sequoia; - setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; + setuptools = callPackage ../development/python2-modules/setuptools { }; - setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { }; + setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; - sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + sphinxcontrib-websupport = callPackage ../development/python2-modules/sphinxcontrib-websupport { }; - sphinx = callPackage ../development/python-modules/sphinx/2.nix { }; + sphinx = callPackage ../development/python2-modules/sphinx { }; - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + TurboCheetah = callPackage ../development/python2-modules/TurboCheetah { }; - typing = callPackage ../development/python-modules/typing { }; + typing = callPackage ../development/python2-modules/typing { }; - urllib3 = callPackage ../development/python-modules/urllib3/2.nix { }; + urllib3 = callPackage ../development/python2-modules/urllib3 { }; - werkzeug = callPackage ../development/python-modules/werkzeug/1.nix { }; + werkzeug = callPackage ../development/python2-modules/werkzeug { }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wsproto = callPackage ../development/python2-modules/wsproto { }; + + wxPython30 = callPackage ../development/python2-modules/wxPython { wxGTK = pkgs.wxGTK30; }; wxPython = self.wxPython30; - vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { }; - - yenc = callPackage ../development/python-modules/yenc { }; - - yt = callPackage ../development/python-modules/yt { }; + vcrpy = callPackage ../development/python2-modules/vcrpy { }; zeek = disabled super.zeek; - zipp = callPackage ../development/python-modules/zipp/1.nix { }; + zipp = callPackage ../development/python2-modules/zipp { }; } diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index 13526349df..5980d88b01 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -25,7 +25,10 @@ let systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; - supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; + supportDarwin = lib.genAttrs [ + "x86_64" + "aarch64" + ] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport); jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; }; @@ -36,7 +39,7 @@ let lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; - darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate + darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = @@ -54,7 +57,7 @@ let jobs.openssl.x86_64-darwin jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin @@ -99,7 +102,7 @@ let jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux - jobs.python.x86_64-linux + jobs.python2.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) jobs.nixpkgs-review.x86_64-linux @@ -130,11 +133,11 @@ let */ ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools - ++ lib.optionals supportDarwin [ + ++ lib.optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin jobs.go.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin @@ -171,7 +174,7 @@ let dist test; }) # darwin is special in this - // optionalAttrs supportDarwin { + // optionalAttrs supportDarwin.x86_64 { x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; @@ -181,7 +184,7 @@ let # Test a full stdenv bootstrap from the bootstrap tools definition inherit (bootstrap.test-pkgs) stdenv; }; - + } // optionalAttrs supportDarwin.aarch64 { # Cross compiled bootstrap tools aarch64-darwin = let