diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 14e810f972c..093239566ce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -26,17 +26,18 @@ /lib/asserts.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals -/default.nix @nbp -/pkgs/top-level/default.nix @nbp @Ericson2314 -/pkgs/top-level/impure.nix @nbp @Ericson2314 -/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer -/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer -/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer -/pkgs/stdenv/cross @Ericson2314 @matthewbauer -/pkgs/build-support/cc-wrapper @Ericson2314 @orivej -/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej -/pkgs/build-support/setup-hooks @Ericson2314 +/default.nix @nbp +/pkgs/top-level/default.nix @nbp @Ericson2314 +/pkgs/top-level/impure.nix @nbp @Ericson2314 +/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer +/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer +/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer +/pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/cross @Ericson2314 @matthewbauer +/pkgs/build-support/cc-wrapper @Ericson2314 @orivej +/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/setup-hooks @Ericson2314 +/pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index e9b89d086d6..b4723a22bb1 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -2,12 +2,12 @@ ## Configuring Emacs {#sec-emacs-config} -The Emacs package comes with some extra helpers to make it easier to configure. `emacsWithPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: +The Emacs package comes with some extra helpers to make it easier to configure. `emacs.pkgs.withPackages` allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use `company` `counsel`, `flycheck`, `ivy`, `magit`, `projectile`, and `use-package` you could use this as a `~/.config/nixpkgs/config.nix` override: ```nix { packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ company counsel flycheck @@ -84,7 +84,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t (projectile-global-mode)) ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ (runCommand "default.el" {} '' mkdir -p $out/share/emacs/site-lisp cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el @@ -103,14 +103,14 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacsWithPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`. ```nix overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages +((emacsPackagesFor emacs).overrideScope' overrides).emacs.pkgs.withPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87b7ea57a95..2bc0ae5f042 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3771,6 +3771,12 @@ githubId = 7481521; name = "Balázs Lengyel"; }; + ilian = { + email = "ilian@tuta.io"; + github = "ilian"; + githubId = 25505957; + name = "Ilian"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -4666,6 +4672,12 @@ githubId = 494012; name = "Kevin Cox"; }; + kevingriffin = { + email = "me@kevin.jp"; + github = "kevingriffin"; + githubId = 209729; + name = "Kevin Griffin"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -5696,6 +5708,12 @@ githubId = 2971615; name = "Marius Bergmann"; }; + mcaju = { + email = "cajum.bugs@yandex.com"; + github = "CajuM"; + githubId = 10420834; + name = "Mihai-Drosi Caju"; + }; mcbeth = { email = "mcbeth@broggs.org"; github = "mcbeth"; @@ -6397,6 +6415,12 @@ githubId = 364510; name = "Tobias Geerinckx-Rice"; }; + ndl = { + email = "ndl@endl.ch"; + github = "ndl"; + githubId = 137805; + name = "Alexander Tsvyashchenko"; + }; neeasade = { email = "nathanisom27@gmail.com"; github = "neeasade"; @@ -6541,12 +6565,6 @@ github = "NobbZ"; githubId = 58951; }; - nocent = { - email = "nocent@protonmail.ch"; - github = "nocent"; - githubId = 25505957; - name = "nocent"; - }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; @@ -6997,6 +7015,12 @@ githubId = 28323; name = "Peter Simons"; }; + petterstorvik = { + email = "petterstorvik@gmail.com"; + github = "storvik"; + githubId = 3438604; + name = "Petter Storvik"; + }; philandstuff = { email = "philip.g.potter@gmail.com"; github = "philandstuff"; @@ -7569,6 +7593,12 @@ githubId = 395821; name = "rht"; }; + rhoriguchi = { + email = "ryan.horiguchi@gmail.com"; + github = "rhoriguchi "; + githubId = 6047658; + name = "Ryan Horiguchi"; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; @@ -8641,6 +8671,12 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio G."; + email = "5861043+superherointj@users.noreply.github.com"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; github = "SuperSandro2000"; @@ -8891,6 +8927,12 @@ githubId = 649832; name = "Teo Klestrup Röijezon"; }; + terin = { + email = "terinjokes@gmail.com"; + github = "terinjokes"; + githubId = 273509; + name = "Terin Stock"; + }; terlar = { email = "terlar@gmail.com"; github = "terlar"; diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 5c4cf0f6c55..411e0d77feb 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, perl, perlPackages }: +{ stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { ''; meta = { - maintainers = with stdenv.lib.maintainers; [ eelco rycee ]; + maintainers = with lib.maintainers; [ eelco rycee ]; description = "Utility to generate a Nix expression for a Perl package from CPAN"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 38bf69afa8b..e46d1ca403f 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -256,6 +256,22 @@ which is the new stable release. OpenAFS 1.6 was removed. + + + MariaDB has been updated to 10.5. + Before you upgrade, it would be best to take a backup of your database and read + + Incompatible Changes Between 10.4 and 10.5. + After the upgrade you will need to run mysql_upgrade. + + + + + The TokuDB storage engine dropped in mariadb 10.5 and removed in mariadb 10.6. + It is recommended to switch to RocksDB. See also TokuDB and + MDEV-19780: Remove the TokuDB storage engine. + + The openldap module now has support for OLC-style @@ -402,6 +418,18 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e SDK licenses if your project requires it. See the androidenv documentation for more details. + + + The Searx module has been updated with the ability to configure the + service declaratively and uWSGI integration. + The option services.searx.configFile has been renamed + to for consistency with + the new . In addition, the + searx uid and gid reservations have been removed + since they were not necessary: the service is now running with a + dynamically allocated uid. + + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index ec2eb536679..691d7fcfcba 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -219,7 +219,7 @@ upload_image() { log "Registering snapshot $snapshot_id as AMI" local block_device_mappings=( - "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}" + "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}" ) local extra_flags=( diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cf0198d7b93..feb9c68301d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -143,7 +143,7 @@ in nix-ssh = 104; dictd = 105; couchdb = 106; - searx = 107; + #searx = 107; # dynamically allocated as of 2020-10-27 kippo = 108; jenkins = 109; systemd-journal-gateway = 110; @@ -457,7 +457,7 @@ in #nix-ssh = 104; # unused dictd = 105; couchdb = 106; - searx = 107; + #searx = 107; # dynamically allocated as of 2020-10-27 kippo = 108; jenkins = 109; systemd-journal-gateway = 110; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 84e7c10ff64..a71c804428d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -900,6 +900,7 @@ ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix ./services/web-apps/virtlyst.nix + ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix @@ -955,6 +956,7 @@ ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix ./services/x11/window-managers/default.nix + ./services/x11/window-managers/clfswm.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 19f821ae17f..d460c52dbef 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,8 +3,10 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ ... }: - +{ pkgs, lib,... }: +let + platform = pkgs.stdenv.hostPlatform; +in { # The initrd has to contain any module that might be necessary for @@ -42,7 +44,10 @@ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" # VMware support. - "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" + "mptspi" "vmxnet3" "vsock" + ] ++ lib.optional platform.isx86 "vmw_balloon" + ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing + "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. "hv_storvsc" diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 94a5c573768..f0efc659cff 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -244,7 +244,7 @@ in { }; }; - meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; + meta.maintainers = with lib.maintainers; [ mic92 kwohlfahrt ]; config = mkIf cfg.enable { assertions = map (opt: { diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 302aa1ed7c4..fd99ee9442c 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -156,7 +156,7 @@ $ ./result/bin/emacs let myEmacs = pkgs.emacs; - emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; + emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; in emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ magit # ; Integrate git <C-x g> @@ -254,10 +254,10 @@ in Querying Emacs packages " -qaP -A emacsPackages.elpaPackages -nix-env -f "" -qaP -A emacsPackages.melpaPackages -nix-env -f "" -qaP -A emacsPackages.melpaStablePackages -nix-env -f "" -qaP -A emacsPackages.orgPackages +nix-env -f "" -qaP -A emacs.pkgs.elpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaStablePackages +nix-env -f "" -qaP -A emacs.pkgs.orgPackages ]]> diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 795a76f748a..1dcdcab8d48 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -25,8 +25,6 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); - smtpTlsSecurityLevel = if cfg.useDane then "dane" else "may"; - mainCf = let escape = replaceStrings ["$"] ["$$"]; mkList = items: "\n " + concatStringsSep ",\n " items; @@ -510,14 +508,6 @@ in ''; }; - useDane = mkOption { - type = types.bool; - default = false; - description = '' - Sets smtp_tls_security_level to "dane" rather than "may". See postconf(5) for details. - ''; - }; - sslCert = mkOption { type = types.str; default = ""; @@ -819,13 +809,13 @@ in // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } // optionalAttrs (cfg.tlsTrustedAuthorities != "") { smtp_tls_CAfile = cfg.tlsTrustedAuthorities; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_tls_security_level = smtpTlsSecurityLevel; + smtp_tls_security_level = mkDefault "may"; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; @@ -969,5 +959,9 @@ in imports = [ (mkRemovedOptionModule [ "services" "postfix" "sslCACert" ] "services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities. In case you intend that your server should validate requested client certificates use services.postfix.extraConfig.") + + (mkChangedOptionModule [ "services" "postfix" "useDane" ] + [ "services" "postfix" "config" "smtp_tls_security_level" ] + (config: mkIf config.services.postfix.useDane "dane")) ]; } diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index fbfa838b168..5544c2035fb 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -69,6 +69,9 @@ in { # i.e. to delegate from the host being accessible as ${config.networking.domain} # to another host actually running the Matrix homeserver. "${config.networking.domain}" = { + enableACME = true; + forceSSL = true; + locations."= /.well-known/matrix/server".extraConfig = let # use 443 instead of the default 8448 port to unite diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c6e5649ec47..b03630208df 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -109,6 +109,13 @@ in description = "Host to bind to. Defaults binding on all addresses."; }; + package = mkOption { + type = types.package; + default = pkgs.murmur; + defaultText = "pkgs.murmur"; + description = "Overridable attribute of the murmur package to use."; + }; + password = mkOption { type = types.str; default = ""; @@ -299,7 +306,7 @@ in Type = if forking then "forking" else "simple"; PIDFile = mkIf forking "/run/murmur/murmurd.pid"; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${pkgs.murmur}/bin/murmurd -ini /run/murmur/murmurd.ini"; + ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 60fb3d5d6d4..a515e4a3dc3 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -1,34 +1,114 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; let - + runDir = "/run/searx"; cfg = config.services.searx; - configFile = cfg.configFile; + generateConfig = '' + cd ${runDir} + + # write NixOS settings as JSON + cat <<'EOF' > settings.yml + ${builtins.toJSON cfg.settings} + EOF + + # substitute environment variables + env -0 | while IFS='=' read -r -d ''' n v; do + sed "s#@$n@#$v#g" -i settings.yml + done + + # set strict permissions + chmod 400 settings.yml + ''; + + settingType = with types; (oneOf + [ bool int float str + (listOf settingType) + (attrsOf settingType) + ]) // { description = "JSON value"; }; in { + imports = [ + (mkRenamedOptionModule + [ "services" "searx" "configFile" ] + [ "services" "searx" "settingsFile" ]) + ]; + ###### interface options = { services.searx = { - enable = mkEnableOption - "the searx server. See https://github.com/asciimoo/searx"; + enable = mkOption { + type = types.bool; + default = false; + relatedPackages = [ "searx" ]; + description = "Whether to enable Searx, the meta search engine."; + }; - configFile = mkOption { + environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = " - The path of the Searx server configuration file. If no file - is specified, a default file is used (default config file has - debug mode enabled). - "; + description = '' + Environment file (see systemd.exec(5) + "EnvironmentFile=" section for the syntax) to define variables for + Searx. This option can be used to safely include secret keys into the + Searx configuration. + ''; + }; + + settings = mkOption { + type = types.attrsOf settingType; + default = { }; + example = literalExample '' + { server.port = 8080; + server.bind_address = "0.0.0.0"; + server.secret_key = "@SEARX_SECRET_KEY@"; + + engines = lib.singleton + { name = "wolframalpha"; + shortcut = "wa"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + }; + } + ''; + description = '' + Searx settings. These will be merged with (taking precedence over) + the default configuration. It's also possible to refer to + environment variables + (defined in ) + using the syntax @VARIABLE_NAME@. + + + For available settings, see the Searx + docs. + + + ''; + }; + + settingsFile = mkOption { + type = types.path; + default = "${runDir}/settings.yml"; + description = '' + The path of the Searx server settings.yml file. If no file is + specified, a default file is used (default config file has debug mode + enabled). Note: setting this options overrides + . + + + This file, along with any secret key it contains, will be copied + into the world-readable Nix store. + + + ''; }; package = mkOption { @@ -38,6 +118,38 @@ in description = "searx package to use."; }; + runInUwsgi = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run searx in uWSGI as a "vassal", instead of using its + built-in HTTP server. This is the recommended mode for public or + large instances, but is unecessary for LAN or local-only use. + + + The built-in HTTP server logs all queries by default. + + + ''; + }; + + uwsgiConfig = mkOption { + type = options.services.uwsgi.instance.type; + default = { http = ":8080"; }; + example = literalExample '' + { + disable-logging = true; + http = ":8080"; # serve via HTTP... + socket = "/run/searx/searx.sock"; # ...or UNIX socket + } + ''; + description = '' + Additional configuration of the uWSGI vassal running searx. It + should notably specify on which interfaces and ports the vassal + should listen. + ''; + }; + }; }; @@ -45,36 +157,74 @@ in ###### implementation - config = mkIf config.services.searx.enable { + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; users.users.searx = - { uid = config.ids.uids.searx; - description = "Searx user"; - createHome = true; - home = "/var/lib/searx"; + { description = "Searx daemon user"; + group = "searx"; + isSystemUser = true; }; - users.groups.searx = - { gid = config.ids.gids.searx; + users.groups.searx = { }; + + systemd.services.searx-init = { + description = "Initialise Searx settings"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "searx"; + RuntimeDirectory = "searx"; + RuntimeDirectoryMode = "750"; + } // optionalAttrs (cfg.environmentFile != null) + { EnvironmentFile = builtins.toPath cfg.environmentFile; }; + script = generateConfig; + }; + + systemd.services.searx = mkIf (!cfg.runInUwsgi) { + description = "Searx server, the meta search engine."; + wantedBy = [ "network.target" "multi-user.target" ]; + requires = [ "searx-init.service" ]; + after = [ "searx-init.service" ]; + serviceConfig = { + User = "searx"; + Group = "searx"; + ExecStart = "${cfg.package}/bin/searx-run"; + } // optionalAttrs (cfg.environmentFile != null) + { EnvironmentFile = builtins.toPath cfg.environmentFile; }; + environment.SEARX_SETTINGS_PATH = cfg.settingsFile; + }; + + systemd.services.uwsgi = mkIf (cfg.runInUwsgi) + { requires = [ "searx-init.service" ]; + after = [ "searx-init.service" ]; }; - systemd.services.searx = - { - description = "Searx server, the meta search engine."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; - }; - } // (optionalAttrs (configFile != null) { - environment.SEARX_SETTINGS_PATH = configFile; - }); + services.searx.settings = { + # merge NixOS settings with defaults settings.yml + use_default_settings = mkDefault true; + }; - environment.systemPackages = [ cfg.package ]; + services.uwsgi = mkIf (cfg.runInUwsgi) { + enable = true; + plugins = [ "python3" ]; + + instance.type = "emperor"; + instance.vassals.searx = { + type = "normal"; + strict = true; + immediate-uid = "searx"; + immediate-gid = "searx"; + lazy-apps = true; + enable-threads = true; + module = "searx.webapp"; + env = [ "SEARX_SETTINGS_PATH=${cfg.settingsFile}" ]; + pythonPackages = self: [ cfg.package ]; + } // cfg.uwsgiConfig; + }; }; - meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + meta.maintainers = with maintainers; [ rnhmjoj ]; } diff --git a/nixos/modules/services/web-apps/whitebophir.nix b/nixos/modules/services/web-apps/whitebophir.nix new file mode 100644 index 00000000000..a19812547c4 --- /dev/null +++ b/nixos/modules/services/web-apps/whitebophir.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.whitebophir; +in { + options = { + services.whitebophir = { + enable = mkEnableOption "whitebophir, an online collaborative whiteboard server (persistent state will be maintained under /var/lib/whitebophir)"; + + package = mkOption { + default = pkgs.whitebophir; + defaultText = "pkgs.whitebophir"; + type = types.package; + description = "Whitebophir package to use."; + }; + + port = mkOption { + type = types.port; + default = 5001; + description = "Port to bind to."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.whitebophir = { + description = "Whitebophir Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + PORT = "${toString cfg.port}"; + WBO_HISTORY_DIR = "/var/lib/whitebophir"; + }; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/whitebophir"; + Restart = "always"; + StateDirectory = "whitebophir"; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 176c1f46127..171660c53ac 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' - ${pkgs.clfswm}/bin/clfswm & + ${pkgs.lispPackages.clfswm}/bin/clfswm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.clfswm ]; + environment.systemPackages = [ pkgs.lispPackages.clfswm ]; }; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 87702c58727..9ca24310e56 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -13,6 +13,7 @@ in ./berry.nix ./bspwm.nix ./cwm.nix + ./clfswm.nix ./dwm.nix ./evilwm.nix ./exwm.nix diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 88e13f4dbfb..3e97d28d83b 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -48,7 +48,7 @@ in description = '' Extra packages available to Emacs. The value must be a function which receives the attrset defined in - emacsPackages as the sole argument. + emacs.pkgs as the sole argument. ''; }; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1fe1bb14eaf..cb9735ae04f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -22,7 +22,7 @@ let rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules; kernel = modulesTree; firmware = firmware; - allowMissing = true; + allowMissing = false; }; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ec257801b33..70d6fcc8967 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -155,19 +155,17 @@ in users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; - # TODO: remove once docker 20.10 is released - systemd.enableUnifiedCgroupHierarchy = false; - systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; environment = proxy_env; serviceConfig = { + Type = "notify"; ExecStart = [ "" '' ${cfg.package}/bin/dockerd \ --group=docker \ - --host=fd:// \ + --host=unix:// \ --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString cfg.liveRestore "--live-restore" } \ diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 3da63078a21..892af513b03 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -329,24 +329,24 @@ let self = { "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; - # 20.09.1632.a6a3a368dda - "20.09".eu-west-1.hvm-ebs = "ami-01a79d5ce435f4db3"; - "20.09".eu-west-2.hvm-ebs = "ami-0cbe14f32904e6331"; - "20.09".eu-west-3.hvm-ebs = "ami-07f493412d6213de6"; - "20.09".eu-central-1.hvm-ebs = "ami-01d4a0c2248cbfe38"; - "20.09".eu-north-1.hvm-ebs = "ami-0003f54dd99d68e0f"; - "20.09".us-east-1.hvm-ebs = "ami-068a62d478710462d"; - "20.09".us-east-2.hvm-ebs = "ami-01ac677ff61399caa"; - "20.09".us-west-1.hvm-ebs = "ami-04befdb203b4b17f6"; - "20.09".us-west-2.hvm-ebs = "ami-0fb7bd4a43261c6b2"; - "20.09".ca-central-1.hvm-ebs = "ami-06d5ee429f153f856"; - "20.09".ap-southeast-1.hvm-ebs = "ami-0db0304e23c535b2a"; - "20.09".ap-southeast-2.hvm-ebs = "ami-045983c4db7e36447"; - "20.09".ap-northeast-1.hvm-ebs = "ami-0beb18d632cf64e5a"; - "20.09".ap-northeast-2.hvm-ebs = "ami-0dd0316af578862db"; - "20.09".ap-south-1.hvm-ebs = "ami-008d15ced81c88aed"; - "20.09".ap-east-1.hvm-ebs = "ami-071f49713f86ea965"; - "20.09".sa-east-1.hvm-ebs = "ami-05ded1ae35209b5a8"; + # 20.09.2016.19db3e5ea27 + "20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2"; + "20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd"; + "20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe"; + "20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2"; + "20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14"; + "20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8"; + "20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8"; + "20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485"; + "20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac"; + "20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7"; + "20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d"; + "20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9"; + "20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927"; + "20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf"; + "20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1"; + "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f"; + "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d"; latest = self."20.09"; }; in self diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d53c6f6511e..7d83b952f94 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -342,6 +342,7 @@ in sbt-extras = handleTest ./sbt-extras.nix {}; scala = handleTest ./scala.nix {}; sddm = handleTest ./sddm.nix {}; + searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; shadow = handleTest ./shadow.nix {}; shadowsocks = handleTest ./shadowsocks {}; diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index ccb69c85a55..50ad5c68aef 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -98,7 +98,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : { }]; services.mysql.settings = { mysqld = { - plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ]; + plugin-load-add = [ "ha_rocksdb.so" ]; }; }; services.mysql.package = pkgs.mariadb; @@ -185,19 +185,5 @@ import ./../make-test-python.nix ({ pkgs, ...} : { mariadb.succeed( "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" ) - '' + pkgs.lib.optionalString pkgs.stdenv.isx86_64 '' - # Check if TokuDB plugin works - mariadb.succeed( - "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" - ) - mariadb.succeed( - "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" - ) ''; }) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix new file mode 100644 index 00000000000..357ade10535 --- /dev/null +++ b/nixos/tests/searx.nix @@ -0,0 +1,113 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "searx"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # basic setup: searx running the built-in webserver + nodes.base = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + services.searx = { + enable = true; + environmentFile = pkgs.writeText "secrets" '' + WOLFRAM_API_KEY = sometoken + SEARX_SECRET_KEY = somesecret + ''; + + settings.server = + { port = "8080"; + bind_address = "0.0.0.0"; + secret_key = "@SEARX_SECRET_KEY@"; + }; + settings.engines = [ + { name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { name = "startpage"; + shortcut = "start"; + } + ]; + }; + + }; + + # fancy setup: run in uWSGI and use nginx as proxy + nodes.fancy = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + services.searx = { + enable = true; + # searx refuses to run if unchanged + settings.server.secret_key = "somesecret"; + + runInUwsgi = true; + uwsgiConfig = { + # serve using the uwsgi protocol + socket = "/run/searx/uwsgi.sock"; + chmod-socket = "660"; + + # use /searx as url "mountpoint" + mount = "/searx=searx.webapp:application"; + module = ""; + manage-script-name = true; + }; + }; + + # use nginx as reverse proxy + services.nginx.enable = true; + services.nginx.virtualHosts.localhost = { + locations."/searx".extraConfig = + '' + include ${pkgs.nginx}/conf/uwsgi_params; + uwsgi_pass unix:/run/searx/uwsgi.sock; + ''; + locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + }; + + # allow nginx access to the searx socket + users.users.nginx.extraGroups = [ "searx" ]; + + }; + + testScript = + '' + base.start() + + with subtest("Settings have been merged"): + base.wait_for_unit("searx-init") + base.wait_for_file("/run/searx/settings.yml") + output = base.succeed( + "${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" + " 'engines.(name==startpage).shortcut'" + ).strip() + assert output == "start", "Settings not merged" + + with subtest("Environment variables have been substituted"): + base.succeed("grep -q somesecret /run/searx/settings.yml") + base.succeed("grep -q sometoken /run/searx/settings.yml") + base.copy_from_vm("/run/searx/settings.yml") + + with subtest("Basic setup is working"): + base.wait_for_open_port(8080) + base.wait_for_unit("searx") + base.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost:8080" + ) + base.shutdown() + + with subtest("Nginx+uWSGI setup is working"): + fancy.start() + fancy.wait_for_open_port(80) + fancy.wait_for_unit("uwsgi") + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" + ) + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2" + ) + ''; +}) diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index e35338a5f0d..35a85b95801 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.1"; + version = "3.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "1bn3nxianbal9f81z9wf2cxi893hndvrz2zdqvh1zpxrhs0cr038"; + sha256 = "0wmalfqnskglssq3gj6kkrq6h6c9yab503y72afhkm7n9r5c57zz"; }; patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index a1019880318..9cc96bd03a7 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss"; + sha256 = "1dfq6ickx24cq8zhhm0a8x5ycd0iygw065qd2blcgl0fim350zw9"; }; - cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys"; + cargoSha256 = "0z4af575rx6ggjxsw1q18kwsb4cvyy1kzfkp32v9n74krmy0fk8p"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 4fb591e75c3..f0f3ad60b41 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -45,13 +45,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.3"; + version = "4.8.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0k5p5y3im7xnf0ikaghh56nfhirkdwf95c8fr17wasgdpw2m86i2"; + sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 09df5dcddbb..09f8bcfd6b6 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.12c"; + version = "6.19"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; + sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix new file mode 100644 index 00000000000..2b04b450dec --- /dev/null +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ladspa-sdk, pkgs, ... }: + +stdenv.mkDerivation rec { + pname = "tap-plugins"; + version = "1.0.1"; + + src = pkgs.fetchFromGitHub { + owner = "tomszilagyi"; + repo = pname; + rev = "v${version}"; + sha256 = "0c6qhyf8smlypc36vmpr42dm3mrzk6pg9cc9r0vx22qbrd5zfpjw"; + }; + + buildInputs = [ ladspa-sdk ]; + + preInstall = '' + substituteInPlace Makefile --replace /usr/local "$out" + ''; + + meta = with stdenv.lib; { + description = "Tom's Audio Processing plugins"; + longDescription = '' + A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser, + TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, + TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, + TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. + ''; + homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + license = licenses.gpl3; + maintainers = [ maintainers.fps ]; + }; +} diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix new file mode 100644 index 00000000000..0b0da5913ab --- /dev/null +++ b/pkgs/applications/blockchains/electrs.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, llvmPackages +}: + +rustPlatform.buildRustPackage rec { + pname = "electrs"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "romanz"; + repo = pname; + rev = "v${version}"; + sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb"; + }; + + # needed for librocksdb-sys + nativeBuildInputs = [ llvmPackages.clang ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr"; + + meta = with lib; { + description = "An efficient re-implementation of Electrum Server in Rust"; + homepage = "https://github.com/romanz/electrs"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index ae1286a384f..37ad808de8a 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk, -cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: +cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.12.4"; + version = "21.1.7"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1j1iqmcbwfj72l7g83ah701bipas9cqwazyhh0af5hp2ckj9nmmf"; + sha256 = "sha256-im0z3g225EhboJFoHBweHefn2QAKvYGSAP7e4Mz6Jm8="; }; sourceRoot = "."; @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { libpulseaudio systemd vivaldi-ffmpeg-codecs + libxkbcommon + mesa ]; in '' patchelf \ diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index cffbdde8f00..a34e834d4a7 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -8,7 +8,7 @@ , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror -, hidapi, rapidjson +, hidapi, rapidjson, quirc , trezorSupport ? true , libusb1 ? null , protobuf ? null @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.8"; + version = "0.17.1.9"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "13cjrfdkr7c2ff8j2rg8hvhlc00af38vcs67wlx2109i2baq4pp3"; + sha256 = "0143mmxk0jfb5pmjlx6v0knvf8v49kmkpjxlp6rw8lwnlf71xadn"; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { monero miniupnpc unbound readline randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite - zeromq hidapi rapidjson + zeromq hidapi rapidjson quirc ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] ++ optionals stdenv.isDarwin [ qtmacextras ]; @@ -75,6 +75,10 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace 'add_subdirectory(monero)' \ 'add_subdirectory(monero EXCLUDE_FROM_ALL)' + + # use nixpkgs quirc + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(external)' "" ''; cmakeFlags = [ "-DARCH=${arch}" ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 9d1761ab446..c9134e3ec47 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.8"; + version = "0.17.1.9"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "10blazbk1602slx3wrmw4jfgkdry55iclrhm5drdficc5v3h735g"; + sha256 = "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 77e603e8380..b884f044efe 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,8 +4,8 @@ let pname = "MyCrypto"; - version = "1.7.12"; - sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3"; + version = "1.7.13"; + sha256 = "15m21n68lxnz6fxwf1bb3cxg5qi6nrwcnqymiw8s9wizvv575vj7"; name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index df54f710d9c..4b6480639b3 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { unlicense unfreeRedistributable # contains libbass.so in repository ]; - maintainers = [ maintainers.nocent ]; + maintainers = [ maintainers.ilian ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index ea776ed4cec..a4900ff951a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -69,10 +69,10 @@ elpaBuild { pname = "adaptive-wrap"; ename = "adaptive-wrap"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.7.el"; - sha256 = "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp"; + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; + sha256 = "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"; }; packageRequires = []; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.1"; + version = "13.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar"; - sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7"; + url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar"; + sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -553,21 +553,6 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "company"; - ename = "company"; - version = "0.9.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; - sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company.html"; - license = lib.licenses.free; - }; - }) {}; company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: elpaBuild { pname = "company-ebdb"; @@ -651,21 +636,6 @@ license = lib.licenses.free; }; }) {}; - cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cpio-mode"; - ename = "cpio-mode"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; - sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; - license = lib.licenses.free; - }; - }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -726,21 +696,6 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dash"; - ename = "dash"; - version = "2.12.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.12.0.tar"; - sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/dash.html"; - license = lib.licenses.free; - }; - }) {}; dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dbus-codegen"; @@ -771,21 +726,6 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "delight"; - ename = "delight"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.7.el"; - sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/delight.html"; - license = lib.licenses.free; - }; - }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; @@ -801,36 +741,6 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diff-hl"; - ename = "diff-hl"; - version = "1.8.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar"; - sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diff-hl.html"; - license = lib.licenses.free; - }; - }) {}; - diffview = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "diffview"; - ename = "diffview"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diffview-1.0.el"; - sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/diffview.html"; - license = lib.licenses.free; - }; - }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-du"; @@ -846,21 +756,6 @@ license = lib.licenses.free; }; }) {}; - dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-git-info"; - ename = "dired-git-info"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el"; - sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; - license = lib.licenses.free; - }; - }) {}; disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "disk-usage"; @@ -876,21 +771,6 @@ license = lib.licenses.free; }; }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dismal"; - ename = "dismal"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; - sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dismal.html"; - license = lib.licenses.free; - }; - }) {}; djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "djvu"; @@ -966,59 +846,14 @@ license = lib.licenses.free; }; }) {}; - ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: - elpaBuild { - pname = "ebdb-gnorb"; - ename = "ebdb-gnorb"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; - sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i"; - }; - packageRequires = [ ebdb gnorb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: - elpaBuild { - pname = "ebdb-i18n-chn"; - ename = "ebdb-i18n-chn"; - version = "1.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el"; - sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl"; - }; - packageRequires = [ ebdb pyim ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; - license = lib.licenses.free; - }; - }) {}; - ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ediprolog"; - ename = "ediprolog"; - version = "2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-2.1.el"; - sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ediprolog.html"; - license = lib.licenses.free; - }; - }) {}; eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "eev"; ename = "eev"; - version = "20201013"; + version = "20210102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20201013.tar"; - sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8"; + url = "https://elpa.gnu.org/packages/eev-20210102.tar"; + sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq"; }; packageRequires = [ emacs ]; meta = { @@ -1099,36 +934,6 @@ license = lib.licenses.free; }; }) {}; - electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "electric-spacing"; - ename = "electric-spacing"; - version = "5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el"; - sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; - license = lib.licenses.free; - }; - }) {}; - elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "elisp-benchmarks"; - ename = "elisp-benchmarks"; - version = "1.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar"; - sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; - license = lib.licenses.free; - }; - }) {}; emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "emms"; @@ -1159,21 +964,6 @@ license = lib.licenses.free; }; }) {}; - epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "epoch-view"; - ename = "epoch-view"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; - sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/epoch-view.html"; - license = lib.licenses.free; - }; - }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1194,43 +984,6 @@ license = lib.licenses.free; }; }) {}; - excorporate = callPackage ({ elpaBuild - , emacs - , fetchurl - , fsm - , lib - , nadvice - , soap-client - , url-http-ntlm }: - elpaBuild { - pname = "excorporate"; - ename = "excorporate"; - version = "0.9.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar"; - sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j"; - }; - packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/excorporate.html"; - license = lib.licenses.free; - }; - }) {}; - expand-region = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "expand-region"; - ename = "expand-region"; - version = "0.11.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar"; - sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/expand-region.html"; - license = lib.licenses.free; - }; - }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1306,21 +1059,6 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fountain-mode"; - ename = "fountain-mode"; - version = "2.7.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el"; - sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fountain-mode.html"; - license = lib.licenses.free; - }; - }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -1381,21 +1119,6 @@ license = lib.licenses.free; }; }) {}; - ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ggtags"; - ename = "ggtags"; - version = "0.8.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el"; - sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ggtags.html"; - license = lib.licenses.free; - }; - }) {}; gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; @@ -1512,10 +1235,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.5"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.5.tar"; - sha256 = "1hfh315vrxd54r2f1wpdfk06b7lhpab7knygav58vdwwdbndlqiz"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; + sha256 = "1lyh1brb68zaasnw2brymsspcyl3jxmnvbvpvrqfxhhl3fq9nbv1"; }; packageRequires = []; meta = { @@ -1553,21 +1276,6 @@ license = lib.licenses.free; }; }) {}; - greenbar = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "greenbar"; - ename = "greenbar"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/greenbar-1.1.el"; - sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/greenbar.html"; - license = lib.licenses.free; - }; - }) {}; guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1620,36 +1328,6 @@ license = lib.licenses.free; }; }) {}; - hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hook-helpers"; - ename = "hook-helpers"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; - sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; - license = lib.licenses.free; - }; - }) {}; - html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "html5-schema"; - ename = "html5-schema"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; - sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/html5-schema.html"; - license = lib.licenses.free; - }; - }) {}; hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "hydra"; @@ -1725,21 +1403,6 @@ license = lib.licenses.free; }; }) {}; - ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "ivy-explorer"; - ename = "ivy-explorer"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el"; - sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; - license = lib.licenses.free; - }; - }) {}; ivy-posframe = callPackage ({ elpaBuild , emacs , fetchurl @@ -1790,21 +1453,6 @@ license = lib.licenses.free; }; }) {}; - js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "js2-mode"; - ename = "js2-mode"; - version = "20201220"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar"; - sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/js2-mode.html"; - license = lib.licenses.free; - }; - }) {}; json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "json-mode"; @@ -2060,21 +1708,6 @@ license = lib.licenses.free; }; }) {}; - memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "memory-usage"; - ename = "memory-usage"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/memory-usage-0.2.el"; - sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/memory-usage.html"; - license = lib.licenses.free; - }; - }) {}; metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "metar"; @@ -2150,36 +1783,6 @@ license = lib.licenses.free; }; }) {}; - mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "mmm-mode"; - ename = "mmm-mode"; - version = "0.5.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar"; - sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; - license = lib.licenses.free; - }; - }) {}; - modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "modus-operandi-theme"; - ename = "modus-operandi-theme"; - version = "0.12.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el"; - sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html"; - license = lib.licenses.free; - }; - }) {}; modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "modus-vivendi-theme"; @@ -2399,21 +2002,6 @@ license = lib.licenses.free; }; }) {}; - olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "olivetti"; - ename = "olivetti"; - version = "1.7.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el"; - sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/olivetti.html"; - license = lib.licenses.free; - }; - }) {}; omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "omn-mode"; @@ -2549,21 +2137,6 @@ license = lib.licenses.free; }; }) {}; - paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "paced"; - ename = "paced"; - version = "1.1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; - sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/paced.html"; - license = lib.licenses.free; - }; - }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -2579,36 +2152,6 @@ license = lib.licenses.free; }; }) {}; - path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "path-iterator"; - ename = "path-iterator"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; - sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/path-iterator.html"; - license = lib.licenses.free; - }; - }) {}; - peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "peg"; - ename = "peg"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/peg-1.0.tar"; - sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/peg.html"; - license = lib.licenses.free; - }; - }) {}; persist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "persist"; @@ -2699,36 +2242,6 @@ license = lib.licenses.free; }; }) {}; - psgml = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "psgml"; - ename = "psgml"; - version = "1.3.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; - sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/psgml.html"; - license = lib.licenses.free; - }; - }) {}; - pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pspp-mode"; - ename = "pspp-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; - sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; - license = lib.licenses.free; - }; - }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -3165,6 +2678,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; + sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3225,21 +2753,6 @@ license = lib.licenses.free; }; }) {}; - smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "smalltalk-mode"; - ename = "smalltalk-mode"; - version = "3.2.92"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar"; - sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; - license = lib.licenses.free; - }; - }) {}; smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "smart-yank"; @@ -3330,21 +2843,6 @@ license = lib.licenses.free; }; }) {}; - spinner = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "spinner"; - ename = "spinner"; - version = "1.7.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; - sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/spinner.html"; - license = lib.licenses.free; - }; - }) {}; sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-beeline"; @@ -3435,21 +2933,6 @@ license = lib.licenses.free; }; }) {}; - swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "swiper"; - ename = "swiper"; - version = "0.13.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar"; - sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swiper.html"; - license = lib.licenses.free; - }; - }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -3718,21 +3201,6 @@ license = lib.licenses.free; }; }) {}; - vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vcl-mode"; - ename = "vcl-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el"; - sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; - license = lib.licenses.free; - }; - }) {}; vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { pname = "vdiff"; @@ -3828,21 +3296,6 @@ license = lib.licenses.free; }; }) {}; - w3 = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "w3"; - ename = "w3"; - version = "4.0.49"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/w3-4.0.49.tar"; - sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/w3.html"; - license = lib.licenses.free; - }; - }) {}; wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wcheck-mode"; @@ -3907,10 +3360,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.12"; + version = "1.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.12.tar"; - sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w"; + url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar"; + sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"; }; packageRequires = [ cl-lib ]; meta = { @@ -3918,36 +3371,6 @@ license = lib.licenses.free; }; }) {}; - which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "which-key"; - ename = "which-key"; - version = "3.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar"; - sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/which-key.html"; - license = lib.licenses.free; - }; - }) {}; - windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "windower"; - ename = "windower"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; - sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/windower.html"; - license = lib.licenses.free; - }; - }) {}; windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "windresize"; @@ -4013,21 +3436,6 @@ license = lib.licenses.free; }; }) {}; - xclip = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "xclip"; - ename = "xclip"; - version = "1.10"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.10.el"; - sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/xclip.html"; - license = lib.licenses.free; - }; - }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 57f5d7b8594..8b9ad33fce7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages`. 3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a47688eca7e..93e215753c7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -6,8 +6,8 @@ To update the list of packages from MELPA, 1. Run ./update-melpa 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index d2dc41bcf04..7adb58c8bd7 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20201228"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20201228.tar"; - sha256 = "0rv98v3zbdbc4yfq9mymrxrcj422xpfhvw31xrspydwgpxqgsf99"; + url = "https://orgmode.org/elpa/org-20210111.tar"; + sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20201228"; + version = "20210111"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20201228.tar"; - sha256 = "0libzh2a51m9l0kb01zjw2fai2nbxqw9r01i8fkjy94hq0lbw7cc"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar"; + sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index 1f37cf624f9..b60af0e9334 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -5,7 +5,7 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.orgPackages`. 3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 18b78521586..42d2c84311a 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -111,14 +111,14 @@ "repo": "emacsorphanage/4clojure", "unstable": { "version": [ - 20200123, - 2008 + 20210102, + 459 ], "deps": [ "request" ], - "commit": "557eecb5da50fedd92840021c8b08d87dfdc782b", - "sha256": "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk" + "commit": "6f494d3905284ccdd57aae3d8ac16fc7ab431596", + "sha256": "19mbfh504mli8mnf95xaych45nqnayrspymf5r80dky4jv43zzv8" } }, { @@ -1871,8 +1871,8 @@ "annotation", "eri" ], - "commit": "c45dc6b2729a53653df2874b6ea8b3500793da78", - "sha256": "03a49iifi5dl2fcsi288l68frmga3qiw2prd0vfr9xzmyqmfaz6z" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -2331,14 +2331,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200923, - 1339 + 20210106, + 1227 ], "deps": [ "memoize" ], - "commit": "6917b08f64dd8487e23769433d6cb9ba11f4152f", - "sha256": "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68" + "commit": "9aa16ae198073fe839a0abfa9a7d3a9dc85ef5f9", + "sha256": "1ll69hb7108fcklyagkvgxkr96nh9sp06kkr73kz92j4cljsahc6" }, "stable": { "version": [ @@ -2717,14 +2717,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200701, - 2108 + 20210101, + 1921 ], "deps": [ "s" ], - "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e", - "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783" + "commit": "b99149715266b5c2c48f5a0fc43716d36575da5f", + "sha256": "14k1wrjfhawb18fyrfdv2lv0nwfpliw0f14hrhdb3kmshp5dsb3x" }, "stable": { "version": [ @@ -2746,8 +2746,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20200912, - 239 + 20210101, + 833 ], "deps": [ "dash", @@ -2755,14 +2755,14 @@ "pythonic", "s" ], - "commit": "39b1cf88c8c459901630d248d6135d8644075648", - "sha256": "0nwrs6cw2dpl522rrdhzrka4fkcw4f2grxlz0mjwwlaxafd2zc3y" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" }, "stable": { "version": [ 0, 1, - 12 + 14 ], "deps": [ "dash", @@ -2770,8 +2770,8 @@ "pythonic", "s" ], - "commit": "6be586123f606317c51e62239490af9843ba2d13", - "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf" + "commit": "80afec20f91f13614647b192522fff460505db6f", + "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" } }, { @@ -3064,11 +3064,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20201216, - 1526 + 20210108, + 1828 ], - "commit": "44ac24f63dab3a5e052248d384082414b7af5f1d", - "sha256": "1np5kqfdxaq76gs6fwrlqv5sv6ii1w6f6rbp74j9hsir34kfpbv7" + "commit": "d4eff870d9c1575731890acfdde89511d0322ec1", + "sha256": "11k5j7xgnxq4s5ar56f3qmbr8vnrhi231zv0iiv2p0nqryaaj354" }, "stable": { "version": [ @@ -3106,8 +3106,8 @@ 20200914, 644 ], - "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", - "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -3188,28 +3188,28 @@ "repo": "k1LoW/emacs-ansible", "unstable": { "version": [ - 20201001, - 838 + 20210103, + 543 ], "deps": [ "f", "s" ], - "commit": "cf6b8f06c2628357fc2a72ea9817a2c2d0ebf690", - "sha256": "1pj7z6hsrh6ih1m6x3lbs2af6y30yazc44ahgkdvi00ckd48akqp" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "f", "s" ], - "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", - "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" + "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263", + "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh" } }, { @@ -4813,11 +4813,11 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20201018, - 1340 + 20210108, + 1841 ], - "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d", - "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9" + "commit": "5ad84d0a12b175360b18504cd04e6bf7ab1cf5c8", + "sha256": "0dpsqzl6nn08kg9d42a6zpk7jq6621c0hzf28c1ary4vzcwm4j9v" }, "stable": { "version": [ @@ -5262,8 +5262,8 @@ 20190331, 2230 ], - "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", - "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -5391,6 +5391,25 @@ "sha256": "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs" } }, + { + "ename": "avy-embark-collect", + "commit": "81c3fffff154360fd4fecb34b1b7ce362bf4eb41", + "sha256": "0fxya97fkh3w18301n37yj07mik3r8aaa61dmb64raav40xza9ad", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210112, + 2334 + ], + "deps": [ + "avy", + "embark" + ], + "commit": "94db870a7089cd3aeff994afde327e0c0acb2a27", + "sha256": "1i2niv9dwbrai9y9njp8h37wb8ssjavmghj2i9kld1d1jgmmnx1f" + } + }, { "ename": "avy-flycheck", "commit": "05755bed49219072d2ec98f0be5ecba4deda7cd1", @@ -6192,11 +6211,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20200928, - 1749 + 20210108, + 38 ], - "commit": "d25c29822aff60ab44eb7b5e68e28bc7c2d5d9a9", - "sha256": "0sc2m1xxhw7rgzpk4bw4n3nivhv0byy8yflzvnaf9xkq7km7wv3z" + "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", + "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" }, "stable": { "version": [ @@ -6611,11 +6630,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20201230, - 2104 + 20210110, + 1317 ], - "commit": "e3a6546aa626b9a79ae451c88f44cf26f9d1a919", - "sha256": "0pijmc496m1mlzhny8zzklh5idpkipv552h8774rkdsn0c6d9jna" + "commit": "411ecdf6e7a3e1b4ced7605070d2309e5fc46556", + "sha256": "03jgfrpjlvn7fkv9grcqayphz2bjjkfh4rd6k1s7vmdpd3hm0xpb" } }, { @@ -6873,8 +6892,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200908, - 1017 + 20210108, + 1155 ], "deps": [ "biblio", @@ -6884,8 +6903,8 @@ "parsebib", "s" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -7039,8 +7058,8 @@ 20200805, 1727 ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -7477,8 +7496,8 @@ 20201116, 2341 ], - "commit": "79b3543ca5efc02e4981d8fb987d2e869986511b", - "sha256": "0vbj0wn0apsxaxj428lkg2ga37pin0jqd3n51r7yrgj8s92qfacj" + "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07", + "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn" }, "stable": { "version": [ @@ -7738,15 +7757,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20201119, - 1841 + 20210105, + 1045 ], "deps": [ "epkg", "magit" ], - "commit": "79bfdbdf0b4a81ee3bab2c853040e57e5454e164", - "sha256": "1rjlkgk6vcfxzgsw44h5prqgpjc1w4sfvklzlbxhyx84x0fzygpb" + "commit": "5de2a7aa0c126f5b18506e187bca66079e68f51d", + "sha256": "18d845xpfp1dklqqghxxzy6zglm8w11lyi3ww44yfmrmxgi8xsvd" }, "stable": { "version": [ @@ -8256,8 +8275,8 @@ 20180307, 2251 ], - "commit": "e093360e05164c78255866c1ac8f966aa38ba514", - "sha256": "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f" + "commit": "b8ecbf0251a59c351a3e44607ee502af343da64b", + "sha256": "1zb4k5v4n6j42z7kzlw2y1jp4xbkp6w9zxls3ja36g326mz5mdjz" }, "stable": { "version": [ @@ -8512,14 +8531,14 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20200426, - 2219 + 20210108, + 1141 ], "deps": [ "dash" ], - "commit": "28a9b0a36cb69b931cf32db7546ad5c6589752cf", - "sha256": "1gwb95pjwv9k0iq290mcyyl0xasr3jldr086rrhabxpcc9ih3yv8" + "commit": "f3a137628e112a91910fd33c0cff0948fa58d470", + "sha256": "04b0c15g24474sy9kp198g28yikhpr0fvmx1kgwqq9ly4p5wyzla" }, "stable": { "version": [ @@ -8805,19 +8824,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20201028, - 2204 + 20210105, + 2255 ], - "commit": "2f24a44f31caf5e832bd48438b5424193c5213d1", - "sha256": "0dxbn9h38a55jk91mrapsv7k7vdvijkakpcblnjpjd1ww5lkhcy8" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" }, "stable": { "version": [ 1, - 23 + 24 ], - "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851", - "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr" + "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", + "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" } }, { @@ -9475,15 +9494,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20201213, - 1943 + 20210103, + 2111 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "b18e1ecc7ef4b0d813ad6775af00f1297efd2804", - "sha256": "04zxafczac13lygdh05glrgqks5zn2l1aajckjcla7ad6naknmar" + "commit": "9c7d885562c7d5935ec2e97585acf95813a084be", + "sha256": "0j1ls97m4rc9mkjp57k4ba1ljvzlhmpn31z7drkqhx9yff0q0fan" }, "stable": { "version": [ @@ -9767,8 +9786,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -9816,8 +9835,8 @@ 20200904, 1431 ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -10086,8 +10105,8 @@ 20171115, 2108 ], - "commit": "412acbdcff7c296f5980ad26e66a7b9235059035", - "sha256": "077rv9hv52rl3hdm3s3csf9wxgjvmd28ndyjwfn3fgshriwhh9dr" + "commit": "fca303e3a22f72c1c4235e404bfdffd6031bd61c", + "sha256": "15wi6xc2ml549ps4ly2a2hxhrs957k6ynz1611zv7xskxkn9dwwd" }, "stable": { "version": [ @@ -10119,10 +10138,10 @@ }, { "ename": "cfml-mode", - "commit": "0d28507e1109195004a371fa201d914b995c2b4e", - "sha256": "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp", + "commit": "858b9dd3723deb7da87c5a4db135b9098c7920ee", + "sha256": "09ic34pk3ccwda2gp42h9kv98b3k4b3069yqffa8621cjhz58fiw", "fetcher": "github", - "repo": "am2605/cfml-mode", + "repo": "amyers634/cfml-mode", "unstable": { "version": [ 20190617, @@ -10171,30 +10190,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20201227, - 1135 + 20210108, + 1152 ], "deps": [ "dash", "posframe", "s" ], - "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", - "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" + "commit": "d4cee9074b31b283b1475bfc8fe3c63ab51dbb61", + "sha256": "122gls0zwxl3km5h0gw5ykccxxdfy8svvr7s7lm78ylmp6prpx2p" }, "stable": { "version": [ 1, - 3, - 2 + 5, + 1 ], "deps": [ "dash", "posframe", "s" ], - "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", - "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" + "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d", + "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m" } }, { @@ -10684,8 +10703,8 @@ "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20201222, - 1500 + 20210106, + 2147 ], "deps": [ "anaphora", @@ -10694,14 +10713,14 @@ "seq", "ts" ], - "commit": "551a750cae4030d7f4ff92eebc26da6c4aae9af6", - "sha256": "1jhdr4b2y92982rbbhwmrd3h4bm17px0adglhsc1w4h02zdm54iy" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" }, "stable": { "version": [ 0, - 5, - 6 + 6, + 2 ], "deps": [ "anaphora", @@ -10710,8 +10729,8 @@ "seq", "ts" ], - "commit": "6e310163b3b43844a45ee93cb37d093f66860ede", - "sha256": "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw" + "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", + "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" } }, { @@ -10722,28 +10741,28 @@ "repo": "contrapunctus-1/chronometrist-goal", "unstable": { "version": [ - 20200906, - 1522 + 20210104, + 336 ], "deps": [ "alert", "chronometrist" ], - "commit": "c8bb401155a8a2c5718ffd3667c516f8e178a1b5", - "sha256": "0lqllxhq8r38gm12ia5s2mjsv75l1d99dbning5lmwwbcyc9cn17" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "alert", "chronometrist" ], - "commit": "e651821d0f64830235232082a8295e86a173574b", - "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v" + "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", + "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" } }, { @@ -10802,8 +10821,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20201230, - 1039 + 20210104, + 915 ], "deps": [ "clojure-mode", @@ -10814,8 +10833,8 @@ "sesman", "spinner" ], - "commit": "02518bc16bd0fbf56bcade491fbf5c36cedc5b8e", - "sha256": "0a82m5rnam34xkjh466ds84n6d09w9z8q162x61dvl2qnyn0ma3f" + "commit": "3fac28541e03812990c771bd774bf8ea65c228c9", + "sha256": "1216nws4mcvmrlkdvpb83slqqwkqiwdyw0fxp2b1nkm2lmrcq7bs" }, "stable": { "version": [ @@ -10985,8 +11004,8 @@ 20181024, 1256 ], - "commit": "414127acad8e2e0092ca60918e6a7cb89da6e28a", - "sha256": "08cfhk33xawj0jbgywfn1w0j7gjyj9bcghbrwn96fd7wwj3wh5j2" + "commit": "925451a00e6defd4f5ac1a7fd76ffefefdbce3ef", + "sha256": "0bmjrfijaicwa5vvlfr47xmjcgj2npmqfcj63nczxc316kka4q9q" }, "stable": { "version": [ @@ -11006,14 +11025,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201225, - 1707 + 20210111, + 2141 ], "deps": [ "cl-lib" ], - "commit": "0472cda711252b06fc07be184449b31933578148", - "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -11058,6 +11077,24 @@ "sha256": "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w" } }, + { + "ename": "circleci-api", + "commit": "d05bf29e8367d4942e13eb768f4db2b291f1281e", + "sha256": "16kcbh5d6yhqaircwzy7zhb2l3in62hz6khzarfadcsk9y47pp2s", + "fetcher": "github", + "repo": "sulami/circleci-api.el", + "unstable": { + "version": [ + 20201221, + 1036 + ], + "deps": [ + "request" + ], + "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b", + "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c" + } + }, { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", @@ -11495,8 +11532,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200831, - 1244 + 20210101, + 1036 ], "deps": [ "cider", @@ -11509,8 +11546,8 @@ "seq", "yasnippet" ], - "commit": "6db85b37b57497b56d97d5e5512160e5db85f798", - "sha256": "1aig67ps65adsnpdkjvl0wdglzjzhw1jc2v1rdhyfszqk0w30sz9" + "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef", + "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs" }, "stable": { "version": [ @@ -11873,16 +11910,16 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20200808, - 2347 + 20201224, + 1358 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "ada167954911bf1631ea73537b4b496f35f99a73", - "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" + "commit": "ffcb122194507593815d67b26f5d2d8ffcc52bf8", + "sha256": "1dqcc5szghqxdhy8r0gq6s7bbv4zq0grsjjfh8n6wmsyd1svrd3k" }, "stable": { "version": [ @@ -12035,14 +12072,14 @@ "repo": "Lindydancer/cmake-font-lock", "unstable": { "version": [ - 20200914, - 1715 + 20210103, + 1558 ], "deps": [ "cmake-mode" ], - "commit": "47687b6ccd0e244691fb5907aaba609e5a42d787", - "sha256": "03am60wr5jzx1vqyvfc885z8vy959zypjbmar37ln2pffiz9510l" + "commit": "5e20ed32193c2c7ebae920a6a3cd711c8c950597", + "sha256": "030j8k2yi1vli7xw10vz24qigq7jxg8yhc15kwjscfczl38x8vh4" } }, { @@ -12087,11 +12124,11 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20201217, - 1410 + 20210104, + 1831 ], - "commit": "95c59252c4116c185e898762d82b49d7a4f42445", - "sha256": "08c4q1nllcc8d5zjcdjg0ms2ia75rar1xxm8sd036pl74bns7ra8" + "commit": "20a7d4485cb3f6520abc22d22fd516a19e4cfdb2", + "sha256": "0ga09h0pqb2bpbp94l21kl6vfdcq7yk1w0m4vd2bhdxvfb9r4s0d" }, "stable": { "version": [ @@ -12600,11 +12637,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20201225, - 2110 + 20210107, + 2111 ], - "commit": "b70046e4bf23583af39ddd0534470358eab0ff9d", - "sha256": "15bn6y75mr7g7l36hxfmz0fmcdpysacp29ib04az4mn6bkylns4x" + "commit": "71b72baed2008e38ad1eb6558934e64094351cd7", + "sha256": "1z39lha9jb1bxr1xlyy5clqqqvnafipx0rf8pdjw9qhbjh4kk2x1" }, "stable": { "version": [ @@ -12641,11 +12678,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20201225, - 1334 + 20210102, + 1035 ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -12877,11 +12914,11 @@ "repo": "remyferre/comment-dwim-2", "unstable": { "version": [ - 20201024, - 828 + 20210101, + 1820 ], - "commit": "396b03c67684461e194a45ce751508d37088469d", - "sha256": "1pmgprhl9fllpa06c4hxb5zss3qiq1lcqwqzlnq5n2lhv8lzk3h0" + "commit": "7cdafd6d98234a7402865b8abdae54a2f2551c94", + "sha256": "0f9gzgn4d2ir79nvv5vqhn4s4131dphzpfzfcb0iy4fx6mhmca5b" }, "stable": { "version": [ @@ -13044,11 +13081,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20201230, - 2332 + 20210103, + 1124 ], - "commit": "123b604297b64c69aeec3018722c75e03d18c23a", - "sha256": "0s5afwzdy31ws7qcjxnijsnm8nsxvqs2pmaz2bxf5ph8cyaxzdvj" + "commit": "6116c4617a7934acfe84cb82a058e9b198f0f480", + "sha256": "1a9ax30g57187ma27kg3p3khci6903hf0anjsxy6s2slvvy8c3fm" }, "stable": { "version": [ @@ -13218,8 +13255,8 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20201004, - 735 + 20210103, + 1605 ], "deps": [ "company", @@ -13227,8 +13264,8 @@ "dash-functional", "frame-local" ], - "commit": "be37a9a30dc112ab172af21af694e2cb04a74f85", - "sha256": "13fgmdy51gqdwijqfvb784pirx4lgva0y7ysi0c3fcx8f82cdj59" + "commit": "ec8f44674dc10dd4d50785a1f97820b29d392ea2", + "sha256": "1bzmwf6nv10pipaa3934kkly4vyzdc7hcb4r7ygimqxxcx0zvipj" } }, { @@ -13650,15 +13687,15 @@ "repo": "guidoschmidt/company-glsl", "unstable": { "version": [ - 20171015, - 1749 + 20210109, + 1403 ], "deps": [ "company", "glsl-mode" ], - "commit": "a262c12c3bcd0807718c4edcaf2b054e30ef0e26", - "sha256": "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk" + "commit": "3a40501ba831a30a7fd3e8529b20d1305d0454aa", + "sha256": "0khpvi23jbgs2rbwjawl56a219z8r3i44s4zq10an91r0q8d8n4l" } }, { @@ -14350,8 +14387,8 @@ "company", "prescient" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -14747,8 +14784,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20201101, - 1948 + 20210111, + 347 ], "deps": [ "cl-lib", @@ -14757,8 +14794,8 @@ "s", "unicode-escape" ], - "commit": "da18b5e1f01facea1e9588f067ec79dc36e475fc", - "sha256": "0qaq5k5c6nnnk7rhi2n51nj4jgnrjf843p8qafcqbz120ynih1w1" + "commit": "a6edb64cd1087f0453d08a72c3c0169cebcd9f4c", + "sha256": "069zzs80zwxhhnwnvybyvhd0qrwdd60r7ihffn5bmngmxf5nmi8i" } }, { @@ -15263,11 +15300,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20201231, - 1259 + 20210113, + 1 ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" } }, { @@ -15278,15 +15315,15 @@ "repo": "minad/consult", "unstable": { "version": [ - 20201226, - 12 + 20210112, + 1845 ], "deps": [ "consult", "flycheck" ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" } }, { @@ -15297,15 +15334,15 @@ "repo": "minad/consult", "unstable": { "version": [ - 20201230, - 942 + 20210112, + 1916 ], "deps": [ "consult", "selectrum" ], - "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", - "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", + "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" } }, { @@ -15621,14 +15658,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201227, - 1327 + 20210109, + 1641 ], "deps": [ "swiper" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -15643,6 +15680,25 @@ "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" } }, + { + "ename": "counsel-ag-popup", + "commit": "746d624efbf305a07c1eb68990b8bfb249e212fc", + "sha256": "148szhlv9pflf7zhc0ljmbsm32k7z8x03r0jqyypp6gfjbhf3l5w", + "fetcher": "github", + "repo": "gexplorer/counsel-ag-popup", + "unstable": { + "version": [ + 20210112, + 1320 + ], + "deps": [ + "counsel", + "transient" + ], + "commit": "b7179875a2185b7ed2460c71a786413be94bb6f6", + "sha256": "1fmsvznxglx97mwf6x51pnbg2flvivrbb5w2qpp72dlsfhgsa5jp" + } + }, { "ename": "counsel-bbdb", "commit": "0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2", @@ -16660,11 +16716,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20201231, - 1103 + 20210112, + 1407 ], - "commit": "74644d4534beae372f7f05b2464a201383588f59", - "sha256": "0k1zm83w6d6dw2w68d8frpcadacsrar09vv996xrax68i16ggcp5" + "commit": "1de65568b3b98d2a1009df35760149ba571fc694", + "sha256": "0kbcdk9wr4bv8z0jdfglnzh24k08d4mgkh2qwsvna9wdbi2bpqds" }, "stable": { "version": [ @@ -17230,11 +17286,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20190713, - 1339 + 20210111, + 841 ], - "commit": "763531d077d02a4a45c58332b8a8b8300c090678", - "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2" + "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6", + "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j" }, "stable": { "version": [ @@ -17272,8 +17328,8 @@ 20190111, 2150 ], - "commit": "e6f92c1753fd8b07c5beb040fb8be1c4a8b0591c", - "sha256": "1cbq2sigqvqrpllli2qlasm5j96ssx96smjr3pj51i6ndi81gp04" + "commit": "320fa6d73811a3fc240b7ec6494bb13c74bcbbed", + "sha256": "1b86f7b5wqc3smkscs56012ikxsm0svyg0i0q5ahk57drkaaqll0" }, "stable": { "version": [ @@ -17439,8 +17495,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200921, - 723 + 20210101, + 907 ], "deps": [ "company", @@ -17451,8 +17507,8 @@ "lcr", "s" ], - "commit": "e2acbf6dd37818cbf479c9c3503d8a59192e34af", - "sha256": "18w9ifykrcxxjn9pwp3xfyxvx54c0icwsv0n12xfjghfdkph21qq" + "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c", + "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby" }, "stable": { "version": [ @@ -17493,8 +17549,8 @@ "posframe", "s" ], - "commit": "041db8eb7f0ceb9477ffff1730b5940814001158", - "sha256": "0cjr2dhqh8k76il9iiajszr7vra1phhksf0zw946chg7sa12chh1" + "commit": "612388d0b85e77972a9c28391bac6224a63408c7", + "sha256": "1z1vimfwjb5bfqdijh38cii222sw07l2mgbw4bwhwp93kasczw9a" }, "stable": { "version": [ @@ -17747,11 +17803,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20201230, - 348 + 20210111, + 1247 ], - "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", - "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" + "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", + "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" }, "stable": { "version": [ @@ -17820,14 +17876,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20201215, - 40 + 20210103, + 1524 ], "deps": [ "dash" ], - "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", - "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" + "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", + "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" }, "stable": { "version": [ @@ -17850,14 +17906,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20201229, - 426 + 20210104, + 1605 ], "deps": [ "page-break-lines" ], - "commit": "c4283b7be41d5c047dfea4e3e8ca4d03c8f63c12", - "sha256": "0w44lf194smcm8ppgl2nsji246sg8n12mm0jaiqrjnk7rcirivbn" + "commit": "2b1ef13392be2f07d2a52636edf578b89512d501", + "sha256": "0lkx03y592jhac0s4d3vn5iqqsymqqwv7zzx5z0rpcyc46ym370r" }, "stable": { "version": [ @@ -17893,36 +17949,36 @@ }, { "ename": "dashboard-ls", - "commit": "656977197e0030525c52b14de8f6e1faa042daeb", - "sha256": "10dsdzps7kh3v5p5grdjwf2xjr7rvaiqp57fg9vh4pficvhylqaa", + "commit": "c011899d671f33ce6f303693a11c4f37e4c90fe7", + "sha256": "19hps917cys5bvplr9l4zzphhq6k9mpi1c4yjgslygx3svrfsxcf", "fetcher": "github", - "repo": "jcs-elpa/dashboard-ls", + "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20201207, - 1616 + 20210108, + 1857 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "91b3c79aa3af3842f1477825f967370414dc77b2", + "sha256": "0q456m64wkbwxc99bwr8b3n7z2f2qkrbcdij0kji35rg89rxbgph" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "dashboard", "f", "s" ], - "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8", - "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b" + "commit": "86ad7ca7b09e98524de6c64e1fd63f61d41f9177", + "sha256": "052072jk22dz141wsr6wg3wfnvwfaikalhmqc7mpp15iwwg1ppa4" } }, { @@ -18190,15 +18246,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200906, - 233 + 20210112, + 2013 ], "deps": [ "ccc", "cdb" ], - "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13", - "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7" + "commit": "1cd0f65e4e116aaa1dddce98e95ce79911ff85ac", + "sha256": "1w9k8gadkm0l39j8i9n5c3zwsgv1rqi9q3gpx050wn5mv33aryak" } }, { @@ -18524,11 +18580,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20200824, - 1120 + 20210103, + 1812 ], - "commit": "3af6825c5f3bf4f6176a3f5b2e499616c65e2fe0", - "sha256": "1l418w5lhlyh62557ffrsisv7ips0ql7bpcxc32msc51dlh7ilhh" + "commit": "6e4a427503aef096484f88332962c346cdd10847", + "sha256": "1mpsc9cfdl5lzn2yzn63gxvshjl3m2aiwsv12g3qvya2a1xskjj8" }, "stable": { "version": [ @@ -18581,11 +18637,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20200515, - 1513 + 20210101, + 1519 ], - "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", - "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" + "commit": "c4af44827f4257e7619e63abfd22094a29a9ab52", + "sha256": "0xphl5r8q884ml6clrfrzaiqznfrrpsvysakigjqpgazic5d60g2" }, "stable": { "version": [ @@ -19052,14 +19108,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20201220, - 1006 + 20210107, + 220 ], "deps": [ "cl-lib" ], - "commit": "a0028d9d3ef28513b0b2cec145199bf088169563", - "sha256": "0g8gia8wbxyx37302is50i4jp863k23fpb75j4ndrv4k0pj6cr20" + "commit": "89aeb2fc8b24b6c4de4394f85041c5dd5fa60dad", + "sha256": "17mar4w5q6yxqcz9qslnz6vg666l2mmy2fhja7r071x8hj5gla0c" }, "stable": { "version": [ @@ -19327,11 +19383,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20201203, - 545 + 20210109, + 1932 ], - "commit": "360e413f06d0da968af7cbb2a25d97a24765818f", - "sha256": "0fbr5s8zf5na8zsm5vq2ahkyr37azslnssa102mhkf67077lpy4n" + "commit": "8559fb73a2c96755cb30f560be82191164014b43", + "sha256": "0jb5ki27yvzli3yybglhcnkhzpjxv15zy646yaafszq232j1ylnk" }, "stable": { "version": [ @@ -19455,8 +19511,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19467,16 +19523,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190515, - 1210 + 20210110, + 1714 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19602,8 +19658,8 @@ "dired-hacks-utils", "f" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19641,8 +19697,8 @@ "deps": [ "dash" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19792,8 +19848,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19811,8 +19867,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19889,8 +19945,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -19908,8 +19964,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -20004,14 +20060,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200711, - 2031 + 20210109, + 1854 ], "deps": [ "dired-subtree" ], - "commit": "da77919081d9a4e73c2df63542353319381e4f89", - "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h" + "commit": "18986f015c993508af0b1b4e43e11dbd7af98057", + "sha256": "1zla8q26sif8795n5vncwgz2j7c45bh3gnjkwqgpdg4carrw5s60" }, "stable": { "version": [ @@ -20058,15 +20114,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180922, - 1615 + 20210105, + 1127 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", + "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" } }, { @@ -20124,11 +20180,11 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20201229, - 2025 + 20210113, + 1 ], - "commit": "a240c7dee42dad03e0012bb7b6280194e31311ea", - "sha256": "19p6w6c6zrfmkbm5g2yisac8f6d8sjlba88syx5crx2cy02m8y51" + "commit": "887434054c2cfc521ceb990266cc7bbc12c4a72a", + "sha256": "16rwxv2mrn79m8hqg79kq7z6fz2l8amh17kny4y3qnsvakpi0hch" } }, { @@ -21105,11 +21161,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20201208, - 1348 + 20210106, + 235 ], - "commit": "6a56c1cc1713b501040b08fdbf0c4159a4fe95f9", - "sha256": "0l5pj85xpywfl2sgd4rgpvlxphc9alhhwi7ls0pa8wh2nry7ri5b" + "commit": "58b7380189de21496235382900838aa0db2dcf92", + "sha256": "1n3kis5g7m25sl68iw9jw7jkfz7jab82v37xk492d77rr9cbvjwx" }, "stable": { "version": [ @@ -21288,16 +21344,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20201212, - 1823 + 20210107, + 1407 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "af5f61888e7eb0aa521d2d29b42221302b717915", - "sha256": "1d1ad9c321ni6hsvcrc6rhd1vbxd0dhfgvz52cna91alg9nhxwmm" + "commit": "4956606a5455a3968ca10cbdb8de3889e6bd1d85", + "sha256": "1agv0jdfqvyw227mr3c4wnpjby48ccggfjglbidnfl7knd9i982d" }, "stable": { "version": [ @@ -21322,14 +21378,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20201220, - 836 + 20210112, + 2045 ], "deps": [ "cl-lib" ], - "commit": "3761dfce75144e49789b6576e187acd82e2731ee", - "sha256": "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r" + "commit": "58b57ff4d65a94635d901763bb3ff0e956851ba4", + "sha256": "09z5myr8c5rlj81f980zdmn1m9ric0ndnh7pyzz7k0swqq02w79c" }, "stable": { "version": [ @@ -21777,6 +21833,21 @@ "sha256": "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c" } }, + { + "ename": "dtb-mode", + "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", + "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3", + "fetcher": "github", + "repo": "schspa/dtb-mode", + "unstable": { + "version": [ + 20210105, + 1132 + ], + "commit": "7f66de945a0be2be5a26b4619cae097288fb55cd", + "sha256": "1ljmjc0a0ich5wixqq8v0k7gh51va9smq5a340c23zfbia17mmw5" + } + }, { "ename": "dtk", "commit": "39333468fb6e9493deb86511f0032610a412ec8a", @@ -21794,8 +21865,8 @@ "s", "seq" ], - "commit": "282ad6f8eb21b5812521bd9e31d2323b8b9bd9cb", - "sha256": "0yy1jfdh3k0fj7mrl66g6ljp6q77b9xh4xywi80021a15vv1va57" + "commit": "86d1558711cc6e843a1a5470113ff9cb1ad608d8", + "sha256": "03k96gr7hxw76dpykbzjfvrpkl2m1ifm4y0jc9skf2p448fd1ssw" } }, { @@ -21956,8 +22027,8 @@ 20191016, 1241 ], - "commit": "133a6fedc217d9b66329cc8fce45ab0edddef538", - "sha256": "0ixmj378dvi2dh2vy6c47v0zqjkfyr7n5gzcyaplrxsydfwzr2j2" + "commit": "4d53aad7f8b91ec09a7c1691eb5392fa3d077a26", + "sha256": "1ija6kzzfvvx3vvjc7caa9ixf78g5nxb6g9g65y32m8zqdnclh0h" }, "stable": { "version": [ @@ -22628,14 +22699,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20201223, - 2217 + 20210110, + 1450 ], "deps": [ "parsebib" ], - "commit": "f4a36bd7629dd67ec5fdfdf4ea4d087d8e8c986d", - "sha256": "0qsl4qyscd29jkbnkp2acy3ww7lrmhfb60nbpcf03hq8mi3n51rp" + "commit": "a0c1cd12f2a635c89f4ecad1f3ec5701a78ebd00", + "sha256": "03np9b9xkd2h7c6il2a6vvlpcm80vnaf16ryark9cv9wraa5q4d1" }, "stable": { "version": [ @@ -23063,16 +23134,16 @@ 20181016, 1125 ], - "commit": "638c0d92ce7030e799c46aa712bbb3034c342e9c", - "sha256": "1qraxzw37jmzssyz2kcnnhh0l90d3fgw0rimx783ppn1h06844z4" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" }, "stable": { "version": [ 1, - 15 + 16 ], - "commit": "4e959de2f78268b348d2eaac4e43c846792d345f", - "sha256": "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y" + "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", + "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" } }, { @@ -23101,14 +23172,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20201122, - 1542 + 20210112, + 901 ], "deps": [ "cl-lib" ], - "commit": "d73333c224de783e42acd225a20330a667fe5191", - "sha256": "1w6ghpkhdy45aqfw01mzh90s437fx29iw3c9m4p7ish65rmxkqgk" + "commit": "9dd9789b77521eb9d128f9ebd4cfc7ef45072d0f", + "sha256": "1fi3mn16pw7iflhwsnhvdgzyghzgmv1kxdiw4ycnc7rb4q162an5" }, "stable": { "version": [ @@ -23438,8 +23509,8 @@ 20200107, 2333 ], - "commit": "fc939c84a0ca6e8de844edfdcc0aacdfde577c66", - "sha256": "1r10ivaifxp4200vpmayjrnqanz9sp4bykknj5n2rsx078fsbb90" + "commit": "a874f97af30b59daefaf08e1b4b6846b2214d1a5", + "sha256": "1vqllbkiwjcq3y68cbrvh7xq4r4xsm04qh628sbc95l09gwrsk2x" }, "stable": { "version": [ @@ -23459,8 +23530,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20201222, - 1735 + 20210110, + 1646 ], "deps": [ "eldoc", @@ -23469,8 +23540,8 @@ "project", "xref" ], - "commit": "4c85df2b04e467b8ed0eca68bd202fd0e7b671f4", - "sha256": "1ibdxkhqjyzf3dyn0y56xjnp0aialfcbzjnmnjnwzik0m0qgw53p" + "commit": "9da9d69a4296f2f0509c033a0aea263002ae5f4b", + "sha256": "1d5wdf6hyi46csgz4anv5jbgdzp7ys780fd1563lpmi9f0vzbi26" }, "stable": { "version": [ @@ -23589,8 +23660,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20201231, - 101 + 20210102, + 1351 ], "deps": [ "anaphora", @@ -23601,8 +23672,8 @@ "websocket", "with-editor" ], - "commit": "5525b345901f72652bc49e1acb77380ea05ea696", - "sha256": "13hl52xx2x2d1srjgs87x3y0z4jyjjskyqybx64hcggz2flsrali" + "commit": "917f2a0b6ca76ed9e966985ca6f19d8b57690d40", + "sha256": "13ifj42v3sgyf7qbd13cyydy9jprlld16n5m172m06cxnixzrqi6" }, "stable": { "version": [ @@ -24077,8 +24148,8 @@ "repo": "rollacaster/elcontext", "unstable": { "version": [ - 20201129, - 1203 + 20210109, + 1238 ], "deps": [ "f", @@ -24087,8 +24158,8 @@ "osx-location", "uuidgen" ], - "commit": "077d36928993950c01bcdb92102a3d3c18d06bac", - "sha256": "1hj3m3y2an0axwkk75af2bd68sqcqf4j0l8dm6392xy4yipz5cj9" + "commit": "2efd3dd8c5176c4f071bb048be6cb069b05d6e9e", + "sha256": "1xi37jpx8wj2cq6n8la1p4wmqzrwga2ixp6rllbnbhq2fpm9fjsr" } }, { @@ -24344,11 +24415,11 @@ "repo": "justinbarclay/elegant-agenda-mode", "unstable": { "version": [ - 20201118, - 558 + 20210106, + 1753 ], - "commit": "c72f42e0f551c3dd81e68262f07a96c0ec90a589", - "sha256": "0f8qk3vd41ffbkfqw5nks3bld0qpjrlnk9sb46wcbsyfnrs2v082" + "commit": "6a812d7a22d9240cf5f1f40079b20ac6a083935c", + "sha256": "0ashjhghwdksjwbkhhwn0mjfzpvii05kj8wkgp9b9x13ipalqih3" } }, { @@ -24931,8 +25002,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200602, - 500 + 20210106, + 228 ], "deps": [ "dash", @@ -24940,8 +25011,8 @@ "reformatter", "s" ], - "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3", - "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj" + "commit": "706ffb8779c7ace330d6e020bb046e331266586a", + "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc" }, "stable": { "version": [ @@ -25230,20 +25301,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20201119, - 1306 + 20210107, + 219 ], - "commit": "c9d4f69dd0fd7a1be143ef512262d219d7c10eb6", - "sha256": "01gnyan4l04pvvpncpxydramd77v5dxcv8vby4k3lv731qqvp0nv" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" }, "stable": { "version": [ 2, 1, - 2 + 3 ], - "commit": "cdd83ff9965d8df7aaf95e5d7751d2feabbd5493", - "sha256": "0i7ayq9v06l0raw8fw557k159rids9avabbj79yzf6p0daq93xvk" + "commit": "49088c9bcdd66316a133252cf657187c4064488a", + "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" } }, { @@ -25536,8 +25607,8 @@ "dash", "elscreen" ], - "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", - "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" + "commit": "5d7a740e47a56365413d75f4f0553de74f5ca198", + "sha256": "1ypk6jj99pb41mi2cwz7jkrzy15mpd3ir176x52riix6737wmgcm" }, "stable": { "version": [ @@ -25903,17 +25974,17 @@ }, { "ename": "embark", - "commit": "d5174ca91e266dbb9467c962e269ff411bbbfa90", - "sha256": "1dps8p4qrzw2az9ccsgjmz0fwqqgj08qcw1f99n5absb3xmyrnf7", + "commit": "a33cbf1d5cb58d2bb7dc535391bb1e1b0e718261", + "sha256": "1pwcgxgmf1pzq76gi4nhb3pq93v0bv48qnn0djdsxkk1snh3v5ni", "fetcher": "github", "repo": "oantolin/embark", "unstable": { "version": [ - 20201231, - 910 + 20210112, + 2324 ], - "commit": "e9aa0d7a941c1fc31cfd9112f2446701201aceed", - "sha256": "0mac0cawis29lywhrvryaafks0fprc5bx6rwl05kx9ziia0640bk" + "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", + "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" }, "stable": { "version": [ @@ -25924,6 +25995,25 @@ "sha256": "0b1p3pmdy21bix3fh57c2kb5mp0bmrwdc5q9vfdb9pni9sxw3n6v" } }, + { + "ename": "embark-consult", + "commit": "91a9088e0d00483874a6dff4526cdeb6d3f7dba5", + "sha256": "0br3hmr4r3jrkla45byyvxrpv0gxv5lwkk4chiqr1k8j3fbkhwqx", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20210113, + 6 + ], + "deps": [ + "consult", + "embark" + ], + "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", + "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" + } + }, { "ename": "ember-mode", "commit": "9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b", @@ -26076,15 +26166,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20201230, - 2142 + 20210112, + 2108 ], "deps": [ "cl-lib", "seq" ], - "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", - "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" + "commit": "d0142e771a4e9bd0d14f01ff020960759039e4d6", + "sha256": "07pv0pbgpmdlh8pzyni6h4bdajydxi7fdphrliq54pq1y9dx9zpn" }, "stable": { "version": [ @@ -26407,15 +26497,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20201130, - 1116 + 20210108, + 1111 ], "deps": [ "ht", "seq" ], - "commit": "4b96f37f315182f95d4ea9ff33a9b5af9f1b1620", - "sha256": "0xk8yv3icb7cik6qgc8c7v657zyyclbpgyra2djagwj5fnn3266n" + "commit": "cfa00865388809363df3f884b4dd554a5d44f835", + "sha256": "0dw0wkirphwk7iv61b9z5qbg850nnyrivi6d2a80al1nmxkla2sg" }, "stable": { "version": [ @@ -26471,8 +26561,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20200420, - 721 + 20210110, + 1928 ], "deps": [ "cl-lib", @@ -26485,8 +26575,8 @@ "projectile", "s" ], - "commit": "a8f6ab823453decf43f0764d02e554d05009a631", - "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" + "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c", + "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb" }, "stable": { "version": [ @@ -26665,14 +26755,14 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20201114, - 240 + 20210106, + 2359 ], "deps": [ "seq" ], - "commit": "18caf5154f61d7f78cd4719d999e0fa6ef52345f", - "sha256": "09ww340nnnsqxkxr68rnd2h9lyi4sdngry30d57ps4g1p3phdfxd" + "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", + "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" }, "stable": { "version": [ @@ -26780,14 +26870,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20201219, - 1947 + 20210105, + 1456 ], "deps": [ "closql" ], - "commit": "f721e3801cf92ea4265d645ac077365dc5c49d41", - "sha256": "167ghzv772i0x8ndldgsagpqkkr768dcm83ajagkppaw7rgkvg0r" + "commit": "94c8389a8b660a68ae7e5458583b06b30ba0edb9", + "sha256": "0r2lvcrs34ixk5xx81b20m0s8x795l7plmry394lgh28gwr437jj" }, "stable": { "version": [ @@ -27421,8 +27511,8 @@ 20200914, 644 ], - "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", - "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" + "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", + "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" }, "stable": { "version": [ @@ -27446,8 +27536,8 @@ 20201215, 830 ], - "commit": "e0e9d8bad472fa94f4919e6db798e45913dc9eec", - "sha256": "0pbj8hafvzg5ydrhf6q3knir5gv265x815amx4vrz0y740w1pzab" + "commit": "9072e6f7135d9c38e12cfca742e3312b572a2330", + "sha256": "1qr0sz0yd5zgzh0gyx238s8rs1j7fcl6dbx9kcqfv9awbsgjil7k" }, "stable": { "version": [ @@ -28293,11 +28383,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20201230, - 1711 + 20210109, + 1455 ], - "commit": "161db4922680b3d3e21acb858b4b1ef38a6b0b1d", - "sha256": "0q055pw86jqpfr8lkn0f7rlrdx928i1iq1xcycin16lc52fhsjw6" + "commit": "a9e9367976658391126c907b6a5dfc8ad3033ebd", + "sha256": "076aizfh62z85wdqpiir75jc5qvl9n66mhdvfkjaqzlzlisrhqax" }, "stable": { "version": [ @@ -28538,6 +28628,24 @@ "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z" } }, + { + "ename": "eta", + "commit": "6566b2cf5be53047db6d076d47f29932ba589d09", + "sha256": "06xfkcnjq5w56vbxaq23lqhw2fl2gx2b0wj8ddvii3q3c432y4hq", + "fetcher": "github", + "repo": "zcaudate/eta", + "unstable": { + "version": [ + 20210103, + 645 + ], + "deps": [ + "ht" + ], + "commit": "850c3aff1d7999348aea30530e722e561b672f9c", + "sha256": "1ridnn2b1sp8rp3z9x3igavaq40d66chq25lhfimb6yw84544l0b" + } + }, { "ename": "etable", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", @@ -28857,15 +28965,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20201107, - 1830 + 20210109, + 807 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -29059,15 +29167,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20201227, - 1057 + 20210112, + 956 ], "deps": [ "annalist", "evil" ], - "commit": "16e14ea9c58aa1224c09d02e40ad3edde72c820a", - "sha256": "1k4lk23yzs0qz6fds5d6brabsh6k9dma4jr4adxhpm4i20b0sv8j" + "commit": "8b1bcd7e49c3fb4ae047d65e22e652a2fb65fa3a", + "sha256": "1jymnkaby6860llr8d2vcyncr073pa12idgskzcvvf8ajxdi8gnl" }, "stable": { "version": [ @@ -29657,14 +29765,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20201216, - 114 + 20210110, + 1011 ], "deps": [ "evil" ], - "commit": "0fd65c463b991e81c6775147385badfafade52e7", - "sha256": "1l572lq6ys9v7yl51p7j3ryas2738imk2hdcbw6sf62q6yvcv1ih" + "commit": "9cdaddd55d28b50d1319baee8038972796e8b178", + "sha256": "15j6li3fnj4q6l54c6r31ng3hrcb703c06c3wk5w4spc4nsgzfvc" }, "stable": { "version": [ @@ -30414,8 +30522,8 @@ "deps": [ "evil" ], - "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758", - "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b" + "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", + "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" }, "stable": { "version": [ @@ -31492,8 +31600,8 @@ 20200327, 1810 ], - "commit": "7a585de01b6fee081eaa167b09d7e12d02cf4149", - "sha256": "11v8rbaiaihpky1m7azbflz77mwg76nbg8hsgybs86wyjk5797dv" + "commit": "d7e517f8e626035df3b63ec6fc07b85d48a996c5", + "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" }, "stable": { "version": [ @@ -31685,19 +31793,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20201227, - 2240 + 20210108, + 1527 ], - "commit": "37f396ec57c28249af3fb10d84231afb44581df8", - "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" }, "stable": { "version": [ 2, - 15 + 16 ], - "commit": "37f396ec57c28249af3fb10d84231afb44581df8", - "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" + "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", + "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" } }, { @@ -31846,11 +31954,11 @@ "url": "https://framagit.org/steckerhalter/emacs-fasd.git", "unstable": { "version": [ - 20201226, - 923 + 20210104, + 738 ], - "commit": "c4c04873fd0c8e916186f38a75cd4ab7f8b7ad59", - "sha256": "1vh5aaljjal62jv3pdl64jkzwszv1hxk7f3lrm873lr84785pc41" + "commit": "c1d92553f33ebb018135c698db1a6d7f86731a26", + "sha256": "16if5pp2y5nxp37gl29l206dmika75fs2znfpks98iv9zwxpps2w" } }, { @@ -32459,26 +32567,20 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20201217, - 527 + 20210112, + 532 ], - "deps": [ - "ivy" - ], - "commit": "f2f537476bb3579dcdf0587dfd2bac034cc5e719", - "sha256": "1zdc73w3649xrm902ah8vr2x8xbk17cacpspif3hrbabqpaihvh9" + "commit": "c4c7ec595c54c3006299717b1fd83e357864b2d5", + "sha256": "0mhp70h7n6h5s4dls5pslp45xxlrg6bbs7hkpbl3p1jhxx414fwr" }, "stable": { "version": [ - 5, - 7, - 13 + 6, + 0, + 0 ], - "deps": [ - "ivy" - ], - "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a", - "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x" + "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d", + "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6" } }, { @@ -32791,11 +32893,11 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200701, - 2239 + 20210112, + 2246 ], - "commit": "a87341d4fb2077076eb83af0fb510112900aaebe", - "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x" + "commit": "3f93650a8e8899114ea48048b7962210f1024862", + "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al" }, "stable": { "version": [ @@ -34363,31 +34465,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", - "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", + "commit": "2e7aee5074faedef4f2b989ffe05995b2f73bfbb", + "sha256": "031x2yh3wdklsm169h34sg0bzpl36nfms129zj4j0z99gw1kda3z", "fetcher": "git", - "url": "https://git.deparis.io/flycheck-grammalecte/", + "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20200515, - 1120 + 20210106, + 1422 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "flycheck" ], - "commit": "8608df3144714d79b93afcfe13400693ed763ed8", - "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" + "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", + "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" } }, { @@ -36804,11 +36906,11 @@ "repo": "jojojames/flymake-racket", "unstable": { "version": [ - 20180912, - 109 + 20210105, + 606 ], - "commit": "d20fa60d66db3f7c2df0133814564ee5b36d2aba", - "sha256": "0fdrlzvznpqfyzy6v7rz4cj83fhdcpyhy37l7jjbb91cqqk2hjc2" + "commit": "3d3e5f2a9ab696670f9e52baa4dde7b84b7542df", + "sha256": "0p935dr74m73w2qs65a2x6chw2zrjq903vdwpmvq3pn2dk4djdf0" } }, { @@ -37642,8 +37744,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20201229, - 939 + 20210112, + 1148 ], "deps": [ "closql", @@ -37655,8 +37757,8 @@ "markdown-mode", "transient" ], - "commit": "c4ae0f2bdd3ecd3dacb303bd7687ecb111af8c9b", - "sha256": "17fwrcaq61qi0067nfs266dbn193lkf47630mf6bdsi2h3d2fxr6" + "commit": "47be4eebfa34f87e502aad30f59907ad09552979", + "sha256": "0fbj6css456abzslr09vxr46xikxydjh78kmd0kqfidsp1rx6xsj" }, "stable": { "version": [ @@ -37711,14 +37813,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20201230, - 2354 + 20210107, + 1425 ], "deps": [ "language-id" ], - "commit": "f51cca79d89f27c65e43f4e4cae2fbec6098304b", - "sha256": "0ix0p3bwp2slcqp7v8lbjr9a2jp1xj3firvvssldiy0d2bfykya4" + "commit": "05bd6d0b4aa3d8b22291de5827da64b7be155590", + "sha256": "0fgc0kj9zb0f08i2mcm8ny9f8cqlk9v8185qmc6wmq1i7kaczsvr" }, "stable": { "version": [ @@ -38380,16 +38482,15 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20201208, - 1852 + 20210106, + 1632 ], "deps": [ - "dash", "eglot", "s" ], - "commit": "848ab1578658b97844e671e4f6dbdbd0f67a52ca", - "sha256": "08nyxyxag86nv6cbj9kmyh28kb52h6wf2l1w5qlq9pb00d5ck7h0" + "commit": "e3dccd65a16a1675722b1eed7aca1a729a2fc8ed", + "sha256": "1wyc3lzvjl01cy18cyzq1xms4kid9iqkm31fxrv87awmzpxsvqi5" }, "stable": { "version": [ @@ -38455,8 +38556,8 @@ "deps": [ "cl-lib" ], - "commit": "aa4babe4f25d218fb4f50ac7b804cbde83e5fb4c", - "sha256": "183kbv6i23zh8dqha4l9crzgx0p5g5vc71d2kkfcpnxh83l3dhmm" + "commit": "71ac38692ace9b90c27f214943e8e77542459b12", + "sha256": "14vcdvzn8pl15zcga925ldbvk7wl6bl6fvl9vd8gmhn6lcgl9b2b" }, "stable": { "version": [ @@ -38790,11 +38891,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20201201, - 1842 + 20210101, + 1358 ], - "commit": "5d776acca230d781ba7647185b730c686622f876", - "sha256": "0rikrpvgnj1zlcr1fgcmi5xqmhr5xsdpphnqp947jr47q70v0qxx" + "commit": "c84beb96b959c0a20d70dad3bb9e3bc275a5b001", + "sha256": "1qb49qw0lyb2v3yn4jzq8fyq45akrl4078kg2q38g3gh9n29wf52" }, "stable": { "version": [ @@ -38954,11 +39055,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20201026, - 1319 + 20210104, + 1919 ], - "commit": "20fc7e438170b8a2e03378956c1a501fbc49aee4", - "sha256": "16k4vdmip6fmz51070w2vz9dqbh1vlsiwq0a7wikmgzz7yv8micd" + "commit": "b53d56e467a77dfd6c26eec5b78e2241083b1408", + "sha256": "120yjlwf8pyrv5n0bdzxnr2lbppwgir4l8c128jq0cx3mbfamjlz" }, "stable": { "version": [ @@ -39055,11 +39156,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20201202, - 1922 + 20210103, + 953 ], - "commit": "cd00be69b26e6fd748b183d127d8b6f4c91ba622", - "sha256": "0zxaayww9h3alc1h5zlpan28wgva561b4rlb8xk6s6gznpkc3gsp" + "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950", + "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3" }, "stable": { "version": [ @@ -39916,16 +40017,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201222, - 1527 + 20210102, + 1242 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", - "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -39949,8 +40050,8 @@ "repo": "emacs-stuff/git-commit-insert-issue", "unstable": { "version": [ - 20201230, - 1721 + 20210107, + 2018 ], "deps": [ "bitbucket", @@ -39958,8 +40059,8 @@ "projectile", "s" ], - "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", - "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" + "commit": "6cfb8b4b5b23ae881cf3d005da4d7f60d91cd2cd", + "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr" }, "stable": { "version": [ @@ -40018,11 +40119,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20201203, - 500 + 20210109, + 640 ], - "commit": "56308dc1a1196583791cb24aa86b2669d343b9f3", - "sha256": "1yad6pyskc28hcva9v9v7d6lxp2dg3j0zvmp9pv2qs1105l590ic" + "commit": "5c2ae01562b3ff2def870ed822fd0869326977d6", + "sha256": "0bf12nfyhpvdbxajbwna2z19ii42ih8h4p8jrvgqvh0r3lhavdiw" }, "stable": { "version": [ @@ -40511,15 +40612,15 @@ "repo": "dgtized/github-clone.el", "unstable": { "version": [ - 20160623, - 310 + 20210108, + 1920 ], "deps": [ "gh", "magit" ], - "commit": "467b40ca60a6c26257466ebc43c74414df7f19cc", - "sha256": "1gdx9sl509vn4bagqg8vi1wvj1h3ryfvd5ggs2mv9rry6x9dg823" + "commit": "9e40d6d3c6128407d7456bf71c95ad1fbb473b2a", + "sha256": "12mk8cl1mpfapdgxwcm6rlyfg9yyk2wk8hv2486hqb6qb77kdg9i" }, "stable": { "version": [ @@ -41348,20 +41449,20 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20201223, - 2347 + 20210104, + 1052 ], - "commit": "df47e871f7fc2f2c53bfed96e5a315281806396d", - "sha256": "1lkkx5ir095ffbdwkvj036x7z0ypxhxd60y3r2y7jq6986mzllka" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "aefd4f671485fbcea42511ce79a7a60e5e0110a3", - "sha256": "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn" + "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", + "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" } }, { @@ -41431,8 +41532,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20201225, - 1617 + 20210103, + 2050 ], "deps": [ "async", @@ -41443,14 +41544,14 @@ "org", "s" ], - "commit": "08687b98403cc165d7d62ceea9d50480f12e7bfb", - "sha256": "07fl52djky3v3gigjdzsi79rlq9ddpiarrmzsbdp0wadp524d4n7" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "async", @@ -41461,8 +41562,8 @@ "org", "s" ], - "commit": "f34e5fc1077e2558e5059876d0a22b35331f7b93", - "sha256": "0nc1chp5h495v3bpbmi00f2wahr9c9p4y7gn6rdr1xx0gnl6v2gk" + "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", + "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" } }, { @@ -41473,20 +41574,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20200513, - 1038 + 20210107, + 1346 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", - "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" + "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", + "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" } }, { @@ -42264,20 +42365,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20201216, - 2023 + 20210102, + 515 ], - "commit": "f6eb3428e6a17a97e6e9f0783ce17ced004b98c3", - "sha256": "0qjsyp488qqjn6vwzxy23aywhv8ckx797l2zah70d23zrf79qmxc" + "commit": "02a402b2323e025f77e89cf56d5e678e31a2d2f6", + "sha256": "07xxj1wqxjvzlqp41xj9jz1jfbb8h4578xmbfaqi4isljbadj04k" }, "stable": { "version": [ 2, 17, - 2 + 3 ], - "commit": "2e519312fdef36dea523aa530d134a703d3032a6", - "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl" + "commit": "a72feb2fe8b1a8993c472995d83d9c4718f7a7c1", + "sha256": "1wsc04l5j5a9y5439qx85pcchxjnjgcgwbffw3l30q9zlblvc58b" } }, { @@ -42312,11 +42413,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20201221, - 1418 + 20210102, + 1843 ], - "commit": "d6e584a2c9487d3df4aee818c43485e437cb87ef", - "sha256": "1mi5cnii7zbhzq6pyfaxsfixhilqmmx6v5milmkzwx6mwxxgjv87" + "commit": "b85915517d3326ca08af5768df75f0be21c7acc3", + "sha256": "13xrwv2wgmblrdcm656rly3xmlh6wmbwv592vjfrmvchrx39np26" } }, { @@ -42441,6 +42542,30 @@ "sha256": "1f3y46q7djr1riz7x26gc7a1gf9p8sfdrnlqyiwzmi9vkk6h8wdz" } }, + { + "ename": "good-scroll", + "commit": "f51029dd5dbfdcd70befae42e1706a309f642996", + "sha256": "1d0f5v0566n8k3vmh6ddbif6cmii8dk6nszkqjx5za09jilndnc9", + "fetcher": "github", + "repo": "io12/good-scroll.el", + "unstable": { + "version": [ + 20210105, + 903 + ], + "commit": "beac144c37227d23e5ceefb8ce1f45aa484ca5c9", + "sha256": "1yv07vpgqla7nk0imn7dlzsv392jvhk3w63frvhcmijq5ciafc45" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd", + "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6" + } + }, { "ename": "google", "commit": "45237d37da807559498bb958184e05109f880070", @@ -42548,8 +42673,8 @@ 20200809, 1430 ], - "commit": "0270073331de9358f29d049a27aa9145697d6dc7", - "sha256": "12nhl3h0f1kmv7ak9lh0p96k0f2284k20ilwn3ail7p2kpp8affk" + "commit": "6f7b75b2aa1ff4e50b6f1579cafddafae5705dbd", + "sha256": "1mcmv1p879nbbhwcimya5licq1mq0wkw5dgil7kqwicz5zzb8p2g" }, "stable": { "version": [ @@ -42827,8 +42952,8 @@ "magit-popup", "s" ], - "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", - "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" + "commit": "50c576d6470e7ab9803ceb466ac34f936971dfc1", + "sha256": "0sria01kapgrxh0jpbgkhr9cr15nji09z1pk4fi650ckipr9alcw" }, "stable": { "version": [ @@ -43575,11 +43700,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20201225, - 638 + 20210112, + 935 ], - "commit": "5f1cffb6d5970988c49b89f29bfaf308f7dd8834", - "sha256": "09hn4ilvhh10sc1dypj1gpcyz07nli5lpbiazsx2gw61y2fgrc40" + "commit": "1911cecb0a48e653ed3c99d58a25266f01189722", + "sha256": "1a3pgzj943i0px7lc2qmsm3irybdl664xwvlcjx5axf16pdvlspl" }, "stable": { "version": [ @@ -43631,14 +43756,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20201224, - 554 + 20210105, + 1136 ], "deps": [ "autothemer" ], - "commit": "46de195e194ebbd21a925c33db9d498c30c342af", - "sha256": "0xyysxn31xsbckxixi6cmz3yrws86cqycd5f9p06p2ahqh8xahxs" + "commit": "0013c68458ae62fe1dc4bbbb23f6a54a9d41e398", + "sha256": "197r166c4pj0kc2v65rip93pcmmnm4li2jvagvajblang1svr2v0" }, "stable": { "version": [ @@ -44592,8 +44717,8 @@ 20181110, 1859 ], - "commit": "c12337a13ec3a1f04400d0ea51e6120ebe79efb9", - "sha256": "0nk7wm8ns721smbyr7wqxp3s4wbpwg594rcy79ai3fkfy1lb6k4y" + "commit": "f33ba22a6e5060fb14c9fd3dda728d6724f2f9dd", + "sha256": "1lmr8j2g7v3jn2q9h65c7qhzzk4asz0mlqarnl2h0g7xjk0wmi6z" } }, { @@ -44703,11 +44828,11 @@ "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20201018, - 1357 + 20210108, + 1835 ], - "commit": "5e8183a275babdc7604ae01fc94853e60cb04a32", - "sha256": "0141xzgvv1xzlsaxls4qy9dzl57g1qy5r02x4qydq1p417r30pqc" + "commit": "fb3f3c9514e652f8955a67baeae13de264996860", + "sha256": "05kaxcazbr51chcmlx0fscwk32blj3lzndkr0qpbwfrn8n6mcmrg" }, "stable": { "version": [ @@ -44846,16 +44971,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201228, - 517 + 20210111, + 2036 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "830f03683d99a1e771277cac6f2a1110b8936334", - "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" + "commit": "77e5a433bfef84992c35f34de8211f84af536a10", + "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" }, "stable": { "version": [ @@ -45168,8 +45293,8 @@ "cl-lib", "helm" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -45774,14 +45899,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201225, - 1456 + 20210105, + 504 ], "deps": [ "async" ], - "commit": "830f03683d99a1e771277cac6f2a1110b8936334", - "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" + "commit": "77e5a433bfef84992c35f34de8211f84af536a10", + "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" }, "stable": { "version": [ @@ -47646,14 +47771,14 @@ "repo": "istib/helm-mode-manager", "unstable": { "version": [ - 20151124, - 938 + 20210108, + 2330 ], "deps": [ "helm" ], - "commit": "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc", - "sha256": "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh" + "commit": "7df8ed3ddd46a0402838b748d317c01454346164", + "sha256": "0j1mlqdqii6vpp748ydvcs0fxlwkrwf5bsbys8h34rjhb7x75dq4" }, "stable": { "version": [ @@ -47709,14 +47834,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20200823, - 1534 + 20210104, + 1214 ], "deps": [ "helm" ], - "commit": "c02bba3c6e52e623951781c98a1cf2ce923439e6", - "sha256": "0i9k03x6gnwfsf3r7m3yhmgf3y9hnc895mv5x4zdv1jazr4gc8gf" + "commit": "392a8c11ab27b625d9f863cdde14e09893401b15", + "sha256": "1l7l75g6sg8fhsd98pfc5qw6w05qq08ilvy6bpaxfz50g81saypg" } }, { @@ -47871,8 +47996,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201203, - 847 + 20210111, + 1022 ], "deps": [ "dash", @@ -47881,8 +48006,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", - "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -48788,14 +48913,14 @@ }, { "ename": "helm-searcher", - "commit": "aafea99e6091ada48708db7a42ffe13effa17a41", - "sha256": "063453h22811inn55z09kfz5a42lzjw3mv41ghwypnqgy0lnjs0r", + "commit": "9ff049623a64ceba2299f43babaede205ccdd67a", + "sha256": "06nhvkf1k7mrbdxliikn5q8kp6nw77zn2f1xifpzp2c6mwxm4idg", "fetcher": "github", - "repo": "jcs-elpa/helm-searcher", + "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20201001, - 838 + 20210108, + 1818 ], "deps": [ "f", @@ -48803,8 +48928,8 @@ "s", "searcher" ], - "commit": "7b3016faeca201843d849c00d11665a90c1709fb", - "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p" + "commit": "d27c7cafc79b6e5e11881014eee9817e3897762f", + "sha256": "117m2c8ms66gqwsxgdwywx166bif2i2y5dgq1w0yw5j4h02q3ji7" }, "stable": { "version": [ @@ -49082,15 +49207,14 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20200831, - 1329 + 20210106, + 1810 ], "deps": [ - "dash", "helm" ], - "commit": "e9927561cfc62c8427e9d10526518d643f4bc26d", - "sha256": "1l4irigdirvbn1xh0py135q5463z8axdh0y0icvzinn7z1z0141j" + "commit": "9de26ca41e94c095c978ed920009de0280f5c4ec", + "sha256": "190bmn04g4nlcrpnsm465vyp0zcd2ryh13bc14f7w1vrmnw6ll1j" } }, { @@ -50133,23 +50257,26 @@ "repo": "tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20200920, - 832 + 20210104, + 1625 + ], + "deps": [ + "cl-lib" + ], + "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02", + "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0" + }, + "stable": { + "version": [ + 2, + 0, + 0 ], "deps": [ "cl-lib" ], "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "5aa800a68e3795716de1e7f2722e836781190f31", - "sha256": "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9" } }, { @@ -50572,11 +50699,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20200813, - 1419 + 20210105, + 744 ], - "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9", - "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal" + "commit": "9661a462d86b22293caaa4c3d94f971a15dbf1d5", + "sha256": "0w0l990wqdv9fdxf8a02fx0aj6ffp83jp3zh81jf3j5i0l75xfkr" }, "stable": { "version": [ @@ -51319,11 +51446,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20201211, - 1320 + 20210106, + 2120 ], - "commit": "5a2638b95f93ededa625187dee76946a60e7b9d4", - "sha256": "063vrr73zsvvfcsda5z8b7hpkhql2smbi40dp10nqsyih26f6ahh" + "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3", + "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr" } }, { @@ -51437,11 +51564,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20201213, - 1504 + 20210107, + 1435 ], - "commit": "4c7a3813bc3fb8753de9edbc1d6296428d3a2601", - "sha256": "13lx5ghi939xx47d3plpznhrs4qlzsgicp8rcvm47li04j56db9h" + "commit": "30072ccf0a49bb47360dce12965db1b1e2f2b57d", + "sha256": "16p7k3lwlykpgrc2pkbdx7z209bzps9ksizjhgbcfbkn67xpavka" } }, { @@ -51873,11 +52000,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20201213, - 2230 + 20210105, + 500 ], - "commit": "a4c65f213bd3d8be94fe8cb28ecf7ff3b44405d1", - "sha256": "02v190pb802vck7di39jyf5prvmfsgcxln8mgwsls2b4clx9da97" + "commit": "288166784de29db2f5f61722cc11151deca3f34a", + "sha256": "0if14qqixkkg8nfikfzhqqnsclhkbx4n8885gm9w0zlibkcj65pk" }, "stable": { "version": [ @@ -52106,16 +52233,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200520, - 1535 + 20210103, + 1621 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "b9ca2566b867464c25b720e2148d240961c110e7", - "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5" + "commit": "f91e5a1d696c13db029fd62806fe9bcb9702be26", + "sha256": "0yhl6wa3fkvkfx87vhjl8dhn3igzrilby2vxhllgysb5kbd9adzc" }, "stable": { "version": [ @@ -52480,11 +52607,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20201125, - 342 + 20210111, + 1147 ], - "commit": "313997a2504e565a34e84fdb59a5a7ffd223328b", - "sha256": "08gaz5ia70hg66a4i4gdyhnaggpf7m39gqilbx88dy9ccg4lywa0" + "commit": "6eb7ff8191b1d271b6f4e7feb608dc72ca203a39", + "sha256": "158fhgvrgm5q1krsc7cssj0ylzkyjrvivpwpdymb45d0x9msin61" }, "stable": { "version": [ @@ -52543,11 +52670,11 @@ "repo": "rolandwalker/ignoramus", "unstable": { "version": [ - 20160414, - 1409 + 20210108, + 2026 ], - "commit": "b37dc7c07edd9d152436f9019c14df158b599be3", - "sha256": "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj" + "commit": "6a6578816ff7af8851f7db36b3465fa9d2c759c5", + "sha256": "04cl5y3ba8bip7fkz8dsxx5m7dc97qx6214fgxj16i0kyxpwfnbl" }, "stable": { "version": [ @@ -52880,20 +53007,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20201202, - 1801 + 20210109, + 1653 ], - "commit": "d965b9b29e1ade16aa92b934ac888616409a95c5", - "sha256": "1s72wj88rannk0byz3689yff3wks4k80xcxkcmh1c4gja6zbj99r" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" }, "stable": { "version": [ 0, - 6, - 2 + 7, + 0 ], - "commit": "fe8875f116cead5bff6befb6c77a6ebb6f20a490", - "sha256": "0gpy8pvaw66pvas1j1f74aa6fyxm1z43kqlan297l4jviw4rh4gs" + "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", + "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" } }, { @@ -53117,20 +53244,20 @@ "repo": "terlar/indent-info.el", "unstable": { "version": [ - 20200128, - 1052 + 20210111, + 745 ], - "commit": "9548f14e7f0f7220d6cd1b8e88756b89fc57c471", - "sha256": "1hmrg1pyzcldqh858j3zpb6y0ap4x6142m56pas0lyh65d2wzggk" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" }, "stable": { "version": [ + 1, 0, - 2, 0 ], - "commit": "4713807101bff80b342d0f847da9006be001141b", - "sha256": "0sprs5qgrbvgxd6k8h8fyybxdxfd3izhvk1bh13vg238qbn09a26" + "commit": "05a787afeb9946714d8b0c724868195a678db49e", + "sha256": "14qjl5mw7zmrc2zbcid1alqh67f704giq49qyda8q8n82vi6g8a9" } }, { @@ -53379,14 +53506,14 @@ "repo": "eschulte/jump.el", "unstable": { "version": [ - 20170913, - 916 + 20210110, + 2237 ], "deps": [ "cl-lib" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -53681,11 +53808,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20201103, - 139 + 20210109, + 1112 ], - "commit": "fb5839ae7307a56a7f4d7ba71d05c9ecc051927e", - "sha256": "1qxmzdhyhh71yivdix1qg4d4wkv7rzfljby03bliv46165i2xsms" + "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b", + "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr" } }, { @@ -54359,11 +54486,11 @@ "repo": "ffevotte/isend-mode.el", "unstable": { "version": [ - 20190201, - 832 + 20210106, + 1506 ], - "commit": "38ace354d579eb364d4f95b9ea16081c171ea604", - "sha256": "19k09bxlq5a8ba3xb68cajv66qad5vh12k391kq9wcj4gjlniyjv" + "commit": "ea855f63be7febc15bd08aec6229fab9407734fb", + "sha256": "0avxwa6d19i5fns27vwpl95f5iawm710jlnrihi5i21ndfm4mcyw" } }, { @@ -54521,14 +54648,14 @@ "repo": "thierryvolpiatto/iterator", "unstable": { "version": [ - 20170207, - 838 + 20210109, + 1859 ], "deps": [ "cl-lib" ], - "commit": "9da54f9aed945b46866782cdf962c9e530419297", - "sha256": "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw" + "commit": "b514d4d1d0167e5973afbc93a34070d1aa967d82", + "sha256": "1xl64lz45z4s90ja96wy86qyr0xahk96v5rdvbamnfgw32kkxyh5" } }, { @@ -54576,11 +54703,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201218, - 1222 + 20210109, + 1619 ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -54607,8 +54734,8 @@ "avy", "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" } }, { @@ -54627,8 +54754,8 @@ "cl-lib", "swiper" ], - "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", - "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" + "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", + "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" }, "stable": { "version": [ @@ -54962,8 +55089,8 @@ "hydra", "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -55168,8 +55295,8 @@ "ivy", "prescient" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -57275,8 +57402,8 @@ "findr", "inflections" ], - "commit": "e4f1372cf22e811faca52fc86bdd5d817498a4d8", - "sha256": "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -57615,8 +57742,8 @@ "deps": [ "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57635,8 +57762,8 @@ "kaleidoscope", "s" ], - "commit": "52b5be3277f65cb5ca657973e9bd7f914b996356", - "sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf" + "commit": "af4034dcace867c4ede0bce744d5cb888c318f23", + "sha256": "1f352ki7yj1z5y2xpbmwi5f8nim208nbg94760hzwkjkk7rd71k2" } }, { @@ -57855,20 +57982,20 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20200928, - 2106 + 20210110, + 630 ], - "commit": "f3d19b4deb14053785e660f1995994581536aecc", - "sha256": "1krxcsvqf9f4mi34kn2zgf82z1cai133sgpfa70f5wczqibhfg99" + "commit": "515343a7667b2bf4253309449f65a6eb94933df7", + "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" }, "stable": { "version": [ 0, 0, - 2 + 4 ], - "commit": "ad073eaab4f96ca033df023736d195dc3b611897", - "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" + "commit": "cd07542fddf080927eae927afdcf62be1b087503", + "sha256": "1syz5yds6b59dws6f8b6az2ng7czwnq34izlc9y25c8ng94bynm5" } }, { @@ -58498,8 +58625,8 @@ 20180702, 2029 ], - "commit": "e205c97ebd8e3cf4d432bc6e1a7e028ebe70f7d9", - "sha256": "1m171sjcckxca2fdcy32s5m488931dsmfbj81j9c7g92v8bw72hb" + "commit": "554e98fb7c439d182a48dce7276932139a325f02", + "sha256": "1afw0ak9wbf63d23sfp78a9ial4vscw002p0b47rlsq895j683cb" }, "stable": { "version": [ @@ -58519,14 +58646,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20201231, - 209 + 20210105, + 1152 ], "deps": [ "request" ], - "commit": "1ea9239189d8c8687375f877e2b4966616001d6f", - "sha256": "0p72yl0h24j8snl630hyn7jqzqh7r1dqfiym6f2p5r0rlwwrrvq9" + "commit": "6c64f7b0776d346561bc887042a6cc5053b723f1", + "sha256": "03b94jzmw12q71j8nv09nk9g00asc0a2g2sj2x534syifhksb9dr" }, "stable": { "version": [ @@ -59080,16 +59207,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20201230, - 859 + 20210108, + 1551 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "5ca13281fc98741bddef6b500bbce34a0f7f44b6", - "sha256": "0qd2nyx7zjxw06qd885zlqghqg9d1pcm2yabiv3743akflpgcs6p" + "commit": "038bc694d45d5069cf3488682928d2315f0b0d17", + "sha256": "081sik013p310idnnv60qa5pm1qpk61ibqhchsvindp5ssw7ln8w" } }, { @@ -59501,8 +59628,8 @@ "deps": [ "colorless-themes" ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -59548,14 +59675,14 @@ "repo": "jyp/lcr", "unstable": { "version": [ - 20180902, - 1919 + 20210102, + 853 ], "deps": [ "dash" ], - "commit": "c14f40692292d59156c7632dbdd2867c086aa75f", - "sha256": "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8" + "commit": "493424dab9f374c5521dca8714481b70cb3c3cfd", + "sha256": "10nvxvyz39avlf2v8d4lag7jj5x5p8jvaqiww7x6l992mp11hahk" }, "stable": { "version": [ @@ -59789,14 +59916,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20200522, - 853 + 20210108, + 728 ], "deps": [ "ledger-mode" ], - "commit": "027a6caf173948feacd2f416a7995d82f82165e7", - "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf" + "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f", + "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb" }, "stable": { "version": [ @@ -59819,11 +59946,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20201226, - 1721 + 20210106, + 227 ], - "commit": "9c418079c244bc984f01b48e2bf360ed764d3261", - "sha256": "1zwmkm6s52dh1vb0d6r845j160i98v2p002iwwhwk28m2v5adbj1" + "commit": "bcd8cefb720702db88986a52bb66e08e2e451c05", + "sha256": "1l2lhz45lc7njdv3kl5g8z5ig6vykxlp446raaif14k2flhw24a0" }, "stable": { "version": [ @@ -60113,8 +60240,8 @@ 20201007, 2214 ], - "commit": "75a30e55501ffc70712bc8176fe47eaf9ca1dbe6", - "sha256": "04ah4ps11lsmclisx2rfbgayznlw0c2blpdvy13b5c8ii7bqjccb" + "commit": "e5f20c459a13b35ed1e71b1d2667363af168e958", + "sha256": "0fapq9b14lxx5qm55yhcj2f1ym0kfrh6796ffb2i032bprh8n3m6" }, "stable": { "version": [ @@ -60247,11 +60374,11 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20201026, - 1122 + 20210107, + 950 ], - "commit": "e26060d2139841ef206704e7e0d2f9fa06a1884b", - "sha256": "0i48sdhrx1nqnca1kk1iaghb6b3nsxshs6bdd0zfs03b425hhlsv" + "commit": "9162a4b350c978f94dde6f75d60bc6a17e1dc18e", + "sha256": "0w45g4pkjsggv5yqw0zsnwqvzljapfvhxzf0vhnrqc446ys9jzp3" }, "stable": { "version": [ @@ -60835,11 +60962,11 @@ "repo": "rolandwalker/list-utils", "unstable": { "version": [ - 20200502, - 1309 + 20210111, + 1522 ], - "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82", - "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" + "commit": "ca9654cd1418e874c876c6b3b7d4cd8339bfde77", + "sha256": "0pkkfjjpak8xxbzr2xl5ah3isrn0bm8d7zfhrmhivpzpkhgdzvfx" }, "stable": { "version": [ @@ -61126,20 +61253,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20201229, - 139 + 20210101, + 1827 ], - "commit": "40a5c9cef3ecae289fef73d76d0e3fd006051a21", - "sha256": "0dafnxqfhxmq4fkrxwalixxb0cmd3mgvx49jwvnmdcaghwxgr1jv" + "commit": "d489fafd824d3fbd26fadb7b60dd2533d32478a9", + "sha256": "13m65xvh172rs7pc4yshz41289h93fz4isrpracy2zi409ji3h37" }, "stable": { "version": [ 4, - 2, + 3, 0 ], - "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790", - "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv" + "commit": "c6d3d34bae62f1d5e986625db74f2076af258900", + "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag" } }, { @@ -61353,8 +61480,8 @@ 20191022, 1955 ], - "commit": "4934c0560d2f63e6314b4584211a0cc0a7e671c4", - "sha256": "03hwvx3h64jj9nylmzpv2241b5fi97anhjjpwc5sjmfsq1wbf432" + "commit": "284d7bb285bd382be6c1936077de7e2246fa2374", + "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l" } }, { @@ -61757,8 +61884,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20201206, - 1725 + 20210110, + 15 ], "deps": [ "dap-mode", @@ -61769,14 +61896,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" }, "stable": { "version": [ 1, 17, - 11 + 12 ], "deps": [ "dap-mode", @@ -61787,8 +61914,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8", - "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc" + "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", + "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" } }, { @@ -61850,15 +61977,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20201210, - 1702 + 20210108, + 1332 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "592e883026288677f4042333b51efc7a40b9a68a", - "sha256": "1dar5iapnx55z8875sr05p4b9nklmqdx6vfxhisy2hsgkp8iq8fc" + "commit": "5d3f4814f6ac44547a62551472cc76fbaebcccf7", + "sha256": "0qak0vl9jicx9sv4sa2ash5agxxsx8qycp4jk3wxs96q5kjshf62" } }, { @@ -61920,8 +62047,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20201105, - 1758 + 20210105, + 1625 ], "deps": [ "dap-mode", @@ -61934,8 +62061,8 @@ "request", "treemacs" ], - "commit": "f43b00acd86801aff76c9cdc01f9d7f4b83bf14f", - "sha256": "1xpjjz7m06yazlw7qp7i278f7v4a3n80kpcvck35ahg5ar8i111j" + "commit": "33364a268a61366f1a07596e9fe7bd0f6d73fd90", + "sha256": "0ii26773cm945z1s4vyfqgzjsizv1a9wiadgg3klnfz9748y93a4" }, "stable": { "version": [ @@ -62046,26 +62173,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20200718, - 928 + 20210110, + 1914 ], "deps": [ "lsp-mode" ], - "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6", - "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b" + "commit": "2140e65fc5d759cdf163128ef6ab15c246d6039b", + "sha256": "10qf62c6raqhikhmfrav6qhc1mj229mrabzs1swyc06sx1sgkiwf" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "lsp-mode" ], - "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116", - "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi" + "commit": "969846d5d0c9a9d1fc8deae30a0f664607f06e72", + "sha256": "1dz9yib9g7a5b1yipxjc6mqq9ffkpkm2icpj6xzanfdnc1ymj7c9" } }, { @@ -62119,8 +62246,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20201231, - 1252 + 20210111, + 1652 ], "deps": [ "dash", @@ -62131,8 +62258,8 @@ "markdown-mode", "spinner" ], - "commit": "51138a029cd2cb5b530ab0e98030e24b830da943", - "sha256": "0l8y3ypb8sl96vqrn8za1bdkkj1w1ip8nya75iqj4h0gcmcdw04z" + "commit": "df809cf4afca507761bdd5a85817d5258aef26c7", + "sha256": "14i3gwvf3adfp8f5kblmmvlyb9wj7s2kyscgpqr8k0zjhbj2ibj7" }, "stable": { "version": [ @@ -62421,8 +62548,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20201209, - 332 + 20210110, + 1507 ], "deps": [ "dash", @@ -62430,8 +62557,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "72034bdd65f66b43d10e6106e82dfa4718557e1a", - "sha256": "0dz2rz6fl87yr2jj324b8v1kw0kr4021lj245l60nqy5pnj7gz2y" + "commit": "fbe9a859f0b50097270ccf1314952de2d2039c12", + "sha256": "01xw3jpwffk5gg86s5n2i1jwn0xslc9bdbacfxy0iyrn6qp5jr1i" }, "stable": { "version": [ @@ -62460,8 +62587,8 @@ 20201110, 1250 ], - "commit": "d2ff3045b9694293a302fa60d7bd5d97f2673156", - "sha256": "1g5wkprz33az2kp8w46343nhri82g4ib8jahqi4lpn507307gchz" + "commit": "9454aeeb665df360543b47e162f03276a16b01a5", + "sha256": "0ssqqhvc08g5917i4lmsr698zr57v9hpnbw67l1lx48ra4vr6fcr" }, "stable": { "version": [ @@ -62875,8 +63002,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201225, - 4 + 20210105, + 1030 ], "deps": [ "async", @@ -62885,8 +63012,8 @@ "transient", "with-editor" ], - "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", - "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -62966,15 +63093,15 @@ "repo": "dandavison/magit-delta", "unstable": { "version": [ - 20200929, - 1335 + 20210104, + 1541 ], "deps": [ "magit", "xterm-color" ], - "commit": "b8526f890415374822514e488341d2b706d6bc2f", - "sha256": "1r809j0pj7lfv70dkqzgzahppzp0g5zsa3q18h68d35vanaicm2d" + "commit": "fc4de96e3faa1c983728239c5e41cc9f074b73a2", + "sha256": "0gyjsjjjdbns8vlbja8wvmba8sq85ah7cawqqm0xjinrpfrhh8b7" } }, { @@ -63225,15 +63352,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200102, - 2204 + 20210103, + 1554 ], "deps": [ "libgit", "magit" ], - "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", - "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" } }, { @@ -63381,14 +63508,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201221, - 2057 + 20210103, + 1631 ], "deps": [ "dash" ], - "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", - "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" + "commit": "25f432551347468ce97b8b03987e59092e91f8f0", + "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" }, "stable": { "version": [ @@ -63971,11 +64098,11 @@ "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ - 20200123, - 1406 + 20210108, + 1832 ], - "commit": "0dfab46a728a21c91658ffcb14101b182cf1b403", - "sha256": "1c17r1vz6181plbhb5nh36q6r2rwkrxhy45xmk7rjghmdd765f2r" + "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", + "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" }, "stable": { "version": [ @@ -64177,11 +64304,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20201230, - 1926 + 20210110, + 2056 ], - "commit": "3c8042845c62b565c211e11d54defa093153b715", - "sha256": "0vl1hb1drchqzxbvf6iil1q6sg6qw9yq8163jaz0cw5rjzjjafb2" + "commit": "09aaad9b01068481c71720058e9d828e0d87c806", + "sha256": "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs" } }, { @@ -64289,11 +64416,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20201220, - 253 + 20210112, + 1557 ], - "commit": "e250a8465f805644d372c264eb0572f569d7f2a1", - "sha256": "0ffx65gq10i56bxcg4baffrhr2xj5vk1051cljvzlffcq56hx98g" + "commit": "3e380572a5177d0fa527c15efd15e340f53a923b", + "sha256": "1zhxw0cp95zy3qy9ai9k81zja5m31964nyyrjqzlywxx7zjk4x9g" }, "stable": { "version": [ @@ -64661,16 +64788,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20201213, - 646 + 20210108, + 1121 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "61554599f839a6d00cd4037d373bfde7b280c1c3", - "sha256": "0mrrb5wf3drpd5ywacq3bj2kcvsijysb37p5asz5pmdpg8s8nr6v" + "commit": "6c83ab7c6e3df95e60e942a9017d0c218228d429", + "sha256": "1v32nip530j4lvvm9gsjr9f6i0p0i59lx3f3j32m25q0yvv4s8z6" } }, { @@ -65240,16 +65367,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20201231, - 748 + 20210112, + 700 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "9d745c8336a39dc1bd47aec4b3f9d2c034a0574f", - "sha256": "0s306wwns2zzpbw1008ga224mncc55jdbd31v9qp147wsnhd11s3" + "commit": "bfd5e52c826c27aab01aaded518179b1192a3620", + "sha256": "0w4aincibdfqcf9k3cgmsl054qx5rwhxcsqg8k676wg7b266wmrg" } }, { @@ -65263,8 +65390,8 @@ 20191025, 851 ], - "commit": "47ebe5e6186e70584ef5f92c9191bd7bbcb6c1da", - "sha256": "1vinlgqljdsv91dd5briak2v747fbml72xdgr859j6v514hap2rz" + "commit": "fc2f6e575077970dbabaac7643b820fcfd9d4f72", + "sha256": "0vm5rm4lym49nj4jk62s2inznkwx4gyrwlkgcz3q0qygylnn3r52" }, "stable": { "version": [ @@ -65557,8 +65684,8 @@ 20201202, 203 ], - "commit": "cf20ca579120dd3a4126641a5bcc1dfc6289183c", - "sha256": "0041q1vxy6222ic8807yhxdxb0vsmzvndb9f50ymfx6zrjisydf7" + "commit": "b5ca49f83f0b178fab4683b8443083515caaa4c2", + "sha256": "0qv6gazz5p46y5p2wc0h9pa4qq45aqbzx2s54aq1vviwl8v9hpj7" }, "stable": { "version": [ @@ -66157,11 +66284,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20200920, - 1500 + 20210105, + 1821 ], - "commit": "8a2f8c2df0e1817190c4dc0d2d7c7b5e5407744a", - "sha256": "0r8b3v4vp46afw8q5v03aifd1kpap79qc4af84placrhy80kya2v" + "commit": "39a7d3e35769086c0008389b3975dd90b91b657c", + "sha256": "0f74wb9f1j47qc0xhhn23i8nrsyznhngwvdrg62ixdzdz9z0z5hh" } }, { @@ -66172,11 +66299,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200916, - 2311 + 20210103, + 7 ], - "commit": "d305108f9520e196b533f05d1dcc284cf535faaf", - "sha256": "0yx89is3g2m8af8vfsz5rgjmfmx7mfrxlffb1x6y4b8lh9l0k6dj" + "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", + "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" }, "stable": { "version": [ @@ -66647,11 +66774,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20201231, - 1237 + 20210112, + 853 ], - "commit": "cc61cc3d034f87a6a7a0dd6266c11c5c79d97981", - "sha256": "1ldj36rp2mjcblawvgq2xxx48bmpvy4j6ny3gwgrqj4ggjjmqjv3" + "commit": "fba8fb08544dd4a19fcc5c0b2ca50490bf4b10e9", + "sha256": "025ak5yvy2920djia1976p1fyxdkl27jyhgi4gdsg8c13yr0asqk" }, "stable": { "version": [ @@ -66770,26 +66897,26 @@ "repo": "jpablobr/emacs-monkeytype", "unstable": { "version": [ - 20201221, - 1355 + 20210110, + 513 ], "deps": [ - "quick-peek" + "scrollable-quick-peek" ], - "commit": "8a01436eda0f2174c0174af097591de76eda4d1b", - "sha256": "11p91p1w84rbvgvb8f9xj3r2nnr34i9ka5hvz82ri4cfx1hwr9hk" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ - "async" + "scrollable-quick-peek" ], - "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc", - "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" } }, { @@ -67338,8 +67465,8 @@ 20200822, 1229 ], - "commit": "9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0", - "sha256": "07fmvwlv77za6k67myfn297hx44j8dn47xsx8mw8xaw5gpin6d3c" + "commit": "1f4fa17372bd196e87042738a16ab08bf904bcbf", + "sha256": "180glmkk6wnq5pc02543phih1f71vpvykqkwxs2qv7s7dyf2qg58" }, "stable": { "version": [ @@ -67465,15 +67592,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20201026, - 1123 + 20210107, + 1303 ], "deps": [ "libmpdel", "navigel" ], - "commit": "e937fbe0b98774e711134f3fac230a9fc66ac106", - "sha256": "1qiwk3ahjhdc6ac3k81qjl5vjjsxm1hd7wnl7whk2zwj7k12zb9j" + "commit": "6682446c6263a79e79c55cf32c0efb066245feec", + "sha256": "0q84gml1g9zwchp4h3r0xvj1sc1ynx0s2drfkpd357br3fw8ivzf" }, "stable": { "version": [ @@ -67777,8 +67904,8 @@ 20190609, 812 ], - "commit": "98110bb9c300fc9866dee8e0023355f9f79c9b96", - "sha256": "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg" + "commit": "ccf85002b18fee54051dbfaf8d3931ca2a07db24", + "sha256": "1ysj9x9m1lxg1gy0z7y07qsi3g26qfqdwwa8kjkf40pchb2wxg0s" } }, { @@ -68015,11 +68142,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20191117, - 1203 + 20210105, + 1229 ], - "commit": "4045823d51f6330466b6ab83828b6c598ac817a0", - "sha256": "18z1mmmjq4xw238mw1417nlqv67qv07blz0lxhpl8m1wma4v96af" + "commit": "f71a56978a57ee5b08e75d01a5d6ec75f20cedba", + "sha256": "10fvwrd0l05lv05shrdl0cw1bg231djkz6gxlgccmdr97d01qwkl" } }, { @@ -68030,14 +68157,14 @@ "repo": "sagarjha/multi-run", "unstable": { "version": [ - 20190507, - 2349 + 20210108, + 336 ], "deps": [ "window-layout" ], - "commit": "c6256b0cc2876c29faf381d8324b31b911045a27", - "sha256": "07nd7lwrnz9j54hq33c8ii1pipd472qfsdifg6fid7kca0rychif" + "commit": "13d4d923535b5e8482b13ff76185203075fb26a3", + "sha256": "0b5pym2dk4rhrcbn0kgiaf6mqpwa45zfi5k2vh0lfzv9b45nngzs" }, "stable": { "version": [ @@ -68367,15 +68494,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20201212, - 2250 + 20210106, + 1857 ], "deps": [ "dash", "request" ], - "commit": "4117f49b9f40d119f9ed0888458ce5495510226e", - "sha256": "0i2r54rzvfiiap7vg2fx4py62xng7n9hjblih0ybb2b0saqmpvgd" + "commit": "cb0637bd3799820d6738f5d66b8bc2de2333e0e4", + "sha256": "1j5x1rfnxvghdmai7cv9sjqw1azq59pk8h5vm0krgnan2rpx5k4k" } }, { @@ -69589,8 +69716,8 @@ 20181024, 1439 ], - "commit": "68f971460bb21abd59dfe6253e35a55c3e1cfc64", - "sha256": "1isbay1i23jjw24a7nxjhsdhvnff2108gr98s90jfwwiymr1fp81" + "commit": "fb824d27b39e10acb97f9b105df2d9485a4677e9", + "sha256": "0sliljjiikgrl4b2cp21hnc1qv9rjb3alj4hk2h334iddcah1klh" }, "stable": { "version": [ @@ -69952,16 +70079,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20201129, - 2009 + 20210104, + 1423 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "94916ad8c3e3bf697855c58257f92cd697c9521a", - "sha256": "19dk7mkjpmmzbq26kdpz032g16jlj3b7mbmgi5px9rfa9qm0v8qw" + "commit": "174eb3bdb1339872b62fe2bf0c27d9a3eb142d27", + "sha256": "089zsy7f69h6kj6rckn5big2bfdn6hgdwamacsgsb8fpsvmy3ai9" } }, { @@ -69987,14 +70114,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20201222, - 1537 + 20210108, + 1350 ], "deps": [ "cl-lib" ], - "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", - "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" + "commit": "6e8950ad296c0f57d80d034eb0b7adf538c02906", + "sha256": "10zjxc6ipm9330awx7k9hzjf28qpnaw2rcz67dc0jbdgxkn16gl8" }, "stable": { "version": [ @@ -70240,8 +70367,8 @@ "deps": [ "colorless-themes" ], - "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", - "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" + "commit": "c1ed1e12541cf05cc6c558d23c089c07e10b54d7", + "sha256": "02ai9yf7h3i81bg01w8nb4kdrcc94ladbrkw9vg3p40w617mjwlb" }, "stable": { "version": [ @@ -70296,8 +70423,8 @@ 20201225, 1832 ], - "commit": "0f37509cc7e92f2c09fcd7d7f3e2b477e4f29401", - "sha256": "1g3l7hyr8zcddwvcdjxmblzkw3dzrdhp8kc31j81m22g9napjxya" + "commit": "a12bf2a52a560cc27503add26e9c3087929b60ec", + "sha256": "1xwzxw9nfcm12zzgbndj4qzlx9mwxh4z57yyx1v6r3zzgr7qgcpn" }, "stable": { "version": [ @@ -71255,8 +71382,8 @@ "ess", "julia-mode" ], - "commit": "862f34da39faae87fc0900bb7006fb20fbd2b61a", - "sha256": "09gg0jbilrzz5fpvgkvig43k860044c0525y5lcgqns6gm0fs24h" + "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5", + "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym" }, "stable": { "version": [ @@ -71968,8 +72095,8 @@ 20201204, 945 ], - "commit": "3910c34756adf38f35ccad9650d1454d2ba5f735", - "sha256": "0h8kwlwff76ry9rps83hgvsx4h8sf6nm9jjcj54z8q8r7j9sh276" + "commit": "aa7e9df7b2ea20c16f17a4f7c40e2a86b106b182", + "sha256": "06841x8adncyw5r3n8xv05mlsb1iv9i8klxf1pj3021b9nbhjkii" }, "stable": { "version": [ @@ -72162,26 +72289,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20201221, - 909 + 20210107, + 1519 ], "deps": [ "org-re-reveal" ], - "commit": "63a3b7744e1820bfc832f3f2ba03e7a9231e806d", - "sha256": "0yfx5brpf45v8nskfgxrflxw0bdjj4xbfvr48gncfs6np6s3w2fb" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" }, "stable": { "version": [ 3, - 11, + 15, 0 ], "deps": [ "org-re-reveal" ], - "commit": "4155e1b7d533cc107da74b4d6f463ed96b6dad39", - "sha256": "0pwpwxqd0mdp7dcir4yiigsybra1iv571ngn3yvprid8ji12h5sr" + "commit": "7edfa815105543a183b1503fa49531f77a713840", + "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" } }, { @@ -72836,11 +72963,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20201216, - 950 + 20210105, + 1749 ], - "commit": "e2a20d6069b8217b5d9386ea15c0c56f40885c26", - "sha256": "0z60vi3qyagr43vnbh80ygcvxcr44pd183dhyacysqv0mif5bvrj" + "deps": [ + "zoutline" + ], + "commit": "c50b98da70d08b27ad1751c57bc7edcf27cd1d79", + "sha256": "19kgyxq3dci44hayzli3z528vs3mxfpsa5443wxf5pfgr7lkc9c0" } }, { @@ -72851,11 +72981,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200905, - 2113 + 20210105, + 448 ], - "commit": "e56eeef6e11909ccd62aa7250867dce803706d2c", - "sha256": "1g4963snkp1gxlf5h1h5kjn4pj55f844ajzx4n5nhkws44sr6isg" + "commit": "cbc0109eac542ef4fe0be027af1c62c4bbf846ee", + "sha256": "0cp8yspghfbgy2nhcqw8irqyhphw4jdr36864m45ralzzxc6lqac" }, "stable": { "version": [ @@ -73027,8 +73157,8 @@ "ox-slimhtml", "request" ], - "commit": "43c3d6418cc91d3e6fe880d02fc498345bd11ae3", - "sha256": "1nbjxcasw14jvmn10cy0ch0k79r7lvaznnh504qq2nhbxkqz22n6" + "commit": "efa9e3aa2d768c00440f745192aba6672b28d086", + "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" } }, { @@ -73223,14 +73353,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20201214, - 822 + 20210108, + 1512 ], "deps": [ "org" ], - "commit": "2f36f303e96e384e17d156e0d6489211808d4a36", - "sha256": "1dm672s30i31103wgp56dlwjb9gdc4g6jhjznz22s6rqrr6wkkhp" + "commit": "f7939ef5071895930eebccf490ea7cb25cc54b2c", + "sha256": "0lplrdy5432ckif94vl9phh07c6qfm8cxa1mjyn1dypn2sh8p9gi" } }, { @@ -73596,14 +73726,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200914, - 1558 + 20210105, + 1758 ], "deps": [ "async" ], - "commit": "42ac361ef5502017e6fc1bceb00333eba90402f4", - "sha256": "0cg4y7hy7xbq4vrbdicfzgvyaf3cjbx2zkqd4yl0y2garz71j99l" + "commit": "97bec7412e1a4d6e9031c7a0568d0f065cd9fd00", + "sha256": "0jb49q2ayhw1s2dnd323lqc7fy9k3sznxn4dv73s4945j8w2lqcc" }, "stable": { "version": [ @@ -74163,14 +74293,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20201229, - 512 + 20210107, + 940 ], "deps": [ "org" ], - "commit": "d1f0aae00adf7e64b8ddbb181eded6d811dd38c6", - "sha256": "0kyf4dqjs16m007ydl27x73scl4isy44n2x38585g592rqn25x6a" + "commit": "a449c614d63712cd55e8c38d4679667117c132c1", + "sha256": "0grsmhif0pmdsvc6lifxip1jh57h5him6ipzkr1rvbs5l47qndk7" }, "stable": { "version": [ @@ -74246,14 +74376,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20201222, - 750 + 20210109, + 913 ], "deps": [ "org" ], - "commit": "c0836483ae43e525bf7547b7a789d171eda84c84", - "sha256": "100w9z2kphxn3r1ybvvin8gcrfv4851niv2sapgqgsllyx0ql2nr" + "commit": "08d5fce95023c015372678d353388ad0dae8952b", + "sha256": "0f1826xi9z895a1wgnvvv5nqpi2r0l6f8h761zk8ng9j1rhkz865" }, "stable": { "version": [ @@ -74365,14 +74495,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20201230, - 1243 + 20210112, + 635 ], "deps": [ "all-the-icons" ], - "commit": "621ff93a7229cce9f6090cdabeb318e857278c4c", - "sha256": "1xic8fh8pnaw0xi1hcsn0xy7mc4d07cmw1zr6ncbk9df0vgz6agf" + "commit": "9e924c1f7a8d893b59e3a62e8731e1bceded5b08", + "sha256": "13q7l77nij20ybpgqch5waj5n1kggcbd9xr44lqzar6s00zxc47d" } }, { @@ -74620,14 +74750,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20201229, - 27 + 20210105, + 2114 ], "deps": [ "htmlize" ], - "commit": "20aac1b7254627c393f3a9e52395ee4d3546d586", - "sha256": "0wvav4g1adqymn6viwf6jmwl41vb6cjkai4n80yk0v4lndw6b1pl" + "commit": "bb378c7942804b81ac9ddf4b14381cd9d84c993c", + "sha256": "0qmbajl91a6xcjgd9537cw6r75ahycwz77rzc7svsa0rhjji8sh9" } }, { @@ -74638,8 +74768,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201212, - 949 + 20210111, + 1022 ], "deps": [ "dash", @@ -74647,8 +74777,8 @@ "org-ql", "s" ], - "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", - "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" + "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", + "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" }, "stable": { "version": [ @@ -74756,8 +74886,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2132 ], "deps": [ "org", @@ -74765,8 +74895,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -74951,16 +75081,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200929, - 2241 + 20210110, + 2052 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f", - "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm" + "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", + "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" } }, { @@ -75064,8 +75194,8 @@ "elnode", "org-present" ], - "commit": "ba7e07af3bd1142e310e868893b919286758a007", - "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20" + "commit": "dc3be74c544efc4723f5f64f54b4c74b523f0bbd", + "sha256": "0axl2wbkgb5vd7dm471gxw45lxv8za6wfcai15rjrfbhlxckj7l9" } }, { @@ -75329,28 +75459,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20201231, - 909 + 20210111, + 1807 ], "deps": [ "htmlize", "org" ], - "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", - "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" }, "stable": { "version": [ 3, - 5, + 6, 0 ], "deps": [ "htmlize", "org" ], - "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", - "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" + "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", + "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" } }, { @@ -75361,15 +75491,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20200624, - 615 + 20210104, + 1650 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "d60e7b000e863c60485f866f14f552506317f5b4", - "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj" + "commit": "2379e224d6acfdba3ee6f0de72805cdfa6b8e0f8", + "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4" }, "stable": { "version": [ @@ -75461,10 +75591,11 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20201230, - 2020 + 20210111, + 1838 ], "deps": [ + "bibtex-completion", "dash", "f", "helm", @@ -75476,8 +75607,8 @@ "pdf-tools", "s" ], - "commit": "5e6c1c7319adfdad6bd67debcf332a478e6812df", - "sha256": "1n08ssdq6m2k5721wgnbdniiyc4gp0g7rmxaw17plbkzj6x6qcbf" + "commit": "e7aab97a39839cec7ba016bb5caaa9f9288bf21f", + "sha256": "16j8qb985jzjflgbnvd521wavsz5pmyhqds991pp0v12awm0dq7j" }, "stable": { "version": [ @@ -75603,8 +75734,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20201225, - 543 + 20210111, + 1138 ], "deps": [ "dash", @@ -75614,8 +75745,8 @@ "org", "s" ], - "commit": "65c0f0dc8cc36261858c31b8c9d1a7fba4ed083c", - "sha256": "08m1lm091nkwmf1462yf7rqmsvxyb2x9qa3wbmr3q86wiw7i5pca" + "commit": "05a9bc44f2d158cc355c904382f2c7b079aeee15", + "sha256": "18s3qp671g28qy1qllnm4lay7mvyar8qcqqjn8yd3417gxwndqhh" }, "stable": { "version": [ @@ -75675,8 +75806,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20201213, - 1924 + 20210109, + 935 ], "deps": [ "dash", @@ -75686,8 +75817,8 @@ "s", "simple-httpd" ], - "commit": "93b673209d141953547fc0732506bb0efa68f804", - "sha256": "0dlw8997d1p6yvgnskimj5nkv1rv9fkf13k3prq0399y9mqyvh0x" + "commit": "c7793202e9929dc2a415482779141e7b429421ce", + "sha256": "1z29xngyxmq0pd8kfx6z8n8hps4apnffnsi8qc0hvmyhp197hkqc" }, "stable": { "version": [ @@ -75732,19 +75863,20 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20201229, - 1905 + 20210102, + 1627 ], "deps": [ "dash", "f", "ht", + "ivy", "mustache", "s", "seq" ], - "commit": "63cf17f35d81f78f9ce10f8c99288b978982d4dc", - "sha256": "16axy433zz8mvbvihj4ks4mq2wn28j2jg5b3vgi9mbrv1pybdm1l" + "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a", + "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn" }, "stable": { "version": [ @@ -76173,15 +76305,15 @@ "repo": "abrochard/org-sync-snippets", "unstable": { "version": [ - 20190318, - 1744 + 20210111, + 1726 ], "deps": [ "f", "org" ], - "commit": "50cefe5a37196ed1af3d330d6871c3b37fa90d41", - "sha256": "13d1adymxn3b579syyaszgg98h3kh3hwn97pdfzghfli1cd9fb9y" + "commit": "88f995dea188b8a645a3388c42b62a2bb88953d3", + "sha256": "1ggn4y6sczl08mzbnzgjixgl685c71wqqffmng4gl67fs6wr6lrv" } }, { @@ -77955,15 +78087,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20191122, - 237 + 20210112, + 1746 ], "deps": [ "htmlize", "org" ], - "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9", - "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x" + "commit": "d782d572c8684f313576d1bb63912654e42e65fc", + "sha256": "049a4azfls5l7l5wnwyj1380d5m5mhc5h56y742w8xpqdp18jbk4" } }, { @@ -78003,11 +78135,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20201125, - 1716 + 20210102, + 1517 ], - "commit": "5b50b6e8d1372955503f01f13ea5c02e4ca16af4", - "sha256": "00jkrnqbkh9nsbjpb7gykgdzzgcq73i4rya6pz4kjvqs76v4npnd" + "commit": "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0", + "sha256": "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29" } }, { @@ -78094,8 +78226,8 @@ "deps": [ "org" ], - "commit": "661eb223fd50b0f3bd683aba92d7fd661b78c2cf", - "sha256": "0kkqg5y0f4bnykv37nvccrq1v745xhj0bs2yknvdji7kx8fs9lns" + "commit": "6bc8ee08023695fa167ac0ddf1fc61e1975fa1ce", + "sha256": "0sb4ms9wd6085g6c6kfjm4bk9z1z02l8dbn15xs9axzksk4zcq6x" }, "stable": { "version": [ @@ -78864,14 +78996,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20201231, - 1321 + 20210112, + 2058 ], "deps": [ "cl-lib" ], - "commit": "126565141704faaad428bc82ca4379701d0c7c04", - "sha256": "1advai81xwvahilbj11g2g3rhxzxi7nmfpaq5dlm8g6qi5814n1x" + "commit": "35650f45063cf5f028ec406ded222f6bc59058f1", + "sha256": "08n8riq4vgaxgicns025mv1msw9vp8s25d82wa6c6ca3v9fdlvam" }, "stable": { "version": [ @@ -78908,15 +79040,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200906, - 512 + 20210111, + 341 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -78939,14 +79071,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20191116, - 45 + 20210110, + 2231 ], "deps": [ "package-lint" ], - "commit": "05596996286089acc7693b700c7c31780439e39f", - "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x" + "commit": "348b15a1da1d62dee378b33971e39758b96c6575", + "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" }, "stable": { "version": [ @@ -79112,19 +79244,19 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20200305, - 244 + 20210104, + 2224 ], - "commit": "34cd91d841e5334c6966e25fbfd971a2dfbcee69", - "sha256": "0lakwlr9azqkxbh38vak2299m88073ylmza7vjfhdzr9dy1cnxq0" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" }, "stable": { "version": [ 0, - 11 + 14 ], - "commit": "67b5928a7f14568baf2716b5741e13659a86b9ea", - "sha256": "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12" + "commit": "69caea070379f3324c530e96e06625c3cd097cb9", + "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp" } }, { @@ -79219,16 +79351,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20201228, - 1117 + 20210105, + 1513 ], "deps": [ "ivy-posframe", "lispy", "worf" ], - "commit": "66827c3fe86a3e50aa2d594e80cccc0fc1064f3b", - "sha256": "09yawvlhgb03077q1ypjizccps4bjr3vizgbjch4gjxvg14j9948" + "commit": "0ba91149095bee8c43688c68f83f4d365fbe6771", + "sha256": "0459qqhra9zx9klw89s5hjbka1kdh1nvhl6wc7igfklglzw0d7zs" } }, { @@ -79877,14 +80009,14 @@ "repo": "pjones/passmm", "unstable": { "version": [ - 20181130, - 1612 + 20210109, + 8 ], "deps": [ "password-store" ], - "commit": "b25a92048c788a8477cc5ffe14c0c4a4df19d79a", - "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" + "commit": "d78d1bf4f397180d2256248df589f33aafb4c8b4", + "sha256": "0r2nj2p6kx40lhmsv06xsyylj5b9lqji32rc4ipr1biaai52w2b6" }, "stable": { "version": [ @@ -80582,14 +80714,14 @@ "url": "https://git.sr.ht/~yoctocell/peertube", "unstable": { "version": [ - 20201222, - 1655 + 20210101, + 1007 ], "deps": [ "transmission" ], - "commit": "3ce0df17465bcf4ed1a478f7346dbd8a1a2363af", - "sha256": "1p4phw90l91c6xax187011n1n45byyf1pjvsd7mlz0gif78lqz6h" + "commit": "bb529db154596e86327829edbd7144b67cf72255", + "sha256": "1vqlz6s57cqhbmxc9733crhb1z91lrhm0xmwfsq3yb30nfdwlyyb" } }, { @@ -80869,25 +81001,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20201218, - 4 + 20210104, + 2243 ], "deps": [ "cl-lib" ], - "commit": "94830c4fc18ac460a217be7c46da4272b2217f43", - "sha256": "1prymf64fhn69mzwnhqnxlid6b7mz0zgxcsc1q5jcbmgns5qm382" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" }, "stable": { "version": [ 2, - 13 + 14 ], "deps": [ "cl-lib" ], - "commit": "1eb46847ea563e213e21e65ec65892e37aeda577", - "sha256": "17ldps10ap0yz3z9smdf4cr35xw3wscmqphad8d9ddd2jbqin6xg" + "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", + "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" } }, { @@ -81360,11 +81492,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20201120, - 1807 + 20210103, + 1738 ], - "commit": "7e5722c8854d7465c93765653e6ec0897fb7cc7b", - "sha256": "0f4i76rbrhgmq4ba7r560yj0xnlmhv46inlp83bwl7cbcy1r679n" + "commit": "8cdc727e6d4eef81655b90574784e9540f407cda", + "sha256": "1v09ldgdjayj66q8vn97n6hh0zqk3pxqg100ibbcyz6vfrsa5pdm" }, "stable": { "version": [ @@ -81683,11 +81815,11 @@ "repo": "johanclaesson/picpocket", "unstable": { "version": [ - 20180914, - 1819 + 20210103, + 2315 ], - "commit": "6fd88b8711c4370662c0f9c462170187d092a046", - "sha256": "1mdzzxf7xm7zwrpnqqxa27d1cr31pd72d7ilbwljv13qp177a3yw" + "commit": "fa3a49f011b5ae139728548fec7375743f61c7c7", + "sha256": "1vb358jyfs3px70ah60dmlz5azdfkva9xrw3mgrr4060vcy7w4q1" } }, { @@ -82098,11 +82230,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20201230, - 1310 + 20210111, + 1508 ], - "commit": "284c78151a73b4813e8d0ff329456826a9fb5622", - "sha256": "1hpnydm6c4rw01cmph16d9rqlnb377v9l9r3gcbj4axfnffgr4py" + "commit": "4d7c9f154652fbaa627899566c026c0c941bb146", + "sha256": "1gnlmwasci438d3j3fh6ivsdzb65lpjk87xx93hfzmg6wfas3j85" }, "stable": { "version": [ @@ -83225,11 +83357,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200722, - 1402 + 20210111, + 919 ], - "commit": "60da23c97c30e08254a914dca411b2e3fd639c99", - "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7" + "deps": [ + "alert", + "dash" + ], + "commit": "52134701fa76b12252b06c9d6fd4e8665596a95a", + "sha256": "1h94dgjcbpd6vr1wgvajx7d0ikz5jl4zdmxjgqzff0cg2vqin3r6" }, "stable": { "version": [ @@ -83249,11 +83385,11 @@ "repo": "baudtack/pomodoro.el", "unstable": { "version": [ - 20190201, - 2152 + 20210111, + 1934 ], - "commit": "6cd665ceeaca1f70954aa4caef6f085179f94c69", - "sha256": "08z2nja3bhjgg6k7bb0cr8v02y8gaxkmxmfcvvgiixw3kfrnkpwn" + "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03", + "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j" } }, { @@ -83400,14 +83536,14 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20200610, - 317 + 20210108, + 1821 ], "deps": [ "cl-lib" ], - "commit": "13364d7674535db225789b03da766746734a4f28", - "sha256": "0glwyrks761kpan3ff6a60mqd1hk11yd7rim1fanycmp711k610q" + "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8", + "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p" }, "stable": { "version": [ @@ -83646,11 +83782,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20201224, - 2318 + 20210111, + 44 ], - "commit": "ae8ac91744010c8975f07cf18282f58ce56605d0", - "sha256": "1y6d4h0lzgg9xmhswkd0d7rjrqs08mpngylqypycqn90rz0gb6hd" + "commit": "3543f1616a6a27a9156403d8677f04ec2f7fc129", + "sha256": "046vc10rwnmzwi85nlj8fxjgy48jhyigwpvw1skn0g1q7ximhdqr" }, "stable": { "version": [ @@ -83929,11 +84065,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201214, - 230 + 20210101, + 2227 ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -84563,14 +84699,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20201227, - 1430 + 20210104, + 1216 ], "deps": [ "pkg-info" ], - "commit": "1f2887696ec4fa7ecc005f258da276c445db039c", - "sha256": "05xrf805slj793mszkzgckhcwf13lbkr4ns2rkqw59cclj3yly1l" + "commit": "c31bd41c0b9d6fba8837ebfd3a31dec0b3cd73c6", + "sha256": "10pibv07mb3mwmz6r2kmd7xdz5rly7hfbxvhmxd536zbr2s9rr1j" }, "stable": { "version": [ @@ -84994,11 +85130,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20201226, - 2208 + 20210110, + 1959 ], - "commit": "2d94aa0aabf0aa7087f8833e1c61d95a034e2d13", - "sha256": "0gbh8cpz4cd03892jg1rfl2azs3ahbbk7mcsq3pwczf7v4vllqkl" + "commit": "0d731606bee81b2d73895a23b69e84796ea7e4e7", + "sha256": "1j0fhd5cmhx6h3hnk2xb30hn6sxfp1js3zgldqpvk4qrws5vs25h" }, "stable": { "version": [ @@ -85101,8 +85237,8 @@ 20200619, 1742 ], - "commit": "635156e40637d65650e91a21afec10ad8fac5c19", - "sha256": "1xkjb57rbrrhy5fidfmqjhij891i4k3j0cm900464z44s9mq2ypf" + "commit": "468bc193ec155756bccf2b2d9eeb8e003d95ce31", + "sha256": "0vp57802im4smywk84ad991mdh78hwbcm3yvd22n4yfspmr0lz7j" }, "stable": { "version": [ @@ -85257,15 +85393,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20201111, - 1424 + 20210102, + 1856 ], "deps": [ "async", "cl-lib" ], - "commit": "4856442966f94fd2da486993a8d3e07f190d971f", - "sha256": "12vip32c6pszrvvnfd9k1mngmd4qzh5wvpc3ykjcil1f4mdfnlar" + "commit": "a3fbcbb94a41450c9a5fdbea3b4ac2134c2aa082", + "sha256": "1w0ifzmd35c9rrc1vwas63hz7f1l8w0dlzwikmiiza6jy51qn9dd" }, "stable": { "version": [ @@ -85363,14 +85499,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20201129, - 1306 + 20210109, + 2155 ], "deps": [ "ptemplate" ], - "commit": "40cf3031f0fb5bbb75e1f35db3186fd1aabe7262", - "sha256": "046wmvhj5bf68klb4gzb0ijgib89pw2hmm9yrykpi8c8fnvzgdb0" + "commit": "26f1e4d40ac0e89e82c3210591064770f86490bf", + "sha256": "1yjigz22laz0f5m10kcslhg184lsqsfr72samk59l13jpnr676qg" } }, { @@ -85559,14 +85695,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20200708, - 827 + 20210109, + 244 ], - "deps": [ - "cl-lib" - ], - "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f", - "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib" + "commit": "8410baff69ba934b64d78340c7fd20aa1e67dbfb", + "sha256": "1gc5rg5rggljmcfz93kz03fy21455nvp7vz79pknqyf8k67aah4h" } }, { @@ -85961,8 +86094,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20201130, - 309 + 20210109, + 1118 ], "deps": [ "async", @@ -85970,8 +86103,8 @@ "pyim-basedict", "xr" ], - "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7", - "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0" + "commit": "09a3b590cd83bf94b92ea772765db581e3aeb2f1", + "sha256": "0v5b7p8icn9gvdqmbh7xy79xnqi80qhskg00ag8zabmg624mpn2x" }, "stable": { "version": [ @@ -86038,14 +86171,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20200910, - 1445 + 20210111, + 923 ], "deps": [ "pyim" ], - "commit": "8b1f0dfa1c5f5f8e5fb110a0963603ee08d60932", - "sha256": "11y4xa27w8n16181bddxs8w5p7r2mk38l19id69w2xvvaqa36prf" + "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c", + "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h" }, "stable": { "version": [ @@ -86117,8 +86250,8 @@ 20200503, 1624 ], - "commit": "3a065a16f0826f3d46025209b11d30a1fd5b3b49", - "sha256": "1p9q5bnkv7jwy4f7d0fq6c72z7qqcl7vwgq55wh46pzhnrvl4f3d" + "commit": "168bee7f23d9956c12b419b18aa9f5974151e3d7", + "sha256": "00y3klba3m1j43mfggh7pvy93khk1ga1lyb98r5mlfffrymvr209" } }, { @@ -86383,8 +86516,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20201120, - 2106 + 20210111, + 1046 ], "deps": [ "dash", @@ -86393,8 +86526,8 @@ "s", "transient" ], - "commit": "4a1c4c8915c12e540d41aae1d4e326a2362da541", - "sha256": "11hzh86mmi4hwiwnq1nfn6lizjk3pghi8j4m4cgam2zikapxq0wi" + "commit": "3fadf1f8bc363d57c54eedd1bf98e6d9db9f0a62", + "sha256": "0ij72rjf3qnsbg3zripxyx3lwzliplm24pfrg867dr6lxczkxwv2" }, "stable": { "version": [ @@ -86678,11 +86811,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20201022, - 638 + 20210101, + 937 ], - "commit": "6aceac05fb8ab23838adc0d5956c0fc439cc84ce", - "sha256": "1f0wqrqqal6a4grcgxxxn0h6bv7riqhi2gcdh0rnwb19qdaqczdn" + "commit": "42835119977a6512274d8337e866479af4f26dec", + "sha256": "1qqzkk3ym4p3q8b33szmww4ixp1sjmirihnvkgmvfpv0rrc15icc" }, "stable": { "version": [ @@ -86974,15 +87107,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20201220, - 1343 + 20210110, + 1607 ], "deps": [ "faceup", "pos-tip" ], - "commit": "6ec7c4c17b2cd7603df6d0e267d99edbdde65794", - "sha256": "19gsxwxdmzis97v7m035abrg028qn5rjsjbwy21mhh3kq0anzryg" + "commit": "871aff8dc5a4bbc6f1d760fdbceb1f71fcf70b1f", + "sha256": "1z8lxaj24ykpa27y6v5zjwmdnaxhd7m8my5q7yxr4inlzyhhgckp" } }, { @@ -88206,8 +88339,8 @@ 20201219, 1739 ], - "commit": "1f46a5ca366f0320dcd5ef9ee84de6e14e162101", - "sha256": "1jixzkswqa8zbj3jf0m8jh5964ffjflm92iwjq7b7py6hyq2ksnk" + "commit": "54d9914b270975e92fec56bcb3911c7335aeed7d", + "sha256": "1v2maw9jpvvfv6a6qkh3nasshf3pjzbqpyxsarhk2054d982qy5c" } }, { @@ -88401,8 +88534,8 @@ 20200814, 435 ], - "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", - "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" + "commit": "5aa8c1867950b9b2ba6e583271f9c0d715853c5a", + "sha256": "1aypb17k408i4lg9v3fnb5q2n8m3iry4ca4c7axjbvax09dawznk" }, "stable": { "version": [ @@ -89153,8 +89286,8 @@ "f", "s" ], - "commit": "29240e4845a44d10134652b427580301318f1288", - "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" + "commit": "8163bcd16417b7c600ebc1f8142414da2b839f4d", + "sha256": "1hpvv4aak164bld7m2613c501cn7z4y73cnaxg2fnpwijgyyqaxq" }, "stable": { "version": [ @@ -89454,8 +89587,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20201227, - 717 + 20210110, + 1153 ], "deps": [ "cl-lib", @@ -89463,8 +89596,8 @@ "popup", "posframe" ], - "commit": "c797c443886aca6083737a3644e45af51f5b6760", - "sha256": "12r94srq41sxnss4b9bqvgccmvmzjgy3hgncb5p4vq26iln2cbxm" + "commit": "88efb918d50bed46b2a8948a52293eba8fffdcac", + "sha256": "0zv9fm1iyclljyp54ynswd3971dmiaqq32ivfhvmn3mzz5h8xals" }, "stable": { "version": [ @@ -90203,19 +90336,19 @@ "repo": "purcell/ruby-hash-syntax", "unstable": { "version": [ - 20200304, - 2214 + 20210106, + 224 ], - "commit": "d64036278dcfb4fa0603e6697142e02c2876f634", - "sha256": "02s494r9iy47jd74cd0z1dz1igh8rw2jbyybahy9pivmcn7fnqkr" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "89fc364a837d7a78ecce34380f09c073a83e30e0", - "sha256": "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8" + "commit": "d458fb5891e0da85271b1cba3ee0ee69ea66a374", + "sha256": "02bjxsi8vbpadwjlhkdgpm4bi091ry9rdvzwnqsr4lh0z7f0ab76" } }, { @@ -90487,8 +90620,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20201219, - 1952 + 20210103, + 1235 ], "deps": [ "dash", @@ -90501,8 +90634,8 @@ "spinner", "xterm-color" ], - "commit": "25d14f1794e55b7ceba4f7560c1fc27b53bcc32d", - "sha256": "0vvqlsmi9idkirz5i1clffrh0jcliigplbib7ayjwpyrbqqlacpx" + "commit": "4570312648cb8d4788f4fe749d67c0fce2de42e4", + "sha256": "1l6b0ljr6xwpjq46qgna2brprj81ppxwzhaj5s1xbwffzi67dc1z" } }, { @@ -90975,8 +91108,8 @@ 20200830, 301 ], - "commit": "4cfbf9985ed25b8ed919d0e59d5af31acdcbe21a", - "sha256": "0a6c6d0gq1v21nxdjrxnbhhfag6lfx452vxjb67syibiplbigndj" + "commit": "0f79135ef8d53d638012d4fd2bbc1b0f7bc22c04", + "sha256": "076hzca4ia0q8hv45i30k2h9g1m11iaimxhafs87a7hp2cmn7r9v" } }, { @@ -91366,6 +91499,39 @@ "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f" } }, + { + "ename": "scroll-on-jump", + "commit": "824ab5881f045a43056d9b143cc59267c43aec81", + "sha256": "03ra46xclmxrygpbbf05j9rx2q8qx70cxsqmhygqad5ij75h253k", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-scroll-on-jump", + "unstable": { + "version": [ + 20210103, + 2120 + ], + "commit": "69c86542a148222a7571506a2515fc52529d209d", + "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb" + } + }, + { + "ename": "scrollable-quick-peek", + "commit": "bd3e8860d02fcc30ee9692e09cd6492e164c0ec5", + "sha256": "09p63w6chb075agw1k90yg1xka5c6bjyhf70w534pik4jzm42lii", + "fetcher": "github", + "repo": "jpablobr/scrollable-quick-peek", + "unstable": { + "version": [ + 20201224, + 329 + ], + "deps": [ + "quick-peek" + ], + "commit": "3e3492145a61831661d6e97fdcb47b5b66c73287", + "sha256": "0gca860rhvcdjgm6k5pm6spznhg4787dqyjzfixvnffd5l93lcvc" + } + }, { "ename": "scrollkeeper", "commit": "d9ad5b16ff61c1f8ba1e030ee0988aa51a437022", @@ -91731,11 +91897,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20201226, - 1908 + 20210112, + 1945 ], - "commit": "4106b216f9b3ccf8960abe89fb9863c570a6f376", - "sha256": "045khkm5b62yagvw0588mmj91b6qapjmp7pzmj0x5i622k83zdxn" + "commit": "95ec10ead32a229bf392cd629a79b5683085bd4e", + "sha256": "159asv71ja4hpdzmc23q6j2c4ffdbr176bg311gmg7ivqalmi3jl" }, "stable": { "version": [ @@ -91761,8 +91927,8 @@ "prescient", "selectrum" ], - "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", - "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" + "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", + "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" }, "stable": { "version": [ @@ -92706,8 +92872,8 @@ 20201021, 552 ], - "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", - "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -92795,6 +92961,21 @@ "sha256": "0yy97yzc8v1h0vjpm6zbrdwy8sd931mscrbrq1svvv2y227s4ffl" } }, + { + "ename": "show-font-mode", + "commit": "c93262f233f73417528e1d4ec254d1c39970a994", + "sha256": "1yv2b9p7ccv21fznl0j4jxd2gzxhahbisacany0p18v1fbkj9njf", + "fetcher": "github", + "repo": "melissaboiko/show-font-mode", + "unstable": { + "version": [ + 20201225, + 2217 + ], + "commit": "8503be7966d3bd8316039b5f49d3c37c7b97d10c", + "sha256": "188d6fpi8cws0dhlcpgvvixbmf6045vb1r7psbd3sqciv29xm1yh" + } + }, { "ename": "showtip", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", @@ -93466,8 +93647,8 @@ "deps": [ "terminal-focus-reporting" ], - "commit": "0f2dcbeef2f924b7ae57a198472b2e059c92cee0", - "sha256": "05fpzg98a3s2rngyjqk4mp6rwln0x78nkqbsx5izivvx85ss26sq" + "commit": "f2d4031711714b100ec81aac321917c40cf20dc9", + "sha256": "1b3nav38g95iasm1shsmw2xbw2jkgf1djddaknywcff129faqb9f" } }, { @@ -93712,15 +93893,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20201216, - 2342 + 20210105, + 2148 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "15cf0609d30255405957bf0612fd6291fea438bc", - "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" + "commit": "48bfe6cccfdf879cd7137b00eb2ca160665a92f8", + "sha256": "1b3kjxjx30lan77vgiskvh9g5cqz4j44xa221vnh9ccixqwqhhim" }, "stable": { "version": [ @@ -93938,11 +94119,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20201218, - 2227 + 20210105, + 1102 ], - "commit": "613f597ecf72eb5719d4e13a4bfdbeb91373bf09", - "sha256": "0xayq42akw3aliagxxbnfqx6s0q3k6hbjn3r1481fpycs0ifpg9c" + "commit": "dffdf3caa12e964127d6eb45ba92ac0442cc5a48", + "sha256": "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn" }, "stable": { "version": [ @@ -94208,14 +94389,11 @@ "repo": "jojojames/smart-jump", "unstable": { "version": [ - 20201113, - 2039 + 20210110, + 214 ], - "deps": [ - "dumb-jump" - ], - "commit": "8c6e9bdc86ea492fa618361a56a9784cc923b3e1", - "sha256": "0zscn6396bl5g9rdw2p6vv5nf5vgmhx562k9vgb72l5m81lxfvyj" + "commit": "947499023b7c31b99fc172e2a4c1a105ad9c8555", + "sha256": "1yyyh1507lr4dlp39k8slwfz0fdjh2hx5ypn5zx5hyjjncw7x2r7" } }, { @@ -94944,11 +95122,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20201226, - 2348 + 20201231, + 1632 ], - "commit": "d3d7509c89c598be73f912aca34097ad4898794c", - "sha256": "0m3wfjmjnswhvki05jp6ih7k65qg8gj91x1nhvavg7pczd398r29" + "commit": "7ca25adc94148f182ac58c9f5d35f576a8a3131c", + "sha256": "1bpq8611yqvi7w58qylbyd2k7va6cbg12xyj6md7ipnq79wpfy4j" } }, { @@ -95085,14 +95263,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20201207, - 1431 + 20210112, + 1050 ], "deps": [ "dash" ], - "commit": "67f261c7b3d1a041e5c8964df680f8132703fc17", - "sha256": "03x5p135i2rshsvvsls2pl70mslzifzfznd310wiqgscg7vja1wy" + "commit": "93d124962106f4cec72e9c8ab8cb243c581d9d46", + "sha256": "11gsxakwmkymlmm8jjbkxi6ryhvfri06n2g8kh4s6abm15pnq6sh" }, "stable": { "version": [ @@ -95252,14 +95430,14 @@ "repo": "mtreca/emacs-theme-sorcery", "unstable": { "version": [ - 20200929, - 1001 + 20210101, + 1352 ], "deps": [ "autothemer" ], - "commit": "d438fe3f985f19ad0f7244ca780e474df8f31ce5", - "sha256": "01qpdp14vzlq3pzbw14ri1gwmw32lkijxsv1mn6b39m0xmsimnkj" + "commit": "5a1c4445b9e6e09589a299a9962a6973272a0c2f", + "sha256": "1b858049n6nw4qf60fmszjrhl80x7ssh32f7glj722kwy7404kdh" } }, { @@ -95798,11 +95976,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20201219, - 1245 + 20210109, + 1842 ], - "commit": "883b3e32573fad834ee4697924c8e57ac3007344", - "sha256": "09h26kwhh95xngb0p8y88xp8nq5vw4rp1mv960kyx41v5x7mmma6" + "commit": "e451b29f2702c60b664ad1e3e3ae253cfb969fa0", + "sha256": "0am4da6j5mianjj6ib5hf87z5v2q3wc8xlmgmna4mi70rx4bkz3x" } }, { @@ -96470,8 +96648,8 @@ 20200813, 1430 ], - "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3", - "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la" + "commit": "c10f71465a416050ee4b9633aeabaee823ff3ba9", + "sha256": "1a5bblc5sfd0akrvjs2hysjs7a9fz4p6y44l00nmk43yl7bh0678" }, "stable": { "version": [ @@ -96514,11 +96692,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20201222, - 709 + 20210111, + 2324 ], - "commit": "f26b37d8c32a033ab4dd7d5c707fd2f2dfccf85e", - "sha256": "0f59v8hmk9j0bfyga8h7ph6xxp72h88ky0g9qq8xisilw209lzji" + "commit": "669532e3cf56232f22c3b318fcd4961a3789ecc0", + "sha256": "0n6hy9g95jpxh919m4vfs82bxzbyxr45w9khx4ckpsq1bp60dq29" }, "stable": { "version": [ @@ -97423,26 +97601,26 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20200625, - 142 + 20210108, + 420 ], "deps": [ "cl-lib" ], - "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d", - "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b", - "sha256": "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99" + "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", + "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" } }, { @@ -97679,11 +97857,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20201009, - 831 + 20210111, + 1314 ], - "commit": "2a19e0aeea9dd90388d86d6adf2339c9c94b73e8", - "sha256": "17xdsgzjd4ys79053nmsfvhmx8c78zizka7hbka4y1j92lqm33gz" + "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9", + "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3" } }, { @@ -97992,8 +98170,8 @@ "deps": [ "ivy" ], - "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", - "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" + "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", + "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" }, "stable": { "version": [ @@ -98479,14 +98657,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20200909, - 1320 + 20210105, + 1400 ], "deps": [ "cl-lib" ], - "commit": "fbeb5c03b3ba94d7302c541ae7281a84de02b499", - "sha256": "1cwfnj0n64q632ldarhf2pg6nvkmw3hldb6kf60b96karp1qsrrc" + "commit": "ffe8b28907973fda775254432f88b55c92b5ae1f", + "sha256": "03qgrchvzw489594s6ghd0wmq53qzlxqsjlcwcnvlj185hg5fiwp" } }, { @@ -98590,11 +98768,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200426, - 1714 + 20210103, + 8 ], - "commit": "92c58d98bc7282df9fd6f24436a105f5f518cde9", - "sha256": "01hj46zgs7a1as0r0x451ag2fb40pp3gyzycvj0gm328grn6vpmk" + "commit": "05add2fe051846e2ecb3c23ef22c41ecc59a1f36", + "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr" }, "stable": { "version": [ @@ -98949,11 +99127,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20201207, - 1629 + 20210104, + 1044 ], - "commit": "d0199992b268784425b1724bf5899fc2dd22bc2e", - "sha256": "124qnfdcrwqnhpi7l2vgr56jik8yfv0d2rvhmpkv07h4kljrgwli" + "commit": "e1bfc473df22605355cdfbb2adc55296018e94be", + "sha256": "0zkrs8gq2pmyynhgahzrpgy9ndpg77ql213vrh18ksfzaywdpqml" }, "stable": { "version": [ @@ -99134,21 +99312,21 @@ }, { "ename": "telega", - "commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f", - "sha256": "0n1n1fciwh7jbakdjkx36aq6k0is0c694j3n5dicwvfp7spca7p8", + "commit": "e5d96e72c0fb942e001f3001ce907be0117705a7", + "sha256": "1qn6gw8dqh335am0wx6dnfc7qxw8djypvvzbk5sl1zmzsg562sbq", "fetcher": "github", "repo": "zevlg/telega.el", "unstable": { "version": [ - 20201231, - 918 + 20210112, + 1316 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3c290b48934a84cff271c10cf60b3b0afe007db0", - "sha256": "0kvi1azzcs25lvibakdqfqcfcjs843mg69nbis8bd92sadgbpzp7" + "commit": "f74d685028fcb93e9f51023f0e186f0f012c9523", + "sha256": "1nk145vy5rb1b9rvcb54w836ys1xlqrm86z91gaax3zk6r6xdqdq" }, "stable": { "version": [ @@ -99279,11 +99457,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20201206, - 302 + 20210111, + 521 ], - "commit": "3243c632bf3062eb1c576dd424378a9f419f6013", - "sha256": "1ggid3vfns9j9bxz33cik270fh0m170bal3044xs0mkfncah1q5a" + "commit": "6dd630e5786e500441b5acbfe5868d7172a2dbcf", + "sha256": "1kqxmainf31d1s2qbwanwzp9dij0i6zj9pp3833clnybf4l90cr6" }, "stable": { "version": [ @@ -100216,18 +100394,18 @@ 20200212, 1903 ], - "commit": "20bcade0c3554aefca82e52b982997f2ae5f3aed", - "sha256": "1gpkykhhcs5ccavicym2w7rhg2n9as1cxdcpdapnb8l735pz16sw" + "commit": "ca45993f45837d9e209a1d1ad4479abab2125a36", + "sha256": "18gdyyhizfhbdy39j8ch4z5yhvbahzswyj7q29c21f5phmkpq1fj" }, "stable": { "version": [ - 2020, - 12, - 21, + 2021, + 1, + 11, 0 ], - "commit": "9f04619abf9ecea78df57fcdc1d0cbe2e4c1f1eb", - "sha256": "1jy54salpfjanvr3qyz23z5lqkfl6m81r1d63v9gvr3hpvbsa801" + "commit": "c72b2fa29856d45c91f5ed6c98fca6d723246977", + "sha256": "1y2hjw2a0dq6vzyfg7hcn09dbw00rfyblzibf5i7s08jbvp2zzin" } }, { @@ -100277,14 +100455,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20200523, - 833 + 20210107, + 1831 ], "deps": [ "haskell-mode" ], - "commit": "4c79a3314dacd77d3e1327a3cc54361da8dffeec", - "sha256": "0fx7km09f70y7f5wmqs3j126jgryzxp66vbkvri6kcimxja36914" + "commit": "0a3a5f9d0aad689ad87649647944d6dca6c16bb5", + "sha256": "1lrwjxx0a3lalwbpndf751b1wn2yv3j2x58xa5kby63dxnxf77ph" }, "stable": { "version": [ @@ -100793,8 +100971,8 @@ "deps": [ "cl-lib" ], - "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", - "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" + "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", + "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" } }, { @@ -101162,8 +101340,8 @@ 20201101, 1045 ], - "commit": "0472cda711252b06fc07be184449b31933578148", - "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" + "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1", + "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk" }, "stable": { "version": [ @@ -101266,11 +101444,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20201220, - 1911 + 20210103, + 1546 ], - "commit": "4a2b7fdf75c6940b5b311d930ea26f7e85a08cd4", - "sha256": "0l0pabisi4x61svnrv8namlyc3nl7zpk3pkmfb4s5lx3rqdg8myf" + "commit": "90e640fe8fa3f309c7cf347501e86ca5cd0bd85e", + "sha256": "0fcwy6v409clw47mf6zir1qrkq9js1rh0f2wi8xijx3hidlqln0j" }, "stable": { "version": [ @@ -101300,6 +101478,25 @@ "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" } }, + { + "ename": "transient-posframe", + "commit": "616910997097f08d49004809cac3d995dcfe4bdc", + "sha256": "1dgcv51ychr575ckykwbz9cvnh6q9li4j11gg0mkqdd0x3srxfsf", + "fetcher": "github", + "repo": "yanghaoxie/transient-posframe", + "unstable": { + "version": [ + 20210102, + 130 + ], + "deps": [ + "posframe", + "transient" + ], + "commit": "dcd898d1d35183a7d4f2c8f0ebcb43b4f8e70ebe", + "sha256": "1aq1vbkww55xplyaa3xagz9z4kdlsxk13x054asnk0dqps4bcgbf" + } + }, { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", @@ -101308,14 +101505,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20201217, - 1922 + 20210106, + 2057 ], "deps": [ "let-alist" ], - "commit": "8e7e020cda8513c1dfeba911d0942640c7650348", - "sha256": "0ndcsyfbyhjvpg9asv0awa7dfj2fhzwhg42qx01kyr3bkb6gkjd0" + "commit": "7cf0d739a8a7834d6c3896b62122a0fc6953d371", + "sha256": "1gy4fmjpymabs4z5k3j07di6hqpx6w592w4qvq1iccapy1kqxbj1" }, "stable": { "version": [ @@ -101482,8 +101679,8 @@ "deps": [ "tsc" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ @@ -101506,15 +101703,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20201229, - 1827 + 20201231, + 1842 ], "deps": [ "seq", "tree-sitter" ], - "commit": "a1eddfabb41375eda84178531b944472599c25e7", - "sha256": "179zz3qw0iq7j6xjw9ga6wp5k52s71w7yfnmx0cy5afxn4wivfdi" + "commit": "a11aa84a768cff2d40db7ef0c6029742b7ce46a1", + "sha256": "1zxzmqdyw681vzxwhs7bi4xylqy99v0jajsv03mppsslxl4l2fwm" } }, { @@ -101525,14 +101722,14 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201221, - 1340 + 20210106, + 1552 ], "deps": [ "tree-sitter" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ @@ -101591,8 +101788,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201230, - 1245 + 20210108, + 1145 ], "deps": [ "ace-window", @@ -101605,8 +101802,8 @@ "pfuture", "s" ], - "commit": "bffb1d88eef63434022d26d6f822fb33c929348b", - "sha256": "0i01sxdm0wn7rgjf3g4wazkxdsl4b553l8vmcmas15a9mhzd2ahd" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101635,15 +101832,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200819, - 1950 + 20210107, + 1251 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" } }, { @@ -101654,15 +101851,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200716, - 2041 + 20210107, + 1251 ], "deps": [ "evil", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101685,14 +101882,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201005, - 1309 + 20210107, + 1251 ], "deps": [ "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101715,16 +101912,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201025, - 957 + 20210107, + 1251 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101748,16 +101945,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210107, + 1251 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -101781,16 +101978,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200901, - 1550 + 20210107, + 1251 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" } }, { @@ -101801,15 +101998,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200530, - 2129 + 20210107, + 1251 ], "deps": [ "projectile", "treemacs" ], - "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", - "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" + "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", + "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" }, "stable": { "version": [ @@ -102066,8 +102263,8 @@ 20201229, 1403 ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "3dd686565b222fb00ff54b374333b48598f5317c", + "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" }, "stable": { "version": [ @@ -102882,19 +103079,19 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20200304, - 2218 + 20210106, + 220 ], - "commit": "6a3f9e929489ebac5aa26862363410144d84409e", - "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8", - "sha256": "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" } }, { @@ -103056,11 +103253,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20190813, - 1436 + 20210110, + 1431 ], - "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6", - "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl" + "commit": "b46fc1d4cc5ab5c2bca3de1e5e43c8f53f1d343b", + "sha256": "1g84ynppdv46lhsrl0bgvdvlkijhzns4knkldgmbdhsjafvnz8cw" } }, { @@ -103475,14 +103672,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20201110, - 2133 + 20210106, + 2145 ], "deps": [ "bind-key" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103514,8 +103711,8 @@ "key-chord", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103577,8 +103774,8 @@ "system-packages", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -103667,8 +103864,8 @@ "deps": [ "s" ], - "commit": "74ab3e375f2f6ddf786d7a520319f95203a47d26", - "sha256": "0wjqy000kaqgkkjvg7bq8qnpnma1cy6vl7sqdfsdiqy2952s2wz0" + "commit": "e1cab50306375d1868ce8ab42394ed508bb67cb9", + "sha256": "12s6c94f9nxpf97crd8p6l844hrvgjbdryy7qpmybvb9zqlxlm9s" }, "stable": { "version": [ @@ -103709,17 +103906,17 @@ 20190715, 1836 ], - "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507", - "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2", - "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq" + "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", + "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" } }, { @@ -104397,20 +104594,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20201231, - 1142 + 20210104, + 2336 ], - "commit": "9bdad040c342dfd513f0c65bde5d938f41da24e6", - "sha256": "0pxzl927pmz851fs3zlhggrk9dryh929sqn4kyql6arpf53jsyir" + "commit": "7ee2d15a14985f30ca2a750691817634b2382b38", + "sha256": "1viv0l0mrlavqnv57isjwza4dig3488i3d9gmb44n8dhjarfpv86" }, "stable": { "version": [ 2, 13, - 0 + 1 ], - "commit": "e714404d8b190e4c82383f9ffe1ff613f3efebe7", - "sha256": "0116n67d3d26mvifs6a7pn2yvj511nrmmnjkykjfb5i8dhpa0lyq" + "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", + "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" } }, { @@ -104882,8 +105079,8 @@ 20201229, 2303 ], - "commit": "ad76c1692e822c0d032e926136011673e9b03aa4", - "sha256": "1j2fb7v8qvs9wkgrfqaddg7sy7w31r9ry25zd2xxhkvda1l80xx7" + "commit": "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2", + "sha256": "1zg69lqg7yxxr4bw5lhcs5r8pljqalxqqbzvv3zrcifx7n24qzi9" }, "stable": { "version": [ @@ -105184,11 +105381,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20201206, - 205 + 20210111, + 522 ], - "commit": "a670b786539d3c8865d8f68fe0c67a2d4afbf1aa", - "sha256": "0s244crjkbzl2jhp9m4sm1xdhbpxwph0m3jg18livirgajvdz6hn" + "commit": "9d2ef5e535e79781a0c1d2523f82d096eb48765f", + "sha256": "03nslg391cagq9kdxkgyjcw3abfd5xswza5bq8rl8mrp9f8v7i17" } }, { @@ -105386,11 +105583,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201224, - 4 + 20210105, + 2310 ], - "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", - "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" + "commit": "f29aadae07bd58689720271b1f6538edfec5c476", + "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" } }, { @@ -105466,8 +105663,8 @@ 20200730, 240 ], - "commit": "7626678315918bdbb81ede68149f20a7d97a928f", - "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0" + "commit": "5e6deddda7a70f4b79832e9e8b6636418812e162", + "sha256": "195h5dnanicxksag72kp19nvsxsbqb34pr3pk6shki6yca2ks7yg" } }, { @@ -105611,16 +105808,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20201128, - 2357 + 20210105, + 1556 ], "deps": [ "apel", "flim", "semi" ], - "commit": "5db307a0441b6b7aa4ecfd34344842d78f15611b", - "sha256": "03044c5lq9j5i1a5d0wy195m1n7353g2kjldinbla650fhwjhix1" + "commit": "cf16d1272cd04ccc845476a1db9fb2ab690b0f55", + "sha256": "05mx1g5gqrbzl4p41kxsk2hl15vrfx8nf97xf2zn9c9s8nq0qj0n" } }, { @@ -105992,6 +106189,36 @@ "sha256": "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj" } }, + { + "ename": "weblorg", + "commit": "8c9f6e5452a31772f90c1b5a5fa34b5a833073bb", + "sha256": "0gcxksn353zl0kzi387dm3fyy9n4gpjsjy5qlbr7iq4pcby4zbjb", + "fetcher": "github", + "repo": "emacs-love/weblorg", + "unstable": { + "version": [ + 20210111, + 526 + ], + "deps": [ + "templatel" + ], + "commit": "1d0b5b9bc640a7147e1aa42867c7794fb5d039cc", + "sha256": "1fanpp3a40fkwdxc3ixvz6ykvkxh61mq2jxl1dgf0rrxc82mzhms" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "templatel" + ], + "commit": "5ef2daff8498be07ea9b0f50a92d84c8d21d3a49", + "sha256": "14797vv2i3b5dgzdazacw2g9r3i5zam4xr3554xzpq1l8ran0g2p" + } + }, { "ename": "webpaste", "commit": "13847d91c1780783e516943adee8a3530c757e17", @@ -106032,25 +106259,25 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20201122, - 246 + 20210110, + 17 ], "deps": [ "cl-lib" ], - "commit": "36deb3ff85368d000a88435d5a645ffbab490654", - "sha256": "08q24pp6r8s74bxah6lk0rs9y4bygfpl4pcpw2yngd5i4wajsjvx" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" }, "stable": { "version": [ 1, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "491a60b8bb8a6c3bd081c70354ab82040b0a7db3", - "sha256": "0g0vy2yc118mcka9f26950gdmb780zpxck9y6nli602vj32dw1g2" + "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", + "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" } }, { @@ -106643,6 +106870,40 @@ "sha256": "0qcnqwiylkkb7132bzra49k7jg8kq13jif8096vpg4xzpcq5lpj2" } }, + { + "ename": "wikinfo", + "commit": "c92d75c776bd5ef84b6e5991f4a9d1398b7044a3", + "sha256": "12vdymysak2d8xn3jklcvl7nw7w7ldkb6jyyvlwsf5z6sk8b3rx8", + "fetcher": "github", + "repo": "progfolio/wikinfo", + "unstable": { + "version": [ + 20210112, + 324 + ], + "commit": "b3c2824ab7cd653741b2b905f5c3279e312857cc", + "sha256": "01l3qwaqrcgrwlvfhxw2db06svcqhiahp6jbn8x8k5fmq7mk5hr3" + } + }, + { + "ename": "wikinforg", + "commit": "536407ae580d8921f40cb1480c0443ad3df5078c", + "sha256": "0v80kaq63h3a2ybfmwk0vm6n6fg4891m9arq6psd0y7f77af9hrs", + "fetcher": "github", + "repo": "progfolio/wikinforg", + "unstable": { + "version": [ + 20201227, + 1454 + ], + "deps": [ + "org", + "wikinfo" + ], + "commit": "8496c243f8d98ba2787b63f7d19fbae3831832d2", + "sha256": "1w7q3badp6r653grsblmnambv99r52c34gmnpdz0f5ybmw83002p" + } + }, { "ename": "wilt", "commit": "eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70", @@ -106921,11 +107182,11 @@ "repo": "dgtized/winnow.el", "unstable": { "version": [ - 20170903, - 1206 + 20210105, + 1919 ], - "commit": "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3", - "sha256": "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv" + "commit": "761b15bc31696a4f80c5fd508c84b1f5b4190ec2", + "sha256": "1hl208sl8vq6mjv9a3f4xmj7732jy3mw4bikxcs5c1drlmqr3mxs" } }, { @@ -107036,14 +107297,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20201030, - 1232 + 20210110, + 1545 ], "deps": [ "async" ], - "commit": "6735180e73e787b79535c245b162249b70dbf841", - "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k" + "commit": "139ef3933ea7aa3fe67b87450a6a1ac0895e5c81", + "sha256": "1zdgn2ajpbdxnc7qf98z7590w8y1s0iqj27fv7m8ndkrn8c1cx0x" }, "stable": { "version": [ @@ -107795,11 +108056,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20201014, - 1717 + 20210112, + 109 ], - "commit": "fd7200afd199a52aea560173689039015aac595d", - "sha256": "0lg5yg1ckbqi5rw8y9jjymdqxl2z8ka959vghkbk7s9h8v6sidpq" + "commit": "134f9d259b68f5c3644dbed203d0d4142e2f3ce9", + "sha256": "15x15dzk67xif8ybnv9jid5xzmwimxx086ysdhryqqzrlxc3igiq" } }, { @@ -107810,11 +108071,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20201219, - 552 + 20210111, + 334 ], - "commit": "c66b54d4c683289a41db823df5da73174184c12b", - "sha256": "071y34n995a391v59n0mdz0y210gkx8p4r4p36yzazkrvhmqkjk3" + "commit": "8948fa8f18023868731a1666f9893abc08f370e1", + "sha256": "1qk1scf085fc650km5hx2fp2chxj1a2hwp4bffxmp59mg78qpb71" } }, { @@ -107825,11 +108086,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20201228, - 107 + 20210111, + 510 ], - "commit": "4e273efcc6f94535e58461c2e9cb0d14fd6d7f6d", - "sha256": "0lwyd9kif0lgm1gawv19jmhraabnrqsqpmvh7pd3g1cmyn2chnkh" + "commit": "bfb3c65ea6e578abab5294c1ef003ac0784446eb", + "sha256": "0jffl3fq7yzdfpk7jy45bwll88q6ds9bk218xgnhs6sfwk55k94d" } }, { @@ -107900,11 +108161,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20201219, - 741 + 20210109, + 1741 ], - "commit": "fa239bf4eaf30858bb40fc8d3c1fa1372faacc42", - "sha256": "1rjclwr4wq7k1bqf9di0smjqyh6aqhzvy7xzj2w28iy6al1b80zw" + "commit": "a051568c21b0bd7907dffebdbe04d0110c038be0", + "sha256": "0z3cvajj5cf23h8lxlj10wm8rxh7vjpnsk8svryx5djd26ffpc11" } }, { @@ -108021,8 +108282,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20201223, - 923 + 20210103, + 1339 ], "deps": [ "aio", @@ -108033,8 +108294,8 @@ "f", "s" ], - "commit": "902b909cf637dc84178abe897b12ac175f8638fc", - "sha256": "0zl4f64v9avpwfn15lbziangd69f83v7n9hvbsh4d4ipdb3yx9x6" + "commit": "5812aa55a816bb66d90443a6a634069d9fbfecf1", + "sha256": "1nwhrbpqgbcv1467zyjwww6r04k965fkrkc5v3iqzkg88ld43sj0" } }, { @@ -108319,6 +108580,21 @@ "sha256": "0kg1vdyjd0n48cb8bvjqskzd79s3bgdcpzn80gm2y78m280kakn8" } }, + { + "ename": "xref-rst", + "commit": "2f6748512dc546f84b13733086cefb158bc7787c", + "sha256": "0crzzalphr4865a78wih085ycscg78h288hlq0dh6qk50siaxk1m", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-xref-rst", + "unstable": { + "version": [ + 20210110, + 640 + ], + "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7", + "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6" + } + }, { "ename": "xresources-theme", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -108845,11 +109121,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20201018, - 1346 + 20210108, + 1826 ], - "commit": "cd66d81c5d4ba39da3c385d12d22f7103ecd67c5", - "sha256": "04mhjh163gp2shivxhilpacy22lrd2vswjf7934ldphw8qfahl2f" + "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1", + "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3" }, "stable": { "version": [ @@ -108917,14 +109193,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20201221, - 849 + 20210105, + 1346 ], "deps": [ "yasnippet" ], - "commit": "1f90ffb80e1da458a8cccf09add2f5fd952f1642", - "sha256": "0yg435j6wv4jalfpndqhy8xb0cviak9kpv38yby9zjzcjc9dcsg7" + "commit": "899c027f442587e0f8ef90761f58b27907ca64b4", + "sha256": "1vl2y271y4vlgpnjb1fa24fsd77zmzha2miyqwnf9n9pdd96brjg" }, "stable": { "version": [ @@ -109487,20 +109763,20 @@ "repo": "eutropius225/zenscript-mode", "unstable": { "version": [ - 20201206, - 2129 + 20210102, + 1350 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a", - "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4" + "commit": "c33b4525502459fe60dd76b383e19919d450aeb8", + "sha256": "0v4limzd9d95wp7f32acln0h245d0zr88jb4a4szl053p6ynvbq0" } }, { diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index fc5657e4419..886019716d4 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -2,18 +2,20 @@ #! nix-shell -i bash -p curl nix set -euxo pipefail +export NIXPKGS_ALLOW_BROKEN=1 + # This script piggybacks on the automatic code generation done by the nix-community emacs overlay # You can use this to avoid running lengthy code generation jobs locally curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages --show-trace +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix +nix-instantiate ../../../.. -A emacs.pkgs.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaStablePackages +nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaPackages +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index b5de993eaa7..bd965c8f128 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let + emacsEnv = pkgs.emacs.withPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 0f3ececd37d..eef98943c3b 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,6 +11,7 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz +, dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin @@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - -in stdenv.mkDerivation (lib.optionalAttrs nativeComp { +let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // lib.optionalAttrs stdenv.isDarwin { @@ -175,6 +174,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; + pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); }; meta = with lib; { @@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { separately. ''; }; -}) +}); +in emacs diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 168c1d06b31..950229baee0 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -13,4 +13,5 @@ kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; + quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index 657f4a19bbf..8a91f829c0c 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -4,12 +4,13 @@ assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; stdenv.mkDerivation { name = "kak-fzf"; - version = "2020-05-24"; + version = "2020-07-26"; + src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "b2aeb26473962ab0bf3b51ba5c81c50c1d8253d3"; - sha256 = "0bg845i814xh4y688p2zx726rsg0pd6nb4a7qv2fckmk639f4wzc"; + rev = "f23daa698ad95493fbd675ae153e3cac13ef34e9"; + hash = "sha256-BfXHTJ371ThOizMI/4BAbdJoaltGSP586hz4HqX1KWA="; }; configurePhase = '' diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix new file mode 100644 index 00000000000..f2fb1f5d57c --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, lua5_3 }: + +stdenv.mkDerivation rec { + pname = "quickscope-kak"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~voroskoi/quickscope.kak"; + rev = "v${version}"; + sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; + }; + + buildInputs = [ lua5_3 ]; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins/ + cp quickscope.* $out/share/kak/autoload/plugins/ + # substituteInPlace does not like the pipe + sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak + ''; + + meta = with stdenv.lib; { + description = "Highlight f and t jump positions"; + homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7ea76c9a824..c2e8a47420e 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -167,8 +167,6 @@ in variant = "gimp"; }; - ufraw = pkgs.ufraw.gimpPlugin; - gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; name = "gimplensfun-${version}"; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix deleted file mode 100644 index c30aeb15a0c..00000000000 --- a/pkgs/applications/graphics/ufraw/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub - -, autoconf -, automake -, autoreconfHook -, bzip2 -, cfitsio -, exiv2 -, gettext -, gimp ? null -, gtk2 -, gtkimageview -, lcms2 -, lensfun -, libjpeg -, libtiff -, perl -, pkgconfig -, zlib - -, withGimpPlugin ? true -}: - -assert withGimpPlugin -> gimp != null; - -stdenv.mkDerivation { - pname = "ufraw"; - version = "unstable-2019-06-12"; - - # The original ufraw repo is unmaintained and broken; - # this is a fork that collects patches - src = fetchFromGitHub { - owner = "sergiomb2"; - repo = "ufraw"; - rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6"; - sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7"; - }; - - outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; - - nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ]; - - buildInputs = [ - bzip2 - cfitsio - exiv2 - gtk2 - gtkimageview - lcms2 - lensfun - libjpeg - libtiff - zlib - ] ++ stdenv.lib.optional withGimpPlugin gimp; - - configureFlags = [ - "--enable-contrast" - "--enable-dst-correction" - ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; - - postInstall = stdenv.lib.optionalString withGimpPlugin '' - moveToOutput "lib/gimp" "$gimpPlugin" - ''; - - meta = with lib; { - homepage = "https://github.com/sergiomb2/ufraw"; - - broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 - - description = "Utility to read and manipulate raw images from digital cameras"; - - longDescription = - '' The Unidentified Flying Raw (UFRaw) is a utility to read and - manipulate raw images from digital cameras. It can be used on its - own or as a Gimp plug-in. It reads raw images using Dave Coffin's - raw conversion utility - DCRaw. UFRaw supports color management - workflow based on Little CMS, allowing the user to apply ICC color - profiles. For Nikon users UFRaw has the advantage that it can read - the camera's tone curves. - ''; - - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ gloaming ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index db07b9e1db4..598a9413826 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" echo '#!${runtimeShell}' > "$out/bin/zgrviewer" - echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" + echo "${jre}/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; meta = { diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9568c38d434..772754ecc6d 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -74,7 +74,7 @@ with python3.pkgs; buildPythonApplication rec { description = "Private cmdline bookmark manager"; homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a61740434e6..8433cc9c87f 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.4.19"; + version = "1.6.7"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj"; - x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw"; + x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb"; + x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix new file mode 100644 index 00000000000..b0252465bde --- /dev/null +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook, lib, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "masterpdfeditor4"; + version = "4.3.89"; + + src = fetchurl { + url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + }; + + nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; + + buildInputs = [ qtbase qtsvg sane-backends stdenv.cc.cc ]; + + installPhase = '' + runHook preInstall + + app_dir=$out/opt/masterpdfeditor4 + mkdir -p $out/bin + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + + install -Dm644 -t $out/share/pixmaps masterpdfeditor4.png + install -Dm644 -t $out/share/applications masterpdfeditor4.desktop + install -Dm755 -t $app_dir masterpdfeditor4 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $app_dir/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $app_dir + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor - version 4, without watermark"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 8597e92f401..d437cfda44f 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.2"; + version = "2.8.4"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "0y26vfgrdym461lzmm5x3z5ai9ky09vlk3cy4sq6hwlj7mzcz0k7"; + sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index bd45e742f54..13f9178f330 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, python27Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: -python27Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "printrun"; - version = "1.6.0"; + version = "2.0.0rc5"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; rev = "${pname}-${version}"; - sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l"; + sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; }; - propagatedBuildInputs = with python27Packages; [ - wxPython30 pyserial dbus-python psutil numpy pyopengl pyglet cython + propagatedBuildInputs = with python3Packages; [ + appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial ]; doCheck = false; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix new file mode 100644 index 00000000000..2a6d613ed57 --- /dev/null +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + version = "0.2.2"; + pname = "reddsaver"; + + src = fetchFromGitHub { + owner = "manojkarthick"; + repo = "reddsaver"; + rev = "v${version}"; + sha256 = "0802jz503jhyz5q6mg1fj2bvkl4nggvs8y03zddd298ymplx5dbx"; + }; + + cargoSha256 = "0z8q187331j3rxj8hzym25pwrikxbd0r829v29y8w6v5n0hb47fs"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + # package does not contain tests as of v0.2.2 + docCheck = false; + + meta = with stdenv.lib; { + description = "CLI tool to download saved images from Reddit"; + homepage = "https://github.com/manojkarthick/reddsaver"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = [ maintainers.manojkarthick ]; + }; + +} diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix deleted file mode 100644 index e678da0a436..00000000000 --- a/pkgs/applications/misc/todolist/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "todolist"; - version = "v0.8.1"; - - goPackagePath = "github.com/gammons/todolist"; - - src = fetchFromGitHub { - owner = "gammons"; - repo = "todolist"; - rev = version; - sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; - }; - - meta = with lib; { - description = "Simple GTD-style todo list for the command line"; - homepage = "http://todolist.site"; - license = licenses.mit; - maintainers = with maintainers; [ uvnikita ]; - }; -} diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix new file mode 100644 index 00000000000..2943fe29f4a --- /dev/null +++ b/pkgs/applications/misc/ultralist/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ultralist"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "ultralist"; + repo = "ultralist"; + rev = version; + sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Simple GTD-style todo list for the command line"; + homepage = "https://ultralist.io"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; + }; +} diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index f89d6eebb5e..6636691468e 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -2,25 +2,26 @@ stdenv.mkDerivation rec { pname = "3proxy"; - version = "0.8.13"; + version = "0.9.3"; + src = fetchFromGitHub { owner = "z3APA3A"; repo = pname; rev = version; - sha256 = "1k5rqldiyakhwhplazlhswkgy3psdkpxhn85605ncwaqx49qy8vk"; + sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8="; }; + makeFlags = [ + "-f Makefile.Linux" "INSTALL=${coreutils}/bin/install" - "prefix=$(out)" + "DESTDIR=${placeholder "out"}" ]; - preConfigure = '' - ln -s Makefile.Linux Makefile - ''; + meta = with lib; { description = "Tiny free proxy server"; homepage = "https://github.com/z3APA3A/3proxy"; - license = licenses.gpl2; + license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.misuzu ]; + maintainers = with maintainers; [ misuzu ]; }; } diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index 925cc1a4f91..e951f4c53c0 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -1,25 +1,23 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "amfora"; - version = "1.6.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7"; + sha256 = "KAOIx401G/kB/TclhidOnUja1P+mLo/mUwAqGJfVfyg="; }; - vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8"; + vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop install -Dm644 amfora.desktop -t $out/share/applications ''; - doCheck = false; - meta = with lib; { description = "A fancy terminal browser for the Gemini protocol"; homepage = "https://github.com/makeworld-the-better-one/amfora"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8baa7cc7b4f..e7661c32caa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "89.0.4381.6", - "sha256": "031w24qf5cn9y30pgh736g67p6c10kwpflhvxa24h0v99gqnah2i", - "sha256bin64": "1fssdxllq2ncpy8s7ykbq33456hfjlgj1m5147wbg2c5k36rj78s", + "version": "89.0.4385.0", + "sha256": "0cwfwkaidxi86n80kcn3lxrwz90zp6ra9dib1nd4xnhpgl7vjjjf", + "sha256bin64": "1hvrdvmlqc95qb9gn7iihal4h1kzf6jqrhk9xvv45chsvwl79pmd", "deps": { "gn": { "version": "2020-12-22", diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix new file mode 100644 index 00000000000..4ade911e1c7 --- /dev/null +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libunistring +, openssl +, pcre +, SDL2 +, AppKit +}: + +stdenv.mkDerivation rec { + pname = "lagrange"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "skyjake"; + repo = "lagrange"; + rev = "v${version}"; + sha256 = "1l9qcymjwg3wzbbi4hcyzfrxyqgz2xdy4ab3lr0zq38v025d794n"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ libunistring openssl pcre SDL2 ] + ++ lib.optional stdenv.isDarwin AppKit; + + hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv Lagrange.app $out/Applications + '' else null; + + meta = with lib; { + description = "A Beautiful Gemini Client"; + homepage = "https://gmi.skyjake.fi/lagrange/"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 5190f1a7b53..9ea122fc7f6 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -104,5 +104,6 @@ in stdenv.mkDerivation rec { license = [ licenses.mpl20 licenses.gpl3 ]; maintainers = with maintainers; [ TheBrainScrambler ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; # 2021-01-07 }; } diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 4009bf96cd4..e4b9e8c2f1b 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.8"; + version = "2.12.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh"; + sha256 = "04r3y71l9849wlhpzzcg2wcqnqdp5nnnhy4s205rp9xswa3mw0k3"; }; - vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; + vendorSha256 = "0m24wi91638zyrp7mpri4862dbx1p0glscjd0hdy0xb56vcr3i09"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 2800df052b5..e368ecff868 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.5.0"; + version = "0.5.9"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n"; + sha256 = "1fic1hgsjhail9p2ki7qqr0vl5av3gfb8y3h9ygzq4j869780bsq"; }; - vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k"; + vendorSha256 = "15zn40pi1rw0yqxm9fpmj4l179rg846r3m89imh96g2v3gk8qqcv"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index aeaff2ff5f1..a2bb9da6805 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p"; + sha256 = "0xb2zlpkh9cwinp6zj2jpv4wlws042ad1fa0wkcnnkh0vjm6mnrl"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 83704f9ea93..387165150ea 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MbhJ1f6Da+kkkCV85kH8Yv74cMzp7JvxeQb0By9aGp8="; + sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q"; }; vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0="; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1b2cd7d598a..cc5931f08ed 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_9, element-web +, electron, element-web }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -15,8 +15,6 @@ let rev = "v${version}"; sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; - electron = electron_9; - in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -57,7 +55,7 @@ in mkYarnPackage rec { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/riot-desktop/blob/develop/package.json + # https://github.com/vector-im/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; diff --git a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index ecca3018e76..69d0d3d7072 100755 --- a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -4,12 +4,12 @@ set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the element-desktop package." - echo "Usage: $0 " - exit 1 + echo "Regenerates the Yarn dependency lock files for the element-desktop package." + echo "Usage: $0 " + exit 1 fi -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1" wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 015e7fdbdf4..3d1fc19113c 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v" + version; - sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n"; + rev = "v${version}"; + sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; }; - vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x"; + vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 4dfca92f39f..0a354b230ce 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch -, autoconf-archive +, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk-pixbuf ? null @@ -22,20 +21,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5"; + sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r"; }; patches = [ - (fetchpatch { - url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch"; - sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k"; - }) ./patches/packages-osx.patch ]; @@ -80,6 +75,8 @@ stdenv.mkDerivation rec { homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; + changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; + downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; updateWalker = true; }; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 614ceeb0c32..6a6302e7495 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -3,7 +3,7 @@ let inherit (python27Packages) python; requirements = (import ./requirements.nix { - inherit stdenv fetchurl; + inherit lib fetchurl; pythonPackages = python27Packages; }); diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index c15b7ac45dd..8277028ac7b 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , pythonPackages }: @@ -8,7 +8,7 @@ let xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; @@ -28,7 +28,7 @@ in { pyfeed = (buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; @@ -49,7 +49,7 @@ in { wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 44df5f6be68..535a356bbaa 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.4"; # Please backport all updates to the stable channel. + version = "1.39.5"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; + sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 83d009e40e8..aee21dca645 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -19,18 +19,22 @@ python3Packages.buildPythonApplication rec { setuptools ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "lieer" ]; + meta = with lib; { - description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; - longDescription = '' + description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; + longDescription = '' This program can pull email and labels (and changes to labels) from your GMail account and store them locally in a maildir with the labels synchronized with a notmuch database. The changes to tags in the notmuch database may be pushed back remotely to your GMail account. ''; - homepage = "https://lieer.gaute.vetsj.com/"; + homepage = "https://lieer.gaute.vetsj.com/"; repositories.git = "https://github.com/gauteh/lieer.git"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ flokli kaiha ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ flokli kaiha ]; }; } diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index c49866ed9c6..570b2d13be1 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable -, gtkmm3, libpeas, gsettings-desktop-schemas -, python3, python3Packages -, vim ? vim_configurable.override { - features = "normal"; - gui = "auto"; - } -, ronn +, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 + +# vim to be used, should support the GUI mode. +, vim ? vim_configurable.override { features = "normal"; gui = "auto"; } + +# additional python3 packages to be available within plugins +, extraPythonPackages ? [] }: stdenv.mkDerivation rec { @@ -20,22 +20,30 @@ stdenv.mkDerivation rec { sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3"; }; - nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + cmake ronn pkg-config wrapGAppsHook gobject-introspection + python3 python3.pkgs.wrapPython + ]; buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas - python3 python3Packages.pygobject3 + python3 notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme glib-networking protobuf - ] ++ (if vim == null then [] else [ vim ]); + vim + ]; postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc ''; - postInstall = '' - wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8 + pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages; + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + ) ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a9a82dc67c0..cc24e13810e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,6 +86,12 @@ stdenv.mkDerivation rec { gdb man emacs ]; + # Expects there to always be a thread with ID + # thread:0000000000000009, but notmuch new is non-deterministic so + # this isn't always the case. Upstream bug report: + # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is + NOTMUCH_SKIP_TESTS = "lib-thread"; + installTargets = [ "install" "install-man" "install-info" ]; postInstall = stdenv.lib.optionalString withEmacs '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index b7858ba14e9..faf4fd7b452 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.6.0"; + version = "78.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/af/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/af/thunderbird-78.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f8fd3a1f0e869ee03a4f120c88b606fbe4ae35d9865394fccd291caa9ae7069"; + sha256 = "f6fb6e449dbfb7478b5faffa0118845a2e55fb09e27f6b4bc63c4d8abd2f5db5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ar/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ar/thunderbird-78.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "73e7beba4e5a2b9cd92ded3ee8e662be9a80d65d59790ed1d5401b5a61c8d147"; + sha256 = "33f0010135377291851e06fd43fe797fc331d93e018e4410b878ea7056e149b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ast/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ast/thunderbird-78.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "890cda9e6a9582d43d61c9b4deb2241f46d34dbac5516d9a808dfbb472a22eec"; + sha256 = "a5b4e9007b68abb9100f757d62ab976a4ecd8e7f389f896411b9957ecc175b62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/be/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/be/thunderbird-78.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b951394def900c975b2796e47d948c03c59f0fde445f22d1b9a0d89ae8b7dd83"; + sha256 = "ed9846f9e06dcbc60b6dfb08814d19111558f91e96181b73338af8dc30b89ad7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/bg/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/bg/thunderbird-78.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2440a8ea3a49d4fe7a84b0c6e67a98889bf98c5f828699bd980705c100a0e585"; + sha256 = "c45a472030b9c42931966a8f90e0d9de9364a4bcca721678090a6702480a1a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/br/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/br/thunderbird-78.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "74b48030e64ff509379dd92d08734804006a8cc6176c69e387e03596138c48b0"; + sha256 = "37cda6ed4d6296d58b18b8325eeeeccc24088029999c4146ce429ff131eefab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ca/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ca/thunderbird-78.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4b951a13352db2cc90aadf94c1e57bc5b40660d82dab855aa80751bbce9aa3b8"; + sha256 = "be91d650c2e8e26afe64373c8ad9213c9b3f903c0037ef9fe215ac4b46b2fe4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cak/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cak/thunderbird-78.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bfb2ebc8a6b376603b9e310ad664a099725a29183c67b02ee13ecf3eb9a3bdac"; + sha256 = "5dab8ad6ab718855237fa5b43ac687e117e7eaeabc1702fe3cfc49af2f62fdf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cs/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cs/thunderbird-78.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "de30e9d948ade3c82b7ebd58a3bbed5e880abcdb2d9c58f8e64d9d3d78bb336d"; + sha256 = "a6c4afa14cefb505aade5a9d8b48a12d9d4f4823c8db7356eb635dc1c492f592"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cy/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/cy/thunderbird-78.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b7d0bb95acb861c453d8649673d9e582920a6df6a9662b8a6f996636d54c68c2"; + sha256 = "f45e222a10bdfe13c51a49e834d10f00320d7cd4093160d7b3616fce01a208ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/da/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/da/thunderbird-78.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2c4765b34f1d63a9eae942531b7f489150d6850f68487565082ea18c94f3ad0d"; + sha256 = "618d582a161d7ee6e7d304e200486b0af7df6cb1a0d154de9fd5ed208e71ef07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/de/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/de/thunderbird-78.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e29280a519f4eca06d4e5862085d8fb8cefb9577918ba953cdc6f63ffc44a6ed"; + sha256 = "79f86cc42efb58ba5b1da6d99c4f17ecbeafe235ed6fe03d772d48e3a4f9f4b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/dsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/dsb/thunderbird-78.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d638be5a999fd1b287628b449235e9995169c06c2cf46d1f7e6de282bf4357b8"; + sha256 = "13a929d9848809c9e44fe6d564fdd796fd3aa87103f6c9cbe5797d73ba4a858a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/el/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/el/thunderbird-78.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "34cbbca7eb8ecd5078d52d429b76ed0b5334398040d6e00aa5b5926bf8eeaba8"; + sha256 = "fb520853ca5aac6380411e86858f58040369100ef1602452d0b1d12dafa4bd89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-CA/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-CA/thunderbird-78.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d50be05404a4b51e3a9c2fc4a73d75504f11e12a7ba7331ca43d5f078f462303"; + sha256 = "ca00e11b378e00a1c551b45608e8261ca5cef088975925030b1c3294f8cd6935"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-GB/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-GB/thunderbird-78.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4d11d73b268369117861250f4fecd5c6d19a904145caaaeb7ee86c7eb9e63f9f"; + sha256 = "fb792943477dfb5210b071832474e27a66290af49ed3204adbaef301bf97b9a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-US/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/en-US/thunderbird-78.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6691e528ac3fc88a023507e1172d67daac235fa1fce97e75e6fbd7072a493e0f"; + sha256 = "442cd017c9aa5321b7f59ca165f4a687e3619d2d5fefcb9af3127d2d8d0a69f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-AR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-AR/thunderbird-78.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2f45d7f6e42fdef4f8bb8ab815879157cd962c91afa352a35f8cbc3fcf52fd82"; + sha256 = "c3b14e63e75efa1411480a8fb9df4e5f57c733f1782f122514c324d2cb943cbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-ES/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/es-ES/thunderbird-78.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7bf50cefecce82e20c06441f003cc51eb7cc16d3a0e55a118213eee78e8b8494"; + sha256 = "f0aad6c895034cd01d55a9e17f3ec81912767b46b3d1db65da24884ee2dfe532"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/et/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/et/thunderbird-78.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2b2c624808f75ae0d713ad37e9959ad518ae5702caa10845fb3aa8089e77bc9c"; + sha256 = "07b29082709f888febae991196c05fc3de3b87a5b7371000d002ac59870c7d45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/eu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/eu/thunderbird-78.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3495821650563af2a62f36f928fb7503568de920211b9ef2f21904884d4fa3ef"; + sha256 = "0b49e505114f24832f337d265a9bf092d25e653790c595c698f3e11a82fd11d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fa/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fa/thunderbird-78.6.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "90b9ff389550e5801bc7ca7e1e4d7db5b281081bef2d0d30b7c2e9799e8cd0c9"; + sha256 = "b333b2a40b4c57ed00c9833bb32a88a72a4db3e4b376db07b84fc146df9fc6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fi/thunderbird-78.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cd5819b7ed9e3017cbef8e1ca33cb92e1804fc8ece9edf6a74133db90b61ee6f"; + sha256 = "5e484dc76a50f77fbc24fac3c8d11f2b4501a3488b8dcc7cb5517b263833966c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fr/thunderbird-78.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "82b382d1ea014a26a397c3fe06c586732df756104533c7450494ad43b11e43a5"; + sha256 = "63e95323a8b93831516ce0015a052d316a6d501f6c7a4a0b1bed6dd367367aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fy-NL/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/fy-NL/thunderbird-78.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3b4b0c4a23ad63f2d152eb8741a30fe4092c2d37d1bbb2cd56eb75c85d885f4a"; + sha256 = "d05e85a3fa9a212160821bcf26cde73eab17ddd1f879c4e1e5d46d28f27bdf17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ga-IE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ga-IE/thunderbird-78.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "093b76080942d3e7584f7948dc65003c20878e8bf4bec4808669f012183cf97f"; + sha256 = "475f4176d529afcc25b5480762ac0cfddaf61e0bd95fffc3761c152b10094ba1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gd/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gd/thunderbird-78.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a726c67ab384b58c3a1ff84a3a1fe95f73219996e7e26f5dcdfe5dda30d34cdf"; + sha256 = "13bbd007cab49ab1f37862392e3c02c5418deece6894fb2ddb1f15e9ce811bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/gl/thunderbird-78.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b731c512c61ece7b811d74e5f40cdae742207463799cccfa9906b43f58d5f2fb"; + sha256 = "8cb71820ff19c7a7c9186aefcd80cf27d0ace5331b320e2e4660d982921b6d96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/he/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/he/thunderbird-78.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d15591239235d2f7debc8454e65c1e67101b8f32901fcc7543025986c524b156"; + sha256 = "12092b25ae77177bac52dd0555136b041dc409507401566d8f0f0973a59eabce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hr/thunderbird-78.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "003d02062016c8f13038e61f189b7ebb75753ffd9a55879e1f8fd3ee1c1f2a2f"; + sha256 = "b9cff4319fb62af844d278c93a649b85c64469aaaf9881a6788aa25498afe5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hsb/thunderbird-78.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2325fd29cadc8c824ddd90ba7d0975ca42c2d9964c62269f0361b5318274155f"; + sha256 = "3bb8f6d9989270197e5b99fce18e2558daf19317b47bea50d8a30a7934c68859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hu/thunderbird-78.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "15650cc17e75780f17927ced485a03a23dcf771dd7d8343b28acd0ae1f0e1f9e"; + sha256 = "253c65d5a1a0b8780f8add3fa532d10290d7aa86e99efa8ed1c881f6ff76e4ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hy-AM/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/hy-AM/thunderbird-78.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c20a4f0ccf2bce093986e3758784190215bf19d31469f6bb51f5a494ed54fb03"; + sha256 = "8dd61e4cbaddb8f97e466402e474adb6c22f2ac9b3d7ddeac53aecbb21ac1129"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/id/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/id/thunderbird-78.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "286eb0484f9a4b9c2d24dd836abcc07b00218a6c870535df1e4947482de1a79f"; + sha256 = "b03444c14c9f73dce2620f1acfa975e165b2ee33d27a8bf359dd3b3a0a22199e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/is/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/is/thunderbird-78.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b291df9b76800c56424ed8c9ad8e55be68f2606968abef2eb83ee3c86d56fc6f"; + sha256 = "4d4e355365b20561b50f72027c160c2d0d3742a09654f6a2b5db80af4aa0b794"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/it/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/it/thunderbird-78.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "51d112544b67c44d82b4d0f54bd35f0dfb485917ad72c09ce6136a8750e58eb0"; + sha256 = "1ea72c07428ab4cff56541b6b18e571f1e0f0f22bd161071548d38746eee1015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ja/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ja/thunderbird-78.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "931815f8f2e0e3a9e3b9eb150fe8f0112b26537b02cc0c0c0dce9c14c1959ac9"; + sha256 = "1983ca2ffd9a2c53a8ac46ee36757375f53d2f6c2ac519ce7fde004e11a6f48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ka/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ka/thunderbird-78.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d51b241842f8da9d6cfc8307b11b73fe813d46a7d6cd9651c46e1af18201e89c"; + sha256 = "339b7be89dfda68efb30c6f72036f94fbaba9b230977b27506edf9f1e70b572f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kab/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kab/thunderbird-78.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "935d2e485aff93ee91c20710c286cb591379f5fae1a34851454707710c75df88"; + sha256 = "5163897a19f9303a32dc69ad6697b458040ef09eb5b1b954617bd9833d66e491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/kk/thunderbird-78.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4534b9c69f44c197997283f455d4b692ff96df122e9d633288d2874b8657833b"; + sha256 = "aa93b34afbe38389722959e5e8bfe788d158b2a186768bcd1a3469c5ab728d88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ko/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ko/thunderbird-78.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "bb083026c53734d3956126a7bc11f1e02e122e463b0f8cb72757cc7cf94cb911"; + sha256 = "06fac9843688e278a56d3bd4d650cb9f2a369c09343663cbfd79054c80a24dde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/lt/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/lt/thunderbird-78.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a9cd61089e2898a3e27cd0d10d9295c295b579324a30ff58f7500c0dd9fa1977"; + sha256 = "6bb215f78165bd0377c983c544a84e4bd41053af475a544e61c78bb2ee0272b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ms/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ms/thunderbird-78.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f84ac7f403802271c2730979dd7da85ec976d970aa39c1f50215ba1902449245"; + sha256 = "59b93cc98131bd462279d36d2449176d1c4f546b4512a7316e88063ffcb1d66a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nb-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nb-NO/thunderbird-78.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98fd61d91149b26750f06e12f64605ffe04f243d96c5ead0d11a2a600c4baa7d"; + sha256 = "1d6f1b6d8db512d4ca330e4fd303efd2165cd7dea4055381b85d5c57534ad45c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nl/thunderbird-78.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "44dbe77dbfb8d74c2c79052e1152e0da0a751d0cccea5b643c5019704454b0ac"; + sha256 = "30693fe9a43221a3afe5755257e0dc0820fdbdb6fc6fcff2ae39475a70a8f9dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nn-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/nn-NO/thunderbird-78.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e88e668c434b5b2469ef8268985015735ba5ff8639a1c670d1c9d42e1dd0b30b"; + sha256 = "dd27afaba1b3354a8a865e297e107f7717a00f83156c92b22ee18a08d6b2ba2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pa-IN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pa-IN/thunderbird-78.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388b87f10db2a0dc9c73580ccc5248c492d6274766e4350981f8289db39c95cf"; + sha256 = "90ca962ae6585842191bdbb8495b37b10fdd0b477760565369457e1945dcab6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pl/thunderbird-78.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cc0e7c7bf4fd33ab255b1bcca808e6ae84c9575b3555228f84da8dad83b02d2a"; + sha256 = "1eb445495e9ff8b4f18eea7ce86655a6470b1d33b524c7eeb8938ecf030f1f20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-BR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-BR/thunderbird-78.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a8b4b7db5ed2a45af8bc595c85f15f9ea78d2a790bb62a9e419b7b2c78616a66"; + sha256 = "2b45cf19695837209ddb6e079a1c05d449962dee94afd5bfb62ba22124b6eaf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-PT/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/pt-PT/thunderbird-78.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c4504cebf2b2c831ec94029605b3068ab1cf220d3cce33b085d658c20fbf4dc4"; + sha256 = "bf4d215bc674ffdc43f80a63f8a19e675209254e08e843b7ef447e488ce416ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/rm/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/rm/thunderbird-78.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b1be40d4a3f6f26c9a06e3179244ae2ad9c9c259e76cdd695cb3f881e43de919"; + sha256 = "aa9ac4a13278437b400035205baf92556e09d3a333a8ce9a3c3df7b241851717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ro/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ro/thunderbird-78.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "305ecbe685a107461aa3dad94e7b74d9f32b343a3d9813cf7d570e0919d5d931"; + sha256 = "edf568ef69d3b8444469d00d9295e377d4b7e8e1df5257b6a13b83cdc4c18b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ru/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/ru/thunderbird-78.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4d49f15c2c9e69a6156e89017c71f5cbda3114940bfdf273efd0e82dfcc3457b"; + sha256 = "22b27fbf138272264ee643fd6b55eb803fcce68682150daedde303ea6d297062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/si/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/si/thunderbird-78.6.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9d108c3b3d54d12c5008f0d77c4a6741ab94c7fcfec1cb4ff59bb2730938d01f"; + sha256 = "477906e0205fd6961a0b2ab2bff27577cc02ee3bf90c66329221b666cd726ba2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sk/thunderbird-78.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a6e51284b554fd6a8970757d519870098baa26d3fd23561e335105ec5bf836ad"; + sha256 = "df25d31d5fc75ffb4e961f8cdbde64183cc507efb2833e58f13ea9e3b849105d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sl/thunderbird-78.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "99b80fb6efd174beaf885e3d5451557a353693158ef147c931aa4d8560966122"; + sha256 = "4a2e66d474f2a8fee6e7a7158145c9474f9f03173e9b3e0c78f906ba612af99d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sq/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sq/thunderbird-78.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5bba738143daec5c687fedf566052c9d387a87520e510acdb963ae80c5d24b3c"; + sha256 = "fb602510a4b58e7a4574987638794a423991a147284babd6b40d3a8b4a859b19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sr/thunderbird-78.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c18424e503d87ee7ea940a4d9551b9ec51a90b76b73180c89541872dbba27674"; + sha256 = "12e203abd18020c9e22eb0142c916d084bc61afe3be55bd0555c1aeb8d11f086"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sv-SE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/sv-SE/thunderbird-78.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d0eb7a8a1a6248e40142a62b61f9fe3e78bb8c277c9734d821358e0a075d5184"; + sha256 = "deef0110e1157c3a7521d1671cb54b8414d09b6cc2898f2bd3ba9f60e184ecd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/th/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/th/thunderbird-78.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "04d3465fb8afcff051ce9a578901f3e9a8fbfab65f31cd7245b0b9321daa102f"; + sha256 = "2c963e0e3804b0e93b6e1c11d09974049f134c36f55f5d57f57449bdc6008326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/tr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/tr/thunderbird-78.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "46acaf32f9f035dd320d4e28d6b36ef8ce2d8ff5f753cfb6a7b02f37e8edb09f"; + sha256 = "8e4daca1bb4d4f93fa6f834c8d8269b91c0fb07f5310e7bccdae202b868c9758"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uk/thunderbird-78.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "60b0be6207532039958f03a81e5fdf070d15cd624a0583c4d8e87e0528ccd240"; + sha256 = "57c1aeaeae081a253557e558c79fd8f85591495a56e9f1bec9153dd51214abf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uz/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/uz/thunderbird-78.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "070963c90b858e9ab75cee1490671ec3f9f46190896eca554fde0ced205d0d44"; + sha256 = "6fcd73f96acf99decaa639cb0d1adf99d65be2dc75b9ca8ba2d15308ee524990"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/vi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/vi/thunderbird-78.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9040ed756aa19c0e850391bd9fa148eb0fbca45b84eea888c874a9c93ee0428b"; + sha256 = "108b21717a42c94ea38f46186f5ee3d570da56d9bacfb4eca9d9b14779e74237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-CN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-CN/thunderbird-78.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "caba2b9f3fabf1231b947c578c9761a241178f732c110fcd4cf620146ce5002b"; + sha256 = "09546642bc79c74a965e4700957c295527b7462d64744a651d5575127ce5c944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-TW/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-x86_64/zh-TW/thunderbird-78.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b48378e3833a0710bca60cb9c87396f0163cf9cd6211725ea711e116557e5abc"; + sha256 = "25f082fdf2051ceda74b12f3c6da76a18b66c928e204e9ce5364545540eee2a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/af/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/af/thunderbird-78.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b4ca4cd2535fb02c059db2783f2428634373730217d420530d7c2f6441191fe7"; + sha256 = "cc01b60e44a2449458af74acc1774266e7cb44ed4eadb9cea766195974694676"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ar/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ar/thunderbird-78.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "29c287ff2ce37f3d4c23770f85aa220d7b9265df2b188aa38730fca68f8ea40b"; + sha256 = "a51eca5032e0beb9dd16bb18e1efe3dde8343ad964dabd25457fc5deea61f858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ast/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ast/thunderbird-78.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e1267edf8d35bfaf1f2bab751b5235855ce9ab768acc607ff308021dc917cd8f"; + sha256 = "b6fed93d30de5635539e2a2f38e78b6e90df82ed79e9e3190f60389b598b928b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/be/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/be/thunderbird-78.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1359027429e2c1ed2535f0878105bc0485f52b569aa342246d380acd1df13e4f"; + sha256 = "7d8e58062d885a35be4cb5e66ed9e1752ba7d1b21c615f255766cde5d737fedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/bg/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/bg/thunderbird-78.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4e2d1a02d6ef6ee123c68db8ff299037cbfa017334599f5e3ac7114ee3e8874b"; + sha256 = "daa18d443e9772f5d956f2b1aceb2186a20b39f18376d4a0ca021adc2436426e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/br/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/br/thunderbird-78.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "526e73827d595452c40bcd2066885d41a9497bf7d61043a5236d600cb9202e94"; + sha256 = "3d9fb8cb96a670225b30f898b83d7ceebf9a43b639e1e60d38478c2d9e1bb8f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ca/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ca/thunderbird-78.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "73605bd265262a8f538b7d15b26915ecb030a76824a09192e7b2e897ac5affe5"; + sha256 = "624f313e09d8ec67ec08ee57a4ee78105e05d378c474d1cc005d12061e55f629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cak/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cak/thunderbird-78.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bbdcb9447938bc2ae8b4dc0a5a250cf82e316c7ef56abca2962f871abf9d1d4a"; + sha256 = "bd483d57306326d61b8bae407a4e4fffca4a6f6a6f57b6ebc4ee9f1b0bd2b38f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cs/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cs/thunderbird-78.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "4052bda928576a30657dc4087bdded6ea2339e271bff36194bbd37e610f55d13"; + sha256 = "0262e549c966460469ac870492587c66114bdb96ef92e48ce50d9f28ba3f3e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cy/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/cy/thunderbird-78.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d3b337be4b64903d075f8e2269ff5f88831d5a88f24a56deead19ea534867d10"; + sha256 = "3a22886e71d3eb8fa6aa683322db0cf19f14b80b4e97a2226dacfbcce7aa0574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/da/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/da/thunderbird-78.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "96080cee994410b59935c0baaa4d8bc0c592d1654242b00540b3b1997398951a"; + sha256 = "5c008c00784ac37ecf56fe24f38952b111d531936de00f47034fbc5a46ba2158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/de/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/de/thunderbird-78.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46b4c8b867fbc4f5ed288f0c503a776a256c229799601d7810ac51b73685d6a2"; + sha256 = "f3a1f1bc1b8ec9701050440c9312440a29392118cb680d6485836197c07ba44d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/dsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/dsb/thunderbird-78.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f1b8576a1c5ed9dea2b92b10b03e2f16e17207c1f5dce4f83556b11a846de754"; + sha256 = "fb4df74e6c293123fed6f1b7fc776cb2e1009f8655d27acc9c0cf6d5872190f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/el/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/el/thunderbird-78.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "01d559767ff8a2562b81c7e42007993065b4d46319fe4890e157a2450a34875f"; + sha256 = "452ecc706867078d54190da0e25d346ee120ea4ebd6be6ac494f67709ffd1975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-CA/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-CA/thunderbird-78.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "99571e51cc28c9dbc5aab42fa5d5f7f680fdfa287f7f8b96c5548949155735a5"; + sha256 = "941852cf3463df6d80686b1808f341a2e21206dfebcbcfd6bdea25adbae5580c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-GB/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-GB/thunderbird-78.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e515ef917801e0fa67b9d4821f7185b21e36b35b7df8bb43b6a917851bcae753"; + sha256 = "83e49ecdebe816c02244d6c5db84ccf9953b2b7349e8e880c3febca7de7ffa09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-US/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/en-US/thunderbird-78.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cee59a70210f9fc8672a914179c957d67556b068d8ce9387c01636e89e54aba9"; + sha256 = "9a93ebefdca24266b55568538d834e139da78f5aea9f3e264c4feb40f8c4f820"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-AR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-AR/thunderbird-78.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e30605e7460ff80a1c26107d0393d7cd12ecfd95d55f256db6f808076d03c53d"; + sha256 = "88e1c5c7b4bc77005bcb384f578a99288bddd99877a10e95920a994767537f05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-ES/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/es-ES/thunderbird-78.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0e2301dd592c06a2628aeba21f38fe4b422ed2690531c1487e958c6cea1b236c"; + sha256 = "6ef1618adf242f6f1aad30d4d872f85d0135a3a86e3783b6ff5bd742c06e6806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/et/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/et/thunderbird-78.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d15684c68e9bef8902e9dcdb87bacda263953cc93ba7368b69fd318739b58fdf"; + sha256 = "701e0fe34fddbd85369550e3ac6aa099d93aff19207c750b74f0ea36e86857a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/eu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/eu/thunderbird-78.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "4144e7de84ce0a6b39d8c29a96221532951c76679a8ac5a85aa07a62b99680d6"; + sha256 = "08904babb0a69cd3bc19575d8e533804525b5786e1aebd3236785e7c574b113e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fa/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fa/thunderbird-78.6.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "028ac9a6ad5d6e7360e597d961a7422238d96cda848042975ececec6f3a06aa3"; + sha256 = "083c128daf6fd05d325282fb7c4648d6cb7c86209a6b940a07f2df730ca25906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fi/thunderbird-78.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ee5adee4c249edd9b61fcacc0a2150d4471a7897aa1057fe3ea04e16729de966"; + sha256 = "ffe71bf498ba41b5fc97f67a99e838b4fafbe383333b0dbc4ec306b362529574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fr/thunderbird-78.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d5d0190541184198a6c628b3c79c7dc96ec911ab195ed3419f33c4817d401e01"; + sha256 = "0160e46be32847dd1c4e597bd1dbd0734aa32a327df93b6d7266879b6c54733e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fy-NL/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/fy-NL/thunderbird-78.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c7b8ee6e8b66a6948f80f10e1ebf2d61c70e5be439f197953bff91f499fa8d51"; + sha256 = "e3292054a4c7d10add34480a828f35b09e103277ad754d4e45869c72a662ed5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ga-IE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ga-IE/thunderbird-78.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "32a1d8ded34b26136b2884d24f31c5b08c965c10061758b87df9510395f8dc7e"; + sha256 = "071efc85f1461c2bfee5c77222c117363b0f37714c25c65f0a6d1637df791aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gd/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gd/thunderbird-78.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a65ff1d77deb34ed46bb84ab480afad20fcf417f39c714021ccd83b4a9d3212e"; + sha256 = "731768809717bb73432deff720252af855e71e7f7743f7316f60fd25f0ce046a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/gl/thunderbird-78.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "87660c561fc92396c1eeafb82e907fbc2670b6649e2c7f0bdc73714fefa3de55"; + sha256 = "0d7f6686fc184f0c0efe3a44793e511c8e229265bf43aacecf766a7189ba323e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/he/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/he/thunderbird-78.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1e5c7324c57de9e5e2a87dceb1d41994a74f55e108e8d97161e0fd428f6b197f"; + sha256 = "dc2dc901c86b5b0af5612e80ea8bb145e33670fbfe338599e3995c43115622a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hr/thunderbird-78.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "cad204c16e1b8ee26809321aa27c73220e64bcd86d261474c636d088ade006e3"; + sha256 = "c720e60e7e0c6ea7bde01111a0bee647c05c17f6fd05a7e87d5733a55b4ab7e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hsb/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hsb/thunderbird-78.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9d3e8988b5e8a3f089a0334304e255a716bc24f4ec9b08dd6594b7ddb4daa3cd"; + sha256 = "f96276ffad03bfbe04ea7424e9d2fdbd2f3af89da54f2f48e5a36267f8b6a26d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hu/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hu/thunderbird-78.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f46e9d49a74ccb2172c78e6e149149ff49c0be7c93336c62f8c17b30a1b1d15f"; + sha256 = "2376d64c5c2ea53ddf07bac4712e8375d91dc92e4c22eb123d6bea4258f5c194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hy-AM/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/hy-AM/thunderbird-78.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f3f7e033489907339055d0ef02abf4a423434248b1a10623736fdcf09a3edd79"; + sha256 = "31a4d4fe82eb5b1dfc949728c9fc386b7a8f64a3c31428aafb58bd3eb3439253"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/id/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/id/thunderbird-78.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "581cbae2f96a616d29d30eda0dad30992eaa7fe71f65c20af10f528d130d83d1"; + sha256 = "c47d68876d3dc1789cfe921ba05096e45351c8df9bfcda01f9d5d7b40c484cd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/is/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/is/thunderbird-78.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8653b1e05517a723a4113995e0e69a73fa59196f5625e2c1b0e51d9d60561646"; + sha256 = "7bf6cf429ffaa4567180c56033666287e10c8a09478a077ba1ddd9b94f13d048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/it/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/it/thunderbird-78.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "98faf75b5216cc75c2348962769fcdaa98ff59c4f4870b44cb6e7a69b7b5e9bc"; + sha256 = "ea1659937f1a9453513c3ce92e36fdf8c194dd1253bc723c4e0e0c2797c97a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ja/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ja/thunderbird-78.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad34916c36ac06eec4c1a900ff33639c6238e01c6426693261433b9bdf44ea91"; + sha256 = "c6fc0d5fa9d6eefbe8a8d867b96c1f4230ca3a8604c83eb963330212a6c8d633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ka/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ka/thunderbird-78.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c3468772b8667784814f6d323a74aef24f561cf3fbd2c5dfbfed16f73e7e7c6d"; + sha256 = "d05682cfcd90fc8072890e63fe3b9817b57759d0592876b53dbb1a1e9d024fa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kab/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kab/thunderbird-78.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1ba665c91e38df62809a601223238dc3c34a50c96e42e5792b145eb9aed3aef7"; + sha256 = "74a8edb8be388cf7a32904a123bd4bf6f98fbea229327eb38843900769dafb2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/kk/thunderbird-78.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "651fda1baa62acfae3f13bb65096368719461d206ce45b84a3ff5540e09d9e24"; + sha256 = "b4c1c9e4e7107ea47d5a4c271b581afd98be4f04c6fe9d427f30e7bea4d70fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ko/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ko/thunderbird-78.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "49b82df2eaa66e658b4ff0f84af7b128a92eddce7e9ce129f0f28b8239367967"; + sha256 = "de1d69f07f087fbbe0b085fbcf57fdf77baea36f09ad95594e9f3eabde835365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/lt/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/lt/thunderbird-78.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6d263e236457576a0e853fd0b00711182c34c32436f65c8fc952aa2810fa500d"; + sha256 = "a2b4dafb34e35da9d7ad939fcd00c1d8730aba99ba71efb1c62dac95cb873209"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ms/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ms/thunderbird-78.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "45b050930b8357e3a988701d46234ccdd43ba7b38e56b88d157dee6309c375c3"; + sha256 = "b8d998101f30ae03a94e6b9c802d41d0c7afe2f837f92be7ffb9ac37998c1ab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nb-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nb-NO/thunderbird-78.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "23760a375705d8c3d22aaefab60c9a761fe73f5d6c97f3a3621312ba362f77ef"; + sha256 = "5b2b419b1a79ff1ac28af11a9649a5f68c0eb06a813687280a8d01edf09db4e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nl/thunderbird-78.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8f006195886d26a519363c1a61940a53388952a67bae4fad07de50ab24ee21c5"; + sha256 = "428e422214e706c5cfcbbcf2bf1e9190168d9cbaaf7a9aa94dfbe078ca1fa38c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nn-NO/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/nn-NO/thunderbird-78.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "85710ff8542c6d592a939a55300040633f5b8fa8587f5c6c0ba0c3c2c7e5e62e"; + sha256 = "0fb80dd45a0f7ddfcfe55d7f99d47279a083a4ca6d813d3791c21c14c759b1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pa-IN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pa-IN/thunderbird-78.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cc1120713915ba43b74e9a4daa5814cf83b32317bc1503061c233e5fe28f8214"; + sha256 = "d4e17383fd04a300b416a291a1b50071284593e635c5c4cb101362dbb1602612"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pl/thunderbird-78.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "bf3da9722d7c9602304f64c7b11aba83cb899a23c1ddd179d5eb431aca23301b"; + sha256 = "c76deda25f28bc43489ef5c13c03f95c52c49b7c58311ea173c853ffe6de0a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-BR/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-BR/thunderbird-78.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0104d48b2de1e26e3b66545a76b7892e2b1b17f56ebf8558353e031fb8741614"; + sha256 = "e7a29a78acd5a7daf2366f2b79f7a51df37f19687e84213de61af2065a011e8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-PT/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/pt-PT/thunderbird-78.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b376bc3cc3f87484c9f976f30a3049bd4873ec67982574ec570c5c96d7643285"; + sha256 = "23cb3cab0228b1290d9315b2416940293df21a53231726937af133a20a102a7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/rm/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/rm/thunderbird-78.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d68e60b06b03b5313a1ddc42464ee5a3ead106655860e1d2c359802875276778"; + sha256 = "0c2175e117964deb87949a3047ce72a11ba7781581f6dcd583fecf51680a1573"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ro/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ro/thunderbird-78.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "051c01b3e2f69258e1d44599c6c485785c1624a67fa6548517ec242c69bf47fa"; + sha256 = "3b3395c39fa032ced0af7508c20a24341b1e893b26ac6430dfebd771ed86478b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ru/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/ru/thunderbird-78.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "db0f48c765e7ec9c090e1d5f43f42faa5ac6cc9e4d593dbc6b8ff6f8f7210027"; + sha256 = "9933df6138ccf8042e82181e629b97166f7661d26dbeb524d0954ac13c9795be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/si/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/si/thunderbird-78.6.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fc104d206779b8b909f645a86151b193da0792c9af6360fbb4933d8224f23bb2"; + sha256 = "b50d48a71acd7c399877c5b6507bd0228c3ca88b3f7ee57748167d579d76c2a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sk/thunderbird-78.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d08d8fe02577ad931020fdfd45b673fd2b71e41d66c1532b8025012e493c869d"; + sha256 = "9a84aec070338c33eec3e617e19f7452c9436c4671cfca6374b45c4d146b7258"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sl/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sl/thunderbird-78.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6907401bb3973911ece57b9b3bd56032b02c2c140ab79ec554f4574a7e2121cc"; + sha256 = "e8398068668cad4f0a0070d2545523c6d3cce2352e753355e8a195a90b3daaed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sq/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sq/thunderbird-78.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "bca13f569b5cd0e6a4bac8ae59a8f1b228010a95871763600080473f45ffe5a2"; + sha256 = "91aa97a9ac1951bd43a46e7c2b36f7d865d307685b20c5dabe48c83714a82bc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sr/thunderbird-78.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "df9328979af4c36d553992e0928d63a6cfcf0a54541e091fe7bb57e2e934057f"; + sha256 = "ef6b30e33e1ad8f771ef4b5a76305369e5cfeed47982a65996c9ceb23409f76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sv-SE/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/sv-SE/thunderbird-78.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a310b66e76a2062354d2ec10dbe0827188610618ac87f866010b418d26032a50"; + sha256 = "48b9733a90ed561d7439369c115d9a2778bfbe83222e786564c98f7c5396de89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/th/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/th/thunderbird-78.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "efb37f15a311d2c66678f42f13085e77eaf8819b2fe16ee52e3410dde5e85bee"; + sha256 = "9759c011a43e0622d4a42ac3462039d70eef678f633863ed24f3cb5736b4b8ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/tr/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/tr/thunderbird-78.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4f9f9088ab91ebc3e4e022ba77cf8c168ab961c73317fccd07e987e38ec6eb57"; + sha256 = "5f9e153ca23c3ff3b9bcae816176cfb4c89845a05481d98b538254603e981896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uk/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uk/thunderbird-78.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d9c527045270007c74e84d9f77ab6cbab2f07112d8688757920f5adbc5bbdf1d"; + sha256 = "cde508d6b9e7590b50902afe6497328cf087cb7519ea4df2de0a5d47ee8e6034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uz/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/uz/thunderbird-78.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9ea90845e8668afff622f412f571b59e03e6c02d49a4e47cb99ab93f5da822dd"; + sha256 = "0a533d7788c957aab3615a04eb0bc6db12acf92d4ccdef5d1763f0e8bf4f3dc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/vi/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/vi/thunderbird-78.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ccf4bd8c6269fb8ae15413923d556ecafb808ef205688dfb78379347a5bce5f4"; + sha256 = "4e30ead1cf49a7716c25759fd5e84efe3edc8dd5722367d50417f2b28e3fb376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-CN/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-CN/thunderbird-78.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "22f0b4a72f995a9936fed178138d3e0c40fb3aefeda989c9ba83fc82a4296fcf"; + sha256 = "c673aead55f3762b68a9c692d422d61a407bca31cd9dbfbe63d8ec4292c24ed8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-TW/thunderbird-78.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.1/linux-i686/zh-TW/thunderbird-78.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b8c8633732641b8ab87bfc2a2867a95b817ce6d0fd0e8f569221bc51ac23e849"; + sha256 = "9c5d7cc03df92efa4be3dfc2f9521f77253fba4abd961a21e4d20ac19495244e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 66d2667e7ed..ab4078d6a0d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.6.0"; + version = "78.6.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0hx9gg3ngpvgshrz9j7ni4kh3chadqd5w5fpywjjw4naj0k53d0i9jjhq4p6fyvf6rb2g825ibqq794lr9drn6nrfndh5w1yn5lw69n"; + "1vzka0msy6gqyxgwyp2dknp6rmgzhcjsyq2hf798wf4wrb7rrrsyrgqrd8skss929wakda0slqng505lhig79za7wyyh531f7i9qbv7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e9ab18f638f..44c4a4e1f52 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.49.3"; + version = "0.50.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1j8d3bih2hs1c1a6pjqpmdlh2hbj76s00srl0f850d06jhldg3p6"; + sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 3b4dd20931c..1681d454590 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -1,25 +1,38 @@ -{ lib, stdenv, fetchurl, automake, libtool, autoconf, intltool, perl -, gmpxx, flex, bison +{ stdenv, lib, fetchFromGitHub +, cmake, libedit, gmpxx, bison, flex +, enableReadline ? false, readline +, gtest }: stdenv.mkDerivation rec { pname = "opensmt"; - version = "20101017"; + version = "2.0.1"; - src = fetchurl { - url = "http://opensmt.googlecode.com/files/opensmt_src_${version}.tgz"; - sha256 = "0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; + src = fetchFromGitHub { + owner = "usi-verification-and-security"; + repo = "opensmt"; + rev = "v${version}"; + sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE="; }; - buildInputs = [ automake libtool autoconf intltool perl gmpxx flex bison ]; + nativeBuildInputs = [ cmake bison flex ]; + buildInputs = [ libedit gmpxx ] + ++ lib.optional enableReadline readline; + + preConfigure = '' + substituteInPlace test/CMakeLists.txt \ + --replace 'FetchContent_Populate' '#FetchContent_Populate' + ''; + cmakeFlags = [ + "-Dgoogletest_SOURCE_DIR=${gtest.src}" + "-Dgoogletest_BINARY_DIR=./gtest-build" + ]; meta = with lib; { description = "A satisfiability modulo theory (SMT) solver"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl3; - homepage = "http://code.google.com/p/opensmt/"; - broken = true; - downloadPage = "http://code.google.com/p/opensmt/downloads/list"; + license = if enableReadline then licenses.gpl2Plus else licenses.mit; + homepage = "https://github.com/usi-verification-and-security/opensmt"; }; } diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 40406cc4588..37173f81978 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkgconfig +, fetchpatch , python3 , meson , ninja @@ -31,6 +32,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix compilation with gcc10 + (fetchpatch { + url = "https://github.com/parnold-x/libqalculate/commit/4fa8f2cceada128ef19f82407226b2c230b780d5.patch"; + extraPrefix = "subprojects/libqalculate/"; + stripLen = "1"; + sha256 = "0kbff623zl0s6yx5avx068f2apwzxzvihjahja4qhlkqkhhzj9dm"; + }) + ]; + nativeBuildInputs = [ glib # post_install.py gtk3 # post_install.py diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 164a8b85005..2c5ddca5090 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0hdxbn5qqqjzpqfcydz33nc351zanxp0j2k0ivizx4dn40fnavd7"; + sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1"; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 3e07a93458b..6f20e4a44c6 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.10.10"; + version = "0.11.9"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; - rev = "v${version}"; + sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; + rev = version; repo = "gita"; owner = "nosarthur"; }; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 3736c1c573d..c73a9277138 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: buildGoPackage rec { pname = "git-lfs"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0n4gi7sh6d1maqwp12fsznrky9xwkk2jrmxfwa2hnk8wb2rhvlrm"; + sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4"; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index ffbeb050956..528e7c3dd99 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { preBuild = let tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite"; + ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; tagsString = concatStringsSep " " tags; in '' export buildFlagsArray=( diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 807399408ba..923c2a67b42 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU="; + sha256 = "sha256-nIqiRWk3gKOWrreyLVT8McRsXClXjOa4y8xXr1ox9Lc="; }; nativeBuildInputs = [ @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace linux/src/droidcam.c \ + substituteInPlace src/droidcam.c \ --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" ''; preBuild = '' - cd linux makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)") makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)") ''; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 48615913505..bc045deb9ec 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -20,6 +20,9 @@ buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) ''; + # no tests + doCheck = false; + meta = with lib; { description = "A native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix new file mode 100644 index 00000000000..244e826f0a2 --- /dev/null +++ b/pkgs/applications/video/sub-batch/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "sub-batch"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kl"; + repo = pname; + # Upstream doesn't tag releases. + rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff"; + sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE="; + }; + + cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; + + meta = with stdenv.lib; { + description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; + homepage = "https://github.com/kl/sub-batch"; + license = licenses.mit; + maintainers = with maintainers; [ erictapen ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1f4d5e3aac6..8e75bf46f49 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkgconfig +, makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git @@ -12,6 +12,7 @@ with lib; rec { dockerGen = { version, rev, sha256 + , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256 @@ -30,9 +31,7 @@ rec { patches = []; }); - docker-containerd = let - withlibseccomp = lib.versionAtLeast version "19.03"; - in containerd.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -41,11 +40,7 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - # disable completion, can be removed when docker uses containerd >= 1.4 - postInstall = []; - # This should be removed once Docker uses containerd >=1.4 - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; - buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; + buildInputs = oldAttrs.buildInputs ++ [ libseccomp ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -64,16 +59,69 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + + moby = buildGoPackage ((optionalAttrs (stdenv.isLinux)) rec { + name = "moby-${version}"; + inherit version; + inherit docker-runc docker-containerd docker-proxy docker-tini; + + src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + sha256 = mobySha256; + }; + + goPackagePath = "github.com/docker/docker"; + + nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; + buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; + + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); + + buildPhase = '' + export GOCACHE="$TMPDIR/go-cache" + # build engine + cd ./go/src/${goPackagePath} + export AUTO_GOPATH=1 + export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" + ./hack/make.sh dynbinary + cd - + ''; + + postPatch = '' + patchShebangs . + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + ''; + + installPhase = '' + cd ./go/src/${goPackagePath} + install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd + + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" + + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init + + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + ''; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" + ++ optional (libseccomp != null) "seccomp"; + }); in buildGoPackage ((optionalAttrs (stdenv.isLinux) { - inherit docker-runc docker-containerd docker-proxy docker-tini; - - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" - ++ optional (libseccomp != null) "seccomp"; + inherit docker-runc docker-containerd docker-proxy docker-tini moby; }) // rec { inherit version rev; @@ -82,97 +130,61 @@ rec { src = fetchFromGitHub { owner = "docker"; - repo = "docker-ce"; + repo = "cli"; rev = "v${version}"; sha256 = sha256; }; - patches = lib.optional (versionAtLeast version "19.03") [ - # Replace hard-coded cross-compiler with $CC - (fetchpatch { - url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; - sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a"; - }) - ]; + goPackagePath = "github.com/docker/cli"; - goPackagePath = "github.com/docker/docker-ce"; - - nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ]; + nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ makeWrapper ] ++ optionals (stdenv.isLinux) [ sqlite lvm2 btrfs-progs systemd libseccomp ]; - dontStrip = true; - + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" - '' + (optionalString (stdenv.isLinux) '' - # build engine - cd ./go/src/${goPackagePath}/components/engine - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - export VERSION="${version}" - ./hack/make.sh dynbinary - cd - - '') + '' - # build cli - cd ./go/src/${goPackagePath}/components/cli + + cd ./go/src/${goPackagePath} # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" export GITCOMMIT="${rev}" export VERSION="${version}" + export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd postPatch = '' - substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" - '' + optionalString (stdenv.isLinux) '' patchShebangs . - substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" + substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man ''; outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); - installPhase = '' cd ./go/src/${goPackagePath} - install -Dm755 ./components/cli/docker $out/libexec/docker/docker + install -Dm755 ./docker $out/libexec/docker/docker makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" '' + optionalString (stdenv.isLinux) '' - install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd - - makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" - - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - - # systemd - install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + # symlink docker daemon to docker cli derivation + ln -s ${moby}/bin/dockerd $out/bin/dockerd '' + '' # completion (cli) - installShellCompletion --bash ./components/cli/contrib/completion/bash/docker - installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish - installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker - - # Include contributed man pages (cli) - cd ./components/cli + installShellCompletion --bash ./contrib/completion/bash/docker + installShellCompletion --fish ./contrib/completion/fish/docker.fish + installShellCompletion --zsh ./contrib/completion/zsh/_docker '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Generate man pages from cobra commands echo "Generate man pages from cobra" @@ -199,30 +211,18 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - - docker_18_09 = makeOverridable dockerGen rec { - version = "18.09.9"; + # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* + docker_20_10 = makeOverridable dockerGen rec { + version = "20.10.2"; rev = "v${version}"; - sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; - runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; - runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; - containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; - containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - }; - - docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.14"; - rev = "v${version}"; - sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y"; - runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 - runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; - # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above - containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9 - containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; - tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 + sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; + mobyRev = "v${version}"; + mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 + runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; + containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 + containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; + tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 4859054d78d..7fd7cda81e2 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "docker-proxy-${rev}"; - rev = "7b2b1feb1de4817d522cc372af149ff48d25028e"; + rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; src = fetchFromGitHub { inherit rev; owner = "docker"; repo = "libnetwork"; - sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935"; + sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; }; goPackagePath = "github.com/docker/libnetwork"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3049e581b22..999deed3c66 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, lib, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms +{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.3"; + version = "4.19"; src = fetchurl { - url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk"; + url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "0wjq6lkidg0g474xsln1fhbxci7zclq3748sda10f1n7q01qp95c"; }; - nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index e9759fc6b33..52322d8e194 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,18 +3,13 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18.3"; + version = "4.19"; src = fetchurl { - url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; - sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci"; + url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; + sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h"; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; - - # fatal error: GENERATED_config_enums.h: No such file or directory - enableParallelBuilding = false; - meta = with lib; { description = "A fork of the i3 tiling window manager with some additional features"; homepage = "https://github.com/Airblader/i3"; diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ddd15065663..f34835eaf09 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -2,11 +2,11 @@ # Usage -`emacsWithPackages` takes a single argument: a function from a package +`emacs.pkgs.withPackages` takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs). For example, ``` -emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` All the packages in the list should come from the provided package set. It is possible to add any package to the list, but the provided @@ -15,19 +15,19 @@ the correct version of Emacs. # Overriding -`emacsWithPackages` inherits the package set which contains it, so the +`emacs.pkgs.withPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the -set which contains `emacsWithPackages`. For example, to override -`emacsPackages.emacsWithPackages`, +set which contains `emacs.pkgs.withPackages`. For example, to override +`emacs.pkgs.emacs.pkgs.withPackages`, ``` let customEmacsPackages = - emacsPackages.overrideScope' (self: super: { + emacs.pkgs.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit magit = self.melpaPackages.magit; }); -in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) +in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) ``` */ diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 6ae46469738..0047a335c76 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -8,6 +8,7 @@ header "exporting $url (rev $rev) into $out" $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ + ${fetchLFS:+--fetch-lfs} \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ ${branchName:+--branch-name "$branchName"} diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 0405951a9e4..5f5ded128de 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, git, cacert}: let +{stdenvNoCC, git, git-lfs, cacert}: let urlToName = url: rev: let inherit (stdenvNoCC.lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); @@ -20,6 +20,7 @@ in # successfully. This can do things like check or transform the file. postFetch ? "" , preferLocalBuild ? true +, fetchLFS ? false }: /* NOTE: @@ -53,13 +54,15 @@ stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. - nativeBuildInputs = [git]; + + nativeBuildInputs = [ git ] + ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch; + inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName postFetch; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 43f7c5acd5a..3cb115c5e6e 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -9,6 +9,7 @@ hashType=$NIX_HASH_ALGO deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT fetchSubmodules= +fetchLFS= builder= branchName=$NIX_PREFETCH_GIT_BRANCH_NAME @@ -72,6 +73,7 @@ for arg; do --quiet) QUIET=true;; --no-deepClone) deepClone=;; --leave-dotGit) leaveDotGit=true;; + --fetch-lfs) fetchLFS=true;; --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; -h|--help) usage; exit;; @@ -283,6 +285,11 @@ clone_user_rev() { local url="$2" local rev="${3:-HEAD}" + if [ -n "$fetchLFS" ]; then + HOME=$TMPDIR + git lfs install + fi + # Perform the checkout. case "$rev" in HEAD|refs/*) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3f895d9cfed..3b3a38ea1d3 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -81,7 +81,8 @@ for module in $(cat closure); do for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" - cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \ + || echo "WARNING: missing firmware $i for module $module" done done diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 9c709921d21..89edbd513d5 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -63,7 +63,7 @@ rec { # # Examples: # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } - makeBinWriter = { compileScript }: nameOrPath: content: + makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); assert lib.or (types.path.check content) (types.str.check content); let @@ -76,6 +76,8 @@ rec { contentPath = content; }) '' ${compileScript} + ${lib.optionalString strip + "${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded $out"} ${optionalString (types.path.check nameOrPath) '' mv $out tmp mkdir -p $out/$(dirname "${nameOrPath}") @@ -109,7 +111,10 @@ rec { # return 0; # } # '' - writeC = name: { libraries ? [] }: + writeC = name: { + libraries ? [], + strip ? true + }: makeBinWriter { compileScript = '' PATH=${makeBinPath [ @@ -131,8 +136,8 @@ rec { -Wall \ -x c \ "$contentPath" - strip --strip-unneeded "$out" ''; + inherit strip; } name; # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin) @@ -165,21 +170,38 @@ rec { writeHaskell = name: { libraries ? [], ghc ? pkgs.ghc, - ghcArgs ? [] + ghcArgs ? [], + strip ? true }: makeBinWriter { compileScript = '' cp $contentPath tmp.hs ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs mv tmp $out - ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out" ''; + inherit strip; } name; # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) writeHaskellBin = name: writeHaskell "/bin/${name}"; + writeRust = name: { + rustc ? pkgs.rustc, + rustcArgs ? [], + strip ? true + }: + makeBinWriter { + compileScript = '' + cp "$contentPath" tmp.rs + PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} -o "$out" tmp.rs + ''; + inherit strip; + } name; + + writeRustBin = name: + writeRust "/bin/${name}"; + # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and # returns an executable # diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d284bda43d0..0febad2929a 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -31,6 +31,12 @@ let test '~' = '~' && echo 'success' ''; + rust = writeRustBin "test_writers" {} '' + fn main(){ + println!("success") + } + ''; + haskell = writeHaskellBin "test_writers" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 702d4293f2a..b3513818df8 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; + sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/prjxray-db/default.nix b/pkgs/data/misc/prjxray-db/default.nix new file mode 100644 index 00000000000..d498fdb1cc8 --- /dev/null +++ b/pkgs/data/misc/prjxray-db/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "prjxray-db"; + version = "0.0-0232-g303a61d"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjxray-db"; + rev = "303a61d8bc552f7a533b91b17448c59e908aa391"; + sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2"; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + DBDIR="$out/share/symbiflow/prjxray-db/" + DB_CONFIG="$out/bin/prjxray-config" + + mkdir -p $DBDIR $out/bin + + for device in artix7 kintex7 zynq7; do + cp -r $src/$device $DBDIR + done + + echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG + chmod +x $DB_CONFIG + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; + homepage = "https://github.com/SymbiFlow/prjxray-db"; + license = licenses.cc0; + maintainers = with maintainers; [ mcaju ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/symbiflow-arch-defs/default.nix b/pkgs/data/misc/symbiflow-arch-defs/default.nix new file mode 100644 index 00000000000..89549da85dc --- /dev/null +++ b/pkgs/data/misc/symbiflow-arch-defs/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchurl +, autoPatchelfHook +, python3Packages +, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ] +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-arch-defs"; + version = "20200914-111752-g05d68df0"; + + src = fetchurl { + url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz"; + sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74"; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ + python3Packages.lxml + python3Packages.python-constraint + ]; + + installPhase = '' + mkdir -p $out/bin + cp -r bin/{symbiflow_*,vpr_common,python} $out/bin + for script in $out/bin/symbiflow_*; do + substituteInPlace $script --replace '/env' '/symbiflow_env' + done + cp bin/env $out/bin/symbiflow_env + + mkdir -p $out/share/symbiflow/arch + cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/ + + for arch in ${builtins.concatStringsSep " " archs}; do + cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/ + done + ''; + + meta = with stdenv.lib; { + description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; + homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs"; + hydraPlatforms = []; + license = licenses.isc; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 1af0230d569..987df8deaf4 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.13"; + version = "3.22.14"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"; + sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index ede6b12cf55..70e7bdef2d4 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; + sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; }; buildInputs = [ diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix index d16a84d5709..f7199767467 100644 --- a/pkgs/data/themes/marwaita-pop_os/default.nix +++ b/pkgs/data/themes/marwaita-pop_os/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-pop_os"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6"; + sha256 = "1nwfyy3jnfsdlqgj7ig9gbawazdm76g02b0hrfsll17j5498d59y"; }; buildInputs = [ diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/data/themes/marwaita-ubuntu/default.nix index 8d32f0a3bd9..f98e112678c 100644 --- a/pkgs/data/themes/marwaita-ubuntu/default.nix +++ b/pkgs/data/themes/marwaita-ubuntu/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-ubuntu"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mld78s6gl5kfsdaqa7xs5mvfng9600pd2d9sp2b2q5axx7wjay5"; + sha256 = "024b0817jilvi5ilq9sbwg19ql5i2x3jfgc1awk7zzv6sqii639x"; }; buildInputs = [ diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index e0d706d2b0b..f7f139a9ea9 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-12-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1"; + sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix index e5a2ccd89cd..0e0dab64be1 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; - version = "6"; + version = "10"; src = fetchgit { url = "https://framagit.org/abakkk/DrawOnYourScreen/"; rev = "v${version}"; - sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w"; + sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; }; uuid = "drawOnYourScreen@abakkk.framagit.org"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ]; + maintainers = with maintainers; [ ericdallo ahuzik ]; platforms = gnome3.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix new file mode 100644 index 00000000000..add87c10f1a --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-unite-shell"; + version = "44"; + + src = fetchFromGitHub { + owner = "hardpixel"; + repo = "unite-shell"; + rev = "v${version}"; + sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g"; + }; + + uuid = "unite@hardpixel.eu"; + + nativeBuildInputs = [ glib ]; + + buildInputs = [ xprop ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/hardpixel/unite-shell"; + broken = versionOlder gnome3.gnome-shell.version "3.32"; + }; +} diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index ee915491f85..959afe1b887 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -39,6 +39,9 @@ mkDerivation rec { xorg.libXScrnSaver ]; + # convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources + patches = [ ./fix-application-path.patch ]; + postPatch = '' sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; diff --git a/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch new file mode 100644 index 00000000000..12ef97db5d8 --- /dev/null +++ b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch @@ -0,0 +1,23 @@ +--- a/lxqtapplication.cpp ++++ b/lxqtapplication.cpp +@@ -77,7 +77,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals) + + void Application::updateTheme() + { +- const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName(); ++ const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName().mid(1).chopped(8); + setStyleSheet(lxqtTheme.qss(styleSheetKey)); + Q_EMIT themeChanged(); + } + +--- a/lxqttranslator.cpp ++++ b/lxqttranslator.cpp +@@ -147,7 +147,7 @@ bool Translator::translateApplication(const QString &applicationName) + if (!applicationName.isEmpty()) + return translate(applicationName); + else +- return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName()); ++ return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName().mid(1).chopped(8)); + } + + diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 275c2944462..dc124f56f6e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -5,13 +5,13 @@ # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { pname = "idris2"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "18m483vccijfh9z6x4zgi37fql3q765x3ypkwixv3rwq9nxnd6hm"; + sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh"; }; strictDeps = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 78fff4a59fb..17030cf5bf1 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -76,7 +76,7 @@ let result = stdenv.mkDerivation rec { i686-linux = "linux-i586"; x86_64-linux = "linux-x64"; armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-arm64-vfp-hflt"; + aarch64-linux = "linux-aarch64"; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); in requireFile { name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index fdea10dcd7e..01d1ee8e980 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "261"; - sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm"; - sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s"; - sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9"; - sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n"; + patchVersion = "271"; + sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; + sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; + sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; + sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; jceName = "jce_policy-8.zip"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } diff --git a/pkgs/development/compilers/prjxray-tools/default.nix b/pkgs/development/compilers/prjxray-tools/default.nix new file mode 100644 index 00000000000..652b5458a75 --- /dev/null +++ b/pkgs/development/compilers/prjxray-tools/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "prjxray-tools"; + version = "0.1-2676-gac8d30e3"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "prjxray"; + fetchSubmodules = true; + rev = "ac8d30e3fe2029122408888d2313844b3e0c265b"; + sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h"; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Documenting the Xilinx 7-series bit-stream format"; + homepage = "https://github.com/SymbiFlow/prjxray"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/symbiflow-vtr/default.nix b/pkgs/development/compilers/symbiflow-vtr/default.nix new file mode 100644 index 00000000000..8735b12678c --- /dev/null +++ b/pkgs/development/compilers/symbiflow-vtr/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, bison +, cmake +, flex +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-vtr"; + version = "8.0.0.rc2-4003-g8980e4621"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "vtr-verilog-to-routing"; + rev = "8980e46218542888fac879961b13aa7b0fba8432"; + sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa"; + }; + + nativeBuildInputs = [ + bison + cmake + flex + pkg-config + ]; + + cmakeFlags = [ + "-DWITH_ODIN=OFF" + "-DWITH_ABC=OFF" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "SymbiFlow WIP changes for Verilog to Routing (VTR)"; + homepage = "https://github.com/SymbiFlow/vtr-verilog-to-routing"; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix b/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix new file mode 100644 index 00000000000..b655f9d4873 --- /dev/null +++ b/pkgs/development/compilers/symbiflow-yosys-plugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, symbiflow-yosys +, zlib +, readline +}: + +stdenv.mkDerivation rec { + pname = "symbiflow-yosys-plugins"; + version = "1.0.0.7-0060-g7454cd6b"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "yosys-symbiflow-plugins"; + rev = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717"; + sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ symbiflow-yosys ]; + + buildInputs = [ + readline + zlib + ]; + + makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ]; + + meta = with stdenv.lib; { + description = "Yosys SymbiFlow Plugins"; + homepage = "https://github.com/SymbiFlow/yosys-symbiflow-plugins"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/compilers/symbiflow-yosys/default.nix b/pkgs/development/compilers/symbiflow-yosys/default.nix new file mode 100644 index 00000000000..b33003f312e --- /dev/null +++ b/pkgs/development/compilers/symbiflow-yosys/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, abc-verifier +, fetchFromGitHub +, yosys +, plugins ? [] +}: + +let + localAbc-verifier = abc-verifier.overrideAttrs (_: rec { + pname = "abc-verifier"; + version = "2020.06.22"; + + src = fetchFromGitHub { + owner = "YosysHQ"; + repo = "abc"; + rev = "341db25668f3054c87aa3372c794e180f629af5d"; + sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s"; + }; + + passthru.rev = src.rev; + }); +in + +(yosys.overrideAttrs (oldAttrs: rec { + pname = "symbiflow-yosys"; + version = "0.9+2406"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "yosys"; + rev = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1"; + sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g"; + }; +})).override { + abc-verifier = localAbc-verifier; + plugins = plugins; +} diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 51f0b7ed45a..a83100911d1 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , flex , libffi -, pkgconfig +, pkg-config , protobuf , python3 , readline , tcl , verilog , zlib +, plugins ? [] }: # NOTE: as of late 2020, yosys has switched to an automation robot that @@ -32,6 +33,8 @@ # ultimately less confusing than using dates. stdenv.mkDerivation rec { + inherit plugins; + pname = "yosys"; version = "0.9+3830"; @@ -43,21 +46,16 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; + nativeBuildInputs = [ pkg-config protobuf flex bison python3 ]; + buildInputs = [ tcl readline libffi python3 protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; patchPhase = '' substituteInPlace ./Makefile \ - --replace 'CXX = clang' "" \ - --replace 'LD = clang++' 'LD = $(CXX)' \ - --replace 'CXX = gcc' "" \ - --replace 'LD = gcc' 'LD = $(CXX)' \ - --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' - substituteInPlace ./misc/yosys-config.in \ - --replace '/bin/bash' '${bash}/bin/bash' + chmod +x ./misc/yosys-config.in + patchShebangs ./misc/yosys-config.in patchShebangs tests ''; @@ -76,8 +74,8 @@ stdenv.mkDerivation rec { exit 1 fi - if ! grep -q "YOSYS_VER := ${version}" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." + if ! grep -q "YOSYS_VER := $version" Makefile; then + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing." exit 1 fi ''; @@ -94,7 +92,14 @@ stdenv.mkDerivation rec { # add a symlink to fake things so that both variants work the same way. this # is also needed at build time for the test suite. postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; - postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; + postInstall = '' + ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc + + mkdir -p $out/share/yosys/plugins + for plugin in $plugins; do + ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/ + done + ''; meta = with stdenv.lib; { description = "Open RTL synthesis framework and tools"; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 9304335260a..7d63c903795 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -22,6 +22,7 @@ with lib; mkCoqDerivation { meta = { description = "Analysis library compatible with Mathematical Components"; + maintainers = [ maintainers.cohencyril ]; license = licenses.cecill-c; }; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a221ce38c8a..e135374511f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -33,7 +33,7 @@ in , profilingDetail ? "exported-functions" # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false -, enableSharedLibraries ? (ghc.enableShared or false) +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 039c50f0693..9fc9a441215 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -85,6 +85,6 @@ in ${lib.optionalString (documentationRoot != null) '' mkdir -p $out/${dataDhall} - XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs ''} '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 525ef8c1c6d..d49de17ebce 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -216,7 +216,7 @@ in with passthru; stdenv.mkDerivation { else ./3.7/fix-finding-headers-when-cross-compiling.patch ) - ] ++ optionals (isPy37 || isPy38) [ + ] ++ optionals (isPy36 || isPy37 || isPy38) [ # Backport a fix for ctypes.util.find_library. ./3.7/find_library.patch ]; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 4d2cf7515c0..f7d94f42469 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { inherit version; description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = platforms.unix; license = licenses.bsd2; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix new file mode 100644 index 00000000000..5f2fdb8f749 --- /dev/null +++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: + +stdenv.mkDerivation rec { + pname = "GameNetworkingSockets"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "ValveSoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "1zghyc4liml8gzxflyh5gp6zi11ny6ng5hv9wyqvp32rfx221gc6"; + }; + + nativeBuildInputs = [ cmake ninja go ]; + + cmakeFlags = [ "-G Ninja" ]; + + # tmp home for go + preBuild = "export HOME=\"$TMPDIR\""; + + buildInputs = [ protobuf openssl ]; + + meta = with stdenv.lib; { + # build failure is resolved on master, remove at next release + broken = stdenv.isDarwin; + description = "GameNetworkingSockets is a basic transport layer for games"; + license = licenses.bsd3; + platforms = platforms.unix; + inherit (src.meta) homepage; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index b3bf33f0e88..a568078f991 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,21 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ autoreconfHook +, fetchFromGitHub +, fetchpatch +, lib +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; + sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + }; + + patches = [ + # Fix compilation without openipmi, can be dropped for the next release. + (fetchpatch { + url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; + sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; }; configureFlags = [ "--with-python=no" ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "General Stream I/O"; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index addcb5b5a4f..e9e8d3447b9 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,24 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }: +{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: -stdenv.mkDerivation rec { +let version = "0.3.95"; pname = "lensfun"; - src = fetchurl { - url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz"; - sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; + # Fetch a more recent version of the repo containing a more recent lens + # database + lensfunDatabase = fetchFromGitHub { + owner = "lensfun"; + repo = "lensfun"; + rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; + sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; }; - nativeBuildInputs = [ cmake pkgconfig ]; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "lensfun"; + repo = "lensfun"; + rev = "v${version}"; + sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; + }; + + # replace database with a more recent snapshot + postUnpack = '' + rm -R source/data/db + cp -R ${lensfunDatabase}/data/db source/data + ''; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib zlib libpng ]; - configureFlags = [ "-v" ]; + cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = with stdenv.lib; { platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ flokli ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; - homepage = "http://lensfun.sourceforge.net/"; + homepage = "https://lensfun.github.io"; }; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 3816788f929..7e481034f43 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. - configureFlags = "LATEX2MAN=${coreutils}/bin/true"; + configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ]; propagatedBuildInputs = [ xz ]; diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch new file mode 100644 index 00000000000..8c164f35499 --- /dev/null +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -0,0 +1,340 @@ +From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 14 Jan 2021 00:32:00 -0800 +Subject: [PATCH] meson: patch in an install prefix for building on nix + +Used in the nixpkgs version of libvirt so that we can install things in +the nix store, but read them from the root filesystem. +--- + meson.build | 9 +++++++++ + meson_options.txt | 2 ++ + src/libxl/meson.build | 6 +++--- + src/locking/meson.build | 8 ++++---- + src/lxc/meson.build | 6 +++--- + src/meson.build | 18 +++++++++--------- + src/network/meson.build | 12 ++++++------ + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 14 +++++++------- + src/remote/meson.build | 6 +++--- + src/security/apparmor/meson.build | 8 ++++---- + tools/meson.build | 4 ++-- + 12 files changed, 53 insertions(+), 42 deletions(-) + +diff --git a/meson.build b/meson.build +index 2e57a435df..4a72902a63 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 + endif + ++# patched in for nix ++install_prefix = get_option('install_prefix') + + # set various paths + +@@ -57,6 +59,13 @@ else + sysconfdir = prefix / get_option('sysconfdir') + endif + ++# nix: don't prefix the localstatedir; some things need to write to it, so it ++# can't be in the nix store, and that's what the prefix is. ++# We'll prefix things ourselves where needed ++localstatedir = get_option('localstatedir') ++# Same for sysconfidr ++sysconfdir = get_option('sysconfdir') ++ + # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for + # sysconfdir as this makes a lot of things break in testing situations + if prefix == '/usr' +diff --git a/meson_options.txt b/meson_options.txt +index 74de064384..0a21eb845e 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,5 @@ ++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') ++ + option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') + option('packager', type: 'string', value: '', description: 'Extra packager name') + option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 3bb6cc5f2e..78d7be0ace 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', + ] + endif +diff --git a/src/locking/meson.build b/src/locking/meson.build +index 8a28310e40..9da81cc574 100644 +--- a/src/locking/meson.build ++++ b/src/locking/meson.build +@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lockd', +- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', +- runstatedir / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', ++ install_prefix + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'sanlock', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif + endif +diff --git a/src/lxc/meson.build b/src/lxc/meson.build +index f8e2a8852a..96d6687c5d 100644 +--- a/src/lxc/meson.build ++++ b/src/lxc/meson.build +@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', +- localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', + ] + endif +diff --git a/src/meson.build b/src/meson.build +index 29c8210ab2..bc960e0b69 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -669,7 +669,7 @@ endforeach + + virt_conf_files += 'libvirt.conf' + +-install_data(virt_conf_files, install_dir: confdir) ++install_data(virt_conf_files, install_dir: install_prefix + confdir) + install_data(virt_aug_files, install_dir: virt_aug_dir) + + # augeas_test_data: +@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, +- install_dir: confdir, ++ install_dir: install_prefix + confdir, + ) + + if data.get('with_ip', false) +@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') + + install_data( + init_file, +- install_dir: sysconfdir / 'init.d', ++ install_dir: install_prefix + sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], +- install_dir: sysconfdir / 'conf.d', ++ install_dir: install_prefix + sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif +@@ -872,7 +872,7 @@ if init_script != 'none' + foreach sysconf : sysconf_files + install_data( + sysconf['file'], +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) + endforeach +@@ -897,10 +897,10 @@ endif + # Install empty directories + + virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', ++ install_prefix + localstatedir / 'cache' / 'libvirt', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', + ] + + meson.add_install_script( +diff --git a/src/network/meson.build b/src/network/meson.build +index 13dd2c26b2..1be020081f 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'network', +- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', +- runstatedir / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', ++ install_prefix + runstatedir / 'libvirt' / 'network', + ] + + uuidgen_prog = find_program('uuidgen', required: false) +@@ -98,7 +98,7 @@ if conf.has('WITH_NETWORK') + ], + capture: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + else + configure_file( +@@ -106,13 +106,13 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + endif + + meson.add_install_script( + meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) + +diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build +index 95af75bb15..7fe99076f4 100644 +--- a/src/nwfilter/xml/meson.build ++++ b/src/nwfilter/xml/meson.build +@@ -19,4 +19,4 @@ nwfilter_xml_files = [ + 'qemu-announce-self.xml', + ] + +-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') ++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') +diff --git a/src/qemu/meson.build b/src/qemu/meson.build +index 4e599d1e69..ba558d78f8 100644 +--- a/src/qemu/meson.build ++++ b/src/qemu/meson.build +@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- localstatedir / 'cache' / 'libvirt' / 'qemu', +- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'swtpm', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] + endif +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6ab1c..429a15b326 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') + } + + virt_install_dirs += [ +- localstatedir / 'log' / 'libvirt', ++ install_prefix + localstatedir / 'log' / 'libvirt', + ] + + logrotate_conf = configuration_data() +@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') + ) + install_data( + log_file, +- install_dir: sysconfdir / 'logrotate.d', ++ install_dir: install_prefix + sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach +@@ -309,7 +309,7 @@ endif + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: install_prefix + sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) + endif +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index af43780211..e2d6c812f8 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, +- install_dir: apparmor_dir, ++ install_dir: install_prefix + apparmor_dir, + ) + endforeach + + install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + + install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], +- install_dir: apparmor_dir / 'libvirt', ++ install_dir: install_prefix + apparmor_dir / 'libvirt', + ) + + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +diff --git a/tools/meson.build b/tools/meson.build +index b8c6802f0a..dacd0ff1ce 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') + install_rpath: libvirt_rpath, + ) + +- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') ++ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') + endif + + if host_machine.system() == 'windows' +@@ -274,7 +274,7 @@ configure_file( + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) + +-- +2.29.2 + diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 224168888c0..690f2f3cfe7 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, autoreconfHook, fetchpatch +, makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils -, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor +, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, libtasn1, iptables-nftables-compat, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin +, meson, ninja, audit, cmake, bash-completion, pkg-config , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -17,26 +18,28 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.6.0"; + version = "6.8.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl"; + sha256 = "0hhk2r0dnm9zmfwmnsnmnacm4pik6z60llp22axx7kcpqxv98nv5"; } else fetchgit { url = "https://gitlab.com/libvirt/libvirt.git"; rev = "v${version}"; - sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn"; + sha256 = "sha256-BQZPdmDE0g7xWd6QOHMKosP2HgVpIjsfgfohA9VxEHs="; fetchSubmodules = true; }; + patches = [ + ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ]; + nativeBuildInputs = [ - makeWrapper pkgconfig docutils - ] ++ optionals (!buildFromTarball) [ - autoreconfHook + ninja meson cmake makeWrapper pkg-config docutils ] ++ optional (!stdenv.isDarwin) [ rpcsvc-proto ] ++ optionals stdenv.isDarwin [ @@ -44,10 +47,11 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + bash-completion pkg-config libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 util-linux systemd libnl numad zfs + audit libpciaccess lvm2 util-linux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -59,62 +63,60 @@ in stdenv.mkDerivation rec { libiconv gmp ]; - preConfigure = '' - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + preConfigure = let + overrides = { + QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; + QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; + }; + patchBuilder = var: value: '' + sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" + ''; + in '' + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - mkdir -p build && cd build - ''; + '' + + (stdenv.lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides)); - configureScript = "../configure"; + mesonAutoFeatures = "auto"; - dontAddDisableDepTrack = true; - - configureFlags = [ - "--with-runstatedir=/run" # TODO: remove when autoconf 2.70 is released - "--localstatedir=/var" + mesonFlags = let + opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + in [ "--sysconfdir=/var/lib" - "--with-libpcap" - "--with-qemu" - "--with-vmware" - "--with-vbox" - "--with-test" - "--with-esx" - "--with-remote" - "--with-polkit" + "-Dinstall_prefix=${placeholder "out"}" + "-Dlocalstatedir=/var/lib" + "-Drunstatedir=/var/run" + "-Dlibpcap=enabled" + "-Ddriver_qemu=enabled" + "-Ddriver_vmware=enabled" + "-Ddriver_vbox=enabled" + "-Ddriver_test=enabled" + "-Ddriver_esx=enabled" + "-Ddriver_remote=enabled" + "-Dpolkit=enabled" + "-Ddbus=enabled" + (opt "storage_iscsi" enableIscsi) ] ++ optionals stdenv.isLinux [ - "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" - "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" - "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy" - "CFLAGS=-I${libtirpc.dev}/include/tirpc" - "--with-attr" - "--with-apparmor" - "--with-secdriver-apparmor" - "--with-numad" - "--with-macvtap" - "--with-virtualport" - "--with-storage-disk" - ] ++ optionals (stdenv.isLinux && zfs != null) [ - "--with-storage-zfs" - ] ++ optionals enableIscsi [ - "--with-storage-iscsi" - ] ++ optionals enableCeph [ - "--with-storage-rbd" + (opt "storage_zfs" (zfs != null)) + "-Dattr=enabled" + "-Dapparmor=enabled" + "-Dsecdriver_apparmor=enabled" + "-Dnumad=enabled" + "-Dmacvtap=enabled" + "-Dvirtualport=enabled" + "-Dstorage_disk=enabled" + (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ - "--with-init-script=none" - ]; - - installFlags = [ - "runstatedir=${placeholder "out"}/run" - "localstatedir=$(TMPDIR)/var" - "sysconfdir=$(out)/var/lib" + "-Dinit_script=none" ]; postInstall = let - binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + # iptables-nftables-compat for an 'ebtables' binary + binPath = [ iptables-nftables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ @@ -132,8 +134,6 @@ in stdenv.mkDerivation rec { --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; - enableParallelBuilding = true; - meta = { homepage = "https://libvirt.org/"; repositories.git = "git://libvirt.org/libvirt.git"; diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index b5fe6e59356..6accf24ac28 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libzra"; - version = "unstable-2020-08-10"; + version = "unstable-2020-09-11"; src = fetchFromGitHub { owner = "zraorg"; repo = "zra"; - rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b"; - sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h"; + rev = "57abf2774dfc4624f14a0bc5bba71f044ce54a38"; + sha256 = "10rlqj6ma02005gdcp57wp48d6cg0vkbv4vl9ai0zlgxyx1g6kc4"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix new file mode 100644 index 00000000000..445188bd0d9 --- /dev/null +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pe-parse"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "pe-parse"; + rev = "v${version}"; + sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + }; + + nativeBuildInputs = [ cmake ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dump-pe ../test/assets/example.exe + ''; + + meta = with lib; { + description = "A principled, lightweight parser for Windows portable executable files"; + homepage = "https://github.com/trailofbits/pe-parse"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index dc0ca5da4cf..ad10a4333de 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -6,25 +6,20 @@ with stdenv.lib; let - unavailable = throw "libtensorflow is not available for this platform!"; + broken = !stdenv.isLinux && !stdenv.isDarwin; tfType = if cudaSupport then "gpu" else "cpu"; - system = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else unavailable; + system = + if stdenv.isLinux then "linux" + else "darwin"; - platform = - if stdenv.isx86_64 then "x86_64" - else unavailable; + platform = "x86_64"; - rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++ - optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); packages = import ./binary-hashes.nix; - packageName = "${tfType}-${system}-${platform}"; - url = packages.${packageName} or unavailable; patchLibs = if stdenv.isDarwin @@ -44,7 +39,7 @@ in stdenv.mkDerivation rec { pname = "libtensorflow"; inherit (packages) version; - src = fetchurl url; + src = fetchurl packages."${tfType}-${system}-${platform}"; nativeBuildInputs = optional cudaSupport addOpenGLRunpath; @@ -72,6 +67,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.tensorflow.org/install/lang_c"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 76f0c5eea7f..b606e45477a 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,15 +1,15 @@ { -version = "1.14.0"; -cpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; +version = "2.4.0"; +"cpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk"; }; -gpu-linux-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; - sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; +"gpu-linux-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz"; + sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq"; }; -cpu-darwin-x86_64 = { - url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; - sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; +"cpu-darwin-x86_64" = { + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz"; + sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3"; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh index 515f25df4c1..d571d38f771 100755 --- a/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh +++ b/pkgs/development/libraries/science/math/tensorflow/prefetcher.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash -version=1.14.0 -hashfile=binary-hashes.nix +# ./prefetcher.sh 2.4.0 binary-hashes.nix + +version="$1" +hashfile="$2" rm -f $hashfile echo "{" >> $hashfile echo "version = \"$version\";" >> $hashfile diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 8f045802d3a..264b34125a8 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -19,10 +19,14 @@ with stdenv.lib; stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' + runHook preInstall + mkdir -p $out/lib cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html + + runHook postInstall ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 7541ee42704..3388666f46b 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, xercesc }: let - fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xsd"; version = "4.0.0"; @@ -14,20 +13,22 @@ stdenv.mkDerivation { patches = [ ./xsdcxx.patch ]; - configurePhase = '' + postPatch = '' patchShebangs . ''; - buildPhase = '' - make ${fixed_paths} - ''; + enableParallelBuilding = true; + + buildFlags = [ + "LDFLAGS=-L${xercesc}/lib" + "CPPFLAGS=-I${xercesc}/include" + ]; + installFlags = buildFlags ++ [ + "install_prefix=${placeholder "out"}" + ]; buildInputs = [ xercesc ]; - installPhase = '' - make ${fixed_paths} install_prefix="$out" install - ''; - meta = { homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix new file mode 100644 index 00000000000..81b335520b0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clfswm''; + version = ''20161204-git''; + + description = ''CLFSWM: Fullscreen Window Manager''; + + deps = [ args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz''; + sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73''; + }; + + packageName = "clfswm"; + + asdFilesToKeep = ["clfswm.asd"]; + overrides = x: x; +} +/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256 + 1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL + http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz + MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 96d5867a3b3..412fd4b8dee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -81,7 +81,7 @@ in postInstall = ((x.overrides y).postInstall or "") + '' export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS $out/lib/common-lisp/query-fs" - export HOME=$PWD + export HOME=$PWD export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" "$out/bin/query-fs-lisp-launcher.sh" @@ -231,4 +231,14 @@ $out/lib/common-lisp/query-fs" cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; + clfswm = x: { + overrides = y: (x.overrides y) // { + postInstall = '' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system clfswm '(function clfswm:main)'" + "$out/bin/clfswm-lisp-launcher.sh" + + cp "$out/lib/common-lisp/clfswm/clfswm" "$out/bin" + ''; + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 52d626888a3..383510df777 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -82,6 +82,7 @@ cl-utilities cl-vectors cl-webkit2 cl-who +clfswm clx collectors command-line-arguments diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 11244ec84a6..cbaa13af962 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2848,6 +2848,13 @@ let quicklisp-to-nix-packages = rec { "fiasco" = quicklisp-to-nix-packages."fiasco"; })); + "clfswm" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clfswm" or (x: {})) + (import ./quicklisp-to-nix-output/clfswm.nix { + inherit fetchurl; + "clx" = quicklisp-to-nix-packages."clx"; + })); "cl-who" = buildLispPackage ((f: x: (x // (f x))) diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index 60e774918d5..8c9f97f81ab 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, async }: buildDunePackage rec { pname = "angstrom-async"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Async support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index eb4de44d7a6..1bb8833cf07 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: buildDunePackage rec { pname = "angstrom-lwt-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Lwt_unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 134c161d266..af72c7f8d2d 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom }: buildDunePackage rec { pname = "angstrom-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 79c4d8a5002..959a7203dfa 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: +{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = { - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "http://apron.cri.ensmp.fr/library/"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; description = "Numerical abstract domain library"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index f790a87e22c..ba8cd98327f 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let # Use astring 0.8.3 for OCaml < 4.05 param = - if stdenv.lib.versionAtLeast ocaml.version "4.05" + if lib.versionAtLeast ocaml.version "4.05" then { version = "0.8.5"; sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { adds a few missing functions and fully exploits OCaml's newfound string immutability. ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 41992575a99..e4edac5fdc1 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }: +{ lib, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }: buildDunePackage rec { pname = "atd"; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index f24896ba2e9..9284bbaf9c6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -8,11 +8,11 @@ , z3 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "BAP is not available for OCaml ${ocaml.version}" else -if stdenv.lib.versionAtLeast core_kernel.version "0.13" +if lib.versionAtLeast core_kernel.version "0.13" then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)" else diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 87622ab0fbf..d4b7f3ff9a1 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.2.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; checkTarget = "test"; createFindlibDestdir = true; @@ -27,10 +27,10 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 518a8756158..07432dd7c6e 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: let version = "1.4"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Benchmark running times of code"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 1da1df752e8..50ef935aff6 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, fetchurl, ocaml, type_conv }: +{ lib, buildOcaml, fetchurl, ocaml, type_conv }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index e98c9a40eea..795e6340129 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -5,7 +5,7 @@ let webpage = "http://mjambon.com/${pname}.html"; in -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index b97c78a399b..8e0780ae6c5 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchFromGitHub, buildDunePackage, easy-format }: buildDunePackage rec { pname = "biniou"; @@ -20,7 +20,7 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index 216978412e0..596ed6161d7 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, fetchpatch +{ lib, buildDunePackage, fetchFromGitHub, fetchpatch , ounit, async, base64, camlzip, cfstream , core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }: diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 359d83b4762..23e8d145a30 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, autoreconfHook, which, ocaml, findlib }: +{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "bitv is not available for OCaml ${ocaml.version}" else @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A bit vector library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/backtracking/bitv"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index d14deedcb65..54bc28697ec 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: -let inherit (stdenv.lib) getVersion versionAtLeast; in +let inherit (lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "4.00.0"; assert versionAtLeast (getVersion findlib) "1.3.3"; diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index ca6c362b6fa..84cee3d97ce 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, fmt, fpath, logs, rresult }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; homepage = "https://erratique.ch/software/bos"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index f23081a5f19..1210ed41dc2 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: stdenv.mkDerivation { name = "ocaml-calendar-2.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { license = "LGPL"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index ca9432a72b3..18683d5f170 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "camlpdf is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index d8bbfafa98d..c2c2e98b2e0 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -2,7 +2,7 @@ let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.10"; url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 6b18220dc8a..79c7a46e6e9 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.05" +if lib.versionAtLeast ocaml.version "4.05" then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { meta = { homepage = "http://camomile.sourceforge.net/"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; branch = "0.8.2"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index b975482ecf3..67bd8b8c755 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation { pname = "camomile"; @@ -21,10 +21,10 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ff0cb4aa3fe..2b246d0f3ea 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, cppo }: buildDunePackage rec { pname = "camomile"; @@ -17,8 +17,8 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; description = "A Unicode library for OCaml"; }; } diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index a947eadbf11..303fdc01011 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index 7a78573412f..5b9814cea69 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; + useDune2 = true; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 75e02244910..3aefe2eb874 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cil is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index b9980471043..7e49679406a 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -4,10 +4,10 @@ let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert lib.versionAtLeast ocaml.version "4.01.0"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.4"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; } else { diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 246397b6081..974c3aa2f9c 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv , logs, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" then +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast async.version "0.13" then +else if !lib.versionAtLeast async.version "0.13" then throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 3a99ed9536f..455a76ce94d 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, cohttp-lwt +{ lib, buildDunePackage, cohttp-lwt , conduit-lwt-unix, ppx_sexp_conv , cmdliner, fmt, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" +if !lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 8357d748ce8..04f81e8e8df 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,8 +1,8 @@ -{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: +{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13" +else if !lib.versionAtLeast ppx_sexp_conv.version "0.13" then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" else diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index d5133064652..addba7a4b34 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcaml, fetchurl, type_conv}: +{lib, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "comparelib"; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index f16819ed8ae..e289b5d711d 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,6 +1,6 @@ -{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: -if !stdenv.lib.versionAtLeast conduit.version "1.0" +if !lib.versionAtLeast conduit.version "1.0" then conduit else diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index b800d6b7ba4..8c9b757f87c 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage , ppx_sexp_conv, sexplib, astring, uri, logs , ipaddr, ipaddr-sexp }: @@ -20,8 +20,8 @@ buildDunePackage rec { meta = { description = "A network connection establishment library"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index b3c7e7fa86f..9f871a8ea9c 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage +{ buildDunePackage , conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp , lwt_ssl, tls }: diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 6514586f9d9..512aa60bb66 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: +{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: buildDunePackage { pname = "conduit-lwt"; diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 724c5b1e2d6..29c7cd61c3f 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }: stdenv.mkDerivation { name = "ocaml-config-file-1.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = "http://config-file.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index 2544723a902..083f00d5d5f 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ autoconf ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 2d9ac2a7b19..6011c6953ba 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else @@ -28,10 +28,10 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 33c1aa6b7ae..750a153c1c4 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -2,7 +2,7 @@ , async ? null, lwt ? null }: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert lib.versionAtLeast ocaml.version "4.01"; let version = "1.9.0"; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/mirage/ocaml-cstruct"; description = "Map OCaml arrays onto C-like structs"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 60496ad28da..8cf2918989e 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "csv"; @@ -13,8 +13,8 @@ buildDunePackage rec { meta = { description = "A pure OCaml library to read and write CSV files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Chris00/ocaml-csv"; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 1805f587cad..92a4ff9535c 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 236b9c19c92..491b2844ef1 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchurl, ocaml +{ stdenv, lib, buildDunePackage, fetchurl, ocaml , result, alcotest, cohttp-lwt-unix, odoc, curl }: buildDunePackage rec { @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; checkInputs = [ alcotest cohttp-lwt-unix ]; # test dependencies are only available for >= 4.08 - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08" + doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") && !stdenv.isDarwin; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 21d9d02da4b..4f0b95da6cb 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.2"; + version = "4.6.3"; useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "0prypr5c589vay4alri78g0sarh06z35did26wn3s3di17d5761q"; + sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 824da303068..d4a47abcafa 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-dolmen-${version}"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index f9eef4774f5..690823c5358 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 92f75fb3c33..62fa7cd08c8 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ stdenv, lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "dtoa"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/flowtype/ocaml-dtoa"; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index ead672fa15c..5b5b107b694 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: let pname = "dypgen"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; - license = stdenv.lib.licenses.cecill-b; + license = lib.licenses.cecill-b; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index e86d21da016..c86b7cba010 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index b41743f542d..4eff6c2957d 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: +{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: stdenv.mkDerivation rec { version = "1.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "ETH LIbrary for Numerical Analysis"; homepage = "http://elina.ethz.ch/"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5d3c5310044..4c845273d71 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib , ppx_tools_versioned @@ -8,7 +8,7 @@ , lwt_ppx }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "eliom is not available for OCaml ${ocaml.version}" else @@ -54,8 +54,8 @@ stdenv.mkDerivation rec distinguish both parts and the client side is compiled to JS using Ocsigen Js_of_ocaml.''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 22a6d12792c..eb0495be797 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.00"; -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ebfcbc90a50..56b5c929570 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "erm_xml is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index c3534d146f8..cff155f4709 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild , erm_xml, mirage-crypto, mirage-crypto-rng, base64 }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/hannesm/xmpp"; description = "OCaml based XMPP implementation (fork)"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 782ebce9cb8..7424d14220d 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, ocaml, fetchurl }: +{ lib, buildOcaml, ocaml, fetchurl }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "estring is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 886f346012c..219b8164e7c 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ounit, expat}: +{stdenv, lib, fetchurl, ocaml, findlib, ounit, expat}: let pname = "ocaml-expat"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; description = "An ocaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 6058c87e7bd..9675fa88151 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }: +{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib expat ounit ]; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; + doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; createFindlibDestdir = true; meta = { description = "OCaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 5e04c73c302..a8b1810e51f 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { name = "ocaml${ocaml.version}-extlib-1.7.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 269288ef3cd..fd318705512 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: +{ lib, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "An easy interface on top of the Jsonm library"; homepage = "https://github.com/mirage/ezjsonm"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix index 68b128283cc..6d5fe28a8c0 100644 --- a/pkgs/development/ocaml-modules/ezxmlm/default.nix +++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, xmlm }: +{ lib, fetchFromGitHub, buildDunePackage, xmlm }: buildDunePackage rec { pname = "ezxmlm"; diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index 64993c4912d..d045bd5a37a 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: +{ lib, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "faillib-111.17.00 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 96423a213a1..77eef7f29a9 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , faraday }: -if !stdenv.lib.versionAtLeast ocaml.version "4.3" +if !lib.versionAtLeast ocaml.version "4.3" then throw "farfadet is not available for OCaml ${ocaml.version}" else @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A printf-like for Faraday library"; homepage = "https://github.com/oklm-wsh/Farfadet"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 9a90c7e5d0d..4adddbfe54d 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); +assert lib.versionOlder "4.00" (lib.getVersion ocaml); -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 031680b1e33..39c41e8eba0 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-fileutils-0.5.3"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index cdf585683d7..d4ce484653b 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index adac4c199c0..a66976b4a2b 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "fmt is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index ce17cc60ebf..8f804988129 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -12,14 +12,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ - "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/" + "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" ]; meta = { description = "Fontconfig bindings for OCaml"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 4694e3ac637..785a71e13a7 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "fpath is not available for OCaml ${ocaml.version}" else @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; homepage = "https://erratique.ch/software/fpath"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index e1078f420ba..2f11001874f 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, ocaml, findlib }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if lib.versionAtLeast ocaml.version "4.02" then { version = "0.6"; sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; } else { diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 9e37d9b9a2d..04d1a081660 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.5"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index c772b9a8b54..58e2b67eacc 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: let - inherit (stdenv.lib) getVersion versionAtLeast; + inherit (lib) getVersion versionAtLeast; pname = "gg"; version = "0.9.1"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index d28e8ef2e7b..ba2372090d8 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult @@ -24,7 +24,7 @@ buildDunePackage rec { checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; doCheck = !stdenv.isAarch64; - meta = with stdenv; { + meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f01f3e8cad5..145cc384529 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: let pname = "gmetadom"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 4780b7917ce..046c92afca0 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator gsl pkg-config ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index b0e17a28e51..e1afefc6a79 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: +{ stdenv, lib, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: let pname = "gtktop-2.0"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { homepage = "http://zoggy.github.io/gtktop/"; description = "A small OCaml library to ease the creation of graphical toplevels"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index 16bf0443d7e..c5223637a15 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcaml, fetchurl}: +{lib, buildOcaml, fetchurl}: buildOcaml rec { version = "112.35.00"; @@ -14,7 +14,7 @@ buildOcaml rec { meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 526989734ab..4a6123ebd3a 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }: +{ lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }: buildDunePackage rec { pname = "hex"; @@ -19,7 +19,7 @@ buildDunePackage rec { meta = { description = "Mininal OCaml library providing hexadecimal converters"; homepage = "https://github.com/mirage/ocaml-hex"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index b1cae90a618..f762e9c7b23 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,6 +1,6 @@ {lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "ocaml-http is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index eeeaab8092f..c141c73506d 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-inifiles-1.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "A small OCaml library to read and write .ini files"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 44b34beb79d..d43d5d9cf8e 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild +{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild , ocaml_lwt # optional lwt support , ounit, fileutils # only for tests }: @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { checkInputs = [ ounit fileutils ]; configureFlags = [ "--enable-lwt" - (stdenv.lib.optionalString doCheck "--enable-tests") ]; + (lib.optionalString doCheck "--enable-tests") ]; - postConfigure = stdenv.lib.optionalString doCheck '' + postConfigure = lib.optionalString doCheck '' echo ': pkg_threads' | tee -a _tags ''; @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "Bindings for Linux’s filesystem monitoring interface, inotify"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 46908369e57..9685e27d0b8 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: +{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; @@ -18,8 +18,8 @@ buildDunePackage rec { meta = { homepage = "https://github.com/mirage/io-page"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; description = "IO memory page library for Mirage backends"; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 15f3a5613b5..0845e4c1841 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitLab, ocaml, findlib +{ stdenv, lib, fetchFromGitLab, ocaml, findlib , sedlex, uunf, uutf }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "iri is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "IRI (RFC3987) native OCaml implementation"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 2a2953673f9..d1b55609bc4 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.2.4"; in @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 513c0a17c01..15f391342bd 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel, +{lib, buildOcamlJane, async_kernel, bin_prot, core_kernel, fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, sexplib, typerep, variantslib}: diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 871fade158a..5f3c2ab83ff 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "bin_prot"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 160fb30ee23..52a9350eeea 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildOcamlJane , core , core_extended diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 75b894a8c14..6ed34f2a28c 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, type_conv, buildOcamlJane }: +{ lib, type_conv, buildOcamlJane }: buildOcamlJane { name = "fieldslib"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index b3ffecb38ce..0dd0dde6ec9 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: { pname, version ? defaultVersion, hash, ...}@args: @@ -14,6 +14,6 @@ buildDunePackage (args // { sha256 = hash; }; - meta.license = stdenv.lib.licenses.asl20; + meta.license = lib.licenses.asl20; meta.homepage = "https://github.com/janestreet/${pname}"; }) diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index eba4e8f94a7..ff03c209190 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }: +{ lib, buildOcaml, fetchurl, ocaml_oasis, opaline }: buildOcaml rec { name = "js-build-tools"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index bd38d963034..8f4eb7e4151 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 131af5367db..2aa1b208d50 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index c742d6fbe80..2dc64497ca2 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, bin_prot}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index 51b18de65e6..103f17c455e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index f3a20425b73..785cdbc31c0 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index d4c7c61a399..edb73814704 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index b3dfcb68ed1..7506e09e30e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver, ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, ppx_variants_conv, re, sexplib, variantslib, fieldslib}: diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index 7fdcdc44612..857e85f8f03 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index 95ebb59faf9..d9c7de65347 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index 811e529851b..0b9bb983894 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index 07577dbf1f7..e6c51bebd52 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_assert, ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here, diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 370221c1d48..49333fb0e86 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index fe4f1753fa7..1ee00ecfa70 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index b1d8007936b..9afc27e8a5d 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index c820464d109..537a5941a9f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index a710436000e..714c3356ea0 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index e51a27ffaee..5bfbd185cee 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index b4d6288a179..842e90276b7 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, typerep}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index 7989ecaecea..a2c8de8a8de 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, +{lib, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: buildOcamlJane { diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index df8f6591bda..b0b2ce3a451 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index ee751eb3cfc..41e845b362e 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "typerep"; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 13cff62afbf..d158e4216ab 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -2,7 +2,7 @@ , camlzip, extlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" +if !lib.versionAtLeast ocaml.version "4.04" then throw "javalib is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index e1f09f5a4a2..78a081619b2 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let version = "1.0.1"; in @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; homepage = "https://erratique.ch/software/jsonm"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index 1dfc4305022..70cc88d2116 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: stdenv.mkDerivation { name = "ocaml-lablgtk-extras-1.4"; @@ -14,10 +14,10 @@ stdenv.mkDerivation { meta = { platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; branch = "1.4"; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index de1c1e6ea94..3cd13b2c4d6 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; stdenv.mkDerivation rec { version = "1.6"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index eae356462b3..02fd7004a56 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.04" +if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else let @@ -31,11 +31,11 @@ stdenv.mkDerivation (rec { branch = "2.14"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi - stdenv.lib.maintainers.roconnor + lib.maintainers.maggesi + lib.maintainers.roconnor ]; homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; description = "LablGTK is is an Objective Caml interface to GTK"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 0bc24b539ac..2aa031f419c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = - let check = stdenv.lib.versionAtLeast ocaml.version; in + let check = lib.versionAtLeast ocaml.version; in if check "4.06" then rec { version = "2.18.10"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 1c8edea66fb..65ea4d4b82e 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: -let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in +let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in if !OCamlVersionAtLeast "4.04" then throw "labltk is not available for OCaml ${ocaml.version}" @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser"; homepage = "http://labltk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index ab45c9ab8db..fc2327b736e 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ - stdenv.lib.optionals stdenv.isDarwin + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index c26b3dbe737..73548021688 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -1,21 +1,22 @@ -{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }: - -if lib.versionAtLeast ocaml.version "4.10" -then throw "lens is not available for OCaml ${ocaml.version}" -else +{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }: buildDunePackage rec { pname = "lens"; - version = "1.2.3"; + version = "1.2.4"; + + useDune2 = true; src = fetchzip { url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz"; - sha256 = "09k2vhzysx91syjhgv6w1shc9mgzi0l4bhwpx1g5pi4r4ghjp07y"; + sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv"; }; - minimumOCamlVersion = "4.04.1"; + minimumOCamlVersion = "4.10"; buildInputs = [ ppx_deriving ppxfind ]; + doCheck = true; + checkInputs = [ ounit ]; + meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; description = "Functional lenses"; diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index 0ad277f4a07..dd5504dda5c 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, result }: +{ lib, fetchFromGitHub, buildDunePackage, result }: buildDunePackage rec { pname = "linenoise"; @@ -17,8 +17,8 @@ buildDunePackage rec { meta = { description = "OCaml bindings to linenoise"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index d141e59d45e..34fe75a2943 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: +{ stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: -let version = stdenv.lib.getVersion llvm; in +let version = lib.getVersion llvm; in stdenv.mkDerivation { pname = "ocaml-llvm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" - "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib" + "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib" ]; buildFlags = [ "ocaml_all" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation { inherit (llvm.meta) license homepage; platforms = ocaml.meta.platforms or []; description = "OCaml bindings distributed with LLVM"; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 4a88a26d30d..fedfb1c7637 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -5,7 +5,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "logs is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 38ccaea65eb..ae16b285654 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "lua-ml is not available for OCaml ${ocaml.version}" else @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "An embeddable Lua 2.5 interpreter implemented in OCaml"; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 8286ee16619..05a5a28dcd7 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, lwt }: +{ lib, fetchFromGitHub, buildDunePackage, lwt }: buildDunePackage rec { pname = "lwt_log"; @@ -18,7 +18,7 @@ buildDunePackage rec { meta = { description = "Lwt logging library (deprecated)"; homepage = "https://github.com/aantron/lwt_log"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index ade51b7da75..e74a743e6b1 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildDunePackage, ssl, lwt }: +{ lib, fetchzip, buildDunePackage, ssl, lwt }: buildDunePackage rec { pname = "lwt_ssl"; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/aantron/lwt_ssl"; description = "OpenSSL binding with concurrent I/O"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 4f3d21be71a..2a5ff08c018 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "1.0.0"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "https://github.com/mirage/ocaml-magic-mime"; description = "Convert file extensions to MIME types"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 349cbea5607..4fcf267e9c0 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: +{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "magick is not available for OCaml ${ocaml.version}" else @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; description = "ImageMagick Binding for OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = imagemagick.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 684fd1271ae..cbb759205e0 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422" +, version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422" }@args: let diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index c37c5bd7811..d2aeb1a37b8 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: +{stdenv, lib, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: -if stdenv.lib.versionAtLeast ocaml.version "4.03" +if lib.versionAtLeast ocaml.version "4.03" then throw "mlgmp is not available for OCaml ${ocaml.version}" else let diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 66672f8ea1a..a0026e3a8ca 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: +{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to the GMP library"; homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 786cc1e27ac..90c24718dd1 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-mparser-1.2.3"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { meta = { description = "A simple monadic parser combinator OCaml library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://github.com/cakeplus/mparser"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 2f8545988d8..9fa302947e9 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ findlib topkg ] - ++ stdenv.lib.optional jsooSupport js_of_ocaml; + ++ optional jsooSupport js_of_ocaml; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index f9ebb36f40e..29720ce1148 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-mysql.forge.ocamlcore.org"; description = "Bindings for interacting with MySQL databases from ocaml"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 263fdc0bbda..ae52ed478e0 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg , cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin , cstruct-lwt ? null }: -with stdenv.lib; +with lib; let withLwt = cstruct-lwt != null; # the build system will call 'cc' with no way to override @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/mirleft/ocaml-nocrypto"; description = "Simplest possible crypto to support TLS"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 150edb3174c..a584f7bc9ed 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromBitbucket, buildDunePackage }: +{ lib, fetchzip, buildDunePackage }: buildDunePackage rec { pname = "nonstd"; @@ -6,10 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - src = fetchFromBitbucket { - owner = "smondet"; - repo = pname; - rev = "${pname}.${version}"; + src = fetchzip { + url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; }; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 420e632b99e..8e1c5f38cb5 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: -with stdenv.lib; +with lib; if !versionAtLeast ocaml.version "4.05" then throw "notty is not available for OCaml ${ocaml.version}" diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index 022b7af9629..b553677fad4 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; inherit (src.meta) homepage; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index fdb225ba8e8..1411d32d40c 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: +{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix index 6f9c8f01e90..374efd8b2b9 100644 --- a/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchurl }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { minimumOCamlVersion = "4.02.3"; diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 1dc98c9fdd2..e5dc3dd54d3 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: +{ stdenv, lib, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { pname = "ocaml-text"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index dabe7ae52a3..c2ca6a2cc8a 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }: +{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }: buildDunePackage { pname = "ocamlfuse"; @@ -16,8 +16,8 @@ buildDunePackage { meta = { homepage = "https://sourceforge.net/projects/ocamlfuse"; description = "OCaml bindings for FUSE"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index df684f166e1..5ae4f6ad3fa 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, lib, fetchurl, ocaml, findlib , gtkSupport ? true , lablgtk }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ] - ++ stdenv.lib.optional gtkSupport lablgtk + ++ lib.optional gtkSupport lablgtk ; createFindlibDestdir = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ]; installTargets = [ "install-findlib" ]; - postInstall = stdenv.lib.optionalString gtkSupport '' + postInstall = lib.optionalString gtkSupport '' mkdir -p $out/bin cp dgraph/dgraph.opt $out/bin/graph-viewer cp editor/editor.opt $out/bin/graph-editor @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocamlgraph.lri.fr/"; description = "Graph library for Objective Caml"; - license = stdenv.lib.licenses.gpl2Oss; + license = lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.kkallio + lib.maintainers.kkallio ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index b4ee828fcc4..a2071a9dfaa 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, lib, fetchurl}: let @@ -25,6 +25,6 @@ in stdenv.mkDerivation { homepage = "http://www.ocaml.info/home/ocaml_sources.html"; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index e98dc62478e..f8d20b7124b 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml native toplevel"; homepage = "http://benediktmeurer.de/ocamlnat/"; - license = stdenv.lib.licenses.qpl; + license = lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel ocamlnat, which is mostly compatible to the byte code toplevel ocaml, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5b6e0dde8b7..110f51cc079 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "ocamlnet is not available for OCaml ${ocaml.version}" else @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 693c4d59fef..4103b48a979 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocamlsdl.sourceforge.net/"; description = "OCaml bindings for SDL 1.2"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 3f551903efa..d8d19f5e365 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, topkg, astring }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "OCamlbuild plugin for C stubs"; homepage = "https://github.com/pqwy/ocb-stubblr"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index c19c9b567a3..ee14a83d57c 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: -if stdenv.lib.versionOlder ocaml.version "4.03" -|| stdenv.lib.versionAtLeast ocaml.version "4.08" +if lib.versionOlder ocaml.version "4.03" +|| lib.versionAtLeast ocaml.version "4.08" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 07b6f72e38d..ae06978dacd 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, astring, pprint }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; homepage = "https://www.typerex.org/ocp-ocamlres.html"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 719252dbea8..553ad9562cc 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, cppo }: let version = "1.0"; in @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Optimised functions to read and write int16/32/64"; homepage = "https://github.com/OCamlPro/ocplib-endian"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 2cf4b6ddffb..8435d1c5e51 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib }: let pname = "ocplib-simplex"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; inherit (ocaml.meta) platforms; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 84bc3ce678b..1feb3ecae71 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 , num }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" + if lib.versionAtLeast ocaml.version "4.03" then { version = "0.8.1"; sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9"; @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ocsigen/deriving"; description = "Extension to OCaml for deriving functions from type declarations"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ gal_bolle vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 30ddd005b79..b4842da12dd 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl +{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl , lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr , pgocaml, camlzip, ocaml_sqlite3 , makeWrapper, fetchpatch }: -if !stdenv.lib.versionAtLeast ocaml.version "4.06.1" +if !lib.versionAtLeast ocaml.version "4.06.1" then throw "ocsigenserver is not available for OCaml ${ocaml.version}" else @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 5939e616453..26d5d10acbb 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson , cohttp-lwt-unix , resource-pooling }: @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { longDescription ='' An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index a0f3136de22..eccdcf80d7c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, opaline +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, opaline , calendar, eliom, js_of_ocaml-ppx_deriving_json }: @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.gal_bolle ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index e0189c90181..01161214a4f 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "octavius is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Ocamldoc comment syntax parser"; homepage = "https://github.com/ocaml-doc/octavius"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 4c2e4ee6a30..d5ef3948408 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: +{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: -if stdenv.lib.versionOlder ocaml.version "4.02" +if lib.versionOlder ocaml.version "4.02" then throw "ocurl is not available for OCaml ${ocaml.version}" else @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "http://ygrek.org.ua/p/ocurl/"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 645955f27a9..edf7d864955 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "ocaml-data-notation is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index cf4abeb7ea6..8e5b4a23ce3 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-omd-1.3.1"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Extensible Markdown library and tool in OCaml"; homepage = "https://github.com/ocaml/omd"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index 0ca332a2a06..ee9961d1533 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Parser and printer for the opam file syntax"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index c177ef52e15..343fb28b6ad 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; patches = - let inherit (stdenv.lib) optional versionAtLeast; in + let inherit (lib) optional versionAtLeast; in optional (versionAtLeast ocaml.version "4.02") (fetchpatch { url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch"; sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; @@ -37,10 +37,10 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/diml/optcomp"; description = "Optional compilation for OCaml with cpp-like directives"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index d229f6284e3..9638e8e0d4e 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "opti"; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 7f68555da08..0642b30699c 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -6,7 +6,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index c0b859c57a3..e5f9ac52067 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}: +{lib, buildOcaml, fetchurl, type_conv, pa_ounit}: buildOcaml rec { name = "pa_bench"; @@ -17,7 +17,7 @@ buildOcaml rec { meta = with lib; { homepage = "https://github.com/janestreet/pa_bench"; description = "Syntax extension for inline benchmarks"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 9d2fa5bac1a..26d00004222 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, ocaml, fetchurl, ounit }: +{ lib, buildOcaml, ocaml, fetchurl, ounit }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "pa_ounit is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index fdfbfe83e53..36eb3fe54bb 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcaml, fetchurl}: +{lib, buildOcaml, fetchurl}: buildOcaml rec { name = "pipebang"; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 70193d5b568..0cdde114709 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "20171003"; sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx"; diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 20b78870f93..a10a6172605 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage }: +{ lib, fetchFromGitHub, buildDunePackage }: buildDunePackage rec { pname = "ppx_derivers"; @@ -15,8 +15,8 @@ buildDunePackage rec { meta = { description = "Shared [@@deriving] plugin registry"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index a5531813c42..87ccd85a07d 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "ppx_gen_rec"; version = "1.1.0"; - minimumOCamlVersion = "4.01"; + useDune2 = true; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 1427485c5ed..94d7eb714dd 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -46,7 +46,7 @@ let src = fetchFromGitHub { maintainers = with maintainers; [ vbgl ]; }; in -if stdenv.lib.versionAtLeast param.version "6.0" +if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix index 92fb1837803..34ca51f0739 100644 --- a/pkgs/development/ocaml-modules/process/default.nix +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-process-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Easy process control in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 485620514e4..30fb5de7cb8 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index e60a8d5a86d..50ad5ea94eb 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: stdenv.mkDerivation rec { version = "0.8.5"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Ptime is not a calendar library. ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 1a96c734d85..899547a937b 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" +if !lib.versionAtLeast ocaml.version "4.04" then throw "reactiveData is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 41d2d258b97..84e042bf7d2 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" + if lib.versionAtLeast ocaml.version "4.03" then rec { version = "0.6.2"; url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; @@ -33,7 +33,7 @@ stdenv.mkDerivation ({ homepage = "http://rope.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = ''Ropes ("heavyweight strings") in OCaml''; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } // param.extra) diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index cdaa7857398..2573c95c628 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-rresult-${version}"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://erratique.ch/software/rresult"; description = "Result value combinators for OCaml"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 61c3fc86288..68a8731201d 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -6,7 +6,7 @@ let webpage = "http://sawja.inria.fr/"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "${pname} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index b066b941259..7ad18fba81c 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }: +{ lib, fetchFromGitHub, buildDunePackage, base, stdio, dune-configurator, secp256k1 }: buildDunePackage rec { pname = "secp256k1"; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index d34b18bf059..3a9f87bd93a 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: +{ stdenv, lib, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "sedlex is not available for OCaml ${ocaml.version}" else @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix index 7a50d1517db..aa0546dd390 100644 --- a/pkgs/development/ocaml-modules/seq/default.nix +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation ({ version = "0.1"; name = "ocaml${ocaml.version}-seq-0.1"; meta = { - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/c-cube/seq"; inherit (ocaml.meta) platforms; }; -} // (if stdenv.lib.versionOlder ocaml.version "4.07" then { +} // (if lib.versionOlder ocaml.version "4.07" then { src = fetchFromGitHub { owner = "c-cube"; diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index a25145ca49f..d0c203689e3 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: -if stdenv.lib.versionAtLeast ocaml.version "4.10" +if lib.versionAtLeast ocaml.version "4.10" then throw "sodium is not available for OCaml ${ocaml.version}" else @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 4fc87ba3d1e..b6a5dc5ecaa 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "sqlite3EZ is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index bd0187dc5f4..ae797815aed 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck # Optionally enable tests; test script use OCaml-4.01+ features -, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" +, doCheck ? lib.versionAtLeast (lib.getVersion ocaml) "4.01" }: let version = "1.4.3"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; configurePhase = "ocaml setup.ml -configure --prefix $out" - + stdenv.lib.optionalString doCheck " --enable-tests"; + + lib.optionalString doCheck " --enable-tests"; buildPhase = "ocaml setup.ml -build"; inherit doCheck; checkPhase = "ocaml setup.ml -test"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://github.com/rgrinberg/stringext"; platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 6ed4fd0b90e..c97f1225663 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03.0"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.03.0"; stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-syslog"; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 1bd926b1ddb..97052115da6 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -5,11 +5,11 @@ The `buildPhase` and `installPhase` attributes can be reused directly in many cases. When more fine-grained control on how to run the “topkg” build system is required, the attribute `run` can be used. */ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.3"; sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; } else { @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://erratique.ch/software/topkg"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 0dad4f54e0a..81ba44647e3 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 72931314490..72e4fcbb35f 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,7 +1,7 @@ {lib, stdenv, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "3.12" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "3.12" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index a970091df51..e41e9b188fc 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "4.00" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.00" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ maggesi ]; + maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index ee0ce0ae0be..3fa9042b035 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildOcaml}: +{ lib, fetchurl, buildOcaml}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -14,7 +14,7 @@ buildOcaml rec { meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maggesi ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix index 20fd5bcb03c..c851f22aa5b 100644 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcaml, fetchurl, type_conv}: +{lib, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "typerep"; diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index fb56cca0f0a..7eec0154715 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Compatibility library for OCaml’s Uchar module"; inherit (ocaml.meta) platforms license; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index d32fcf07b6c..f1ada5d0998 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.2"; sha256 = "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"; } else { @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 3a0d9f124b1..020b256c72f 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -6,7 +6,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index da4b2a175d7..cb95839d16c 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -21,7 +21,7 @@ let }; in -assert stdenv.lib.versionAtLeast ocaml.version "4.03"; +assert lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix index f26ccdb39a9..f39336a8423 100644 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, ocaml, fetchurl, type_conv }: +{ lib, buildOcaml, ocaml, fetchurl, type_conv }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "variantslib-109.15.03 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index d33f03a0d34..a9a4c0d3d6b 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -8,7 +8,7 @@ with lib; let - inherit (stdenv.lib) optionals versionAtLeast; + inherit (lib) optionals versionAtLeast; pname = "vg"; version = "0.9.4"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 06c84531482..c8944926488 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "wasm is not available for OCaml ${ocaml.version}" else @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index 463bfbc79f9..896b6e49ac0 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, bos, cmdliner, rresult }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Open and reload URIs in browsers from OCaml"; homepage = "https://erratique.ch/software/webbrowser"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 82f635afb68..0ca48ebee28 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: let pname = "xml-light"; version = "2.4"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { library. ''; homepage = "http://tech.motion-twin.com/xmllight.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.romildo ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index d1945ea7859..43b0bf5faa7 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -4,7 +4,7 @@ let webpage = "https://erratique.ch/software/${pname}"; in -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "xmlm is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 50a3eeadec8..f1c1f15dc72 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml , js_of_ocaml-ppx, re }: -if stdenv.lib.versionOlder ocaml.version "4.03" -|| stdenv.lib.versionAtLeast ocaml.version "4.11" +if lib.versionOlder ocaml.version "4.03" +|| lib.versionAtLeast ocaml.version "4.11" then throw "xtmpl not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 21c9a6d19ce..61d931a66cc 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,7 +2,7 @@ let pname = "yojson"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then rec { + if lib.versionAtLeast ocaml.version "4.02" then rec { version = "1.7.0"; url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 364d76f40fa..d937c95a972 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -4,7 +4,7 @@ }: let source = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.11"; url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 847951783ee..a7889523bcc 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,36 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }: +{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then - { - version = "3.1.0"; +buildDunePackage rec { + pname = "zed"; + version = "3.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; - buildInputs = [ dune ]; - propagatedBuildInputs = [ charInfo_width ]; - extra = { - buildPhase = "dune build -p zed"; - inherit (dune) installPhase; }; - } else { - version = "1.4"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ camomile ]; - extra = { createFindlibDestdir = true; }; - } -; in - -stdenv.mkDerivation (rec { - inherit (param) version; - name = "ocaml-zed-${version}"; - - src = fetchzip { - url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - inherit (param) sha256; }; - buildInputs = [ ocaml findlib ] ++ param.buildInputs; - - propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs; + propagatedBuildInputs = [ charInfo_width react ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -41,11 +24,10 @@ stdenv.mkDerivation (rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - homepage = "https://github.com/diml/zed"; - license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + inherit (src.meta) homepage; + license = lib.licenses.bsd3; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; -} // param.extra) +} diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index e3f046e10fc..6345755bffc 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -1,24 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36 -, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }: +{ lib +, asynctest +, buildPythonPackage +, docutils +, fetchFromGitHub +, imaplib2 +, mock +, nose +, pyopenssl +, pytestCheckHook +, pythonOlder +, pytz +, tzlocal +}: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.7.15"; + version = "0.7.18"; - # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj"; + sha256 = "037fxwmkdfb95cqcykrhn37p138wg9pvlsgdf45vyn1mhz5crky5"; }; - disabled = !(isPy3k && pythonOlder "3.7"); + checkInputs = [ + asynctest + docutils + imaplib2 + mock + nose + pyopenssl + pytestCheckHook + pytz + tzlocal + ]; - checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ]; - - # https://github.com/bamthomas/aioimaplib/issues/35 - doCheck = !isPy36; + # Project is using asynctest with doesn't work with Python 3.8 and above + # https://github.com/bamthomas/aioimaplib/issues/54 + doCheck = pythonOlder "3.8"; + pythonImportsCheck = [ "aioimaplib" ]; meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix new file mode 100644 index 00000000000..c153ff37d8c --- /dev/null +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -0,0 +1,44 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-cov +, pytestCheckHook +, pytest-mypy +, pythonOlder +, tenacity +}: + +buildPythonPackage rec { + pname = "aiokef"; + version = "0.2.17"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "basnijholt"; + repo = pname; + rev = "v${version}"; + sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; + }; + + propagatedBuildInputs = [ + async-timeout + tenacity + ]; + + checkInputs = [ + pytest-cov + pytest-mypy + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + pythonImportsCheck = [ "aiokef" ]; + + meta = with lib; { + description = "Python API for KEF speakers"; + homepage = "https://github.com/basnijholt/aiokef"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 4ada562557b..66c66535a12 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.0.10"; + version = "0.0.11"; src = fetchPypi { inherit pname version; - sha256 = "1h9awwnn4dr3ppdlnjb4abhyw873n1iddipw6wkwjpw7nnaqqr6i"; + sha256 = "11ygrhkqm524i4qp2myjvpsmg1lsn32nsqxqla96sbj84qfnhv0q"; }; # Upstream hasn't release the tests yet diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix new file mode 100644 index 00000000000..a49e55abe10 --- /dev/null +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "awesomeversion"; + version = "20.12.5"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1jwlfqnrqlxjp30fj9bcqh7vgicmpdbn5kjdcmll4srnl87lalfg"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "main" ${version} + ''; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "awesomeversion" ]; + + meta = with lib; { + description = "Python module to deal with versions"; + homepage = "https://github.com/ludeeus/awesomeversion"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 0ad45dceb2b..e91a0fb0749 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.10.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f"; + sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 29392699ce2..9781fcecaaf 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.eventgrid" ]; meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index a04f28f2a51..81afa6ff7ed 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -5,23 +5,25 @@ , msrestazure , azure-common , isPy3k +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "4.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; + sha256 = "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 759467aa902..4432595a12e 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.2.0"; + version = "1.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72"; + sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index aa188e87efa..033ef0cccea 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "9.0.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; + sha256 = "1d3b2c9ebd57c8874e11d29e7dd05a1f078d2156fc9683e2f2ad41024e448bf6"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index c138dde95d0..09800f9cef3 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -2,23 +2,25 @@ , buildPythonPackage , fetchPypi , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , msrestazure }: buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.3.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415"; + sha256 = "71414e3cd7445e44fc18f217f2d22df05c36877e1233328b2297d07ddf27e82a"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 1460cdb9ca3..32e6cebd1f5 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -3,6 +3,7 @@ , fetchPypi , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , python , isPy3k @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "azure-mgmt-commerce"; - version = "1.0.1"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4"; + sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index 175dd9de6e8..be22e14b574 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -5,22 +5,24 @@ , isPy3k , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-consumption"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83"; + sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index a186017a4d3..91f420f11ae 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00"; + sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index b149584b6a9..fc5d8ba6f01 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -7,21 +7,23 @@ , msrestazure , azure-common , azure-mgmt-datalake-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-datalake-store"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c"; + sha256 = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE="; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-datalake-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 7c5e6a1d7ba..820f737c548 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -6,23 +6,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-devtestlabs"; - version = "4.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; + sha256 = "d8160d93fd3d947e5613c6919176b0edf72c94ac69679ea3b92cf27ff7398e64"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index df48be1281c..1b244818f91 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "2.2.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866"; + sha256 = "a8a6e1bb105a14f1d3545ecb07c190370f21a145f8ba51599ed169f1dc8d5dcc"; }; propagatedBuildInputs = [ msrest msrestazure + azure-mgmt-core azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg @@ -28,6 +30,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.eventgrid" ]; meta = with lib; { description = "This is the Microsoft Azure EventGrid Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 08915244fc4..5547eb032d0 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "2.1.0"; + version = "7.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028"; + sha256 = "d0070817ee2be611d45af91eabc5665dd53f024eaa7a55e490ace4f71a55c733"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index b514488ff4a..2f368b82649 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7"; + sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index e36e30fc16e..c51d43ec444 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.12.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; + sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix index 8c2b3c8fd8d..bc63084410c 100644 --- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -4,28 +4,31 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-logic"; - version = "3.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add"; + sha256 = "d3a780d299c4db59134bd984c4c9281b9b6ae5d4ba185bcbae43f6c3af04f85a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.logic" ]; meta = with lib; { description = "This is the Microsoft Azure Logic Apps Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index a8a138d27bd..9538ed2a234 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -6,22 +6,24 @@ , azure-common , azure-mgmt-nspkg , isPy3k +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-marketplaceordering"; - version = "0.2.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2"; + sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index a57bbe07f56..a89d94f3d70 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.14.0"; + version = "0.15.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539"; + sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index 7b4985c5333..bf9d9bab576 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-notificationhubs"; - version = "2.1.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h"; + sha256 = "92ffed71a2999ff5db41afd66c6ba5cfef9d467f732c7bb45b7c41db371c6e4a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index 6522b3c8c43..30fce388545 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4"; + sha256 = "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.policyinsights" ]; meta = with lib; { description = "This is the Microsoft Azure Policy Insights Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 0e96647f492..c7cb274d68b 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "2.2.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + sha256 = "8b018543048fc4fddb4155d9f22246ad0c4be2fb582a29dbb21ec4022724a119"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.rdbms" ]; meta = with lib; { description = "This is the Microsoft Azure RDBMS Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index a0ee8f3ce9c..d1f49355f8b 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "203ebbd6b698a99975092a72d6d47285646a0264b9085fecef1e7b7c98c5d52e"; + sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.recoveryservices" ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 229cf58cea9..4ce18c4ae3b 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f"; + sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 46db2d3528c..9b7444a6ecb 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -5,22 +5,24 @@ , isPy3k , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-relay"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57"; + sha256 = "38f6dd9d122a316efa921e72933e01ec4d76ed39d4682655b17a997079e8b20a"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; @@ -28,6 +30,7 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.relay" ]; meta = with lib; { description = "This is the Microsoft Azure Relay Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index c6c525176c7..e4cb5b23474 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -4,28 +4,31 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6"; + sha256 = "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core + azure-mgmt-nspkg msrest msrestazure - azure-common - azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.search" ]; meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 9de17636b23..a947e84f9ae 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.6.0"; + version = "1.0.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; + sha256 = "ae1cff598dfe80e93406e524c55c3f2cbffced9f9b7a5577e3375008a4c3bcad"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index d0a5845d905..d4238cc8204 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -4,30 +4,33 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77"; + sha256 = "22f606f298419f466a8149811fc762686c93da00a7dc15d3b7cdbf22b96cf5db"; }; propagatedBuildInputs = [ + azure-common + azure-mgmt-core msrest msrestazure - azure-common ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.subscription" ]; meta = with lib; { description = "This is the Microsoft Azure Subscription Management Client Library"; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index ad8fe1c8a07..7b579a84ba1 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.11.4"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c"; + sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6633657d186..d1b795a9ef4 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.15.0"; + version = "0.16.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b"; + sha256 = "1983p8pkbdj6yaclkdng7fn0pmlbz1yc75a4a847ppw47075ryph"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix new file mode 100644 index 00000000000..eea43d5c739 --- /dev/null +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest-mock +, cryptography +}: + +buildPythonPackage rec { + pname = "cert-chain-resolver"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "rkoopmans"; + repo = "python-certificate-chain-resolver"; + rev = version; + sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l"; + }; + + propagatedBuildInputs = [ cryptography ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + # online tests + disabledTests = [ + "test_cert_returns_completed_chain" + "test_display_flag_is_properly_formatted" + ]; + + meta = with lib; { + homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; + description = "Resolve / obtain the certificate intermediates of a x509 certificate"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index f25170cc6ae..1c551bfb0d9 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -7,12 +7,11 @@ , six , stevedore , pyyaml -, unicodecsv , cmd2 -, pytest -, mock +, pytestCheckHook , testtools , fixtures +, which }: buildPythonPackage rec { @@ -32,20 +31,21 @@ buildPythonPackage rec { stevedore pyyaml cmd2 - unicodecsv ]; - # remove version constraints postPatch = '' - sed -i '/cmd2/c\cmd2' requirements.txt + sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt ''; - checkInputs = [ fixtures mock pytest testtools ]; + checkInputs = [ fixtures pytestCheckHook testtools which ]; # add some tests - checkPhase = '' - pytest cliff/tests/test_{utils,app,command,help,lister}.py \ - -k 'not interactive_mode' - ''; + pytestFlagsArray = [ + "cliff/tests/test_utils.py" + "cliff/tests/test_app.py" + "cliff/tests/test_command.py" + "cliff/tests/test_help.py" + "cliff/tests/test_lister.py" + ]; meta = with lib; { description = "Command Line Interface Formulation Framework"; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix new file mode 100644 index 00000000000..faa1affcd06 --- /dev/null +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, requests +, requests-toolbelt +, pyparsing +}: + +buildPythonPackage rec { + pname = "cloudscraper"; + version = "1.2.52"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "07j2nhzimzhcskj2wpxpvpb3dhpci19daw02r2ckkjiq3zifhm6v"; + }; + + propagatedBuildInputs = [ + requests + requests-toolbelt + pyparsing + ]; + + # The tests require several other dependencies, some of which aren't in + # nixpkgs yet, and also aren't included in the PyPI bundle. TODO. + doCheck = false; + + pythonImportsCheck = [ "cloudscraper" ]; + + meta = with lib; { + description = "A Python module to bypass Cloudflare's anti-bot page"; + homepage = https://github.com/venomous/cloudscraper; + license = licenses.mit; + maintainers = with maintainers; [ kini ]; + }; +} diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 829f157fced..0740ee33b5f 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "colorlog"; - version = "4.6.2"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4"; + sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - # tests are no longer packaged in pypi - doCheck = false; - checkPhase = '' - py.test -p no:logging - ''; - - pythonImportsCheck = [ "colorlog" ]; + pythonImportsCheck = [ "colorlog" ]; meta = with lib; { description = "Log formatting with colors"; diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 465f1bb5b4d..50ba05aca6f 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -1,21 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , biopython , docopt , flametree , numpy , proglog +, pytestCheckHook , python-codon-tables - }: +, primer3 +, genome-collector +, matplotlib +}: buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.5"; + version = "3.2.6"; - src = fetchPypi { - inherit pname version; - sha256 = "35301c5eda0baca5902403504e0b5a22eb65da92c2bbd23199d95c4a6bf0ef37"; + src = fetchFromGitHub { + owner = "Edinburgh-Genome-Foundry"; + repo = "DnaChisel"; + rev = "v${version}"; + sha256 = "0m88biw7sycjwsmncdybj9n3yf4n9cyvifv9zv7irm8ha3scchji"; }; propagatedBuildInputs = [ @@ -27,9 +33,24 @@ buildPythonPackage rec { python-codon-tables ]; - # no tests in tarball - doCheck = false; + checkInputs = [ + primer3 + genome-collector + matplotlib + pytestCheckHook + ]; + # Disable tests which requires network access + disabledTests = [ + "test_circular_sequence_optimize_with_report" + "test_constraints_reports" + "test_optimize_with_report" + "test_optimize_with_report_no_solution" + "test_avoid_blast_matches_with_list" + "test_avoid_phage_blast_matches" + "test_avoid_matches_with_list" + "test_avoid_matches_with_phage" + ]; pythonImportsCheck = [ "dnachisel" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 7a23d17aca2..5b148a9d62a 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071"; + sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA="; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index abdb0f58394..990908efe03 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,59 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, -# Build inputs -dateutil, six, text-unidecode, ipaddress ? null -# Test inputs -, email_validator +{ lib +, buildPythonPackage +, fetchPypi +, dateutil +, text-unidecode , freezegun -, mock -, more-itertools , pytestCheckHook -, pytestrunner , ukpostcodeparser , validators }: -assert pythonOlder "3.3" -> ipaddress != null; - buildPythonPackage rec { pname = "Faker"; - version = "4.18.0"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2"; + sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil + text-unidecode + ]; + checkInputs = [ - email_validator freezegun pytestCheckHook ukpostcodeparser validators - ] - ++ lib.optionals (pythonOlder "3.3") [ mock ] - ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; + ]; # avoid tests which import random2, an abandoned library pytestFlagsArray = [ "--ignore=tests/providers/test_ssn.py" ]; - - propagatedBuildInputs = [ - dateutil - six - text-unidecode - ]; - - postPatch = '' - substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" - ''; + pythonImportsCheck = [ "faker" ]; meta = with lib; { - description = "A Python library for generating fake user data"; - homepage = "http://faker.rtfd.org"; - license = licenses.mit; + description = "Python library for generating fake user data"; + homepage = "http://faker.rtfd.org"; + license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index 065808dfe6e..d06ea28b334 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -8,6 +8,10 @@ buildPythonPackage rec { sourceRoot = "source/python"; + # flatbuffers needs VERSION environment variable for setting the correct + # version, otherwise it uses the current date. + VERSION = "${version}"; + pythonImportsCheck = [ "flatbuffers" ]; meta = flatbuffers.meta // { diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix new file mode 100644 index 00000000000..70589912520 --- /dev/null +++ b/pkgs/development/python-modules/genome-collector/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, appdirs +, biopython +, fetchPypi +, proglog +}: + +buildPythonPackage rec { + pname = "genome_collector"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph"; + }; + + propagatedBuildInputs = [ + appdirs + biopython + proglog + ]; + + # Project hasn't released the tests yet + doCheck = false; + pythonImportsCheck = [ "genome_collector" ]; + + meta = with lib; { + description = "Genomes and build BLAST/Bowtie indexes in Python"; + homepage = "https://github.com/Edinburgh-Genome-Foundry/genome_collector"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index bee22eb98bd..70963a85d41 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -29,10 +29,6 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook Rtree ]; - disabledTests = [ "web" ]; - pytestFlagsArray = [ "geopandas" ]; - propagatedBuildInputs = [ pandas shapely @@ -41,6 +37,11 @@ buildPythonPackage rec { pyproj ]; + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook Rtree ]; + disabledTests = [ "web" ]; + pytestFlagsArray = [ "geopandas" ]; + meta = with lib; { description = "Python geospatial data analysis framework"; homepage = "https://geopandas.org"; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2f6508c062f..854ec37a1e4 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , google-auth, google-auth-httplib2, google-api-core -, httplib2, six, uritemplate, oauth2client }: +, httplib2, six, uritemplate, oauth2client, setuptools }: buildPythonPackage rec { pname = "google-api-python-client"; @@ -16,7 +16,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-auth google-auth-httplib2 google-api-core - httplib2 six uritemplate oauth2client + httplib2 six uritemplate oauth2client setuptools + ]; + + pythonImportsCheck = [ + "googleapiclient" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index fd12aab81b4..23a2545525a 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ libguestfs qemu ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "guestfs" ]; + meta = with lib; { homepage = "https://libguestfs.org/guestfs-python.3.html"; description = "Use libguestfs from Python"; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix new file mode 100644 index 00000000000..fabc2d147fc --- /dev/null +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage +, six +}: + +buildPythonPackage rec { + pname = "gviz_api"; + version = "1.9.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; + }; + + propagatedBuildInputs = [ + six + ]; + + meta = with lib; { + description = "Python API for Google Visualization"; + homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix new file mode 100644 index 00000000000..feccc73707c --- /dev/null +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "hydrawiser"; + version = "0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ptcryan"; + repo = pname; + rev = "v${version}"; + sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytestCheckHook + requests + requests-mock + ]; + + pythonImportsCheck = [ "hydrawiser" ]; + + meta = with lib; { + description = "Python library for Hydrawise API"; + homepage = "https://github.com/ptcryan/hydrawiser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix new file mode 100644 index 00000000000..b89df0bd2ce --- /dev/null +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbr +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "icmplib"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ValentinBELYN"; + repo = pname; + rev = "v${version}"; + sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "icmplib" ]; + + meta = with lib; { + description = "Python implementation of the ICMP protocol"; + homepage = "https://github.com/ValentinBELYN/icmplib"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch new file mode 100644 index 00000000000..b70f9304c72 --- /dev/null +++ b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch @@ -0,0 +1,1194 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..84c37bc +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1188 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.14.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ ++[[package]] ++name = "aead" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "ascii-canvas" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" ++dependencies = [ ++ "term", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" ++dependencies = [ ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bindgen" ++version = "0.51.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" ++dependencies = [ ++ "bitflags", ++ "cexpr", ++ "cfg-if 0.1.10", ++ "clang-sys", ++ "lazy_static", ++ "peeking_take_while", ++ "proc-macro2", ++ "quote", ++ "regex", ++ "rustc-hash", ++ "shlex", ++] ++ ++[[package]] ++name = "bit-set" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "buffered-reader" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5711ccfa79a8167779ad2176d3334078f03b1579ddf8f42aa556196eba60a42" ++dependencies = [ ++ "bzip2", ++ "flate2", ++ "libc", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bzip2" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "275d84fe348b838dc49477d39770682839b3e73e21a3eadc07b12924f1a9fcbe" ++dependencies = [ ++ "bzip2-sys", ++ "libc", ++] ++ ++[[package]] ++name = "bzip2-sys" ++version = "0.1.9+1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++ ++[[package]] ++name = "cexpr" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" ++dependencies = [ ++ "nom", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi", ++] ++ ++[[package]] ++name = "cipher" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "0.28.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" ++dependencies = [ ++ "glob", ++ "libc", ++ "libloading", ++] ++ ++[[package]] ++name = "cmac" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73d4de4f7724e5fe70addfb2bd37c2abd2f95084a429d7773b0b9645499b4272" ++dependencies = [ ++ "crypto-mac", ++ "dbl", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "lazy_static", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "crypto-mac" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" ++dependencies = [ ++ "cipher", ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "ctr" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" ++dependencies = [ ++ "cipher", ++] ++ ++[[package]] ++name = "dbl" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2735145c3b9ba15f2d7a3ae8cdafcbc8c98a7bef7f62afe9d08bd99fbf7130de" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "diff" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "dyn-clone" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" ++ ++[[package]] ++name = "eax" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1f76e7a5e594b299a0fa9a99de627530725e341df41376aa342aecb2c5eb76e" ++dependencies = [ ++ "aead", ++ "cipher", ++ "cmac", ++ "ctr", ++ "subtle", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "ena" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "fixedbitset" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" ++ ++[[package]] ++name = "flate2" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" ++dependencies = [ ++ "typenum", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "ghost" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "indoc" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" ++dependencies = [ ++ "unindent", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "inventory" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" ++dependencies = [ ++ "ctor", ++ "ghost", ++ "inventory-impl", ++] ++ ++[[package]] ++name = "inventory-impl" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "johnnycanencrypt" ++version = "0.5.0" ++dependencies = [ ++ "anyhow", ++ "chrono", ++ "pyo3", ++ "sequoia-openpgp", ++ "talktosc", ++] ++ ++[[package]] ++name = "lalrpop" ++version = "0.19.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c64e04d8ea9c95c2135dfc4298088eafaf956bc90ba372eb1bea4f715634587" ++dependencies = [ ++ "ascii-canvas", ++ "atty", ++ "bit-set", ++ "diff", ++ "ena", ++ "itertools", ++ "lalrpop-util", ++ "petgraph", ++ "pico-args", ++ "regex", ++ "regex-syntax", ++ "string_cache", ++ "term", ++ "tiny-keccak", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "lalrpop-util" ++version = "0.19.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9de203e2fa3e883364fcc778a1293ab4d936f6cff400433013c20105df178c5" ++dependencies = [ ++ "regex", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++ ++[[package]] ++name = "libloading" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" ++dependencies = [ ++ "cc", ++ "winapi", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++dependencies = [ ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if 0.1.10", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "memsec" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "nettle" ++version = "7.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1afae85450b829ad720f2827e3b07d78e06b5521cfe5ed72808a9f593e7cdd8" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "nettle-sys", ++ "thiserror", ++] ++ ++[[package]] ++name = "nettle-sys" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8629333ff5f3b74d251dae253e383cda9242410fac4244a4fe855469be101fb" ++dependencies = [ ++ "bindgen", ++ "pkg-config", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++dependencies = [ ++ "memchr", ++ "version_check 0.1.5", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "object" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "instant", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "winapi", ++] ++ ++[[package]] ++name = "paste" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" ++ ++[[package]] ++name = "pcsc" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88e09a8d8705a2c9b1ffe1f9dd9580efe3f8e80c19fc9f99038fe99b7bb56c83" ++dependencies = [ ++ "bitflags", ++ "pcsc-sys", ++] ++ ++[[package]] ++name = "pcsc-sys" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1b7bfecba2c0f1b5efb0e7caf7533ab1c295024165bcbb066231f60d33e23ea" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++ ++[[package]] ++name = "petgraph" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" ++dependencies = [ ++ "fixedbitset", ++ "indexmap", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "pico-args" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "pyo3" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "ctor", ++ "indoc", ++ "inventory", ++ "libc", ++ "parking_lot", ++ "paste", ++ "pyo3-macros", ++ "unindent", ++] ++ ++[[package]] ++name = "pyo3-macros" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16" ++dependencies = [ ++ "pyo3-macros-backend", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pyo3-macros-backend" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++ ++[[package]] ++name = "rpassword" ++version = "5.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++ ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "sequoia-openpgp" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "664de0a9388e38d0f350547056f18fcc03f78d85e5a49fa4fa8927ca6aea1424" ++dependencies = [ ++ "anyhow", ++ "backtrace", ++ "base64", ++ "buffered-reader", ++ "bzip2", ++ "chrono", ++ "dyn-clone", ++ "eax", ++ "flate2", ++ "idna", ++ "lalrpop", ++ "lalrpop-util", ++ "lazy_static", ++ "libc", ++ "memsec", ++ "nettle", ++ "regex", ++ "sha1collisiondetection", ++ "thiserror", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "sha1collisiondetection" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7a6cf187c4059b3e63de2358b7e2f9a2261b6f3fd8ef4e7342308d0863ed082" ++dependencies = [ ++ "digest", ++ "generic-array", ++ "libc", ++] ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++ ++[[package]] ++name = "siphasher" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" ++ ++[[package]] ++name = "smallvec" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" ++ ++[[package]] ++name = "string_cache" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" ++dependencies = [ ++ "lazy_static", ++ "new_debug_unreachable", ++ "phf_shared", ++ "precomputed-hash", ++] ++ ++[[package]] ++name = "subtle" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" ++ ++[[package]] ++name = "syn" ++version = "1.0.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "talktosc" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eda5fee425f91e5a4083946f4468948f59cc16412cdcd659554e474c647a5645" ++dependencies = [ ++ "pcsc", ++ "rpassword", ++ "thiserror", ++] ++ ++[[package]] ++name = "term" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" ++dependencies = [ ++ "byteorder", ++ "dirs", ++ "winapi", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi", ++] ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "typenum" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "unindent" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix new file mode 100644 index 00000000000..407bb44d8b2 --- /dev/null +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pipInstallHook +, llvmPackages +, pkg-config +, maturin +, pcsclite +, nettle +, python +, requests +, vcrpy +, numpy +, pytestCheckHook +, pythonOlder +, PCSC +}: + +rustPlatform.buildRustPackage rec { + pname = "johnnycanencrypt"; + version = "0.5.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kushaldas"; + repo = "johnnycanencrypt"; + rev = "v${version}"; + sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; + }; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r"; + + LIBCLANG_PATH = llvmPackages.libclang + "/lib"; + + propagatedBuildInputs = [ + requests + vcrpy + ]; + + nativeBuildInputs = [ + llvmPackages.clang + pkg-config + python + maturin + pipInstallHook + ]; + + buildInputs = [ + pcsclite + nettle + ] ++ stdenv.lib.optionals stdenv.isDarwin [ PCSC ]; + + # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) + doCheck = false; + doInstallCheck = true; + + installCheckInputs = [ + pytestCheckHook + numpy + ]; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" + runHook postBuild + ''; + + installPhase = '' + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + preCheck = '' + export TESTDIR=$(mktemp -d) + cp -r tests/ $TESTDIR + pushd $TESTDIR + ''; + + postCheck = '' + popd + ''; + + pythonImportsCheck = [ "johnnycanencrypt" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/kushaldas/johnnycanencrypt"; + description = "Python module for OpenPGP written in Rust"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 52fc90a3ca9..22ae853c043 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { ]; # no tests + doCheck = false; pythonImportsCheck = [ "keep" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index e02b34e3816..af0344b8009 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "6.6.0"; + version = "6.8.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v"; + sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00="; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix new file mode 100644 index 00000000000..f9ca3afc4b1 --- /dev/null +++ b/pkgs/development/python-modules/manticore/default.nix @@ -0,0 +1,109 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, capstone +, crytic-compile +, ply +, prettytable +, pyelftools +, pyevmasm +, pysha3 +, pyyaml +, rlp +, stdenv +, unicorn +, wasm +, yices +, pytestCheckHook +, z3 +}: + +buildPythonPackage rec { + pname = "manticore"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "manticore"; + rev = version; + sha256 = "0z2nhfcraa5dx6srbrw8s11awh2la0x7d88yw9in8g548nv6qa69"; + }; + + propagatedBuildInputs = [ + crytic-compile + ply + prettytable + pyevmasm + pysha3 + pyyaml + rlp + wasm + ] ++ lib.optionals (stdenv.isLinux) [ + capstone + pyelftools + unicorn + ]; + + # Python API is not used in the code, only z3 from PATH + postPatch = '' + sed -ie s/z3-solver// setup.py + ''; + + checkInputs = [ pytestCheckHook ]; + preCheck = "export PATH=${yices}/bin:${z3}/bin:$PATH"; + pytestFlagsArray = [ + "--ignore=tests/ethereum" # TODO: enable when solc works again + "--ignore=tests/ethereum_bench" + ] ++ lib.optionals (!stdenv.isLinux) [ + "--ignore=tests/native" + "--ignore=tests/other/test_locking.py" + ]; + disabledTests = [ + # failing tests + "test_chmod" + "test_timeout" + "test_wasm_main" + # slow tests + "testmprotectFailSymbReading" + "test_ConstraintsForking" + "test_resume" + "test_symbolic" + "test_symbolic_syscall_arg" + "test_state_merging" + "test_decree" + "test_register_comparison" + "test_arguments_assertions_armv7" + "test_integration_basic_stdout" + "test_fclose_linux_amd64" + "test_fileio_linux_amd64" + "test_arguments_assertions_amd64" + "test_ioctl_bogus" + "test_ioctl_socket" + "test_brk_regression" + "test_basic_arm" + "test_logger_verbosity" + "test_profiling_data" + "test_integration_basic_stdin" + "test_getchar" + "test_ccmp_reg" + "test_ld1_mlt_structs" + "test_ccmp_imm" + "test_try_to_allocate_greater_than_last_space_memory_page_12" + "test_not_enough_memory_page_12" + "test_PCMPISTRI_30_symbolic" + "test_ld1_mlt_structs" + "test_time" + "test_implicit_call" + "test_trace" + "test_plugin" + ]; + + meta = with lib; { + description = "Symbolic execution tool for analysis of smart contracts and binaries"; + homepage = "https://github.com/trailofbits/manticore"; + changelog = "https://github.com/trailofbits/manticore/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 7537fb2e157..51ee529e234 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "08ngf55pbnzyqkgffzxix6ldal9l38d2jjn9rvxkg88ygxsalfvm"; + sha256 = "16bbyihap2ygsi7xg58rwdn14ms1j0jy2kxbdljpg39s9q1rz6ps"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index f842826d20b..046a338a993 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.1"; + version = "3.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fxssbmnv44m03shjyvbqslc69b0160702j2s0flgvdxjggrnbjj"; + sha256 = "0ibl2xyj4380ai60i2bfhm8qn1sjyjbwwjmgzfcqa12wlnhck7ki"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 1f21778f7db..21b93bf5bfe 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.18"; + version = "0.6.19"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "0j0dbca47qnxnhpfgj3v5bglg8dpx2cy1psix8kp3ldrkf6rjwdb"; + sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix new file mode 100644 index 00000000000..ee27dc20766 --- /dev/null +++ b/pkgs/development/python-modules/mulpyplexer/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mulpyplexer"; + version = "0.09"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "mulpyplexer" ]; + + meta = with lib; { + description = "Multiplex interactions with lists of Python objects"; + homepage = "https://github.com/zardus/mulpyplexer"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 0df4b0218b5..908ecff8c17 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -5,13 +5,15 @@ , pkgsStatic , openssl , invoke -, pytest , tls-parser , cacert +, pytestCheckHook }: let - zlibStatic = pkgsStatic.zlib; + zlibStatic = pkgsStatic.zlib.override { + splitStaticOutput = false; + }; nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -34,17 +36,16 @@ let opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( oldAttrs: rec { name = "openssl-${version}"; - version = "1.1.1"; + version = "1.1.1h"; src = fetchurl { url = "https://www.openssl.org/source/${name}.tar.gz"; - sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [ "enable-weak-ssl-ciphers" "enable-tls1_3" "no-async" ]; - patches = [ ./nix-ssl-cert-file.patch ]; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; } ); @@ -66,32 +67,36 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z"; + sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; }; - postPatch = '' - mkdir -p deps/openssl-OpenSSL_1_0_2e/ + postPatch = let + legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; + zlibVersion = zlibStatic.version; + in '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ cp ${opensslLegacyStatic.out}/lib/libssl.a \ ${opensslLegacyStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_1_0_2e/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_1_1_1/ + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ cp ${opensslStatic.out}/lib/libssl.a \ ${opensslStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_1_1_1/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include - ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-1.2.11/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ ''; propagatedBuildInputs = [ tls-parser ]; @@ -103,7 +108,7 @@ buildPythonPackage rec { invoke package.wheel ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Skip online tests diff --git a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch deleted file mode 100644 index 893fb3eb664..00000000000 --- a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c ---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 -+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 -@@ -97,7 +97,9 @@ - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = getenv(X509_get_default_cert_file_env()); -+ file = getenv("NIX_SSL_CERT_FILE"); -+ if (!file) -+ file = getenv(X509_get_default_cert_file_env()); - if (file) - ok = (X509_load_cert_crl_file(ctx, file, - X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix index 171b8810870..970928e03f4 100644 --- a/pkgs/development/python-modules/notmuch/2.nix +++ b/pkgs/development/python-modules/notmuch/2.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , notmuch , python @@ -13,6 +14,10 @@ buildPythonPackage { buildInputs = [ python notmuch cffi ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "notmuch2" ]; + meta = with lib; { description = "Pythonic bindings for the notmuch mail database using CFFI"; homepage = "https://notmuchmail.org/"; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 173f332b314..609d4c78d5d 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , notmuch , python @@ -16,6 +17,10 @@ buildPythonPackage { notmuch/globals.py ''; + # no tests + doCheck = false; + pythonImportsCheck = [ "notmuch" ]; + meta = with lib; { description = "A Python wrapper around notmuch"; homepage = "https://notmuchmail.org/"; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 64ed54cafbe..aa61b18291d 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -84,6 +84,7 @@ buildPythonPackage rec { ''; meta = with lib; { + broken = true; # Dashboard broken, other build failures. description = "A hyperparameter optimization framework"; homepage = "https://optuna.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 88189493a62..e2eb0139f12 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -4,6 +4,7 @@ , cmake , future , numpy +, qdldl , scipy # check inputs , pytestCheckHook @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7"; + sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3"; }; nativeBuildInputs = [ cmake ]; @@ -24,15 +25,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ future numpy + qdldl scipy ]; pythonImportsCheck = [ "osqp" ]; checkInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; # don't run checks twice disabledTests = [ "mkl_" - "update_matrices_tests" # broken w/ scipy >= 1.5.0. Remove next release. See https://github.com/oxfordcontrol/osqp-python/issues/44 + ]; + pytestFlagsArray = [ + # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50 + "--ignore=module/tests/basic_test.py" + "--ignore=module/tests/feasibility_test.py" + "--ignore=module/tests/polishing_test.py" + "--ignore=module/tests/unconstrained_test.py" + "--ignore=module/tests/update_matrices_test.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 3db271ee998..b9865fe628b 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -85,7 +85,6 @@ in buildPythonPackage rec { doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture pytestFlagsArray = [ - "$out/${python.sitePackages}/pandas" "--skip-slow" "--skip-network" ]; @@ -120,7 +119,10 @@ in buildPythonPackage rec { "test_clipboard" ]; + # tests have relative paths, and need to reference compiled C extensions + # so change directory where `import .test` is able to be resolved preCheck = '' + cd $out/${python.sitePackages}/pandas export LC_ALL="en_US.UTF-8" PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH '' diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix new file mode 100644 index 00000000000..0ffdf895227 --- /dev/null +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "poolsense"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "poolsense" ]; + + meta = with lib; { + description = "Python module to access PoolSense device"; + homepage = "https://github.com/haemishkyd/poolsense"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix new file mode 100644 index 00000000000..e8aa83ed94d --- /dev/null +++ b/pkgs/development/python-modules/primer3/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, click +}: + +buildPythonPackage rec { + pname = "primer3"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "libnano"; + repo = "primer3-py"; + rev = version; + sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; + }; + + nativeBuildInputs = [ cython ]; + + # pytestCheckHook leads to a circular import issue + checkInputs = [ click ]; + + pythonImportsCheck = [ "primer3" ]; + + meta = with lib; { + description = "Oligo analysis and primer design"; + homepage = "https://github.com/libnano/primer3-py"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix new file mode 100644 index 00000000000..d2923f1ad44 --- /dev/null +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyevmasm"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = pname; + rev = version; + sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa"; + }; + + propagatedBuildInputs = [ future ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Ethereum Virtual Machine (EVM) assembler and disassembler"; + homepage = "https://github.com/crytic/pyevmasm"; + changelog = "https://github.com/crytic/pyevmasm/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix new file mode 100644 index 00000000000..43909e2c130 --- /dev/null +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyfido"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfido" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/titilambert/pyfido"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix new file mode 100644 index 00000000000..1306c530bb4 --- /dev/null +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyfnip"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyfnip" ]; + + meta = with lib; { + description = "Python client to get fido account data"; + homepage = "https://github.com/juhaniemi/pyfnip"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 71253a894e7..2b46a4ce682 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.52.0"; + version = "0.52.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "0nm4z7v9qcb9mxqbl21jgzica4faldnpy5qmbkrc6scnx55pxfm9"; + sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 1a32851e6f3..3af6b3a263e 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,49 +1,49 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy3k -# propagatedBuildInputs , aiohttp -, async-timeout -, semantic-version -# buildInputs -, pytestrunner -# checkInputs -, pytest -, pytest-asyncio , aresponses +, async-timeout +, awesomeversion +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, pytest-asyncio +, pytestCheckHook }: + buildPythonPackage rec { pname = "pyhaversion"; - version = "3.4.2"; + version = "20.12.1"; - # needs aiohttp which is py3k-only - disabled = !isPy3k; + # Only 3.8.0 and beyond are supported + disabled = pythonAtLeast "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd"; }; propagatedBuildInputs = [ aiohttp async-timeout - semantic-version - ]; - - buildInputs = [ - pytestrunner + awesomeversion ]; checkInputs = [ - pytest - pytest-asyncio aresponses + awesomeversion + pytest-asyncio + pytestCheckHook ]; + pythonImportsCheck = [ "pyhaversion" ]; + meta = with lib; { - description = "A python module to the newest version number of Home Assistant"; + description = "Python module to the newest version number of Home Assistant"; homepage = "https://github.com/ludeeus/pyhaversion"; - maintainers = [ maintainers.makefu ]; + changelog = "https://github.com/ludeeus/pyhaversion/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix new file mode 100644 index 00000000000..8596883326b --- /dev/null +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +, async_generator +, pypubsub +, pyserial +, pyserial-asyncio +, pyyaml +, pytestCheckHook +, pythonOlder +, pytest-cov +, pytest-asyncio +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "pyinsteon"; + version = "1.0.8"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h"; + }; + + propagatedBuildInputs = [ + aiofiles + aiohttp + async_generator + pypubsub + pyserial + pyserial-asyncio + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyinsteon" ]; + + meta = with lib; { + description = "Python library to support Insteon home automation projects"; + longDescription = '' + This is a Python package to interface with an Insteon Modem. It has been + tested to work with most USB or RS-232 serial based devices such as the + 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. + ''; + homepage = "https://github.com/pyinsteon/pyinsteon"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pykira/default.nix b/pkgs/development/python-modules/pykira/default.nix new file mode 100644 index 00000000000..43d381e6bce --- /dev/null +++ b/pkgs/development/python-modules/pykira/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pykira"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zxglzmd2k1nc4wri76ykra910fdgli027nw9d6541ic7xmw87vj"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pykira" ]; + + meta = with lib; { + description = "Python module to interact with Kira modules"; + homepage = "https://github.com/stu-gott/pykira"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix new file mode 100644 index 00000000000..7e1fa060619 --- /dev/null +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, python-language-server }: + +buildPythonPackage rec { + pname = "pyls-spyder"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07apxh12b8ybkx5izr7pg8kbg5g5wgzw7vh5iy2n8dhiqarzp7s1"; + }; + + propagatedBuildInputs = [ python-language-server ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "pyls_spyder" ]; + + meta = with lib; { + description = "Spyder extensions for the python-language-server"; + homepage = "https://github.com/spyder-ide/pyls-spyder"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix new file mode 100644 index 00000000000..90a45640812 --- /dev/null +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pylutron"; + version = "0.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pylutron" ]; + + meta = with lib; { + description = "Python library for controlling a Lutron RadioRA 2 system"; + homepage = "https://github.com/thecynic/pylutron"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix new file mode 100644 index 00000000000..2500909d534 --- /dev/null +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiodns +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pymyq"; + version = "2.0.14"; + + src = fetchFromGitHub { + owner = "arraylabs"; + repo = pname; + rev = "v${version}"; + sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + }; + + propagatedBuildInputs = [ + aiodns + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymyq" ]; + + meta = with lib; { + description = "Python wrapper for MyQ API"; + homepage = "https://github.com/arraylabs/pymyq"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 202607186b9..023e5f12fd4 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -56,7 +56,7 @@ let optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests ) ++ ( # https://github.com/pyca/pyopenssl/issues/974 - optionals stdenv.isi686 [ "test_verify_with_time" ] + optionals stdenv.is32bit [ "test_verify_with_time" ] ); # Compose the final string expression, including the "-k" and the single quotes. diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix new file mode 100644 index 00000000000..f4f5bf6c70d --- /dev/null +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fixtures +, mock +, pbr +, pytest-cov +, pytestCheckHook +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "pyopnsense"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + checkInputs = [ + fixtures + mock + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyopnsense" ]; + + meta = with lib; { + description = "Python client for the OPNsense API"; + homepage = "https://github.com/mtreinish/pyopnsense"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix new file mode 100644 index 00000000000..f8e6cc96aff --- /dev/null +++ b/pkgs/development/python-modules/pypck/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytest-timeout +, pytestCheckHook +, pythonOlder +, stdenv +}: + +buildPythonPackage rec { + pname = "pypck"; + version = "0.7.8"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alengwenus"; + repo = pname; + rev = version; + sha256 = "06yqyqpzpypid27z31prvsp7nzpjqzn7gjlfqwjhhxl8fdgh8hkr"; + }; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-timeout + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_connection_lost" + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "pypck" ]; + + meta = with lib; { + description = "LCN-PCK library written in Python"; + homepage = "https://github.com/alengwenus/pypck"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 66d7579d0ed..e63b7329c96 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv -, fetchFromGitHub +{ lib , buildPythonPackage -, pytestCheckHook -, pytest -, inflection , factory_boy -, pytestcache -, pytestcov +, fetchFromGitHub +, inflection , mock +, pytest +, pytestcache +, pytestCheckHook +, pytestcov }: buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; }; - # TODO: remove in next release, it's removed in master. - postPatch = "substituteInPlace tox.ini --replace '--pep8' ''"; + propagatedBuildInputs = [ + factory_boy + inflection + pytest + ]; - propagatedBuildInputs = [ factory_boy inflection pytest ]; - - # The project uses tox, which we can't. So we simply run pytest manually. checkInputs = [ mock pytestCheckHook pytestcache pytestcov ]; + pytestFlagsArray = [ "--ignore=docs" ]; + pythonImportsCheck = [ "pytest_factoryboy" ]; meta = with lib; { - description = "Integration of factory_boy into the pytest runner."; + description = "Integration of factory_boy into the pytest runner"; homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; maintainers = with maintainers; [ winpat ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 1f33bac6827..9879a441b3e 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,43 +1,25 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, mock, pytestcov, coverage +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pytestCheckHook, mock, pytestcov, coverage , future, futures, ujson, isPy38 -, fetchpatch }: buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; + sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6"; }; postPatch = '' sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py - # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -iEe "s!'ujson.*\$!'ujson',!" setup.py ''; checkInputs = [ - pytest mock pytestcov coverage - ]; - - checkPhase = '' - pytest - ''; - - patches = [ - (fetchpatch { - url = "https://github.com/palantir/python-jsonrpc-server/commit/0a04cc4e9d44233b1038b12d63cd3bd437c2374e.patch"; - sha256 = "177zdnp1808r2pg189bvzab44l8i2alsgv04kmrlhhnv40h66qyg"; - }) - (fetchpatch { - url = "https://github.com/palantir/python-jsonrpc-server/commit/5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea.patch"; - sha256 = "1gx7lc1jxar1ngqqfkdn21s46y1mfnjf7ky2886ydk53nkaba91m"; - }) + pytestCheckHook mock pytestcov coverage ]; propagatedBuildInputs = [ future ujson ] diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 757194d11a5..dc3b33a6f53 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson +, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -21,33 +21,33 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.34.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; + sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; - patches = [ - # https://github.com/palantir/python-language-server/pull/851 - (fetchpatch { - url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch"; - sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5"; - }) - ]; + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] + ++ stdenv.lib.optional (withProvider "autopep8") autopep8 + ++ stdenv.lib.optional (withProvider "mccabe") mccabe + ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle + ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle + ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes + ++ stdenv.lib.optional (withProvider "pylint") pylint + ++ stdenv.lib.optional (withProvider "rope") rope + ++ stdenv.lib.optional (withProvider "yapf") yapf + ++ stdenv.lib.optional isPy27 configparser + ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - postPatch = '' - # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -i -e 's!ujson<=!ujson>=!' setup.py - ''; # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytestcov coverage flaky # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope @@ -67,20 +67,9 @@ buildPythonPackage rec { "test_matplotlib_completions" "test_snippet_parsing" "test_numpy_hover" + "test_symbols" ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] - ++ stdenv.lib.optional (withProvider "autopep8") autopep8 - ++ stdenv.lib.optional (withProvider "mccabe") mccabe - ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle - ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle - ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes - ++ stdenv.lib.optional (withProvider "pylint") pylint - ++ stdenv.lib.optional (withProvider "rope") rope - ++ stdenv.lib.optional (withProvider "yapf") yapf - ++ stdenv.lib.optional isPy27 configparser - ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - meta = with lib; { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; diff --git a/pkgs/development/python-modules/python-prjxray/default.nix b/pkgs/development/python-modules/python-prjxray/default.nix new file mode 100644 index 00000000000..5b92311612b --- /dev/null +++ b/pkgs/development/python-modules/python-prjxray/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, pkgs +, buildPythonPackage +, intervaltree +, numpy +, openpyxl +, parse +, progressbar +, pyjson5 +, pyyaml +, simplejson +, symbiflow-fasm +, textx +}: + +buildPythonPackage rec { + pname = "python-prjxray"; + version = pkgs.prjxray-tools.version; + + src = pkgs.prjxray-tools.src; + + propagatedBuildInputs = [ + intervaltree + numpy + openpyxl + parse + progressbar + pyjson5 + pyyaml + simplejson + symbiflow-fasm + textx + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Documenting the Xilinx 7-series bit-stream format"; + homepage = "https://github.com/SymbiFlow/prjxray"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index d2fd99f6d16..52b3d828ded 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "--ignore examples/" ]; pythonImportsCheck = [ "pytile" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = " Python API for Tile Bluetooth trackers"; longDescription = '' diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index aa6eecfdeb5..17c18a96c73 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, isPy3k, buildPythonPackage, pygame, pyglet, pysdl2, six }: +{ lib, fetchFromGitHub +, python, buildPythonPackage, isPy27 +, pygame, pyglet, pysdl2, six +}: buildPythonPackage rec { pname = "pytmx"; - version = "3.22.0"; + version = "3.24.0"; + + disabled = isPy27; src = fetchFromGitHub { # The release was not git tagged. owner = "bitcraft"; repo = "PyTMX"; - rev = "187fd429dadcdc5828e78e6748a983aa1434e4d2"; - sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc"; + rev = "eb96efea30d57b731654b2a167d86b8b553b147d"; + sha256 = "1g1j4w75zw76p5f8m5v0hdigdlva2flf0ngyk8nvqcwzcl5vq5wc"; }; propagatedBuildInputs = [ pygame pyglet pysdl2 six ]; checkPhase = '' - python -m unittest tests.pytmx.test_pytmx + # Change into the test directory due to a relative resource path. + cd tests/pytmx + ${python.interpreter} -m unittest test_pytmx ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix new file mode 100644 index 00000000000..4415ca7c376 --- /dev/null +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-cov +, pytest-asyncio +, pytest-timeout +, responses +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "pyvera"; + version = "0.3.11"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pavoni"; + repo = pname; + rev = version; + sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87"; + }; + + patches = [ + (fetchpatch { + # build-system section is missing https://github.com/pavoni/pyvera/pull/142 + url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch"; + sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytest-cov + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "pyvera" ]; + + meta = with lib; { + description = "Python library to control devices via the Vera hub"; + homepage = "https://github.com/pavoni/pyvera"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix new file mode 100644 index 00000000000..9b8b6eeac8f --- /dev/null +++ b/pkgs/development/python-modules/pyxeoma/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyxeoma"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "pyxeoma" ]; + + meta = with lib; { + description = "Python wrapper for Xeoma web server API"; + homepage = "https://github.com/jeradM/pyxeoma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix new file mode 100644 index 00000000000..d8e043d546d --- /dev/null +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, pybind11 +, numpy +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qdldl"; + version = "0.1.5.post0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c392c7427651d8b226423c7aba4a0f2338a1f38a4bbdabac6bc4afd8bc934f06"; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ pybind11 ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "qdldl" ]; + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A free LDL factorization routine"; + homepage = "https://github.com/oxfordcontrol/qdldl"; + downloadPage = "https://github.com/oxfordcontrol/qdldl-python"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 5de13530f66..aed6576c90d 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -1,21 +1,43 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, oauthlib, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, mock +, oauthlib +, pytestCheckHook +, requests +, requests-mock +}: buildPythonPackage rec { - version = "1.3.0"; pname = "requests-oauthlib"; + version = "1.3.0"; src = fetchPypi { inherit pname version; sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; }; - doCheck = false; # Internet tests fail when building in chroot propagatedBuildInputs = [ oauthlib requests ]; + checkInputs = [ + mock + pytestCheckHook + requests-mock + ]; + + # Exclude tests which require network access + disabledTests = [ + "testCanPostBinaryData" + "test_content_type_override" + "test_url_is_native_str" + ]; + + pythonImportsCheck = [ "requests_oauthlib" ]; + meta = with lib; { description = "OAuthlib authentication support for Requests"; homepage = "https://github.com/requests/requests-oauthlib"; + license = with licenses; [ isc ]; maintainers = with maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index acd52c22d1b..e549a00c894 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -1,34 +1,38 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose , plumbum +, pytestCheckHook }: buildPythonPackage rec { pname = "rpyc"; - version = "4.1.3"; + version = "5.0.1"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9"; + sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1"; }; propagatedBuildInputs = [ plumbum ]; - checkInputs = [ nose ]; - checkPhase = '' - cd tests - # some tests have added complexities and some tests attempt network use - nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry - ''; + checkInputs = [ pytestCheckHook ]; + + # Disable tests that requires network access + disabledTests = [ + "test_api" + "test_pruning" + "test_rpyc" + ]; + pythonImportsCheck = [ "rpyc" ]; meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = "https://rpyc.readthedocs.org"; - license = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 090d31e67a9..900943a0e15 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: +{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: buildPythonPackage rec { pname = "scrapy-deltafetch"; @@ -11,7 +11,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ bsddb3 scrapy ]; - checkInputs = [ pytest ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "scrapy_deltafetch" ]; meta = with lib; { description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 48988be2c0a..ab00377f4a0 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: +{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }: buildPythonPackage rec { pname = "scrapy-splash"; @@ -9,7 +9,11 @@ buildPythonPackage rec { sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; }; - checkInputs = [ pytest hypothesis scrapy ]; + propagatedBuildInputs = [ scrapy six ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "scrapy_splash" ]; meta = with lib; { description = "Scrapy+Splash for JavaScript integration"; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 1b7b75eaff4..48bafa41dff 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -79,7 +80,10 @@ buildPythonPackage rec { "test_retry_dns_error" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "test_xmliter_encoding" + "test_download" + ]; src = fetchPypi { inherit pname version; @@ -92,6 +96,8 @@ buildPythonPackage rec { install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; homepage = "https://scrapy.org/"; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index a47a1278425..de1b8123dd9 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -2,7 +2,7 @@ psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch +, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server - atomicwrites pyxdg diff-match-patch + atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder ]; # There is no test for spyder @@ -51,7 +51,7 @@ buildPythonPackage rec { postInstall = '' # add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors - wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH" + wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH" # Create desktop item mkdir -p $out/share/icons diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 24b334ef882..991f85c900e 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -1,30 +1,30 @@ { lib , fetchFromGitHub -, pytest , buildPythonPackage , nassl , cryptography , typing-extensions , faker +, pytestCheckHook }: buildPythonPackage rec { pname = "sslyze"; - version = "3.0.8"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; + sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography" + --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; checkPhase = '' # Most of the tests are online; hence, applicable tests are listed diff --git a/pkgs/development/python-modules/stdiomask/default.nix b/pkgs/development/python-modules/stdiomask/default.nix new file mode 100644 index 00000000000..8ef59074fc0 --- /dev/null +++ b/pkgs/development/python-modules/stdiomask/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "stdiomask"; + version = "0.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "19m3p6i7fj7nmkbsjhiha3f2l7d05j9gf9ha2pd0pqfrx9lp1r61"; + }; + + # tests are not published: https://github.com/asweigart/stdiomask/issues/5 + doCheck = false; + pythonImportsCheck = [ "stdiomask" ]; + + meta = with lib; { + description = "Python module for masking passwords"; + homepage = "https://github.com/asweigart/stdiomask"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index ee18a6ca6b2..8f383b60b17 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.3.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3"; + sha256 = "f640ae4e6fe761c3ae7138092c3dcb9b5050ec56e9cbac45d8a6b549d7ec973c"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix new file mode 100644 index 00000000000..5b6362b76a1 --- /dev/null +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, asynctest +, stdiomask +, cryptography +, pytestcov +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "subarulink"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = "G-Two"; + repo = pname; + rev = "subaru-v${version}"; + sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq"; + }; + + propagatedBuildInputs = [ aiohttp stdiomask ]; + + checkInputs = [ + asynctest + cryptography + pytest-asyncio + pytestcov + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "subarulink" ]; + + meta = with lib; { + description = "Python module for interacting with STARLINK-enabled vehicle"; + homepage = "https://github.com/G-Two/subarulink"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 30f34c56c81..321a48e72b6 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -18,7 +18,8 @@ buildPythonPackage rec { preConfigure = '' substituteInPlace setup.py \ - --replace 'requests>=2.24.0' 'requests~=2.23' + --replace 'requests>=2.24.0' 'requests~=2.23' \ + --replace 'flask-cors==3.0.8' 'flask-cors' ''; checkPhase = '' @@ -27,6 +28,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook mock ]; + pythonImportsCheck = [ "SwSpotify" ]; + meta = with lib; { homepage = "https://github.com/SwagLyrics/SwSpotify"; description = "Library to get the currently playing song and artist from Spotify"; diff --git a/pkgs/development/python-modules/symbiflow-fasm/default.nix b/pkgs/development/python-modules/symbiflow-fasm/default.nix new file mode 100644 index 00000000000..609987441ea --- /dev/null +++ b/pkgs/development/python-modules/symbiflow-fasm/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, buildPythonPackage +, textx +}: + +buildPythonPackage rec { + pname = "symbiflow-fasm"; + version = "0.0.1-g4857dde"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "fasm"; + rev = "4857dde757edd88688c2faf808774d85bdbe3900"; + sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435"; + }; + + propagatedBuildInputs = [ textx ]; + + meta = with stdenv.lib; { + description = "FPGA Assembly (FASM) Parser and Generation library"; + homepage = "https://github.com/SymbiFlow/fasm"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 18570c90c00..51f055d0660 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "6.2.0"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9"; + sha256 = "0zsdajdpcjd7inrl7r9pwiyh7qpgh9jk7g2bj1iva2d3n0gijkg1"; }; nativeBuildInputs = [ pbr setuptools_scm ]; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix new file mode 100644 index 00000000000..1ae1aa471be --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchPypi, buildPythonPackage +, gviz-api +, protobuf +, werkzeug +}: + +buildPythonPackage rec { + pname = "tensorboard_plugin_profile"; + version = "2.4.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + python = "py3"; + sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; + }; + + propagatedBuildInputs = [ + gviz-api + protobuf + werkzeug + ]; + + meta = with lib; { + description = "Profile Tensorboard Plugin."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix new file mode 100644 index 00000000000..b0966ca2c7c --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "tensorboard_plugin_wit"; + version = "1.7.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + python = "py3"; + sha256 = "0nv855qm2fav70lndsrv810pqgg41sbmd70fk86wk18ih825yxzf"; + }; + + meta = with lib; { + description = "What-If Tool TensorBoard plugin."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ ndl ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index f18364e1116..bca75224fa3 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.3.0"; + version = "2.4.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp"; + sha256 = "1w0pkcslm6934qqd6m5gxyjdlnb4pbl47k6s99wsh6dyvvr7nysv"; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index a89c6fa307e..91880562eb3 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -122,9 +122,10 @@ in buildPythonPackage { ''; meta = with lib; { + broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2 description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; []; # This package is maintainerless. }; } diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index d0cf7f28f4d..03125420506 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -5,9 +5,10 @@ , protobuf , grpcio , markdown -, futures , absl-py , google-auth-oauthlib +, tensorboard-plugin-wit +, tensorboard-plugin-profile }: # tensorflow/tensorboard is built from a downloaded wheel, because @@ -16,19 +17,16 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.1.0"; + version = "2.4.0"; format = "wheel"; + disabled = !isPy3k; - src = fetchPypi ({ + src = fetchPypi { pname = "tensorboard"; inherit version format; - } // (if isPy3k then { python = "py3"; - sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6"; - } else { - python = "py2"; - sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w"; - })); + sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + }; propagatedBuildInputs = [ numpy @@ -38,10 +36,12 @@ buildPythonPackage rec { grpcio absl-py google-auth-oauthlib + tensorboard-plugin-profile + tensorboard-plugin-wit # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel - ] ++ lib.optional (!isPy3k) futures; + ]; # in the absence of a real test suite, run cli and imports checkPhase = '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e726f927f5c..342a87a6e8d 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,24 +1,25 @@ -{ stdenv, pkgs, bazel_3, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath # Python deps -, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python +, buildPythonPackage, pythonOlder, pythonAtLeast, python # Python libraries -, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py -, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta -, functools32 +, numpy, tensorflow-tensorboard_2, absl-py +, future, setuptools, wheel, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2 +, dill, flatbuffers-python, tblib, typing-extensions # Common deps -, git, swig, which, binutils, glibcLocales, cython +, git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 -, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib +, jemalloc, openmpi, gast, grpc, sqlite, boringssl, jsoncpp +, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib # Upsteam by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null , mklSupport ? false, mkl ? null +, tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script @@ -39,7 +40,7 @@ assert ! (stdenv.isDarwin && cudaSupport); assert mklSupport -> mkl != null; let - withTensorboard = pythonOlder "3.6"; + withTensorboard = (pythonOlder "3.6") || tensorboardSupport; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; @@ -65,34 +66,40 @@ let includes_joined = symlinkJoin { name = "tensorflow-deps-merged"; paths = [ - pkgs.protobuf jsoncpp ]; }; tfFeature = x: if x then "1" else "0"; - version = "2.3.2"; + version = "2.4.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; pythonEnv = python.withPackages (_: [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) - numpy - keras-preprocessing - protobuf - wrapt - gast - astor + # This list can likely be shortened, but each trial takes multiple hours so won't bother for now. absl-py - termcolor - keras-applications + astunparse + dill + flatbuffers-python + gast + google-pasta + grpcio + h5py + keras-preprocessing + numpy + opt-einsum + protobuf setuptools + six + tblib + tensorflow-estimator_2 + tensorflow-tensorboard_2 + termcolor + typing-extensions wheel - ] ++ lib.optionals (!isPy3k) - [ future - functools32 - mock + wrapt ]); bazel-build = buildBazelPackage { @@ -103,27 +110,21 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-ncwIkqLDqrB33pB9/FTlBklsIJUEvnDUmyAeUfufCFs="; + sha256 = "0yl06aypfxrcs35828xf04mkidz1x0j89v0q5h4d2xps1cb5rv3f"; }; patches = [ - # Fixes for NixOS jsoncpp - ./system-jsoncpp.patch - + # Relax too strict Python packages versions dependencies. ./relax-dependencies.patch - - # see https://github.com/tensorflow/tensorflow/issues/40688 - (fetchpatch { - url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; - sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; - }) + # Add missing `io_bazel_rules_docker` dependency. + ./workspace.patch ]; # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - swig which pythonEnv + which pythonEnv cython perl ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -135,19 +136,18 @@ let # libs taken from system through the TF_SYS_LIBS mechanism grpc sqlite - openssl + boringssl jsoncpp - pkgs.protobuf curl + pybind11 snappy - flatbuffers + flatbuffers-core icu double-conversion libpng - libjpeg + libjpeg_turbo giflib - re2 - pkgs.lmdb + lmdb-core ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn @@ -173,10 +173,17 @@ let # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" "com_github_grpc_grpc" - "com_google_protobuf" - "com_googlesource_code_re2" + # Multiple issues with custom protobuf. + # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis` + # and related functionality, but then the next error is about "dangling symbolic link", and in general + # looks like that's only the beginning: see + # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf + # "com_google_protobuf" + # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)' + # "com_googlesource_code_re2" "curl" "cython" + "dill_archive" "double_conversion" "enum34_archive" "flatbuffers" @@ -198,8 +205,9 @@ let "pybind11" "six_archive" "snappy" - "swig" + "tblib_archive" "termcolor_archive" + "typing_extensions_archive" "wrapt" "zlib" ]; @@ -224,16 +232,13 @@ let TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; postPatch = '' + # bazel 3.3 should work just as well as bazel 3.1 + rm -f .bazelversion + '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 - sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py - - # numpy 1.19 added in https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch - sed -i 's/numpy >= 1.16.0, < 1.19.0/numpy >= 1.16.0/' tensorflow/tools/pip_package/setup.py - - # bazel 3.3 should work just as well as bazel 3.1 - rm -f .bazelversion + sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py ''; # https://github.com/tensorflow/tensorflow/pull/39470 @@ -277,16 +282,15 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; removeRulesCC = false; + # Without this Bazel complaints about sandbox violations. + dontAddBazelOpts = true; fetchAttrs = { - # So that checksums don't depend on these. - TF_SYSTEM_LIBS = null; - # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-lEdPA9vhYO6vd5FgPMbFp2PkRvDBurPidYsxtJLXcbQ=" + "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz" else - "sha256-ZEY/bWo5M3Juw1x3CwhXYXZHD4q5LzWDlhgXnh4P95U="; + "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9"; }; buildAttrs = { @@ -329,15 +333,13 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in - # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b - broken = !(xlaSupport -> cudaSupport) || !isPy3k; + broken = !(xlaSupport -> cudaSupport); }; }; in buildPythonPackage { inherit version pname; - disabled = isPy27; + disabled = !isPy3k; src = bazel-build.python; @@ -354,27 +356,23 @@ in buildPythonPackage { # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ absl-py - astor + astunparse + dill + flatbuffers-python gast google-pasta - keras-applications + grpcio + h5py keras-preprocessing numpy - six + opt-einsum protobuf + six + tblib tensorflow-estimator_2 termcolor + typing-extensions wrapt - grpcio - opt-einsum - astunparse - h5py - ] ++ lib.optionals (!isPy3k) [ - mock - future - functools32 - ] ++ lib.optionals (pythonOlder "3.4") [ - backports_weakref enum34 ] ++ lib.optionals withTensorboard [ tensorflow-tensorboard_2 ]; diff --git a/pkgs/development/python-modules/tensorflow/relax-dependencies.patch b/pkgs/development/python-modules/tensorflow/relax-dependencies.patch index fc11a04cbdc..b26c1e95a64 100644 --- a/pkgs/development/python-modules/tensorflow/relax-dependencies.patch +++ b/pkgs/development/python-modules/tensorflow/relax-dependencies.patch @@ -1,16 +1,51 @@ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 594e74f40c0..bfbf010144f 100644 +index 65133afdafe..8ef6364ff7e 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -54,9 +54,9 @@ _VERSION = '2.3.1' +@@ -75,23 +75,23 @@ if '--project_name' in sys.argv: + # comment the versioning scheme. + # NOTE: Please add test only packages to `TEST_PACKAGES` below. REQUIRED_PACKAGES = [ - 'absl-py >= 0.7.0', - 'astunparse == 1.6.3', +- 'absl-py ~= 0.10', +- 'astunparse ~= 1.6.3', +- 'flatbuffers ~= 1.12.0', +- 'google_pasta ~= 0.2', +- 'h5py ~= 2.10.0', +- 'keras_preprocessing ~= 1.1.2', +- 'numpy ~= 1.19.2', +- 'opt_einsum ~= 3.3.0', ++ 'absl-py >= 0.10', ++ 'astunparse >= 1.6.3', ++ 'flatbuffers >= 1.12.0', ++ 'google_pasta >= 0.2', ++ 'h5py >= 2.10.0', ++ 'keras_preprocessing >= 1.1.2', ++ 'numpy >= 1.19.1', ++ 'opt_einsum >= 3.3.0', + 'protobuf >= 3.9.2', +- 'six ~= 1.15.0', +- 'termcolor ~= 1.1.0', +- 'typing_extensions ~= 3.7.4', +- 'wheel ~= 0.35', +- 'wrapt ~= 1.12.1', ++ 'six >= 1.15.0', ++ 'termcolor >= 1.1.0', ++ 'typing_extensions >= 3.7.4', ++ 'wheel >= 0.34.2', ++ 'wrapt >= 1.12.1', + # These packages needs to be pinned exactly as newer versions are + # incompatible with the rest of the ecosystem - 'gast == 0.3.3', + 'gast >= 0.3.3', - 'google_pasta >= 0.1.8', -- 'h5py >= 2.10.0, < 2.11.0', -+ 'h5py >= 2.10.0', - 'keras_preprocessing >= 1.1.1, < 1.2', - # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage - # https://github.com/numpy/numpy/pull/15355 + # TensorFlow ecosystem packages that TF exposes API for + # These need to be in sync with the existing TF version + # They are updated during the release process +@@ -118,7 +118,7 @@ if 'tf_nightly' in project_name: + # BoringSSL support. + # See https://github.com/tensorflow/tensorflow/issues/17882. + if sys.byteorder == 'little': +- REQUIRED_PACKAGES.append('grpcio ~= 1.32.0') ++ REQUIRED_PACKAGES.append('grpcio >= 1.31.0') + + + # Packages which are only needed for testing code. diff --git a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch b/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch deleted file mode 100644 index ecb2d04d7ee..00000000000 --- a/pkgs/development/python-modules/tensorflow/system-jsoncpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD -index 526fd0c418..646f3fdcea 100644 ---- a/third_party/systemlibs/jsoncpp.BUILD -+++ b/third_party/systemlibs/jsoncpp.BUILD -@@ -7,6 +7,7 @@ filegroup( - - HEADERS = [ - "include/json/autolink.h", -+ "include/json/allocator.h", - "include/json/config.h", - "include/json/features.h", - "include/json/forwards.h", -@@ -23,7 +24,7 @@ genrule( - cmd = """ - for i in $(OUTS); do - i=$${i##*/} -- ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i -+ ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i - done - """, - ) diff --git a/pkgs/development/python-modules/tensorflow/workspace.patch b/pkgs/development/python-modules/tensorflow/workspace.patch new file mode 100644 index 00000000000..15a527815ec --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/workspace.patch @@ -0,0 +1,18 @@ +diff --git a/WORKSPACE b/WORKSPACE +index 9db1d9b80eb..c46f13f4ca4 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -12,6 +12,13 @@ http_archive( + ], + ) + ++http_archive( ++ name = "io_bazel_rules_docker", ++ sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80", ++ strip_prefix = "rules_docker-0.15.0", ++ urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"], ++) ++ + # Load tf_repositories() before loading dependencies for other repository so + # that dependencies like com_google_protobuf won't be overridden. + load("//tensorflow:workspace.bzl", "tf_repositories") diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix new file mode 100644 index 00000000000..07c568b87d4 --- /dev/null +++ b/pkgs/development/python-modules/textx/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, arpeggio +, click +, jinja2 +}: + +buildPythonPackage rec { + pname = "textX"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname; + inherit version; + sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82"; + }; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/functional" ]; + + propagatedBuildInputs = [ + arpeggio + click + jinja2 + ]; + + meta = with stdenv.lib; { + description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python"; + homepage = "https://textx.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix new file mode 100644 index 00000000000..dab312c8845 --- /dev/null +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, diff-match-patch }: + +buildPythonPackage rec { + pname = "three-merge"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w6rv7rv1zm901wbjkmm6d3vkwyf3csja9p37bb60mar8khszxk0"; + }; + + propagatedBuildInputs = [ diff-match-patch ]; + + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "three_merge" ]; + + meta = with lib; { + description = "Simple library for merging two strings with respect to a base one"; + homepage = "https://github.com/spyder-ide/three-merge"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 01aa6a29005..13f23edaad1 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -1,39 +1,39 @@ -{ lib, stdenv, fetchPypi, python }: +{ lib +, buildPythonPackage +, factory_boy +, faker +, fetchPypi +, pytest-cov +, pytestCheckHook +, six +, tox +}: -python.pkgs.buildPythonPackage rec { - pname = "tld"; - version = "0.12.4"; +buildPythonPackage rec { + pname = "tld"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - sha256 = "0976g7jcpi3jv7snawmfis5ybb6737cv2xw7wlanlfkyqljip24x"; + sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv"; }; - propagatedBuildInputs = with python.pkgs; [ six ]; - checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook]; - - # https://github.com/barseghyanartur/tld/issues/54 - disabledTests = [ - "test_1_update_tld_names" - "test_1_update_tld_names_command" - "test_2_update_tld_names_module" + checkInputs = [ + factory_boy + faker + pytest-cov + pytestCheckHook + tox ]; - preCheck = '' - export PATH="$PATH:$out/bin" - ''; - - dontUseSetuptoolsCheck = true; - - pythonImportsCheck = [ - "tld" - ]; + pythonImportsCheck = [ "tld" ]; meta = with lib; { homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; - license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + # https://github.com/barseghyanartur/tld/blob/master/README.rst#license + # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later + license = with licenses; [ lgpl21Plus mpl11 gpl2Only ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix new file mode 100644 index 00000000000..88bda79b8b3 --- /dev/null +++ b/pkgs/development/python-modules/tmb/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tmb"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alemuro"; + repo = pname; + rev = version; + sha256 = "0fmwm9dz2mik9zni50wrnw7k9ld4l4w3p92aws6jcrdfxfi7aq7p"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tmb" ]; + + meta = with lib; { + homepage = "https://github.com/alemuro/tmb"; + description = "Python library that interacts with TMB API"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix new file mode 100644 index 00000000000..28560feb04f --- /dev/null +++ b/pkgs/development/python-modules/tumpa/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyside2 +, johnnycanencrypt +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tumpa"; + version = "0.1.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kushaldas"; + repo = "tumpa"; + rev = "v${version}"; + sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq"; + }; + + propagatedBuildInputs = [ + setuptools + johnnycanencrypt + pyside2 + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "OpenPGP key creation and smartcard access"; + homepage = "https://github.com/kushaldas/tumpa"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix new file mode 100644 index 00000000000..68fa57165df --- /dev/null +++ b/pkgs/development/python-modules/unifiled/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "unifiled"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "florisvdk"; + repo = pname; + rev = "v${version}"; + sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq"; + }; + + propagatedBuildInputs = [ + requests + urllib3 + ]; + + # Project doesn't have any tests + doCheck = false; + pythonImportsCheck = [ "unifiled" ]; + + meta = with lib; { + description = "Python module for Ubiquiti Unifi LED controller"; + homepage = "https://github.com/florisvdk/unifiled"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 958f8a01704..7559ae1ccca 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "1.3.2"; + version = "2.0"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "3fa85a6e490e45eab64e6be19841e0ab15ec8054c97f162079a061da6a93eba0"; + sha256 = "3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65"; }; # requires X server diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix new file mode 100644 index 00000000000..f6c2cc42e38 --- /dev/null +++ b/pkgs/development/python-modules/wasm/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "wasm"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; + }; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ "wasm" ]; + + meta = with lib; { + description = "WebAssembly decoder and disassembler"; + homepage = "https://github.com/athre0z/wasm"; + changelog = "https://github.com/athre0z/wasm/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix new file mode 100644 index 00000000000..a07c1e6333e --- /dev/null +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, pytest-runner +, pytestCheckHook +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "waterfurnace"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "sdague"; + repo = pname; + rev = "v${version}"; + sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf"; + }; + + propagatedBuildInputs = [ + click + pytest-runner + requests + websocket_client + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "waterfurnace" ]; + + meta = with lib; { + description = "Python interface to waterfurnace geothermal systems"; + homepage = "https://github.com/sdague/waterfurnace"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index a43aa915ea0..f42df005495 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , chardet +, colorama , configparser , fetchFromGitHub , future @@ -8,44 +9,61 @@ , mock , netaddr , pkgs -, pyparsing , pycurl +, pyparsing , pytest +, pytestCheckHook +, setuptools , six +, stdenv }: buildPythonPackage rec { pname = "wfuzz"; - version = "2.4.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "xmendez"; repo = pname; - rev = "v.${version}"; - sha256 = "15dihrc7jsvpxcmb4fp254s633mkjm7ksjfkr9pqaai49qmnddyf"; + rev = "v${version}"; + sha256 = "1izasczm2zwknwzxbfzqhlf4zp02jvb54ha1hfk4rlwiz0rr1kj4"; }; - buildInputs = [ pyparsing configparser ]; - propagatedBuildInputs = [ chardet - future pycurl six + setuptools + pyparsing + ] ++ lib.optionals isPy27 [ + mock + future + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + colorama ]; - checkInputs = [ netaddr pytest ] ++ lib.optionals isPy27 [ mock ]; + checkInputs = [ + netaddr + pytest + pytestCheckHook + ] ++ lib.optionals isPy27 [ + mock + ]; - # Skip tests requiring a local web server. - checkPhase = '' - HOME=$TMPDIR pytest \ - tests/test_{moduleman,filterintro,reqresp,api,clparser,dotdict}.py - ''; + preCheck = "export HOME=$(mktemp -d)"; + # The skipped tests are requiring a local web server + pytestFlagsArray = [ "tests/test_{moduleman,filterintro,reqresp,api,clparser}.py" ]; + pythonImportsCheck = [ "wfuzz" ]; meta = with lib; { - description = "Web content fuzzer, to facilitate web applications assessments"; + description = "Web content fuzzer to facilitate web applications assessments"; + longDescription = '' + Wfuzz provides a framework to automate web applications security assessments + and could help you to secure your web applications by finding and exploiting + web application vulnerabilities. + ''; homepage = "https://wfuzz.readthedocs.io"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ pamplemousse ]; }; } diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index fb7326c81d5..51c0de77917 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -3,7 +3,6 @@ , pythonOlder , isPy27 , fetchFromGitHub -, nose , noise , numpy , pyplatec @@ -11,6 +10,7 @@ , purepng , h5py , gdal +, pytestCheckHook }: buildPythonPackage rec { @@ -47,13 +47,12 @@ buildPythonPackage rec { --replace 'PyPlatec==1.4.0' 'PyPlatec' \ ''; - # with python<3.5, unittest fails to discover tests because of their filenames - # so nose is used instead. doCheck = !isPy27; # google namespace clash - checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ]; - postCheck = stdenv.lib.optionalString (pythonOlder "3.5") '' - nosetests tests - ''; + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "TestSerialization" + ]; meta = with lib; { homepage = "http://world-engine.org"; diff --git a/pkgs/development/python-modules/xc-fasm/default.nix b/pkgs/development/python-modules/xc-fasm/default.nix new file mode 100644 index 00000000000..bf00bb15901 --- /dev/null +++ b/pkgs/development/python-modules/xc-fasm/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, simplejson +, intervaltree +, python-prjxray +, symbiflow-fasm +, textx +}: + +buildPythonPackage rec { + pname = "xc-fasm"; + version = "0.0.1-g0ddd9516"; + + src = fetchFromGitHub { + owner = "SymbiFlow"; + repo = "xc-fasm"; + rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577"; + sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4"; + }; + + propagatedBuildInputs = [ + simplejson + intervaltree + python-prjxray + symbiflow-fasm + textx + ]; + + # Pip will check for and then install missing dependecies. + # Because some of them are installed from git, it will try + # to download them even if they're present in + # propagatedBuildInputs. + pipInstallFlags = [ "--no-deps" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with stdenv.lib; { + description = "XC FASM libraries"; + homepage = "https://github.com/SymbiFlow/xc-fasm"; + license = licenses.isc; + maintainers = with maintainers; [ mcaju ]; + }; +} diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index 8b2d73b00fb..e47a91fb993 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , clikit -, poetry +, poetry-core , pytestCheckHook }: buildPythonPackage rec { - version = "4.0.1"; + version = "5.0.1"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -14,10 +14,10 @@ buildPythonPackage rec { owner = "srstevenson"; repo = pname; rev = version; - sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + sha256 = "sha256-WMY9Hs9SbErTp8hVBoCWTz4dLQhuzqTRpXFEyE7+woo="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ clikit diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 75d090699a4..21b45b9c322 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -20,7 +20,8 @@ buildPythonPackage rec { ''; # https://github.com/NixOS/nixpkgs/pull/107872#issuecomment-752175866 - doCheck = stdenv.isLinux; + # cannot import name '_gi' from partially initialized module 'gi' (most likely due to a circular import) + doCheck = false; meta = with lib; { description = "An interactive viewer for graphs written in Graphviz's dot"; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix new file mode 100644 index 00000000000..19720a55d23 --- /dev/null +++ b/pkgs/development/python-modules/xknx/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, netifaces +, voluptuous +, pyyaml +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "xknx"; + version = "0.16.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "XKNX"; + repo = pname; + rev = version; + sha256 = "0a9pxah37ml2a5qpc841ps22d256003i8d4mix2gh7nwxab2qp8j"; + }; + + propagatedBuildInputs = [ + voluptuous + netifaces + pyyaml + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "xknx" ]; + + meta = with lib; { + description = "KNX Library Written in Python"; + longDescription = '' + XKNX is an asynchronous Python library for reading and writing KNX/IP + packets. It provides support for KNX/IP routing and tunneling devices. + ''; + homepage = "https://github.com/XKNX/xknx"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 55b45fb5171..e31054e74c1 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.4.1"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56"; + sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad"; }; propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 89b063f84be..be935b1995c 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments +, gitMinimal, mercurial, subversion, patchutils, less +}: buildPythonPackage rec { pname = "ydiff"; @@ -9,21 +11,38 @@ buildPythonPackage rec { sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; - # test suite requires a multitude of other version control tooling - # currently only a single file, an import/usage should suffice + patchPhase = '' + substituteInPlace ydiff.py \ + --replace "['git'" "['${gitMinimal}/bin/git'" \ + --replace "['hg'" "['${mercurial}/bin/hg'" \ + --replace "['svn'" "['${subversion}/bin/svn'" \ + --replace "['filterdiff'" "['${patchutils}/bin/filterdiff'" \ + --replace "['less'" "['${less}/bin/less'" # doesn't support PAGER from env + substituteInPlace tests/test_ydiff.py \ + --replace /bin/rm rm \ + --replace /bin/sh sh + patchShebangs setup.py + patchShebangs tests/*.sh + ''; + + checkInputs = [ docutils pygments ]; + checkPhase = '' - $out/bin/ydiff --help + runHook preCheck + make doc-check reg # We don't want the linter or coverage check. + runHook postCheck ''; meta = with lib; { description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")"; longDescription = '' - Term based tool to view colored, incremental diff in a Git/Mercurial/Svn - workspace or from stdin, with side by side (similar to diff -y) and auto - pager support + Term based tool to view colored, incremental diff in a version + controlled workspace (supports Git, Mercurial, Perforce and Svn + so far) or from stdin, with side by side (similar to diff -y) + and auto pager support. ''; homepage = "https://github.com/ymattw/ydiff"; license = licenses.bsd3; - maintainers = teams.deshaw.members; + maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 72d6d48f977..a3b00ec3232 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.28.6"; + version = "0.28.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c"; + sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb"; }; propagatedBuildInputs = [ ifaddr ] @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "zeroconf" ]; meta = with lib; { - description = "A pure python implementation of multicast DNS service discovery"; + description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 752d2eeda8d..2f3500516cb 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , aiohttp , zigpy -, conftest , asynctest , pytestCheckHook }: @@ -20,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ aiohttp zigpy ]; - checkInputs = [ pytestCheckHook conftest asynctest ]; + checkInputs = [ pytestCheckHook asynctest ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e86ef253249..a3c02503b37 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -56,11 +56,6 @@ let # radare 3.3 compat for radare2-cutter (cd shlr && ln -s ../capstone-${cs_ver} capstone) tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - # necessary because they broke the offline-build: - # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 - # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 - curl() { true; } - export -f curl ''; postInstall = '' @@ -110,12 +105,12 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24959"; - gittap = "4.5.1"; - gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; - rev = "4.5.1"; - version = "4.5.1"; - sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; + version_commit = "25480"; + gittap = "5.0.0"; + gittip = "a476454c00f64acbb7425c178c98714ef76e26d7"; + rev = "5.0.0"; + version = "5.0.0"; + sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 52b1a26d814..8a48b43312e 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -15,6 +15,22 @@ let }; }); + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.27.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; + }; + }); + + dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; + }; + }); + cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { version = "1.6.0"; src = oldAttrs.src.override { @@ -68,7 +84,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3.1" \ + --replace "docker~=4.2.0" "docker~=4.3" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 925d10b23b4..ab7a7c0fdff 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, emacsPackages }: +{ stdenv, fetchurl, python, emacs }: stdenv.mkDerivation rec { pname = "cask"; - inherit (emacsPackages.melpaStablePackages.cask) src version; + inherit (emacs.pkgs.melpaStablePackages.cask) src version; doCheck = true; - nativeBuildInputs = [ emacsPackages.emacs ]; - buildInputs = with emacsPackages; [ + nativeBuildInputs = [ emacs ]; + buildInputs = with emacs.pkgs; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ] ++ [ diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix new file mode 100644 index 00000000000..e051dfef19b --- /dev/null +++ b/pkgs/development/tools/clpm/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchgit +, wrapLisp +, sbcl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "clpm"; + version = "0.3.5"; + + src = fetchgit { + url = "https://gitlab.common-lisp.net/clpm/clpm"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if"; + }; + + buildInputs = [ + (wrapLisp sbcl) + openssl + ]; + + buildPhase = '' + ln -s ${openssl.out}/lib/libcrypto.so.* . + ln -s ${openssl.out}/lib/libssl.so.* . + common-lisp.sh --script scripts/build.lisp + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; + + # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` + dontFixup = true; + + meta = with stdenv.lib; { + description = "Common Lisp Package Manager"; + homepage = "https://www.clpm.dev/"; + license = licenses.bsd2; + maintainers = [ maintainers.petterstorvik ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20a..00000000000 --- a/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 29d00a159ab..27e4eb88d46 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -94,12 +94,12 @@ rec { headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; }; - electron_11 = mkElectron "11.1.0" { - x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538"; - x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0"; - i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6"; - armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd"; - aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777"; - headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr"; + electron_11 = mkElectron "11.2.0" { + x86_64-linux = "a2ed11a5ec9ad10302053e5e2bdf2abf0f9bac521e4f80a377308bffe8c24c00"; + x86_64-darwin = "c8485cc6cb754bccfb1a01db93f5f0f1ee1ed3017551f3d25a1191c7c7aea654"; + i686-linux = "508b9276f97c66418e530cbfa584701d4b0a42825fb2519b21ff161db1dc121f"; + armv7l-linux = "edf1ad6606eab5efc1c9a33ce16489dae1df21ce6e69166f4c8da27ca6fde2ca"; + aarch64-linux = "ed8e318ce0ba92058efdc667790bcbfce1c7f888f9d94038c1c76ed8678158fc"; + headers = "0mwv9vm2km6sawyds87fzy7m4pcmmwl9c2qihs1nc7cwmdz388lv"; }; } diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 82ae3d4bb7b..e55cea0895b 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2020-10-27"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0"; - sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy"; + rev = "v${version}"; + sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558"; }; - vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz"; + vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id"; doCheck = false; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 2e13f67e9f7..eabf41f8663 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2020-10-27"; - rev = "eafbe7b904eb2418efc832e36ac634dc09084f10"; + version = "2021-01-13"; + rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg"; + sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; }; # The gopls folder contains a Go submodule which causes a build failure. diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix new file mode 100644 index 00000000000..a9ba82e53f6 --- /dev/null +++ b/pkgs/development/tools/jbang/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: + +stdenv.mkDerivation rec { + version = "0.58.0"; + pname = "jbang"; + + src = fetchzip { + url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; + sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + rm bin/jbang.{cmd,ps1} + rmdir tmp + cp -r . $out + wrapProgram $out/bin/jbang \ + --set JAVA_HOME ${jdk} \ + --set PATH ${lib.makeBinPath [ coreutils jdk curl ]} + runHook postInstall + ''; + + installCheckPhase = '' + $out/bin/jbang --version 2>&1 | grep -q "${version}" + ''; + + meta = with stdenv.lib; { + description = "Run java as scripts anywhere"; + longDescription = '' + jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically + downloaded and the java code runs. + ''; + homepage = "https://https://www.jbang.dev/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 6b797481799..877aedc4e49 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs --host strace-graph"; - configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; + configureFlags = [ "--enable-mpers=check" ]; meta = with stdenv.lib; { homepage = "https://strace.io/"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 0c366668c5c..32094d9303b 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "12.1.1"; + version = "12.1.2"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1n5n7lxlw6zhrdf4jbmqpyn9k02dpn4wqm93qgiin4i8j8bxwjw8"; + sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "0bph6n8i5dfy5ryr3nyd3pxyrl1032vvg63s4s44g01qjm9rfdvf"; + cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index c267b2757a4..60a9bfba58f 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -32,9 +32,14 @@ in buildDunePackage rec { # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml - # set bogus user info in git so git commit doesn't fail - sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ - tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # fix problems with git invocations in tests + for f in tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t; do + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' "$f" + # surpress hint to set default branch name + substituteInPlace "$f" --replace "git init" "git init -b main" + done + # ignore weird yes error message sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 147ab877d6b..5b1d8b0794d 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; + sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; }; outputs = [ "out" "man" ]; @@ -31,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' patchShebangs . @@ -42,9 +43,9 @@ buildGoModule rec { install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ - --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} + --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix deleted file mode 100644 index 510808fc412..00000000000 --- a/pkgs/development/tools/ydiff/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git -, subversion, coreutils, which }: - -with pythonPackages; - -buildPythonApplication rec { - pname = "ydiff"; - version = "1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; - }; - - patchPhase = '' - substituteInPlace tests/test_ydiff.py \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/sh ${stdenv.shell} - substituteInPlace Makefile \ - --replace "pep8 --ignore" "# pep8 --ignore" \ - --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ - --replace /bin/sh ${stdenv.shell} \ - --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" - patchShebangs tests/*.sh - ''; - - buildInputs = [ docutils pygments ]; - propagatedBuildInputs = [ less patchutils ]; - checkInputs = [ coverage coreutils git subversion which ]; - - checkTarget = if isPy3k then "test3" else "test"; - - meta = { - homepage = "https://github.com/ymattw/ydiff"; - description = "View colored, incremental diff in workspace or from stdin"; - longDescription = '' - Term based tool to view colored, incremental diff in a version - controlled workspace (supports Git, Mercurial, Perforce and Svn - so far) or from stdin, with side by side (similar to diff -y) - and auto pager support. - ''; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index f484d3304cb..19edf446864 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.8.tar.xz", + "name": "factorio_alpha_x64-1.1.10.tar.xz", "needsAuth": true, - "sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m", + "sha256": "1vz0av669l6li87sld59v1yjlfxkzwdprbh152wnaym7sgszp3lq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.8/alpha/linux64", - "version": "1.1.8" + "url": "https://factorio.com/get-download/1.1.10/alpha/linux64", + "version": "1.1.10" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.0.0.tar.xz", + "name": "factorio_demo_x64-1.1.10.tar.xz", "needsAuth": false, - "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "sha256": "151crxb5xihj9fygf5n335g342mjmqi9fs1nblx6nspk2s4firwm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/demo/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.10/demo/linux64", + "version": "1.1.10" }, "stable": { "name": "factorio_demo_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.8.tar.xz", + "name": "factorio_headless_x64-1.1.10.tar.xz", "needsAuth": false, - "sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf", + "sha256": "1132spanr8w71v6y6ynd9ciy22nk60mz4vdaxgdnwmjd8yfbg1d7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.8/headless/linux64", - "version": "1.1.8" + "url": "https://factorio.com/get-download/1.1.10/headless/linux64", + "version": "1.1.10" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 638bf59fc78..8870fe21ab9 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkg-config, SDL_mixer, SDL_image, SDL_ttf }: + stdenv.mkDerivation rec { pname = "fish-fillets-ng"; version = "1.0.1"; + src = fetchurl { url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"; @@ -10,18 +12,31 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf]; - postInstall='' - mkdir -p "$out/share/games/fillets-ng/" - tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 + + nativeBuildInputs = [ pkg-config copyDesktopItems ]; + buildInputs = [ SDL lua5_1 SDL_mixer SDL_image SDL_ttf ]; + + desktopItems = [ (makeDesktopItem { + name = "fish-fillets-ng"; + exec = "fillets"; + icon = "fish-fillets-ng"; + desktopName = "Fish Fillets"; + comment = "Puzzle game about witty fish saving the world sokoban-style"; + categories = "Game;LogicGame;"; + }) ]; + + postInstall = '' + mkdir -p $out/share/games/fillets-ng + tar -xf ${data} -C $out/share/games/fillets-ng --strip-components=1 + install -Dm644 ${./icon.xpm} $out/share/pixmaps/fish-fillets-ng.xpm ''; - meta = { + + meta = with lib; { inherit version; description = ''A puzzle game''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "http://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/games/fish-fillets-ng/icon.xpm new file mode 100644 index 00000000000..9947c54e7e5 --- /dev/null +++ b/pkgs/games/fish-fillets-ng/icon.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char * fillets_ng_xpm[] = { +"32 32 4 1", +" c None", +". c #000000", +"+ c #808000", +"@ c #FFFF00", +" .......... ", +" ...+@@@@@@+... ", +" ...@@@@@@@@@@@@... ", +" ..+@@@+......+@@@+.. ", +" ..@@@+..........+@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..................@@@.. ", +" .+@@....................@@+. ", +" ..@@......................@@.. ", +" .@@+......................+@@. ", +"..@@.....@@@@@.........@@...@@..", +".+@+...@@@@@@@@@.....@@@@...+@+.", +".@@...@@@.....@@@...@@+@@....@@.", +".@@...@@.+@....+@@+@@+.@@....@@.", +".@@..@@..@@.....+@@@+..@@....@@.", +".@@..@@.........+@@@+..@@....@@.", +".@@...@@.......+@@+@@+.@@....@@.", +".@@...@@@.....@@@...@@+@@....@@.", +".+@+...@@@@@@@@@.....@@@@...+@+.", +"..@@.....@@@@@.........@@...@@..", +" .@@+......................+@@. ", +" ..@@......................@@.. ", +" .+@@....................@@+. ", +" ..@@@..................@@@.. ", +" ..@@@................@@@.. ", +" ..@@@..............@@@.. ", +" ..@@@+..........+@@@.. ", +" ..+@@@+......+@@@+.. ", +" ...@@@@@@@@@@@@... ", +" ...+@@@@@@+... ", +" .......... "}; diff --git a/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch new file mode 100644 index 00000000000..d4fe7be1918 --- /dev/null +++ b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch @@ -0,0 +1,33 @@ +From 9dbfa680db6bfd1033772dda753120fe4452e0d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 8 Jan 2021 04:49:14 +0100 +Subject: [PATCH] fix include path for SDL2 on linux + +--- + .../src/main/java/arc/backend/sdl/jni/SDL.java | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java b/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +index 62d9286a..2853119d 100644 +--- a/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java ++++ b/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +@@ -8,16 +8,8 @@ import java.nio.*; + public class SDL{ + /*JNI + +- #ifdef __APPLE__ +- + #include "SDL2/SDL.h" + +- #else +- +- #include "SDL.h" +- +- #endif +- + */ + + static{ +-- +2.29.2 + diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index db2dcdf9180..b9969b84fb7 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,12 +1,20 @@ { lib, stdenv , makeWrapper , makeDesktopItem +, copyDesktopItems , fetchFromGitHub +, fetchpatch , gradleGen , jdk , perl -, jre + +# for arc +, SDL2 +, pkg-config +, stb +, ant , alsaLib +, glew # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means @@ -25,12 +33,52 @@ let version = "122.1"; buildVersion = makeBuildVersion version; - src = fetchFromGitHub { + Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y"; }; + Arc = fetchFromGitHub { + owner = "Anuken"; + repo = "Arc"; + rev = "v${version}"; + sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d"; + }; + soloud = fetchFromGitHub { + owner = "Anuken"; + repo = "soloud"; + # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 + rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5"; + sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531"; + }; + + patches = [ + ./0001-fix-include-path-for-SDL2-on-linux.patch + # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch"; + sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan"; + extraPrefix = "Arc/"; + stripLen = 1; + }) + # add resolveDependencies task, remove when and if it gets added upstream in a future release + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/pull/4302.patch"; + sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq"; + extraPrefix = "Mindustry/"; + stripLen = 1; + }) + ]; + + unpackPhase = '' + cp -r ${Mindustry} Mindustry + cp -r ${Arc} Arc + chmod -R u+w -- Mindustry Arc + cp ${stb.src}/stb_image.h Arc/arc-core/csrc/ + cp -r ${soloud} Arc/arc-core/csrc/soloud + chmod -R u+w -- Arc + ''; desktopItem = makeDesktopItem { type = "Application"; @@ -40,7 +88,9 @@ let icon = "mindustry"; }; - postPatch = '' + cleanupMindustrySrc = '' + pushd Mindustry + # Remove unbuildable iOS stuff sed -i '/^project(":ios"){/,/^}/d' build.gradle sed -i '/robo(vm|VM)/d' build.gradle @@ -48,13 +98,8 @@ let # Pin 'SNAPSHOT' versions sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle - ''; - preBuild = '' - # Arc is run at build time for sprite packing, and it needs to see - # the runtime libraries - ${stdenv.lib.optionalString stdenv.isLinux "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib"} - export GRADLE_USER_HOME=$(mktemp -d) + popd ''; # The default one still uses jdk8 (#89731) @@ -63,15 +108,18 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; - inherit version src postPatch; + inherit version unpackPhase patches; + postPatch = cleanupMindustrySrc; + nativeBuildInputs = [ gradle_6 perl ]; - # Here we build both the server and the client so we only have to specify - # one hash for 'deps'. Deps can be garbage collected after the build, - # so this is not really an issue. + # Here we download dependencies for both the server and the client so + # we only have to specify one hash for 'deps'. Deps can be garbage + # collected after the build, so this is not really an issue. buildPhase = '' - ${preBuild} - gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion} - gradle --no-daemon server:dist -Pbuildversion=${buildVersion} + pushd Mindustry + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon resolveDependencies + popd ''; # 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 = '' @@ -81,51 +129,72 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0vzck6hsrvs438s3ikk66qmpak88bmqcb8inqbbjwy7x87d2qsvj"; + outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l"; }; - # Separate commands for building and installing the server and the client - buildClient = '' - gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} - ''; - buildServer = '' - gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} - ''; - installClient = '' - install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/mindustry \ - ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \ - --add-flags "-jar $out/share/mindustry.jar" - install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png - install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop - ''; - installServer = '' - install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/mindustry-server \ - --add-flags "-jar $out/share/mindustry-server.jar" - ''; - in -assert stdenv.lib.assertMsg (enableClient || enableServer) +assert lib.assertMsg (enableClient || enableServer) "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; stdenv.mkDerivation rec { - inherit pname version src postPatch; + inherit pname version unpackPhase patches; - nativeBuildInputs = [ gradle_6 makeWrapper ]; + postPatch = '' + # ensure the prebuilt shared objects don't accidentally get shipped + rm Arc/natives/natives-desktop/libs/libarc*.so + rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so + '' + cleanupMindustrySrc; + + buildInputs = lib.optionals enableClient [ + SDL2 + glew + alsaLib + ]; + nativeBuildInputs = [ + pkg-config + gradle_6 + makeWrapper + jdk + ] ++ lib.optionals enableClient [ + ant + copyDesktopItems + ]; + + desktopItems = lib.optional enableClient desktopItem; + + buildPhase = with lib; '' + export GRADLE_USER_HOME=$(mktemp -d) - buildPhase = with stdenv.lib; '' - ${preBuild} # point to offline repo - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle - ${optionalString enableClient buildClient} - ${optionalString enableServer buildServer} + sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle + sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle + + pushd Mindustry + '' + optionalString enableClient '' + gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} + gradle --offline --no-daemon sdlnatives -Pdynamic -Pbuildversion=${buildVersion} + patchelf ../Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \ + --add-needed ${glew.out}/lib/libGLEW.so \ + --add-needed ${SDL2}/lib/libSDL2.so + gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} + '' + optionalString enableServer '' + gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} ''; - installPhase = with stdenv.lib; '' - ${optionalString enableClient installClient} - ${optionalString enableServer installServer} + installPhase = with lib; '' + runHook preInstall + '' + optionalString enableClient '' + install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry \ + --add-flags "-jar $out/share/mindustry.jar" + install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png + '' + optionalString enableServer '' + install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \ + --add-flags "-jar $out/share/mindustry-server.jar" + '' + '' + runHook postInstall ''; meta = with lib; { @@ -133,14 +202,10 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "A sandbox tower defense game"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + maintainers = with maintainers; [ fgaz petabyteboy ]; + platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - # Problems with native libraries in aarch64: - # https://github.com/NixOS/nixpkgs/pull/107646 - # https://logs.nix.ci/?key=nixos/nixpkgs.107646&attempt_id=3032c060-72e9-4a76-8186-4739544397dd - broken = stdenv.isDarwin || - stdenv.isAarch64; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix new file mode 100644 index 00000000000..0278afc5e40 --- /dev/null +++ b/pkgs/games/soldat-unstable/default.nix @@ -0,0 +1,123 @@ +{ stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper +, SDL2, freetype, physfs, openal, gamenetworkingsockets +, xorg, autoPatchelfHook +}: + +let + base = stdenv.mkDerivation rec { + pname = "soldat-base"; + version = "unstable-2020-11-26"; + + src = fetchFromGitHub { + name = "base"; + owner = "Soldat"; + repo = "base"; + rev = "e5f9c35ec12562595b248a7a921dd3458b36b605"; + sha256 = "0qg0p2adb5v6di44iqczswldhypdqvn1nl96vxkfkxdg9i8x90w3"; + }; + + nativeBuildInputs = [ zip ]; + + buildPhase = '' + sh create_smod.sh + ''; + + installPhase = '' + install -Dm644 soldat.smod -t $out/share/soldat + install -Dm644 client/play-regular.ttf -t $out/share/soldat + ''; + + meta = with stdenv.lib; { + description = "Soldat's base game content"; + license = licenses.cc-by-40; + platforms = platforms.all; + inherit (src.meta) homepage; + }; + }; + +in + +stdenv.mkDerivation rec { + pname = "soldat-unstable"; + version = "2020-11-26"; + + src = fetchFromGitHub { + name = "soldat"; + owner = "Soldat"; + repo = "soldat"; + rev = "2280296ac56883f6a9cad4da48025af8ae7782e7"; + sha256 = "17i3nlhxm4x4zx00i00aivhxmagbnyizxnpwiqzg57bf23hrvdj3"; + }; + + nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ]; + + buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; + runtimeDependencies = [ xorg.libX11 ]; + + patches = [ + # fix an argument parsing issue which prevents + # us from passing nix store paths to soldat + (fetchpatch { + url = "https://github.com/sternenseemann/soldat/commit/9f7687430f5fe142c563b877d2206f5c9bbd5ca0.patch"; + sha256 = "0wsrazb36i7v4idg06jlzfhqwf56q9szzz7jp5cg4wsvcky3wajf"; + }) + ]; + + postPatch = '' + for f in client/Makefile server/Makefile; do + # fix unportable uname invocation + substituteInPlace "$f" --replace "uname -p" "uname -m" + done + ''; + + buildPhase = '' + mkdir -p client/build server/build + + # build .so from stb headers + pushd client/libs/stb + make + popd + + # build client + pushd client + make mode=release + popd + + # build server + pushd server + make mode=release + popd + ''; + + installPhase = '' + install -Dm644 client/libs/stb/libstb.so -t $out/lib + install -Dm755 client/build/soldat_* $out/bin/soldat + install -Dm755 server/build/soldatserver_* $out/bin/soldatserver + + # make sure soldat{,server} find their game archive, + # let them write their state and configuration files + # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless + # the user specifies otherwise. + for p in $out/bin/soldatserver $out/bin/soldat; do + configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" + + wrapProgram "$p" \ + --run "mkdir -p \"$configDir\"" \ + --add-flags "-fs_portable 0" \ + --add-flags "-fs_userpath \"$configDir\"" \ + --add-flags "-fs_basepath \"${base}/share/soldat\"" + done + ''; + + meta = with stdenv.lib; { + description = "Soldat is a unique 2D (side-view) multiplayer action game"; + license = [ licenses.mit base.meta.license ]; + inherit (src.meta) homepage; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.x86_64 ++ platforms.i686; + # portability currently mainly limited by fpc + # in nixpkgs which doesn't work on darwin, + # aarch64 and arm support should be possible: + # https://github.com/Soldat/soldat/issues/45 + }; +} diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/misc/emulators/pcem/default.nix new file mode 100644 index 00000000000..6e7e3bc6379 --- /dev/null +++ b/pkgs/misc/emulators/pcem/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config +, autoreconfHook, withNetworking ? true, withALSA ? true }: + +stdenv.mkDerivation rec { + pname = "pcem"; + version = "17"; + + src = fetchzip { + url = "https://pcem-emulator.co.uk/files/PCemV${version}Linux.tar.gz"; + stripRoot = false; + sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ wxGTK31 coreutils SDL2 openal ] + ++ lib.optional withALSA alsaLib; + + configureFlags = [ "--enable-release-build" ] + ++ lib.optional withNetworking "--enable-networking" + ++ lib.optional withALSA "--enable-alsa"; + + meta = with lib; { + description = "Emulator for IBM PC computers and clones"; + homepage = "https://pcem-emulator.co.uk/"; + license = licenses.gpl2Only; + maintainers = [ maintainers.terin ]; + platforms = platforms.linux ++ platforms.windows; + }; +} diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4b0d698905f..4ed6852c17e 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -47,7 +47,7 @@ mkDerivation { meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz nocent ]; + maintainers = with maintainers; [ abbradar neonfuz ilian ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index afa17282385..3a5abe18d75 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,32 +44,24 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.22"; - url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; + version = "6.0-rc4"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; inherit (stable) mono gecko32 gecko64; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - - # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163 - (pkgs.fetchpatch { - url = "https://bugs.winehq.org/attachment.cgi?id=68680"; - sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo="; - }) ]; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; + sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; owner = "wine-staging"; repo = "wine-staging"; - #rev = "v${version}"; # revert back to this statement on next release - # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162 - rev = "f257f37b92041fc718de04aa83ec3139b748ffa2"; + rev = "v${version}"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2b5d7f7caed..93e58516610 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -325,6 +325,18 @@ in rec { ''; }; + power-theme = mkDerivation { + pluginName = "power"; + rtpFilePath = "tmux-power.tmux"; + version = "unstable-2020-11-18"; + src = pkgs.fetchFromGitHub { + owner = "wfxr"; + repo = "tmux-power"; + rev = "aec44aa5e00cc39eb71c668b1d73823270058e7d"; + sha256 = "11nm8cylx10d565g17acy0bj12n6dcbxp71zca2bmg0j1dq859cm"; + }; + }; + prefix-highlight = mkDerivation { pluginName = "prefix-highlight"; version = "unstable-2020-03-26"; diff --git a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch index ca82e82123b..3d0324a692c 100644 --- a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch +++ b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch @@ -1,30 +1,45 @@ -From 3c6b7c0922370e9d0c1705706e7c47dcd234e6c8 Mon Sep 17 00:00:00 2001 +From 3d0ce353cf62efea11aa88f814aa23bf8c04acc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Wed, 30 Dec 2020 11:49:16 +0100 +Date: Mon, 11 Jan 2021 15:13:10 +0100 Subject: [PATCH] configs/rpi: allow for bigger kernels --- - include/configs/rpi.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + include/configs/rpi.h | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/rpi.h b/include/configs/rpi.h -index 834f1cd2..b63ee96f 100644 +index 834f1cd..10ab1e7 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h -@@ -163,10 +163,10 @@ - "fdt_high=" FDT_HIGH "\0" \ - "initrd_high=" INITRD_HIGH "\0" \ - "kernel_addr_r=0x00080000\0" \ -- "scriptaddr=0x02400000\0" \ -- "pxefile_addr_r=0x02500000\0" \ -- "fdt_addr_r=0x02600000\0" \ -- "ramdisk_addr_r=0x02700000\0" -+ "scriptaddr=0x02c00000\0" \ -+ "pxefile_addr_r=0x02d00000\0" \ -+ "fdt_addr_r=0x02e00000\0" \ -+ "ramdisk_addr_r=0x02f00000\0" - +@@ -153,20 +153,20 @@ + * more than ~700M away from the start of the kernel image but this number can + * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line + * parameter given to the kernel. So reserving memory from low to high +- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for +- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000. ++ * satisfies this constraint again. Reserving 1M at 0x02e00000-0x02f00000 for ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x02f00000. + * Even with the smallest possible CPU-GPU memory split of the CPU getting +- * only 64M, the remaining 25M starting at 0x02700000 should allow quite +- * large initrds before they start colliding with U-Boot. ++ * only 64M, the remaining 17M starting at 0x02f00000 should allow reasonably ++ * sized initrds before they start colliding with U-Boot. + */ + #define ENV_MEM_LAYOUT_SETTINGS \ + "fdt_high=" FDT_HIGH "\0" \ + "initrd_high=" INITRD_HIGH "\0" \ + "kernel_addr_r=0x00080000\0" \ +- "scriptaddr=0x02400000\0" \ +- "pxefile_addr_r=0x02500000\0" \ +- "fdt_addr_r=0x02600000\0" \ +- "ramdisk_addr_r=0x02700000\0" ++ "scriptaddr=0x02c00000\0" \ ++ "pxefile_addr_r=0x02d00000\0" \ ++ "fdt_addr_r=0x02e00000\0" \ ++ "ramdisk_addr_r=0x02f00000\0" + #if CONFIG_IS_ENABLED(CMD_MMC) - #define BOOT_TARGET_MMC(func) \ --- + #define BOOT_TARGET_MMC(func) \ +-- 2.29.2 + diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index b1e8e7f2b24..20d928d944d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.10"; + defaultVersion = "2021.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; + sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"; }; buildUBoot = { version ? null @@ -55,7 +55,10 @@ let dtc flex openssl - (buildPackages.python3.withPackages (p: [ p.libfdt ])) + (buildPackages.python3.withPackages (p: [ + p.libfdt + p.setuptools # for pkg_resources + ])) swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2ca2da67596..35abdcf5421 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-01-08"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "54dd731cf14c809ebcc9c21b41084a17c5411744"; - sha256 = "1j3jndx2cl7dxw7ilai7dxi1vkgjzh24k2vl43adai87gl6jqqs5"; + rev = "97ce2423b04745d5c7588385ddbd75be9ef846d4"; + sha256 = "1q55kd8xqxl43rvj08awyq32a0mrv4svm2932s6q73zb8022db4a"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -305,12 +305,12 @@ let brainfuck-vim = buildVimPluginFrom2Nix { pname = "brainfuck-vim"; - version = "2021-01-08"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "fruit-in"; repo = "brainfuck-vim"; - rev = "4e5344436f480d65d99c89d623e5564d71cdd0f7"; - sha256 = "1p5kyy6z2nrnxdvwnpcvbd1xk9r0pqr3hayz3p7c2zi30rj0fdx5"; + rev = "d58b673eaa3dbc58975e9b23c09eac57c3e1e4b5"; + sha256 = "178m0ada1a0gijdwikycszls41kzgx6ysbd2aavlkbnrvclrkfa9"; }; meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; @@ -341,12 +341,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-12-30"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "1d352606aa4f9cf3116514669533b314f6e800a0"; - sha256 = "16m7zpw5i2bjxj771856wahfk4y6rhk3qb0jifblma219gnqmhz4"; + rev = "289fe67f9a20a88b93b570671cf8a5d258fc7b69"; + sha256 = "17201r2nvy3jxf0f29ihqrln37xr4h3f2z20igjhajl3ajkg60h1"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -461,12 +461,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-04"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "1b88de2322b2f9adad4d5c1739289ed861afc8d0"; - sha256 = "1xcc2zdgkc72vvnl83c97cyx12mx93ryik9wlyw48clsi02kw6aq"; + rev = "e0a4cfa0fb856b31a6d16828ce3629b2901496f0"; + sha256 = "0vadrkk92vrw48h7clbasqacyfcjn63ziq33740mciwa7a3h5bfg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -483,6 +483,18 @@ let meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; + coc-lua = buildVimPluginFrom2Nix { + pname = "coc-lua"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-lua"; + rev = "ad83de5ef16299e026b7fce6a024c82b2b7110f5"; + sha256 = "0b56af3z04vvlkr67yg3bfj71qycyhrv895p1sbfamj483hs7ds6"; + }; + meta.homepage = "https://github.com/josa42/coc-lua/"; + }; + coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -509,24 +521,24 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8af3eaee714f2c390f2f8e83ea47b78d24eab8"; - sha256 = "1x088m180wk6b0gk1xdw8crmrhp7s05yshj8nigqyhafm589a7vf"; + rev = "891c73f0deb3777870aed67c6ea6e5e184bafe27"; + sha256 = "11wlsicv74vsxyr5l7q8r02h1wmf6zq3igxrp1anndv3j8mjbi09"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi-vim"; - version = "2020-07-25"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "08e26f4dc4bdb0cbc790474beb29a48e7a9c8ceb"; - sha256 = "1qwacymipshfvvg7ya7gsfz1r65q44qjjsgya6wm81n04q9rpxfx"; + rev = "cf62681a4962ce1873e4b2a5e0bf401dcd42890f"; + sha256 = "15j08qa7sklm0pilfn3ljgq75hrv8y9h8xzj8ibrafp29640gkfl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -594,12 +606,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-01-09"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "25dac52c4eb37bf28cc1b8fd6283b151db85e764"; - sha256 = "1ljzva5zy1d5d5yfvpf57rjpfzp194rkf98arslns8i0as30kbmd"; + rev = "d8eb3ba816d6bae9b741c23dee4d496e545a4ef8"; + sha256 = "1nndg6lbsgfp65vpqw5bpjj2qa944c2x5s38jfrf2lp68hk39z23"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -870,24 +882,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-01-08"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f7667ec03c4cdef1b4d9a95521d1ee5866f3f2de"; - sha256 = "19s3809kasiybv18q6q7c36bf43cq9ndq7z5zpqrxgg6kf3my2d8"; + rev = "d01c56ff3eab215c1485bd04d132b709f922de3e"; + sha256 = "0b2hmdkbi9d1273f8pylb87hxq2mws4s8g06rmy61ycbq60ldg4k"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-05"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "9582a7dc191f3569644092fb0d3b2ad7bf608bca"; - sha256 = "0kpnzzg1pigjrw8g58iajw8apb7dczapm7jwdh8q5ixhmh31xn6v"; + rev = "e470e3df3e94181c6e8a20e62df564beb8d7df36"; + sha256 = "17l0ykpib84lgq30dkfdk7s6gxb2dc20wg22z0pvf3slnyfdf8ra"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1112,12 +1124,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-01-08"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0901b1886208a32880b92f22bf8f38a17e95045a"; - sha256 = "0r66sjkgbbhgdalqnfyzy3ym3jiikyd10pi5236aqga75vysvk0s"; + rev = "4c5acd271591c4b5e5420ce05c2b20eb7beb08e3"; + sha256 = "1vy3n81y7f535adyplmy3pvvsgjdzrxcfqlzrwz62r4bspqqf42r"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1318,16 +1330,28 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-01-08"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "100764195f8cea2edf8a8c6a69a3cb707e35cf6d"; - sha256 = "099mk22287zjgc0sy0v9vsw8l9ssa2rr56jasxpd6yswppafdrs7"; + rev = "316c8ad965f7d23093bd36a792730f701b80fb2a"; + sha256 = "1l04kjrnafj8509nmz349ki6xm5vzry9dqikgw5gsykrwgf8cp3a"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; + fennel-vim = buildVimPluginFrom2Nix { + pname = "fennel.vim"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "bakpakin"; + repo = "fennel.vim"; + rev = "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89"; + sha256 = "1fvcn4q87d594nzxlj1597bmrixzlfqnl7k8f547skvvywx09kii"; + }; + meta.homepage = "https://github.com/bakpakin/fennel.vim/"; + }; + ferret = buildVimPluginFrom2Nix { pname = "ferret"; version = "2020-12-08"; @@ -1475,12 +1499,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-12-30"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "fb4a1610d830806311595ad5b314eed5ec6b1893"; - sha256 = "17a663rx6x7mmls3i8ix4njfqdvqsbcj5avhdk07y8icdyiwbrp0"; + rev = "52883ef368c97b013dad5c9afcf6cd9bdae9875a"; + sha256 = "06mw3y3idzsbr2kb74vlrwjds4pzgp1fknjbabdpw38y90ax0j8c"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2100,12 +2124,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-21"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; - sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; + rev = "8e013f32f524157bf14ccaa87d97be3d3a7201e2"; + sha256 = "0yl5r1dv91wzkgflh37fd52dinwsm4rcf4kfizn4xg5lbzdafkmn"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2148,12 +2172,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-01-09"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8742b6e466dff01657b1cd4187f2f25aa57d2916"; - sha256 = "00i0mx18apx48lhzmc4fik0mbqm3vsfdp4pbl2z8d0fnmldhqx75"; + rev = "823665c511d5727107a57e4f31205f92bb2c573e"; + sha256 = "1krfj35zmbf9gznsh4npwhjmy132svbrivsy007vpz798lir7i06"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2508,12 +2532,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-12-02"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7e458dafae64b7f14f8c2eaecb886b7a85b8f66d"; - sha256 = "00x6yx4y4m45p3silwz084scs1a602d4xazyr39lgc0ssv6d9jhv"; + rev = "18aee89508fb7eea2bbff824dd1c33bdf7158d75"; + sha256 = "1bq2m85kdlgak1df5gpslylq0x7fxf694gb2y18s33jxmpvnahxz"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2640,12 +2664,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-12-11"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "119b99d1662113a588734e3666213d246e50900d"; - sha256 = "1dci0a5hcpvx567vqns7csn7p24i2m2l3ra8jmcvwrhlk72kvgrf"; + rev = "7d2fb974a36b3c7773a90a749fcb92a40669e444"; + sha256 = "1vq4wkywidmjr2g8z9js5173b15lr6zawxb0z12fmvaiwxpbli4z"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2736,12 +2760,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-25"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; - sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; + rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc"; + sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2772,12 +2796,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-01-01"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "97f0ef219241ec8379feada8ab46c7da8c69f9ca"; - sha256 = "10q0fdib4mcbih13f7wknfs99wjqf1flhrj13qwlw0p5sswjz0z3"; + rev = "e971d2af33189bff941c9632aca51211dfca0869"; + sha256 = "09h2kacqbqazllajacpfnlysvwb1ikg5gmymci3hp39g488i3kx6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2832,24 +2856,24 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-09"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8c68dc78d00fc9b55312108d48c4191ec3851f6a"; - sha256 = "09mzkn7psfv4iaq3myi7mq5qymxz0jnisr0d0k927z64ca3vzjbq"; + rev = "844d6f9d7af961eb27f876dc0cae9fe0fab5a769"; + sha256 = "151s2n50zmvfgbb30h63cgzbbxi8vb5fagiyl4gr6vpfn6p64s4g"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-01-08"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "7f393053d303750868d17c8743c350a5503c3139"; - sha256 = "0r17l5g8fpx7bax3sriawj0f7pkzj33vjr27i5yxa5934gxawv0q"; + rev = "fae88180b573e935f4a0827eb096208a7c76b215"; + sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -2880,24 +2904,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-12-28"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "86944b51c0e0a8fed5a02ab44640b2b215cebe93"; - sha256 = "1mmpzhsj17rc88hfsn86y2w97a1mz3fjix9p61wnhq1sf0finkhr"; + rev = "361e20ecfa21c6bbc31436cf701ceb87e8e7bde7"; + sha256 = "01yd5i56k8c7kii3gnxh3654d5a8kdmad974yicxj0jzgvawncn4"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-01-08"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "00ea65199e316aec5934cc2666ec9738e410b711"; - sha256 = "1q37hd8cggx863d91ld9r4s51wld73pqgq93zwlg22i7qyl2v423"; + rev = "39968ca258c89b796fc9ce5f3643ca8781150dd8"; + sha256 = "0lcm37xrysypflyrblmbgn6sv8106mrjv9qg1rf4mn1sbdc7z4bp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3132,12 +3156,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2020-12-30"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "08c0eabcb1fdcc5b72f60c3a328ae8eeb7ad374e"; - sha256 = "1qn1cj9jiq33nldi5s7mrwxxi1y4wibygq3ii2a18x3v5xmw83zy"; + rev = "e9b81e2bb98e00e9f6ca2b6a698cc8452fe2943e"; + sha256 = "00j5gnx5jgrx7qmbxhrjsrdzp9krc5c7zij9a25jhz3l2j98xpdg"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3782,12 +3806,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-01-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "978e1fe761de8be1f4d6c8469deba74a3cc0872f"; - sha256 = "0y9bd1y23z9w7ibn761yx5wq02liazv5dgxfqyy6xfxr17zvd514"; + rev = "c7e7d5e565eca1c8a39a567a7a26cdc2512c1c7e"; + sha256 = "0sqsh8vca1yvj253as4ky0l925czf8584k7zcbcimkjb35cp4d64"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3830,12 +3854,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-01-09"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "de80a9837cd1d207981c1f6dbf504436f8bfee13"; - sha256 = "1zasdfn982akcgyyxvwwyp9vvh4p7kyi1gfkc57rj6jqkygwicsm"; + rev = "57012550977679925176819345adc4d0dce85a00"; + sha256 = "002c120ppz8g6xiqckq61nbr7zcfdh5n75hhzbcn0xqlagmi9p6y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3878,12 +3902,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-08-15"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "161ff743cb031eff376780108b018735d92160b0"; - sha256 = "105a1a9kahfdicw1gkdhc88w41pyhmhv6yw2kh1flkaikzqlxbc8"; + rev = "bfd408a3210c305aaf51e6ce31ac99497e6ab1ec"; + sha256 = "1kh12d0dg932j9drby27fhg8vbjm8rwih33rm4yjba0316i8wcyv"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -4323,12 +4347,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-01-08"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "fdfc11f53adce1bd6644a5dac6002106ef08db95"; - sha256 = "1bas31zkrkz6pxsxnh5s4kph861z85gxg0fik0psd698yg9zzgc1"; + rev = "0ca9576331ba845e7bf29f5e092f5da04f4f3580"; + sha256 = "11ai8j7l1v6pviijvrayaw4wcs5720a0qpk35x99ir3dq7pflm54"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4563,12 +4587,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-01-08"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "284ef9a0b7776ab34d387fb403d500371a65cbda"; - sha256 = "06jc831kcbpdh4k3890sh2srisbgljr0azx8g1g9fq0328qqnpbs"; + rev = "07cac9de58ad1f1ce287e47ac41e7eb7bb4db6a3"; + sha256 = "186d3mncgw6g4hrl6qv6wxnpy5mk5xkjpr0b03ql6z52iybcmxff"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4597,6 +4621,18 @@ let meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; + vim-closer = buildVimPluginFrom2Nix { + pname = "vim-closer"; + version = "2020-10-24"; + src = fetchFromGitHub { + owner = "rstacruz"; + repo = "vim-closer"; + rev = "c61667d27280df171a285b1274dd3cf04cbf78d4"; + sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn"; + }; + meta.homepage = "https://github.com/rstacruz/vim-closer/"; + }; + vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; version = "2020-10-09"; @@ -5139,12 +5175,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-01-09"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "428a59e4ec5061cae34dacd865bd831ddee7a446"; - sha256 = "0jfdbaxjizb127s8rhx2ilhz48cg5xahv77rhm9sa4v9lky8zgrr"; + rev = "37c999def265ebf5463a925decc6604481f3c598"; + sha256 = "1ix3q36hhb5k7y1c4r5qzmr8gyxk6amb3zk88bs85j36kn56mz4j"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5307,12 +5343,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-01-09"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9ac9a4337e4e71ca434f97a7678f301eca7266f7"; - sha256 = "06lzyakavb89k7pwhicqd2zc5rd12cjd6p8pb4m3xzw9kff6gzy1"; + rev = "d68fc4d71d7c254c8fbd666a470b2d92c8a6d610"; + sha256 = "04py4c52hlb8adkgywkn4hnibrsiczvmmf8b82wfr2sa1k5b9hbx"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5560,12 +5596,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-01-07"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "f8d01ab7417be5e3878678acd46e4d17e8d8d9b6"; - sha256 = "1vnhvnxw7a4v583pw80lqcc9bb9lmcfzm1vhnskxrfxhz01r9ina"; + rev = "19bfdcaafcc15b2d891c6c523c4ce80dfbba965a"; + sha256 = "0c586j1icllyl0y54dayn4204w0rvfvv9srz51rk6k1n7rghr72n"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5753,12 +5789,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-11-07"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6"; - sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm"; + rev = "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41"; + sha256 = "16d76jvfb1cq591i06fnmgzv0q16g89zz7cmvgvj24vap2wgkbp8"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5945,12 +5981,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-01-09"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "678c0592382c7073505650d30e71e9f9cbc3353c"; - sha256 = "0s7yhgajjqavj0lfzwassrk0n83dckf41bca54p5833ds85vwnsz"; + rev = "3bca7e8c8a794fde38075e7df9d14c286d055a84"; + sha256 = "1x9rb34a9542rn2dx2kaz4iq83swpq56144h81pr8l080r6vi2l6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6030,12 +6066,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-12-09"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "24407e21e0a977e67774f70e0065dd3fea8d7595"; - sha256 = "03bmlvvfsyr5ccfjfrnl1r5wzkvarmdbm735abal02pifni05k1r"; + rev = "c74467ea130f99bc97697f91b0e5369f958e6333"; + sha256 = "0w03l0iri8wsjm3fz3ysqqhl38gkfqci4b3dfkbshy2civpg2g7j"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6162,12 +6198,12 @@ let vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { pname = "vim-nerdtree-syntax-highlight"; - version = "2020-07-19"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "tiagofumo"; repo = "vim-nerdtree-syntax-highlight"; - rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; - sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + rev = "5178ee4d7f4e7761187df30bb709f703d91df18a"; + sha256 = "0i690a9sd3a9193mdm150q5yx43mihpzkm0k5glllsmnwpngrq1a"; }; meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; @@ -6246,12 +6282,12 @@ let vim-numbertoggle = buildVimPluginFrom2Nix { pname = "vim-numbertoggle"; - version = "2020-12-30"; + version = "2021-01-12"; src = fetchFromGitHub { owner = "jeffkreeftmeijer"; repo = "vim-numbertoggle"; - rev = "4e4fda05db27e698c8ad4dff7c17bec54bb10a0c"; - sha256 = "0crrgdz5wyriylj28sn0sil732wfnhnz35zaydqgp2csqi9s9xcb"; + rev = "df9b1fe616507340718716204ba7f434125bdf7a"; + sha256 = "02zgzkwv2fk4zyg6agvski054nwkrm1m9dw0jpva57ksbf8rvqrg"; }; meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; @@ -6270,12 +6306,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-01-01"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "2a18135901b312e5159f30e26786d657919281a4"; - sha256 = "00xyj3bzd76cdc60wiw42b4d35nlxshr9xh4n4c6jf1wavm1clfj"; + rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd"; + sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -6354,12 +6390,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-01-05"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "755561cd3e4532009dc75c997f8cb0e5f50c9ed7"; - sha256 = "18vgmmnds5zfnn1v285g4s0yq7zpj9nwkdm1l5rcnx986rdrbgyw"; + rev = "ffac2ecab211469a1f9a4d17d42bc543214112f5"; + sha256 = "08vkalypqcrj4p2znx2gih7b1i87pk2ygybvl8a7hby13gwrm8v1"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -6654,12 +6690,12 @@ let vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-01-09"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "d2cfbfe7b6a810f0be4de1f024a75ce6e9d9a260"; - sha256 = "049fimc3mvn6c6cfwg8i1kzjn81arx60gyid39wsi2h0gb1sxv12"; + rev = "cee73ec40ee21083c3fc1e1fede2c288fa46c2c3"; + sha256 = "0mbsslhwjnjg8l39pbqj4zlirqvysj21xq01fb6dnld7rl7qrxyg"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -7038,24 +7074,24 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-01-06"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "51168d7dc184c8234e692cd66e89bc7f95e35d72"; - sha256 = "1psxnv6y690nx6g3msyxw8gm6z16gxdn92rlngpjirgs513kigin"; + rev = "a5b5dd46e9c2b796599ff4530e1c8d29fdd77945"; + sha256 = "05k6irv1p8kglznz9pfdzlb3qplf6y1k4x9qr3zcidv79hldg0b5"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-01-07"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "d43498c949a3acf297fd74397a3bc165033f2028"; - sha256 = "1q0b3xsr1br172n6mj5bfza2lcacznlnwk2sgasxz8bkdq1rk6mi"; + rev = "29d37483c4a8dad8baf0684f73541f6364dd3734"; + sha256 = "0dav4125sjrbj5mg0d76ivsadz9mh8skzaixzifxs2cq2zl3n0s1"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7819,12 +7855,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-01-09"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "5303de81954b854161dffb76da37f8508c9c1476"; - sha256 = "0xkgirbb2rw4b0h4qdv8f2lsvadqcyqrclxd8a3i8r2dc4xdgp3p"; + rev = "52eff3265181bbbe5338818dc5bc196e234cea45"; + sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7832,12 +7868,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-08"; + version = "2021-01-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7806f0f5e1615d4ce9cef6b7edfb6ec6b1b7e666"; - sha256 = "0j1b1lf8y58jqp4r9vjw266nxlf38gz509qzaxp3n0sb4svg93pw"; + rev = "aebcaddf2ede37e04812a2804b0d951dacdfa150"; + sha256 = "0cf94yv9zmksnvsv4d8xyqk48d4v3k7zs1cb01g7l4m34cx0gv99"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8000,12 +8036,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-01-02"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9039d2421b8fe4c70b743d2c28df935290026dca"; - sha256 = "1yv46b041340jq4s0471w5l1ryikkczp09rsnxh0piyp7fqmb0qh"; + rev = "ac6057f57e0d96ee744635e35cacf2f2d3037d95"; + sha256 = "037vmmnhir217ais2bnl6lskbpdh2wfmjq6qmjvrdp2ylwscm81d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 48c86ed5b48..c914ac62b83 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -395,6 +395,16 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ beancount ]; }); + vim-closer = super.vim-closer.overrideAttrs(old: { + patches = [ + # Fix duplicate tag in doc + (fetchpatch { + url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; + sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; + }) + ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5b5e13a362a..c61fd8ef3a1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim ayu-theme/ayu-vim +bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 benizi/vim-automkdir @@ -205,6 +206,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug +josa42/coc-lua josa42/vim-lightline-coc joshdick/onedark.vim jpalardy/vim-slime@main @@ -475,6 +477,7 @@ roxma/nvim-yarp roxma/vim-tmux-clipboard RRethy/vim-hexokinase RRethy/vim-illuminate +rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 180dddab98e..e2f01531c50 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ let }; }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "copy-relative-path"; + publisher = "alexdima"; + version = "0.0.2"; + sha256 = "06g601n9d6wyyiz659w60phgm011gn9jj5fy0gf5wpi2bljk3vcn"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; @@ -87,6 +99,23 @@ let }; }; + CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; + description = "A customizable extension for colorizing matching brackets"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; + homepage = "https://github.com/CoenraadS/BracketPair"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "bracket-pair-colorizer"; + publisher = "CoenraadS"; + version = "1.0.61"; + sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652"; + }; + }; + coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "bracket-pair-colorizer-2"; @@ -119,6 +148,57 @@ let meta = { license = stdenv.lib.licenses.mit; }; }; + donjayamanne.githistory = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; + description = "View git log, file history, compare branches or commits"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory"; + homepage = "https://github.com/DonJayamanne/gitHistoryVSCode/"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "githistory"; + publisher = "donjayamanne"; + version = "0.6.14"; + sha256 = "11x116hzqnhgbryp2kqpki1z5mlnwxb0ly9r1513m5vgbisrsn0i"; + }; + }; + + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; + description = "Code formatter using prettier"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; + homepage = "https://github.com/prettier/prettier-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "5.8.0"; + sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7"; + }; + }; + + file-icons.file-icons = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; + description = "File-specific icons in VSCode for improved visual grepping."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=file-icons.file-icons"; + homepage = "https://github.com/file-icons/vscode"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "file-icons"; + publisher = "file-icons"; + version = "1.0.28"; + sha256 = "1lyx0l42xhi2f3rdnjddc3mw7m913kjnchawi98i6vqsx3dv7091"; + }; + }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "auto-close-tag"; @@ -143,6 +223,39 @@ let }; }; + freebroccolo.reasonml = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; + description = "Reason support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=freebroccolo.reasonml"; + homepage = "https://github.com/reasonml-editor/vscode-reasonml"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "reasonml"; + publisher = "freebroccolo"; + version = "1.0.38"; + sha256 = "1nay6qs9vcxd85ra4bv93gg3aqg3r2wmcnqmcsy9n8pg1ds1vngd"; + }; + }; + + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "1.1.5"; + sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2"; + }; + meta = with lib; { + description = "GitHub theme for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = licenses.mit; + maintainers = with maintainers; [ hugolgst ]; + }; + }; + golang.Go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; @@ -192,15 +305,20 @@ let }; jnoortheen.nix-ide = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; + description = "Nix language support with formatting and error report"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; + homepage = "https://github.com/jnoortheen/vscode-nix-ide"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; version = "0.1.7"; sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; }; - meta = { - license = stdenv.lib.licenses.mit; - }; }; justusadam.language-haskell = buildVscodeMarketplaceExtension { @@ -297,6 +415,23 @@ let matklad.rust-analyzer = callPackage ./rust-analyzer {}; + ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; + description = "Official OCaml Support from OCamlLabs"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; + homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; + license = licenses.isc; + maintainers = with maintainers; [ superherointj ]; + }; + mktplcRef = { + name = "ocaml-platform"; + publisher = "ocamllabs"; + version = "1.5.1"; + sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + }; + }; + pkief.material-icon-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index ce4b14910b6..00ae9868673 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation { "LD8=${stdenv.cc.targetPrefix}ld" "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy" "OBJDUMP8=${stdenv.cc.targetPrefix}objdump" - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}ld" - "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - "OBJDUMP=${stdenv.cc.targetPrefix}objdump" + "CC7=${stdenv.cc.targetPrefix}cc" + "LD7=${stdenv.cc.targetPrefix}ld" + "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" + "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" ] ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9bad2280a3a..c86ec88ec69 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -419,7 +419,7 @@ let MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. - SECURITY_LOCKDOWN_LSM = no; + SECURITY_LOCKDOWN_LSM = option no; } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { # Detect buffer overflows on the stack diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 26c559ea908..6a2aec809a1 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -61,6 +61,12 @@ sub runConfig { # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)"). if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) { $choices{$2} = $1; + } else { + # The list of choices has ended without us being + # asked. This happens for options where only one value + # is valid, for instance. The results can foul up + # later options, so forget about it. + %choices = (); } $line = ""; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 91a6b42ac41..83d01bbb6b6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,27 +1,27 @@ { "4.14": { "extra": ".a", - "name": "linux-hardened-4.14.214.a.patch", - "sha256": "14m075fnbzlshrz09vpyk9v9qbki896caj8f49am2z8dmm5hnr6b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.214.a/linux-hardened-4.14.214.a.patch" + "name": "linux-hardened-4.14.215.a.patch", + "sha256": "1bk00y0cm05pzsshf1kmbxwcizi0lnq6ss1ig2bhxzgv2rxzj8cz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.215.a/linux-hardened-4.14.215.a.patch" }, "4.19": { "extra": ".a", - "name": "linux-hardened-4.19.166.a.patch", - "sha256": "0wkyd8k68qy378vj3937dk0valqb4sgdz5fg3107bjcgv7a4lvis", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.166.a/linux-hardened-4.19.166.a.patch" + "name": "linux-hardened-4.19.167.a.patch", + "sha256": "1ijdlkh1ad803i9dds46w2457jwigzlil9v37x793v4mx0rqb8ag", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.167.a/linux-hardened-4.19.167.a.patch" }, "5.10": { "extra": ".a", - "name": "linux-hardened-5.10.6.a.patch", - "sha256": "18ryh9zhrv5mmg876wss8k5fx8abm7ay0qpanvzmf5bjw7dc6qkq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.6.a/linux-hardened-5.10.6.a.patch" + "name": "linux-hardened-5.10.7.a.patch", + "sha256": "1b5djibfdqs0zhidh87hz9fhnvxyjxnz7lys0ks3a9a7ha5mina4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.7.a/linux-hardened-5.10.7.a.patch" }, "5.4": { "extra": ".a", - "name": "linux-hardened-5.4.88.a.patch", - "sha256": "0fz44izfmcsj205l7hjmkp78f5isy96fcjsz2bvrpb4x3h98bm5i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.88.a/linux-hardened-5.4.88.a.patch" + "name": "linux-hardened-5.4.89.a.patch", + "sha256": "1rbk8j8f31j8jjb7p29q3sv538jjlrc9mgxrac4pga11dmxzgahk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.89.a/linux-hardened-5.4.89.a.patch" }, "5.9": { "extra": "", diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fc876e80353..0f1b26eb889 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.214"; + version = "4.14.215"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07ir4yw7s5c6yb3gjbgjvcqqdgpbsjxrvapgh6zs22ffd8hrchpm"; + sha256 = "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 48c2050842b..3012eca87a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.166"; + version = "4.19.167"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03l86ykdjs5wa0n4wknpgy9dv2r6l92qfsyak373jkhs684z53mr"; + sha256 = "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6ff11414fce..ae832fe58aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.250"; + version = "4.4.251"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12m14j8654rawj2znkyhvcnwnf53x10zlghxd0mpl8dfzwvn2f5b"; + sha256 = "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e634716d0af..fea6a7c7102 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.250"; + version = "4.9.251"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15vizxd2i2311skjank406ny3bc30c5rz2p9jvh5xz1yv12vzgcy"; + sha256 = "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 2e82728107c..f9a74dec425 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10.6"; + version = "5.10.7"; # 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 = "02v91afra3pcwfws74wxdsm8pfc57vws659b7j6jmsxm3hnd0rvp"; + sha256 = "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a81d38b1527..f30abeb6b90 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.88"; + version = "5.4.89"; # 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 = "1ci432xanm7glgg05012kh43pfi4k771kzih0816y5674v0hg02b"; + sha256 = "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6cf74a504a1..c18d75b93f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.11-rc2"; + version = "5.11-rc3"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "092jgmzqfpylwbwhv7j8hy5y0ai14b6wm7p7vw6pxj7alixyynq0"; + sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a1a69000710..6b1568013b9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -105,14 +105,4 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; - - # https://lkml.org/lkml/2020/12/18/461 - wireless_syntax_error = rec { - name = "wireless-syntax_error"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://lkml.org/lkml/diff/2020/12/18/461/1"; - sha256 = "11rnw9z7311crsx37sk68b71q51cni70lzf40ildqjnnn71m3q58"; - }; - }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 193aa548021..9a3daa3d270 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,7 @@ nvidia_x11: sha256: { stdenv +, lib , fetchFromGitHub , m4 , libtirpc diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 5886a2ae73a..677c50010a3 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,24 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dex"; - version = "2.23.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8"; + sha256 = "0n66nm91qcmm00mz8f8x39xqr3y05qxk34fvka53s6xax1gxvxxi"; }; - goPackagePath = "github.com/dexidp/dex"; + vendorSha256 = "1k87q3ic02n2b632y3lmnclac1iaidmsl3f9py61myi5r02p03lp"; subPackages = [ "cmd/dex" ]; buildFlagsArray = [ - "-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}" + "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9b44d199d40..01c0175228c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.1.0"; + version = "2021.1.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -11,7 +11,7 @@ "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; - "advantage_air" = ps: with ps; [ advantage_air ]; + "advantage_air" = ps: with ps; [ advantage-air ]; "aftership" = ps: with ps; [ pyaftership ]; "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; @@ -247,7 +247,7 @@ "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 - "fido" = ps: with ps; [ ]; # missing inputs: pyfido + "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -283,7 +283,7 @@ "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius "frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi - "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip + "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 @@ -367,7 +367,7 @@ "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti - "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser + "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink @@ -379,7 +379,7 @@ "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors pillow ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; - "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib + "imap" = ps: with ps; [ aioimaplib ]; "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client "influxdb" = ps: with ps; [ influxdb-client influxdb ]; @@ -388,7 +388,7 @@ "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon + "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; @@ -413,12 +413,12 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef + "kef" = ps: with ps; [ aiokef getmac ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ aionotify evdev ]; - "kira" = ps: with ps; [ ]; # missing inputs: pykira + "kira" = ps: with ps; [ pykira ]; "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client - "knx" = ps: with ps; [ ]; # missing inputs: xknx + "knx" = ps: with ps; [ xknx ]; "kodi" = ps: with ps; [ ]; # missing inputs: pykodi "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky @@ -428,7 +428,7 @@ "lannouncer" = ps: with ps; [ ]; "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches - "lcn" = ps: with ps; [ ]; # missing inputs: pypck + "lcn" = ps: with ps; [ pypck ]; "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 @@ -459,7 +459,7 @@ "luci" = ps: with ps; [ openwrt-luci-rpc ]; "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy - "lutron" = ps: with ps; [ ]; # missing inputs: pylutron + "lutron" = ps: with ps; [ pylutron ]; "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides @@ -519,7 +519,7 @@ "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi - "myq" = ps: with ps; [ ]; # missing inputs: pymyq + "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns @@ -590,7 +590,7 @@ "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv "openweathermap" = ps: with ps; [ pyowm ]; - "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense + "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru @@ -615,7 +615,7 @@ "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ ]; # missing inputs: icmplib + "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; @@ -625,7 +625,7 @@ "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint - "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense + "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw @@ -827,7 +827,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow tensorflow-build_2 ]; # missing inputs: pycocotools tf-models-official + "tensorflow" = ps: with ps; [ numpy pillow tensorflow ]; # missing inputs: pycocotools tf-models-official "tesla" = ps: with ps; [ teslajsonpy ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -841,7 +841,7 @@ "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; - "tmb" = ps: with ps; [ ]; # missing inputs: tmb + "tmb" = ps: with ps; [ tmb ]; "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 @@ -875,7 +875,7 @@ "uk_transport" = ps: with ps; [ ]; "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; - "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled + "unifiled" = ps: with ps; [ unifiled ]; "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ connect-box ]; @@ -894,7 +894,7 @@ "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch - "vera" = ps: with ps; [ ]; # missing inputs: pyvera + "vera" = ps: with ps; [ pyvera ]; "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; @@ -915,7 +915,7 @@ "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync "water_heater" = ps: with ps; [ ]; - "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace + "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; @@ -942,7 +942,7 @@ "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi - "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma + "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4f9698c536f..2275f8c14b5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.0"; + hassVersion = "2021.1.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -81,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "14njb2j16h536xq5df4zpna874fxjcd6fqr881y6mq081f00i0r0"; + sha256 = "1linjv1hryqsh8y1rql1i95b4lz4h8siw847gm78m1z8niacz7ss"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 84adea1f4dc..49097fe2bfa 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -12,19 +12,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' - # install darkhttpd - install -Dm755 "darkhttpd" "$out/bin/darkhttpd" - - # install license - install -d "$out/share/licenses/darkhttpd" - head -n 18 darkhttpd.c > "$out/share/licenses/darkhttpd/LICENSE" + install -Dm555 -t $out/bin darkhttpd + install -Dm444 -t $out/share/doc/${pname} README + head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE ''; meta = with lib; { description = "Small and secure static webserver"; - homepage = "https://unix4lyfe.org/darkhttpd/"; - license = licenses.bsd3; + homepage = "https://unix4lyfe.org/darkhttpd/"; + license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 31417989c44..807f241fa3e 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, python3, fetchFromGitHub, nixosTests }: let python = python3.override { @@ -14,14 +14,14 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; + sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh"; }; nativeBuildInputs = [ @@ -37,19 +37,9 @@ in with python.pkgs; buildPythonApplication rec { sqlalchemy ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest - ''; - - patches = [ - # Use poetry-core instead of poetry. Fixed in 1.2.3 - (fetchpatch { - url = "https://github.com/supakeen/pinnwand/commit/38ff5729c59abb97e4b416d3ca66466528b0eac7.patch"; - sha256 = "F3cZe29z/7glmS3KWzcfmZnhYmC0LrLLS0zHk7WS2rQ="; - }) - ]; + __darwinAllowLocalNetworking = true; passthru.tests = nixosTests.pinnwand; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 90f7d6b49f5..8d44f8160d0 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "steck"; - version = "0.6.0"; + version = "0.7.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; + sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1"; }; propagatedBuildInputs = with python3Packages; [ @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { toml ]; + # tests are not in pypi package + doCheck = false; + passthru.tests = nixosTests.pinnwand; meta = with lib; { diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 466f07052b8..bbb40844ae5 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -1,17 +1,33 @@ -{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }: +{ autoreconfHook +, fetchFromGitHub +, gensio +, lib +, libyaml +, nix-update-script +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; + sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; }; - buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ gensio libyaml ]; meta = with lib; { description = "Serial to network connection server"; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 6b83df2496c..a2a9c210a35 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -44,6 +44,7 @@ perlPackages.buildPerlPackage rec { perlPackages.LogLog4perl perlPackages.LWP perlPackages.NetHTTP + perlPackages.NetHTTPSNB perlPackages.ProcBackground perlPackages.SubName perlPackages.TemplateToolkit diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 90c11084a7c..562b059015f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests -, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl +, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl +, libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support , withStorageMroonga ? true, kytea, msgpack, zeromq , withStorageRocks ? true -, withStorageToku ? true }: with stdenv.lib; @@ -23,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.15"; + version = "10.5.8"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "0cdfzr768cb7n9ag9gqahr8c6igfn513md67xn4rf98ajmnxg0r7"; + sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; name = "mariadb-${version}.tar.gz"; }; @@ -38,11 +37,10 @@ common = rec { # attributes common to both builds ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ - ncurses openssl zlib pcre libiconv curl + ncurses openssl zlib pcre2 libiconv curl ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] - ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ] - ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ]; + ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -174,6 +172,7 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" + "-DWITHOUT_TOKUDB=1" ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ "-DWITH_NUMA=ON" ] ++ optional (!withStorageMroonga) [ @@ -182,13 +181,12 @@ server = stdenv.mkDerivation (common // { "-DWITHOUT_ROCKSDB=1" ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [ "-DWITH_ROCKSDB_JEMALLOC=ON" - ] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [ - "-DWITHOUT_TOKUDB=1" - ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ - "-DWITH_JEMALLOC=static" - ] ++ optional stdenv.hostPlatform.isDarwin [ + ] ++ optional (!stdenv.hostPlatform.isDarwin) [ + "-DWITH_JEMALLOC=yes" + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" + "-DWITHOUT_PLUGIN_S3=1" ]; preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' @@ -198,7 +196,6 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} - rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 299302b27de..519ef64bca8 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,27 +1,33 @@ { lib, stdenv, fetchurl, bison, cmake, pkgconfig -, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.17"; + version = "8.0.22"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + sha256 = "9fd85bb243940ef8234d21384ef421a0962fd4d13406fc1420efa902115ce17a"; }; patches = [ ./abi-check.patch - ./libutils.patch ]; nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + ''; + buildInputs = [ boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch deleted file mode 100644 index fa1a35e12f2..00000000000 --- a/pkgs/servers/sql/mysql/libutils.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) -- COMMAND /usr/bin/libtool -static -o $ -+ COMMAND libtool -static -o $ diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index b56e430d995..bb9944ea377 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,21 +1,27 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }: with python3Packages; -buildPythonApplication rec { +toPythonModule (buildPythonApplication rec { pname = "searx"; - version = "0.17.0"; + version = "0.18.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { - owner = "asciimoo"; + owner = "searx"; repo = "searx"; rev = "v${version}"; - sha256 = "0pznz3wsaikl8khmzqvj05kzh5y07hjw8gqhy6x0lz1b00cn5af4"; + sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn"; }; postPatch = '' sed -i 's/==.*$//' requirements.txt + # skip failing test + sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py + ''; + + preBuild = '' + export SEARX_DEBUG="true"; ''; propagatedBuildInputs = [ @@ -30,14 +36,18 @@ buildPythonApplication rec { unittest2 zope_testrunner selenium ]; - preCheck = '' - rm tests/test_robot.py # A variable that is imported is commented out + postInstall = '' + # Create a symlink for easier access to static data + mkdir -p $out/share + ln -s ../${python3.sitePackages}/searx/static $out/share/ ''; + passthru.tests = { inherit (nixosTests) searx; }; + meta = with lib; { - homepage = "https://github.com/asciimoo/searx"; + homepage = "https://github.com/searx/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; }; -} +}) diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix new file mode 100644 index 00000000000..a1d8e9c0061 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, pkgs +, lib +, fetchurl +, nodejs +, runtimeShell +}: + +let + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + whitebophir = lib.head (lib.attrValues nodePackages); + + combined = whitebophir.override { + postInstall = '' + out_whitebophir=$out/lib/node_modules/whitebophir + + mkdir $out/bin + cat < $out/bin/whitebophir + #!${runtimeShell} + exec ${nodejs}/bin/node $out_whitebophir/server/server.js + EOF + chmod +x $out/bin/whitebophir + ''; + + meta = with lib; { + description = "Online collaborative whiteboard that is simple, free, easy to use and to deploy"; + license = licenses.agpl3; + homepage = "https://github.com/lovasoa/whitebophir"; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; + }; +in + combined diff --git a/pkgs/servers/web-apps/whitebophir/generate.sh b/pkgs/servers/web-apps/whitebophir/generate.sh new file mode 100755 index 00000000000..825def892fc --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +set -euo pipefail + +node2nix \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix new file mode 100644 index 00000000000..78d4b9ccd77 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -0,0 +1,1495 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@financial-times/polyfill-useragent-normaliser-1.9.0" = { + name = "_at_financial-times_slash_polyfill-useragent-normaliser"; + packageName = "@financial-times/polyfill-useragent-normaliser"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.9.0.tgz"; + sha512 = "jrVQ42tT1RrWyR/hkJlro2HhHZMPGXknKfJyZabe0CYj1c1KIqdS1JhhXEOt0T9ntaRCYq56y2/hAMM6LOU73g=="; + }; + }; + "@financial-times/useragent_parser-1.5.1" = { + name = "_at_financial-times_slash_useragent_parser"; + packageName = "@financial-times/useragent_parser"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.5.1.tgz"; + sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ=="; + }; + }; + "@formatjs/ecma402-abstract-1.5.0" = { + name = "_at_formatjs_slash_ecma402-abstract"; + packageName = "@formatjs/ecma402-abstract"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz"; + sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q=="; + }; + }; + "@formatjs/intl-datetimeformat-3.2.2" = { + name = "_at_formatjs_slash_intl-datetimeformat"; + packageName = "@formatjs/intl-datetimeformat"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz"; + sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA=="; + }; + }; + "@formatjs/intl-displaynames-4.0.3" = { + name = "_at_formatjs_slash_intl-displaynames"; + packageName = "@formatjs/intl-displaynames"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz"; + sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg=="; + }; + }; + "@formatjs/intl-getcanonicallocales-1.5.3" = { + name = "_at_formatjs_slash_intl-getcanonicallocales"; + packageName = "@formatjs/intl-getcanonicallocales"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.3.tgz"; + sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA=="; + }; + }; + "@formatjs/intl-listformat-5.0.3" = { + name = "_at_formatjs_slash_intl-listformat"; + packageName = "@formatjs/intl-listformat"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz"; + sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g=="; + }; + }; + "@formatjs/intl-locale-2.4.12" = { + name = "_at_formatjs_slash_intl-locale"; + packageName = "@formatjs/intl-locale"; + version = "2.4.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz"; + sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw=="; + }; + }; + "@formatjs/intl-numberformat-6.1.2" = { + name = "_at_formatjs_slash_intl-numberformat"; + packageName = "@formatjs/intl-numberformat"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz"; + sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g=="; + }; + }; + "@formatjs/intl-pluralrules-4.0.2" = { + name = "_at_formatjs_slash_intl-pluralrules"; + packageName = "@formatjs/intl-pluralrules"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz"; + sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q=="; + }; + }; + "@formatjs/intl-relativetimeformat-8.0.2" = { + name = "_at_formatjs_slash_intl-relativetimeformat"; + packageName = "@formatjs/intl-relativetimeformat"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz"; + sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw=="; + }; + }; + "@juggle/resize-observer-3.2.0" = { + name = "_at_juggle_slash_resize-observer"; + packageName = "@juggle/resize-observer"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.2.0.tgz"; + sha512 = "fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg=="; + }; + }; + "@types/component-emitter-1.2.10" = { + name = "_at_types_slash_component-emitter"; + packageName = "@types/component-emitter"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; + sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + }; + }; + "@types/cookie-0.4.0" = { + name = "_at_types_slash_cookie"; + packageName = "@types/cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"; + sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + }; + }; + "@types/cors-2.8.9" = { + name = "_at_types_slash_cors"; + packageName = "@types/cors"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz"; + sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="; + }; + }; + "@types/node-14.14.20" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; + sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + }; + }; + "@webcomponents/template-1.4.4" = { + name = "_at_webcomponents_slash_template"; + packageName = "@webcomponents/template"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz"; + sha512 = "QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q=="; + }; + }; + "Base64-1.1.0" = { + name = "Base64"; + packageName = "Base64"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/Base64/-/Base64-1.1.0.tgz"; + sha512 = "qeacf8dvGpf+XAT27ESHMh7z84uRzj/ua2pQdJg483m3bEXv/kVFtDnMgvf70BQGqzbZhR9t6BmASzKvqfJf3Q=="; + }; + }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; + "accept-language-parser-1.5.0" = { + name = "accept-language-parser"; + packageName = "accept-language-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/accept-language-parser/-/accept-language-parser-1.5.0.tgz"; + sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791"; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "audio-context-polyfill-1.0.0" = { + name = "audio-context-polyfill"; + packageName = "audio-context-polyfill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/audio-context-polyfill/-/audio-context-polyfill-1.0.0.tgz"; + sha1 = "4b728faf0a19555194d4fbd05582f833fdcd137b"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base64-arraybuffer-0.1.4" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; + sha1 = "9818c79e059b1355f97e0428a017c838e90ba812"; + }; + }; + "base64id-2.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"; + sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "cldr-core-38.0.0" = { + name = "cldr-core"; + packageName = "cldr-core"; + version = "38.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.0.0.tgz"; + sha512 = "WkjA4zo5rLT/BWTZAxHJ0lJXwI33gCYucEz1+CpoI8Wu+rr5IrC57wyNXyrNNMdxfDE5RsWi/JCQ9qnG8sHTiw=="; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cors-2.8.5" = { + name = "cors"; + packageName = "cors"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + }; + "current-script-polyfill-1.0.0" = { + name = "current-script-polyfill"; + packageName = "current-script-polyfill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz"; + sha1 = "f31cf7e4f3e218b0726e738ca92a02d3488ef615"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "engine.io-4.0.6" = { + name = "engine.io"; + packageName = "engine.io"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz"; + sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA=="; + }; + }; + "engine.io-parser-4.0.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; + sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-source-polyfill-1.0.22" = { + name = "event-source-polyfill"; + packageName = "event-source-polyfill"; + version = "1.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.22.tgz"; + sha512 = "Fnk9E2p4rkZ3eJGBn2HDeZoBTpyjPxj8RX/whdr4Pm5622xYgYo1k48SUD649Xlo6nnoKRr2WwcUlneil/AZ8g=="; + }; + }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "fastestsmallesttextencoderdecoder-1.0.22" = { + name = "fastestsmallesttextencoderdecoder"; + packageName = "fastestsmallesttextencoderdecoder"; + version = "1.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz"; + sha512 = "Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "from2-string-1.1.0" = { + name = "from2-string"; + packageName = "from2-string"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz"; + sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "graceful-fs-4.2.4" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + }; + }; + "handlebars-4.7.6" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; + sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + }; + }; + "html5shiv-3.7.3" = { + name = "html5shiv"; + packageName = "html5shiv"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz"; + sha1 = "d78a84a367bcb9a710100d57802c387b084631d2"; + }; + }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-url-1.2.4" = { + name = "is-url"; + packageName = "is-url"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; + sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; + }; + }; + "is2-2.0.1" = { + name = "is2"; + packageName = "is2"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is2/-/is2-2.0.1.tgz"; + sha512 = "+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "js-polyfills-0.1.43" = { + name = "js-polyfills"; + packageName = "js-polyfills"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/js-polyfills/-/js-polyfills-0.1.43.tgz"; + sha512 = "wWCJcw7uMA12uk7qcqZlIQy9nj+Evh1wVUmn5MOlJ7GPC8HT5PLjB9Uiqjw9ldAbbOuNOWJ6ENb7NwU6qqf48g=="; + }; + }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.45.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.45.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; + sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + }; + }; + "mime-types-2.1.28" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.28"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; + sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mnemonist-0.38.1" = { + name = "mnemonist"; + packageName = "mnemonist"; + version = "0.38.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.1.tgz"; + sha512 = "I674bCCj9p87Re+gv15ynDrP14XjcmLR7tBO22l3UoxQLniyIXdD9vid2sSxYkyOr0fZwJTA+dXRvrwANgdnyg=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "mutationobserver-shim-0.3.7" = { + name = "mutationobserver-shim"; + packageName = "mutationobserver-shim"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"; + sha512 = "oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.2" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "obliterator-1.6.1" = { + name = "obliterator"; + packageName = "obliterator"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; + sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "picturefill-3.0.3" = { + name = "picturefill"; + packageName = "picturefill"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz"; + sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; + }; + }; + "polyfill-library-3.101.0" = { + name = "polyfill-library"; + packageName = "polyfill-library"; + version = "3.101.0"; + src = fetchurl { + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz"; + sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-polyfill-1.1.6" = { + name = "promise-polyfill"; + packageName = "promise-polyfill"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz"; + sha1 = "cd04eff46f5c95c3a7d045591d79b5e3e01f12d7"; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "seamless-scroll-polyfill-1.2.3" = { + name = "seamless-scroll-polyfill"; + packageName = "seamless-scroll-polyfill"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/seamless-scroll-polyfill/-/seamless-scroll-polyfill-1.2.3.tgz"; + sha512 = "emnwZtu6NrlBlvT6HrlbAOs024JX4orWew8H5owBOyUJ7eFXn8lGe4bsXTBD6AAWzP/p7LL86AjVIH8Apqec5w=="; + }; + }; + "semver-7.3.4" = { + name = "semver"; + packageName = "semver"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "socket.io-3.0.5" = { + name = "socket.io"; + packageName = "socket.io"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz"; + sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; + }; + }; + "socket.io-adapter-2.0.3" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz"; + sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ=="; + }; + }; + "socket.io-parser-4.0.3" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz"; + sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "spdx-licenses-1.0.0" = { + name = "spdx-licenses"; + packageName = "spdx-licenses"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-licenses/-/spdx-licenses-1.0.0.tgz"; + sha512 = "BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw=="; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stream-cache-0.0.2" = { + name = "stream-cache"; + packageName = "stream-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz"; + sha1 = "1ac5ad6832428ca55667dbdee395dad4e6db118f"; + }; + }; + "stream-from-promise-1.0.0" = { + name = "stream-from-promise"; + packageName = "stream-from-promise"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-from-promise/-/stream-from-promise-1.0.0.tgz"; + sha1 = "763687f7dd777e4c894f6408333fc6b3fc8a61bb"; + }; + }; + "stream-to-string-1.2.0" = { + name = "stream-to-string"; + packageName = "stream-to-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.0.tgz"; + sha512 = "8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "toposort-2.0.2" = { + name = "toposort"; + packageName = "toposort"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + }; + }; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + }; + }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "uglify-js-3.12.4" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz"; + sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A=="; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "unorm-1.6.0" = { + name = "unorm"; + packageName = "unorm"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz"; + sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="; + }; + }; + "usertiming-0.1.8" = { + name = "usertiming"; + packageName = "usertiming"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/usertiming/-/usertiming-0.1.8.tgz"; + sha1 = "35378e7f41a248d40e658d05f80423469a7b0650"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "web-animations-js-2.3.2" = { + name = "web-animations-js"; + packageName = "web-animations-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz"; + sha512 = "TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="; + }; + }; + "whatwg-fetch-3.5.0" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; + }; + }; + "wicg-inert-3.1.0" = { + name = "wicg-inert"; + packageName = "wicg-inert"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.0.tgz"; + sha512 = "P0ZiWaN9SxOkJbYtF/PIwmIRO8UTqTJtyl33QTQlHfAb6h15T0Dp5m7WTJ8N6UWIoj+KU5M0a8EtfRZLlHiP0Q=="; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "ws-7.4.2" = { + name = "ws"; + packageName = "ws"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; + sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + }; + }; + "yaku-1.0.1" = { + name = "yaku"; + packageName = "yaku"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaku/-/yaku-1.0.1.tgz"; + sha512 = "uZCrhA5DEytGnFfw9XZKIoWRG43v6oCA20vInFS4anPJb3G5Hy+PKuaKSMTJ+aChvFdNDxY5K8jFx5wmlLbTjQ=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + }; +in +{ + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.7.0" = nodeEnv.buildNodePackage { + name = "whitebophir"; + packageName = "whitebophir"; + version = "1.7.0"; + src = fetchgit { + url = "https://github.com/lovasoa/whitebophir.git"; + rev = "3bf594334e683c63229ac9b6b3a607fdad43c8e1"; + sha256 = "7d6d7baddc759d75b586131c436be3ea16b63889f916996e866f2e9aca7cfe50"; + }; + dependencies = [ + sources."@financial-times/polyfill-useragent-normaliser-1.9.0" + sources."@financial-times/useragent_parser-1.5.1" + sources."@formatjs/ecma402-abstract-1.5.0" + sources."@formatjs/intl-datetimeformat-3.2.2" + sources."@formatjs/intl-displaynames-4.0.3" + sources."@formatjs/intl-getcanonicallocales-1.5.3" + sources."@formatjs/intl-listformat-5.0.3" + sources."@formatjs/intl-locale-2.4.12" + sources."@formatjs/intl-numberformat-6.1.2" + sources."@formatjs/intl-pluralrules-4.0.2" + sources."@formatjs/intl-relativetimeformat-8.0.2" + sources."@juggle/resize-observer-3.2.0" + sources."@types/component-emitter-1.2.10" + sources."@types/cookie-0.4.0" + sources."@types/cors-2.8.9" + sources."@types/node-14.14.20" + sources."@webcomponents/template-1.4.4" + sources."Base64-1.1.0" + sources."abort-controller-3.0.0" + sources."accept-language-parser-1.5.0" + sources."accepts-1.3.7" + sources."align-text-0.1.4" + sources."audio-context-polyfill-1.0.0" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.4" + sources."base64id-2.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-1.2.1" + sources."center-align-0.1.3" + sources."cldr-core-38.0.0" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."cookie-0.4.1" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."current-script-polyfill-1.0.0" + sources."debug-4.1.1" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."diff-4.0.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + (sources."engine.io-4.0.6" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."engine.io-parser-4.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."event-source-polyfill-1.0.22" + sources."event-target-shim-5.0.1" + sources."fastestsmallesttextencoderdecoder-1.0.22" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."from2-string-1.1.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."handlebars-4.7.6" + sources."html5shiv-3.7.3" + sources."http-errors-1.7.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ip-regex-2.1.0" + sources."is-buffer-1.1.6" + sources."is-url-1.2.4" + sources."is2-2.0.1" + sources."isarray-1.0.0" + sources."js-polyfills-0.1.43" + sources."json3-3.3.3" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."longest-1.0.1" + sources."lru-cache-6.0.0" + sources."merge2-1.4.1" + sources."mime-1.6.0" + sources."mime-db-1.45.0" + sources."mime-types-2.1.28" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-1.0.4" + sources."mnemonist-0.38.1" + sources."ms-2.1.3" + sources."mutationobserver-shim-0.3.7" + sources."negotiator-0.6.2" + sources."neo-async-2.6.2" + sources."object-assign-4.1.1" + sources."obliterator-1.6.1" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."picturefill-3.0.3" + (sources."polyfill-library-3.101.0" // { + dependencies = [ + sources."source-map-0.5.7" + sources."uglify-js-2.8.29" + ]; + }) + sources."process-nextick-args-2.0.1" + sources."promise-polyfill-1.1.6" + sources."range-parser-1.2.1" + sources."readable-stream-2.3.7" + sources."repeat-string-1.6.1" + sources."right-align-0.1.3" + sources."rimraf-3.0.2" + sources."safe-buffer-5.1.2" + sources."seamless-scroll-polyfill-1.2.3" + sources."semver-7.3.4" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + (sources."socket.io-3.0.5" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-2.0.3" + (sources."socket.io-parser-4.0.3" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."source-map-0.6.1" + sources."spdx-licenses-1.0.0" + sources."statuses-1.5.0" + sources."stream-cache-0.0.2" + sources."stream-from-promise-1.0.0" + sources."stream-to-string-1.2.0" + sources."string_decoder-1.1.1" + sources."toidentifier-1.0.0" + sources."toposort-2.0.2" + sources."tslib-2.1.0" + sources."uglify-js-3.12.4" + sources."uglify-to-browserify-1.0.2" + sources."unorm-1.6.0" + sources."usertiming-0.1.8" + sources."util-deprecate-1.0.2" + sources."vary-1.1.2" + sources."web-animations-js-2.3.2" + sources."whatwg-fetch-3.5.0" + sources."wicg-inert-3.1.0" + sources."window-size-0.1.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."ws-7.4.2" + sources."yaku-1.0.1" + sources."yallist-4.0.0" + sources."yargs-3.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Online collaborative whiteboard"; + license = "AGPL-3.0-or-later"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.json b/pkgs/servers/web-apps/whitebophir/node-packages.json new file mode 100644 index 00000000000..44977342cc2 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -0,0 +1,3 @@ +[ + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.7.0" } +] diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix new file mode 100644 index 00000000000..d0273cfe1f9 --- /dev/null +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix new file mode 100644 index 00000000000..bfe01740f14 --- /dev/null +++ b/pkgs/shells/fish/babelfish.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "babelfish"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "bouk"; + repo = "babelfish"; + rev = "v${version}"; + sha256 = "08i4y4fw60ynamr1jz8nkfkidxj06vcyhi1v4wxpl2macn6n4skk"; + }; + + vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag"; + + meta = with lib; { + description = "Translate bash scripts to fish"; + homepage = "https://github.com/bouk/babelfish"; + license = licenses.mit; + maintainers = with maintainers; [ bouk kevingriffin ]; + }; +} diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 1774a1c6677..74843dea6cc 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; + sha256 = "0wsl57i3cd9whqvgjdnbz05230mkn2174gqld7mzn9iiym1rkcm4"; }; - cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; + cargoSha256 = "1ifvfwmrl97skjwp1qwrj863npsxcgfqm4a81cvw9bqhbylbjc77"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 064e1836b17..ed2b291ca2a 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -66,7 +66,7 @@ in lib.init bootStages ++ [ else if crossSystem.isDarwin then buildPackages.llvmPackages.clang else if crossSystem.useLLVM or false - then buildPackages.llvmPackages_8.lldClang + then buildPackages.llvmPackages.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index a477beac5a0..d832b00a6ee 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev75"; + version = "2.0.0dev85"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c"; - sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri"; + rev = "962bb5d356096c57e25a5579d09e4b4d928c886d"; + sha256 = "09bk8d0r3245kbi96641gvfl3q4jjhw55gjldc2cpml6mv36hhnb"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.17"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r"; + sha256 = "1pla97sylzhvj7r5cschv4bg23hpl0ax1m5cx4291fppjnrn2yp9"; }; postPatch = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4026effd6f6..a4c34662ef3 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,14 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.17.0"; + version = "2.17.1"; + srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { + name = srcName; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "2QLPtZYZZ+W5xZH2hxFnjox31v3My3zocouqLWGWSYI="; + sha256 = "sha256-RTYCsdoZx1YQa9a8ZyvwQ9yTLEB6r7/mMgfecc/vGvM="; }; # put packages that needs to be overriden in the py package scope @@ -19,7 +21,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pname = "azure-cli"; inherit version src; - sourceRoot = "source/src/azure-cli"; + sourceRoot = "${srcName}/src/azure-cli"; prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index ab417af8d44..743c9e197d7 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -52,7 +52,7 @@ let pname = "azure-cli-core"; inherit version src; - sourceRoot = "source/src/azure-cli-core"; + sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ adal @@ -111,7 +111,7 @@ let version = "1.0.4"; # might be wrong, but doesn't really matter inherit src; - sourceRoot = "source/src/azure-cli-telemetry"; + sourceRoot = "${src.name}/src/azure-cli-telemetry"; propagatedBuildInputs = with super; [ applicationinsights @@ -209,6 +209,9 @@ let azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip" "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199"; + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" + "sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; @@ -393,6 +396,23 @@ let ''; }); + azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec { + version = "0.5.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; + extension = "zip"; + }; + + preBuild = '' + rm azure_bdist_wheel.py + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" + ''; + }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.7.2"; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 6d86d52ae1e..61f41daf242 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1miqvh2b3mxrrr63q8f5i944mp3rz6685ckmnk5fml2wyc273jiv"; + sha256 = "1rfaa4b34mijlqxi9savzjplk1z83rs1z8iyx89zbw21fyry08kb"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "15kfsxn6j37rsw97ixj7ixkzcby0pkgc5xj7cpqdq975ym58sgv7"; + sha256 = "15izl7bvv7m96nyrs93b60fivr7gi2i306ryq6ynxrbq0nq43iya"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "321.0.0"; + version = "322.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 610e89c2fc3..90602cd42d8 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; - version = "17.01"; - + version = "17.03"; src = fetchFromGitHub { owner = "szcnick"; repo = pname; rev = "v${version}"; - sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps"; - } - ; - - patches = [ - ./gcc10.patch - ]; + sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d"; + }; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' @@ -35,12 +29,13 @@ stdenv.mkDerivation rec { find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; + makeFlags = [ "DEST_HOME=${placeholder "out"}" ]; + preConfigure = '' - makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - '' + stdenv.lib.optionalString stdenv.isDarwin '' - cp makefile.macosx_llvm_64bits makefile.machine -''; + buildFlags=all3 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_llvm_64bits makefile.machine + ''; enableParallelBuilding = true; diff --git a/pkgs/tools/archivers/p7zip/gcc10.patch b/pkgs/tools/archivers/p7zip/gcc10.patch deleted file mode 100644 index 9361249af93..00000000000 --- a/pkgs/tools/archivers/p7zip/gcc10.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1b7d2c73f01b2d2b6a3d2d16840e96e92afdcd61 Mon Sep 17 00:00:00 2001 -From: jinfeihan57 -Date: Tue, 9 Jun 2020 16:48:25 +0800 -Subject: [PATCH] gix gcc10 compiler error - ---- - CPP/Windows/ErrorMsg.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp -index 99684ae..90a7e20 100644 ---- a/CPP/Windows/ErrorMsg.cpp -+++ b/CPP/Windows/ErrorMsg.cpp -@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode) - const char * txt = 0; - AString msg; - -- switch(errorCode) { -+ switch(HRESULT(errorCode)) { - case ERROR_NO_MORE_FILES : txt = "No more files"; break ; - case E_NOTIMPL : txt = "E_NOTIMPL"; break ; - case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; -@@ -22,7 +22,7 @@ UString MyFormatMessage(DWORD errorCode) - case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; - case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; - case E_INVALIDARG : txt = "E_INVALIDARG"; break ; -- case ERROR_DIRECTORY : txt = "Error Directory"; break ; -+ case ERROR_DIRECTORY : txt = "Error Directory"; break ; - default: - txt = strerror(errorCode); - } -@@ -43,7 +43,7 @@ bool MyFormatMessage(DWORD messageID, CSysString &message) - const char * txt = 0; - AString msg; - -- switch(messageID) { -+ switch(HRESULT(messageID)) { - case ERROR_NO_MORE_FILES : txt = "No more files"; break ; - case E_NOTIMPL : txt = "E_NOTIMPL"; break ; - case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 624e9ed62d3..23036596c97 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "bacula-9.6.6"; + pname = "bacula"; + version = "11.0.0"; src = fetchurl { - url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2"; + url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; + sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Enterprise ready, Network Backup Tool"; homepage = "http://bacula.org/"; - license = licenses.gpl2; + license = with licenses; [ agpl3Only bsd2 ]; maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 17a324525f8..94ed258d332 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,6 +1,6 @@ # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix. -{ lib, stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock +{ lib, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, util-linux , useNixUdev ? true, systemd ? null # useNixUdev is here for bw compatibility @@ -30,13 +30,13 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" + c libudev = "${lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; propagatedBuildInputs = [ pykickstart pyparted pyblock libselinux cryptsetup - ] ++ stdenv.lib.optional useNixUdev systemd; + ] ++ lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 88a1716a0e1..194819cda16 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt +{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -22,17 +22,17 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cryptsetup-reencrypt" ] - ++ stdenv.lib.optional enablePython "--enable-python"; + ++ lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lvm2 libgcrypt libuuid popt ] - ++ stdenv.lib.optional enablePython python; + ++ lib.optional enablePython python; - meta = { + meta = with lib; { homepage = "http://code.google.com/p/cryptsetup/"; description = "LUKS for dm-crypt"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 3ad9de468b4..8186b1964f8 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -10,46 +10,46 @@ let blivet = import ./blivet.nix { - inherit stdenv fetchurl buildPythonApplication; + inherit lib fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; inherit (pkgs) lsof util-linux systemd; }; cryptsetup = import ./cryptsetup.nix { - inherit stdenv fetchurl python; + inherit lib stdenv fetchurl python; inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl lvm2; + inherit lib stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { - inherit stdenv fetchurl; + inherit lib stdenv fetchurl; inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { - inherit stdenv fetchurl lvm2; + inherit lib stdenv fetchurl lvm2; inherit (pkgs) fetchpatch readline systemd libaio gzip; }; parted = import ./parted.nix { - inherit stdenv fetchurl; + inherit lib stdenv fetchurl; inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { - inherit stdenv fetchurl python lvm2 dmraid; + inherit lib stdenv fetchurl python lvm2 dmraid; }; pykickstart = import ./pykickstart.nix { - inherit stdenv fetchurl python buildPythonApplication urlgrabber; + inherit lib fetchurl python buildPythonApplication urlgrabber; }; pyparted = import ./pyparted.nix { - inherit stdenv fetchurl python buildPythonApplication parted; + inherit lib stdenv fetchurl python buildPythonApplication parted; inherit (pkgs) pkgconfig e2fsprogs; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index fd608889102..c5d8eebc47c 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2 }: +{ lib, stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ lvm2 ]; - meta = { + meta = with lib; { description = "Old-style RAID configuration utility"; longDescription = '' Old RAID configuration utility (still under development, though). @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 4369d659034..25d2fb8ae3b 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }: let v = "2.02.106"; @@ -68,9 +68,9 @@ stdenv.mkDerivation { cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; - meta = { + meta = with lib; { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 36525e6fa3c..976a3ce2567 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,6 +1,6 @@ # FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix. -{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: +{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with lib; { description = "Tools for the Linux multipathing driver"; homepage = "http://christophe.varoqui.free.fr/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index d3fc9ce96f5..2891f990afb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline +{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline , util-linux, check , enableStatic ? stdenv.hostPlatform.isStatic }: @@ -21,21 +21,21 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2; + ++ lib.optional (readline != null) readline + ++ lib.optional (gettext != null) gettext + ++ lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; + ++ lib.optional (lvm2 == null) "--disable-device-mapper" + ++ lib.optional enableStatic "--enable-static"; doCheck = true; checkInputs = [ check util-linux ]; - meta = { + meta = with lib; { description = "Create, destroy, resize, check, and copy partitions"; longDescription = '' @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/parted/"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; maintainers = [ # Add your name here! ]; # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index f087edd853d..ddf260300fb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, lvm2, dmraid }: +{ lib, stdenv, fetchurl, python, lvm2, dmraid }: stdenv.mkDerivation rec { pname = "pyblock"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" ]; - meta = { + meta = with lib; { description = "Interface for working with block devices"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 0698dcd9ecb..092db8ee7c4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: +{ lib, python, buildPythonApplication, fetchurl, urlgrabber }: buildPythonApplication rec { pname = "pykickstart"; @@ -22,9 +22,9 @@ buildPythonApplication rec { ${python}/bin/${python.executable} tests/baseclass.py -vv ''; - meta = { + meta = with lib; { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index f71e7c3a06d..48c5252d0ae 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: +{ lib, stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: buildPythonApplication rec { pname = "pyparted"; @@ -14,7 +14,7 @@ buildPythonApplication rec { sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py - '' + stdenv.lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py @@ -33,10 +33,10 @@ buildPythonApplication rec { make test PYTHON=${python.executable} ''; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index d80247801f0..30d4d79488e 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "1zm8q0fx695x28zg8ihzk3w41439v47n68cw6k551x31mls939yn"; + sha256 = "14vccp1z0g2hr9alx2ydz29hfa4xfv9irdjsvqm94fbyi5fa87k0"; }; dontBuild = true; diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix deleted file mode 100644 index eef1533587b..00000000000 --- a/pkgs/tools/misc/gnuvd/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnuvd-1.0.12"; - - src = fetchurl { - url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; - sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; - }; - - meta = with lib; { - description = "Command-line dutch dictionary application"; - homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 7f3c3ed4d56..3bd297628b2 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -20,6 +20,8 @@ pythonPackages.buildPythonApplication rec { homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - inherit version; + # fails to install with: + # TypeError: cannot unpack non-iterable bool object + broken = true; }; } diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 839ee5b2082..940ae130c84 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e"; + sha256 = "e5135d07a8944170e39ea8b96b09123c54648cca94537b4953d8f15e5a537da2"; }; postPatch = '' diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix new file mode 100644 index 00000000000..07b4d834978 --- /dev/null +++ b/pkgs/tools/misc/trillian/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: +let + pname = "trillian"; + version = "1.3.11"; + +in +buildGoModule { + inherit pname version; + vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh"; + }; + + # Remove tests that require networking + postPatch = '' + rm cmd/get_tree_public_key/main_test.go + ''; + + subPackages = [ + "cmd/trillian_log_server" + "cmd/trillian_log_signer" + "cmd/trillian_map_server" + "cmd/createtree" + "cmd/deletetree" + "cmd/get_tree_public_key" + "cmd/updatetree" + ]; + + meta = { + homepage = "https://github.com/google/trillian"; + description = "A transparent, highly scalable and cryptographically verifiable data store."; + license = [ lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.adisbladis ]; + }; +} diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix new file mode 100644 index 00000000000..1ad9ddd4deb --- /dev/null +++ b/pkgs/tools/misc/vsh/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "vsh"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "fishi0x01"; + repo = "vsh"; + rev = "v${version}"; + sha256 = "0k9bbfzqhijzimng8plk2xx9h37h7d2wj8g3plvvs3wrf7pmwxs7"; + }; + + # vendor dir is already part of repository + vendorSha256 = null; + + # make sure version gets set at compile time + buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + + meta = with lib; { + description = "HashiCorp Vault interactive shell"; + homepage = "https://github.com/fishi0x01/vsh"; + license = licenses.mit; + maintainers = with maintainers; [ fishi0x01 ]; + }; +} diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix index fe2285df22c..c989f36da3d 100644 --- a/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -1,19 +1,17 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-shadowsocks2"; - version = "0.0.11"; - - goPackagePath = "github.com/shadowsocks/go-shadowsocks2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "go-shadowsocks2"; rev = "v${version}"; - sha256 = "1dprz84gmcp6xcsk873lhj32wm8b55vnqn0s984ggvwf1rjqw00c"; + sha256 = "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"; }; - goDeps = ./deps.nix; + vendorSha256 = "0iyak8af708h3rdrslndladbcjrix35j3rlhpsb8ljchqp09lksg"; meta = with lib; { description = "Fresh implementation of Shadowsocks in Go"; diff --git a/pkgs/tools/networking/go-shadowsocks2/deps.nix b/pkgs/tools/networking/go-shadowsocks2/deps.nix deleted file mode 100644 index 7fe0c2b6985..00000000000 --- a/pkgs/tools/networking/go-shadowsocks2/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/aead/chacha20"; - fetch = { - type = "git"; - url = "https://github.com/aead/chacha20"; - rev = "8b13a72661dae6e9e5dea04f344f0dc95ea29547"; - sha256 = "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "60c769a6c58655dab1b9adac0d58967dd517cfba"; - sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb81701db80f1745f51259b1f286de3fe2ec80c8"; - sha256 = "1cgvyzkmsbvgyp75nxp10fpnpy08scz6ak60s9w0mkgibw7irhz3"; - }; - } -] diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index c2fbb06167d..36028208f56 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,23 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy -, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium -, liburcu, ncurses, pkgconfig, zlib }: +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, bison +, flex +, geoip +, geolite-legacy +, libcli +, libnet +, libnetfilter_conntrack +, libnl +, libpcap +, libsodium +, liburcu +, ncurses +, pkg-config +, zlib +}: stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.7"; + version = "0.6.8"; - # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; + sha256 = "10ih8amaqspy0zwg7hqvypa1v7ixpjl0n608cyfgyfzffp73lbqf"; }; - nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; + nativeBuildInputs = [ + bison + flex + makeWrapper + pkg-config + ]; + buildInputs = [ - geoip geolite-legacy libcli libnet libnl - libnetfilter_conntrack libpcap libsodium liburcu ncurses zlib + geoip + geolite-legacy + libcli + libnet + libnl + libnetfilter_conntrack + libpcap + libsodium + liburcu + ncurses + zlib ]; # ./configure is not autoGNU but some home-brewn magic @@ -37,12 +67,12 @@ stdenv.mkDerivation rec { wrapProgram "$out/sbin/trafgen" --prefix PATH ":" "${stdenv.cc}/bin" wrapProgram "$out/sbin/bpfc" --prefix PATH ":" "${stdenv.cc}/bin" - ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat $out/etc/netsniff-ng/city6.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat - ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat $out/etc/netsniff-ng/city6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible ''; @@ -56,7 +86,7 @@ stdenv.mkDerivation rec { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = "http://netsniff-ng.org/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 2806e09c994..5dafb1e5639 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -46,6 +46,14 @@ stdenv.mkDerivation rec { "--enable-external-ell" ]; + postInstall = '' + rm -r $out/etc/ofono + ln -s /etc/ofono $out/etc/ofono + ''; + + enableParallelBuilding = true; + enableParallelChecking = false; + doCheck = true; meta = with lib; { diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index c50b2236c9e..7a24ccf33b7 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,19 @@ -{ stdenv, fetchurl, openssl, readline, which, nettools }: +{ lib +, fetchurl +, nettools +, openssl +, readline +, stdenv +, which +}: stdenv.mkDerivation rec { - name = "socat-1.7.3.4"; + pname = "socat"; + version = "1.7.4.1"; src = fetchurl { - url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp"; + url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; + sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z"; }; postPatch = '' @@ -22,12 +30,12 @@ stdenv.mkDerivation rec { checkInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs - meta = { - description = "A utility for bidirectional data transfer between two independent data channels"; + meta = with lib; { + description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; repositories.git = "git://repo.or.cz/socat.git"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ eelco ]; }; } diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 2d474159359..75cf8403d93 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "woefe"; @@ -13,23 +13,23 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; + propagatedBuildInputs = with python3Packages; [ click feedparser lxml sqlalchemy youtube-dl ]; - checkInputs = with python3Packages; [ nose pytest ]; + checkInputs = with python3Packages; [ nose pytestCheckHook ]; # Disable tests that touch network or shell out to commands - checkPhase = '' - pytest . -k "not get_channels \ - and not play_video \ - and not download_videos \ - and not update_all \ - and not add_channel_duplicate" - ''; + disabledTests = [ + "get_channels" + "play_video" + "download_videos" + "update_all" + "add_channel_duplicate" + ]; meta = { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; homepage = "https://github.com/woefe/ytcc"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ marius851000 ]; }; } diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 01a1bf4a933..af072de3e14 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,19 +1,17 @@ { lib, python3Packages, fetchFromGitHub }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "0wkk107s0bpvbknapns0qdzf8csrzc2j6gliy6pa8z208fcfzyy3"; + sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ binaryornot boolean-py debian @@ -24,7 +22,7 @@ buildPythonApplication rec { setuptools_scm ]; - checkInputs = [ pytest ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 94e62c03ad3..a6b0d43aae2 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.26"; + version = "2.2.27"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0vgzrwafi4s4q5ixn4inwm0ir6acz405kghnvxsj3lpsr7k6jxai"; + sha256 = "1693s2rp9sjwvdslj94n03wnb6rxysjy0dli0q1698af044h1ril"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 943bebf41c7..34abfe21757 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.10.1"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana"; + sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic"; }; - vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a"; + vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x"; doCheck = false; @@ -46,12 +46,9 @@ buildGoModule rec { ln -s $out/bin/gopass $out/bin/pass ''; - # --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662 postFixup = '' for bin in $out/bin/*; do - wrapProgram $bin \ - --prefix PATH : "${wrapperPath}" \ - --run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"' + wrapProgram $bin --prefix PATH : "${wrapperPath}" done ''; diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/tools/security/hakrawler/default.nix new file mode 100644 index 00000000000..fc5ee32bcba --- /dev/null +++ b/pkgs/tools/security/hakrawler/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "hakrawler"; + version = "20201224-${lib.strings.substring 0 7 rev}"; + rev = "e39a514d0e179d33362ee244c017fb65cc2c12a5"; + + src = fetchFromGitHub { + owner = "hakluke"; + repo = "hakrawler"; + inherit rev; + sha256 = "0wpqfbpgnr94q5n7i4zh806k8n0phyg0ncnz43hqh4bbdh7l1y8a"; + }; + + vendorSha256 = "18zs2l77ds0a3wxfqcd91h269g0agnwhginrx3j6gj30dbfls8a1"; + + meta = with lib; { + description = "Web crawler for the discovery of endpoints and assets"; + homepage = "https://github.com/hakluke/hakrawler"; + longDescription = '' + Simple, fast web crawler designed for easy, quick discovery of endpoints + and assets within a web application. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix new file mode 100644 index 00000000000..fddd10da618 --- /dev/null +++ b/pkgs/tools/security/terrascan/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "terrascan"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "accurics"; + repo = pname; + rev = "v${version}"; + sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + }; + + vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + + # tests want to download a vulnerable Terraform project + doCheck = false; + + meta = with lib; { + description = "Detect compliance and security violations across Infrastructure"; + longDescription = '' + Detect compliance and security violations across Infrastructure as Code to + mitigate risk before provisioning cloud native infrastructure. It contains + 500+ polices and support for Terraform and Kubernetes. + ''; + homepage = "https://github.com/accurics/terrascan"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index db7275da7df..6fb65e0c3a2 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "gdu"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "0gk36z8xzj7blwzs080fqsz76hn56c89xcsyil6n5cfkbyf85c6i"; + sha256 = "0ajkc0vbzyl56d6z03s5vb17frjrg5wl145x60asnrmh7lg8adsj"; }; vendorSha256 = "1jqbsda9bch3awdq816w4jybv7wz9mfflmvs5y2wsa2qnhn9nbyp"; buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + # analyze/dev_test.go: undefined: processMounts + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Disk usage analyzer with console interface"; longDescription = '' diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 1b1aaf00b37..9de9d0b7368 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.2.01-1"; + version = "3.2.02-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"; + hash = "sha256-+6EURaeN1kJ4X+xdhN8ojuCbcBtxqNksGFEqPhIwCc4="; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 430b4db2577..d4ca083d0b1 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d"; + sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; - cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq"; + cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index a951285bd06..90ddd5b6929 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.1"; + version = "5.2"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y"; + sha256 = "1fz3rxqg5z2jxbalraz8lwkzj0jh69zzfmf3vpwywilvl7xlhdrd"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share - mv * $out/share/ + mv -- * $out/share/ for lt in languagetool{,-commandline,-server};do makeWrapper ${jre}/bin/java $out/bin/$lt \ @@ -27,9 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://languagetool.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ - edwtjo - ]; + maintainers = with maintainers; [ edwtjo ]; platforms = jre.meta.platforms; description = "A proofreading program for English, French German, Polish, and more"; }; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 321421a6b80..e4c6c5d0c08 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { }) ]; - buildPhase = ''make -f protoMakefile''; + makefile = "protoMakefile"; + preBuild = '' + makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc) + ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index f6e5e4a9ebb..54c3da224d8 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30, - boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml, +{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30-gtk3, + boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkgconfig ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 1bcee62ac6c..ac0220cf561 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,7 +1,21 @@ -{ lib, stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }: +{ lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); + + # perl 5.32.0 ships with U:C 1.27 + UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec { + pname = "Unicode-Collate"; + version = "1.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${pname}-${version}.tar.gz"; + sha256 = "0dr4k10fgbsczh4sz7w8d0nnba38r6jrg87cm3gw4xxgn55fzj7l"; + }; + meta = { + description = "Unicode Collation Algorithm"; + license = perlPackages.perl.meta.license; + }; + }; in perlPackages.buildPerlModule { @@ -10,21 +24,13 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; - patches = [ - # Fix for https://github.com/plk/biber/issues/329 - (fetchpatch { - url = "https://github.com/plk/biber/commit/fa312ce402fe581ba7cc0890c83a1d47c2610e26.diff"; - sha256 = "1j87mdwvx368z9b5x6b72s753hwvrldf2pb42p6hflq5hzkicy50"; - }) - ]; - buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ParseRecDescent IOString ReadonlyXS RegexpCommon TextBibTeX - UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + UnicodeCollate_1_29 UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey TestDifferences PerlIOutf8_strict diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index d6b92991340..522c3438d90 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.5"; + version = "0.7.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2"; + sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 0625fe16090..bf7b7952f51 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -2,10 +2,12 @@ params: with params; # combine = args@{ pkgFilter ? (pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "core") -, extraName ? "combined", ... +, extraName ? "combined" +, extraVersion ? "" +, ... }: let - pkgSet = removeAttrs args [ "pkgFilter" "extraName" ] // { + pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ] // { # include a fake "core" package core.pkgs = [ (bin.core.out // { pname = "core"; tlType = "bin"; }) @@ -37,7 +39,7 @@ let (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); in (buildEnv { - name = "texlive-${extraName}-${bin.texliveYear}"; + name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}"; extraPrefix = "/share/texmf"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index c2e6399ab86..cc30024ca0f 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -88,6 +88,12 @@ let ++ combinePkgs (attrs.deps or {}); }; + snapshot = { + year = "2021"; + month = "01"; + day = "09"; + }; + # create a derivation that contains an unpacked upstream TL package mkPkg = { pname, tlType, revision, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args: let @@ -110,7 +116,7 @@ let #"ftp://tug.org/texlive/historic/2019/tlnet-final/archive" # Daily snapshots hosted by one of the texlive release managers - https://texlive.info/tlnet-archive/2020/10/09/tlnet/archive + "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive" ]; src = fetchurl { inherit urls sha512; }; @@ -174,6 +180,7 @@ in (combine { ${pname} = attrs; extraName = "combined" + lib.removePrefix "scheme" pname; + extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}"; }) ) { inherit (tl) diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index 8358becdab7..92001874a57 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -46,8 +46,8 @@ "plain-3.141592653"="my32apfgd55b14vf8bsldaqwdd931gcg"; "tex-ini-files-40533"="831h7dslin8dnan7llz8mki6zibqfglj"; "tex-ini-files.doc-40533"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic"; -"unicode-data-1.13"="xf2vq0qljmqhmj93630s637v5lcjycd0"; -"unicode-data.doc-1.13"="x22d4xiklr72ymaihfxs1r0kkdl4vdlp"; +"unicode-data-1.14"="l3va6jrpqxc96kl6idaqgnhhzx9cwcnk"; +"unicode-data.doc-1.14"="jrwxwchmf7m8qrarf1d4dzg5jpqn0r66"; "makeindex-52851"="yzy90d3n087yrdsawabd0bn7iwz3m1i6"; "makeindex.doc-52851"="ygvhwf55z6f9ix5jny8im72qwva5w560"; "mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4"; @@ -61,11 +61,11 @@ "pdftex.doc-56291"="5h8yj63fkg266p5klb1x4ymajlw9j5fh"; "dehyph-48599"="dwnq2aajr29sdydc45056na079ph8gc6"; "tex.doc-3.14159265"="hjzzikx7zp8zhncjv85z8g0v0zjj5vqm"; -"texlive-common.doc-56460"="9dcj7zhplmgf2q1cy1xk32vc9iipdz99"; -"texlive-docindex.doc-56593"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; +"texlive-common.doc-57339"="7hzsgkvbvl89iiqm88yxyc3bf6k21zk2"; +"texlive-docindex.doc-57339"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb"; "texlive-en.doc-54755"="my69ybbyv9cxn91hh3ms3yksy391h7py"; -"texlive-scripts-56579"="vis89yjbvc8r961syjrpgalh61wa6rrj"; -"texlive-scripts.doc-56579"="m2vylj86h3xxpkspjny4sf5kbifj7dwl"; +"texlive-scripts-57344"="6jxkfiq8181ds7yvj0ysq9r5ribpm3qy"; +"texlive-scripts.doc-57344"="ng0ni58vjqv3z9f4shad5087kpila62k"; "tlshell-56461"="r5iil3d7fmjj1fhc40nd29mh7cgdnfgv"; "tlshell.doc-56461"="yps67a47kr5r3ljhd18kq35bhn2qjj3y"; "aaai-named-52470"="3lh28gvljcszn9vhzgsb6fp93m7n4d1d"; @@ -84,7 +84,7 @@ "archaeologie.source-2.4.5"="6azzb6zrv4xcrqc89a0f23inxgicin0c"; "authordate-52564"="d2bswrn2prjx106g6qyxs0sdhxxr0wfh"; "authordate.doc-52564"="0p505jmjdgvy26acbbgmkw9cp008kzl1"; -"beebe-56534"="g5giqxg2c2hv94k4hrzgf35aqbalfd8h"; +"beebe-56713"="8ayj8j9yb88f9k0yvw33fgdz54v5hg8r"; "besjournals-45662"="n3ljrkamca5v9w0rk3m38nqw86s1izc8"; "besjournals.doc-45662"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77"; "bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq"; @@ -95,20 +95,20 @@ "bibarts-2.2"="w813f5qw2kbsmlhcwxsg62na06bp0p0r"; "bibarts.doc-2.2"="xrv6r5iwpdyrjzqzanvgw2dy07xgkgb0"; "bibarts.source-2.2"="c4js97f9wx1ndh8isk3fgg6lp1rhrrmb"; -"biber.doc-2.15"="vg8dnl0xsy1lx8cpxqr4n2amh64gxbzw"; -"biber.source-2.15"="jw9fanm2xw4f7f5gs7l4aqb5c9cxb98g"; +"biber.doc-2.16"="283hs3rvg9m38yk97pvajyzwkgyv38j9"; +"biber.source-2.16"="nbbnd4gdmkw2y15wigqrjxv1b2xvsdbg"; "bibexport-3.03"="gxzcd5xddarag47glbq02fmxgpn5ndw3"; "bibexport.doc-3.03"="mvqlfzqzyhbnqw8xixa01qdfgrlm5xln"; "bibexport.source-3.03"="q41ipwczv79cxnl2420cvcj5q9c6l57l"; "bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv"; "bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4"; -"biblatex-3.15a"="ki4f3anc1abw53fmndw5m41d3gl5a6d6"; -"biblatex.doc-3.15a"="0jdxzkwqy9kh3rb8w1aznbq1gz4hvzxf"; +"biblatex-3.16"="1y6ynai1zf5mx9106yhka418lhki79v6"; +"biblatex.doc-3.16"="5papwbpfnyfrimwh18p0nsnpajfkb6px"; "etoolbox-2.5k"="1b2h9kr3gk2by5n0dswnq3z1hf68q5lm"; "etoolbox.doc-2.5k"="51558shd94h5lrary13dznhss225wrfd"; -"kvoptions-3.13"="jnr335l6nr52608i08zza9z1qi7drnnx"; -"kvoptions.doc-3.13"="w77jdi8gdsjzlhzwscnjvhpp0l27dh06"; -"kvoptions.source-3.13"="ab0dw2aayx34kgshcjv0k4hx4zr9ar72"; +"kvoptions-3.14"="vplbvmnl37ypgrdqcn0mycsnwr5z1ha4"; +"kvoptions.doc-3.14"="2avi8y8yglncwa87vs41akaxlvbcjgbi"; +"kvoptions.source-3.14"="rl5bv5ip88w4251w0hf2wk5p8nzl9lwj"; "logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0"; "logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv"; "pdftexcmds-0.33"="pa208jqk3rvps51niwccdmnx3c0zhlc2"; @@ -140,8 +140,8 @@ "biblatex-bookinother.doc-2.3.3"="wz5w9vgr3c19kd5x6fic9sx3qs6lz0vy"; "biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w"; "biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq"; -"biblatex-caspervector-0.3.4"="5rgdqdckgrl9pbk2d3q4cr0g6j2gb0mf"; -"biblatex-caspervector.doc-0.3.4"="2n8fhy903ydzz24kqc491qd7x0hrypjv"; +"biblatex-caspervector-0.3.5"="lfrll315pr653wb5cp3263na44g2m8lh"; +"biblatex-caspervector.doc-0.3.5"="jdq7pdz08pzhrzd4ym6i8fws90a4bhfh"; "biblatex-chem-1.1y"="fizmglf8yy4zn0kqbng2d5c7i9migvjs"; "biblatex-chem.doc-1.1y"="xl7fq05fa16ayzpxpjjqjdkkdxb0jj6x"; "biblatex-chicago-2.0"="6ljx5hr3m84xy0ljj49z04c1dxdnql8n"; @@ -152,20 +152,20 @@ "biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m"; "biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg"; "biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y"; -"biblatex-ext-0.9"="kzr50lz234hwhfhhblxc3hz5696znq87"; -"biblatex-ext.doc-0.9"="yq631vfhj878gwfkjryn851zlmilcvp5"; +"biblatex-ext-0.10"="jdd9sd2d5i74zlw9i1fw9nz39kzzlz66"; +"biblatex-ext.doc-0.10"="475lznr42kxgfqnjz06v22dn735n3mk3"; "biblatex-fiwi-1.7"="xwb00mw95l90bba4fc31kw62p43cxjz1"; "biblatex-fiwi.doc-1.7"="y5hpi0gwp2s7hgqir2qw2yam9l3aqzdw"; "biblatex-gb7714-2015-1.0v"="cq9fszwkn128c0yprjal5jcjfhcra8a7"; "biblatex-gb7714-2015.doc-1.0v"="gwf2wk7ha7gadg90zp0y91rq04mn4b00"; -"biblatex-german-legal-001"="myvc5zb0a4v9d9y8z4bp34ynvyblnix4"; -"biblatex-german-legal.doc-001"="g2p5by6h7fysyglyj8gdsjz3mnwjl1pc"; -"biblatex-gost-1.18"="xp5b370133fs6dsr8xzw9xfnyxf1hxfa"; -"biblatex-gost.doc-1.18"="jldlsx5faynps1m7zfc94asbcd7473x2"; +"biblatex-german-legal-002"="wfjfph758mzj742z6gmg8dbrh6snmgw4"; +"biblatex-german-legal.doc-002"="ds43kijns6a8qjirib258w4nvm46nb54"; +"biblatex-gost-1.21"="ix95xf69yj6b48w761q1i5wvyc0x5lqa"; +"biblatex-gost.doc-1.21"="bn90k270bs89314iss1rv9sbiiyk5vq3"; "biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8"; "biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb"; -"biblatex-ieee-1.3c"="ysyhz738wl2y1a7wqkmxqjrkz7ajdax8"; -"biblatex-ieee.doc-1.3c"="jpdz0v1ircribqnv33wr19ffxxsw5b7y"; +"biblatex-ieee-1.3d"="16r09shnkza9j86x5yb674aqarvbrq6a"; +"biblatex-ieee.doc-1.3d"="arx55nh1jm6257kjdm6gnldr61d1pp4z"; "biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf"; "biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki"; "biblatex-iso690-0.4"="f4hhfkq9hg3m1s3vcxddqqsi1wfhy4c7"; @@ -188,8 +188,8 @@ "biblatex-multiple-dm.doc-1.0.1"="j1hb0xn9gz6mywx018i4rq4g5xwi7af4"; "biblatex-musuos-1.0"="dj5nsyf90mbi4dlghyh8aklqr28jvx76"; "biblatex-musuos.doc-1.0"="ypw7naafkwm22kfq1hd4b0z665g4jz9p"; -"biblatex-nature-1.3c"="wjgvlv71qv8q988pc8xnffzx7gfk1xl8"; -"biblatex-nature.doc-1.3c"="dqwyqgdszfmpj5jmpwfx3607hsgp1s3a"; +"biblatex-nature-1.3d"="vqvnb88jb6rwsdxigpcs2mr03p8d3npj"; +"biblatex-nature.doc-1.3d"="yvc82f9vdh7kh6x444gz7h3bzm8cq15w"; "biblatex-nejm-0.5.0"="vybm8b0dqd5xyw3x6wp5xmq3dvl4by1k"; "biblatex-nejm.doc-0.5.0"="6ppfzm4xdys6akhzc300kfh31jg49hlf"; "biblatex-nejm.source-0.5.0"="q9s7ml5f366r7v1130brjvx20c4bpy6y"; @@ -197,9 +197,9 @@ "biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh"; "biblatex-opcit-booktitle-1.9.0"="3aspv5b3a0lpif4wksanjq3fqclqkdij"; "biblatex-opcit-booktitle.doc-1.9.0"="sz4gb2ahn58y76cl92hpap7xxg0mg0y5"; -"biblatex-oxref-2.0.1"="nlc115k2ciss7450vlbksrav7y3wrvqm"; -"biblatex-oxref.doc-2.0.1"="2q3cb51zp8iaaps2m2m7lw1ffzm0jzlz"; -"biblatex-oxref.source-2.0.1"="dyyjar6l7fzw2glggr3xzszcmmigbkpl"; +"biblatex-oxref-2.1"="j0x74zl6c91hxf0hpvh0g58zchd8081d"; +"biblatex-oxref.doc-2.1"="nyb34riypvic7vg2qs4s46k1j4ah795p"; +"biblatex-oxref.source-2.1"="m088ib6q6cz9sx37qhafqszdkrbr0y7a"; "biblatex-philosophy-1.9.8c"="n2nkfafqbs1rmij23q45ry0gww43s6c4"; "biblatex-philosophy.doc-1.9.8c"="lsllrjkqva40nfz6bxmgiklh2sc6rzs0"; "biblatex-philosophy.source-1.9.8c"="j2sp7vlflcfgj7r4cwdr0xys52gnf3c6"; @@ -209,8 +209,8 @@ "biblatex-publist.doc-1.21"="gqbkq5880gn9maswfdvsfkbgh9y93j9a"; "biblatex-realauthor-2.7.1a"="6qb576bh9x616f02msiq3xz83xzaa047"; "biblatex-realauthor.doc-2.7.1a"="9pbd2aixmwj8as9lrmivkkfl4081820q"; -"biblatex-sbl-0.11"="kd461qdagb93p72av0ffqpy6747yz37k"; -"biblatex-sbl.doc-0.11"="6y9nz59fsqw1mhr6f3pg6sfqasjpllsm"; +"biblatex-sbl-0.12"="c20vk47abw6af6h8xwx2193kck6vsby9"; +"biblatex-sbl.doc-0.12"="3d0pwf6w0gcnrkg1d6pqaqi0rkbidl5b"; "biblatex-science-1.2"="7ql42aav0jqxx7zdfd3mavkbv14rwq7n"; "biblatex-science.doc-1.2"="y4vhwv5nybp628i852dmq61wqccqpgvn"; "biblatex-shortfields-1.0.1"="ji0p9w4dzyf4mi46nbcpvswas9r40xij"; @@ -238,9 +238,8 @@ "biblatex2bibitem.doc-0.2.0"="fymi4mzi8z1f1i4hjh928v8cajfyblgp"; "biblist-17116"="b565jl60ysccd5qkzgidjb188i509y9l"; "biblist.doc-17116"="50kjqxwhdncn09c7cx0abkcihvhfzzpl"; -"bibtexperllibs-1.5"="nnb90d3rqwa1vcc92fmmbnhs7di0rkgv"; -"bibtexperllibs.doc-1.5"="mzvrc7zyrq6agqb5vhxy743brp57yf4j"; -"bibtexperllibs.source-1.5"="ailmqz0d71gscxa584pkb6jpvvzish9r"; +"bibtexperllibs-1.6"="prnsdd72d808kfrkv2s4c9flzs7dqq25"; +"bibtexperllibs.source-1.6"="idmidg8svnznmhzsg0qb2104bw4d9yhs"; "bibtopic-1.1a"="r3rbv97qik2ikmkp3vx6srw7qf5v704c"; "bibtopic.doc-1.1a"="anrfs022bvwbfwsm05hxl10zgwckidn6"; "bibtopic.source-1.1a"="s32v3bwk7a1aqfkmp1scaf812x6ra9rx"; @@ -292,26 +291,26 @@ "auxhook-1.6"="xac68wvfhmds8251pc9ii7rjlak9ya27"; "auxhook.doc-1.6"="gmg6905gsw51mvqwpksajw3p8yjag16c"; "auxhook.source-1.6"="d0f1ia58xllmkg796dvky2b4mv86p7yd"; -"babel-3.50"="6h9rzbgz641k7kh2ya1qyl6zcwnsk9rq"; -"babel.doc-3.50"="n1m6vsdkqgbhyy8dxjl3pypwih2kza0b"; -"babel.source-3.50"="m6jv9li0r7p79i36vzqvwql03y6vamrr"; +"babel-3.52"="wzzxgndcll56wl7flnsd2ypbv27f37z3"; +"babel.doc-3.52"="kzlwmb3p90yrxdbvkkp06qd2whrfkg2g"; +"babel.source-3.52"="vbcdg4phafqf98fq0s6834518hj89gz1"; "babel-english-3.3r"="lrsz299wwvr17sshfjvsvrzs0s9y2acs"; "babel-english.doc-3.3r"="y7rp46lrpxsp8z1ridc6msxnbb008k0c"; "babel-english.source-3.3r"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9"; -"babelbib-1.32"="0jpv3d5s8inkpg1nyz1b8m80aq6simwa"; -"babelbib.doc-1.32"="cixpp9aiajyjxj23gzvxw94zydsxd3az"; +"babelbib-1.34"="f59py6xcjdpkdrn7gs3ik7ci2b091vrh"; +"babelbib.doc-1.34"="3ajzfn5k7i3ywhhgpx55dvph91amlqsa"; "bigintcalc-1.5"="3ivnkj1qyviffssxymdjy0nagrkh95yp"; "bigintcalc.doc-1.5"="hmfcvfzcyal8sz74ywhcqx3ydhmywgnm"; "bigintcalc.source-1.5"="jlaf6n169xxpipzg2d83dclk05v72h74"; "bitset-1.3"="nw1h1rrc82r2saka495mncrd6vn54dj6"; "bitset.doc-1.3"="srlljjm4s7sfkclndy4ziwcgm3r6mpjb"; "bitset.source-1.3"="1fc9dp30lpgicd4c3cj0vkqy4j01lzkq"; -"bookmark-1.28"="bpz7mvymqhww5nimmwnsmyfr39374cm9"; -"bookmark.doc-1.28"="briagq8yzmxjx9ridrrwql99a1pk6lv7"; -"bookmark.source-1.28"="2h3yqzjr5z2jfy53r45403cfli8ch6g1"; -"carlisle-47876"="wlkxgqdq20dlbinabdia2n1af9nhz5vm"; -"carlisle.doc-47876"="i2mg4zqlcsipqcz4wa9y9p89nnfzvavf"; -"carlisle.source-47876"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; +"bookmark-1.29"="m0fqwisbqakdvza2bnr7clwz5nhi9wlw"; +"bookmark.doc-1.29"="vr3fyr67n83j9pcj5piyy3z88n13m9ya"; +"bookmark.source-1.29"="vfkirhdggrclpxvcjv1bk6bz89zy1m6y"; +"carlisle-56753"="7cp342lr12vvr9zy0g84l5jy0aj241v5"; +"carlisle.doc-56753"="0wbnc5y0vvwd9208z2ylwfffaqr3i88p"; +"carlisle.source-56753"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv"; "colortbl-1.0e"="v55k9b9db0gy7fhqp0lg3isy4v9slphm"; "colortbl.doc-1.0e"="445wygx49bhlsyqm9czmp4npksgxxs01"; "colortbl.source-1.0e"="jbxzz8nx1gxm642yr63am3nz9f3sqq5b"; @@ -321,12 +320,12 @@ "etexcmds-1.7"="5ihd653q0sbq1q40hd9pvwxj73j099iq"; "etexcmds.doc-1.7"="h35i02fn3bim95f50bvq50pwiymjdpag"; "etexcmds.source-1.7"="dkiaxggiyzx1w07brj8zgqn7f1s4vs4h"; -"fancyhdr-3.10"="0jn1ivsf29hmmclhxbl1fc2gmglgwcq8"; -"fancyhdr.doc-3.10"="dndsyllh1bb96p5acr7dics7831g4pax"; -"fancyhdr.source-3.10"="xg41mjxhd1vajr1n1s8vzvggkf4zi9lz"; -"firstaid-1.0d"="wc9n67g7v1y82wzmmijjmy7ai6f84ls8"; -"firstaid.doc-1.0d"="9s2vhl6yqgl5vr5877862j3jcfdcqfnd"; -"firstaid.source-1.0d"="qqk73cw9b4wjram607ylxq989nf32jmm"; +"fancyhdr-4.0"="1vwf5j8bf1xkk06r1i8wk4cq3lmzz50j"; +"fancyhdr.doc-4.0"="k1g0f9ss84h0n1paymhar1azbcr2ad52"; +"fancyhdr.source-4.0"="ajvh04pj955ihpn9pwzhjjs7inpmncap"; +"firstaid-1.0i"="9vivpxkdis707z686ls6yj0rnlzxpz8h"; +"firstaid.doc-1.0i"="qlansw5gcrm168fwrij2r09z6s0vxxfd"; +"firstaid.source-1.0i"="w4c8h87bhbpyp8bgriac9y4jw3iyj0g4"; "fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83"; "fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng"; "fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p"; @@ -387,37 +386,37 @@ "l3backend-56424"="7rdw1mdgyy4gm57c0c1yyalj8sfpadi8"; "l3backend.doc-56424"="4dhc5awcvpiymir33wm4asz2xbawhk45"; "l3backend.source-56424"="8infr5qkjrps0nqlrpijsap5p01ccwx6"; -"l3kernel-56556"="65gl8zbvg0pss7wx2qh2vlhgjlzl334b"; -"l3kernel.doc-56556"="gjz8zrj31z4mim2h94wyxdqms0k6172n"; -"l3kernel.source-56556"="siqk8556hfi891ahz2gviq7n4qhyml4s"; -"latex-56514"="xmsf352kgs9dlck2xhq166hggrxikfk9"; -"latex.doc-56514"="cnfa8kaznlibh8bcdx8ab1gpy7qyik9p"; -"latex.source-56514"="p2mljvf1iybpcif73rf1ir9zzp6kpxkh"; +"l3kernel-57088"="nx3qcqcasbh5wqprfd703zx83qfl9yx3"; +"l3kernel.doc-57088"="533m04r2fjgrxh4cfgdmh6kjr1vn9ik8"; +"l3kernel.source-57088"="hfdrvihmxqbwqgc0lfrnqy581nl0k15h"; +"l3packages-56785"="m451yyhjbcmig9vncj43jmxlhs6xarvz"; +"l3packages.doc-56785"="f40lhaczxfccjqrc81j44qbzvw8aqpn8"; +"l3packages.source-56785"="wsir7rqbpp28gpg0wly9apcdwsipd5pz"; +"latex-2020-10-01-PL4"="85wa2sw72nzh6lwf47pwjzmd4zypjd6d"; +"latex.doc-2020-10-01-PL4"="ddgjcjhlyqs4v336h0rxlq3bpfki985j"; +"latex.source-2020-10-01-PL4"="igvlaq2pg82a4cf66yrdi5cpc9glrpzx"; "latex-fonts-28888"="pw97wy7b4hhzm28r0wl44lacn7nx41ia"; "latex-fonts.doc-28888"="mv9ivpdxgyjj92fq9141bsw5s306mg83"; "latexconfig-53525"="p0p0bmn0xa6pny05y862pnviafrjhr7i"; -"latex-bin.doc-56548"="6k6l63crh3kpg22v79s5kq3gra330194"; -"l3packages-56556"="7r7k76lr7wqqx87d4xnjpc3aykis6328"; -"l3packages.doc-56556"="737y7wzkjkl37hav3xah06qz9ara231s"; -"l3packages.source-56556"="q4b59jmgsmfrwbm1a9dkhfdngg6ppyny"; +"latex-bin.doc-57186"="6k6l63crh3kpg22v79s5kq3gra330194"; +"everyshi-4.00"="z9jwa1p2n1463ssx82dzdnj6wy69l856"; +"everyshi.doc-4.00"="hk1m31wikxs1b66sjmh8vkjd0js50c6v"; +"everyshi.source-4.00"="lz9d57cvr57z25j3263ddyiv9xvq9h8d"; "lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g"; "lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02"; "lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n"; -"luaotfload-3.15"="k4a960gmx52xlzvy58f5j731ljxnq6vx"; -"luaotfload.doc-3.15"="rk8ah69vjc92gyr459pj0iysk20yrckm"; -"luaotfload.source-3.15"="423i6lpfcs4f8y3hlh0fk7ihmpwkbz20"; -"lualibs-2.72"="iwr4hyw221wvr0qyz1pnmbj0hry0304b"; -"lualibs.doc-2.72"="6kwwhgmkpdgpwiy2l3rhl4w865ng4cg6"; -"lualibs.source-2.72"="2nh5mw358ppnb5dhcrxf0qn11n14i1iv"; -"ms-51784"="1pl0q5d2rmp29raq2icpn03lfa7hynv9"; -"ms.doc-51784"="xwl23v3xbp7kahsh1d5lgjazbbbn91hm"; -"ms.source-51784"="9bmd1famkcmas9g2bb9mi0z6yjrlrqh7"; +"luaotfload-3.16"="wl66y4wh0l7qwg7ay2wlq7phgchxycmi"; +"luaotfload.doc-3.16"="c1806dar72mbdxyh45bmqr3m204knj2d"; +"luaotfload.source-3.16"="423i6lpfcs4f8y3hlh0fk7ihmpwkbz20"; +"lualibs-2.73"="jcdwmmdkg2kbvnvybfyskf1k10wnxc6k"; +"lualibs.doc-2.73"="mvdgcbmrwamdn0ddqx866v94grdm5abn"; +"lualibs.source-2.73"="5ambrmj82026wa0ginan4sjgfxhzm87r"; "ltxmisc-21927"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x"; "mfnfss-46036"="52p8xnxca0ypcxbbjakx42mljjwv5jjj"; "mfnfss.doc-46036"="0c2hn0h964j1c0kzn0aq19cvff0n87hs"; "mfnfss.source-46036"="829y6cng0z45bdsb2vdrs4wkq2pp0cxz"; -"mptopdf-54276"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96"; -"mptopdf.doc-54276"="z2jlmw0d4lw1mkn7qwlpyvx9rradiawl"; +"mptopdf-57347"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96"; +"mptopdf.doc-57347"="5lrz8b6a6k130gkh0skg72y1m1cjpzwq"; "natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj"; "natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg"; "natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj"; @@ -476,9 +475,9 @@ "footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm"; "francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia"; "francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd"; -"gbt7714-2.0.2"="jm13r9974dlg6pl2dgrgi1wgkqd0c0hg"; -"gbt7714.doc-2.0.2"="kdslwk0xwgj5zansx3n7k1ds5wiv98dw"; -"gbt7714.source-2.0.2"="0hi7vgddiyrqal79nss7xvpl36jwq2n9"; +"gbt7714-2.1"="d72pw49b373nj1rrl3phvcmnyjcx4772"; +"gbt7714.doc-2.1"="rpvsgxsm3j492qsyadxnchk8hbasm6ch"; +"gbt7714.source-2.1"="0ndyqhqkrrqc8mvfga8hrm8dhzd6clcz"; "geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6"; "geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm"; "geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1"; @@ -567,8 +566,8 @@ "usebib.source-1.0a"="967j287dsb1j4wa5k9sxsv4xp7194q3b"; "vak-23431"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl"; "vak.doc-23431"="sr1gi7csll74iw13j24r1hdwn3gql9ak"; -"windycity-56492"="58aylihi386z72hx2yk532szwfr459yj"; -"windycity.doc-56492"="ylinhvp1mdigcgpq7g4946ipirdqjx8x"; +"windycity-56911"="dxlhvym5f12jymwc3kvpdjh48asvgmfc"; +"windycity.doc-56911"="hnw7s59kgaigfyzkgrh59smiblnynb1r"; "xcite-16383.99998"="wvb8mc5cp8s32hvi76gby25nk3n887jd"; "xcite.doc-16383.99998"="h07vrlm1107k8a8mjv4f8p0s69k5d08p"; "xcite.source-16383.99998"="kllh0w903i2jybhciiy925rs186klrh2"; @@ -582,8 +581,8 @@ "arara-5.1.3"="r1v2yazqi3ch0pc67gaa4h7s46f0ii4j"; "arara.doc-5.1.3"="702qxsc1si6kiwivg6409xr70aq040ih"; "arara.source-5.1.3"="pyicgm0x6kgmci9yclh4cdcb8vkhka8a"; -"asymptote-2.67"="x9zsa3qm2g31qrf1df406srz811sncwz"; -"asymptote.doc-2.67"="xwc0ggdrp2zbcb08yic8azx9mdz9hrvl"; +"asymptote-2.68"="x9zsa3qm2g31qrf1df406srz811sncwz"; +"asymptote.doc-2.68"="xwc0ggdrp2zbcb08yic8azx9mdz9hrvl"; "bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1"; "bibtex8.doc-3.71"="d5gk5h3a5milfx9lb1bcyzc6y5pz3d2c"; "bibtexu.doc-52851"="djmr91p0ig74imwgym82lpm81jp3csgb"; @@ -630,7 +629,7 @@ "dviout-util.doc-52851"="g20rq0qgf4va4icrg830k9r9h2by1cj9"; "dvipng.doc-1.17"="ckaakzpg7r0djiiz8l7cjqr02f1glkqx"; "dvipos.doc-52851"="6m8fym7ky0a7xy6pmn0aklh5jg0ppbzx"; -"dvisvgm.doc-2.10"="kapga5h6vvzkpwck68z7hpw0zr9pir5d"; +"dvisvgm.doc-2.11"="kapga5h6vvzkpwck68z7hpw0zr9pir5d"; "findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv"; "findhyph.doc-3.4"="ivpfnjybcl80xzda2jlrplaglqhf9adc"; "fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir"; @@ -657,8 +656,8 @@ "latexdiff.doc-1.3.1.1"="0fks08hh9z03bcyax837dn7rlf3xliq6"; "latexfileversion-0.3"="79yrcgv4lj33pavgn48ycvsd9a1x49s3"; "latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8"; -"latexindent-3.8.2"="ac2b0aivhcivvd16sdapiizypyk68zwx"; -"latexindent.doc-3.8.2"="w93c03pmf2wzj1iy2ki153bd39f4p4ss"; +"latexindent-3.8.3"="ab4qipxyh1d385lypwbaaab202z2drnz"; +"latexindent.doc-3.8.3"="1ja82ywynqqlb4f8hd8am1yjsips148g"; "latexmk-4.70b"="21lwd164g7z57rz6w2kjfgzm2km1hwff"; "latexmk.doc-4.70b"="39gnyyhwbmpwnz82215icd78jms1na3q"; "latexmk.source-4.70b"="a6zcqynkxjfrlldpg1js76ffbh2i6m3p"; @@ -696,8 +695,8 @@ "pdftex-quiet-1.1.0"="3cx8zd0q9z19d1xhhc8rd640ifwsrjxc"; "pdftex-quiet.doc-1.1.0"="84mb3zp9h3jnl179kc6svsd52pmx13pd"; "pdftosrc.doc-54074"="2f36i1iminb16zkpb796g2brrbs1s1ra"; -"pdfxup-1.60"="2p71pka7fhw4l887h7cyd8mizhjbp8m2"; -"pdfxup.doc-1.60"="h8iwrl07ax8xp8b7ns79aiddwdjhab8l"; +"pdfxup-2.00"="mza819bgnq201y9pqkjb06ky44kjc6kw"; +"pdfxup.doc-2.00"="xjwqzajjp6hayyxldqnb6n1gczx1rqlw"; "pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435"; "pfarrei.doc-r36"="bi4wqwx32x2498kr0k1rmkmslyz134x0"; "pfarrei.source-r36"="zrdbqakfqkm5kwbpwpy5d1pqp4w5sz42"; @@ -718,8 +717,8 @@ "sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib"; "sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65"; "synctex.doc-54074"="wk9fbvv3gdqzyh12gxa05zbd88l5zh65"; -"tex4ebook-0.3b"="yfzid2313phvxkp8f3b5mk7kkizczd7x"; -"tex4ebook.doc-0.3b"="r3i1bvrccrzazql9nxbmmrrzmgr0qqcx"; +"tex4ebook-0.3c"="s2d0w5089zd6xai6qhj8cksijbrgk2bl"; +"tex4ebook.doc-0.3c"="z54xmjb89jfz1j06gmzrli0f13kr4095"; "texcount-3.1.1"="spfdnfgbcy8y8c7191pd973wmdnrgp8j"; "texcount.doc-3.1.1"="idd45zpjjy6cgibnndxygdmljw28gyq4"; "texdef-1.9"="jc5hxmivzlsr1cklddvxmv3zxcyq5j6v"; @@ -766,15 +765,15 @@ "lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7"; "lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq"; "manfnt-font-45777"="isk7hkf6lfg41mjli9sgn77kvn6fkl96"; -"metapost-56291"="6hm4z5b1yw7qdhnk5zvr0li679rvfvi0"; -"metapost.doc-56291"="g4q6g496pzvdi5g285zyn76wvly60irs"; +"metapost-57271"="6hm4z5b1yw7qdhnk5zvr0li679rvfvi0"; +"metapost.doc-57271"="d38xa7r499np9f0fmfmxnwh6k28szr1h"; "mflogo-font-1.002"="m5lb3rhr5yighsixjb0k6zp2hx8fxvr9"; "mflogo-font.doc-1.002"="va6f9qjbh5ah4zvlmc4wi9m395x3bhpr"; "stmaryrd-22027"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35"; "stmaryrd.doc-22027"="r91xmqmmm6i6jka78qyaiilas94xc5hi"; "stmaryrd.source-22027"="ch2gj89jxrqysjsl24s40za3y5z03yan"; -"xetex-56548"="5mai30qjzqsc5hdmzavbsgchlarv6gfh"; -"xetex.doc-56548"="v3ijvh3ybf8yw7623x09nz6hi36k8bnj"; +"xetex-57186"="5mai30qjzqsc5hdmzavbsgchlarv6gfh"; +"xetex.doc-57186"="v3ijvh3ybf8yw7623x09nz6hi36k8bnj"; "xetexconfig-45845"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp"; "context-account-47085"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr"; "context-account.doc-47085"="lms208c3s9clga2ymi1j2i5whyz2dffy"; @@ -860,8 +859,8 @@ "adfsymbols.doc-1.2b"="q3840xankbi9xr7fdsfxd3gkgydrvmxr"; "alegreya-54512"="g97xv22dfmdfhyn4yqz67rj42mkp35qj"; "alegreya.doc-54512"="ds3p6fvf6bdrzf9clxksrcl9r3lbbknx"; -"algolrevived-1.05"="zsvm25smf853hdl7rqw1irl7lvf6lryi"; -"algolrevived.doc-1.05"="5l6ql0n9j8xbsdxwkikw15265vqkh5w0"; +"algolrevived-1.052"="9bhf3s32fk8p0vfw81c05jcpcbjmmsrm"; +"algolrevived.doc-1.052"="vcfri2j0bl3bs2lvf3ykz9ydrva030kk"; "allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr"; "allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv"; "allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy"; @@ -879,11 +878,15 @@ "archaic-38005"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n"; "archaic.doc-38005"="mb0z3xq325y48yv0bx4xsz8x5f790c60"; "archaic.source-38005"="j05dan5d8xxzg43iay4v76vbcdscc6zn"; +"archivo-0.0.2"="6cklwzyrf0b5pwakna7qgfwl6f1rgz4v"; +"archivo.doc-0.0.2"="s7qhxip5n0iwgx8c10lg1c5blkvby4x8"; "arev-15878"="xc3i2264d5w0ijv10n6ka53311bgnib0"; "arev.doc-15878"="s39jgnizjbpnh1czr3ck5yd32bxks476"; "arev.source-15878"="msk58av5fwg6hi4mzpz8abgzigqyskf2"; "arimo-42880"="1z5ij30qfbd4y2c0292aai2dsg87n1rm"; "arimo.doc-42880"="2fr1vjv5386lvixzs8idr0wyf9ghlg1f"; +"arvo-57213"="jz4jq6bin6pnwz643z576hdcvldvkbv6"; +"arvo.doc-57213"="macfnskh7cjjcxsr1mhh8d74kzw67wcz"; "asapsym-1.0"="gbn04lk9k66wj689vna4kgxq8gddhwca"; "asapsym.doc-1.0"="qfbaary485cs3q5azl6d650z53kd9s73"; "asapsym.source-1.0"="g9m2vwmd438fwfczm8xwhv4wdp2aj114"; @@ -910,8 +913,8 @@ "baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs"; "baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk"; "baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1"; -"baskervaldx-1.074"="iwr4zqy5l93la5mshgqm6bcwzj727i4s"; -"baskervaldx.doc-1.074"="aaqrs7brry15cggz118c27bdvh9z0arj"; +"baskervaldx-1.076"="hv5ycdbvsgrajd2waycsl0ail4vj9kh2"; +"baskervaldx.doc-1.076"="km1ycjnk0sksv73rl38dfx0jlrvdin5n"; "baskervillef-1.051"="5mb4w2c9i85hi0vdn3nkakrhbzin59ma"; "baskervillef.doc-1.051"="7000j6d5p3ar92imfm53ss57xm63r17k"; "bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g"; @@ -1013,8 +1016,8 @@ "cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h"; "cmupint-1.1"="y3vd4gx3bm5432xbhp6kd6fgvgxb24id"; "cmupint.doc-1.1"="jh5gh9ca5gwvjc0zpbb8wzlbi7kzfmf6"; -"cochineal-1.064"="8bj8vs4nj13axzijxfawx6cf4f9fdpb1"; -"cochineal.doc-1.064"="l3nfnvzjarq3dl3vd7139fmdrciqlghz"; +"cochineal-1.065"="apwv5j423x4g02v8rq3wj7mp2364245q"; +"cochineal.doc-1.065"="jdz7qylnkzpndzlazzcn53dhb03izr55"; "coelacanth-0.005"="qbhn9dh24pnw2bzsjgv2inr1fyh26qka"; "coelacanth.doc-0.005"="dbx6zwlbflq60b3zgkff1aj284bl77i3"; "comfortaa-3.2"="r9sis4ra19lgzsl56h3xp8s56awhlbrq"; @@ -1111,8 +1114,8 @@ "epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3"; "erewhon-1.111"="dsvp55hhwrgbyrbqiiikb4inv17snffg"; "erewhon.doc-1.111"="sczyvlpvzlg9xh7qjrj5vidl803ynd6a"; -"erewhon-math-0.44"="4gk0154d8gjvrfs70kbp6rpz8573990s"; -"erewhon-math.doc-0.44"="49bp5w0xcqxmv7nrkb4qrzvwnjs76x5a"; +"erewhon-math-0.45"="hx56393y3qvz6xhdkm1sqlnzk1bs8fgy"; +"erewhon-math.doc-0.45"="q1yyga9zqywjf4ic103h5clx6sap79dg"; "esrelation-37236"="zhs9fa75r0wr060cfsk4gmmvn06mywmy"; "esrelation.doc-37236"="08i1bczpz8sccj5lf32axfl3c5ix1sri"; "esrelation.source-37236"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv"; @@ -1143,8 +1146,8 @@ "fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl"; "fira-4.3"="7djxip2p87v4bjjnlqigzyia0cdwp1yl"; "fira.doc-4.3"="llsvxv1afxxlkxxwyk9mrq32bnz4hjml"; -"firamath-0.3.3"="fl4cbr4kka8yvq31dl7iiqylp5s8kqvm"; -"firamath.doc-0.3.3"="9higy6zhahbmfaa9w6js7958kqf6v085"; +"firamath-0.3.4"="jcqr18y6256nz7pj740yimvqj6f1rwng"; +"firamath.doc-0.3.4"="mbzsrizx3rh5gq4j8aqq7jgfcri0xhf1"; "firamath-otf-0.02a"="8va0xil2r5i2bjmmv7xj39jbk9j8l9d8"; "firamath-otf.doc-0.02a"="0i3j6rfpa5jahxipwa5ibfkh4x7vhz48"; "foekfont-15878"="wha0shrvr3lv9ll9d3gv60mcav605vcc"; @@ -1169,6 +1172,9 @@ "frcursive.doc-24559"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy"; "frederika2016-1.000_2016_initial_release"="bl8g27dfv6xsqfwlr2i6w9yar7916qnn"; "frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6"; +"frimurer-1"="fh6b7ag1zzzggi6xzb6by04hwhhl2k4x"; +"frimurer.doc-1"="vghsyznfdxa6ab2irz1gppr57sbc6b6p"; +"frimurer.source-1"="ixvp583gb0qlfi28hxy52hzbivnz77k8"; "garamond-libre-1.4"="sjc7j87aq5vi8zgxiigg9hslvgq43fwv"; "garamond-libre.doc-1.4"="k0m63fxp3f8fhyjachi19la5kz7wgz3d"; "garamond-math-52820"="mr7aafbkhy8z5iy5qc0l7pmpqbvnzq4n"; @@ -1232,6 +1238,8 @@ "initials.doc-54080"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g"; "inriafonts-1.0"="v2z21gr8glh8557carc8405d39h9yxyq"; "inriafonts.doc-1.0"="dq2aix14cqch32dywqyka5ci8qn31ayw"; +"inter-57213"="217klka90d7inpzwvjv0cmrfrmgylpjs"; +"inter.doc-57213"="a2rnff5s05lc06k48mcidc1biyczvnyf"; "ipaex-type1-0.5"="pzqc88hkzspswvgps1bswsn6khablb87"; "ipaex-type1.doc-0.5"="xls1iggs58i1mnpc79fp15v1f1i59h3y"; "iwona-0.995b"="l8pylg2zq5pvxs7czq17b3v1xpar4qkr"; @@ -1240,8 +1248,8 @@ "jablantile.doc-16364"="yml29hq7xcawh3zkd6b32dbsk0aj024q"; "jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9"; "jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0"; -"josefin-56311"="iyrjxsy05x1jbnzryj8s68qg9rxl770f"; -"josefin.doc-56311"="kzqdhzl0r1k8yk06qz1didbhp43pmmd5"; +"josefin-57152"="18lrkgv2giwpm43g71ygmd77nr4s4df4"; +"josefin.doc-57152"="zg0p38v21kscdcr20xn6g4a4vx4r7ylc"; "junicode-1.0.2"="2vg9bfcpawwij52yxai93fb276v351wy"; "junicode.doc-1.0.2"="49dyn91fjdhs7yzc6j7y9ihnxkc9wpml"; "kixfont-18488"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40"; @@ -1249,8 +1257,8 @@ "kpfonts-3.33"="rsl5v8zsm8pblyjryw3f14svxjzhnchm"; "kpfonts.doc-3.33"="rr7q8ww1nkpzqy29xmxhsyizszf59mqx"; "kpfonts.source-3.33"="448xjy1djbz9l9wbhmq7r6fpgvsn9dyy"; -"kpfonts-otf-0.31"="k648qikyjc7izhc8h19b65cp4gzmxb8l"; -"kpfonts-otf.doc-0.31"="gmhwph5kh1ndri1yj3i45hq2dxzg2a18"; +"kpfonts-otf-0.32"="glzbjwslsv7cqhkrqmhizx4anbsqx535"; +"kpfonts-otf.doc-0.32"="b8ldq3jg09lb7c4x1iajyhx194r0nq51"; "kurier-0.995b"="dadp8vkzvblj60424k75bchravcr0338"; "kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b"; "lato-3.3"="5cl837pwnp1zd7h8w5j7cwqpvf6pmik6"; @@ -1266,21 +1274,21 @@ "fontaxes.source-1.0e"="4cgxjx83a87dpmandkb36j4pjvmypvg7"; "mweights-53520"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq"; "mweights.doc-53520"="zkki0s268s1a23zm962ymbxl3gi7mzix"; -"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4"; -"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc"; -"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f"; +"xkeyval-2.8"="42rn633ggns36f6cxy4alii7mspfq0b2"; +"xkeyval.doc-2.8"="sa7qsydnwsl5s5yr0gdnmiv125j1163y"; +"xkeyval.source-2.8"="wsj7l9nya5753423srdk6dxzza8b0mf5"; "libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7"; "libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857"; "libertinus-0.02"="hvyjkdpyb4i742jrp38jvihki874ynzy"; "libertinus.doc-0.02"="00qv91migs6yq98sq8yzvgxyn2nfmnf2"; -"libertinus-fonts-7.000"="64k5a77sih39af4yig0n0zs646iigk0q"; -"libertinus-fonts.doc-7.000"="3fparhj044gym12c8b7h46ax6iypjs1a"; -"libertinus-otf-0.26"="vk7skfrymfjcq2bz26n0qwn2vkz84094"; -"libertinus-otf.doc-0.26"="aji4hnx7rzbvvlaahyh17ngng77ywf22"; -"libertinus-type1-56160"="n1j5n41lcl27hz8gz6qzwwjsqi49dxg5"; -"libertinus-type1.doc-56160"="5vl9xnfj5vnysw95rr5qyziwrwn3l3kn"; -"libertinust1math-1.2.1"="pi1jmb8wx2n7zpb80jvyk71z5969h7vi"; -"libertinust1math.doc-1.2.1"="7cs3igry5pvr00alrv92w9a0ybgh370f"; +"libertinus-fonts-7.020"="b1g49ajzscj8lk0szqhfnxs5n45cgw63"; +"libertinus-fonts.doc-7.020"="bnsxh72cl4iyln39w2b5m6jvlbf5mdg9"; +"libertinus-otf-0.27"="jgq0yql4nk3m01c8nmg35wz3v64qn9nc"; +"libertinus-otf.doc-0.27"="s3f5a4wg9l4gpbpbk1xi6w9s2dhxvhsx"; +"libertinus-type1-57159"="n1j5n41lcl27hz8gz6qzwwjsqi49dxg5"; +"libertinus-type1.doc-57159"="p8hng135zwahklgzfj6dqwfvah94ylxi"; +"libertinust1math-1.2.2"="pc8wfs8px04bnsgwkhbi46gs6synmvs1"; +"libertinust1math.doc-1.2.2"="v094dws0m9cv01iamdpirrwlvmdsf665"; "librebaskerville-56018"="n7ld6vxki5zh7svbpgzl239y3gb9h2xn"; "librebaskerville.doc-56018"="31pv0p1g3za88z7br5zx2jfhvpaij6m7"; "librebodoni-39375"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5"; @@ -1335,12 +1343,12 @@ "montserrat.doc-1.03"="0hb2s3xrsawiza8qn21hwkji1sxxi4xz"; "mpfonts-54512"="ar90vvz924ppxyfbqa3g7j7q9l4ddah2"; "mpfonts.doc-54512"="kyij6dba277ysdwyd74bfybqi2bgm436"; -"newcomputermodern-2.31"="g9nj0x2h3k845fb26xngpmsc4vnvw9gm"; -"newcomputermodern.doc-2.31"="prz0lnvzv52ypw4q8s15ix0l58sn9c3n"; -"newpx-1.413"="bp58v6iaiyl2ivznf1h44ny4g5snnvw5"; -"newpx.doc-1.413"="f5kk1mc9f6bp453drmmzawvina0md0qg"; -"newtx-1.630"="dqk5sv3ivpash74a9ddbgv0qjrqck1rc"; -"newtx.doc-1.630"="vm5wbybsqdz6k4qlrpzkprprhqsqyyzf"; +"newcomputermodern-2.34"="d95mf74dpndq1id44jiprf2rlmiiihy7"; +"newcomputermodern.doc-2.34"="x6dz99kgfj0s1ga9k8k3a05bd6g461mh"; +"newpx-1.414"="dhhrp4ylaz6xk7z0n19lbp5506nkx7zb"; +"newpx.doc-1.414"="3kvjf9vzmbhmcsrkcqzp9yk6v32l9wgq"; +"newtx-1.640"="vx0dbvwhxc8h39pfh8i878wpfw02xwj7"; +"newtx.doc-1.640"="fxnx7kjh4226k72qwhwgqh9703im1v3n"; "kastrup-15878"="qdr5cacl37ans3zd5jlzwr2356xxgswy"; "kastrup.doc-15878"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw"; "kastrup.source-15878"="13vj32k48f0ahs5694zrsvk953kxjrwc"; @@ -1352,8 +1360,8 @@ "niceframe-type1.doc-44671"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a"; "nimbus15-1.013"="9k2ck6b5lj3n5fjlpmwxs589mf9ph02y"; "nimbus15.doc-1.013"="pb7vyh76yjs5ywb1hcwpxid9gzdq082q"; -"fontools-55997"="f7m47yp3gxpy1xffa1mvlz4rsy120ypl"; -"fontools.doc-55997"="5zay561ij6sp1wcvdjyfa8p0ppagbjyh"; +"fontools-57171"="lhkm7vl0plalj8f7c3x2py1ba76w3fhz"; +"fontools.doc-57171"="zyx59j8vq5w15fljpq37jx10aaaxmnzh"; "nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd"; "nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff"; "nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279"; @@ -1361,8 +1369,8 @@ "noto.doc-54512"="ws089havhd1gi0rs7mvdh6nb0f1npbxl"; "noto-emoji-2019-11-19-unicode12"="4hgmkcwhy0air6pw59331ydfxbjj0fxv"; "noto-emoji.doc-2019-11-19-unicode12"="viyj6daza3fqvdsj101l75v32v9xkv8x"; -"notomath-1.00"="xyh8sd811brsf7gz7qsn4mbjrxas4ms8"; -"notomath.doc-1.00"="y9b5jwprlwx8drir8c6q8agfx9if22jf"; +"notomath-1.01"="82i6a43z09zmn5rxgyxpwiakb1rxr4z6"; +"notomath.doc-1.01"="nana478cpv0z89s7f9w5lmb9xvzxjx2b"; "obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh"; "obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl"; "ocherokee-25689"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a"; @@ -1381,12 +1389,14 @@ "old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb"; "oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd"; "oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda"; -"oldstandard-2.5"="mlwzzs29s5bf8hym5748wsldj2w092rd"; -"oldstandard.doc-2.5"="qrz3lybazynjlp770l9sknzrcr2mcjdn"; +"oldstandard-2.6"="95xqbrjzizc2qhjaw30zi0x2h7w77cqm"; +"oldstandard.doc-2.6"="dmgzhqgqk0h11ix5y0gs4ci7r73cfawc"; "opensans-2.2"="a68ghfiy4iiv9n6z78s956grswbdyf4k"; "opensans.doc-2.2"="c70nwprgs35f2a7bvabdbsnmkayxyvd3"; "orkhun-15878"="fmazxvhmc0r0m96ms6a234wj139g00iy"; "orkhun.doc-15878"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l"; +"oswald-57253"="rajfni01q60wwf2vjvahqhndykkjx8cj"; +"oswald.doc-57253"="qxvy0gzc4nz345qvg2k8441lh86jqc1g"; "overlock-56079"="ml25rmi7bi6q1yag7sj91zjmq49rmznd"; "overlock.doc-56079"="vcm3nk33hlydpv1yaz2gw9038mk6gbcz"; "pacioli-24947"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv"; @@ -1407,6 +1417,9 @@ "plex.doc-54512"="yf6z2wd095cln6lcg885b8qx6grnkr1z"; "plex-otf-0.07a"="2k3j1snsf3d414k4pjq56d9b1vn2vh1x"; "plex-otf.doc-0.07a"="z6clw20q3nfwzn087f3c3ifc4g2yr4kp"; +"plimsoll-1"="di983hrdafxqnqf406bgrph743kslqmk"; +"plimsoll.doc-1"="9rz48f3k6b03lvd585g8g50vn6f8xz1p"; +"plimsoll.source-1"="11ypgr9wnihsggwp3jrwr93yf93hjfvj"; "poiretone-56070"="isnd3cmsm0ps7dh40sjqiwa9vrpc1d19"; "poiretone.doc-56070"="k2g9vk6snvf66n1g6x2d4hd2d1z6cghm"; "poltawski-1.101"="ipqjw12syp38hj1pw4b9g03kx07l40vn"; @@ -1447,8 +1460,8 @@ "sauterfonts-15878"="kciqmij0w173na214ix5yhngc18likch"; "sauterfonts.doc-15878"="x2lc53r2wnwrjfainmngafdsg39zyf48"; "sauterfonts.source-15878"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m"; -"scholax-1.026"="ydajpfgivxbqvvrgx1y3816ghydi4kas"; -"scholax.doc-1.026"="lqf9lmig6dl0iddhn5q21njmyfkcqqva"; +"scholax-1.029"="ybzp2iq193fhc9y76aqrfrp101gigwz6"; +"scholax.doc-1.029"="jss5hdfcrl9bsdys9l0xmnks2lfs4vz1"; "schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807"; "schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81"; "semaphor-18651"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35"; @@ -1463,17 +1476,19 @@ "sourcesanspro.doc-2.8"="iyk2jh81qg0bq9j0zi8g35mypd0zcll7"; "sourceserifpro-1.4"="zxfp95p1ah6yv6n7p0bdsvnmrpm42kjl"; "sourceserifpro.doc-1.4"="qg32lg4s8ba732ac5z3gzc6i7iy0mdls"; -"spectral-56153"="wpy09gk4zc3amy45b8pnk7dx4yi0qx6r"; -"spectral.doc-56153"="ws7xnmisdi6ppagbsmqicn4384hz9fm1"; +"spectral-57296"="s16pqm20px7mjdqdvgq2ikifrbimcm83"; +"spectral.doc-57296"="zayb8fwvv08a4wbvvk5z3jmp0x6pb8sw"; "starfont-1.2"="phdad9yy6nvcxi7ym1chdvz0vvb309ag"; "starfont.doc-1.2"="96h183mv5rmxmnkgy6766519cz5nff6g"; "staves-15878"="9vcnfl7q4czfhyl3zxadig3nzdxg900r"; "staves.doc-15878"="rn25a0syl0d0n89jp09906y30679mr7v"; "staves.source-15878"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3"; -"step-2.0.3"="v0amk44nny3vi305zpbwl0w16sfcafr6"; -"step.doc-2.0.3"="ahh0r2mdrkavizsw1wqb2npfy6vfjrf3"; -"stickstoo-1.033"="k0kj2930hby7wkrxlal4wr7ajagm9lnd"; -"stickstoo.doc-1.033"="mn4pm8hwyl39h1v7xkvhd8dghkbnwlk3"; +"step-2.0.5"="nr1cw7y05s41v9ndh46l6yi7g9j9ich4"; +"step.doc-2.0.5"="ym39n0yndkc213b0mckbwbvp9nwm8qk8"; +"stepgreek-3.0b1"="w7245whipp7l165zrl18q578bi9rmvc2"; +"stepgreek.doc-3.0b1"="h631y9sxkkq9wwj28z3cpk0h8307ksp8"; +"stickstoo-1.034"="1s3rabdgy9m5brnp0ldpinhsr7d1v6ay"; +"stickstoo.doc-1.034"="2ca34j220kgnmx9nmnvrm6wravidazhw"; "stix-1.1.3"="sxfvkk30xb94rfby1kli4xny57xsbqv8"; "stix.doc-1.1.3"="xa4z5gssrb74xsdc392ni8rww37c2phd"; "stix.source-1.1.3"="m4csxq0wlzy246f1kgbd4n0sfgrcbnri"; @@ -1535,8 +1550,8 @@ "venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g"; "wsuipa-25469"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz"; "wsuipa.doc-25469"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm"; -"xcharter-1.209"="j907j2f8vvmvh70qfp5zxpyyrh2mj4c8"; -"xcharter.doc-1.209"="xbqd9g70wmzxv23i9nsg6fc3prfz5xmb"; +"xcharter-1.213"="azidj7m4wwhj42n8sgfnjzyj3pajvqmr"; +"xcharter.doc-1.213"="7y5ybmnv996qj3s5lz459acfkgc5d5gn"; "xits-1.302"="p0s2ycdklzp3nwp8ix7zfq30hp2wfgwj"; "xits.doc-1.302"="avh0lr47xhdnfqpcxbjxlcp9q7q1mi59"; "yfonts-1.4"="i2aacxlhsnkbgfb9i8p0sdwb57qv6gb6"; @@ -1604,6 +1619,9 @@ "accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab"; "afm2pl-54074"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y"; "afm2pl.doc-54074"="4kms0bi8801giwdiyk5d0l7q0rdsvqi0"; +"albatross-0.2.0"="ypcdh3bdsgviksrqsv80y01l5lxshx3f"; +"albatross.doc-0.2.0"="v5cqy86r1nn088v9r1aa0d5hzv6kbyrm"; +"albatross.source-0.2.0"="a7jydvbzzp2z1xsm9xf48k3dgwsd4s2v"; "dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9"; "dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x"; "dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk"; @@ -1616,8 +1634,8 @@ "fontware.doc-56291"="d76vkfmsnnxyn5pzp37k35mkril4f26f"; "lcdftypetools.doc-52851"="c6agyhm6yaqg7gfnahfy124cdkln32cl"; "metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq"; -"mf2pt1-2.5a"="d57jv2y04fsln3q3znw2qi16j7dfq3ap"; -"mf2pt1.doc-2.5a"="gc2i9fp30877ycz5l3wgphwlg9kpfqp7"; +"mf2pt1-2.6"="c0pp9hwb6xn5ka9is576ml3cy7dkliff"; +"mf2pt1.doc-2.6"="ml4dcrc2qy0d6wkdqf0gg60719hcm3a1"; "ps2eps-1.68"="ja294cdv9aagllqxjbckv50b13swxlvj"; "ps2eps.doc-1.68"="00q5228fgcsw6rbadprynz6zdjc6y2j6"; "ps2pk.doc-52851"="k23d42q6071yrh1jnzxdw7yx19nbk5ac"; @@ -1639,7 +1657,7 @@ "eplain-3.11"="qn75j5ylrpq7n758wgspr9bgisd8bnlz"; "eplain.doc-3.11"="81yx3sj0nzw7l8q0xxf2cyqkvipfcg9m"; "eplain.source-3.11"="fn1f737csi8474xf9dis8azwbh3478sq"; -"jadetex-3.13"="79dd0y9m791m62b48pnkyw4352271a6d"; +"jadetex-3.13"="nzij63zrphdvv457fn1b7yl1cghrig5d"; "jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2"; "jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9"; "cyrillic-47350"="zax5fp5a3p2zd3bhbpng70sydjxm9i1p"; @@ -1678,9 +1696,9 @@ "chess-problem-diagrams-1.15"="yiqgdwhfqypmf5i21s0r48614jzl16gi"; "chess-problem-diagrams.doc-1.15"="aw911cwfw6nix4s2597w1nxa5sb7gf1j"; "chess-problem-diagrams.source-1.15"="4jflmd6p2dxlh63dmc4d96c0qga3hcgk"; -"chessboard-1.8"="mpdarc678ndb3qhx72fbkfr5di3mp05f"; -"chessboard.doc-1.8"="9s4g0f3q9dbv521rqxgwf6v4sk9l1mrl"; -"chessboard.source-1.8"="hkh4fq04v2zmw4fwjnkcswhiq46pn3wh"; +"chessboard-1.9"="366wmw6jypbcg0dd3p6blwf1rzja917a"; +"chessboard.doc-1.9"="khnp39nrlnmca5sdy0q2n7f1gr0f3wpj"; +"chessboard.source-1.9"="9hi3xxi5iablrhcpkrc7gwa0axwmbipc"; "chessfss-1.2a"="is60vi3pamq0qzj8pw0jvj4prvgbzxp2"; "chessfss.doc-1.2a"="1ia29r7y1ja9d5hx7z17bk0qw7lgz2mf"; "chessfss.source-1.2a"="r4dzyg9nx44ajf01kbj0qyfg2r4dawc5"; @@ -1731,6 +1749,9 @@ "pas-crosswords.doc-1.03"="pm76nswngl127k5c2vwm9nwscci1dcng"; "psgo-0.17"="487m1ggdz7a554viflmp4cg2kgdw9ghv"; "psgo.doc-0.17"="cw2v9zzpbmqqw8k8hdq0la2dhdggip3d"; +"realtranspose-1.1"="pkzqw0yhk215ddxwj6sjdss531vxdi0p"; +"realtranspose.doc-1.1"="cwxhdxg5gc939jifir67vin798qrcvb9"; +"realtranspose.source-1.1"="ynbps4pnm2ll3iqkhbqhsflpx0wsydk6"; "reverxii.doc-24976"="2w8l7rs761h556il3d875k0sc86xll98"; "rubik-5.0"="9wi8kxm1rfbqdmgd08bkfmmcrxh6qglv"; "rubik.doc-5.0"="byp3r482d99yvd7wj0gw7sy8azki6srs"; @@ -1861,9 +1882,9 @@ "qobitree.doc-15878"="xi15qg62q42sgh4115gp2mcnv7nriwiz"; "qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp"; "qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg"; -"reledmac-2.34.5"="n2883406m95bb5dlyxzmqwiz2hdngkh8"; -"reledmac.doc-2.34.5"="jlnsmw14cyn89s2vslvcnqvs1qj05hnj"; -"reledmac.source-2.34.5"="55wa89r0dz9n9k992ffjv9010xslwmvl"; +"reledmac-2.35.1"="5whll2znxwkk1j7xhgi0ir7ki01aqmsm"; +"reledmac.doc-2.35.1"="q4q0bna50w15yg65s0icf33l3b40yqg0"; +"reledmac.source-2.35.1"="ack7d2gwfnsz8rl36z91k6xqplnnr0s5"; "rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5"; "rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq"; "rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y"; @@ -1930,8 +1951,8 @@ "na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9"; "persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm"; "persian-bib.doc-0.9"="q8vjf93qjdkm6qz099464mwdl4w4gjqi"; -"quran-1.7a"="p0vapx04q4a6lfpc8bw0hzblm21z66jf"; -"quran.doc-1.7a"="c376j0bvpwzx9ww14vjhyk8jcaq4sp2j"; +"quran-1.8"="7wwrcn6x678y2xiqn4mf0mfzy496myav"; +"quran.doc-1.8"="dn3d31xax2lfciwb19jwg2pmwawasvsp"; "sexam-1"="jlh6d5mzxqbnkn6yy963fnhc6rmggigl"; "sexam.doc-1"="532l18ix2czx5r80ar4g7mqgdij4r5xx"; "simurgh-0.01b"="n8bv87n12x5xv3h41487vyqpbigv3qkc"; @@ -1974,9 +1995,9 @@ "uhc.doc-16791"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z"; "wadalab-42428"="cpc689ywzaqil8xz78nkzwx30qmqixh5"; "wadalab.doc-42428"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j"; -"cjk-gs-integrate-20200307.0"="2svsh7dq007rsgn7phbj6mcn4r72x99h"; -"cjk-gs-integrate.doc-20200307.0"="pm40f0bk29kasbz433m9w524yfww38k9"; -"cjk-gs-integrate.source-20200307.0"="scgfp18nqkcghsvw99khhw5x11zv693p"; +"cjk-gs-integrate-20201206.0"="0llgl1xwswii91q704aj23r13xqfdcbf"; +"cjk-gs-integrate.doc-20201206.0"="8z9x8jgv4zw2nvb4v1k3k5cyl0xc337h"; +"cjk-gs-integrate.source-20201206.0"="scgfp18nqkcghsvw99khhw5x11zv693p"; "cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss"; "cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9"; "cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k"; @@ -1994,16 +2015,19 @@ "xcjk2uni.source-1.0"="r4rlcadgrylpzdds14c0nf5y94yclhm8"; "zxjafont-1.2"="jpj2xg53gz5k86p1aqc0czgbi2pp8yab"; "zxjafont.doc-1.2"="8z7k507pgb7g4998rw2l53a1kydmp3xk"; -"ctex-2.5.4"="q7k71rliafarfsqysqcrilrby1cb3cfh"; -"ctex.doc-2.5.4"="8g06xsy7c8plsisp6lq1047xvgbwfz0v"; -"ctex.source-2.5.4"="z4hp28044xxybzdwag1jd0cv72scniy6"; -"beamer-3.59"="lz6nmign8qqwnlz7408bxvrm3l257l2v"; -"beamer.doc-3.59"="lx1k8s5ci3y0jzil3mrakpm06w4jqv5f"; -"pgf-3.1.6a"="nn2layzf2wyaj757rjcsbmz8y0f93ixy"; -"pgf.doc-3.1.6a"="id9zxi14x9mncld4yjb4pk0vspx0lmkz"; -"pgf.source-3.1.6a"="axqhmadpaw4srzqcj65lg69dxjr0m45y"; +"ctex-2.5.5"="l9fx68lwzrp9lwkzfq1sx0hxmmfgv3xj"; +"ctex.doc-2.5.5"="qq0y6lfa67z9nmiv6bbmc64rvi16z58s"; +"ctex.source-2.5.5"="z79vc82r08k6w6j71fyb26pckjx1x3fc"; +"beamer-3.60"="pjkxpl3nzmjqr08n8wdzkw8v7kysixq5"; +"beamer.doc-3.60"="i94jbccs916w9kyzn1sai2sa2jam0xxl"; +"pgf-3.1.8b"="hs9cw6pfxzc0cb77fyn1gs94l92jbs3l"; +"pgf.doc-3.1.8b"="is2s49v1mshmpwplajvx27mg9pz1z2gp"; +"pgf.source-3.1.8b"="axqhmadpaw4srzqcj65lg69dxjr0m45y"; "fp-2.1d"="lxyxf8jkbgrkk43qbnr2s3ns19ihgmw5"; "fp.doc-2.1d"="ih2kq6xp1nd5gs9bc9vhd34qa7jcj093"; +"ms-57002"="qp98aj0g84a9py4vn8kcg0wwndfvg7k4"; +"ms.doc-57002"="lvc0364h2bh150sjal8xyfn1hbf4xmcs"; +"ms.source-57002"="2vd4h991lmmcj3wwiqn6z5znp44vzd9l"; "xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg"; "xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6"; "xcolor.source-2.12"="zgpsq8x4n6m23a9d1m5m06davpxv76id"; @@ -2022,45 +2046,45 @@ "euenc.source-0.1h"="amsw2lpbcm2grnfch6cag6hyn957acv6"; "xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4"; "xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf"; -"luatexja-20201005.0"="9cl7mm9sbrk1xnaa2a03l9r8ygvf1549"; -"luatexja.doc-20201005.0"="wiprs1hdgzj3579r8p7aq4si961cn173"; -"luatexja.source-20201005.0"="0vyyl2rlhkdagrqjck43r289p5xa79ch"; +"luatexja-20210103.0"="krxpdw5n4izk37kaj4f0ymi5afhdygxl"; +"luatexja.doc-20210103.0"="y0r7fmq0vi1fj2bvmzdh56gvrrqcdhjb"; +"luatexja.source-20210103.0"="yp79bqa3qy5zfzl6hzkk2mlyyk6brqh9"; "luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4"; "luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0"; "luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp"; "ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh"; "ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq"; "ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy"; -"platex-tools-56451"="aiqfyvkvgz2186fsj25ljymbmsm8l927"; -"platex-tools.doc-56451"="ixzwk3gvdxalgnxagpy72sgqcgv1fj6a"; +"platex-tools-56661"="0gsz51576bqpza0ing7h13k9y55dwmk9"; +"platex-tools.doc-56661"="7wa681sw52rqjp8cg72vmcbhnw2g50jv"; "svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i"; "svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj"; "svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4"; -"uplatex-56548"="xmk1pk5ck677acr534phb917ndhfxrwm"; -"uplatex.doc-56548"="b792jqspgq9p44n7ng8dprawfsp45k6f"; -"uplatex.source-56548"="jafq9dy7s19lhnzlbf13qrkdqdvcbjxs"; -"latex-base-dev-2020-10-01_pre-release_9"="n52sw89jrawgrqxxjbnz6sgc63b7cjmx"; -"latex-base-dev.doc-2020-10-01_pre-release_9"="yw2iwkhk0dmvbc1h2sa6hr29wq159vgf"; -"latex-base-dev.source-2020-10-01_pre-release_9"="indvnllsmg4l4j39dw5dv2qgvzv7p34l"; -"platex-56582"="3k5p6bl7x1p919w2iw4pvc8vhnfdnpd5"; -"platex.doc-56582"="4lmb5dsxwnhsg4dzqbsng0ka6da25dyx"; -"platex.source-56582"="iy5qsmlpfc0gyiyrrgbv3jvrd3sq98rx"; +"uplatex-57186"="xmk1pk5ck677acr534phb917ndhfxrwm"; +"uplatex.doc-57186"="b792jqspgq9p44n7ng8dprawfsp45k6f"; +"uplatex.source-57186"="jafq9dy7s19lhnzlbf13qrkdqdvcbjxs"; +"latex-base-dev-2021-05-01_pre-release_0"="ipbkxg31ix8l50ziipmbbggxkizhz6d4"; +"latex-base-dev.doc-2021-05-01_pre-release_0"="a9cyw1f79d7lb6vf974a5glz6kx5hhim"; +"latex-base-dev.source-2021-05-01_pre-release_0"="b3navw8q9x1rps0vq7ymsr7lg1bamb02"; +"platex-57186"="3k5p6bl7x1p919w2iw4pvc8vhnfdnpd5"; +"platex.doc-57186"="4lmb5dsxwnhsg4dzqbsng0ka6da25dyx"; +"platex.source-57186"="iy5qsmlpfc0gyiyrrgbv3jvrd3sq98rx"; "ptex.doc-55920"="8bbl9cw3gzqnv1a1h6al43qkj4c7hkp5"; "ptex-base-56487"="25h63rcankqnc0phq3sr0dkxd57ws9vk"; "ptex-base.doc-56487"="y0mqw72x8di4z9k0z9mnznw3sqyr34rs"; "ptex-fonts-46940"="iqch8gk4nianpr01y03nl0zwp49bw1b4"; "ptex-fonts.doc-46940"="ln071z7k84vqpdf72ngcn7s24hpkhazc"; "uptex.doc-56291"="x7582i32ib2gr2fnkl1dwmaljyqj51b6"; -"uptex-base-56489"="ailz7gb71drgy7glh81731lnydbpkmwc"; -"uptex-base.doc-56489"="ma00d4qzm6i4lln9zlpq4ik9wvvby34v"; +"uptex-base-56832"="ailz7gb71drgy7glh81731lnydbpkmwc"; +"uptex-base.doc-56832"="dsfdb6gnflgz1bdqv4dfm914scr7gxpk"; "uptex-fonts-54045"="dlh3qw9bz67kldx14fqd7f9fb9gcgcah"; "uptex-fonts.doc-54045"="fx7gncl6m75n5pi7y00qprwmvgp978n4"; -"xecjk-3.8.5"="9sy0bgygmm3m3zwn1510hbbkr7ywmji3"; -"xecjk.doc-3.8.5"="925s4lmksm59mnkrr49i6dvyqr8pzlwx"; -"xecjk.source-3.8.5"="jqx668zfxbryiv8vli98gq4bvvb3q8hl"; -"xpinyin-2.8"="jx2f7l8zlwbpbaa8zzwpnj2ka5ipfbfa"; -"xpinyin.doc-2.8"="9r26g7z5dyfcm0jfds6yb5hrrrr324vr"; -"xpinyin.source-2.8"="7gbn6jslq8xgqrzpjrhsjna8my10vwah"; +"xecjk-3.8.6"="3jp1b8rf5ncm0wm7gcwh9n1ccnncyyws"; +"xecjk.doc-3.8.6"="q82p0svfc3m40rg63frhijslapvch7zs"; +"xecjk.source-3.8.6"="h75n0pid7fhjhwl589nzhljya2wck3zn"; +"xpinyin-2.9"="1m2kq41z483px431dxn4w33kjqm50hcc"; +"xpinyin.doc-2.9"="dal70z1n0yv7j7k62rdzyj26ijnfsngj"; +"xpinyin.source-2.9"="13njiqkx26j9q98hcz4aklsr3wwlzj6l"; "zhmetrics-r206"="2li2anrf74242blfd59cxfyn13iwmfxs"; "zhmetrics.doc-r206"="njh801caaxkfyw5nsfv3q36gkcql14pj"; "zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm"; @@ -2075,7 +2099,7 @@ "fduthesis.source-0.7e"="40fiw5f3xjz72rmls35aqwyvy58v5q1m"; "hyphen-chinese-54568"="pz0lws81lfznlprq5rc77whxx61qcw20"; "impatient-cn.doc-2020"="8k1gcnqs5gghbarikj17ykh4vgahpqbw"; -"install-latex-guide-zh-cn.doc-2020.10.1"="wcbgjk72iw9i043kr9xj9mb3adhc9ark"; +"install-latex-guide-zh-cn.doc-2020.12.1"="dl5mxpibmz8v9avcqrx77aq5ryswcj5a"; "latex-notes-zh-cn.doc-1.20"="qx777fwi8k06qvknnll3crc1j0yvraxs"; "lshort-chinese.doc-6.02"="67pcgs0daq1ns0kpk1bml43d5zsgwbl1"; "nanicolle-2.03y"="5rvjbz93d55qcywbg7dkh231bsc82xzq"; @@ -2106,18 +2130,18 @@ "babel-bulgarian-1.2g"="4c5cdn8lijfw1qhkfz69pvlvl2hcg5hz"; "babel-bulgarian.doc-1.2g"="pyikwcg47yj8nh416g6wdzwk7a7f460p"; "babel-bulgarian.source-1.2g"="km3vz4iykb1pckz9bgllgd6xxc77k2c9"; -"babel-russian-1.3k"="2rlfypayd115mvqmim0bh36njf5ihdfj"; -"babel-russian.doc-1.3k"="1i3m4iiwwkzzpdiwqn6s6n7l7cfrlwwa"; -"babel-russian.source-1.3k"="2sz18i1sfqaczkcy10b3hygrpfc8s8ky"; +"babel-russian-1.3l"="m59pjnrkqkr25c3qiglh8n38vbqhiz57"; +"babel-russian.doc-1.3l"="vbldwnf7n2x3f6lv125qdi4vabrj0sa6"; +"babel-russian.source-1.3l"="3xv3nrj81pw3j871b9q7ap4adz1i721j"; "babel-serbian-2.0a"="qz0klmzp380x2sn97v6ca1hjpir9fxmk"; "babel-serbian.doc-2.0a"="5s29smlmhqrx68ra2k6mqvw5lffclbb7"; "babel-serbian.source-2.0a"="6gp84lpbncbd2775nfac1zg86034a7i9"; "babel-serbianc-3.0a"="rxrc15zajz0g5gzczw5k7kid3g3fisxm"; "babel-serbianc.doc-3.0a"="bid4np071hjbaplxq8pvxggwifky0y8d"; "babel-serbianc.source-3.0a"="wa836abk9b2z4r5zxfzyj6z3d6wzfvjm"; -"babel-ukrainian-1.4c"="zkrzqv0a32c8dm30bin1axbkd1i7fxlm"; -"babel-ukrainian.doc-1.4c"="vj7acrkzm3cdby2aczcancag1y6swvl0"; -"babel-ukrainian.source-1.4c"="yh5qaricqrn5lmvrz9vdycbr5y2lpmr2"; +"babel-ukrainian-1.4e"="v4xihfkgfn5dr5lncrk0rrchwviakhjr"; +"babel-ukrainian.doc-1.4e"="gdyd3xlx328rpb68mcdvhbdvk9xfv6x1"; +"babel-ukrainian.source-1.4e"="5ir7vrg6inyzrph1za72cdlqml2c0nrs"; "churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp"; "churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw"; "hyphen-churchslavonic-54568"="b4sqbmrs146m82i36hnlcpls09zl62hj"; @@ -2132,9 +2156,9 @@ "eskd.source-15878"="q70i7jl8dkf9vakj558fgwqfbn8230q0"; "eskdx-0.98"="b2dx9jv2rg97hmlf3gx4h4l3ci16chr2"; "eskdx.doc-0.98"="l1r5bapnlsz61yasg9gyrzp6za8iw0nf"; -"gost-1.2i"="i4ymhad9kyybwc4072yhc204pr9hfw3p"; -"gost.doc-1.2i"="vwsvpn0p9d4888107r2qj7rghl3l50xg"; -"gost.source-1.2i"="fawqr3q9mk5ki6qgqzv3xa4kz5ak2srq"; +"gost-1.2k"="8gc0lvpx68j3x12gz8p40m651g0f58a4"; +"gost.doc-1.2k"="wx6w4c5p6fr3z558s5pkhx764zhz4cj0"; +"gost.source-1.2k"="s4prj09pk5lrvm8nbdl9mqxnnmdi2b5r"; "hyphen-belarusian-54568"="58rbwvqvgbds46sg908xk8hriiw9ifzw"; "hyphen-bulgarian-54568"="nc2iqf07jr477nryla9xn5sgxdb21rd5"; "hyphen-mongolian-54568"="rl6ypg7gdsrlj4j4i3qb05mjfmljykxn"; @@ -2199,10 +2223,10 @@ "cs-41553"="ks76xw08rrkrcxg7rv72w18glx2vncfk"; "csbulletin-54433"="yc0z0nyy6mmlwrn711j3gkpm5afa6ljx"; "csbulletin.doc-54433"="andx6r2719a1pfg044bclvha66vrcc1z"; -"cslatex-56548"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; -"cslatex.doc-56548"="sjrbpvzpncq8xk13nz9n31wqz8fir6xw"; -"cslatex.source-56548"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; -"csplain-54699"="zcqw5855kibhsivq0vvhpyl0qjrq9yh5"; +"cslatex-57318"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh"; +"cslatex.doc-57318"="sjrbpvzpncq8xk13nz9n31wqz8fir6xw"; +"cslatex.source-57318"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq"; +"csplain-57318"="zcqw5855kibhsivq0vvhpyl0qjrq9yh5"; "luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1"; "luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw"; "luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8"; @@ -2215,6 +2239,7 @@ "vlna.doc-54074"="f3wz8jy4vbrb3bhk9ly7fdkipwfqixbc"; "MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn"; "Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl"; +"amiweb2c-guide.doc-1.0"="w9jm6mjivcml5swz9v14jrc7amyzkw3p"; "amscls-doc.doc-46110"="4hsr68pmd3v06fnxiynmp4xpgik6v8g2"; "amslatex-primer.doc-2.3"="9d9pxr0jbjm6zwqd51f7m2bzysdq5gv7"; "around-the-bend.doc-15878"="a6jilpw0nw27vlj1shnhxfv92yn86ys2"; @@ -2223,7 +2248,7 @@ "components-of-TeX.doc-15878"="7sc5ryfj785jifvw9b44yni2ifmssr7f"; "comprehensive.doc-13.0"="c4y3bgj3r97vy17qbdakmdcmcvm7xbqw"; "dickimaw.doc-32925"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7"; -"docsurvey.doc-48931"="0lml7hvr42zsfk14da493xsl24z3i8vx"; +"docsurvey.doc-57298"="46k4jz2gw4w0nv9vd77n3342kwk43ns6"; "dtxtut.doc-2.1"="108k3lyvja5wmg8gxyvqskbz8wwh0cyw"; "first-latex-doc.doc-15878"="8vcday36pq5hlr075kjk6hb82ypazjd9"; "forest-quickstart.doc-55688"="g08gcf8sk0kkn6jifvx355slh3lvbr6l"; @@ -2238,12 +2263,12 @@ "l2tabu-english.doc-1.8.5.7"="j7m684bvmpv1jaa6s856dj9aknrwlqiq"; "latex-brochure.doc-40612"="azp69yf9xkksqan9n096wabgxlk9hgsn"; "latex-course.doc-2"="km59hhadaad0hlpa07rqmx91036h123r"; -"latex-doc-ptr.doc-15878"="1dsc8ym34nlj315aln3npfibx37n9c3z"; +"latex-doc-ptr.doc-57311"="2ckpyrc8nls1jxlpnpg4g9rnw91djc2y"; "latex-graphics-companion.doc-29235"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2"; "latex-refsheet.doc-1.2"="9gvmiiqg78xn8348cymz3wfzi45mf8xz"; "latex-veryshortguide.doc-0.7"="dv3ikj9drgivpsapvl9jpkbww3h839ya"; "latex-web-companion.doc-29349"="wzj6qw8bhwr82ipsph640ya62mpj6k3r"; -"latex2e-help-texinfo.doc-56291"="jmg3aygadzdj3jvdsd26rvg9ipjbwq7d"; +"latex2e-help-texinfo.doc-57213"="jmg3aygadzdj3jvdsd26rvg9ipjbwq7d"; "latex4wp.doc-1.0.10"="bxffry3cy7vkcjhdm5yzn4hipma74jdp"; "latexcheat.doc-1.13"="iav6gzdcadndwli0jar6d7i1711ssq41"; "latexcourse-rug.doc-1.1"="fxz46xn5hazqy707qrf2mkgk121m6ywv"; @@ -2263,6 +2288,7 @@ "plain-doc.doc-28424"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49"; "short-math-guide.doc-2.0"="34mdd47c63946iz86c2r0g2jx11q4mhc"; "simplified-latex.doc-20620"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9"; +"startlatex2e.doc-56809"="hd5dhdc0klww7vhrn0q0d77lr3frlcw3"; "svg-inkscape.doc-32199"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m"; "tamethebeast.doc-1.4"="14cs89g2l3bn3xhfrhrw9pfdf65c2xcy"; "tds.doc-1.1"="fmmdgblpf26x9ajn16g024sn5sbwwy0s"; @@ -2275,15 +2301,15 @@ "titlepages.doc-19457"="g0fvssp703yk3c2icdb8qgalxikm0xq9"; "tlc2.doc-26096"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s"; "tlmgrbasics.doc-56221"="cp4cwr8k9sjq58mm67qf23swal2jqaah"; -"undergradmath.doc-42926"="kp1xxp209mbvyhpmh62yp53c6q8ppnwk"; +"undergradmath.doc-57286"="58rd10vaavwf003gq73yk82hlxzmvcva"; "visualfaq.doc-38647"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m"; "webguide.doc-25813"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8"; "xetexref.doc-56291"="4ljbfwhzmwq71nfgqfkijqa27hsd3y2i"; "armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq"; "armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz"; -"babel-albanian-1.0c"="1dasgklnjx05y74bk0pcwn1ivghswmvs"; -"babel-albanian.doc-1.0c"="vsgwp4d6skqm7v0i0d0bvb32zpylk7a9"; -"babel-albanian.source-1.0c"="yar9fs7vp71nsjmjp7hppgwpyd16w7xa"; +"babel-albanian-1.0d"="yqrwj8mb7773j1svwl5chhxg15rqskxh"; +"babel-albanian.doc-1.0d"="fpsfzmk847y3c6q5jq42dqz4sfm54yvs"; +"babel-albanian.source-1.0d"="xii1mv9hbv4f7xd1c13rxn53v99bjxnw"; "babel-bosnian-1.1"="l6pdr8hm15swhzxx5ly2rd24jnscsyiz"; "babel-bosnian.doc-1.1"="gahvgi7r3rs553pi00l1q33k3bz59pqa"; "babel-bosnian.source-1.1"="idi2fhr3wfq31pz63d3fi0zkjm58gzxi"; @@ -2296,9 +2322,9 @@ "babel-danish-1.3r"="j5ndb7h4jwgkk2ianlqy45sa8f59djd9"; "babel-danish.doc-1.3r"="9y9h8n6g2rwi004chcm8frm60hv16afi"; "babel-danish.source-1.3r"="slb1z6vbrhf23x471ivngv28mik8n3ir"; -"babel-dutch-3.8i"="5x891i0b2d78xsh61a96cshjncsshmki"; -"babel-dutch.doc-3.8i"="z93rpjg49q22ixnmvv8n4hy1nip4gv5w"; -"babel-dutch.source-3.8i"="3bwgdf7nzmwdrbfwglf6xm5bnf3nxqz2"; +"babel-dutch-3.8j"="4x9m1a08si80i831sgbgjnaa88bfvafp"; +"babel-dutch.doc-3.8j"="l3pigzhgp2jlb9dir38vnbkgkb0ji1xf"; +"babel-dutch.source-3.8j"="cx1l3xndvpvjins8f1rz4z3pqq86rwi9"; "babel-estonian-1.1a"="pn52pj8gprmsqf7f7i97vllrkjjm2bbh"; "babel-estonian.doc-1.1a"="nchqv4ahbhjrh6g49fj8xpjv1ghlqzn9"; "babel-estonian.source-1.1a"="8d3nvwgv9bvhhxsgdicdlf3gsrscaxsi"; @@ -2367,9 +2393,9 @@ "hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x"; "hrlatex.doc-0.23"="lrx3m4bg9wlqlrcd08mh90wal16fvilg"; "hrlatex.source-0.23"="s5ajy6yi6nzivfwafk5ymav4j2dcgif4"; -"hulipsum-1.0"="8pqz5vilzli6in81d604dnkz9024i5s7"; -"hulipsum.doc-1.0"="3sqiw98n02kg8752hzv7vp1r5xysrw0m"; -"hulipsum.source-1.0"="dv9wyvy9cbkvjlc9awaz0mv4vaanz7jn"; +"hulipsum-1.1"="1glcsnk30qpbxcd522vi4ddnhk3zdqym"; +"hulipsum.doc-1.1"="py5pklwmr7i1w63rhkysxw5s312i22fn"; +"hulipsum.source-1.1"="m7il2x4h4zwivgzxq9zzlc57xdd64m54"; "hyphen-croatian-54568"="wyg3vyklkrhpjhhb98x2v0iigwqf9067"; "hyphen-danish-54568"="w2ixlyv1zwnx2lww20hvrb8ghiwpy35x"; "hyphen-dutch-1.1"="fldx9b6pqwmkj21mry0s2yrfpbgi4mdx"; @@ -2406,6 +2432,8 @@ "nevelok-1.03"="v5hds3a09c91d79iac1qsyf0mr6lpaqg"; "nevelok.doc-1.03"="biq2dbyv6mak992s0cqb834k119xfa0p"; "nevelok.source-1.03"="5c03z6r25gidf0bncaanw1259n1hcdw0"; +"rojud-1.2"="z3b1grijbh986rpa49fncmfwj3lkjmcs"; +"rojud.doc-1.2"="xv1iy0filv53va4r8f99710ahb8cd0h1"; "swebib-15878"="5z0719m62712flc3ylrnp5223gbsk98n"; "swebib.doc-15878"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp"; "turkmen-0.2"="r8ryr694sxginv96wy2ibwg7mjwckmy0"; @@ -2416,14 +2444,14 @@ "annee-scolaire-1.6"="r0kwlnx1bhflkj35dwz9malgjhjhf3fy"; "annee-scolaire.doc-1.6"="3rc70b93ciiw5r7mq5rpfd933ccbvh7p"; "annee-scolaire.source-1.6"="jbl0zrqvrndbvpdn52lm212b95bv9k86"; -"apprendre-a-programmer-en-tex.doc-50933"="ra7bkghkmm4cl88fi1vn3rf9yy1kzya9"; +"apprendre-a-programmer-en-tex.doc-57179"="x4qrlzv0s9prq4hjb20kn0dcff7xmgzv"; "apprends-latex.doc-4.02"="fy3lj0gsk1nkcfp2ssyfm26a7ih2ysf5"; "babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa"; "babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk"; "babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33"; -"babel-french-3.5k"="9k614fpriq278ijb3b0r28i7vxypfj7p"; -"babel-french.doc-3.5k"="9fy21w7bmp2l881qkajds8npza5gxh76"; -"babel-french.source-3.5k"="j0rvcy3jbj9zjqh856sdrw73352x6zsn"; +"babel-french-3.5l"="sl1vn19njwbvy86dsx3xcixvc5kx925r"; +"babel-french.doc-3.5l"="mh277xcfj2lql9dpqfwr5ms75fslk290"; +"babel-french.source-3.5l"="rrgl05jg8dsdn292cz2pwr6mm765ca8g"; "basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj"; "basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n"; "basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f"; @@ -2445,11 +2473,11 @@ "facture-1.2.2"="ys1fq6vkml8gnfc6bjkx2lkbdw2w0fsn"; "facture.doc-1.2.2"="ij99my45fi9m1lcc79rj6kyxggmv4v3r"; "facture.source-1.2.2"="aywgffiyigrwxv9lipf7a131mycjp839"; -"formation-latex-ul.doc-2019.03"="i0f7ij9m4h02vxd21hs3iw7m23qlgjii"; -"formation-latex-ul.source-2019.03"="3g9v9qrcjkd5dms6aa3zdlr7q0sy572b"; -"frenchmath-1.4"="nvxiiich6w76xzsn9a73sg6d9gl79klb"; -"frenchmath.doc-1.4"="h6h3ywj67r11ljpy6passw07jm8v7zp4"; -"frenchmath.source-1.4"="ansrjlrbxv1ph59ngvr3p53bw04j9cnd"; +"formation-latex-ul.doc-2020.10"="lwwcc5rjbnqccskh19scmf6zsy85a4ra"; +"formation-latex-ul.source-2020.10"="hc8lyb7812bzqfaps76jk8fjyfsfbfn0"; +"frenchmath-1.5"="9farb3by3rv5q3i791d52aizc1z9h57q"; +"frenchmath.doc-1.5"="z4y6qbx3nc5rnqizjfk3rwsmzia6cgf5"; +"frenchmath.source-1.5"="sz9288008axr9di9bnrkkjcf9pmzm0pi"; "frletter-15878"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl"; "frletter.doc-15878"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h"; "frpseudocode-0.3.0"="d088q642bl3bnaz4lfla7sr73rg916l4"; @@ -2462,7 +2490,7 @@ "impnattypo.doc-1.5"="q72pgsqjgmxrgclh3lziqv83h1r6020j"; "impnattypo.source-1.5"="z4vzzjjhrxpaj91zqhzg6mx52av49qkq"; "l2tabu-french.doc-2.3"="ncl8is1rmnk3n9ybrsav882w5qsb1w2k"; -"latex2e-help-texinfo-fr.doc-56275"="83ly2z3bbhq0p919q2r3j8bdxddrqvi8"; +"latex2e-help-texinfo-fr.doc-57275"="7ifzcfqj7hsdliym14msbjvjimh2r2y5"; "lshort-french.doc-5.01fr-0"="33vkjmz23zk2jrzyw99zri58jm0cpxax"; "mafr-1.0"="vl6jgzlqqyn70cndvj91nnkmcxas15j8"; "mafr.doc-1.0"="v44yahqn2gnnfbnf1ayqr96va6y49aij"; @@ -2494,7 +2522,7 @@ "dhua-0.11"="4n8cvm61marrsbxd7308xw089j0q2wlj"; "dhua.doc-0.11"="kisr6kymm9v5kk9nfxi0ckdf6k8mhr91"; "dhua.source-0.11"="a9ap1rwrqqwh394c6hjqx5nlw070iwp6"; -"dtk-bibliography.doc-DTK_2020-03"="6m4772vgjc32aqxx990d6gzaisicw5rq"; +"dtk-bibliography.doc-2020-04"="vi2vdhrcaax7ia4xlsp4h3fy23qy39ng"; "etdipa.doc-2.6"="cid5wjvbs4hl5lwczp1s1wbdwxfwr24n"; "etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx"; "fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py"; @@ -2530,7 +2558,7 @@ "termcal-de-2.0"="pql7q4dqaqgg0arqgg7l8iz4hwxrxd7x"; "termcal-de.doc-2.0"="fpjnpzi59rrqg44j513w4d6f9cqi7ik0"; "termcal-de.source-2.0"="myc9fjxig0z3dirj1brla1q70ryrczrr"; -"texlive-de.doc-54604"="khc0yk2xf0v8dxhzxqavpwbwgc3wfkv1"; +"texlive-de.doc-57223"="a8qip61g838xk2gjs3xj07ankbhmffg8"; "tipa-de.doc-1.3"="aa0msh91ynxxigmbxwy72i05g095fwxg"; "translation-arsclassica-de.doc-23803"="xayn50bvfkyf5fh93426fg2m6mmvpdwc"; "translation-biblatex-de.doc-3.15"="n799gvic99wrrp9wlkzfdh3gm1sa4g32"; @@ -2549,9 +2577,9 @@ "umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9"; "umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w"; "voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v"; -"babel-greek-1.9j"="f62w6in6bbp8in23n7d3lfs774wjzk5h"; -"babel-greek.doc-1.9j"="cgfy00f52a9z9zc1v9md5k1znmv6c668"; -"babel-greek.source-1.9j"="r53ppvvjhjk5gkxr0j1j6q8dgv92rn6s"; +"babel-greek-1.10"="17bc657ll0aacq85s967yypmalya2krv"; +"babel-greek.doc-1.10"="3h72jkrqpa3jjw1091gix8rvwgwy78j2"; +"babel-greek.source-1.10"="yhx2b0dnjfy591xj1c2qw24hf7npwqii"; "begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i"; "begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc"; "begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5"; @@ -2561,9 +2589,9 @@ "gfsbaskerville.doc-1.0"="7sx91lqgpn4w4xgbdbpsk41i5mxixqf2"; "gfsporson-1.01"="k6gimiba8zfbnf4wc4zjrmwwc7ggnxkg"; "gfsporson.doc-1.01"="6i47g0k5ys9q394g6q0a3686q4h75gz3"; -"greek-fontenc-1.0"="m529vnxzq00v80700afp400q8d9468ck"; -"greek-fontenc.doc-1.0"="pr8wzpz1v48dkpcd3yhychdqaxi56vln"; -"greek-fontenc.source-1.0"="v8kv28db1b2ay1ybdcl88g1dnfvhk701"; +"greek-fontenc-2.0"="qcxq329yb8malcjbjc39rdylna76qvy8"; +"greek-fontenc.doc-2.0"="884sj5a8wq4vkjhsr9nnqzjjckhg59ah"; +"greek-fontenc.source-2.0"="2sjrw0m2an6m9gyrzx9dy0zj22yxjnlc"; "greek-inputenc-1.7"="4fwqx35kx5yqpbg8hy83pgpm45gm1q6d"; "greek-inputenc.doc-1.7"="1fwpw7k0xwbfgp38dxr9vw4hds93jbhm"; "greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v"; @@ -2589,9 +2617,9 @@ "lgreek.doc-21818"="iwa1xfg3sawwblifpgkc3na1r3hld02r"; "mkgrkindex-2.0"="v5hb36lspx6xyzzpm8ryprr7mwwpcrm5"; "mkgrkindex.doc-2.0"="mfpkm8mm8n0nqhzgnm70yjy16lzjvvhd"; -"teubner-4.8"="7h0mh95kwrp8l3im9fq4m4my65hxcwpd"; -"teubner.doc-4.8"="w0ygcfsjgrw6r5z49ciwxfwyxzpf6gfg"; -"teubner.source-4.8"="l0syr53r8jk5cjh3lx8bf279hlgwsps1"; +"teubner-5.0"="8j8svhs1l8v3x0n81yicn2z6xa5szch8"; +"teubner.doc-5.0"="0ybwf79saadw742zw3rb971s67ass35d"; +"teubner.source-5.0"="5cmgbdgnm6912h4fr4pswldwc3d41wyk"; "xgreek-3.0.1"="742vxyljmp433rk26ap2rjqbfd7802ys"; "xgreek.doc-3.0.1"="qdgh9jnqimis40pf5gj383j01ynx4cqb"; "xgreek.source-3.0.1"="33imiba9m0sxmjxilflqzsysgr7vdv1q"; @@ -2625,35 +2653,35 @@ "layaureo-0.2"="7qqhm139n1afxdpsmikzdyn7pn09hv9x"; "layaureo.doc-0.2"="pf22ypfazq7hwxpfiidcvkd24zs1gys3"; "layaureo.source-0.2"="3q0ixl7rw7sz7n2bfd8gyfnglfcq2hcs"; -"lshort-italian.doc-15878"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid"; +"lshort-italian.doc-6.2"="r33gvxp6z6qzn1hfl3zcc0356514clmi"; "psfrag-italian.doc-15878"="xb8qlcz7f0za963yybhjvbyjq37z516f"; "texlive-it.doc-54534"="rjkflhhrms2qhbsakznnxfh3r3kbz5dr"; -"verifica-1.2"="dwgpgq7r4r6s6glysghbd8b2s3gazjmm"; -"verifica.doc-1.2"="73f23nps62hryhdl9q6gndblnc3vvbw9"; -"verifica.source-1.2"="glz0p5kfvk6h83icf4dbvg67pkg6k2xp"; +"verifica-1.3"="dm0n4wlbvx5621ldhj516pvlidqiigkn"; +"verifica.doc-1.3"="2pfdvki7wk8fhah50knvh01yq721yw30"; +"verifica.source-1.3"="n6qmhmpx4f2nhjinfqh1z3h370lx40mj"; "ascmac-2.1"="5fiwx48hj22yr2f0x9q37jgwpvr7ixrm"; "ascmac.doc-2.1"="nmfb4d9b21bsr7nqg5bgprxakj82ryy3"; "ascmac.source-2.1"="9d6l1w7c7g8g88vfxxflrqhvmnf0miad"; -"babel-japanese-2.2"="s8sj89mjl5fxb2cr87qn9ix0fyy7if6m"; -"babel-japanese.doc-2.2"="rxwigd9cjla62cw4sgg3j4wvz9f0q8gr"; -"babel-japanese.source-2.2"="01qb909xr4k1kcjk8dz2dpiqwfx5awdx"; +"babel-japanese-57129"="yx41fa00vvz0wra03q9xx45r3fzlnwcc"; +"babel-japanese.doc-57129"="jkk307ypyhkdz458xnxqv1fvsq3rmk0j"; +"babel-japanese.source-57129"="ls84v5vd8gxyqmklw2np6pdgry88qy70"; "bxbase-1.2"="cmpmcxr25044s63nagvkzb6zv8giyqh7"; "bxbase.doc-1.2"="na2vh2jak4zvmibrpkis6jr21ly00904"; "bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z"; "bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx"; "bxghost-0.3.0"="fmg8agh5563jny9106kxzn6ac0y9ypcc"; "bxghost.doc-0.3.0"="ybrg38lhjrc3jfadkn3h9vacy2zwhycb"; -"bxjaholiday-1.0.0"="w9mdw9zrcrrf988z2vd314bn0dqr4pd0"; -"bxjaholiday.doc-1.0.0"="yq903l1in5hwp20wj9i2kz4qmx3y0aqs"; +"bxjaholiday-1.1.0"="sqraclljhkpsgq4h9zvy3in7g6j85rrg"; +"bxjaholiday.doc-1.1.0"="d3cgw8izvja5vk7xhdy54rflgcs6n3in"; "bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c"; "bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh"; "bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l"; "bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc"; "bxjatoucs-0.2"="hmb6rpwihwgfi7sq1zpf7yw12ibr17kw"; "bxjatoucs.doc-0.2"="4nkg3si0bwryyyh0wpqnvkrmxmbnlin3"; -"bxjscls-2.2c"="z5i40795avjbcb242jijbd970wdjinls"; -"bxjscls.doc-2.2c"="5inv8gi1zpc533bd8jglfq0dvds2b64l"; -"bxjscls.source-2.2c"="1wf8z5pxq8vqfijmwr92n3sj3gajl81l"; +"bxjscls-2.4"="1arzykvy6qlwn3fa886bchvlh9svb6ff"; +"bxjscls.doc-2.4"="jrgaavvyr8y8v34wxvj07by4b353z44s"; +"bxjscls.source-2.4"="wdpk86l4r5id30ryb0f2kmr8jhq3fcg8"; "bxorigcapt-0.3"="lbrfjjqsjm4n5b7byyrhm1akbmxxap6d"; "bxorigcapt.doc-0.3"="grspvjmbrcjq91wgi6l3a73y5l7nnl4m"; "bxwareki-0.6"="rgw2day3m4vr0k6d2mbhrpy8anmzklc1"; @@ -2662,32 +2690,32 @@ "convbkmk.doc-0.30"="nvi9mfw8iiw923v54fdi5pk7r93y7vsc"; "endnotesj-3.0"="p1524a2l6zsh2gl28im4rxzr7afy323b"; "endnotesj.doc-3.0"="ksn1n0s90shsi65kgw4bppanfsbxrq0z"; -"gentombow-56429"="4mwyhhcbhp3hnjzqpkn62kv2sz27lxkb"; -"gentombow.doc-56429"="lv12zrj4xqkf02n68gfi7qad4gwafch6"; -"haranoaji-20200912"="aaa482yajabi905clhabkww2qlsyh1vw"; -"haranoaji.doc-20200912"="hxffn0lkmli3fhkvzncwjyry2agrd4pz"; -"haranoaji-extra-20200912"="0vzf6cqxk6igkbxnx2y37yvfbrjmpmby"; -"haranoaji-extra.doc-20200912"="q1zj08b1qb58bywmb905xnqrg6b8j1bf"; +"gentombow-56665"="9i576fvl59r1gna7w5b76skw7hvbziv8"; +"gentombow.doc-56665"="qn40cv4xa1ah7khfpk4368sxqhr2yjqn"; +"haranoaji-20210102"="amm14qdsyvla06iaf7qrh7c9jbh1zplm"; +"haranoaji.doc-20210102"="v3x5b96qw72c714mslg2rwk4rcbqzj81"; +"haranoaji-extra-20210102"="vw53xxz194dsnwp55can2kplb7qlqdyc"; +"haranoaji-extra.doc-20210102"="xsq16spb4rvdff62n0ip1wbqncnf31h3"; "ifptex-2.0"="vd33lyik4nfippj7dax3k8rbkpacc3c3"; "ifptex.doc-2.0"="ii033xhz4lx24hwzmkqgff5w13q38fny"; "ifxptex-0.2"="db7waqqfn8nrn8b3z4dh7dy846f2zxad"; "ifxptex.doc-0.2"="y1039vpyrh9k2dyi1xws45a1gj3b6dv1"; "ipaex-52032"="pxy5kyyznzddkci3pzdb7fla8gsfsqm5"; "ipaex.doc-52032"="bv4h64z9gnd6jf3mx85b45dqxalicjcl"; -"japanese-otf-1.7b8"="n7pnmaclyp3yb8rfn3n59g6jdy5k349r"; -"japanese-otf.doc-1.7b8"="kszig0vk5dwk708vff5cfnhcfx0rp39d"; -"japanese-otf.source-1.7b8"="dp0djxlqid3irac8y2zfh0x3r31r305d"; -"japanese-otf-uptex-0.25"="8swbn4s13n9g9sm0m8pwm94iq0gl1ziz"; -"japanese-otf-uptex.doc-0.25"="7wqm9qjxawyih9z9qls5ccm5dblq50f6"; -"japanese-otf-uptex.source-0.25"="gmslw4incmf7dlcfvkrmjkmz0wpcblw4"; -"jlreq-56450"="cd9sqg3j5jwwa9k95by1810xc6skwnw8"; -"jlreq.doc-56450"="iq495i7xsbmsja0hwd2h74w242smgz6h"; -"jlreq.source-56450"="qc40ih88g40yaiah4wgcp6rdsvdir4x7"; +"japanese-otf-1.7b8"="paspl3x1vidnyagy2bix3wnqhgwqkd3d"; +"japanese-otf.doc-1.7b8"="b1j34w3286splmlsshl5w59lsj0fccvq"; +"japanese-otf.source-1.7b8"="913dx9d29szxr89bfmc77kcn3k5wj79x"; +"japanese-otf-uptex-0.26"="3ckjzz5j3xbrkggjszwrw8iqrmb5k4cy"; +"japanese-otf-uptex.doc-0.26"="34404k1jv5ibhc08fqvmxncvclfbwy7a"; +"japanese-otf-uptex.source-0.26"="s71xnfr7py2v1f7xrzlwiw2h8ps7pn7a"; +"jlreq-57255"="nvp0x96knq1vpdsn8fnz96a7rm70r2gq"; +"jlreq.doc-57255"="6l3g4f4pnvhy84al3483z547zyzacbkb"; +"jlreq.source-57255"="gcv6xnm2biyhggddgv2hi7hwvzka5rdh"; "jlreq-deluxe-0.3.1"="6k38b15b5gyw3vr0y06hjvfc7d7l1v4f"; "jlreq-deluxe.doc-0.3.1"="wa8zvis2jn58d1b1qx9gp38mq2vzq6as"; -"jsclasses-56551"="66578bq8n52pvag0i3hxk17q7bd0kbh9"; -"jsclasses.doc-56551"="3xjdam2ca9jq1ji6zvzzd65rg167sy8g"; -"jsclasses.source-56551"="rjdyfgikzdw9x6ms2qjv3669mwywhyxc"; +"jsclasses-56608"="bq7m6pjhh3mh3z3mvklgr14wnpixcl21"; +"jsclasses.doc-56608"="jfla9xn8wymcf6m1hf85yqi6l4nmwqwc"; +"jsclasses.source-56608"="skfshlzg14lrx40lhxp5vw21wz5f7m56"; "lshort-japanese.doc-36207"="5b8svqq4w1ipn3737s73pk969s8yv63d"; "mendex-doc.doc-50268"="vp31541i0l4rfkijbng5zj0q4cmbdz19"; "mendex-doc.source-50268"="2w1ibgiylpczrzp9xhl7lidn8y2yhnn6"; @@ -2697,14 +2725,12 @@ "pbibtex-base-40986"="nix33k8m51bymsgnmfz69mwpllkk9rhq"; "pbibtex-base.doc-40986"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n"; "platexcheat.doc-3.1"="khwx5x4r6aydzhd5rkv7h9lf58l27494"; -"plautopatch-0.9j"="d1x84i98r7r0w4dish75dnrg7snba1la"; -"plautopatch.doc-0.9j"="inab0q6fxcng0z4qkxcfcss6jarxskzp"; -"ptex-fontmaps-20200217.0"="xi0xpizlahvb5ingkq4d4qazkh1lp1k6"; -"ptex-fontmaps.doc-20200217.0"="c2asq6r15z67wy364zsadjxlhznxykyz"; -"ptex-fontmaps.source-20200217.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq"; -"baekmuk-2.2"="5rhc42dabpd99i92hkdmkjzgr3jqhg16"; -"baekmuk.doc-2.2"="4syhh948m1jw14xlhq6dbpdw5p5p198h"; -"ptex-manual.doc-54450"="xq0cigm101rbpk0gywlkc49k710p39q6"; +"plautopatch-0.9m"="ibd9v0019f57bb2d0xz79gl2c5asm5lh"; +"plautopatch.doc-0.9m"="mwfg30ya3jgmfj8vb2sxpj54cl06zdxv"; +"ptex-fontmaps-20201227.0"="vfr2ryj599njmkx4iibb1i6crjcaz1lv"; +"ptex-fontmaps.doc-20201227.0"="ir2hb9xa03wfn6kl06rml0xv9066x2ac"; +"ptex-fontmaps.source-20201227.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq"; +"ptex-manual.doc-57128"="yqn4cbbrdi468hj4s7bl5wycnzcgds1d"; "ptex2pdf-20200520.0"="n51vdwpxcdyb0w3bxi3d9i2b6gh8j3ij"; "ptex2pdf.doc-20200520.0"="xy5gdmv5jh3mlabwk74hcj1b2g9qrv8f"; "pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa"; @@ -2713,8 +2739,8 @@ "pxchfon.doc-1.7e"="4pimmbvbbjnrpmnh11y75rk0ahj3d7lz"; "pxcjkcat-1.1"="i368i8r85baiimnwh2rfqd0hfrklw8hs"; "pxcjkcat.doc-1.1"="hcxxg9rg6d64hwysf6nlvfhv8h360168"; -"pxjahyper-0.6"="b5q5xfvplzy9xdq2qzzzkwa72s67kyhb"; -"pxjahyper.doc-0.6"="vwm7ji8z5m7n6ba48cy486cnld18z6kz"; +"pxjahyper-0.6"="yn6s3hxp4idpn0vg79ka8p2zk7ghpdqv"; +"pxjahyper.doc-0.6"="m85nxzf8yxy5ynhbq4ck7kr3x4q838cy"; "pxjodel-0.3"="81408a28dnm6qxf1fvdzl9892bjgw16d"; "pxjodel.doc-0.3"="9gpcf45l044gd9z8pqvag7apcnfy407c"; "pxrubrica-1.3c"="p6ych4fz68bzhg7nmb0456jr32qhg20g"; @@ -2727,6 +2753,8 @@ "zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh"; "zxjatype-0.7"="8wfcvfci8mj8ikqpfa1s4km4c46i3hb5"; "zxjatype.doc-0.7"="qp9vrpjyjxma8bi3yhkdbbxv0db2l0mr"; +"baekmuk-2.2.1"="yrs4d6j382fxfn4ncmp27af5xjrv3xs4"; +"baekmuk.doc-2.2.1"="wprw23q0ksga33zysqi5478xpi5izqsr"; "cjk-ko-1.8"="bzihr3wa6c0rp7jrj89483w2xlapj6jv"; "cjk-ko.doc-1.8"="avb0cwq3p97yj94gsfwj29bwdixv2lyg"; "kotex-oblivoir-2.2.1"="cx0nxwxwj719krdh6n5hg3cf6ga7ysfm"; @@ -2832,9 +2860,9 @@ "latino-sine-flexione.doc-1.2"="hnb3gr9lz8wfqgz3g1shzb9s85r4dn9h"; "lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2"; "lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx"; -"marathi-1.4"="bv89wm74091k334rvc46jbj5wydds7lc"; -"marathi.doc-1.4"="9ywp9dv2cm99q1v48z550fj4gbjnfsdz"; -"marathi.source-1.4"="3rwsdhd80lxlnkqzakhhgjl9f258ydjx"; +"marathi-1.5"="51bd8dlakv17av6qsnln14s3wqdfizzi"; +"marathi.doc-1.5"="pg4n9ml082bd23yzf5qayfs2x6ynz3qr"; +"marathi.source-1.5"="ckdmamj5cp67iiiqc51dnz9y9ayjsrq3"; "ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni"; "padauk-3.002"="dwdgm603clk71s9gcjx9ghzwlkh6k2gd"; "padauk.doc-3.002"="zarib60py4ddx2axyrm695pkikxih70z"; @@ -2931,7 +2959,7 @@ "hyphen-spanish.doc-5.0"="kznsqnkm7dg2rdpisil38syyvs6fs0j6"; "hyphen-spanish.source-5.0"="lia19yzmwyz4fsbnrca8al43hfc46i55"; "l2tabu-spanish.doc-1.1"="rc7058j31za1cg1ik27b6gcgscir9bfk"; -"latex2e-help-texinfo-spanish.doc-56291"="zqfixpmcslcpjzg9f3rxcv6z1j7i5d3w"; +"latex2e-help-texinfo-spanish.doc-57213"="zqfixpmcslcpjzg9f3rxcv6z1j7i5d3w"; "latexcheat-esmx.doc-2.00"="bzjjilpj8rmp1cc93bs32568dc8dvgic"; "lshort-spanish.doc-0.5"="3gmql5wpqh3h5mhr0pjcs6v0a5jqc1c8"; "texlive-es.doc-54465"="qbhp4jz17w79iylcj1dxv5n7zlqrn9xk"; @@ -2969,8 +2997,8 @@ "achemso-3.13b"="nmz9jzrfm4kp4961f869kcw5sziad7dj"; "achemso.doc-3.13b"="4g9pj83kvpizdfhrz00ycwhw9rzma0nh"; "achemso.source-3.13b"="zr5icfcmqvhadh0rlhf3c1knmrkr4iyd"; -"acro-3.2"="h63ir9a0mpg273kd7vzh72vwlsvrm5yd"; -"acro.doc-3.2"="4dg6dmb5qgc46frbjqpv2wblya84716m"; +"acro-3.4"="zm87wcng805m71lg1ycnrfgr3wpwim9j"; +"acro.doc-3.4"="yzl03s4l8i19aml3z6c1hx0v2qg5l4mc"; "acronym-1.47"="6471snmy26zvq7gh9lswa4fg0zp94phd"; "acronym.doc-1.47"="3z4ps2hfi959q7dazpjrj02icpbr69g9"; "acronym.source-1.47"="2sbaifpka4p220fd9dlbvzbp92vg971w"; @@ -3041,9 +3069,9 @@ "arcs-1"="b0qh2cpybhqd0d0d8a183hhv7xlx13di"; "arcs.doc-1"="x9xzx0p7wmn5mh61lkmlycfcybzfasz5"; "arcs.source-1"="jbx1wd4pyp8682lbz3mw00ha114adrad"; -"arraycols-1.0"="p6c0xqv9y69fbg7vzv1r10nmq1lspaay"; -"arraycols.doc-1.0"="946328vqw5893d8172f7l2j25bi20wfm"; -"arraycols.source-1.0"="xjw5d1b9vf75nlvnswn4vprk7mnlzjgs"; +"arraycols-1.1"="cfkhjyajfjgzp4826i0rnxbbc1yfxa20"; +"arraycols.doc-1.1"="m03wdi9flydgvs5f7450hj1i88ynm85i"; +"arraycols.source-1.1"="mh3g35c7dybg3r8npb1zc69vyzs2arva"; "arrayjobx-1.04"="zxqamnkgiq8c9p1z3w89rlgqv61bp2n6"; "arrayjobx.doc-1.04"="fyx7869qi432q3g06i3xyg92jqh29fbr"; "arraysort-1.0"="h5gbw2lvn0zfvhz0s5lmc495yz49bdds"; @@ -3062,9 +3090,11 @@ "assignment.doc-20431"="0d0cafwd56gqn5dacsq4fdgzz8jqks19"; "assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6"; "assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9"; -"atenddvi-1.4"="6ygnmbsi6bqj2z0vawx65snrkqlmbidg"; -"atenddvi.doc-1.4"="7hhrbjji7ibzcy65qp9xgxg2i87kar32"; -"atenddvi.source-1.4"="n8zj2xfx23h8n8bfs92kxkmdpl1drq0z"; +"association-matrix-1.0"="ia2sz5pjhb312fpd3wq4h3jlzx6p4mhq"; +"association-matrix.doc-1.0"="7yg14fhaggb07h6zj7wz4a1ml7wkz6im"; +"atenddvi-1.5"="mdd2z14rww1y98y7v1jsyq3hzrg2rf6i"; +"atenddvi.doc-1.5"="sk0j256ab9vz5lnn7v2dj7rwn5a1lnhh"; +"atenddvi.source-1.5"="x07x6lrj3ichjg83nphb044z99583c1c"; "attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql"; "attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs"; "attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4"; @@ -3087,8 +3117,8 @@ "avremu-0.1"="xk59ssazl5122hy7cw9h8l8ky47ac58m"; "avremu.doc-0.1"="sp38mldllwslwxq2rvizcx1dcpfaava7"; "avremu.source-0.1"="inwrrgrds8ympmhzgrk3m82x544x8nhi"; -"axessibility-3.0"="a43649gdk2b6sxv4vkrvk8lmw9vmcijy"; -"axessibility.doc-3.0"="wys2qwwj4aiwhxpgllayv7kw6pb32jnd"; +"axessibility-3.0"="21hz0f1kbq51g3s4s6pcc2wg869m3a39"; +"axessibility.doc-3.0"="9s7zwv0a8y52ddgv5wvyhgp9id55zz9v"; "axessibility.source-3.0"="g8jxfyvj67bx306vkyryhfml2v535959"; "background-2.1"="akcsb7n8iyy4zlcgfp0ikwb5awzdnh9d"; "background.doc-2.1"="inm76hq9brwc39n6bhp9782766mmgwpx"; @@ -3130,8 +3160,8 @@ "beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047"; "beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b"; "beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy"; -"beamertheme-focus-2.6"="lv5yfs1bhgzg70zq4bzj51pr4z1cka1x"; -"beamertheme-focus.doc-2.6"="a4gfchd3sgh1bcvc5llcib6dzaa32i7c"; +"beamertheme-focus-2.8.1"="rsyiviz20m0f8v699yv80rw4k4drbl3m"; +"beamertheme-focus.doc-2.8.1"="idhc1g1ja4y43gdnk3bd1387v6fw14d2"; "beamertheme-light-1.0"="9vz0g593s4ykwasfky58jqq6h7a95p12"; "beamertheme-light.doc-1.0"="dvyzvi4hl69xvvgbhdbp5ax2l3z68nck"; "beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk"; @@ -3141,8 +3171,8 @@ "beamertheme-npbt.doc-4.1"="dzjby8rnpsgll6gvab9cslziqszhd4zf"; "beamertheme-phnompenh-1.0"="01nbk38jh4hxk8vykf37x6bhnb55ijdb"; "beamertheme-phnompenh.doc-1.0"="p0nj4cqg4vaaq6wlycicz0xbl7391lwp"; -"beamertheme-pure-minimalistic-1.2.4"="r3kxc6gbrhal87wl85xbck483sbf2w76"; -"beamertheme-pure-minimalistic.doc-1.2.4"="54r3rj2vha4amqk7mccqir896fx35m6f"; +"beamertheme-pure-minimalistic-2.0.0"="5wsvlda1yasnisw6zx61g2qq63106a7a"; +"beamertheme-pure-minimalistic.doc-2.0.0"="a33m9xa1jqc650zrv6mrz9xdyfs14nyc"; "beamertheme-saintpetersburg-45877"="jkhmvyc96zm66cmfjl1fvrnz86a81zbp"; "beamertheme-saintpetersburg.doc-45877"="9msrd7ylkwfg6ijdx3rddcl143p17383"; "beamertheme-saintpetersburg.source-45877"="16hmcal8wb74z1qdi5r46w36w3n87n6z"; @@ -3159,9 +3189,9 @@ "beton-15878"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j"; "beton.doc-15878"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5"; "beton.source-15878"="znwrdd877gdwmsiaxc9v8pczdw21wrb8"; -"bewerbung-1.1"="kb947mnv03wjc8ja8k402inijnplk1vy"; -"bewerbung.doc-1.1"="mv9vrqp8g689cvbwpm3xkczk98s1blas"; -"bewerbung.source-1.1"="w8z7h0w0ld2dd88a0yhp6p6md8hn7kkh"; +"bewerbung-1.2"="4zrcxx73cyavv3wm4dm50hvrmjw02s3f"; +"bewerbung.doc-1.2"="m6668z3ds3sgdvpr409jbyshsznqs4qp"; +"bewerbung.source-1.2"="5kmfflgw9nnl5gsigh08ww7f9k9zhmh9"; "bez123-1.1b"="9lx6fqcskk9lj28vcfhfnkmjb9dhlqdh"; "bez123.doc-1.1b"="s5s834dhxqlqc5i8dswvayhf62chrqbh"; "bez123.source-1.1b"="fsc7gqwcbpfjlhn0bljq7l0jd8g6zapd"; @@ -3177,6 +3207,9 @@ "bigints.doc-29803"="jyxj3risms61j5aazx9hkxxfwbg6nyzr"; "biochemistry-colors-1.00"="fvz3nlqi6y12g5pcyh118l6vjbw5kz2i"; "biochemistry-colors.doc-1.00"="r7n07xkk4ixxk9zhz3ffkg7kqsz0i8fc"; +"bithesis-1.0.0"="vq8zlw5g879cmhzd9hg0mfdkjb5y7kb1"; +"bithesis.doc-1.0.0"="4hklq8jxwmfvq4sbd53gqni11d8dcbn0"; +"bithesis.source-1.0.0"="gkhy05l4m4pz82qsinnm6ajx9k6h689x"; "bizcard-1.1"="l59w5wy3djx28g5yw2ywagi5am258bry"; "bizcard.doc-1.1"="yallp1mh43m9224sqhzg85ylymiib9v2"; "bizcard.source-1.1"="z70q003l3pmi9p0z0a99f2bz0lxkq2y9"; @@ -3198,9 +3231,9 @@ "boites.source-1.1"="vcfgm806kvw3z466j5kimj5wzgaywv0f"; "bold-extra-0.1"="0kr4p0z1bfng2sindvkk7rkfzm863qmx"; "bold-extra.doc-0.1"="czal2y2szfldrzkn4h0aj6iwjk7gpifk"; -"bookcover-2.3"="mcs63f0cb9qvma487xqrym0a0p5mfli6"; -"bookcover.doc-2.3"="9zwjwl5k3i02cgizw0gf0j0ig46l5jc8"; -"bookcover.source-2.3"="jw98c4wikxgaj2vaykw25azy189q877s"; +"bookcover-3.3"="8jzphigwp2xys5h1hq3vgk8xx8hbl8bw"; +"bookcover.doc-3.3"="caki4lv0vkwnl12in3i2xa78avsba80l"; +"bookcover.source-3.3"="pr9g2yp4vqi3fgqwa7hgy3zmb3vr1f76"; "bookest-1.1"="70j4zrqfn4cr0qg7dhdqainy3pxxilg0"; "bookest.doc-1.1"="3cbqgyzvm6zvzib6jhgdyy7mcw5p75nc"; "booklet-0.7b"="fkicb41vlz1m3spn6jf9g1dk28f22v7i"; @@ -3263,8 +3296,8 @@ "cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188"; "cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd"; "cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86"; -"calxxxx-yyyy-20.20a"="77wp5sxr7a9z2lhxa4cc3f20a3lc5fdz"; -"calxxxx-yyyy.doc-20.20a"="qpasnrbn64r5ha4sxkgrdfrljqjprjvf"; +"calxxxx-yyyy-20.21a"="hx11kvbi5kph8himmnr7cygyxrs92h6y"; +"calxxxx-yyyy.doc-20.21a"="rc1cp1b4mxrq8pbva644wgra1cvs45dn"; "cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn"; "cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf"; "canoniclayout-0.5"="vg54aawlapxdw0dp8s7jinkl16jd8n6h"; @@ -3321,6 +3354,9 @@ "censor.doc-3.22"="rcvd45yfghlg5yc3jcfzgj506zfnbmpz"; "centeredline-1.1"="cqrj6vf1p84c5sqz09an9dixy4mkvbx5"; "centeredline.doc-1.1"="k0yjy3jia8qsxh1zzgsdvm5a7xj58ni1"; +"centerlastline-1.0"="svlrrvv2sa6534pkbr8rzqiaw4jiz6av"; +"centerlastline.doc-1.0"="6b213204s814gvfsf40rmcfhcx14ncpa"; +"centerlastline.source-1.0"="35f4f2b8ccvz9k04c7n0nss2i9s1a3ll"; "changebar-3.6c"="76f70hw5065zfzmvbkrkia3ih5jhhkjq"; "changebar.doc-3.6c"="310sfxf3nzqrrkcp2n794kpn4bzv9b3b"; "changebar.source-3.6c"="xi3ldcm33mq6aa4jad2sfv7g58kwg0p3"; @@ -3426,9 +3462,9 @@ "breqn-0.98k"="zxlvpm3140isqldavaiq93i62wx9fvd5"; "breqn.doc-0.98k"="rq5wmm3nkf8dn5ai2fc9vbrnahb1aym9"; "breqn.source-0.98k"="d6zijlq7xzciyk3xn1v5pbly5wxhd63m"; -"caption-56374"="irza4zki002sxhb3bqwrxylyl9yvy8di"; -"caption.doc-56374"="910jq53lg1dqgv2xafy3vfjs8afqzrzm"; -"caption.source-56374"="ssq3n46ifvbq3r42rjqvxrg9g9nyardi"; +"caption-56771"="bjmm0mpsrkwvz5mzk9n6dqpn6smfcbya"; +"caption.doc-56771"="ck3gbg8qcdfji56xksflhl5664fdrvkb"; +"caption.source-56771"="lg7lv6j2mwfzxd04sgcvs62f762jimp3"; "cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj"; "cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx"; "cmap-1.0h"="bky8rw1a9f00x6fzx611hgfcyf7d115f"; @@ -3439,9 +3475,9 @@ "ctable-1.31"="wd1f4k8s98g3lcfn825snbj9pvsr6s2j"; "ctable.doc-1.31"="sjikmhs468fpx52r50s7qyjc4rkfb9r0"; "ctable.source-1.31"="a3danbgiabx2z87nxkkcbvdb0l7fs0s8"; -"eso-pic-2.0i"="8zpvv2r92yzdw9sjn1hdp9gydwcy0bla"; -"eso-pic.doc-2.0i"="9bha1qpmffkbl2bsq99gkhqqvlbcbccc"; -"eso-pic.source-2.0i"="1ilqjlmap2gq7s30mq4b20c9bcahs7y4"; +"eso-pic-3.0a"="5hkndcg8z7mq3hjd710hdm05sy15gpmn"; +"eso-pic.doc-3.0a"="5ls3fcmrl5v6dpi9qzympyvhdwqfiahi"; +"eso-pic.source-3.0a"="xz2ybhj1aw80mafgbn7lrj7g6mssr5g4"; "euler-2.5"="32y9kxnr7zw4byr1zxsd2iqcfyzjvn42"; "euler.doc-2.5"="g4bxh88pzc2872qk0w0sgapcaglal808"; "euler.source-2.5"="8h1ahs9sbijdsc3xiv1rwv6k0vm9m858"; @@ -3472,21 +3508,21 @@ "jknapltx-19440"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp"; "jknapltx.doc-19440"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3"; "koma-script-3.32"="iml0agfaadaqivm19nfg2bn788mbidzv"; -"l3experimental-56424"="xiczgr88w47x7k8lw6y8fqwzmjs0c3n4"; -"l3experimental.doc-56424"="0vsnycdfn4zd0vkisw717a179k86m10b"; -"l3experimental.source-56424"="18lzg9axjak2hdhcqy3cb5436hbfppn9"; -"latexbug-1.0h"="bv8jiiyxjfgalld6nxv7qisvb8i9ix1d"; -"latexbug.doc-1.0h"="fz9slhiwkar37hwqwcsx4ih1nw7zl2xa"; -"latexbug.source-1.0h"="sr865dxax5f9j7r0bvhg9nlxf8bs0rwj"; +"l3experimental-56785"="dwfrgnbi17200xqaka8sasc4dv20i7d6"; +"l3experimental.doc-56785"="l73h6vhmw3hwqldddcs2gh07z8giyvmm"; +"l3experimental.source-56785"="jfnxqj2ic0g65hadmicr20jynq45gpvq"; +"latexbug-1.0i"="5v5z4388srxr5l3g41zj22625b6y5kwm"; +"latexbug.doc-1.0i"="yw8cjcla0s5m1hnp5z2vpwbbr8fkw18h"; +"latexbug.source-1.0i"="dynv3lhhzm2rzyhn6mr48aa5grdd3c7f"; "lineno-4.41"="kvbdigwxw4db752kssgdb8rlxhljkkpm"; "lineno.doc-4.41"="cfnil0v0isahd65d1sly2kr29w38h535"; "lineno.source-4.41"="w30n8z3rnrvzpfa1d1s7mn3rcj03s892"; "listings-1.8d"="ci87vjqba9nnwsgm8412749fg7fid33v"; "listings.doc-1.8d"="jq29kbrz6bxs58iqhp76ail0kiy5s53r"; "listings.source-1.8d"="0cz06d1v08369wgfnkddmzqi7258rsx0"; -"lwarp-0.892"="5h6ljfnxs5p2cag2mnsxsf1iv2gf94z4"; -"lwarp.doc-0.892"="c94x100afrll07vaja7pgs7mj8dpa1i7"; -"lwarp.source-0.892"="5fkj8vdxjmhly9dv86v19v3vpphwwl3s"; +"lwarp-0.894"="sjx6p71lbrhdik062rpgy4fn28085il4"; +"lwarp.doc-0.894"="bykrdn8b3y4570cgxgllh8yy5abz2pzd"; +"lwarp.source-0.894"="wg064ipx6s3bmmfs68kvg9fi4hm576fv"; "mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0"; "mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh"; "mathtools-1.24"="ybp5grgnwb0jbfzim9hc676q8pc10b83"; @@ -3498,15 +3534,15 @@ "metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv"; "metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh"; "metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm"; -"microtype-2.7d"="b41abl38422cr5brjfy0630iq9x9mj8z"; -"microtype.doc-2.7d"="9sl8bgxi48cda1kln3qqy9xpf6lfw2d2"; -"microtype.source-2.7d"="39b3miq2ypis8brg4q2wjjrw4jzggcy3"; +"microtype-2.8"="6bgyahdxp20gnwxsfaad2jw7b3xpc525"; +"microtype.doc-2.8"="gzhij6jgvdprk551fvy9qr6w6k5kj7rz"; +"microtype.source-2.8"="hqg1hg2k649jprv3vjj5chpiqdwaqprh"; "newfloat-1.1l"="lbxyrzkqg5j3hgwjaw9gdm2h1cf381vz"; "newfloat.doc-1.1l"="fkbi9h381inng5z9qdgnig25z0fxsb4p"; "newfloat.source-1.1l"="p8lpx95dawyhvyd36nkppgilrflb79v1"; -"ntgclass-2.1d"="y8cgcs422bvbz798jxiliyzv0sllld5w"; -"ntgclass.doc-2.1d"="7s1fk4p4zhm9x4gph5zmd9vqjwj6zynp"; -"ntgclass.source-2.1d"="3m8mi9ms4mjnl5yk6ygk15a3751yhi0a"; +"ntgclass-2.1e"="zkss2080gby0mqd685h9ff8421j3nq21"; +"ntgclass.doc-2.1e"="d3ns0gma0fivb3phssvzx9b1c6zwfzpl"; +"ntgclass.source-2.1e"="i9d2yfcz7blz7c5gakqhycmmwhwykzgw"; "parskip-2.0f"="4hdlnxb9gf2q2q08fmkz7j4rwzddpz9i"; "parskip.doc-2.0f"="l2w61n7gb9iw8gixp7fmfvy4gh9aa5p0"; "parskip.source-2.0f"="iz00ql6ncqqhxinijmqp98jq38pwqddx"; @@ -3516,9 +3552,9 @@ "pdfpages-0.5q"="1bdik391lsmp7dz6d8arq1hdawj4qraf"; "pdfpages.doc-0.5q"="9jdi9zs7hycixbdxld0m95b8935f4cqw"; "pdfpages.source-0.5q"="f8nglq0jzz4n3lky57q6mmm2pdrydxf9"; -"polyglossia-1.49"="506kkq32qbwp5xnmvdahbpv6mgfx9pad"; -"polyglossia.doc-1.49"="dyfg38rwcsrq6w4z8sr2y0rsba0ipl47"; -"polyglossia.source-1.49"="sjcan0v66d6j1k7hwsrk4vrdmsr450c8"; +"polyglossia-1.51"="psda8pj73fja066g2j69ljvzjwj4gn41"; +"polyglossia.doc-1.51"="s1aazzxm3yglcrfr0lkp4r81nvllmk0x"; +"polyglossia.source-1.51"="i09x40vvg9bsvk6l5d17vsa4vy1y4qx8"; "makecmds-15878"="anpaqglvl5rmcy8r2q0ap8m117nsx89q"; "makecmds.doc-15878"="39zxaxxqlmps1wd4rjy42a1hk027n06v"; "makecmds.source-15878"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6"; @@ -3568,8 +3604,8 @@ "aobs-tikz-1.0"="klfbwfabfx6lv1pk6kz3vayabsnphvrh"; "aobs-tikz.doc-1.0"="qh43c30d1xpyl4rbazp4kj8p850rdxwb"; "aobs-tikz.source-1.0"="xgmck3vrplx5q6blkm6yg2njgkk4k5bz"; -"askmaps-0.1"="4bm7q1w9sz28mj7v79gphh13rlz1ny3d"; -"askmaps.doc-0.1"="dp5c0n7vk509bhwhmxi6wvshz45s3fix"; +"askmaps-0.2"="h7gsxw1m64s9ci55nf4c8xwr709jfcg6"; +"askmaps.doc-0.2"="06v8bsahhf9mmi3ln2zg8rj9nd0kpnbp"; "asyfig-0.1c"="61q9dbbmirr3q1fncz10fpvqr68kj3zb"; "asyfig.doc-0.1c"="1ynfgvq1hvwl8dflmf5vchv2xhmr8511"; "asyfig.source-0.1c"="2403n3a1pa3gbrrs919rj56jcy4klyz0"; @@ -3615,19 +3651,19 @@ "celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd"; "chemfig-1.56"="wg525q207i0jm3zvackkq2im40n624dg"; "chemfig.doc-1.56"="v2d4fmsfcdvh631sdddm3jmjq6zg477x"; -"circuit-macros-9.3"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj"; -"circuit-macros.doc-9.3"="zpvs7dhf74ly62lm2mc8c5x31ssbgrih"; -"circuitikz-1.2.4"="25dmbjg0xidl0kn6ci9hnbj31a12x66l"; -"circuitikz.doc-1.2.4"="s9x2ldihx2c4zjds53jsdnjw97h57f4x"; +"circuit-macros-9.5"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj"; +"circuit-macros.doc-9.5"="a7ipgax8cs0bg1nwd5yzzhd9y5ffm8ag"; +"circuitikz-1.2.7"="m196y5hvnl7bqkizd96z678310jzznnq"; +"circuitikz.doc-1.2.7"="667snrw550xgqayc4jzc342xcm5yvx61"; "combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a"; "combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg"; "combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q"; "curve-1.16"="w4a3qv419x68y5ydvi1dk6pnm6ni82ci"; "curve.doc-1.16"="f4n85j7dlkp12vm17vqac8d4hzm1jvd9"; "curve.source-1.16"="gkfbyzhsaknlrhm3ni81jxswdjv5z9ij"; -"curve2e-2.2.10"="3hs2rsdsf2ip2b55xshi3qfb3zvgm5kx"; -"curve2e.doc-2.2.10"="dvgxy96bkj3q77pbkf3lyi6hpcmhmx8g"; -"curve2e.source-2.2.10"="p5pw2fcdgg1hkj366fmhdk8yvyg7lbvl"; +"curve2e-2.2.13"="1iz71fdwzibj77g8hg7wfmnlsv5mxx24"; +"curve2e.doc-2.2.13"="4vq8xlmc3x1glj1r1nziiv0plq4bwgia"; +"curve2e.source-2.2.13"="p9w176wvrskj5c7sj5nh323hmr6w4v8d"; "curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b"; "curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv"; "curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw"; @@ -3707,8 +3743,8 @@ "graph35-0.1.1"="x18xxd2x7yb5ckpild1s64w9f9rpi5n7"; "graph35.doc-0.1.1"="qza5xy7xdsncal55gyqs8ay9z1h5rp49"; "graph35.source-0.1.1"="gaabqpc5jr86g3jbd4sm6df0633c65y3"; -"graphicxpsd-1.1"="1lnxx7fjgam8dyjyay2ws6la9wjhbkn2"; -"graphicxpsd.doc-1.1"="rx8yz6raa7cyyqr37jr41wkgpgljdhr8"; +"graphicxpsd-1.2"="wzg5nivinnigm98anjkpqkzxy5yy7g9s"; +"graphicxpsd.doc-1.2"="41hyvv7makf7nhamhwgjdvark6ydkdfk"; "graphviz-0.94"="gicmf9qslgbamr7qkac4y3x0wajkbhw1"; "graphviz.doc-0.94"="xxyyxpgr81jv00v48zv7vxkm9sa4hjsn"; "graphviz.source-0.94"="kqv26abzy2ff31a3f0aval7lskvk5nql"; @@ -3725,8 +3761,8 @@ "hobby-1.8"="kmk2l2ik0anclivgqk6alx1v44j6g8pk"; "hobby.doc-1.8"="8bdi0hrpyxyczql8rhqfiqlrza5y2g56"; "hobby.source-1.8"="99k7q3r58r1v7vqh3hv08qbb5s1r552p"; -"hvfloat-2.16"="42b4aspf04rp4gvjlxh51284g8vkmhpn"; -"hvfloat.doc-2.16"="qsn79czwvj36r4ifp0yb8p8hrfrs4p4w"; +"hvfloat-2.17"="24f6508k2ak1lzv2gimrady79fzc44yf"; +"hvfloat.doc-2.17"="71aqcr8rqqym989hk16d6rpxnq1912qc"; "istgame-2.0"="il4ycc7pxqvpyals4cvc2bkgvzc29vmc"; "istgame.doc-2.0"="rr6wnw1csla45zv7kmcfizj72rfcgx05"; "kblocks-1.0"="lrlcxbcx98bsjxwkr10w5wax3x4lmyjm"; @@ -3739,9 +3775,9 @@ "ladder.doc-44394"="32b2x9zydsp7b2zncs2lg6ldz5cs7gpa"; "lapdf-1.1"="g5x8axkiscl5796b82is201vcbdxvc3f"; "lapdf.doc-1.1"="3lpf17r6yqaa7ld8742cp8a7crafpc9x"; -"latex-make-2.4.0"="v57k7bkaqhjbwn5chpws53r9g6a9ksac"; -"latex-make.doc-2.4.0"="faq72r8b5xhjjsczv7ws6g12s1aydjaz"; -"latex-make.source-2.4.0"="yxz5ih93ddpi61badp2js36hj36r5cgg"; +"latex-make-2.4.2"="nazmg5gjqni54i0rk3giq13jnzn9w5ql"; +"latex-make.doc-2.4.2"="rz0xp76krcxvy654ji1f003c37g1pkmf"; +"latex-make.source-2.4.2"="bfddkj3bcb11lff9ypiswkcyaa2dbcf7"; "lpic-0.8"="74wchk7ljfacnfqy6wn0j9ns5bqzhkv1"; "lpic.doc-0.8"="yqsjlvnfzgj180kssqhp1i11gq8d9c9q"; "lroundrect-1.0"="x8g1sz9w4xaj9da4y1xy58hrdblmdx4g"; @@ -3767,8 +3803,8 @@ "miniplot.doc-17483"="hi57wciv475ix91zl4rh30lv5pffns1p"; "mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b"; "mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3"; -"modiagram-0.3"="sbc0gqy5h9g3vvay1hg8nd8c8za52ns7"; -"modiagram.doc-0.3"="nxgyiv2d5sh787nmp4kjn0qlv88j77lm"; +"modiagram-0.3a"="zn4c83sdrwn9vkv6m1q15bsvwp01ycjm"; +"modiagram.doc-0.3a"="qy9zyvkyvs6r8jhchndbprhszbj69ycf"; "neuralnetwork-1.0"="3scaqj2kvqri7x23chqymfkg534298ik"; "neuralnetwork.doc-1.0"="xxsvv8bh5174ihqmaxgy5072z92glvhd"; "numericplots-2.0.2"="c6kqacnf4qlhx7lkbnrp4xji5xg9nzib"; @@ -3840,6 +3876,8 @@ "ptolemaicastronomy-1.0"="09a5aimp6j8yxwfhsdb7kf574jcy2p6g"; "ptolemaicastronomy.doc-1.0"="7ijjcz9y4ah07pwb30b6r0wpg87fxij4"; "ptolemaicastronomy.source-1.0"="xv9cql2pkkiczvgf3v7sa80p22pbz3h9"; +"puyotikz-1.0.1"="qx2rv06l811c34pni8rgkffirpc09fw8"; +"puyotikz.doc-1.0.1"="969cy9jzd8rfrm9sb5gcr9gsc1qxn23g"; "pxpgfmark-0.2"="sy9cs1y4gf9xr7jfiyp8zkr1r8di00hc"; "pxpgfmark.doc-0.2"="25vgpjc0zr0wjny4snksr3yzk908s2mq"; "qcircuit-2.6.0"="va7w4d1n5djxqa4fis7m409aapx7hqa4"; @@ -3890,6 +3928,8 @@ "spectralsequences.doc-1.2.2"="by1zrk0y8nq05qf8csa2gvwl316zc1j4"; "swimgraf-25446"="x77prbkrnadhj57fbh68hqsmrbk2qsis"; "swimgraf.doc-25446"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi"; +"syntaxdi-0.8.2"="hkrwysi8yl9741hkdqjhhmhhwsjqji9q"; +"syntaxdi.doc-0.8.2"="zdnlrpza0hrf4pacrabdmv4n3xx16rb1"; "table-fct-1.1"="b7wz94n1h3wpq9mi40zdl3v4m9hi1wxk"; "table-fct.doc-1.1"="1k2sa9bsygbw1ib85x7yqda1jbzbg05f"; "texdraw-v2r3"="rkzarniigb4a454964qbfdiaj1z124xi"; @@ -3898,6 +3938,8 @@ "ticollege.doc-1.0"="7n7nyn8zrp9za6l355797gq96vxp2d78"; "tikz-3dplot-25087"="kl827mar9jlbjpwxl90z3fml8i3zabb9"; "tikz-3dplot.doc-25087"="y736rbqkbjg7nnly25d0jl72z9gyx17w"; +"tikz-among-us-1.1.0"="d9n1f1a617n59l6h5790mzkv5arkrwzw"; +"tikz-among-us.doc-1.1.0"="m25gkpfpna507ij74x2x9fbxvw0frc3a"; "tikz-bayesnet-0.1"="w9x9vf5hgmv18ljz0kx7rby1dig63539"; "tikz-bayesnet.doc-0.1"="g7dkg4gg6729jbscb7cf3fsay2dfqv42"; "tikz-cd-0.9f"="h74wx5r1jclma4zqd78wb3f5bmpfc2pw"; @@ -3949,8 +3991,8 @@ "tikz-timing-0.7f"="phaw9fm5dzq5xr4klpnw2dhnrq3lcam0"; "tikz-timing.doc-0.7f"="cc5mlz7linvwb3ki8bnhhs6qz9xmkkb4"; "tikz-timing.source-0.7f"="8lpjas5dgvpl8dcxf1549m8nh0vn20fw"; -"tikz-trackschematic-0.5.1"="b8a2ljq13a1yg0dsa9icngsa2iiyanw0"; -"tikz-trackschematic.doc-0.5.1"="cif4841w92syf5xxwlw9njb7zlqdd0gr"; +"tikz-trackschematic-0.6"="0dpci10miikxhmb9k3vkzzq30mmf9dxk"; +"tikz-trackschematic.doc-0.6"="4xiw69h4jb3xggwyak9l4387kfga7bhn"; "tikz-truchet-50020"="h8p45wr3xhjslajpyyzr8zha6x52jyci"; "tikz-truchet.doc-50020"="6nyandwvh9qj5z6pzh20417kl3gd3q68"; "tikz-truchet.source-50020"="r5gpj9cmqj4njzzx820v7ka0v7chxy24"; @@ -3961,8 +4003,8 @@ "tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a"; "tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9"; "tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf"; -"tikzlings-0.3"="f75p9d4c4iizb6q4xhaafcdpm9y2bjjm"; -"tikzlings.doc-0.3"="rpbk1nbww341mf3qc1rqbss9xrgzjy9c"; +"tikzlings-0.4"="h0ifghxbc62wqvyn8rd5173jcvnxyhis"; +"tikzlings.doc-0.4"="0nx5gd5kzbk0r6lammxzwrdxskc76iyi"; "tikzmark-1.8"="5k486ngj472l6mz533nfcgj43zlp1sjl"; "tikzmark.doc-1.8"="0ljfqj9mzqrxy9hz1bjzm0z3i5hk650q"; "tikzmark.source-1.8"="864falsbql4b9wwxyf5g0xm5dwmzydrh"; @@ -4028,6 +4070,8 @@ "sauerj.source-15878"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh"; "xifthen-1.4.0"="4d6x7yb6hdr4xg2dn572gwpfnykppsph"; "xifthen.doc-1.4.0"="364kifdxmk5ak2flyqcfzjgv0dbsykax"; +"utfsym-0.8.3"="xh468icpjaggal7grvpwsl4maaclihan"; +"utfsym.doc-0.8.3"="glys9xfrh02f7przb9bbcn3k29wa0why"; "venndiagram-1.2"="pxwyrzjwbkkyhfm22v13p2mm5l9s2bqp"; "venndiagram.doc-1.2"="xn6lk2l6vjwjirm9s0vmcsqna9q096zv"; "venndiagram.source-1.2"="aj2hp4pyi0jhirjbsrv8cpajh42q64ai"; @@ -4040,6 +4084,9 @@ "colophon-1.1"="7naibja70d1kb637ydb5jbj3xbgxa4l5"; "colophon.doc-1.1"="m0y1dcw2ymnr8a09a8wzj6vw00ns055g"; "colophon.source-1.1"="xfrkdkkk54q9zbhv9jzwm2bf43czj0na"; +"color-edits-1.1"="p36qzdisyklnxg7qxfpfdqp157sifg8x"; +"color-edits.doc-1.1"="jmlvf1izvr4gaj32mfkgrwv6xmfvgw7q"; +"color-edits.source-1.1"="mlm9y14rzw6a7lpw6bbv62jnh1l8qrzp"; "colordoc-18270"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx"; "colordoc.doc-18270"="2sw71l3579qkh4z3hqirvv0y3d79sssh"; "colordoc.source-18270"="3p7baf59n87p34sxwdm9lf761dmh8w0b"; @@ -4149,8 +4196,8 @@ "crossreference.source-15878"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6"; "crossreftools-1.0"="ajn6w7b0nk4i3jhppd2ikmkmjj85c12p"; "crossreftools.doc-1.0"="2khdwzgrmdnpidnf8qqhnw31mf208sp0"; -"csquotes-5.2j"="a8ii20nagxkr6657vwz3py2jjbqwa0lg"; -"csquotes.doc-5.2j"="928657z95scss0zv6bz8j8p79q63gz23"; +"csquotes-5.2k"="747dygcnaj9ps48kaqpm1rjm9sxsz1j6"; +"csquotes.doc-5.2k"="mwx9yhc1z0rjlkr356bg89z7jlys75lp"; "css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x"; "css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b"; "csvmerge-1.0"="r2srdy1zz8m0dkbpg1gaml9ln23q9rgy"; @@ -4204,6 +4251,9 @@ "xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms"; "xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar"; "xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm"; +"datax-1.1.1"="mb0p3kqk4c4brqmf42zhkj1kv5y71fmq"; +"datax.doc-1.1.1"="79vryqqph1k46k0429ldinwjdd1lcs9d"; +"datax.source-1.1.1"="3r08b1n40fww69p4yxn9li9bi67iqal3"; "dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6"; "dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx"; "dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy"; @@ -4353,9 +4403,9 @@ "delimtxt-16549"="akp06kcf04g4dx2ph7bs5cg4byld136r"; "delimtxt.doc-16549"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n"; "delimtxt.source-16549"="j788dpwxgryml7ny68nzab9c3dy0322z"; -"denisbdoc-0.9"="blzw94fnv6kr25yvf7r637wwkxdkkl24"; -"denisbdoc.doc-0.9"="sk4wdmr6zv8czg80zwzhb9b9zr86960p"; -"denisbdoc.source-0.9"="vln9nx7s68vdr55mc1j9ahrsrxdh9m1p"; +"denisbdoc-0.9.1"="5xkpr9mh5607qp6vvx2a5xnw35xn07h5"; +"denisbdoc.doc-0.9.1"="8xqm0s7gp4znh4b7c0c9xgs23nwj899y"; +"denisbdoc.source-0.9.1"="bkr6b5hiymlmpm2brdy2vdjjzz48kc4p"; "diabetes-logbook-54810"="x5s8rl10s8fg10xwa8s972zay7ximns5"; "diabetes-logbook.doc-54810"="kcpszp5n9np9v31iha2yhz31h5b5snnx"; "diagbox-2.4"="2d44gh8w38gdb44amp3c5vj4calw00bh"; @@ -4427,18 +4477,18 @@ "draftcopy.source-2.16"="b6319hjnccfx3xxfrxz1kmx9813aik0a"; "draftfigure-0.2"="w154bzgm94wzqs4shyi3vir6vzfd7324"; "draftfigure.doc-0.2"="n3cvgb3mn0a0asrk5wng4f5pnr36k337"; -"draftwatermark-2.2"="2rrmq8jllyx6w1kiz8xynz3rqvalnmrk"; -"draftwatermark.doc-2.2"="apbh042x5qis6y4hp5rglh04vrz62afc"; -"draftwatermark.source-2.2"="9icchlivyradf2n8zzzys45jkqd4ax9n"; -"dtk-2.08g"="4v50smdv44x4fp57sjdjk4sl0jd8hmnc"; -"dtk.doc-2.08g"="3gr8dvcl3553c4i8z04666lscw69llyr"; +"draftwatermark-3.0"="3rnp6myad4ij6ikq9wwfdknjkxyqd04g"; +"draftwatermark.doc-3.0"="df3zzpkq6ixspdzpql1zmif2y78k5glf"; +"draftwatermark.source-3.0"="b7ngzwvmc8g8w3hc6ymk8r8h6kn1a4x5"; +"dtk-2.08h"="x0hk8li42r2m26kmmn5fz5kxjy4xi09c"; +"dtk.doc-2.08h"="6yxf7x6a5d8r7dnwipcxa87w2sgs8xz9"; "dtxdescribe-1.02"="2bhwnkb5id2raigd4iywhf7da7c772zr"; "dtxdescribe.doc-1.02"="2ygyzgrllyq4fa2xbf8fyrfk810w2ja9"; "dtxdescribe.source-1.02"="39inl1ksgzd28sszdfjyyq80gscdc6xs"; "dtxgallery.doc-1"="bpsakwyq6ihcw2ziqpjv8qh2a90s5mw9"; -"ducksay-2.5"="dyhjn1zfasgd7yzx1shbxcswj1zqz9md"; -"ducksay.doc-2.5"="8j27sx7khqa6jas9hnxvvm7hawvafiaz"; -"ducksay.source-2.5"="nd5z7dlyn7svr6msmc6hxhydnrrjv2r5"; +"ducksay-2.5a"="sg9xk4jc4ngsan1f0806w9ph5372qihk"; +"ducksay.doc-2.5a"="khw153wkf91llm5n87wkq5wqr3mgazy6"; +"ducksay.source-2.5a"="xsyz67f6rm0561r1lc128xn8091vxyva"; "duckuments-0.5"="vdc247rsaliycjf37gn8lwihycrpgksp"; "duckuments.doc-0.5"="7ia6rdsdhhnvf2jdxynz780virwl48p7"; "duckuments.source-0.5"="ndcajqs2y2vmk0fzd25ayc4i9yq03qz2"; @@ -4458,6 +4508,15 @@ "easyfig-1.2a"="l6pbmvwsjjnrpxl6d9v6askvk0fvqpyn"; "easyfig.doc-1.2a"="glg4115m5lkacjxdq29my9a01xn5mj13"; "easyfig.source-1.2a"="szidzjjq2h8aiqh995xcd37460xx5lbz"; +"easyfloats-1.0.0"="v2v3sm7d9dga3kpmr43jvi8p5s3xlbiw"; +"easyfloats.doc-1.0.0"="s385w8a59a9xncvv6rqclbiac11bsksk"; +"easyfloats.source-1.0.0"="08b3pa30hllhxb884hgmpby1zkz1n7bj"; +"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; +"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; +"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; +"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r"; +"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q"; +"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g"; "easyformat-1.4.0"="x6ad1pxvbj09q2kypdg6z5js8q11a7k4"; "easyformat.doc-1.4.0"="1g0wbnrc4snik4hbzldn9c015ry80n50"; "easylist-1.3"="3mri8pvv7jc5lkqkmzh8h5a4x8agh702"; @@ -4545,8 +4604,8 @@ "engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy"; "engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk"; "engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp"; -"enotez-0.10b"="14hjscgb5k0pr21jg2bz75k7ys1ycgzz"; -"enotez.doc-0.10b"="x60vbpi6c6n6b0v3gmbq2sa3h6cml1sh"; +"enotez-0.10c"="qgbri1hhaq4yh7mnxcdwky11rww0ab6y"; +"enotez.doc-0.10c"="nmqm91i52qry6rm0rzlzqjxl18wmfpaj"; "enumitem-3.9"="cddx7nd076jvg59bdkqaxnmk4rdlg94a"; "enumitem.doc-3.9"="nraf0fvdrdn61w2dxiaqcd6xzlywq9pc"; "enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4"; @@ -4554,9 +4613,6 @@ "enumitem-zref.source-1.8"="3l875sm2v3c2frxhr17rv80q36n19a9h"; "envbig-15878"="9jl4id16g9bmsqwwdbcdp2925m5c381k"; "envbig.doc-15878"="5302z09wsidh1fvnfs5d7zf3fzd9z967"; -"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k"; -"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0"; -"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8"; "envlab-1.2"="iqf24bqqcnpp7kiysfb5dy4ksw2ni0pn"; "envlab.doc-1.2"="5xscix7j6x6fbscw6hk22r4qz864y654"; "envlab.source-1.2"="ndl09cfzl24rbp7rw71lcv2q6dn9pdih"; @@ -4612,13 +4668,13 @@ "eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis"; "eulerpx-0.2.1"="1kvqcqfjh77lg1d1jzwj6mr2rchjpnyb"; "eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93"; -"europasscv-49703"="l85dmsidqdd33pivkp8q5bl50mxynhhd"; -"europasscv.doc-49703"="vm9plycg2pppcnqv2mzhnxf09adzr2ff"; +"europasscv-56829"="5sjzgabngp49v4ghn8sv6dahbnnka7sd"; +"europasscv.doc-56829"="8racsqj1y0rr6r8x9hb0khb4k2g4dgw7"; "europecv-54080"="fmf2rbqmvglyydrw34ksz35dg3ya7v36"; "europecv.doc-54080"="3pwjj21avp8rw3sfr8hr1gnz2blb4fzh"; -"everypage-1.1"="ds2s326xkr4qvzz1pd3ln8j6841pgndq"; -"everypage.doc-1.1"="8d3v8gk3mmw9vyk9slxwwf8gshq4pcd2"; -"everypage.source-1.1"="v920b95jn03slad6q3w3fr97ricjvd3f"; +"everypage-2.0b"="az5nzriphfs7imw4zi1g7m02qy14d0j7"; +"everypage.doc-2.0b"="fvd7wnl16rgkkkl95z24k7057np0jh54"; +"everypage.source-2.0b"="6q8da7fiji3x0wli9dncncg2kgx4wwkj"; "exam-2.603"="c9bgf04s696pqwzvf69w42xqay2wzjjn"; "exam.doc-2.603"="n4ly7a6sc6vk3n1lc87rs9gqj4yyz5sq"; "exam-n-1.1.4"="nhyripks5spkljgi7js9mva03lgam717"; @@ -4672,9 +4728,9 @@ "facsimile-1.0"="mhx5jbh4rwv10z6hd3b2w5haj02bjz0y"; "facsimile.doc-1.0"="pb8sj68gxph376h1ph6yb65ncyblxbdw"; "facsimile.source-1.0"="dvjli6r3pr4w74n9mnm2ix30jva6yysc"; -"factura-3.73"="f9drhb4ndhzxfxjxcbj2i4b9brpx3691"; -"factura.doc-3.73"="pb4c019asn8hv1sld6psji01azkc89m1"; -"factura.source-3.73"="zqhhmhapy179pjgpc9g40xsgqgi365xh"; +"factura-4.00"="3rn2gc3d7861614g9p38jkj4zdkaga1g"; +"factura.doc-4.00"="i9l8lg739x2y4cq91hq4x7smy3m64cjh"; +"factura.source-4.00"="0a47dflwg4xq6vswm89jyvb2ms0316jl"; "fancyhandout-46411"="d1l30rd3z334px9zyw74l4x5vjyki6zi"; "fancyhandout.doc-46411"="y4vl6xw99i4q8j9nr369isqzs9vl39z1"; "fancylabel-1.1"="fvnw8s5y8rr4sfpff9ay2y1yqqgrwysk"; @@ -4707,9 +4763,9 @@ "fewerfloatpages.source-1.0a"="88x4v7p9yc5skms1zms5j3cx06lay8gm"; "ffslides-38895"="v88vqphgndyc8bznnkpc17pcgc4f429f"; "ffslides.doc-38895"="1378bj25gqxr8mhdwf99rw2q61kbakqd"; -"fgruler-1.0"="z5k7w4nncv381nbznr8c7bwq0a9k9l5m"; -"fgruler.doc-1.0"="rm6g865195d2lm97v9pbaim7jrgsnjyz"; -"fgruler.source-1.0"="67chz0f0pjn70xrxzmw7jvzgskjl9vlv"; +"fgruler-1.3"="8cb0sximw14vln08pdri479bgqz072na"; +"fgruler.doc-1.3"="qzp1jn7pxsx90zszck96412hv7g2bbhy"; +"fgruler.source-1.3"="salx2na2qh9srcyzy4pxm95hzmby9vcx"; "fibeamer-1.1.8"="9vdqi8fyrg6ixnia4qh18dyzbg1y0pdd"; "fibeamer.doc-1.1.8"="blp94av9rfbpawsvgrlwq5p2ycgwz3bm"; "fibeamer.source-1.1.8"="6s017bq2ca3g3ml50br5dwn14i9q3986"; @@ -4769,9 +4825,9 @@ "flashmovie.doc-0.4"="n1iz704bdaxj2k26m4125h6aqna0g25i"; "flipbook-0.2"="6mlbadxnf64k383jr2b2phh2ybkk1m81"; "flipbook.doc-0.2"="j9a1rvi85n2hmhr7233zzz9a5qylb6pl"; -"flippdf-1.0"="g4pw7i38h9ypal2wkqfvchwbr9wn6v5r"; -"flippdf.doc-1.0"="s9xvjdfjxxz1dag35lcbw8dznlx43305"; -"flippdf.source-1.0"="vqjf15dsa1nvx8cw0qbam1zvr2qr171y"; +"flippdf-2.0b"="pff26pmbw5sgmgdm20schik2fvx2qch6"; +"flippdf.doc-2.0b"="kpkjnx6iwwjdg62s7nn0sz1kn6ph23ma"; +"flippdf.source-2.0b"="50zpnpjcak8bcaq09q49d5wai1pwrsng"; "floatflt-1.31"="ppv98lki1x3s6xklksd69n5cr8vrd6pd"; "floatflt.doc-1.31"="7n9r2sl31qx9jnw802mhykidjldhx4hl"; "floatflt.source-1.31"="byz5ymxby208lx8am35lz229dibcn4ic"; @@ -4806,11 +4862,11 @@ "foilhtml-1.2"="78dmna552hnh9i11v9zgg6l68hmla7bc"; "foilhtml.doc-1.2"="a2bsh99xh1lfpssggzxhiz9ipwz6bijd"; "foilhtml.source-1.2"="lrjc6lj49c8knfh4bh9jx7vzpddxsh71"; -"fontsetup-1.007"="d4n2r53a8r9adw18bg479rbks021wf05"; -"fontsetup.doc-1.007"="1cjkfjqgzdmlqksq2lyflkz53hxjs9vm"; -"fontsize-0.2"="jk625dm838g7qj0y9r9llhsgb8y3rpsx"; -"fontsize.doc-0.2"="lj2lj6pdvgainc1bgj5p4j86w3mkf4za"; -"fontsize.source-0.2"="7jrjdh5lz8shcxv7jabxv35dh7gh04wh"; +"fontsetup-1.008"="8q2flj4bhrf002570vkfwyr00ivk340v"; +"fontsetup.doc-1.008"="pxrdnyhswrrxl27m9g1qz1h3h9m1qzx5"; +"fontsize-0.3"="pjqhk41c1vlysrpsy20mcf3vxf2z7726"; +"fontsize.doc-0.3"="ni55dvgwpxrja1zc94far9rjfxdikz4h"; +"fontsize.source-0.3"="28xaccan906af8i28w2wz8rwvjjlmzkn"; "fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d"; "fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan"; "fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y"; @@ -4856,6 +4912,9 @@ "frankenstein.source-15878"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb"; "frege-1.3"="vczq96wx0icl69c5xqcqmfsy2wdw1ncn"; "frege.doc-1.3"="h07nnplqxq2fyh6f0wh03jpism89ji0d"; +"froufrou-1.2"="7v7g5xw3q550wyg4ls80fflyl1lcx6q3"; +"froufrou.doc-1.2"="1vmkmq9nbgn6786zj027zlmy9lxx008h"; +"froufrou.source-1.2"="9n2ns02cqqkharia3bj3lk9pdkv5i74a"; "ftcap-1.4"="7srhgl4z3zpicxv7aakm970xy2yxnpns"; "ftcap.doc-1.4"="1y7r73w8r779pdchcgwmlvcd2sq8hyfj"; "ftnxtra-0.1"="8iicyf847h3xf4jvn1y8nzyjk3dw7jng"; @@ -4919,8 +4978,8 @@ "gitinfo2.doc-2.0.7"="l2rsxd08m2y44wg53q2adl7d084r14cf"; "gitlog-0.0.beta"="q64k3v3pwcvg8abw382rijglrgllfvwx"; "gitlog.doc-0.0.beta"="29ysf5jz8cvwanmhad4ka66jcwxn9a1i"; -"gitver-1.1"="h8a7jyl9vdz7va6ia9ncyal0himdc1ba"; -"gitver.doc-1.1"="v0w2s16f0xqrgfcj0zsrwbrk5788bncb"; +"gitver-1.3"="g29l771yh6kcwqmb719ilba7d4d2pk84"; +"gitver.doc-1.3"="yljhjx0nrp3vvh55i3zaswl5mwzdil5s"; "globalvals-1.1"="cjs44i0mivi683bifs5icf9nk3jr7v8k"; "globalvals.doc-1.1"="2pdq5ik88cr3z5x9j5jvqz1k6abkllm4"; "gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs"; @@ -4996,12 +5055,15 @@ "graphbox-1.1"="x0ckk1yx2f9ks1g70g32f4a683rpf4nx"; "graphbox.doc-1.1"="b4m3rss283l9gfk0vc0apg05biifhpfj"; "graphbox.source-1.1"="p7vnvaxz5a2grh651f3gld07pj7lcxp9"; -"graphicx-psmin-1.1"="bp0jkvi4zbl88zpfh6zfvmqw9nw56akc"; -"graphicx-psmin.doc-1.1"="rrh6zwqmg0d4qz2r0wa97p0ql3xp982j"; -"graphicx-psmin.source-1.1"="nx2ga2h4xz7qsczgnh3d0y9bjrl2dka5"; +"graphicx-psmin-1.2"="j5n5gycsp7vqnqgqsx5p47hg27yj16s6"; +"graphicx-psmin.doc-1.2"="my9qg42ilqhfzwcirmsmf8mjj1ck0j8h"; +"graphicx-psmin.source-1.2"="hxdpbsrnh9zd9aqg3l6vxbqy4iz8nw3y"; "graphicxbox-1.0"="6grrmcmr2wlpx8dbj1k1nggs2b6z7qh4"; "graphicxbox.doc-1.0"="2blrwzsralqjrvlx6xjvyaqvsi764nmx"; "graphicxbox.source-1.0"="1vl41sp02d8byjrapj58v5pg6i2g989l"; +"graphpaper-1.0"="rgmcqd72bykipk8py9rpwffxjag3ci9b"; +"graphpaper.doc-1.0"="ca0qq1zsjfnx1c9ma42lw4iik0j19yqg"; +"graphpaper.source-1.0"="7w9rbx215ssxjv6291qazx61p9csz735"; "grayhints-49052"="g0g3914m4qsplnykwnbfy3ik6svxbifq"; "grayhints.doc-49052"="gayl01rd21rc9i5x6xnd376wm907qlz5"; "grayhints.source-49052"="jimxcmdqgjndw6dqmwzb0ry84lwr59cy"; @@ -5080,9 +5142,9 @@ "hyperbar.source-0.1"="iydbmx9cvsd986n970lvc3k6m28ix2rk"; "hypernat-1.0b"="25v0a423yhy68vf125ys0n6p0qhvr088"; "hypernat.doc-1.0b"="0n4qzpmvhks66d0g9gnyizpl44jbh4pf"; -"hyperxmp-5.6"="m6vqa9njh29d2qfz08zrkginll6z4ba3"; -"hyperxmp.doc-5.6"="hzmi4n5x1qwq2lqk8pg2fp2rzvp2pgip"; -"hyperxmp.source-5.6"="29ay8dqq1l59ibq1lh87mrk9y527wjg8"; +"hyperxmp-5.9"="9h79wa3bsc5p7ch7a42idsjdmskyzqgy"; +"hyperxmp.doc-5.9"="7hmrn0hhsi4s5p216hvrgdm3v7imc9j8"; +"hyperxmp.source-5.9"="20fwjc1fhgrfq70ihcqg2sms40jq5046"; "hyphenat-2.3c"="wr2lhsafb13b0zira7190bx5s68fak45"; "hyphenat.doc-2.3c"="z1sj3r1ny1lgixr2fcmsglz55b23f5lm"; "hyphenat.source-2.3c"="x70g8xiz9ss4pw775lz82yncq0x7lxf1"; @@ -5179,8 +5241,8 @@ "iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l"; "jlabels-24858"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d"; "jlabels.doc-24858"="fndgg419y1rp47d5qifv0k304b5iymab"; -"jslectureplanner-1.11"="vzd0f1283s5cqn024r0p9x8kfc8sm8ri"; -"jslectureplanner.doc-1.11"="zzcnik63rxszh5plgvg004w5q6h7d0yi"; +"jslectureplanner-1.12"="1g82c7aw484p3iqy1c9yw8d39g26q04r"; +"jslectureplanner.doc-1.12"="lx9m14da0gm8nlp6p6cx84ib5fxqi040"; "jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr"; "jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil"; "jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl"; @@ -5251,18 +5313,18 @@ "lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4"; "lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr"; "lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8"; -"latex-amsmath-dev-2020-10-01_pre-release_2"="9gxzfnx8figpi65w0fa40351g8rpv3m9"; -"latex-amsmath-dev.doc-2020-10-01_pre-release_2"="r92dc282pwfkf8kxayrxr3gzl9pibl1y"; -"latex-amsmath-dev.source-2020-10-01_pre-release_2"="lchxam34sm7r2kg2yy56001ig922kbq0"; -"latex-bin-dev.doc-56548"="qk6kfk6nham1q8xfvzd6jvk9iaxqlnm7"; -"latex-graphics-dev-2020-10-01_pre-release_4"="qvr5rcvddfgbsx4f2sxw8p0hc4ik7gv2"; -"latex-graphics-dev.doc-2020-10-01_pre-release_4"="kql79zdphnrgxd6z1wwk49nnk1x73ka3"; -"latex-graphics-dev.source-2020-10-01_pre-release_4"="kym0hbfd9zjnk8xrd2xyy71waysyfs1y"; +"latex-amsmath-dev-2021-05-01_pre-release_0"="p6q4apm28gg02j85lhh3dp8ppwdc3sv3"; +"latex-amsmath-dev.doc-2021-05-01_pre-release_0"="81mlxa3lyggmff4zi0wb7lbhjlswhj07"; +"latex-amsmath-dev.source-2021-05-01_pre-release_0"="03r21wxncnrhm3jswd48x3mqva1caswg"; +"latex-bin-dev.doc-57186"="qk6kfk6nham1q8xfvzd6jvk9iaxqlnm7"; +"latex-graphics-dev-2021-05-01_pre-release_0"="qvr5rcvddfgbsx4f2sxw8p0hc4ik7gv2"; +"latex-graphics-dev.doc-2021-05-01_pre-release_0"="m70dchwqxmhnd46jb2czvlgb1z9xqvx9"; +"latex-graphics-dev.source-2021-05-01_pre-release_0"="kym0hbfd9zjnk8xrd2xyy71waysyfs1y"; "latex-tds.doc-55777"="m38f5gncr9c56sg2cjs0mfgd57wik7pd"; "latex-tds.source-55777"="xdigsidx76bs121jl0m42wavzf4y88qj"; -"latex-tools-dev-2020-10-01_pre-release_5"="hbrzqrai0j91n9jvv1ss8rrpqj0ykv9p"; -"latex-tools-dev.doc-2020-10-01_pre-release_5"="74nvwdl18m0wwplqv908r2wzfg33mgsh"; -"latex-tools-dev.source-2020-10-01_pre-release_5"="b8xgi581bvh5iyj6m1vwy1gigbhgcqr3"; +"latex-tools-dev-2021-05-01_pre-release_0"="hbrzqrai0j91n9jvv1ss8rrpqj0ykv9p"; +"latex-tools-dev.doc-2021-05-01_pre-release_0"="8gp9dhjm7dvymh58xqf3mp6gpva7aiq2"; +"latex-tools-dev.source-2021-05-01_pre-release_0"="b8xgi581bvh5iyj6m1vwy1gigbhgcqr3"; "latex-uni8-0.03"="kh4gfpkynq6f2aqg9r3wfp4b75wd3zaz"; "latex-uni8.doc-0.03"="qany361f2byfy4p1jsbwr4za45x5j74a"; "latexcolors-0.1a"="0izwkzw8h2rqlgnl9dsn2zwm0z2wczch"; @@ -5291,9 +5353,9 @@ "leading-0.3"="m10kyvg2pjysh33gajn8a8hisfc74ii1"; "leading.doc-0.3"="5bc58zdia3qp0742p1hwmxaw13qdgnxw"; "leading.source-0.3"="ks8sv07mg6n12g60aj3s33siha865chp"; -"leaflet-1.1b"="jaqjjxvh2wb6bg7c608cn6rg9d67pkv4"; -"leaflet.doc-1.1b"="5vgkqz1bw0qlxzz5fczsqf873dqsq50g"; -"leaflet.source-1.1b"="l8g4n75f5d85dj4mfwbrc19bh87jzr81"; +"leaflet-2.1a"="zlw7vvglq35pqcgydpzi70lw5p2k3bik"; +"leaflet.doc-2.1a"="jizzawdg24dcb08c1q0k8pffkrfql9gc"; +"leaflet.source-2.1a"="70m92az0j37y5yk5ci4z6ni4vlr8xxmz"; "lectures-1.0.5"="vxrkqjn0y0lqgxp2c2ms8xxwhv8y7dmw"; "lectures.doc-1.0.5"="93h48qv5h0c9g3v4ga95d3cmcml595qr"; "leftidx-15878"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh"; @@ -5515,9 +5577,9 @@ "menucard-0.1"="7k5mxiwycgzqq8ais9d99ss9dhir44x6"; "menucard.doc-0.1"="lv3amrvqjpl36rc3wmrf6yg8dw9w7lw8"; "menucard.source-0.1"="p3sy5yj4gljpasmsyjbi8ndlnjvm69jl"; -"menukeys-1.5"="4paqhdrsa9n9vnlcih3lwbs7ig1cvpxb"; -"menukeys.doc-1.5"="vqip96fgdq26ypfs2xpp947qmjybxpxm"; -"menukeys.source-1.5"="g0i476r5ajhpj65sq4m3h92c236plbkw"; +"menukeys-1.6.1"="wxn5c57h8z5aj5q2d6v5kv9fbk902g1w"; +"menukeys.doc-1.6.1"="8ijrwc0zfhv0cwvy3vk6cqlbd0yxwcmg"; +"menukeys.source-1.6.1"="1gm1gpzj7lply9qfyf00aralircg6gw0"; "metalogox-1.00"="4xl37x2ng2chj7ds59rjkapvmk3fza5q"; "metalogox.doc-1.00"="wk7qd75laf3wm5wqil70vsrcg1ch6q4n"; "metalogox.source-1.00"="8yal3yny31s95vd72p10mybmkx7n11xy"; @@ -5596,9 +5658,9 @@ "monofill-0.2"="jnv36mj3w2vihnq2f17pbm1yzrz2176w"; "monofill.doc-0.2"="gr0mhc8f2w3dnd9r6flqvq5yyb388h4p"; "monofill.source-0.2"="gmdpp4qn9x5bxk24afqs4xg7vzvaqkp4"; -"moodle-0.5"="256bfwnph8m38q5y917zfs7fcwzlxijk"; -"moodle.doc-0.5"="574wp6sh5cnn4r3nggvpk1xv06fi2haw"; -"moodle.source-0.5"="y0njw4q1m03x2wd83d64ph0i3vha42rm"; +"moodle-0.8"="5dxhd75b7rmbxxyrac9rqf28ci03zmr0"; +"moodle.doc-0.8"="73gdm8jzgrawb3apg8y9aklhq2iy94qg"; +"moodle.source-0.8"="8n3ilwn62icss1vimbdsj277zslzbyav"; "moreenum-1.03"="q6a3sxik7whl9zif8j5bs1bgxcp611rr"; "moreenum.doc-1.03"="f0vzqhha6bbsvwnsgq3ng5v4qg3vkbgr"; "morefloats-1.0h"="dzx390854qkxvhcas8krahqfg2pkg93y"; @@ -5660,9 +5722,9 @@ "multilang-0.9b"="56lbpndclbci7ihkidrjqg1i1rb5d540"; "multilang.doc-0.9b"="k2fcrbwx48nwwmwjb5sln2xfyv7ac03p"; "multilang.source-0.9b"="26rcwx14xbk0zfwazm40ab76pkv6b1g1"; -"multirow-2.5"="cchqv2b096x37wbngyp264mm97vs78fh"; -"multirow.doc-2.5"="47q33df5nzraljqx9wrrrp8mrn5b417a"; -"multirow.source-2.5"="qq1b7khcjkxzvxr38hazkkl84wn3kw0k"; +"multirow-2.6"="5llkv1gjmgjvz5hp7z6fqrjg5361i9zz"; +"multirow.doc-2.6"="yfn07prmlv66qbn0h5ai5k6qm738bx6l"; +"multirow.source-2.6"="8rd6n2jjywr04idrrlkbmis0hdyd31im"; "mversion-1.0.1"="7vpmmb88cjk92m2a2hz10cijkxf44bmy"; "mversion.doc-1.0.1"="a2fx7phvl0i1nyhb5h0w6ld1n9kvcgcv"; "mversion.source-1.0.1"="zhbd3j6kxsdyznx9haqqh4vk7b8nrl09"; @@ -5672,15 +5734,17 @@ "mycv-1.5.6"="am1khnlv1w5w9732q2azpsjqjp7xd96b"; "mycv.doc-1.5.6"="gd3fqxrg0y28fw4093g50a9fl5qpb0l8"; "mycv.source-1.5.6"="9jvb2232smja8fb39hlxnh813vlvs47v"; +"mylatex-56751"="yv3rfndf7x4cd2a9gx5fsg82v3gm0qy5"; +"mylatex.doc-56751"="sar6czcxp6cksy74rjnjxdycwwxlhgnf"; "mylatexformat-3.4"="j9yz4p89ln68ra05iyl46vnsia9c2m83"; "mylatexformat.doc-3.4"="jv51r001b567qdpj04srhpinqza2cbrx"; "mylatexformat.source-3.4"="27n04f9m812jsgwpr47sk2k39anbk264"; "nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0"; "nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip"; "nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d"; -"nameauth-3.4"="7vf14i5aid38msdp6kxfmpczkbza48qa"; -"nameauth.doc-3.4"="b5hybqfylxwszjll75c651a8k5235kpx"; -"nameauth.source-3.4"="bb0bbr0635mpaiarr54dwmaaavfbk63h"; +"nameauth-3.5"="1m3lsji2ws3hl7lg7jqyvsldkis5q2sq"; +"nameauth.doc-3.5"="vgv2c6p4avikbpm35fn2gjgd088g12gj"; +"nameauth.source-3.5"="k0dpg67xs4gy4ibzvf1bs6c6khdyi7p3"; "namespc-15878"="6f7x6ldx008l8w5ziahgwl42hb5bws4k"; "namespc.doc-15878"="6aqpn007i8s488j4qi8xhbx9zsyvafbs"; "namespc.source-15878"="s5ws2rny22j23bqy5cn2mz23qn91ssfj"; @@ -5708,9 +5772,9 @@ "newvbtm-1.1"="2khz8c8b8a5946h97w2rf2gmp6z8wvh0"; "newvbtm.doc-1.1"="y1rlqvpv8y77ns1a35q6raksa88qqdnd"; "newvbtm.source-1.1"="1ws90wkmj308mz4qa3hham4mxm3lrl5i"; -"newverbs-1.5"="pcyr9wqib6j9rjv7xlrd9g3lk1da1xyf"; -"newverbs.doc-1.5"="1d4icav7dd83b49jl85k7m8vmfja2jgy"; -"newverbs.source-1.5"="dq87niyhap5jl7wgisr0if7qwl1zbxxn"; +"newverbs-1.6"="pcyr9wqib6j9rjv7xlrd9g3lk1da1xyf"; +"newverbs.doc-1.6"="1d4icav7dd83b49jl85k7m8vmfja2jgy"; +"newverbs.source-1.6"="dq87niyhap5jl7wgisr0if7qwl1zbxxn"; "nextpage-1.1a"="b7b41bpr8zk2z6m5il51q9vxb3c8h67j"; "nfssext-cfr-43640"="isp9rw94ck4a9ckl4b5hd8ma3cmlkdwd"; "nfssext-cfr.doc-43640"="si6j8b4314s0gbnjxwymqbzcajclqn2w"; @@ -5737,9 +5801,9 @@ "noitcrul.source-0.2"="b8s8g15qwdsxm7ywvgj9g6307ws3hg0d"; "nolbreaks-1.2"="1603r89wi8sninjv541na8k2islfk4sc"; "nolbreaks.doc-1.2"="g0nm3i09kzxqqcrycrz2cak05d8qlvqs"; -"nomencl-5.4"="s6hixgxx15y1pzn463005vxnarphp3k0"; -"nomencl.doc-5.4"="a3jlrikv7hick6day2ax9lawl0fnz90y"; -"nomencl.source-5.4"="cpyr0wj64q8lh7swsi0saix56980jz4c"; +"nomencl-5.5"="zxky0yrdmhjg6qs5l5l6wi36h3mszdpc"; +"nomencl.doc-5.5"="3rmvqb2q57mzdiydj7ggqnm62a2rhgnw"; +"nomencl.source-5.5"="dkyq9n1wb5cf9k331mfjd3n6hbz7l3rg"; "nomentbl-0.4"="k74vk3a9kl3sbrkmpyav1snh0cd16np9"; "nomentbl.doc-0.4"="k2ggwchfqa253i96whp2lh4s3p8vbysk"; "nomentbl.source-0.4"="al9s24x1ivpw91bbnn9sqrjp3rb5h0ni"; @@ -5779,8 +5843,8 @@ "numprint-1.39"="7fd6ja6vw3c7yg824y30xrqrmrk3qkwx"; "numprint.doc-1.39"="bbfg2cyh8cykgl3zk9c53wk3q3vbb8pn"; "numprint.source-1.39"="cr7xjw77r8h4bcjihxc68iraxd760gh2"; -"numspell-1.2"="xv0c8dxm8yncknrmarqy0nhjcqdaq8fv"; -"numspell.doc-1.2"="b6sfqk9wnbrg0l3p0hwff0nkskw13rcl"; +"numspell-1.4"="y1gvvz28ix791pp51bc2z4403bn9c1c0"; +"numspell.doc-1.4"="85l7d5arf6ss67lhzjj72fldlyz6isc4"; "ocg-p-0.4"="lxy3nprj8j37b2c7aylxzgm17221wscx"; "ocg-p.doc-0.4"="qg16xjfjp36s3jxm1m75ln2nrl1rlama"; "ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5"; @@ -5808,6 +5872,9 @@ "optional.doc-2.2b"="jg81vzayz3a2pvlxhvyrx8j3w1sw65xg"; "options-1.0"="5xy1cf8yq8awm7bspjj23nywhbs7ww67"; "options.doc-1.0"="gy13y93wl0im19p5jc011fjnr49afgsp"; +"orcidlink-1.0.2"="32vymxk7x7xrkqjsg7n8gvzjyk7cvihp"; +"orcidlink.doc-1.0.2"="pfsf1niv699xl3z7x218c6qavqbah8ai"; +"orcidlink.source-1.0.2"="320adccg7355p4agrqgsixasnmx43r03"; "outline-18360"="m192v07lmcfzq3zbv87cbckz8jwanbha"; "outline.doc-18360"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1"; "outliner-0.94"="24bsa0d5zxz2i50i4bz0b3zsc5v7hp8d"; @@ -5856,9 +5923,9 @@ "paracol.source-1.35"="zw0z1fnlqd1h9hgxgc6pqnj99rsbn679"; "parades-40042"="bkr92ffb7s3zzl845jjkj1777517dwk1"; "parades.doc-40042"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58"; -"paresse-5.0"="586bf4v9x283902iq1rymkil2y30sjgg"; -"paresse.doc-5.0"="vp9b5jpsidh9004ji5yklclfalqvz318"; -"paresse.source-5.0"="a60vw2a7hangmdypia7lvjclcmn1jddm"; +"paresse-5.0.1"="jigr743az2xjrw1qsb15w2hcvi78xjl1"; +"paresse.doc-5.0.1"="r3k4iifg67gm7sxac4l4qzlx94sj5ai1"; +"paresse.source-5.0.1"="9kcjbh6pzglp4h72dxih81xkn0ah7102"; "parnotes-3b"="42sal99phkqbw05k2d9x6by27iy7sc7j"; "parnotes.doc-3b"="3hlfpf75qjahy1qzc8l3dl1n8pj323pm"; "parsa-1.3"="iawcalgm3zpppbclhzn63i33bmnxk47c"; @@ -5885,6 +5952,9 @@ "pax-0.1l"="iqmsy6p191p8bn2bs642zclq3q42n89p"; "pax.doc-0.1l"="cjppdms9xlc6hsj0mk324ndpjqg2px93"; "pax.source-0.1l"="harabcx553nchhf8hh9m3wqwic4l80fc"; +"pbalance-1.0.1"="fa64xh9irys681nlh0gn2fn4qgq2jwbw"; +"pbalance.doc-1.0.1"="75v4ijv45pzqrzwr1cm9bhgbmcw21824"; +"pbalance.source-1.0.1"="mb458ddplvcqcbsz916nxy5crd2i0ach"; "pbox-1.2"="9y4p69w5nskv8j5i8a2pxmhswxz8nc50"; "pbox.doc-1.2"="hjv8mqhlfa9ggqypr7nwzzf03rgm7cry"; "pbox.source-1.2"="pk6hx6w8szi4dbb7irkr0wy3xwjjdpxg"; @@ -5903,13 +5973,13 @@ "pdfcprot.source-1.7a"="95cr49yywd59mcyj7qvqkfc9bhj63hxh"; "pdfmarginpar-0.92"="pra0y1df005b6br3n93zpi7wrvgk2h6d"; "pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4"; -"pdfoverlay-1.1"="y3y3cilmgla5nd49s5vhy8jsyfy79dk0"; -"pdfoverlay.doc-1.1"="0lrr1prxgpwa5zf8xp9ypa6ipw8mjkxk"; -"pdfoverlay.source-1.1"="7zk1x6k04drra2hwdawf9f8948aimr4v"; +"pdfoverlay-1.2"="dpdcfiv148ara2fhm7lbpr2nj4zqdmxh"; +"pdfoverlay.doc-1.2"="f3pkp44zn1lyxrfjnvdz4wz8gzkryhpx"; +"pdfoverlay.source-1.2"="v434d6x8bfcqyv8g2vr6fpgplvrvai80"; "pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5"; "pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h"; -"pdfpc-0.4.0"="04dacl314awsqrfizil2rfszywb1ixi0"; -"pdfpc.doc-0.4.0"="rw7dp54s8pfj5jikqlhi0ggkzvvp1c2y"; +"pdfpc-0.5.1"="yx5ahzjprl4vdaa6lnk876kx9hrkvjf8"; +"pdfpc.doc-0.5.1"="c1091w97m4m4smds9dyjn8jyjabx6dg3"; "pdfpc-movie-1.0"="la1blfvhk9kwfy2q0sp6x1ybw5c2i7jh"; "pdfpc-movie.doc-1.0"="5qc0gdmlgspl5696zvng96nbhgr0j0m4"; "pdfpc-movie.source-1.0"="2d4v3bwnsws65w57arhbs2j5gvm3w5f4"; @@ -6005,6 +6075,9 @@ "ppr-prv.source-0.13c"="g4r673h9bqfxkh1ih2qp9shhf40cbz95"; "practicalreports-2.0.3"="z0zj7cw6zrywmjxwh1kv9qh4340a8729"; "practicalreports.doc-2.0.3"="qnag6zn4rn2l8gwwrmrm2vminwrz8w4f"; +"prelim2e-2.00"="sbggpshfqbnkx6vxl8gldgswsnf0g7sa"; +"prelim2e.doc-2.00"="hjzx94h91zal4xqpdhvgq03in9pqxzzl"; +"prelim2e.source-2.00"="4979f2wp30xgi311nfvkivlcdkj2h0wb"; "preprint-2011"="z8qdsshgjd3dav562qnyx4vh9gdyga27"; "preprint.doc-2011"="78x9z1vyl7vpcv39nj167bawb4z8fsnf"; "preprint.source-2011"="i09zkvcpvapyf2jj7yhabmyrpxyf0gp0"; @@ -6014,9 +6087,9 @@ "prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2"; "prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7"; "prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0"; -"preview-12.2"="j0hgpgmxn5cxfq5zs2q5a8915in16zy9"; -"preview.doc-12.2"="bygh3nzzr1v84dqldp6qhjmyqcbpx4r3"; -"preview.source-12.2"="c4pwp5f3x2dzfmbd8dp33ls800rniq5z"; +"preview-12.3"="6nij1k7lml3fwzl8qmwx8515cnsk53pd"; +"preview.doc-12.3"="9rgwn57grqwvw45jdca07k7jcj898aag"; +"preview.source-12.3"="xyak9iszf9hvfyiggz1gvl96ki862cw2"; "printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim"; "printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv"; "probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl"; @@ -6050,8 +6123,8 @@ "pxgreeks-1.0"="hdqmxzcwyd5llq80fakhjvx8whjxs8mr"; "pxgreeks.doc-1.0"="hdm2s76j6vya85lid9lrkzhaj6bkvlda"; "pxgreeks.source-1.0"="1i5jmxhyphz2mdhl742ydrzam336ix5w"; -"pygmentex-0.8"="bnyslpaj6qfdmak1k1bjyrk0jvflvg1l"; -"pygmentex.doc-0.8"="crqmqfjxlpwibbb9s7sp9qkafnk38f8c"; +"pygmentex-0.10"="v0g38cn50ybp08jqycwkj3gfb482mzx2"; +"pygmentex.doc-0.10"="3fsj110x7rzgmwrmv3g70y84g50c848n"; "python-0.21"="a7v60025926j1nf783w765d773zla60r"; "python.doc-0.21"="901hkhiwnx89si1rx242wa3gx2mx5kkg"; "qcm-2.1"="d9xas7ra5n0hzkc22s6ky3qr752i1i2k"; @@ -6067,9 +6140,9 @@ "quicktype.doc-0.1"="ljcdha8k0ngr0ymwqbqbblgyslybvcgp"; "quiz2socrative-1.0"="8wpvm4ysp513gkigsymd0d0sg3708m4r"; "quiz2socrative.doc-1.0"="xpz8wilnlh12lf0dfjvmzcprjd7pmr4k"; -"quotchap-1.2"="f0cxvb4c0gzg40k03y6yjn1lgyjibx0v"; -"quotchap.doc-1.2"="mc84x8s62mhh3s2hvgzpw09i33klh59n"; -"quotchap.source-1.2"="s54vgrf4zzbxbcys17z8497y3wxz58x1"; +"quotchap-1.3"="jn2r0lm9ky6k8y38p60fls6lvfqh8crl"; +"quotchap.doc-1.3"="9qibsdfc8gr5f56wk9lzfyj7si7mlcq0"; +"quotchap.source-1.3"="7h3yh4i3gfd48hzzrf0xj2adjb5hmb9n"; "quoting-0.1c"="jmw5a88k3r137dxxrvznxx9xqwh9yvlw"; "quoting.doc-0.1c"="2a4d2w7b4jshz79hhz57fpq6vzgdvb34"; "quoting.source-0.1c"="g238v3pr075wgknaj82ivn70z6fbf0gp"; @@ -6218,8 +6291,8 @@ "scontents-1.9"="hh97r1s523a6v2ay9b704cqv744iny10"; "scontents.doc-1.9"="34jdskkym5x8vmhwjkbfnvwdvk7x98pv"; "scontents.source-1.9"="jx3mw5l964zggyczpxl8x30g8xcbbg21"; -"scrlttr2copy-0.1d"="jw87bnb7phfp7nmvp4gvbi6nhfwifqph"; -"scrlttr2copy.doc-0.1d"="6pfnhhnjm97ap2zbi5bjj011wqbr2yg4"; +"scrlttr2copy-0.3a"="kgi950bw7jijqn93vzlvrdx9mkrv1sg8"; +"scrlttr2copy.doc-0.3a"="daf3y1bx8187h9270y4c13wrnxac23rj"; "sdaps-1.9.8"="swij4rm5szzjh3pwqi7a2b3jzzmnxkwp"; "sdaps.doc-1.9.8"="a6aif8szw295jihhn782lygi1k6sx1i4"; "sdaps.source-1.9.8"="4h7km9vs0m0va5k8msmjwhxnqcl2lyca"; @@ -6245,8 +6318,8 @@ "selinput-1.6"="f4xcvq61azvc95rvijmiij8mhjq2ams8"; "selinput.doc-1.6"="6pwfj1pn035vm2jb19sz1qjc523zirqm"; "selinput.source-1.6"="hv4gdy52gpza79867li3img657779zq9"; -"semantex-0.461"="b8nv8fpq8x20bkcr1rcl9vylcl10kdjx"; -"semantex.doc-0.461"="9mvjv4sii7ljcp6lxawgw0f6vp2gcqpb"; +"semantex-0.463"="cg41r6nzzax6wpybk98syvhq86g54wl2"; +"semantex.doc-0.463"="3m1h2gc8h9ridydis9v6lnh1zq6cwffv"; "semtex-0.45"="mb7w1wbpfwpjv9dcnzyfacw4p9612n76"; "semtex.doc-0.45"="f0cwzvv4bsfn1jgvbyavr6455w5r684v"; "semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp"; @@ -6254,6 +6327,9 @@ "semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p"; "semantic-markup-53607"="8x44h8x0qlwz95gh7wmgcq59ldwx59s3"; "semantic-markup.doc-53607"="24d8xyxdibsx9k7jqdcsidpssfbvi7qn"; +"semesterplanner-1.0"="wcqxq4w4shlj7r87jn6ivjwa5nyj8wbm"; +"semesterplanner.doc-1.0"="ndfk7h5nxr18yamb5m0z8d1n5sd05xcj"; +"semesterplanner.source-1.0"="ininzdhnah46n0b5xi78lc3qq8bwy62k"; "semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn"; "semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a"; "semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv"; @@ -6330,13 +6406,17 @@ "skb-0.52"="4abwsdqy977aj45v4frjhf5p4kqi08aa"; "skb.doc-0.52"="hgwacvlqab84b3nv6rnmd79irl1ilzkn"; "skb.source-0.52"="v3b3ggy38vp9z5b9n802dg0xi22yjpwz"; -"skdoc-1.5c"="v3dwsf3zbh5qpcdav60rjjgjhijvr8br"; -"skdoc.doc-1.5c"="jf85c6whs90zinlbl6q707gmb3d8h7vp"; -"skdoc.source-1.5c"="rbi9j4mgp4aqlgsixgp8ffkh98cbg4rw"; +"skdoc-1.5d"="bg0yb5d0bgmnqy12y2irpxn7zfqhin3l"; +"skdoc.doc-1.5d"="9k842q2wjblz991x81554dqn9lshskd0"; +"skdoc.source-1.5d"="991wi8q2b3fhnzddnr0wwbnwis39mczd"; +"skeldoc-0.1.1"="qn5w3f3lsf30826mfdlykfji2mq8dps6"; +"skeldoc.doc-0.1.1"="sla27imxcw6clyik6g34wwfyia7fipdd"; "skeycommand-0.4"="w3sqnw1xyx8l1qb9h7j8jg8z3f6xsnvi"; "skeycommand.doc-0.4"="y8kcbdpydw0an53vfw75nvs8f5rhp5f9"; "skeyval-1.3"="r39dajvb7hh6437jbq3gly44i22im66z"; "skeyval.doc-1.3"="g9gr3bwzslymzx3a5kja4n4s1n0ns5lm"; +"skills-1.0.0"="yhi1ypj4yqg38rg7zwmh1cr1h9r1cdsk"; +"skills.doc-1.0.0"="xlsk7bhrbn5974wjpxdjsm45iab3hh8q"; "skrapport-0.12k"="3hili1y9sl6x37pixcsz33a0r1aqqvg4"; "skrapport.doc-0.12k"="0w6nri4jmaqv9vi8rpg7wd9b68jk58fd"; "skrapport.source-0.12k"="11fvh9n4pr8xsgg3zwvdxly3z9qrk87v"; @@ -6349,11 +6429,11 @@ "smartref.doc-1.9"="hj0c7i3climwjy64h98ddab5skczf3mh"; "smartunits-1.2"="z3kj39xpdk8pa7bzqdjd6g6qlhwx2vhx"; "smartunits.doc-1.2"="r72h43bvig293769q6s8glhdlrcg9836"; -"snapshot-2.13"="pyg4abki4d4zy828r5spb45fax7b4glb"; -"snapshot.doc-2.13"="xaggw13x7izmkhcfl92ldqnzcz398zzh"; -"snapshot.source-2.13"="7hjbi6p9bxh9a405dzbhjlxmwyafckfm"; -"snotez-0.3"="vwnz8rgz6lkw0dvpq1m8xygq1qwrgn62"; -"snotez.doc-0.3"="8gxvxc7x918mf5b63b7n3wvp99ix5ka8"; +"snapshot-2.14"="6x5ifdy780sy1kps29xh2k833cqlm295"; +"snapshot.doc-2.14"="bb748sr7gilrsw9s7q0bvc14pqj2aypa"; +"snapshot.source-2.14"="d9y194pxkkb90gbigwp9kcc84zy4gbqr"; +"snotez-0.5a"="f4w7klr766ll5gwvib5rwvviqaqap9cy"; +"snotez.doc-0.5a"="9siiyz7x76rh3jrlrrpkr9wgn4ca2b2s"; "soulpos-1.1"="908fbjhq1zkq0p3qg4ihs62zxd18988i"; "soulpos.doc-1.1"="7l3pl7mbjmkpr9fwkrdcyjkhqvw2jfdn"; "soul-2.4"="krkmw15blkx20x947657pddl5kda59il"; @@ -6362,9 +6442,9 @@ "soulutf8-1.2"="90gd4zgr0nsq5ccx27cj32b84rnbk7vf"; "soulutf8.doc-1.2"="0hlg0wmni0qswpm7l3yzga6lc6wl2pkr"; "soulutf8.source-1.2"="pspazx53c9dn73absjhpv43wiycncbgb"; -"spacingtricks-1.2"="84f9wq44xbh1qsy3q6dnihgdfsdrax09"; -"spacingtricks.doc-1.2"="n9f1q4ph131jk4wfw5nk0991667j2403"; -"spacingtricks.source-1.2"="8a4sl2svxhs1wpwy5mz4iylzl701mfb6"; +"spacingtricks-1.3"="lb2y9dmbizq70hihhh4l11z7kghgw1g9"; +"spacingtricks.doc-1.3"="i4kfvvpia2sl2b0nrr3m4s692nn9197y"; +"spacingtricks.source-1.3"="9d74zwmlr5r7g9d2332jmzd2qcpv8xjw"; "spark-otf-0.05"="9siivrc6cbck4p4vg4ly0r1b37h7lw28"; "spark-otf.doc-0.05"="y4v051bqbhwc91ipzdfqc1yqrzd5hg0x"; "sparklines-1.7"="swn54z70rhmbk917dpl37mfr3sx21525"; @@ -6420,12 +6500,12 @@ "storebox.source-1.3a"="6zzmya7fcjajy73i8iys9584bldh18z2"; "storecmd-0.0.2"="k2y4zjx31k7014wpb0kvg3ivm3ssp1kv"; "storecmd.doc-0.0.2"="8iskfkck7dgqj3i0knwhzqfvhmv1pr74"; -"stringstrings-1.23"="3jyx0rjn2y5s3i7mdwgmbfygfqmph5v9"; -"stringstrings.doc-1.23"="iwlccyqlbypigdzw8dmpfif08wq8nv2g"; -"stringstrings.source-1.23"="lfm6lqdy2r3lazymqcca7padzmcvb0a6"; -"sttools-2.0"="hhzhgswnm5a26ivlaskdzmma472vsl11"; -"sttools.doc-2.0"="rdvrvdri5g9pb2pm6m95sibp73a73d9w"; -"sttools.source-2.0"="95j75a9qmcpqi8b8fm2hagdmw3fzcn50"; +"stringstrings-1.24"="wnzqsj6nmivadhqqi5hi646hvp3cbzyh"; +"stringstrings.doc-1.24"="k0gm4v75xs9lzgpgqvks7pxbkr5jvian"; +"stringstrings.source-1.24"="j632ahc5hwr2pjazfyql1lxl4x7znr3b"; +"sttools-2.1"="8286phhm1l1sp2pk8smmrmw3wn30ab9q"; +"sttools.doc-2.1"="mszlb4py9kz4gfsgpr6y4qbbzdayrwsd"; +"sttools.source-2.1"="z8dgrhfjc0qwj7vn0qcs98dw7maysmbp"; "stubs-0.1.1"="5ia769ndpi4pcrbg6cljdbpxsx353qlj"; "stubs.doc-0.1.1"="apc0wxqj03fhbab6nwwh5rvzc6i9la8y"; "studenthandouts-1.0"="3gss3z8gv8fyyj3qygmwmbp1jxs7k7dn"; @@ -6446,9 +6526,9 @@ "subfigure-2.1.5"="rnd1mc9gr078d2vna7vwnhv420mnndch"; "subfigure.doc-2.1.5"="zpsn8d5b6h8s9cwbl4fd9iv6w7hypmc4"; "subfigure.source-2.1.5"="10lv7vivb3hggcyv8hkygjhhly6ixxlf"; -"subfiles-2.0"="zhzqc6hlsb7q827v3blxfdyn8whmisml"; -"subfiles.doc-2.0"="7mq48iicimlhggw3pkr3dp8b3ps952pl"; -"subfiles.source-2.0"="l20v3cnafk2as4iyvg5ci83fivl1990g"; +"subfiles-2.2"="l5p3id4vzmik187fsbx10l9789prfqsy"; +"subfiles.doc-2.2"="4c1bv5yyynn7wq4cy7m58sdnd31498mr"; +"subfiles.source-2.2"="lmgliaxdhrb2wx49fc5p2ws0w5wqanvq"; "subfloat-2.14"="l7d8iz54q7zfi5764jfl8v786wihisw3"; "subfloat.doc-2.14"="rx97nj1mh981n89pby4prni2wfmqisj9"; "subfloat.source-2.14"="3a8hj83wyvwrsfk0v6ibzmz4ahzvbkv7"; @@ -6457,9 +6537,9 @@ "supertabular-4.1g"="2rh3aa8ch5jm9yc4iaj349cd339wabw6"; "supertabular.doc-4.1g"="5n3nyqcxgn9fszv2njl59rgadnbg2n45"; "supertabular.source-4.1g"="vi7q7isd5xw019q888apkp0rdqjzzi76"; -"svg-2.02i"="p48dvxfbd8w95fgmgqcl98mnfkdpmrym"; -"svg.doc-2.02i"="1z476mvi6fhl11mlb0bqifpb23g1a2n6"; -"svg.source-2.02i"="4221dfaf1xaw9rzrj38jb6ac0rsbw0s5"; +"svg-2.02k"="64rbl8z8f2h4y0nald9alxq81dqkriyy"; +"svg.doc-2.02k"="z863fd7lspbpdmzym8bx95csfdjnc6yg"; +"svg.source-2.02k"="6sq41726hirllwfkk0x9h6hl804cdmv2"; "svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2"; "svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r"; "svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic"; @@ -6471,6 +6551,9 @@ "svninfo-0.7.4"="761kpr460h6nfczsf1vakdj9r947in1s"; "svninfo.doc-0.7.4"="qlhr7rj98m7g55kgrms1jjw3wp3k7z4v"; "svninfo.source-0.7.4"="xsf1rs0ar8ris0dh8qbslxwx5i0ci6ck"; +"swfigure-0.9.18"="i8j5r40svsl99znl7dwbz6b6fvk6i0lx"; +"swfigure.doc-0.9.18"="3c383j9lc6751zffvylh0xlqy9irph78"; +"swfigure.source-0.9.18"="2vcw78dyrpyplf5fap9vsv9wmplg4wyj"; "syntax-15878"="1bvja2hjsw8p68202f84sbzcrs0f7d27"; "syntax.doc-15878"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr"; "syntrace-1.1"="02njfsdqh7ssnjcsnpmzi3iwxz2yfj9f"; @@ -6508,6 +6591,8 @@ "tabu-2.9"="pvg42mixn7f8vvz4ll8a5y927hhzh82s"; "tabu.doc-2.9"="zsybb13fpnbffljq4w7vcpl3nmvg5xk8"; "tabu.source-2.9"="88pnpips4j95nj427mydnjzqa5nmb2f0"; +"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; +"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; "tabularborder-1.0a"="cfbcq6f60xjzsdwdcxnf9alsgdwcgi25"; "tabularborder.doc-1.0a"="wgd2b7s6bc3349rbhhafcg9iz3wwky33"; "tabularborder.source-1.0a"="7dchkfap6l9ff49i0xwlpxd04yvh672a"; @@ -6535,8 +6620,8 @@ "tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr"; "tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40"; "tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9"; -"tcolorbox-4.41"="vccsv3l6zis6lipj4z2lv2qf14jxbd8m"; -"tcolorbox.doc-4.41"="04ffj3ccvx31hxd0y0gk59ghnqiwkagv"; +"tcolorbox-4.42"="030q9hss3ldncsz2kypwrcvvjj69rhjz"; +"tcolorbox.doc-4.42"="m1grvl7n974qqrnz9y7bsgnmgy052vdm"; "tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8"; "tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg"; "technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh"; @@ -6667,17 +6752,14 @@ "totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f"; "totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj"; "totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj"; -"translations-1.8b"="pd0xy1whysmnz3cn0r7dbpm9hshwmws0"; -"translations.doc-1.8b"="q9qlq3kr1hfn9ygw4178n9g5dxz4nxkr"; +"translations-1.9"="5dh6nja370fm0828qasp6fvklwlxxwb4"; +"translations.doc-1.9"="afx08p9lj0r89pg5v2zb5lgwmkpgpdg1"; "transparent-1.4"="dmcm4nfjmkxj8ycc0y7lgzklbfafm5cg"; "transparent.doc-1.4"="w7vkf495ybi15ir7vpdv9n85wlarlfl3"; "transparent.source-1.4"="hxayqrkm3ann09p5ffqq8i7vhn89k86z"; "trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa"; "trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f"; "trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8"; -"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r"; -"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q"; -"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g"; "trivfloat-1.3b"="vwnj2bh21crx1dkyhq36g4bxpiyjwany"; "trivfloat.doc-1.3b"="dg12fam23s6510jskihm7hbwvf22p442"; "trivfloat.source-1.3b"="dr1x8k6sx8rzfglz91clqwfyzl202sai"; @@ -6765,12 +6847,10 @@ "varindex.source-2.3"="g260r972d5dicmhzdch9kp77fxxakpqd"; "varsfromjobname-1.0"="hy3mbsrrdd55ky6ilrmqfgc5dsx3kdl8"; "varsfromjobname.doc-1.0"="inwn7n9dn0lym3nfh2szc3vfszhns7vn"; -"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr"; -"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96"; "vcell-1.0.1"="g4z68vrb7qslxdq1f31nawlpv5cma6za"; "vcell.doc-1.0.1"="vfsfz1lzpcaqbrdcyrpjc99xylk5inss"; -"vdmlisting-1.0"="8kkhifiignvk7ilb9ka1b0bssgc7vv1v"; -"vdmlisting.doc-1.0"="aqw59yhbm5sxfp4kmhy63npmlywh31dq"; +"vdmlisting-1.1"="n25b8bdw43shzlsn97rk4f0x31k0i2ip"; +"vdmlisting.doc-1.1"="rjcgx3yigj8w0085q0cdk8yir2728f2s"; "verbasef-1.1"="i92bhi5drkn26s6lc8kwdm2z5f2qr0y0"; "verbasef.doc-1.1"="qnn12d8793pgj92wfi0254n1kgi96r4x"; "verbatimbox-3.13"="zb6kvwdpd9a4s4d7wcax8j6c43f3dy7d"; @@ -6889,8 +6969,8 @@ "xint.source-1.4b"="nws3kzv8aadv37kyvrh5hjc6halqvflz"; "xkcdcolors-1.0.1"="2g1glnkhcq4709y8hkkn3f6b3a4wh5dl"; "xkcdcolors.doc-1.0.1"="ni52wb9gdcxdwzwdl78988anxhj5ay61"; -"xltabular-0.2d"="xr6zzhbymh3v7z16ixdaacbv7z47cl28"; -"xltabular.doc-0.2d"="76yq255vnakwh7h10dkaczkhfkg5nisz"; +"xltabular-0.2e"="ll0q138s9xm3kapjmcl2iz260xgwiya7"; +"xltabular.doc-0.2e"="1qf8125m1hxzpf98w7jkfymbhcbsv003"; "xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6"; "xmpincl.doc-2.2"="dczhfj7g5h3gf3vg7wncvccn1q3xavqp"; "xmpincl.source-2.2"="0pfma5c8agil5jamikja0qh5fnyd9wn0"; @@ -6919,8 +6999,8 @@ "xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm"; "xtab.doc-2.3f"="pmhfig6nmfimb0didacw2sja2kc1nik7"; "xtab.source-2.3f"="78m8pqm3r7jhxy1p5cvqy7p0clpzwi6q"; -"xurl-0.09"="r9jl4qmmbmybr18x273477yjb5dkfqm5"; -"xurl.doc-0.09"="pzg8fxxawhrhp4n0svxkwg221j817f4m"; +"xurl-0.09a"="2h8qp6r2i4rdd6f7lq34g40w2wfbhwv3"; +"xurl.doc-0.09a"="mnwhvjinhwwxxxcqyydpnnb9lz887q56"; "xwatermark-1.5.2d"="5c0z0yvlrs562482lkz70w6n7i80mkqi"; "xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj"; "xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf"; @@ -6948,9 +7028,9 @@ "zed-csp.doc-17258"="5p8s701yk431qyngw010qws6b9shx588"; "ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04"; "ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm"; -"zref-2.31"="8m0k34dxidh1r4803ff6rnbjb5al80sl"; -"zref.doc-2.31"="6dyiph2mr5d1v7glk8dsi0yzil6hw883"; -"zref.source-2.31"="61h6655gkdcjpfiz9k7xb81wadzc2lbd"; +"zref-2.32"="17gs2db0nrwc4hvrh5ha3lpvbnvzaxic"; +"zref.doc-2.32"="krs6a5w6n269rbr6qipmbhma2nbcirkv"; +"zref.source-2.32"="jgjibzgh4bzhxwdic53f8iw2f9f9400v"; "zwgetfdate-15878"="ibagqadgb3nbq8y72lzhrbamv5xcipk1"; "zwgetfdate.doc-15878"="idw9limrda31c7h0xd3j6v23xqbd2nn3"; "zwpagelayout-1.4d"="h3kdf67z95ghbzw3fjm7rq9jra2qwnkg"; @@ -6965,9 +7045,11 @@ "bezierplot.doc-1.4"="crzlgln3g39kmqdba5dffqdx3p9fffzh"; "checkcites-2.4"="2vzqckrpid1lxi5awbc3s1179j0yw9rm"; "checkcites.doc-2.4"="5dfipwxsrf3jn446z9ar0caa8bsmw4al"; -"chickenize-0.2.5"="bh3kdbw0yvz28izgmxxw3psmirwmfcd5"; -"chickenize.doc-0.2.5"="hqyyggfs1is65gfl4ck1mki9wgm6238v"; -"chickenize.source-0.2.5"="xhybj8jxyv1fghx7955dcgfcl9kjgbkw"; +"chickenize-0.3"="lmc9ia08np6k06m6fm4lkzp2x8ilng33"; +"chickenize.doc-0.3"="v5b1an4wzrgbp07lh1y0ccsqm4c2xqqf"; +"chickenize.source-0.3"="8mzsm3jdxa8ii448wg4i83fjxisihz4j"; +"chinese-jfm-1.0.1"="zwgqs6w7w6dy580hvpnhfr14n81f9y4m"; +"chinese-jfm.doc-1.0.1"="yx0s2s2zndhss575b7n0cw0mca820wmp"; "cloze-1.6"="6fnj9fvkd2969p095lrsk2rxvp3bqzx5"; "cloze.doc-1.6"="sp2jppmdhd3w1z6ivi3kga393bhwqw6m"; "cloze.source-1.6"="5b31196q2dpj278h0wjbwr193q96p0fk"; @@ -6975,9 +7057,9 @@ "combofont.doc-0.3"="99h3xmx3jv5il99g6wc10csqkmpm5mg6"; "cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp"; "cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9"; -"ekdosis-1.0"="7zg59f9z3sb50vbj4z5224dypbsmywxb"; -"ekdosis.doc-1.0"="rf0i1p4092qb9my1vlp425zzlgp1j2as"; -"ekdosis.source-1.0"="iqj4hqnja5l7si40a4ds2wrjzc8nvycw"; +"ekdosis-1.1"="d8b15bhkhnky34fcr5qnbiw7mi4wizgs"; +"ekdosis.doc-1.1"="7276zfz02kmb49nqhfmd7508dpwc70hy"; +"ekdosis.source-1.1"="4z5d7qd9hw5c2jr8iqh01cxkwcd4xa6g"; "emoji-0.2.1"="v664b6kkikc2bclfv4c2p4bh4l4fwjan"; "emoji.doc-0.2.1"="51iq1l5488652ns99wl3irf3d9qsgwzl"; "emojicite-0.3"="ycvzy0rk6ilmzv8jlbn0a6502j6n0085"; @@ -6995,8 +7077,8 @@ "lua-ul.source-0.1.0"="hrcnn0m4bfqqqznfx5j4fxn72aqiglkn"; "lua-uni-algos-0.2"="52pjhipq7788hbldi78i78y5pk90v0l4"; "lua-uni-algos.doc-0.2"="pkw96m767bgcms4k8hypfbzm1xb872fi"; -"lua-visual-debug-0.7"="dc1d0z6fxpdsligy9qf6ij32sw7y99np"; -"lua-visual-debug.doc-0.7"="abkl63vyaxlvp9hbl33lwlkkr5ml5ykz"; +"lua-visual-debug-0.8"="q9v0clrwznlv66r3i4dq1srbz6a3nqd6"; +"lua-visual-debug.doc-0.8"="5ka8px5n50n5ghfi8k86svs347cahvpz"; "luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl"; "luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f"; "luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7"; @@ -7022,9 +7104,9 @@ "lualatex-truncate-1.1"="imd10qn2sh19fdz4zp8qz57rqs0kh2n9"; "lualatex-truncate.doc-1.1"="xfanw53qhm8qhqg45ykvvf213j3q5dy9"; "lualatex-truncate.source-1.1"="sv3j09xlab2gfqn670wd41xgdk3rjc84"; -"luamplib-2.20.5"="d59kbn85512qqzby49rkmhdfq9vq9xnk"; -"luamplib.doc-2.20.5"="xh4ybk8z6frhvvjd3ybivrlnkr3ydzxl"; -"luamplib.source-2.20.5"="sk5w1r0bb36gbr304ck9px0xf568rlrf"; +"luamplib-2.20.6"="6n7blz32jw7ig9p6bxcmgx00zkzw7i21"; +"luamplib.doc-2.20.6"="jggxncxxd0gfb6yjrk7wqr9vyymq1kcy"; +"luamplib.source-2.20.6"="7j3zklr88455syyaq53p3x1pljxkcymw"; "luapackageloader-0.2"="gmc8hizbl18cka1iq0xhy8bp65yrl4gw"; "luapackageloader.doc-0.2"="ilsqrigd8gvczbfkcbr0ci54qlryhyhg"; "luaprogtable-1.0"="cyzviwzjdg10rh7xizm90d9vbsqjscir"; @@ -7038,15 +7120,15 @@ "luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd"; "luavlna-0.1g"="q0d5901smibj9xiarwd9hcyvw6wqjw4j"; "luavlna.doc-0.1g"="zkdgb3grkrj1ixvbwc4v0jd19p7jnv52"; -"luaxml-0.1m"="9f5jxdhxdpzbmx5inhr2jnhn5w1jcqwa"; -"luaxml.doc-0.1m"="6r2q16a1cf8mmrgkhx1nkk09kzsfhbnr"; -"nodetree-2.1"="1b11kq5f9944iiq0j89kyavrfrvnnj2r"; -"nodetree.doc-2.1"="w55dx9d3i1000zw75079agf2bfgll91j"; -"nodetree.source-2.1"="jd25q55yzgr1smkjf87yyb4j27x9zl3v"; +"luaxml-0.1n"="mfc6hrdlf4kq0xfickj9p894av9hljm0"; +"luaxml.doc-0.1n"="xdbvbd6qy265j4ck813ycr5yi3v1655w"; +"nodetree-2.2"="r5kgj9y7caj0npi1z70yvyfdsgmbf124"; +"nodetree.doc-2.2"="0q6c5yfwcsbfrdj1r2435kar1q4bj1wr"; +"nodetree.source-2.2"="dsccgf77bz156m8kj7hxcg8yylg3701m"; "odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl"; "odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp"; -"optex-0.15"="di7cx8pc36wrc7rdazyw444gvj6knr6c"; -"optex.doc-0.15"="9pkhsdjk8hpz6m804nqa4hv8lm5x8015"; +"optex-0.18"="iph13j8xknvxbk2p93kvzhcc0baz8vxd"; +"optex.doc-0.18"="rclw6gshxrb98z46w0fsmss4fhzpnxn6"; "pdfarticle-1.0"="gp3238h9g1kcamcamvhndgs1h9wav9ld"; "pdfarticle.doc-1.0"="zh97mill1idcik9zhb8cp6wyq32lm7i4"; "placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy"; @@ -7062,6 +7144,8 @@ "stricttex.doc-0.2beta"="a4hz60n22504k60j2hj2ip3fc5pn874z"; "typewriter-1.1"="4xbzb4igw0cd0p9ry0xxii4p8gj7y8w3"; "typewriter.doc-1.1"="vk3rzpx4vpgs5mwq8hmys9m0vv6gmmdj"; +"uninormalize-0.1"="a9qjz4wd45prkb54v5fnrji5y1fi3r4r"; +"uninormalize.doc-0.1"="ab1z4pxac91p1ywijfipjclzdn7hbq1x"; "12many-0.3"="kzixh8p9qmbz0hxczir6pixx8k6zc1an"; "12many.doc-0.3"="v5qw194xha1w7mr6x3zcwp9a0gpi4w4n"; "12many.source-0.3"="wqc3q5hqwg09g0sz7l5va9xazvmqbbrv"; @@ -7099,9 +7183,9 @@ "amscdx.source-2.2x"="da89in5nc7m37m5padb246ra9gl6cjrq"; "amstex-56070"="lpqwc8f3c8iv9691yxqs6r00dkjp9mh2"; "amstex.doc-56070"="fsvgc0caxsbw7gqzaqz97fsz9c5x3qi9"; -"apxproof-1.2.0"="f4p5sn16ygfnnx6lzjmz6gwhdy2pd88q"; -"apxproof.doc-1.2.0"="xzlmlck028ri44c49sd5vr5ksawjg62b"; -"apxproof.source-1.2.0"="nhmzdgibha22wzmr1ppvinifbq2vs49w"; +"apxproof-1.2.1"="rv12vr5m8iw2fw6rp07l3srnbirz3ibr"; +"apxproof.doc-1.2.1"="4cfsxj3d8f2gnvrqkqsx2i4jarmpkvc4"; +"apxproof.source-1.2.1"="4vnna3hyyqrmq1i4fvkpdyg8isvcarx5"; "autobreak-0.3"="61yyi2p6gf0sjydn5kr8h8qvpxgmvbin"; "autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv"; "autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la"; @@ -7139,21 +7223,23 @@ "bussproofs-extra-0.4"="v5xhwycppwm0mpn11589shbys65hplx5"; "bussproofs-extra.doc-0.4"="29pwpr7yfc7n2nflvzfpm39gdwx0qis5"; "bussproofs-extra.source-0.4"="mi485ji1m4vvbd82xavgv05kbd3j96q6"; -"bytefield-2.4"="whxn5qk2z4pia4hpafbzggp6q6zai2c0"; -"bytefield.doc-2.4"="ixgwy7pi37anjp4nmm765hc6hh484gxz"; -"bytefield.source-2.4"="mmnbxv3g3c6i858xs5dazi1nkfvrxsjs"; +"bytefield-2.6"="ns0c255yr22gvypcpgyvn7yan52yjvwc"; +"bytefield.doc-2.6"="y537gi9040798qyg6z3vjsz9g5i8px4p"; +"bytefield.source-2.6"="asvjyk82y4x267vq2srkxq5dk0vr0jmx"; "calculation-1.0"="sss6l897zlki1lidr2s5vp60rv1jfm0f"; "calculation.doc-1.0"="zwcix1a11s0s1hh7ccy28gbdxylz1n3k"; "calculation.source-1.0"="asdip95ln7gna99vk7hjiq8n1hfcqg1x"; "cascade-1.1"="xl13i2yr1fy3awaihp637h4lz7g5d7gj"; "cascade.doc-1.1"="3jivxwvfqdwlc240ks4q52q07zrp06m2"; "cascade.source-1.1"="ggqhq9cl5ia7l54kws9yqvz20s46y3dq"; +"causets-1.1"="rqqybjv2cbfk6wbl0ffmn66ijrasc6ny"; +"causets.doc-1.1"="ywnqh68ciqxv5q0mqzplra7496vdqvvi"; "ccfonts-1.2"="im7vh7a3c8ja312745mlndwmndg1jvh3"; "ccfonts.doc-1.2"="4ayp0gvbvmf0jxnfw8ciwz1jfmvbf3ds"; "ccfonts.source-1.2"="8sfbbqrr9fq9jqbvapgrx0ghhh6r1hkc"; -"ccool-3.0"="wp017y73kf8csvr1p3vbplxbjqw87sz8"; -"ccool.doc-3.0"="sb4c3l8jqhj51ampn05zdj0c5z5kicld"; -"ccool.source-3.0"="iqz2hjjcygw2hww5yh9jk21airqw4dlc"; +"ccool-3.1"="chdi79g5j28xq27pbqk0nk9ccbcq11py"; +"ccool.doc-3.1"="q495yyd79mczqqn957jnn2ykp49xk6a5"; +"ccool.source-3.1"="lwic4fdqlcnqp6yplmrmq2zwr8h4dn5i"; "chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72"; "chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg"; "chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506"; @@ -7164,14 +7250,14 @@ "chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp"; "chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck"; "chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1"; -"chemformula-4.15j"="dgk33ik72xs6arp5r4xywbs03skqn073"; -"chemformula.doc-4.15j"="h2w5zvnxgrf803w2s6jz79w0jiv94h1r"; +"chemformula-4.16"="9a0qa89xd6mhzwl6l0g5mn6263igqdhs"; +"chemformula.doc-4.16"="451y52ic67j0i289gzgrl25dpb5lzrb7"; "chemgreek-1.1a"="9jhyby4636bybvzq4ppvrjp7md499vp3"; "chemgreek.doc-1.1a"="1v4wdq6k5yjcyi8v976la6ldskmh061a"; -"chemmacros-5.11"="8bpw8jl33idm8pywy53j5v5qci9m9v0p"; -"chemmacros.doc-5.11"="bp5wxh0z4zdaw98x1fhhc6zzsca7zb1r"; -"chemnum-1.2c"="4az4s50lwaray904pnfc9z6i2gqi7a5x"; -"chemnum.doc-1.2c"="wbikxk89zq84klsqq67a5ds50jaf28nx"; +"chemmacros-5.11a"="fwkab5q7nkn3khh2p71qrdwsxfbwnk7i"; +"chemmacros.doc-5.11a"="55b2w1ka0n5v402h5p1m7gm840jj6q4p"; +"chemnum-1.3"="rkb4yh5gq0j4pcvbx16j0apgmazavaqp"; +"chemnum.doc-1.3"="adk6gfv163mrw50h0g004wn3bbm0qrzm"; "chemplants-0.9.8"="mnsmsmh4gsllxqd8a8590sggv7844k03"; "chemplants.doc-0.9.8"="j6zlbg0gpb3360953q726g008br0zs7b"; "chemschemex-1.2"="w3v5w049p0g28v8wx70ah804wp3map2v"; @@ -7212,8 +7298,9 @@ "cryptocode-0.40"="2v0vwspdr8xvy4s1hx41abssrgl6lpyr"; "cryptocode.doc-0.40"="q56g76fx90pyi6qc2kq7mnccnl96l4n7"; "cryptocode.source-0.40"="y27wial5c2si94j1alf6zrssghvykmlv"; -"decision-table-0.0.2"="sbimxm7awix68mi53s6hlac8cqhmhabw"; -"decision-table.doc-0.0.2"="85fyr1l1fqlhshixhfgdzhyd8d03vwc1"; +"decision-table-0.0.3"="sj1ivppcdkh5rqcvmrh0bbzxvwfjms0k"; +"decision-table.doc-0.0.3"="7lday4lz5xah837ljynxmmwbxyjrkl36"; +"decision-table.source-0.0.3"="ldvmfif7p2n6hrf4ax6hv6bswk5l2hly"; "delim-1.0"="q2f4p0f8bg1nwim31i272i5rpnjibxks"; "delim.doc-1.0"="5k874svcycyk4y5qalbs4h0x4zkviwc4"; "delim.source-1.0"="bglajqs1gdzhpjayh5d4afw7h09wln22"; @@ -7323,6 +7410,8 @@ "isomath.doc-0.6.1"="nhpi08b738hs457jqv7139b44z35xy5j"; "jkmath-0.1"="l4nykjpkg2p19fdvy4a6h32ik4hcimdq"; "jkmath.doc-0.1"="79bfybh585f88gcyc82b3ds7nx92jng6"; +"jupynotex-0.1"="ri5pp81vxiwa2m3dxk23pz1ahxl9w6yf"; +"jupynotex.doc-0.1"="hpka37bcy98c0cpm09m9gwf4j6dfm80c"; "karnaugh-21338"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2"; "karnaugh.doc-21338"="85z4avy6yfziaqd7b4w077ys394a3y4z"; "karnaugh-map-1.1"="mryi5vdfqia142b35n97pwzvh267y6bh"; @@ -7389,9 +7478,9 @@ "miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb"; "miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51"; "miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3"; -"mismath-1.7"="v2s1vq1j6rkk1bz7xiad62a8ns123bpp"; -"mismath.doc-1.7"="711hsvwqxxbwr1y6lzcac1ax76n20hcl"; -"mismath.source-1.7"="f7w52yr2xq8d352z21zka6kb6zx004kd"; +"mismath-1.8"="qgcm8svg1sdxnwjnkhimjq7w8gqpqyp2"; +"mismath.doc-1.8"="aflrdaxjvq20v57jmsvmnpj05dmj53r2"; +"mismath.source-1.8"="7f2gdkc4n5177zm0r9q42qpcphdhnb43"; "multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz"; "multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731"; "multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6"; @@ -7399,9 +7488,9 @@ "natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk"; "nath-15878"="7x3cdih5q3i8dg25h6737vaphmrdxvbp"; "nath.doc-15878"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg"; -"nicematrix-5.4"="yxr2pc09mjxan41k7bx3m10cjp05l9x6"; -"nicematrix.doc-5.4"="911bm7fh52yrhr6qhqaj4cpp4ydii41f"; -"nicematrix.source-5.4"="2k5d0m339g5p0ywxzqik7b9lypwi630l"; +"nicematrix-5.9"="4pbjw3rmrsfxbf1i6hndqqdib0y3qzjk"; +"nicematrix.doc-5.9"="di4qvcivqqfqgfim6rkb77ksdfal2gda"; +"nicematrix.source-5.9"="yhgffsdg3r52jmssgvx9vabb43ag3h32"; "nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma"; "nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30"; "nucleardata-1.1"="b76hnd5fpl3f1hfh8pwgrsnqkadqi2zn"; @@ -7428,13 +7517,15 @@ "physunits.source-1.0.4"="bwj0mas8fx3csw3ij081znnz5mrq2nw4"; "pinoutikz-1.1.2"="dzb6wpz2hywq4i4cxi49s3yssxhxkm3v"; "pinoutikz.doc-1.1.2"="9iyyk8vp4yfnc7jy990gh6z449mxqll6"; -"pm-isomath-1.0.06"="cy9qc9l9z8hq2mlv90vbn4i3nfnyi0ak"; -"pm-isomath.doc-1.0.06"="fy7shz0li68lm894cx9754fhwikklj0z"; -"pm-isomath.source-1.0.06"="3my6scxs3dmc013ccsxb81nsa6jxg6qr"; +"pm-isomath-1.0.07"="4bhf0nkw5wsmj7r26j1cwhgdxpy62pzb"; +"pm-isomath.doc-1.0.07"="92djvbz5x4c0rdpjk1z1kbhf374pi9mm"; +"pm-isomath.source-1.0.07"="vfmjgjks3i5hs6gxp6nhzvhlbfsm6qsa"; "polexpr-0.7.5"="20yvnhmb8dy7p1jwlimayaflwm3sw2q6"; "polexpr.doc-0.7.5"="3zbnfkrlxphvikk3w1jrd21dzrsnkad7"; "prftree-1.6"="jwghbxhmr9lnai4rh4gnrrd5i98vqi1j"; "prftree.doc-1.6"="7a0lrs2rak9c45ayjfmn8ghx89zab2pg"; +"principia-1.1"="sp0508hz6pi8jn5xfhl7clx2886czw3x"; +"principia.doc-1.1"="yqmyf1syday8m8lvxjlmh922y5f3y4wr"; "proba-15878"="k6j2r5kacbcl25i7zwb71a2mlyn17dap"; "proba.doc-15878"="a30lrji3wrd9rb8aa7hzflch7cwlybdq"; "proba.source-15878"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id"; @@ -7456,17 +7547,17 @@ "rank-2-roots.doc-1.0"="x84hhyxp10nhqk3vh5zwsxdqmkifwc10"; "rec-thy-3.4"="gyi6qbzryvr8w0cvq40g05pw2d5v72nf"; "rec-thy.doc-3.4"="dp8579zcyw7wp3b89k0apgm4h7rvf82b"; -"rest-api-1.3"="06a2z40gg5zr9mqcr5l9l62pikkzpgq6"; -"rest-api.doc-1.3"="v0h4q30pb18gdv3z6n32giq2y94mid1i"; -"rest-api.source-1.3"="hzxhbfc7451p9g3l4b74432gglvjdfim"; +"rest-api-1.4"="4nq3lciglb70rr49v7w9an1bj2ymq0kc"; +"rest-api.doc-1.4"="ipic9f43478jakkdigfaw0zpaq9apq32"; +"rest-api.source-1.4"="d4868ncchm5byvnbfw25mydlf27ncgl2"; "revquantum-0.11"="ciws2fb27v2jkmvacgxx5f5rjypxwhxj"; "revquantum.doc-0.11"="3yx0fd96b5sxmf0950wy2yfswfn5k5j2"; "revquantum.source-0.11"="a3lxg56ihykvv3wy0az60hbd3n721grf"; "ribbonproofs-1.0"="7r52zy2n48hichyvyxnhvzcn10v6bm3l"; "ribbonproofs.doc-1.0"="15wcmvid4xbflmy4lv1njbnvbz5svk41"; -"rmathbr-1.0.3"="fv88qckj67imsc8a7v0y9pgzqdlzcbmz"; -"rmathbr.doc-1.0.3"="giw002mrgbyjbm5mfsxy2aan7mgiqmv6"; -"rmathbr.source-1.0.3"="iq3id8a5cyskh3adf20nxwfwjxbb32ib"; +"rmathbr-1.1.1"="i61vd0n322pbpqia1ymizwkqzz31g7vz"; +"rmathbr.doc-1.1.1"="4h44kiz0z8bzxp75zfpc3jb2haxylqxq"; +"rmathbr.source-1.1.1"="z41y0xrn0amgmjmgbqhxl9fz441fd5jx"; "sasnrdisplay-0.95"="9yvwv7a6iw8a7g58w0zlgmfaz2zy8nxj"; "sasnrdisplay.doc-0.95"="0dc8ai8f6b0dn05ljdlnx2dykbhil5xh"; "sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh"; @@ -7484,8 +7575,8 @@ "shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a"; "shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld"; "shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm"; -"simplebnf-0.1.0"="gy1fdjkxfirryqcspyqn3xh19h5ab9sj"; -"simplebnf.doc-0.1.0"="fff34d89r4aiw5qcy9px8ksh4190rcql"; +"simplebnf-0.2.0"="rsyph0dhpy3yz1yqvr5wa7gmcn1zyg6i"; +"simplebnf.doc-0.2.0"="3k3pb1cylrcnr3bs0vz278xkizf11048"; "simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3"; "simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z"; "simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67"; @@ -7580,8 +7671,8 @@ "youngtab-1.1"="0pni2w43573rjhi2lygsg7547n3fi3ic"; "youngtab.doc-1.1"="1svxp5r9wmqszr860w9nx6b60nv1qiq8"; "youngtab.source-1.1"="3f54467ky4ban6xkqcldajyr4gfy7mm1"; -"yquant-0.3.2"="r4z8dsvn24lj3d69bq5mn1hfhnj6b603"; -"yquant.doc-0.3.2"="vxf63ra7jijqhiy3bkdrcz6nj6ayj09w"; +"yquant-0.3.3"="f069ff7d9f6vv5cnhmq1f27h6zl6f414"; +"yquant.doc-0.3.3"="xygcxv62qah8j35s3l6pxnnkb8cc98z2"; "ytableau-1.3"="37wsbj7an7fvsrh4w5kvjiibhq0abn9j"; "ytableau.doc-1.3"="wbgandbbk6zgms4jz2ird33kyg9yg19b"; "ytableau.source-1.3"="2rblxwykvkrljn1xqz7zw9dz1wyib686"; @@ -7626,8 +7717,8 @@ "gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg"; "latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb"; "latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf"; -"mcf2graph-4.52"="w0vzlw5kvflnffkzbsgbbkbnli71xqvq"; -"mcf2graph.doc-4.52"="nxjcisz791gn5f0n2s7izripnbgwrss8"; +"mcf2graph-4.55"="msp8abvdflp0h9k19y596vw2rwlmvwq3"; +"mcf2graph.doc-4.55"="8jsyy4q435cmlxl4zjv43rvij238l17f"; "metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z"; "metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g"; "metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb"; @@ -7726,9 +7817,9 @@ "musicography.doc-53596"="z63rsy6v54c4p1l844ck0b6hc9fwr96x"; "musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1"; "musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf"; -"musixtex-1.30"="rgrd6yf6vr0nns6y5xp6ppzrdja4cf5w"; -"musixtex.doc-1.30"="h56v5x6ljybd30dymw0n1i4dx1hnv1v8"; -"musixtex.source-1.30"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; +"musixtex-1.31"="2cl7fw84mii0n2v2rvmrprbr2yinvpqv"; +"musixtex.doc-1.31"="0anlk9gnbpgzasrdbv0685mgi0zfkr5l"; +"musixtex.source-1.31"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1"; "musixtex-fonts-37762"="a8kdi135xis6qcwy90yisg4wafklmw2y"; "musixtex-fonts.doc-37762"="91fl3b700pvjqkwsl6h29f0z5i5781s3"; "musixtnt-40307"="6412y8lh8awml9xs7ybcnhkgyjrc08vx"; @@ -7756,8 +7847,8 @@ "abstyles.doc-15878"="xba8x95rimsa16xhr7nziglk7djzv6w8"; "apnum-1.7"="hvw4fwjm3n7hfj08ik7nkg5w51zg9mbx"; "apnum.doc-1.7"="isai4pdly4pkhhjnh3afijlrm9mw2i0q"; -"autoaligne-1.4"="lvfsylaqq4sxi02bv9v6z1sy8gayb570"; -"autoaligne.doc-1.4"="7rzi51xaglby24ihmzplk6d0yk2x1wlb"; +"autoaligne-1.5"="1ycql6wzhqayd90wkd62n5bqymwr0z9h"; +"autoaligne.doc-1.5"="72b0nqh19zipzzv46z2hhkkv8fg93ca7"; "barr-38479"="rsgsgzki68jgx8d4r05qj1awvi02rm33"; "barr.doc-38479"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr"; "bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b"; @@ -7793,18 +7884,18 @@ "epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg"; "epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p"; "epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a"; -"expkv-1.4"="29gqz3z2a8yb4r035224dcksf7kdypws"; -"expkv.doc-1.4"="d4am4ls66vfnsxrdsq299a3f7qz2a4ql"; -"expkv.source-1.4"="6bk2fihm7ksck8pkm1hbpva54gmi9z1g"; -"expkv-cs-0.4"="cackn20g9nx2c0y117swfpqjnlssz4lj"; -"expkv-cs.doc-0.4"="1d3xf7mpjzavavc2adlnql4xd32kfmgj"; -"expkv-cs.source-0.4"="3mki6i67x9r74qd053nclwqxymrixid0"; -"expkv-def-0.5"="swzr4rilgni5a12p1mhyqd3siv6lxygz"; -"expkv-def.doc-0.5"="cadfkapwdx2b33nvh7s37h9ps7svng37"; -"expkv-def.source-0.5"="yipx1lbc2xf82xq8h9kxinm7i4rf107m"; -"expkv-opt-0.1a"="7h72cifas5v9vcd4h0g1lpjb0mn8rd0h"; -"expkv-opt.doc-0.1a"="s88rd2wfw21n3fm8pifzyzyw0r1x2n50"; -"expkv-opt.source-0.1a"="ds4jry5d0h3cfdrrqis65vc5kpgwmwvl"; +"expkv-1.6"="x19fg4al6xjan41l07dkf7lgp6akgw6l"; +"expkv.doc-1.6"="16ny94yijql35j0klhdbpvvb7l2rv8bf"; +"expkv.source-1.6"="92z0fwgv9jf2v47cvrw3j1zz9mjzwymj"; +"expkv-cs-0.6"="r6f8mb6qxasa09kz9l1lbbs3r0dzbr10"; +"expkv-cs.doc-0.6"="d708jfhsdxzpgbp6p2i1176yd0fpaskm"; +"expkv-cs.source-0.6"="daw8zwynx2xhxbph8r4cbnwb5drcvmxg"; +"expkv-def-0.7"="j4w7rgirhfl57mz938fbm512z394ycgv"; +"expkv-def.doc-0.7"="8n4pxgxg9hpn4zajr5f2w5cj58bcxm4d"; +"expkv-def.source-0.7"="iv5pzka6a93yg9k6ry0kcfzkafzkdvv8"; +"expkv-opt-0.1b"="zvgwq3f7ic1hdn9glglrmsxhs7lv31yz"; +"expkv-opt.doc-0.1b"="wwzx0jdrazqnj7c3ahbs9chw01gndvbc"; +"expkv-opt.source-0.1b"="m313vzjxyjbi5dr1ca2wi6haazm9zpig"; "fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96"; "fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb"; "figflow-21462"="166qngk7yy25v0rbjavi53m0sazk90gn"; @@ -7830,8 +7921,8 @@ "gobble-0.2"="r1knqlpg1ndgkvkmi038jy9g450qm2k4"; "gobble.doc-0.2"="kpgjg6n4p17fvw93qyih0xslid4x7w66"; "gobble.source-0.2"="i8dh8xayn1a2lsslnr8wygj0qr168wpx"; -"graphics-pln-54080"="l78qggbm95wq2yqj1yzr2gy2x244cbiq"; -"graphics-pln.doc-54080"="nx34dlv8zk90kr1agqbj5h7y2b4whq5k"; +"graphics-pln-56823"="ny2glbxpiyxv0b9nf254h3fs08cqb7dg"; +"graphics-pln.doc-56823"="c9rd01qyp0bcngq6cv997zkqdzsgbb8d"; "gtl-0.5"="bypkgzwx7y2srhdxv94a9zvbyxkbwgqh"; "gtl.doc-0.5"="777isinskwws7m2b47a0w26w9dsp01qd"; "gtl.source-0.5"="di1lh2gf5xc3wk34q247zvgvgnmnwdh4"; @@ -7914,9 +8005,9 @@ "resumemac-15878"="8kydfyx795317240qryrp7zjvpbcd43r"; "resumemac.doc-15878"="avh8y1vj230yn8bq0mb0mngrki4h0czy"; "ruler-1.1"="48pdi6yxiiwdnmpy6822p0baymfgf38z"; -"schemata-1.1"="8vhx9mla27iim098qdi0k9wkpsbzamvk"; -"schemata.doc-1.1"="2p884sk15m95rr5lslcwh90zsl44gbp0"; -"schemata.source-1.1"="lsyg7d8zk85h776fgzwlyxgx7llcgmgm"; +"schemata-1.3"="aj63lv7cnzxxx3c6s4icbz75cjfvmkgw"; +"schemata.doc-1.3"="b81sb8v41f0njm91mg6g1pid6a9n1kj6"; +"schemata.source-1.3"="cvsm59jgdhy40smv6hxpp19qs7pm5228"; "shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2"; "shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf"; "simplekv-0.2"="xwzqwbgqinc13n4zxjr3wxx1d4z2yfp1"; @@ -7930,14 +8021,14 @@ "termmenu.source-37700"="xygav2l9gll238dyqa8126sn9hc1n1w2"; "tex-ps-15878"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp"; "tex-ps.doc-15878"="g377qq7n63mqil18vlfgimfd589pa1qm"; -"tex4ht-56601"="3in5gr70fwp5h01j6igngn7jv7qj40ay"; -"tex4ht.doc-56601"="zp3gcglcmbs85qcfdy1x0rq1nwnfggvj"; +"tex4ht-57348"="182fa538apy5jcjainph0zwni1x3q494"; +"tex4ht.doc-57348"="zp3gcglcmbs85qcfdy1x0rq1nwnfggvj"; "texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd"; "texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx"; "texdate-2.0"="vi2h6c5c56i63vhzn64x7qvn11733z70"; "texdate.doc-2.0"="3yzkfs7q2v20ykcz7754r48p0hb2l09s"; "texdate.source-2.0"="zwkrw8y0m074w5fpjnaabbv7kk293g80"; -"texinfo-5.1"="b94hh50y0ahcn5fk9xl4fmcki7b5mw0l"; +"texinfo-5.1"="pq81j2p022cn5mjpdca5xz3irfd62xg3"; "timetable-15878"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb"; "tracklang-1.4"="dla1jqizbjlb31drs8bnc09vxqilalys"; "tracklang.doc-1.4"="nm0wsmwrl78ikmfzn63gl3mp0nh6af72"; @@ -7954,8 +8045,8 @@ "xdvi.doc-54338"="dz4q0d643a261kll9fci78dmgwjkjhbb"; "xii.doc-45804"="p1ijdgk0mch86gs858rvkjzjh2yn35d8"; "xii-lat.doc-45805"="8ilsp524wb5anl3shmdhbnn1nl2c8sav"; -"xlop-0.27"="qqb21cjpvnv6k136cw9jvpflk2n5nqrl"; -"xlop.doc-0.27"="bmrvybz9axzcbczjv4fw48bl32wm0fs5"; +"xlop-0.28"="23yzc7hmvhc5dya994k7z6w40w3y8cxf"; +"xlop.doc-0.28"="4xf1rn0g79ykd4yllawjqxlayh5mlhr5"; "yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl"; "yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h"; "zztex-17.7"="kack2q2qi130rm6x49sqlkrv4q31qzv4"; @@ -7983,8 +8074,8 @@ "pst-3d-1.10"="pg6n52kv7lk6i6rfqyzijfrxdbv7ym5x"; "pst-3d.doc-1.10"="x7bl3prki06ki517r33ab7pz72n0ycz0"; "pst-3d.source-1.10"="xchbmh6g5zwja9xgxlkdb04qx4kplclx"; -"pst-3dplot-2.05"="7l59hfwk8bf1j7f9i5xrk26cwr6fv7d9"; -"pst-3dplot.doc-2.05"="6d5kf9kjdmv62k55znwjkz5v5v29sc84"; +"pst-3dplot-2.06"="k15iab4rzyfcq8c02fnbyl0gwzc5aib2"; +"pst-3dplot.doc-2.06"="j1b2dfmfkhhdm0rvc1zppc19w5mnql3s"; "pst-abspos-0.2"="bbag5d5l1pad71rrc51lbd8k11jm7nn2"; "pst-abspos.doc-0.2"="70m0f6dbxy9j9iwxx92kj2k4vwqsbrc8"; "pst-abspos.source-0.2"="3bnsfp2rj4rviirll63zljd7wady41q5"; @@ -8123,9 +8214,9 @@ "pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k"; "pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg"; "pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av"; -"pst-pdf-1.2e"="xjrjc29wwwlmk93x6i8ai8faazrvh636"; -"pst-pdf.doc-1.2e"="mj3572ny8nxvx5v4yrsn2dwy8x8pl9ln"; -"pst-pdf.source-1.2e"="v7byw0kwvl3ahlc63sjm0vas058bxbd5"; +"pst-pdf-1.2f"="b6y40i1cavghj4c5q1n71g6m7ncpw40h"; +"pst-pdf.doc-1.2f"="hhii0z91g0wbcqi3xsa6y0g1sk2sa0md"; +"pst-pdf.source-1.2f"="vdbn9r619v5ww220igdv9v844720ypkw"; "pst-pdgr-0.4"="cijfx5hq5ygnchsgdw7ly5a43a5v6cqb"; "pst-pdgr.doc-0.4"="s94gqhws251skwh2ap0b3hlvpp818y0z"; "pst-pdgr.source-0.4"="s2zbikk5v94207zmrmnlpr5bx3jjzc5i"; @@ -8221,9 +8312,9 @@ "abnt.doc-55471"="jk11kdy4pqbqxhscx0bqkb46r0z15lh0"; "abntex2-1.9.7"="zxahr9mb1vq0yfcj35znym4qx2jh4p53"; "abntex2.doc-1.9.7"="hs3g3ji0knhsh0gmjcz49dvc547wh0cc"; -"acmart-1.73"="lsfvbxkyv94q5y4x0zzbqv75kng4fqsp"; -"acmart.doc-1.73"="lbxb60z3bn81dz5h3zzhlyj0wwzsdh5h"; -"acmart.source-1.73"="2q9y39hzxslkk3kmyjsmrxzw6q29ww3d"; +"acmart-1.75"="76831qm9apd7fgwa45x4wr213snk0pca"; +"acmart.doc-1.75"="4s30kgw83xqzcn9xvrwyb79x1zqb0234"; +"acmart.source-1.75"="1146n4qfma5ysgkzk53rcyla8mf3d8bw"; "acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5"; "acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23"; "acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik"; @@ -8259,9 +8350,9 @@ "apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z"; "apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw"; "apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk"; -"apa7-2.03"="vb967a62gll747hcwyw65xadzhg3fz04"; -"apa7.doc-2.03"="iqrp4anw12z05975w72dgb3r0sv2mdba"; -"apa7.source-2.03"="qrc2vv7c9faaql9w9g99484cadzxw7qa"; +"apa7-2.07"="wix1v2y7iw7scr0lqdg671q8w391vs7r"; +"apa7.doc-2.07"="cwfrhj3lgswjqp0dxhk1y1fvz97rp8hb"; +"apa7.source-2.07"="j0v5d7rnaha019slvzpk33l05dzsclr7"; "arsclassica-45656"="pk5gn6ifrhj5c33f78d619hq4j3d7nmg"; "arsclassica.doc-45656"="z21lmz2x0sc7g6gc50j1x0hhzz96ra7b"; "articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l"; @@ -8271,8 +8362,8 @@ "asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1"; "ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3"; "ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623"; -"asmeconf-1.19"="k4ha0bi87l4lncccqfx77wgdc0zx01q4"; -"asmeconf.doc-1.19"="2vdyalblmk3hk1qha8dm617iz7hph0b1"; +"asmeconf-1.21"="wg2lj9l4m8rw4zbm7i6d7bd9imvw3l34"; +"asmeconf.doc-1.21"="dp3bjbf9bc0yk5f1as8mmmdcrdsnsw2k"; "asmejour-1.14"="8n4si71waf490dzy0qcbzvzw3478wahx"; "asmejour.doc-1.14"="jfv2azrl1pf2wpibhycfp0q1rf388v3g"; "aucklandthesis-51323"="gqqynyfp4l80jc7a90by84wjmn22s0br"; @@ -8311,6 +8402,8 @@ "cesenaexam.doc-0.2"="1cq9yg0f3j9s40jrkzgxnpk2ya88jgiv"; "cesenaexam.source-0.2"="213fs3j3x9f0330jy9hfxmq3dhpl1lgf"; "chem-journal-15878"="8rsrybpvzqr389ip3lfkjna1vy6lclv1"; +"chifoot-1.0"="k9iv6mr24x0fxdylmzma4rcip0dd7lry"; +"chifoot.doc-1.0"="kwyxpsww86h23gs0zlin4niykgjiiqal"; "chs-physics-report-54512"="ci2816gvc1ds20gh2jiiyyrc061n0ncz"; "chs-physics-report.doc-54512"="ipzvx9zkpnnzbdkmbzzk6g4wz4qaql17"; "cje-1.06"="s4l2hjnfw2s0l19hbzf5249igprbhw7a"; @@ -8338,9 +8431,9 @@ "ebsthesis.doc-1.0"="wic4wfgihf2yyk40937hr2g59933cyy5"; "ebsthesis.source-1.0"="q1lhixwgkc6zis1sgsnwzsd0p7spp0zz"; "ecothesis.doc-1.2"="92jxgiddwpj5g62zwg50wm681h2z1ixf"; -"ejpecp-1.8.3"="5xcyqpnlhm97h4fhws0995jfsxdivdll"; -"ejpecp.doc-1.8.3"="fh290208ain7ncl4gnqglb0zxg691pkd"; -"ejpecp.source-1.8.3"="wr82s5hppg2mbb29ij8sgbw2b6zg2730"; +"ejpecp-1.9.0"="6z822g8sqvwndh8gdcaii3f8pdnk0pmi"; +"ejpecp.doc-1.9.0"="a5kin866l57fzcgp5i3flqialzn94ghd"; +"ejpecp.source-1.9.0"="9jmfaci8rmnmz8lgbc7syd3lsp5f61k5"; "ekaia-1.06"="r87yx6q2rzrcp150gny82070fk0a8a9i"; "ekaia.doc-1.06"="lnjkk17sysdnj4l9vpx0qwkr1w185iq7"; "ekaia.source-1.06"="jvjhgfg1hvj60lcwa7k34zfl9v17bw5h"; @@ -8349,14 +8442,14 @@ "elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4"; "els-cas-templates-2.1"="128x9ixs3cpv1nh2pwx2kp6bhn64kxpw"; "els-cas-templates.doc-2.1"="188ypaihn3x9p3951vybzl0i725j22nd"; -"elsarticle-3.2"="wybpbhzmw2a1h76ik1m7dafh0z83537z"; -"elsarticle.doc-3.2"="1dpvggnxxpyvg331xsgnwnyzrj9sw2hm"; -"elsarticle.source-3.2"="0w53y3wskl6iarnpmdk9c154dp63pnky"; +"elsarticle-3.3"="0hii9fd4wnh10b1scaclvbsq1471fni6"; +"elsarticle.doc-3.3"="wnvrk9yhf2bv69bcrvcfhcfnjb3wv1bs"; +"elsarticle.source-3.3"="ffcj8f3r4p4wwy6aj5c0sk9k9bqp3nbc"; "elteikthesis-2.1"="mivcwfrlyxmxsrc94vg0ji7sgl1c5a33"; "elteikthesis.doc-2.1"="20a9fq7yb4xyfnk5x4c1isd3afc4s69p"; -"emisa-2.2.0"="5ap5gagakjpx889lpiz1knpd3z8fcff3"; -"emisa.doc-2.2.0"="x1qp5j19svjw388qkmccwlh6by9r5a1r"; -"emisa.source-2.2.0"="i3zqwl03w9ff9caf1nafflv8a3gvbdjm"; +"emisa-2.3.0"="25kpkvf03crgwps8fk5gm6jhi2lvmgff"; +"emisa.doc-2.3.0"="yx0k9dab0wappz1sbfdkl7aciy84qb2s"; +"emisa.source-2.3.0"="j95fvqf1p9ad4ck02nhil1vqwliwhp1b"; "erdc-1.1"="pmxparxijq91mlqb2z2ci0mk9as4r1nz"; "erdc.doc-1.1"="a7f0jw1j2l0md2s4hdzv6gb1v867nk8n"; "erdc.source-1.1"="5rf897hybsib6915bvyp0nai8j7bszgb"; @@ -8388,9 +8481,9 @@ "gatech-thesis.doc-1.8"="q97libi0drg6plfjps8p9fd7fxbxg34n"; "gradstudentresume-38832"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b"; "gradstudentresume.doc-38832"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk"; -"grant-0.0.3"="a9bjc5a9i24mymq11dsw78gck3pdb16n"; -"grant.doc-0.0.3"="39g10k0rwfx678fnc8vx6j77wvn8f5c0"; -"grant.source-0.0.3"="4cfhdbqmffiypcs88iij2fxc5lmylxfk"; +"grant-0.0.5"="n25rm5asji0fx6kkj9n730v1i89ki97a"; +"grant.doc-0.0.5"="fw57a585095x7iszbwblzxb3zkjbxdns"; +"grant.source-0.0.5"="r7hk7fmqdm91xd2g94jzgv5cp1c09y7b"; "gsemthesis-0.9.4"="jhw29zl7f93xh641ws6ydqh62cv1kbbj"; "gsemthesis.doc-0.9.4"="3nw8q8pxsfdbd4gmly0bg8ig15ccpy1q"; "gsemthesis.source-0.9.4"="w1k5h97pgahsar4r1sbg6i2dj4npr6y0"; @@ -8399,16 +8492,16 @@ "gzt.source-1.0.0"="rmx7xw85v4ha7d67zkba3c33xljcs0y0"; "h2020proposal-1.0"="sdm13gcvhga8q32ai16mnz2rfsnwb7bz"; "h2020proposal.doc-1.0"="8nsjvgzyw9137ncq9v48dhlncb10snyn"; -"hagenberg-thesis-51150"="173nwqf3ckrpf7l9clx68sbjv2iamqff"; -"hagenberg-thesis.doc-51150"="8q67qw9cj4lrbxs585ymw56q029s5apn"; +"hagenberg-thesis-56798"="q22ijqqwcxl09k2b7p3hqmn1dxk8h5yk"; +"hagenberg-thesis.doc-56798"="i1nfmw31ssxmn5s0dyybymlvm14ij7hg"; "har2nat-1.0"="yn5d36r1lnx5xhrk46laka9crikcd5yl"; "har2nat.doc-1.0"="8gh35w4a8j117z6dzy9p7mmbxsh789zf"; "hecthese-1.4"="8ipql2rwzwaaqc9az5syb4ny89c75d3z"; "hecthese.doc-1.4"="aily0d12b24n16ah6d4chb96vvh2ppwb"; "hecthese.source-1.4"="2m08qjacg4y5rvk16pfyyya1yiik7sry"; -"hep-paper-1.5"="7q1ih63bk64988xpgrl8xlml4ff4anrv"; -"hep-paper.doc-1.5"="j18jvw065f86asbhxx058qjcp2z90xs7"; -"hep-paper.source-1.5"="7z14d308z4n26i160vdxssy0186l5iy2"; +"hep-paper-1.6"="dil9g6bmnpsdfhvxk57gc1z19sdxlqwi"; +"hep-paper.doc-1.6"="nciggxz3kbil9vka01npln99bdcc7yhh"; +"hep-paper.source-1.6"="mppyxf3mm5wdaxzr6zlzw0f9i7nw9vdh"; "hithesis-2.0.11"="drsv1qaj1wnzsnl1kqzq5k8c4g00xi0m"; "hithesis.doc-2.0.11"="anqnh1ra6l9fhi0xmgks1yj46zp58irp"; "hithesis.source-2.0.11"="a7nrjypxwi5m6l49paqc182jz5yh96f1"; @@ -8420,9 +8513,9 @@ "hitszthesis.source-3.2"="wxvimwcr2wjmqr4f53pkz9mfwjabx25h"; "hobete-27036"="k2agw9n4s8imsfi399r1n3v80sdxc41s"; "hobete.doc-27036"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g"; -"hu-berlin-bundle-1.0.5"="f2xk6c0s4ikp7qizbh0dmqpaqs6jnli1"; -"hu-berlin-bundle.doc-1.0.5"="b39mqpgdp5rj773x2cm449cs0pyp4jkc"; -"hu-berlin-bundle.source-1.0.5"="35qaqv6m0dshlq3kzf06k1m2qazffnqn"; +"hu-berlin-bundle-1.0.8"="g98c1rqidlrfklqw8xbg8nhry7sf6xid"; +"hu-berlin-bundle.doc-1.0.8"="4xj9bm4fbniv5jq3418nli7538cr8587"; +"hu-berlin-bundle.source-1.0.8"="4nihxxx8aacb1bbm90fm43zmfjv978c1"; "hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs"; "hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w"; "hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2"; @@ -8452,8 +8545,8 @@ "jmlr-1.28"="d4dsidg0avjbflvc2gdx6rr48bhrbw51"; "jmlr.doc-1.28"="w52w3cf4n9dbchs8br6xlfnwjyrjbm6a"; "jmlr.source-1.28"="2q4bm66ql7grambkhcjsy7qifk1hpz98"; -"jnuexam-0.7"="jklladlbjlbr3vc1dyqvzggr87lgwqp1"; -"jnuexam.doc-0.7"="d4mrhs90v6j5pqab9hp86i1dfydvw6dn"; +"jnuexam-1.0"="i5nabjrqbv9q7cf167wvqs2f3c1sla26"; +"jnuexam.doc-1.0"="h7qal4ph3b0fwmasah44ihws53zqjih0"; "jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x"; "jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b"; "kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr"; @@ -8490,15 +8583,18 @@ "matc3mem-1.1"="1w8m977ngbqivnhlaqsf6bvn7yngg3hg"; "matc3mem.doc-1.1"="y6b8v00dhz5xg56kz04jql3rdrl0v5n1"; "matc3mem.source-1.1"="3n9x1jfgrc8jigj8w2bmngk7pxqz9v29"; -"mcmthesis-6.3"="3sxh596ivd2sfwzb9vcyn4b0gcpwpa7f"; -"mcmthesis.doc-6.3"="aa86mfx1a75jphkyjvlm0b0gd19ng2hi"; -"mcmthesis.source-6.3"="4sr3z45i1zhjkd7z7bb5098bqf45wpih"; +"mcmthesis-6.3.1"="yx590n1qwxski5c3ha5a0p1zhl5nz8zz"; +"mcmthesis.doc-6.3.1"="hpbx9mn6df9nkhcr7066qqr3cf5xglb9"; +"mcmthesis.source-6.3.1"="g47kbm3y491m8m16hnlh5mpibmy9s8zq"; "mentis-1.5"="nfpcmyxlg0gadqj33jnxji3nvs5fni9l"; "mentis.doc-1.5"="vnj4lk1vxc0c0710jb21x3vskppk9c86"; "mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g"; -"mlacls-0.8"="73ji41jrjrnl1xcj19b1y9l12d7582p6"; -"mlacls.doc-0.8"="699kvdgq269b735kqd1nv1n9qakplkbx"; -"mlacls.source-0.8"="fmw8xafidbn60xg7qsai600z103ah7gb"; +"mlacls-0.9"="2fkxkj9cwy2j2c3fsmrx9a7rj8idjbx8"; +"mlacls.doc-0.9"="qarilny8mbhr93jkhishz96ly84154m2"; +"mlacls.source-0.9"="5v52krplb9sqsk83zilcdp2gnf9kn25m"; +"mluexercise-2.0"="55nqdha684dmm0f8360zvz4wby202h12"; +"mluexercise.doc-2.0"="7ha9qpaz3xrq3q7c7d8lbz0xf0vklw87"; +"mluexercise.source-2.0"="9q1spi4fzz2yfzjr6q32ypr4ghr9lip9"; "mnras-3.1"="782c0f5jafxl0xys89wp8f0pw00b7rh5"; "mnras.doc-3.1"="cb0rhnjpawgc9i4hamgriy746xx4v42g"; "modeles-factures-belges-assocs-1.0.1"="yildlnjq5szbsvis65ph02bvvzydgldv"; @@ -8511,6 +8607,9 @@ "mugsthesis-34878"="cfkw21f3xy6pchbq7ryw2df8bdssilc5"; "mugsthesis.doc-34878"="xqm757zbzxi9ag50dd22274bk5n1897h"; "mugsthesis.source-34878"="6awfcfhsqggxvxxxmfbi77pa6bwchg79"; +"muling-0.2"="0isshjwygamwvdgx9lqz7wjrrcq9wk5a"; +"muling.doc-0.2"="qivxsrjaiyizrk21g7kn77lkzx87wjxb"; +"muling.source-0.2"="qyvgpl8wxl6rbwl245mc8parwq1h9cd1"; "musuos-1.1d"="v0bx55bnw5lcpq1w0zxfkf1hlxahxj0x"; "musuos.doc-1.1d"="iqviyy26inh9bw04maby457bvxip69xw"; "musuos.source-1.1d"="rx3zcmp2mw88f3jxa0igajz4dzvx135m"; @@ -8550,14 +8649,14 @@ "opteng.doc-1.0"="24dy7xc4wlz223svmhsv4k05bw6b12af"; "oup-authoring-template-1.0"="2wa7y11p3lzyq911n8ybd893mwcl2w61"; "oup-authoring-template.doc-1.0"="lr5ckdwfcnh1if3myqirjpk4yjij25yi"; -"philosophersimprint-1.4"="cdw4cms8w2z5lvj17ayb1yg3075qfpik"; -"philosophersimprint.doc-1.4"="j5ri2kgr97c4z3mzf5kilcwjlqliibjp"; -"philosophersimprint.source-1.4"="i6h47warmh5zlaswpq62mvbc6nkl3hij"; +"philosophersimprint-1.5"="4xvmqn3dbqra0mxkhpgagsgzrkmczqpm"; +"philosophersimprint.doc-1.5"="hxcldbndvc7biy3fh16f4s6ka093n7sl"; +"philosophersimprint.source-1.5"="kq0i9n14zcvj7cvxfr2nxqspx86585wg"; "pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5"; "pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4"; "pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469"; -"pkuthss-1.8.2"="rvla82aghkzrq11iklb8ysvqklaky5pk"; -"pkuthss.doc-1.8.2"="dc60g5c9zagylhnhagi37yj6066n62x8"; +"pkuthss-1.8.3"="7nv77cwznfjw31gjgkggndv66day1n80"; +"pkuthss.doc-1.8.3"="fimsmsy9zfrdix9ifgvpm3iwfcmf7dvn"; "powerdot-fuberlin-0.02a"="2wv4gd2gi1xvzmy83cp701hd7971xdsa"; "powerdot-fuberlin.doc-0.02a"="jzdfhb0xjlx0cffp8ma18r99lvr26l2z"; "powerdot-tuliplab-1.0.0"="x7ygn34dsmvncmaps2skxfqdakqkp4rz"; @@ -8577,8 +8676,8 @@ "qrbill-1.02"="q9j60z5d39s257n5lxgphddh4z97gy9k"; "qrbill.doc-1.02"="4c5j18c0xbcgfc6l5ca3w82kvgkbn6l9"; "qrbill.source-1.02"="m0bdpkmpqaqlpmbvycw0ksh5jzfjj4av"; -"quantumarticle-5.0"="gxfjl7qlir4m4rmqwrxmm1jksgh63crf"; -"quantumarticle.doc-5.0"="vzv5j94a6zvbyvbsbcdxpzialv29313j"; +"quantumarticle-5.1"="5azgk8assb2szsbfhb8sn30qmn6b788q"; +"quantumarticle.doc-5.1"="y5mfn12rhzl40l3cqgsry3d1m20vspwa"; "resphilosophica-1.35"="vaxdd2gghalbbbikxsyw92fhnx3wn8d9"; "resphilosophica.doc-1.35"="xwkcpdm9bn3vhfazhbx7fxibz5shrild"; "resphilosophica.source-1.35"="7wysrjs5ynmpadf39vkj2asysjvchqmz"; @@ -8607,8 +8706,8 @@ "sageep.source-1.0"="j5qj2vr800891ccgbvgdqbnfa0mxj4n3"; "sapthesis-4.1"="63dcp1gxf0dhdrlzljj5267j83q97pd5"; "sapthesis.doc-4.1"="mra57v29ah4bjcmngl3h1vyg5c2z9imd"; -"schule-0.8.1"="0bskmm375d4kvnpnl7askk78ni06k4ds"; -"schule.doc-0.8.1"="b3kmlg0khjb1239nb6myl1w5kxpp9175"; +"schule-0.8.2"="k0jnqi4zavamy5fxr41ah8jlfva3xcvz"; +"schule.doc-0.8.2"="6q4yghqfys34pvns8gc1k1nxaln4zn4m"; "scientific-thesis-cover-4.0.2"="g3c3y6l5nb34vmla06bry9nipwjwcxcs"; "scientific-thesis-cover.doc-4.0.2"="zzlsbapfhvlfgry78cc63a1l9d6gf66c"; "scientific-thesis-cover.source-4.0.2"="29sksgy5611i9gwmckxmyypkkk1r0vpv"; @@ -8642,9 +8741,9 @@ "stellenbosch-11a"="s0wddhmfp77y6v54qq4jsmqidjq3bkqh"; "stellenbosch.doc-11a"="97wbyj0mg7phb66ngkf82ziiy8v624b1"; "stellenbosch.source-11a"="0raanzzc5qjay7gz94himx8np0437pgb"; -"suftesi-2.9.10"="v3ql10qjlwmssbya8nbq6mxcmvfikpvx"; -"suftesi.doc-2.9.10"="pl1cy2dfbs2pp0qa012vssjpmvdvijyc"; -"suftesi.source-2.9.10"="9dlcgl4alvssjqhfj98i3cdkmf0q4b4b"; +"suftesi-2.9.11"="yh6zvs9qz3c14kji7hsgczv4rd262qyw"; +"suftesi.doc-2.9.11"="xg147fzl0acln4zr9hfs743y1457ksj4"; +"suftesi.source-2.9.11"="h572zyvxb35l9j4h54p336xvaf93g9mw"; "sugconf-15878"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d"; "sugconf.doc-15878"="siyxf3blr7z953fm4xy61z4jfx589bcb"; "tabriz-thesis-1.1"="psrla5z8x9icyxgdqnxpiv2vjnbq4rsq"; @@ -8653,9 +8752,9 @@ "technion-thesis-template.doc-1.0"="8kkfqc0f3pkn9sm84zw2iqi133nr2sy8"; "texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l"; "texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl"; -"thesis-ekf-4.0"="36m51dx3jlm3f6a0ahhg5p2i35wyaiv9"; -"thesis-ekf.doc-4.0"="6qyln0j3hslnx0hibpfijixclha7jv86"; -"thesis-ekf.source-4.0"="yfph61m1j44d3rn2whz13m88pgn95igk"; +"thesis-ekf-4.1"="qx6shfmc4wc23xl68bvhyxj6iyy7j4gd"; +"thesis-ekf.doc-4.1"="4ljavrr21zd0d15n7r51md5p1v38s5vm"; +"thesis-ekf.source-4.1"="ixbb50g799akwc8c8vwjv44y0z1phfr3"; "thesis-gwu-1.7.0"="lmgwrdny0kp9p8ldyyxg8521vmhngjpb"; "thesis-gwu.doc-1.7.0"="2c219vkiy9h43v2jpaj69hv9lwh7m4v9"; "thesis-qom-0.42"="rnhdvsrpsgjbwih0ia9r1h4kyqdrhg6x"; @@ -8668,9 +8767,9 @@ "thucoursework-2.6"="mvwpfacql0xna37vqa3q7dkrwkzqnpvj"; "thucoursework.doc-2.6"="rg2y6dx27cxw5h1y0zifciy9wn2f63l5"; "thucoursework.source-2.6"="frk70dd03ld969k7l6s1vc38vqkdclh0"; -"thuthesis-7.0.0"="49l8ppaywbn2y9lydsqwxivdiyv0q6zl"; -"thuthesis.doc-7.0.0"="zlzv84sf4al6508fbdiwidm4blvhpihw"; -"thuthesis.source-7.0.0"="5gxwk945bq955rd65ah2jylgn8b7x7vp"; +"thuthesis-7.1.0"="iy1kp51ydv7hfwzkb9fn3nksa7yfv2ba"; +"thuthesis.doc-7.1.0"="2xwlhh7n6cwb54gr9hdfv66lbvd4sr5n"; +"thuthesis.source-7.1.0"="nmr6jyqmp82r02lk9ccxmcmp5krd7ri6"; "timbreicmc-2.0"="8mnap2xvfny35sb0ziq5xhlckwcmgb3w"; "timbreicmc.doc-2.0"="b649dhjapj0ani2as7783bphamp0hwsq"; "timbreicmc.source-2.0"="8s3vn2id27cl1164brvkrxg96ggvgb3v"; @@ -8682,14 +8781,14 @@ "toptesi-6.4.06"="f32mdcbb85b7dja6cvhc6h0b111i7h28"; "toptesi.doc-6.4.06"="rx42mn8j2fy5qji2xmi41a85wii0p1yy"; "toptesi.source-6.4.06"="9am8c6ps9if4zlbcrld528hhgk9j6f0d"; -"tuda-ci-3.04"="7vbf0nkamz958bwjfrrsaa355dm57wag"; -"tuda-ci.doc-3.04"="cfnnk6f0fkk4vysnixs22sqa3rz6cb00"; -"tudscr-2.06j"="dwbpyy1yy1h56dsg9j52k74w2x4mg5dj"; -"tudscr.doc-2.06j"="nv88hc346psjc3iwsq87ni94b60bb6im"; -"tudscr.source-2.06j"="1b2d7pbn0iqnsdnymywpcd1fwdnhffnq"; -"tugboat-2.23"="7mijib9nmvq4kap6gihvfla8cvpbxfjm"; -"tugboat.doc-2.23"="1n3myrhdb9laa5razq381ji6xznqpak0"; -"tugboat.source-2.23"="kmmd4s3dkgil4f0nh8bgayndrjcb7qd7"; +"tuda-ci-3.08"="b7xpbkawflrh5jib1n9b38rrmwn03a7d"; +"tuda-ci.doc-3.08"="ax2jy5n7awwnh3hnc88l2zwhdva4qhv0"; +"tudscr-2.06k"="60mdwggs5xpvijmyfnx0ahqziqyr2kkh"; +"tudscr.doc-2.06k"="5dxnr37xw0690k3pq8rmkc912h4rn0jg"; +"tudscr.source-2.06k"="bjwl7yf1az9lrddgcz84svsmmhd8ca14"; +"tugboat-2.24"="9c3ipn2fzwrf0w21mih2ld7j1z1w7i0w"; +"tugboat.doc-2.24"="g6vmgk9zria85cc38khzz1kk7x0s5a4m"; +"tugboat.source-2.24"="6kpj4a43gk6ww8hc434lipc04l2k3abw"; "tugboat-plain-1.25"="hdp8r703mch4096qy67y5zqjma848hh1"; "tugboat-plain.doc-1.25"="36nn5cxa1rms40af14c7bbxrkz8y7q40"; "tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw"; @@ -8745,8 +8844,8 @@ "unifith.doc-1.2"="4gsy6kk4w91df3pkz0wxqybr13jgbvj3"; "unitn-bimrep-45581"="s3x065jkvzazjx24an10jbwj47903gjl"; "unitn-bimrep.doc-45581"="k2iakhx4fkiz9ckglr1pvnrqday0sbnp"; -"univie-ling-1.12"="0inv9zi3b5k1msr587xj0gv8dafphrk8"; -"univie-ling.doc-1.12"="c69k0m7nwp4m9iyn05gfsglxd04gddv8"; +"univie-ling-1.13"="fh7pmppl3gz3p8gf4crrxccivlsqa2lk"; +"univie-ling.doc-1.13"="pyws8xjmzfxq455v9p25a5nrk7psk2wm"; "unizgklasa-1.0"="pz93dd2qidcvdsa78zgl73s07zjgshs4"; "unizgklasa.doc-1.0"="inphl2x3czqw7mw17if9ahl0jbin3dd7"; "unswcover-1.0"="5bqxws27nxyhgrlc6c9k9v5pm8jvdhzc"; @@ -8762,8 +8861,9 @@ "urcls.doc-2.1"="rkrvkvh23jmn7qhyvgnmgzr7qhyckjy8"; "uspatent-1.0"="lqv4zrqgwdhav1075ym1wp3cmy7r3ahw"; "uspatent.doc-1.0"="0pa1qihx7vyc5lfkzr7bbakkphzmxp2p"; -"ut-thesis-2.1"="wz086qs6isll7wfa16yf154zqdbwz7zw"; -"ut-thesis.doc-2.1"="yqaa6h1yz1401ljb6wxnlz3rqmlr7fy0"; +"ut-thesis-3.0.0a"="92kva56yzsi6sqp9ydjkfysj5ny5c8lk"; +"ut-thesis.doc-3.0.0a"="vi6ddxgpmwnxhqdc6ljsfmn611k7vrmg"; +"ut-thesis.source-3.0.0a"="1kha7qd6fkmi1v86anrh28yfczbks59q"; "utexasthesis-1.0"="dyplgpcmg18gjkxvnqzgs99lf3aj6yc2"; "utexasthesis.doc-1.0"="x4ngw5sm9zm5w46l5xap4cwnygb8qlha"; "uwthesis-6.13"="1z7cpyrzcb9ga77d9a58jm9234w2zafy"; @@ -8776,9 +8876,12 @@ "xduthesis-1.00"="qxvczdxndgw1n1hxzrr5scvnrgcl3q3f"; "xduthesis.doc-1.00"="a58xwk250qq99pyz4rj2br4dqfzhhmxv"; "xduthesis.source-1.00"="nw0j5z9vd83a3idksbq2338j8ir01fr6"; -"yathesis-1.0.3"="6ispkfhr378lrdy4vwnaiwdf3q22x48c"; -"yathesis.doc-1.0.3"="ypxdv9db1snyqas2csk58y3asrjqa1qw"; -"yathesis.source-1.0.3"="w9xr9hmaknawlhllj87m1dyd2h9v2chw"; +"xmuthesis-0.4.1"="y598kfraksgxzjhiqnvpi44nkgy448bh"; +"xmuthesis.doc-0.4.1"="ryzi6wjgmw3kxar74hhdjazylp116a5k"; +"xmuthesis.source-0.4.1"="mjlyb6dl3w3gi34ld39pk5xdjkzdi064"; +"yathesis-1.0.4"="gnm9im78y7x5p7vhrcd78rp8pkdimj84"; +"yathesis.doc-1.0.4"="vghz35m84d9mxmvg3pxh8dqxg18s6cpc"; +"yathesis.source-1.0.4"="lnpa4iwg7kl69phfgmgyr28gbd1jz8p0"; "yazd-thesis-0.3"="583l53kxfnfb7s67fnh3n45lvqqww941"; "yazd-thesis.doc-0.3"="9qw7byq6s1iv4kfq19xy3qm01l9vh0q6"; "york-thesis-3.6"="rm9hh3b6cq902rr4crmv6c3z3ll2680b"; diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 2ecb162a571..a495fb218db 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -264,13 +264,13 @@ tl: { # no indentation version = "3.13b"; }; "acmart" = { - revision = 56343; + revision = 56946; stripPrefix = 0; - sha512.run = "4ee65c22b449731701cd5b42915bc045a375a16ec8b4cc32f2d8340900bf9a5e6a99d705b765a3792a31e4b90a0e715f3514d03ccd73ba4ba5dd9a2597c7af63"; - sha512.doc = "1dbee22c3e48c4d893e5901fee7fdeee4f3c66dbb095f77da3b38743fdcbd12f5f189f4ad3a4ddca15be69ee1bd7baf06f38540f8032d8f48fa4b6e83a61ce68"; - sha512.source = "d820deb59cbbb8d9623a21ed23e900bd014dfcc6cbd7dca0de7f265d9f7a0db86944d7227b45fb26180d07053b4b4391c8cb51820a358be7be741648f948ef0e"; + sha512.run = "cda16a82e6416cc92773ad39e1998bace936aced37a7b1208c48857b18447993bb14bdb31a5632fd1700e4fdd9fabd4c3e39c6af27fb355285bf824974e9d2c3"; + sha512.doc = "27e241160fcad9cffb962f0204bda5384f81946bb82ffd99fc3c35d58e95109a15586214c774d6af57a9a12e8a1fc9f230d7c18f66dfb13ef2a45deed957cf55"; + sha512.source = "b8c9b62228bb844373e972a24ec9bea3bbb81a028d0700bc61a42a4298241ac96483ee52cda42744ae3e453e1eaa2e7564299554fa535fae5ba15f77750f881f"; hasRunfiles = true; - version = "1.73"; + version = "1.75"; }; "acmconf" = { revision = 15878; @@ -282,15 +282,15 @@ tl: { # no indentation version = "1.3"; }; "acro" = { - revision = 55090; + revision = 57226; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; - sha512.run = "29eb42635028c26c61860a5d00d9a15bc0f5685543d4046ae0fe5ab60f4061405c1ba90b8daddafb33fcb92b0db825f49914f72dbd88e980671c6afe1cd3a682"; - sha512.doc = "acf15ed9db6731db5cdfc9360704f0f60801291581f0ed0b98ae87b996c73bd4d386e4f9490dc2b345569ebf5e81311b2629552935ac488268d391aad4994504"; + sha512.run = "24d039966a0559040d1cabc39a79ee805dbfc534a92a46286676d798f98c3bb871cdfb582fd7bcc68cae49096ed3051c49ca14769f560b0db058a49c16a62f42"; + sha512.doc = "c3935f8697b5f654229de2425143b2d13bc992bfdedc534dfa6a29a7e478a5d860a20822832cc162792b11cbe1845c714e197280722e1d0c09d6ba3d7367c6ec"; hasRunfiles = true; - version = "3.2"; + version = "3.4"; }; "acronym" = { revision = 54758; @@ -543,6 +543,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2"; }; +"albatross" = { + revision = 57103; + sha512.run = "809b1062cf7bb27690d62cc60b378e1ac6758cff7938fe1f19ad44e255c6606c7d0a718c45b7d2e0b88b34749c701a9e19beed0e30d827be883e43318706eb99"; + sha512.doc = "3b702f383079734c2e6063f537bd463660beb8a9121e8969f4ad2bf4912ea14ec18161767861b5e50b1887b614a1ae28cf68dfb8984d44c2d9455a501fde5ebd"; + sha512.source = "e1ef67131a15a03e314cc4c5a5d3da9f4ce2ff632385a54b1fd89fcbfd43777db6bb991940cced49f02afe003cc0c91d529f9ef6a26e02c3b69d5478a24763ca"; + hasRunfiles = true; + version = "0.2.0"; +}; "alegreya" = { revision = 54512; stripPrefix = 0; @@ -588,12 +596,12 @@ tl: { # no indentation version = "1.3"; }; "algolrevived" = { - revision = 56472; + revision = 56864; stripPrefix = 0; - sha512.run = "98db2033f2fd2871c6b60543951819e5609ace0b9cb7b8f789768d1f946cb2d3ec7d45d1141474e63fb9257b30d8e6d1f4224cee005fb85cf0516bbe4c3bb763"; - sha512.doc = "a27c2f189a06c602aafcbedccd0db8920ff86a497ed9515ee5225507463ef25b1cf9d7387f1a1f4aed4b443c12d3edfb9f862c7cabb1a465e30de83244cef0cb"; + sha512.run = "bb038512d7ade0cf90217150d276d8ed7fb4279b8a3088bcb38dfe8f48373e8957909f5fdfdd2f6247682623414f04e732262a393cc0042279705ceb345cd608"; + sha512.doc = "c42976e8fe3d53240de84845a0c4428363868629b5137a57863b5fc922ed8f557e2e4451446277cead1dba0dff036e843e5ead35e6e591a04f2edeb640c7932c"; hasRunfiles = true; - version = "1.05"; + version = "1.052"; }; "algorithm2e" = { revision = 44846; @@ -728,6 +736,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.113"; }; +"amiweb2c-guide" = { + revision = 56878; + stripPrefix = 0; + sha512.run = "1ffd4d1691abe2543585fa950d9b18ebb10e48c5c7d97e2f05828f04620bfd730894cd92f0df507627ddd9451a253ed8bbe89c07306b6db27ba84bd6c24910ea"; + sha512.doc = "d8f6ab658d8d8f2e05876ce27b5220eb2e10a58775cde91f975cdd106708ddef86781cc1c004b4381176fa7ee8ee6630a34bf7cacec374bf21ffe5e06c8d4d68"; + version = "1.0"; +}; "amsaddr" = { revision = 29630; stripPrefix = 0; @@ -988,13 +1003,13 @@ tl: { # no indentation version = "0.3"; }; "apa7" = { - revision = 56095; + revision = 57083; stripPrefix = 0; - sha512.run = "11cf9e3cadd39f5c5c30258c2df64785b732cb2518f5a4552814ecb2eb615b1a3000cfd7b857c170aa79ed3d04ec2b81cd0d1e920e596f932f744f190902f29c"; - sha512.doc = "9a6119297cf112f0e00fad8969f52fd8ab2d947d060eeb10e198a647a709f13015406a47591df512a802635e2c4b02ba1194d10975653c45ccd229b68bc96718"; - sha512.source = "936b8f0f20cb2d36c0d5c0cf4c4fc2e332f85e17a5ad211f120f924819525a659f4a90fbaf185a1c313bbce6b1edc866f2646f188d4efd67809ef36f064fa410"; + sha512.run = "1cbb599a8c41903c3ac00d1f0ecaacf09202319ecc7455f38e0d09251a45efe36b2c9a5893450a04e5c7d02a8d08d482f85d0b05e9bf7d5668be0d2252e1f467"; + sha512.doc = "07bc7020971f87a20dd09d273538cf47a64f7f5d83bc0ea0e5510675bd42ae5b1900037bf66c7c9002eb68827c431c2d0dee854e218d6d297d1dfaf6b096a747"; + sha512.source = "09f8580f65e3e6cb9be68d675f023d594a174738b4d2be83e951ba21e331c12763da7da66c4eb68136e046bd7ac0ff1d829afc2fe40db6493c9cfe2d71098006"; hasRunfiles = true; - version = "2.03"; + version = "2.07"; }; "apacite" = { revision = 54080; @@ -1044,10 +1059,10 @@ tl: { # no indentation version = "1.2"; }; "apprendre-a-programmer-en-tex" = { - revision = 50933; + revision = 57179; stripPrefix = 0; - sha512.run = "deaf9ad3580a803fd5fa7cbf8f8a11df4d350b7b90ed880317d1e67290ce8b48bf783bfdf470076b672cc5e257bd10d69d6361c7959d81f9fb759752adbf2a6e"; - sha512.doc = "820f1ba9f635e05a25167203a1f27d13c380281640784828c27ae7366816f309c6d3a630abf3ed49ed996357064878c735c9d7c17bd6dc262a21a420fe40f77f"; + sha512.run = "2008619320d2b7e906c2511609e76894dd065f8e56dd1800cfac0e13af4415dc76c437cdadcf15cfea85d7862996e99ba3240aa30d36fa70d9c1d950b7c97e96"; + sha512.doc = "34c86cf9f0a296846a85f896f31da102013dd7b78ddc11d20aca93770671f2ab05930167160d3bf6282b7740fd9d5eb5238ec70bdf405658c1688d3bbd769d7e"; }; "apprends-latex" = { revision = 19306; @@ -1066,13 +1081,13 @@ tl: { # no indentation version = "1.0"; }; "apxproof" = { - revision = 52324; + revision = 56673; stripPrefix = 0; - sha512.run = "400c95494142780c5359df48864fd5ca48409180220a9efc25c0650889fc84fdb725f7ea263c00ce7afb8099c80d4ef42b601e5b61ae0bd2fb8e68fcdbb673fc"; - sha512.doc = "fd818e5ec077a1d479b0bbcc8470a80c396dd5e4b0fd6191c30009f709d8da6de74277e1f162df3595a4de6e10bc88db6290c9b42df37672d8a6aef7047d9164"; - sha512.source = "08eb4f6d847ba8d7fb4d19b81f1fcbd21a4d1bad908824fc6739b16d08763f6ba1bf388d5f0dfce29916205d6751983f06f9f4562d44f9284f690fb16fe7cd80"; + sha512.run = "0a81e01bc885b8e7d4bd69361b185beb8cde62f7a10db4e5441312dfea15c0da7c352a4cb412102bdbedc60d974ddaee6f44451042283f577b9a4b4f54a263c1"; + sha512.doc = "a6131b7889d7882a9bfe253f3bfd380498310dc9f0d13ae382d786e3604201c887b98b8555d69cf62067b4c6d5975b16f14169dc10cf4ca5933af3fb843b60b0"; + sha512.source = "0895ef3552dea3685c529a2adbe8efc7a7010e63b277b8e3740d1a123bbaef1609f05d2085887d013ba9f75155108397153b187f13b6bea8e49954bc75938a2d"; hasRunfiles = true; - version = "1.2.0"; + version = "1.2.1"; }; "arabi" = { revision = 44662; @@ -1141,11 +1156,11 @@ tl: { # no indentation version = "5.1.3"; }; "archaeologie" = { - revision = 56075; + revision = 57090; stripPrefix = 0; - sha512.run = "739b7be7d5bce5f3f89eab7c32a06764679f5601ae971001f656b10fadf26e2d9661331187053db6fe84265f099f76887b983f6cbd0931f71a2147ebe535fd94"; - sha512.doc = "f0093b989605ba792563a598a3862d005aa33bff2b2b66dbde69cd4afcf47abc695837bec4b378d7b5125cb7144fef0d2ab1029fb0c0f0858e4e2b290fa9adab"; - sha512.source = "08518f4c6fa8b69862b65ddca05d54f5656b983ba1ee18a63fed04bae8b2968715cba6de97f89ebac42755028ad02fc6791c697f1e1cd6361ac4456fb2e1ba1a"; + sha512.run = "40220a43a1f5775076f75379eb7c6c6eb4f7e9c709b7ff22b0db29868f5ac7e5def3cead10dbcd17e3bad2aa33af7942c10f5968c42494b5ab35dd6886c912db"; + sha512.doc = "efc68c2bb845f1966aecf6cdb20694778212261d6ba6f0136c87ddd0cd5872d0196c99220c56a9c9dd50ecc32c1a59a4d4630ff3fea9b5d953a0a9ee3aa66dcc"; + sha512.source = "2f3324c8844c5d04d35e3e4bbafac591c1c33ac2a0ba21d7b4b1231ae7883ddd53fee555ac89d2f2fe27358c80470b414f14fef073f03fc3ed405b96a5df290f"; hasRunfiles = true; version = "2.4.5"; }; @@ -1157,6 +1172,14 @@ tl: { # no indentation sha512.source = "5a39568546651ef10937849550c3305bde9379737b21e24b2adbec532dee8192ddbdaaa77f2e6bc135d518f354c1b20d7c43bc03f65ccf47d423f4af1e75d620"; hasRunfiles = true; }; +"archivo" = { + revision = 57283; + stripPrefix = 0; + sha512.run = "0f6b7985d73ba3e62874bee7a05c215cea0008bdfd1b0c3df6795a2d6363ee2a209df956b4f9698ec93ee8d9c6bd62ab5bf3bf19cff78c968a97da58a80b5f40"; + sha512.doc = "88cf002d557401730c035727251e228effdd25d52e9d76edc950d0f3ee639e2eb5bf623c77a4e80dd902b7095076030b32aa017c8adea9f57912ca9de51ab7b0"; + hasRunfiles = true; + version = "0.0.2"; +}; "arcs" = { revision = 15878; stripPrefix = 0; @@ -1210,13 +1233,13 @@ tl: { # no indentation hasRunfiles = true; }; "arraycols" = { - revision = 51491; + revision = 56997; stripPrefix = 0; - sha512.run = "818971d673180323d20534faf9bcc41afb7da93f41df689b37237af19471ebba1942d0cef900bfd5dadfa5730295bca2e9c9e873ba2b25a1fc885f0d5aa3c4fb"; - sha512.doc = "10d1132c5f964915c88eed1c00edf982da80fb1dea3dec028e372eeacc91023b06a0b49a1b63e4442d23c0ef550f2651dc0f12246e3d58d0ae320006e9b49b37"; - sha512.source = "1dc2055ab0a511896909ee526b9f5b1adeb079dd9a1a6d64c0fe9ef326e29392d69088b47a7e26dbca2d32e5527549c7bcd9d8f3b28cf8c1ca7d442819488638"; + sha512.run = "68ee9188b13dfd1e45552fc0845b80df2a497a00af9d70eee726694708b214b9351d7955819d1a9e21deb6873cf5dab90416b05a58ebfcc2d31495992bc989e0"; + sha512.doc = "43c31b4a1cf254891226c796193415d81d299cb0e831e617c61d62728b6bca768cfd813ea4b3b1fb15a702411bebf53bee36e025bf8ae8c287cfed51b90710d1"; + sha512.source = "65a24651f3cfef479b4027a0e3a687b43016bb02f67ffbc69071f57b43914c4f3cb5ade46616b7841df948562ce3b8d9eb051739280181205d68f64f3104b8d8"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "arrayjobx" = { revision = 18125; @@ -1251,6 +1274,13 @@ tl: { # no indentation hasRunfiles = true; version = "0.3"; }; +"arvo" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "3a6236c3f5e07f3ad709c6a5e0f7d2c90574cc897f6f5d470aa1523b537370587b5942e1a8c581fd96e43e80189fb1c7c4a2475823077feeb929ec594a90ffa9"; + sha512.doc = "3d3c6a92159b47e8dd5ae7360c06c8d5db8ccab609dd5f3db47db2ddc9d62badc3e6bd7c881ec5955003ac2b460c550ce56154cb2323ebd2bdb8205318a709ce"; + hasRunfiles = true; +}; "arydshln" = { revision = 50084; stripPrefix = 0; @@ -1328,20 +1358,20 @@ tl: { # no indentation version = "2.7"; }; "askmaps" = { - revision = 32320; + revision = 56730; stripPrefix = 0; - sha512.run = "d07dc2e9b3cd0dc7d46576fcf9f08c5a628bcc701a95d8d934e322666c93f649054b9dbfe38f7d9577ce3d27344e9e5a99ec8b1e710c45f4a609a5a2dfadd126"; - sha512.doc = "a170144d18c4a90b166c8a315e9d1f0d86cc5f2a53ef69381652c3f8307b85d8b70dc610bcb98be6eee1bdbedc02b7cbf097a13133da78d492c71db33d94b04d"; + sha512.run = "0f4d91a15053d40d329744c429540075c33e2098f6d9d07eccc5ad16c5696233dd01de89c61a7090dc127c3730ef04e24f8d56845919cd268ec8c0bc68d9c09f"; + sha512.doc = "268915d685c8bea4388055487ca0d30418557babd01547457449085e58d639bb17787b6b5c97fa99301555afa9d9d11754196cd2b1dbf48b642b05a835b383b0"; hasRunfiles = true; - version = "0.1"; + version = "0.2"; }; "asmeconf" = { - revision = 56096; + revision = 57113; stripPrefix = 0; - sha512.run = "333c07c67e35687f7d5ce658322bc0771038dbce2c2c438015bf268040be7981f992967229a3ef6b0f2e3733929fa114b0c1ab0eddf1bef434d0085d603590f8"; - sha512.doc = "7252880be82af7d9fe662d151a396fe7c460b43aa28c2466e7ece4921ab416bc79cc5fcecbac451798c4a520e93692929e2723b1142043b181629df8d1364c01"; + sha512.run = "9218573b7a91d5fac5358bb634fbfedee1c70cb687785bbc4633d9fd8c3d2a9f70d125d51c38b12f05404f5af676db89edb0d4ff3a39c56902755fc53dbe978b"; + sha512.doc = "154d49872d4474c591765e5a03f268411f0adc6472203b875ab17c897d1148f90a5b5c1f79ca44f35f017d2378170ea74f857f1a8c358b7404a737a5bc778ed3"; hasRunfiles = true; - version = "1.19"; + version = "1.21"; }; "asmejour" = { revision = 56101; @@ -1374,6 +1404,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.8"; }; +"association-matrix" = { + revision = 56759; + stripPrefix = 0; + sha512.run = "1f33388d8d9230fb11dc1318cb9c189fb7c14ef7404193d1df35e83863869ab8cd7f918bef8fcfdcadbff29b3c20db7309026d0ee3935e78db0f5e3365f065ae"; + sha512.doc = "d22756e5fcb921c6f0e80c6d0f5322dda0be1a52a5de60b2a0d7ca719b4d92e4039c395e06f7b4a6fa080aed59e4c4c30ae9ace8139963943134048cc40e6c94"; + hasRunfiles = true; + version = "1.0"; +}; "astro" = { revision = 15878; stripPrefix = 0; @@ -1392,11 +1430,11 @@ tl: { # no indentation version = "0.1c"; }; "asymptote" = { - revision = 56070; - sha512.run = "38c8c9928b4ed067b3ac0fb2a0a1b15a0cb3967a33274162a21869d2a6cd80d96da25f7ad8572b6a87e90792136e06ec1656804db028907f544cdb4482283560"; - sha512.doc = "ba66eb645b8ed33dda47c473d8c8f65c7316161868d9a8dcb85b7680ae08129593a326676619ea7cb760599646a57394e18f5131b3bf55ce801bb676c46eb54c"; + revision = 56991; + sha512.run = "1a6676ea28821730b98e6ba1366b8a85d3a7b9bbb5db1eab7f3b90aa8479639b1fe42f1bb5a064ee3cde52d72254b614bc8972c39d0b33add9d781bd460227b6"; + sha512.doc = "3840b3051ea6c7e76e3a95b78dc2d8999af273ddacbd59ef9a2d492496f220bfb8905c34420acf912de7fcf858a8d39429a289bfe6a9b5e9ab6cc51322b3ff57"; hasRunfiles = true; - version = "2.67"; + version = "2.68"; }; "asymptote-by-example-zh-cn" = { revision = 15878; @@ -1435,13 +1473,13 @@ tl: { # no indentation version = "1.19"; }; "atenddvi" = { - revision = 53107; + revision = 56922; stripPrefix = 0; - sha512.run = "d936d42a3a5e2c4fa0dd9064658b450ea521e054c22ab9a30b3b11e0c093ba9961b3553b686021f0fbeae6eca7e40b2aedf3c42287ecb68a724c499007c552eb"; - sha512.doc = "56f03915ef772c486e44b0b80ceb29543c2c1e2ede3ba5b4028af17f013aec8f3d373912aa7b1ef8b5f4524de5c0946833cbe418932dc3bdfe10a752a18035e1"; - sha512.source = "56abe3e2c0b7896d4b5fa46f70569f5fa0a7f18970f8d4dd6255a3825d5a698467bbb18b84eb3400bc81ce799577f8d58884f7a1c5f38a1bc5ff77a8232d3125"; + sha512.run = "49b0a69eb308e19e3ed97406fc1ded6e80f15d7787031e2b71cc41ca2e1c74c19d3f3832ae13c5f1af70abf9f2f201c9a7ef669ed2e58349a584ddc767059c54"; + sha512.doc = "d60dae681800be4495c2690f78513475d98a4480364306eb26c16c551b0e984f135aefccdcff549e6702b2b62bb185ccbdacd85dd3c12e5b20c128d9397c0e8c"; + sha512.source = "a2c6321e825629a75d745f0bd03cab168fb51b5c33d5d256a621847f27ec2010f0331c37644e95b2ee40604d68cf34772a3dde59b6c6fe340713c0e593fc318c"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "attachfile" = { revision = 42099; @@ -1558,12 +1596,12 @@ tl: { # no indentation version = "0.03"; }; "autoaligne" = { - revision = 49092; + revision = 56966; stripPrefix = 0; - sha512.run = "10c1b6b8973bc451d38f1051715d7f6efe8acc7420b954aae657bae10254d6919fc7e3d605ebc90e525a7cfa56f082a966bad600c54e50070f1c3fae2bec38fd"; - sha512.doc = "c0a1f2514d80e153b74efa94918c70cc16638d68c6b6e1ae4df8f765e13bc55218a1b7eed289f6dafba440ab7c5ef6cf1b6a728f8df161b21c9951894e83b949"; + sha512.run = "25e4d56033596a05c6b9e9bae4380dd5fc27d469cfa63272bb388fb3b38a57d2a980fadad7061c76940adc3d50e2115037b5299cd2f095ba5c2e9f47a88fb8d5"; + sha512.doc = "ef84201b9cfc06b3c6f9031389bd9b593e5477f92507843689304afa8db67737887773d1d5c0a2be2fc77d922dd183cffa0ca27063cf27cd3d41664f76803a7b"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "autoarea" = { revision = 15878; @@ -1646,19 +1684,19 @@ tl: { # no indentation version = "0.1"; }; "awesomebox" = { - revision = 51776; + revision = 57349; stripPrefix = 0; - sha512.run = "f8b841701beb248ecdc636756d954420b879028db1754319cf13a975313e7832e5393afc76f2edea579c6f38ba4a8fe779edcbf7f1442d7f179dbef9b1feb1ab"; - sha512.doc = "cb0a6e98faf307cd718b4c7409f3aa75d30a781b1a299d32c781b3b6906d6a74399c7a04d41ea421a5cb3def06d963d8fc87d841ae199e7e86dc2f1360e4e48f"; + sha512.run = "4984d58669576137746518b68988fd9837b5ef133eb8da948f67bb0d5f775ad961055871bb46084e420ef0564b6a4796ba81a093be93f667f959a45ffc0c6174"; + sha512.doc = "eec717fa5bb5a0f0d15cfc39d2172f8818718f6c7037fe962a0e811c131cbc91d3f3167077ec413d565e6b0b782f5b3f77b38257caa6529a6f5db7da8e163c3d"; hasRunfiles = true; version = "0.6"; }; "axessibility" = { - revision = 54080; + revision = 57105; stripPrefix = 0; - sha512.run = "586e60a85337059a44dd02a4e979e2d7914dabe2dbdd90d157853d76deffa8d4f7ce644636134f9c7e8ef9a99158832a9722dcab56161e14419aa2f2344418c9"; - sha512.doc = "7d6b0e9ba8cf4f524af95f39a1d39b4426d13f56dc7f6937dee874d33cfadad23ca64cf3bbfa66d1b973369ca03082794a6c815a158b6d60e0b0dec8bfec3f12"; - sha512.source = "ade173d78e8f9948e201d495e0757c4ca9ce86be6fb7f786c01f8db4a2b8ba31535b47c659ba02b67c608b5ab8e3fc773ae8234fefb84601c6d8688ad10e822a"; + sha512.run = "9b42a40556f3432e045ef35b23fb7fcb6ff295064645e5b9331d0ce99a8f2bd232d0926b46eacb5598da112dfcf3673225efd655573523dd504767a06a42686c"; + sha512.doc = "f3255c9d6b1eb75a501e5c36cece49cb72767e467c0853465d2b8a39f011138d7154eab2fa5287f9223b4f535aad5c2db25d2f76c286376499c71d0ffd120699"; + sha512.source = "c5ef10d286eccf16b270c8b487e91270cafb09ba10a88a8e0c925485a380c18002d399857f7dd42978aee72f7b1889c5dcde7ffdf2f5626424f31fd99a452ff0"; hasRunfiles = true; version = "3.0"; }; @@ -1680,22 +1718,22 @@ tl: { # no indentation version = "1.0"; }; "babel" = { - revision = 56581; + revision = 57153; stripPrefix = 0; - sha512.run = "1772ba9553ce20f13e9a8e10d69a5ce12d71dfedb07259cc2dfac77e8099db47c940dd7342bdf045b7ba67f6672d7410f4e0cfae6715da87db54740dfcfe3ec3"; - sha512.doc = "1552285e99e5d6bf542ff061f9503a94f33ac49dddc3d726b6ab4e10d07a6a84398dcfd7a0c701b1a78be7acf8a2f7609fd94327c16b79e0051b851b8859c54b"; - sha512.source = "f0f455c9a80e312a6da3839638de28b60a3ae829765327da30194534fc86960c1f83ae1649129bf2c2337cc61dbbef96c0aaa2b4c82a8108024d317f5ea684ae"; + sha512.run = "f096fbd407b22554b6e4a1f2ae4e50813d006b1221969d4a9ff9d3931e91a649885a553ca5bf79cfbac8711b7e3f1eefb2307958ad8148917012ee92f05a6ea4"; + sha512.doc = "dfb40dbc7b26940b99f6049edd11cfcbf4022398be059e0079aec7cca5b0f7034d54b20c2b8ffc61a044f577991f008f89f1328be64c317c83d9e7bbaaf5f271"; + sha512.source = "74b3212ac86ab8a0246c878453efe0ffba31a8c3c6392446db947c23dd0fb425069d11997ee964a95e6e9ff0bfdbb6338b493fd74afb71d6ccb77d53ea6169a5"; hasRunfiles = true; - version = "3.50"; + version = "3.52"; }; "babel-albanian" = { - revision = 30254; + revision = 57005; stripPrefix = 0; - sha512.run = "55231eb303d7a2549d21e2d3bba9cb784e95cb99edc29a84212539ce04eb27261078437b8902419e85c69e2a8d7e6fba7abcb86e7b6448b4ab139de60cb77d87"; - sha512.doc = "12afde1de6174c7aee0dcafa4c6df472c0096373a09726c5d4223d082b53b558185b3b48d1ab3204d03c4a89c5f5f2293136fae671c2f2913ea72109c3f58e19"; - sha512.source = "95c1550b76ca8ecf4dea6495b644b550dc2feb45cc3d3c597c94236e6d3f86a3a42da7bcc7b77b4ee6597d167da33a571da16f5f7e35fd4666ea708a86c490ea"; + sha512.run = "8a98ba1dc08bc2bdbba0793bda2a07a6c248543fdee56cbb047229d1cfe77cdf616c0ef023b0a74f877d9863768065f0e256ba35a1071e0dd3f2bbf2b47b7ebe"; + sha512.doc = "d26b9d933bbf0225f79bd8180f9dcc2961ea481fef7b535267034296062f8879b53ca47ed6b512fc724b261276be6d92ce045ba0c8bbdba0149cca6f117be8ea"; + sha512.source = "74212f36288599d730fafd00dc50839cf0f12283ed8653303471d2cb64a57217b4792f1000cb44411c7d5031e4597db67368964ad318e896987103af8e21f838"; hasRunfiles = true; - version = "1.0c"; + version = "1.0d"; }; "babel-azerbaijani" = { revision = 44197; @@ -1788,13 +1826,13 @@ tl: { # no indentation version = "1.3r"; }; "babel-dutch" = { - revision = 30263; + revision = 56827; stripPrefix = 0; - sha512.run = "3f967688c9124502243589b666e1e3af500329782cdad8da5225eb3fe6a50262c2287be02d6d6ec04f3ce81a6767b4d2821179cbf04dcea4c20001e8ea1a9f5c"; - sha512.doc = "5591a30a32ac2900266d4dd642481a5c9e7bac1062fcf5557ad4acf93cad0e36020c75e081b63680c0c96ff580a2156fded920e394a9c5c685cbb152e8d4142f"; - sha512.source = "98c412d7a2a776286fb3f78faa49da6dedab2d3ec80b5f722a20eb34fec53768ba4000debc952df3241661f1f86b7035d7e71f712be3fff91f13608dd0fcf87c"; + sha512.run = "4bdebadb6dabd378fb52eedacd8181623e40bd0a8215aa77c34f7a051a020d6c60230fa0203c2d519bfffcb9a374702ccb1d7c6b0482a232f1eeda5ff52f6c1e"; + sha512.doc = "92bb3f2df9706bc6af7d20df200174a4b3f0b3237a8f1d9259886272deeab4109e85245a0cf6cf5b43bee93b14b581b1fe5e0d4f7198b88a77e2fbf0c8156090"; + sha512.source = "5942ba0dff02c632f0a09e240b3576eb425ed1c74924c007572b2a7b8b95701777bf20b2a943acd0028682d5cf422988c51752c3c80806413c0227daf2f8fff6"; hasRunfiles = true; - version = "3.8i"; + version = "3.8j"; }; "babel-english" = { revision = 44495; @@ -1833,13 +1871,13 @@ tl: { # no indentation version = "1.3r"; }; "babel-french" = { - revision = 56333; + revision = 56607; stripPrefix = 0; - sha512.run = "387008584ad1b71c10573aef439f36838e6cea0d23e39b9c58804cfd9eb43297e64a3efc2c10a72324e89a91b0ccfc93114ff2e49a3e44433fc8bddb00e87faf"; - sha512.doc = "1a5068f911e3925685c746b49c670665000ad633dd3b9551d06ec5682c89151f66984240dfe1f7ec2278df02423533206b01725422e3f8bc21e5fac21d6ccb8c"; - sha512.source = "bce67137956b9f2f261e15951bd0c5a23064308421b4d4713690603a75eba1ee0c4aec50a334c9d9d993f45027b7a98b379ac2ca739ce55e595c73ed3194152a"; + sha512.run = "eaf680b5828b069907c0edf2b62c49475648f973f1ed220e47f6c05907e4b813021b0b18f66b3926ddea4266654dc91055913f3d6be1a799ef0bb2ac8241b9e3"; + sha512.doc = "67c54e55985a756ad52c6c904271a0b54b95e36f2da793d8804771c1606a354c075c8cb547d261c291fb70996fa818573f9f4e0e2c6f0e4a72be0ce71b65b724"; + sha512.source = "676c38f93a87b0fde0d7527f5a4e7db38744cd72e069dfa093e1bc91e365a219fe00a2d523ba06522f31aa106df1f391c669215bc4617a59df606f1cf3df179c"; hasRunfiles = true; - version = "3.5k"; + version = "3.5l"; }; "babel-friulan" = { revision = 39861; @@ -1877,13 +1915,13 @@ tl: { # no indentation version = "2.12"; }; "babel-greek" = { - revision = 54512; + revision = 56904; stripPrefix = 0; - sha512.run = "38db98876386d56f4c9bb96099ee63ca9f54938e3be615d5dd56f31d168d0b9ab1af3b8cea5b806d23da9c5c95cb29edf1cbb8650723ed23c9d16049f847913d"; - sha512.doc = "52e281383c779b7c3d4842ec338b4a53cc9068cd9b5c581cfa40326049b244b37e2757ee8a68861af0805cc38a11b9c731446aa5f59d74d7f6c835dfc9aa200e"; - sha512.source = "b438fbe2407f30841083f0087f99b3fdf0102df2ed46ef809c86122532e798a657ed3706f6ee07ec019c06fd27cb243f84cb95a4f770f0fa0d95aa8ea9e7decc"; + sha512.run = "6b0ab839f2e8a9562c8292fe8f7661a73148754ed816088be25d06537a58ba95ac34d9440bc4f3f35c3b720188b261b432887f9867ff94b51261076f9d8e0160"; + sha512.doc = "965dc1293a90ed4f7c777d32887186febf28f7a174a00af26c19720493605291d1b17a5790b5541547f9265d8a1a3d102d9a4fae79aba43780c384b7385e06b3"; + sha512.source = "907493b19b16ed7a0c6377864a4b8266732065e2330c746d118dfec14a6a4976115eb48bd6b4286ce48cf6823e30fd3c9f06551aba2f52ef4a8ccfaf3f800810"; hasRunfiles = true; - version = "1.9j"; + version = "1.10"; }; "babel-hebrew" = { revision = 30273; @@ -1948,13 +1986,12 @@ tl: { # no indentation version = "1.4.04"; }; "babel-japanese" = { - revision = 50735; + revision = 57129; stripPrefix = 0; - sha512.run = "eeab94dee49061fabb116702c1cdd0c6ff11eb61994c4bc20bc2147329411c42f5db7faae78141ca53380c308f8b310f592abbbc77d67654270b6b1d72ca5cca"; - sha512.doc = "152a3c6d723dc8bcbc046275993b207103e12ab551216e87aa999c2c912acf2ba7e1bd54b0a1c8099940c62f564a268da04372ee559da7a7c56b6e0a32e29b4f"; - sha512.source = "04bec4bd09f46c0c6e25a0f59ce2435a5d5fe222268616b02314ef091315e3bdb882381890fd304c07d5398e95e217aac46b47734fc9e6efbb32649c9f974cf2"; + sha512.run = "5c4d9be1853ea0cc90b1338bc69881b1f1a1d2b1b7bb37150747e6247ecbf2c53eeb2b29c6f08632144d9146b1891c31c6083aef0a45c84155ecb2820c120ef5"; + sha512.doc = "f2ca8d3b11d13df5cdd948cb21f7a7320d743e61a2ab33c8e9c7e69133f15dea205d3335eb0609c603d0523a4e8996524f469708cb49b07d7fb1f26b14003a08"; + sha512.source = "0edf9c1a4a383f0ad0f70bffc1ee37976d9afb80b211e5c31d53ccbb176c3fbc7058694b680506d26cabe65e63fa03a73d5e80cc91ea0aecd9a9eae9ec205dc6"; hasRunfiles = true; - version = "2.2"; }; "babel-kurmanji" = { revision = 30279; @@ -2063,13 +2100,13 @@ tl: { # no indentation hasRunfiles = true; }; "babel-russian" = { - revision = 56597; + revision = 56663; stripPrefix = 0; - sha512.run = "fde01c945239b63ac99840dafc08569e78d0a2abd143664693324004e0f815003b1a6043cbf281d5b7fdaba8753b3730e059f6f599c96466e1c2d0488f72e7ac"; - sha512.doc = "3acd55a7e161cae33fbcfa68e762d61b476d12ea91560822f1de0eb35bc8b04127cc7ef30aca2e6fcee3f4665357e23d570d1b76dd2bbe0539773867c08d8b0b"; - sha512.source = "b5eb81e9bd501846b3bab3aecea6e6789edd189673cc713e60fa37391b6a09892144bd247c38c197abe79124a814be5275c01788984b5616572d106f821430a8"; + sha512.run = "a13697984db65dbd36387761012062b6e55195137b8b1903114ced022e2def90ded6a8a9e3987b76f81d5d1d73202c371d835c1cbd00e824cd13c78aa04a2136"; + sha512.doc = "7be47356ab7350ac5d67ba2ab2f14ea728c5dde7072dcc527785f96de5286aae94e22e48692d544ba7faf6b13ff7af103f5a0585a189fe83b0cd9c03632c030b"; + sha512.source = "5d2f16e58c7cbd868a5c51f47fc703a43618f52cea4cc35bc518944b8d6fbdb821e8a0e8cd6382f7e81dffc4443ab7f3bb161e07caa7f90750a1f0766db36b19"; hasRunfiles = true; - version = "1.3k"; + version = "1.3l"; }; "babel-samin" = { revision = 30288; @@ -2171,13 +2208,13 @@ tl: { # no indentation version = "1.4"; }; "babel-ukrainian" = { - revision = 47585; + revision = 56674; stripPrefix = 0; - sha512.run = "6729384e1029580ee8ff2337508cb5998e8a385de25da4d5969341869f22f17180b03a98a403b583ac5b7a965c2a07d5c96b0aff1b93b82cdcb549b4915ceb4e"; - sha512.doc = "f36acbe23a159e2a9547d7cd5b64d529c49a35353f5a84082a303204f8a55f088f1beb0aa75d852595768a3ad10de34763329a22e2c87c5081ce2d6fa4076309"; - sha512.source = "110d08aa4e84718e04223e4e4745a968c2bbf3d7f453430ee02eec57a96fe952046dc9101b95f90a7de84bf6a4dbd65e8697e1980f0d85eee84233554de31370"; + sha512.run = "10476b0dda4e80472aa8d3b3628d372da10f8badd37df6beca434e3bf1b9e135972acd5decb63eb6f706b700ef969136117b96ae5a6d6209fd75b9c13d06567c"; + sha512.doc = "7dd3c5d02024cdd4e0c06b57d3aef0a723aba718760efd4b1214b7da2dca8877293bdfff2d3893e531eb734d5551dd93afc03dc4f3413822a3df0b40b4bec43b"; + sha512.source = "0fec3b7b65f3e2a5c0b426d4c55e55ec0551fb38a786cd36db52cdfd6c87909ff82ca21328ea33c7089b39aa2694d4d62ddcd1d59255ae929d4ec85a44abdd62"; hasRunfiles = true; - version = "1.4c"; + version = "1.4e"; }; "babel-vietnamese" = { revision = 39246; @@ -2198,12 +2235,12 @@ tl: { # no indentation version = "1.1a"; }; "babelbib" = { - revision = 50354; + revision = 57349; stripPrefix = 0; - sha512.run = "70214f7a3e16c1fe4b3bfae479df63c10f9b654b34bd29abe3b4837b1a375b1a13077d0ba98e46a78ed702616bccac6aac3c70d422c85e37f462a376b2ee2589"; - sha512.doc = "729fdb0bcc60929dffce6883db377e487a31610979d92f7be48e017a6f982298a9d113f06376bacbf2406a89fc1ce10cab86a43de3d92be8aeea7e3cb7cb9f98"; + sha512.run = "90e78ff6086c80e0102ce7aae74070d3b1444208f3957e354f2c940ea4d279f87ed59e6c3310c6d9fc1464c227fb0eb4c3813ca679a6e94295e0b824cb527376"; + sha512.doc = "cd5785a17242a523f23093f8389f1d4c5e3d49c0656ac3f168a8627fb153b217b5a14e5c990c7afd1c5ea7324b5aad2e3dd40e8c2ca0f9ba9064f91f7214bf90"; hasRunfiles = true; - version = "1.32"; + version = "1.34"; }; "background" = { revision = 42428; @@ -2224,12 +2261,12 @@ tl: { # no indentation version = "3.1"; }; "baekmuk" = { - revision = 56291; + revision = 56915; stripPrefix = 0; - sha512.run = "bfc4909c549dfa89f11f707fe8bf2f02f118ccef8863c7708e1fdb65fd772605b9a8f661a41b1ef6f259492e9383774a7751144191f29c285b13840843248419"; - sha512.doc = "c583a3ea88de39681bd49ec722f80ee09ffe43dc668a1901c73cd40eabcf3be24bdfbe582b72426cc56fe2b27d0f810208ce7feb9222a3a9e0cc2fbdd0e1b408"; + sha512.run = "f9270a17459444e128b5fc5d12b943043fa4ec2f87ee5996808f9dfad1c4c4146787db3ecd267767a375d1fdbd56e15850b25cd7c9c71ab270e3517b5863054a"; + sha512.doc = "3a3819f892bdf69afeb66b9fdfbfe1ffe06e2a488425e814cb3a1e223ec9659a71f0571dc25136e0f7afcdb616f717dcb3823b89e640b0894313683e4f79b197"; hasRunfiles = true; - version = "2.2"; + version = "2.2.1"; }; "bagpipe" = { revision = 34393; @@ -2337,12 +2374,12 @@ tl: { # no indentation version = "1.016"; }; "baskervaldx" = { - revision = 56388; + revision = 57080; stripPrefix = 0; - sha512.run = "34e55c19f6675ef921e02e48dc8dee0151a975cf86250512c91ff733d82d2cf6e7c13dfdc8b8f7bd4b59bb233c5341689ba18cd35c4af8114df34405653564c3"; - sha512.doc = "b5d6e6f4be9d72265f61e8a3dcba11155cf4a3cabae0add57bc5fe3938ac0b9605cae3770aedd46d4243106dc906db3c1634abcafba7f73ef656b45d61dde03d"; + sha512.run = "42db4e01e127ca3870f6eb692217a7b0c24857599f01314c41ff6f26664e3559c4a938fac1557e799e273b42df2884955df3dd72f8e0b44456b414b8831fc019"; + sha512.doc = "df3462932654a6fee3afd099a92c5d12b6999003af1c76a3be3ec3f32035b76993b3806c88e670a26c0857bbc699efa64063a4f23c24055ec337481e65019e91"; hasRunfiles = true; - version = "1.074"; + version = "1.076"; }; "baskervillef" = { revision = 55475; @@ -2443,7 +2480,7 @@ tl: { # no indentation version = "3.1"; }; "beamer" = { - revision = 55908; + revision = 57140; stripPrefix = 0; deps."amscls" = tl."amscls"; deps."amsfonts" = tl."amsfonts"; @@ -2456,10 +2493,10 @@ tl: { # no indentation deps."pgf" = tl."pgf"; deps."translator" = tl."translator"; deps."xcolor" = tl."xcolor"; - sha512.run = "c3632194b89f6e21fee4507ea4139215b018754a6b15cb2e4e02e7442baa5cb840393fa1d15f123dfe3d48d2312a9098b8ac477abc8dbb5a43e0c574ea8b56a9"; - sha512.doc = "dc19602254665ddecb9f7000e440671df67835142acd09044428f4c28526b0fddd86c68961bbb8d22cdd31ee171f6e15fe443d5160c232679e5a8a4b4a632ae2"; + sha512.run = "6eaf8eff8bf8e41d401368eb5c2a3a8676de36f572657dd47a0e638782632d5225353315ec7ec1ba5ce20ad25fd838645672d5c55902f40baa091f951b68c2e0"; + sha512.doc = "d5bc528d1d903964fea497764065ebc3053e230032e36bd08020663e641221654b75c76644085c9834149965d7131984a6d19fba1b33f2b54b0fc1e0d604187a"; hasRunfiles = true; - version = "3.59"; + version = "3.60"; }; "beamer-FUBerlin" = { revision = 38159; @@ -2591,12 +2628,12 @@ tl: { # no indentation version = "1.0"; }; "beamertheme-focus" = { - revision = 55475; + revision = 56967; stripPrefix = 0; - sha512.run = "c3e4be78d964598e6e83be90030cf30a0d28e0a36e639b76dc3b9b4fc1170392a97cbfe94959842a789c86422448f9b0423ae242cfca9031d68e15ac23f6968f"; - sha512.doc = "9771d48a5966da9a8fbb5417178d36769e092fd2179582c69a240f7adbecce3eb52a21a53291a34b78357b722e459a1b32e2ff4d6d338943394967e5e7eab8a9"; + sha512.run = "b3b9be62e244fe4288e77113aa8488e24f83932d5e2b31accd30d62ced1cc8bff4b44183fe2be375e69375862237f18b6f0b40c6201f1199cd1423b09c2a60f4"; + sha512.doc = "57e8e51ac4a4eed778796c916713420e9372429fe7d310d9acae988c6d540ee516e64ca290dc6feebe28ad81877ee7e8919b1145e626821c4ef72c226b3cdbde"; hasRunfiles = true; - version = "2.6"; + version = "2.8.1"; }; "beamertheme-light" = { revision = 49867; @@ -2632,12 +2669,12 @@ tl: { # no indentation version = "1.0"; }; "beamertheme-pure-minimalistic" = { - revision = 55360; + revision = 56934; stripPrefix = 0; - sha512.run = "6e915b404db09b2400b0953eb543a3ab9315b2ef782e621176e9db7de576ecd666c34f16d54e27d5500fab889d178793cd6768b63a6fc337401245fb897df4ca"; - sha512.doc = "4a0e1f612ffb1188d2a0a42a23056ae84111ced5286349b7cd69fd28ae6ebddd03ddc33e53ae2121dec39ac3ec1cf5118bcb2b50c3d77da1ff3b5aa170e4039c"; + sha512.run = "b9c6237108e1aa5f4859ebd1100efbddd2bca55c76bca876e0e3a0c10dbd322a3ee834e4e452b80b2f7755ce026fd2bbe5c69434371ad29df1fe3280b409bdc6"; + sha512.doc = "791e3a367f5c7ebfee453e7d7a76753763e2bbe122616e49fd0d4268dbd274e3ecb308b5adb850765d143bc46a311316f86bd13e60ce1449b0217d7b4f733830"; hasRunfiles = true; - version = "1.2.4"; + version = "2.0.0"; }; "beamertheme-saintpetersburg" = { revision = 45877; @@ -2688,9 +2725,9 @@ tl: { # no indentation version = "0.2"; }; "beebe" = { - revision = 56534; + revision = 56713; stripPrefix = 0; - sha512.run = "e1119cd8795e66499b811391a8ea2cedcc5e095d81edeb01750113495ce751b0edc4359ddbaafb216ce6dbe34d5748e2afb6cf8140349662d5819d9121183804"; + sha512.run = "0f48ab57f14d50a4671d616cdf9bc0431f4c092c99c911c0d839e09c80aca1b5b1b757e7fbebdb39dcbed63215eff62ef5935871743df4f32f1d1e07d20e45ac"; hasRunfiles = true; }; "begingreek" = { @@ -2790,13 +2827,13 @@ tl: { # no indentation version = "1.3"; }; "bewerbung" = { - revision = 37880; + revision = 56998; stripPrefix = 0; - sha512.run = "a82ffeb4fc7fa5bc42f06476df0c985d59d70c81b34ab50f10cf2117f8861a09b90ef3f53bee78291842a46fbc15bc40663d65b88c7c682c72b25fc86ccff2bd"; - sha512.doc = "d9fb4f9da944e132187fce6e987be8eb0ef08cce80ce63e8813c1af8738dad61a93aa7c2e214b3ac0b77c980f8a000251ab9536c8a7557b9c7cdf66ae42fcbcd"; - sha512.source = "260f6f1b5484358c7b558f8b78ca68ec5ac691fa367e634e5fe6f29b06ea9eeee868bce9e10717971d85c5ac23b71d853ed746842ad7674f7e913cf16b9def47"; + sha512.run = "85ea6341316c231786612a29fbdd4bdaa412512f23e84431669a60262b5594fee908f68b8805ec79adf8445eed724327e4df8e692e75717710498486f86a7f22"; + sha512.doc = "c414d4d98b74e8720e487ec2ff5040e9e3de59dcce449698d5e781abb300f13679a5beb2c4af3439a8ded3072a9e69d7bab431869309e87a7b5e803ad684d177"; + sha512.source = "25749c09482ea181ea35b95bebabdded49908ab6796ece3d907261907581118eaf626dba418987349d503a4ce8dfde87faa5ff2b750a53bfd6ccb4c7525ea141"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "bez123" = { revision = 15878; @@ -2868,11 +2905,11 @@ tl: { # no indentation version = "2.2"; }; "biber" = { - revision = 56144; - sha512.run = "9ed3866c784065dfc27655ea45679bc32851299e9c15974e19fb635b7d7bb356b34b4339274babeb5650d7a2827471f30656a183aa66ded6a5166f4173dfd008"; - sha512.doc = "c1b5f8b10d332e2bb2f5e256f67416b7e3a468f4f0e5b9d38b488091c7ef991ad843720c2176573de3b629b3410218363b5ae4e1ce4a6642163fd787e8ff051d"; - sha512.source = "9bf1ed70c4b07adff102cfce504b4c6eff879a40747a17d34b8d30c2bd6a8d27e5969bc32a6b26304f4024c2ba57209bb277ded1e537850e615d654d598d35ca"; - version = "2.15"; + revision = 57273; + sha512.run = "85c07705dda6e4dac7fb3d3fcafaa156abee84f19ce8652b71787ef5a631ba4519ca35a34c8d0d83f90b8f14c583f83f820add220d0f764c19d1abf4c3b7a3db"; + sha512.doc = "9d86fe6df7fe33221259395aac86729708481ee5222868a455153e7976c91c48a9469a9813bb0decb83c7eba2a3ec408150ec47533f9a41c974587415266f6e2"; + sha512.source = "396398323e6e9ee4df904a827bab9b246e6fbba15033076cbbc3a63e4443641f81c19646a4145c0c0fae38af37f54a5fd2166799685f39183d349c8273d13459"; + version = "2.16"; }; "bibexport" = { revision = 50677; @@ -2891,17 +2928,17 @@ tl: { # no indentation version = "2.0.2"; }; "biblatex" = { - revision = 56166; + revision = 57272; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."kvoptions" = tl."kvoptions"; deps."logreq" = tl."logreq"; deps."pdftexcmds" = tl."pdftexcmds"; deps."url" = tl."url"; - sha512.run = "e32babb9276e130311ba93e3a5b107f012e406fddba3594cc2eb94d92aa5508522a868e0fe0284b5e28bc90183c0700d8784b0d4bafad6c207261b9d052de74f"; - sha512.doc = "be2dc1b5fb666c25eecf9bb37d9766e6133570af56d6b338142a73d8e025d541354126a2f57f7f64613c727d9a92848b2f614aa35d5cf53e61ad7920532a643c"; + sha512.run = "9d8fbb720f69afabb42ff17287ba61760d910b40c4b90923bf46fa0aa9e6eeb188cbf09f533f0916af145a361702387fce95ece74feb3a535d6409a3fb39f684"; + sha512.doc = "c81fd0590e7662c7887274effc3e1e0badf0d0c67fc44f32abf8c8da3426549a1adbf6703fbd530e595a2cfedbc4a5a089c703f3a542ec0416705839ad093bd5"; hasRunfiles = true; - version = "3.15a"; + version = "3.16"; }; "biblatex-abnt" = { revision = 49179; @@ -2994,12 +3031,12 @@ tl: { # no indentation version = "0.02"; }; "biblatex-caspervector" = { - revision = 52802; + revision = 56837; stripPrefix = 0; - sha512.run = "0dbc78505f64dfdae6bfda4276f0958b046305b847c8d228d8ccdad2657c571866380bcf3026c6ebe260e27060c184dea61038b99079bf93c0c98994ca64b267"; - sha512.doc = "91e37539ffc49b637afbfd097071fd6b0124f8e6a531287019f21c1ff9d13d8cf57d7915fbb65e489ac800323dfde2b251da8fa1540d6bba1cdcf19347c5d03d"; + sha512.run = "d3e8c56ef35444c740e505cc9ccd3a3e0fc7627de17658f2f83865fe9dd48610a42fb226a0896b642851d4ee8a6e4bdbf070df32eeee047bdca001a8a8e34c94"; + sha512.doc = "076578ca8f7416c698de9f54765ffc95fad9a9d504f78c50648bd1aa3a12132caec3ca067aee94731cdf71af97bbb73f4b85afe477ccf128e587d221fbe5cb4d"; hasRunfiles = true; - version = "0.3.4"; + version = "0.3.5"; }; "biblatex-cheatsheet" = { revision = 44685; @@ -3048,12 +3085,12 @@ tl: { # no indentation version = "1.0"; }; "biblatex-ext" = { - revision = 56150; + revision = 57287; stripPrefix = 0; - sha512.run = "e42c5c396c5b0134c4213dd1c6d61f7c5db5c809d395d45ea10eb3728946bf298a04e50a201b5dfa495e0a706f4ba296391f882dae8354ce38ec35f705298e03"; - sha512.doc = "e04bcfa64863a33ad7564cbae3d148186c993ae23d5a039e3b8deda42a4572ea1e548a170df1aeeb7aaecb03259dd1282647c7458009806152b997608bb2eaae"; + sha512.run = "7b0bd0fa39775117eea6ea88eef2461f7599a67a19203642884b018de79ad05584b79a75faeb0c8c69d357c9708f3bcec656dba712bfe0b9490e76f32a55b0b2"; + sha512.doc = "8a486e482964c073e659375290daa927f7313975e2cc2a6839987e7b510b0f2fba286a0659e0c2728c4f004e1cd475aaffd0192f7015e2bea9b5a67e5ec1419d"; hasRunfiles = true; - version = "0.9"; + version = "0.10"; }; "biblatex-fiwi" = { revision = 45876; @@ -3072,20 +3109,20 @@ tl: { # no indentation version = "1.0v"; }; "biblatex-german-legal" = { - revision = 54297; + revision = 56939; stripPrefix = 0; - sha512.run = "d5cd757da88530f71560785189aa2830a2a2c6677529a10b318511b472e7a4bee03cea0d627e3d7eb43c36d96577c2b757ec84617f2a2812e99280184d5f03ba"; - sha512.doc = "2422b1918d20102ffb76fbeea02592feceb408e46209d2aea4146434d5f78f9f1f6e1cadbb919a8be8b3710ace7258d3c3a919103302b6bdd0eaf4a6ce4ee3e3"; + sha512.run = "a82cb2c531e5f3671b0ec29ae27f9df9ea375f9dc616286805e8ff2a8940437427c23c51d09e477703e60c7aa70645430ed98890efbcaf9593b1747800a9836b"; + sha512.doc = "d4108ee1d625301ccc32ae4202002d9c33c1cd9817b2d26430eb1acf902386817aeaeb6af518b67669b2542a3eab91e0f513bf1ad5ef8ba2572c5f5d7b813382"; hasRunfiles = true; - version = "001"; + version = "002"; }; "biblatex-gost" = { - revision = 53916; + revision = 56790; stripPrefix = 0; - sha512.run = "a620eb113751c856e3b7838067e35af53b9ca54587b2eb76fe6a613b202a66569a607801cbfdc18afee182467841f9031db62d3777378d923a559f3811eb6f10"; - sha512.doc = "d74575b0eed08f5e75fb31f8bf2aa3cf00e4a896f34119ab6665f8add1b938ded58e81ed1ac16f7a66ff088294478eef630789c8350a6c5767d4eec829f678cc"; + sha512.run = "c9dad05fd20f6147215805df07cbcea228d023b2051a2b8fdac28e55d0d3424d81d71f48d7dbbd679f3a306c1385dd2d1c50d8d128432d3d64abc9fa96373350"; + sha512.doc = "90220ec8159d1621e54ffd83c587d111bafdd54ed3d104146992cef5340d55093166283367e4dc3cb21ea2621122b4080d0a849f7ca2b116f262b96b6d177ce1"; hasRunfiles = true; - version = "1.18"; + version = "1.21"; }; "biblatex-historian" = { revision = 19787; @@ -3096,12 +3133,12 @@ tl: { # no indentation version = "0.4"; }; "biblatex-ieee" = { - revision = 56222; + revision = 57256; stripPrefix = 0; - sha512.run = "16cf9d5ceb28274a0a33208f4d47fc6c93c70526f4ef4639756ea00c261b6d62503baa3029022bf2bfd1b3ef73fa636cceb2bd3f7c7d63d614890672561e144c"; - sha512.doc = "1fbca2aa8ed98322e4da15c663eadfe401b68d9f7e831817f4267dff31f13d9c45f1ee81ffa5c2f8753b8b059be8adb7e842e8ac320dd02cc7f301cbd97b7d03"; + sha512.run = "edf4d7d3d94c080d44154e06d1275e9a973f4d59fcd583c6fdd5ef6038db6430fc9b14605f42bf988226a374102827287157df9c2a805084969e83604d31cddc"; + sha512.doc = "4cbe9498f9a8bf08adae00d3bfd9f86d0c2a33f19d407abc13d025eb568d5e46b83e887d12f56a0d330e67ebdbce5bec6babd8812214750b16e1c854774b9c1c"; hasRunfiles = true; - version = "1.3c"; + version = "1.3d"; }; "biblatex-ijsra" = { revision = 41634; @@ -3192,12 +3229,12 @@ tl: { # no indentation version = "1.0"; }; "biblatex-nature" = { - revision = 48940; + revision = 57262; stripPrefix = 0; - sha512.run = "265427460a57fa3cba846b3e7dd4fddf9639c11e223cba5e7f47da5b18ed1d348a70c29204378ab560f2eeacfdb12257c25482a1c3d9836f9025d0ddf987b511"; - sha512.doc = "9053472af9e07e4c297ce0650c7d9d20b85dfe22645652a9be49e950bc9718160433e6ffa01e5d0dec04a036425e31d4b7e6c31de9fc7553a730720fe54eb36a"; + sha512.run = "b4b12abe904d96c9489dbdf248042ed1f1af1474921e0835027220059492f2441aace661260fa3632a65bb2c1ec0ab4e521014e63a14f7fb835293fd8191c2fe"; + sha512.doc = "c5169189b1225dba8631a0f7f5ceb5bdb5267888b2817716e23aa79bd4516665965b4343ed5e1a8e5099eb59ca64cea9edbd31613f7cb02f161b8ba561c6d4e5"; hasRunfiles = true; - version = "1.3c"; + version = "1.3d"; }; "biblatex-nejm" = { revision = 49839; @@ -3225,13 +3262,13 @@ tl: { # no indentation version = "1.9.0"; }; "biblatex-oxref" = { - revision = 53571; + revision = 56706; stripPrefix = 0; - sha512.run = "deb25777940c0aa54976865590f629b866d5175de57fe21dac0193c4991eb5333591f350475bf9ad4fee253acea2c27f9a6abc52280f487b422f70a9c77f5877"; - sha512.doc = "f589fecde40d9e07d99b453c9119668d6ee3a9b672a2a3184e8aba08e6c18484a359ef598c7a5ba9f741fee104b7d1260144075f28767064ba6971d5965771e3"; - sha512.source = "3c979ac6b9cdf3a256f29ad012068cbf901781a0f977f79603c74eadd38cd8e21365efdedc6979ddd86b145663f0ec6f74df6d6cdc7985f3836ff351210bbf77"; + sha512.run = "46cd9566e5cc55646b8e3bba36ff70f727f8aa0955397d11bc2f9495ac47a64436e361e6d54bdbee58723e429b8aa6398878a16f5ea58fb0d92bb11c198d113c"; + sha512.doc = "ad716ed5a486f743f0bd5491558dcfd511d44e58ca02b7acde4f6c65dd7b0244cfb990ab63ad596dd4f079bb8b75362e187a6e07dedb594bc61b2ae277bba562"; + sha512.source = "c21a0ec18ff976493a96429fc069677f19935b0ed1e2874094382c5576e6e7dd7b1b25ff0e8cbd2527872517aaeab2177d33e686476cde78658b70b1d915f1d1"; hasRunfiles = true; - version = "2.0.1"; + version = "2.1"; }; "biblatex-philosophy" = { revision = 56493; @@ -3267,12 +3304,12 @@ tl: { # no indentation version = "2.7.1a"; }; "biblatex-sbl" = { - revision = 49426; + revision = 56853; stripPrefix = 0; - sha512.run = "dfbe4de870b93fd1bd77aacf003ea56926adc6d52d0b5f47125d411738a66822f8c99bf3d58d0fe955105a30e5f2629a0c37ef5bc3cf00d3ebe895cadf621063"; - sha512.doc = "c7ccc14015397b816ca508bed2533fbc2ff183dbdb035d13100e8ec8faee18ea7ce10f7d8140b2ebbc6d58831db59ed6a9d7a4b75b0ef346081deebc7c323b72"; + sha512.run = "b13fc1b54270fd7b79c3dc71388152b9dd81ee868ce382063fef690c828dcac8a11127dc3cb1c02b138a16d17dd5a5e311d8639efaf8f84e50aac4de6cebcc93"; + sha512.doc = "815f16ab2f6edc7767fc1bd95f4e792c435e605ddb777e65ed54f66f8cea4e15b6cb80938276b1fa30184a498e628d32e2c226d97b7afa99b6022c6f6eb2522b"; hasRunfiles = true; - version = "0.11"; + version = "0.12"; }; "biblatex-science" = { revision = 48945; @@ -3324,10 +3361,10 @@ tl: { # no indentation version = "1.2.0"; }; "biblatex-swiss-legal" = { - revision = 56594; + revision = 57349; stripPrefix = 0; - sha512.run = "b0d626284d4bea56c3f0ca7c1b551d3f6e4ca3759aea514de97ac1a3f3a1eeb4e31cc7b4f8d321357da1dfa96b5de5a4a23ecd01e68c10068d30450b6c158a39"; - sha512.doc = "2cfc4d0ffae18fbfe022bb4613d5169cb65263df639dcf44368c9e9d1395ade3d001bc6b4c4708865056a017fdb1107140195e53ba4f21bf82ecd8d4c543f86f"; + sha512.run = "0e60b726e6d0ffbca5108c38daaf8066e44f401d553b9e1208eee1b13199e9c723e03a94fdbedc86dc14a0ce6ae7a94a7dd197773aff6b58f0de727a45d6e7ab"; + sha512.doc = "0d628718be8ad1a5857ab2462097356f5c6ced313741adff0715787c5bcf60bddb072dceb4a695709a27fc8cccac119bab20b56edb4a7d94a8d15a99cca24981"; hasRunfiles = true; version = "1.1.2a"; }; @@ -3454,13 +3491,12 @@ tl: { # no indentation version = "3.71"; }; "bibtexperllibs" = { - revision = 54512; + revision = 57137; stripPrefix = 0; - sha512.run = "32263453ac7fbca7bd9c893d363c575fcc5bc160e41d952c6d6bee137c31f242abcf6a285d0f817614b85a42cce7257f8400df152c185a7fa2acd018fa9ab4f5"; - sha512.doc = "74bf34744140a60c513fff915921c5fe5c2245e0145322bf8f3a8ea0ceb0166dccebe6ca4a6beb22c9a56a1fb23dcb70e5a92b6b48cef0e7471cf12570f8f991"; - sha512.source = "9b36fd9a5de4c45716b9ff13437765ee742bbcc1b7314c6411942b8cb2009ad4c27d24e3cc0d71036873f8e5430ef18ff7cc96883fc63da35de284b939ebec98"; + sha512.run = "a2989820b603d7001bdafd85d637d500a1f27640c37ed48990acd5cd49b8c9d0035457f9c55bb79dad5c9397fd5d4f46fc8a10834bb388a0626daf8e8269a2ba"; + sha512.source = "b4cb508f2e24de447427bc82abf3366f5f2afa0b5a5a827e1b129e8b2819878ea78c2057c771dcdd86e362eaefa942c90e0f7285a8495256a9087667cde2325b"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "bibtexu" = { revision = 52851; @@ -3625,6 +3661,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.1"; }; +"bithesis" = { + revision = 57233; + stripPrefix = 0; + sha512.run = "63679b88ffbc811fd87471bea5b277014ce16b3c9742c2e3dc34a88e7b8c0f612b0fc0fd40e6b20efdc2225f21fcfbeaa211c39bcfe6d100e09e0da960608990"; + sha512.doc = "9d9ac7ae83d2f456f1bbd76c06f9795e4c3ccc156f53ff2c482faf05c397fef0489820e9baf115b7776192b20f6db79a3b8553d9180a6d4370442276896a2743"; + sha512.source = "629052b8eda9f325181f1cdaf4f276dbccdde557597071e8bd8d44bd23989d700b5db2589884ed62b8b17ae789b53e75dab8b7ec5e8f92edbf6bb614b7b02cd0"; + hasRunfiles = true; + version = "1.0.0"; +}; "bitpattern" = { revision = 39073; stripPrefix = 0; @@ -3808,13 +3853,13 @@ tl: { # no indentation version = "1.0.1"; }; "bookcover" = { - revision = 46410; + revision = 57326; stripPrefix = 0; - sha512.run = "1a96e15ab73c11f36b58dfbc0109529fb9bbe322d4c589222e122f774dbcff5337e88a5350a3fac05652aaf0010cf97ea1842693102acf00e9a22db7b6bf77f4"; - sha512.doc = "1f017e0071060f82e5f530d3726d1d91c5fd742c6a29613a2009756d96a2afcbda1e647cc588c350e90cd65be67207c811ef6466cd863c1b80b39f6afcbbd7e1"; - sha512.source = "e018f3a388f3c5d0a4ff9f35a952ec96e7af45b2469122d6dc225ae6768704ae9884933200b8a7cb62c1e182602ec697daca530cc966d764ed2d7fe807b09328"; + sha512.run = "1ea230af804c794f26919542d5246d16cb7fe1060f69d7c4f99df327895b528c3565f9450c5a8ded68ee1833a08f6c55c92bb5dd92855d4869b0af0ac5ea0684"; + sha512.doc = "fcd7bf97646458420e3d1ce0faa6d38f7a2d03a0722ede25fda763df506a27857631db95b7085f22f8d5de44551d1a7fdb54b9d28d9e4532587d33f2150c25f8"; + sha512.source = "982ad86158e5dbd7c00e323b77f5e685bb4737615b11b35b291eaf10995d4754701a1c1c0d876ee05d8834367b153d5587546fecd939eaf1764b4b2833f2cbdf"; hasRunfiles = true; - version = "2.3"; + version = "3.3"; }; "bookdb" = { revision = 37536; @@ -3856,13 +3901,13 @@ tl: { # no indentation hasRunfiles = true; }; "bookmark" = { - revision = 53026; + revision = 56885; stripPrefix = 0; - sha512.run = "29f24d431958caf824b8a3af098f9b8712315ac98ed7c1b4969b1a650cb8a9732341ea3af42c154e28aff35fa6a0abe8b3cfd24772662027912f355f3f5cd16e"; - sha512.doc = "39ff86ed5dace26339bf93b83e9d41a8d89cf17ba6abbf07be9f9ec72232dd27e88e88291d54c09b2bc1ff8b88bcc40a04c75767ba2f9b35a192dfbb8b6b9100"; - sha512.source = "411587deb4d6e436928dfe318166735444c178c777b2124e2479b993e4b00240060569bb95f56ff12d421e73ec191a203186318057b649bb3a48ca5cfd7ebbd5"; + sha512.run = "56d73af9961348a8436beb957b65cd9cb0bf62c9031fa71e5f247a367ecfbbb15763214710c66e057d2806a0dc0ce09b05a163d74a7687c8f0dc340ebdbd2849"; + sha512.doc = "44491b3165eb356327345f6f7c5b690db6435369e1c58571146982285ef849425935ad03ef1c9bb0e306af740bb6b886b21226093fd083e838da29d09bb005bc"; + sha512.source = "9fb4abf83e752b4c1301050feaa4d648d67fedbb6ddd9aa1bc253dd9eca76b91ce02c14fed17364d768d170e8b7ec4e991c23c582d121a4e72e4fe62a02f0442"; hasRunfiles = true; - version = "1.28"; + version = "1.29"; }; "bookshelf" = { revision = 55475; @@ -4208,12 +4253,12 @@ tl: { # no indentation version = "0.3.0"; }; "bxjaholiday" = { - revision = 49924; + revision = 57025; stripPrefix = 0; - sha512.run = "d028523087abe4587c8eaf877eb2dd0f4c12fc12055c29bc1bbf615e855155a77266df8cdf50bb458600bab0264836346a6d98fc183aafc92b546cfc7bcc1bdf"; - sha512.doc = "398bc4686c7c3b121260cbaf379ca66f7f64911b18d771c04507287d3cce834256662dd8f72f1f55601648cc364703f88a0713d9dab19c53cf19c252e2919fd1"; + sha512.run = "e062446514cdcf8e817f06a33cd02a29cd1985dff450a89baaf2e230fd9dbe20e92d3a34b661ec12c764c5a6230b1fede49034847fcac2d2db2377eb7d4450cb"; + sha512.doc = "3b44cf93b4afbbf97263b091509a5486bcbc6fc7091bc8a583be73f35487962af93f071547a78895231fb576054e440271abea20a7b07d111c197382b52ee746"; hasRunfiles = true; - version = "1.0.0"; + version = "1.1.0"; }; "bxjalipsum" = { revision = 43369; @@ -4240,13 +4285,13 @@ tl: { # no indentation version = "0.2"; }; "bxjscls" = { - revision = 56552; + revision = 56686; stripPrefix = 0; - sha512.run = "567f67ef9754d093e2ee01fcfaf3c34bf4973f28c61a30ab01a630e38a0910e9b9d20580a498f1cc456f70b965b5bb16a2df594d94cf7f44bd02b03609906330"; - sha512.doc = "0233721882bafcefac1299577ab6984bc8f45c4aebb4fc880802b93c964e724775670899b9963bae3de04c4383410839adeb720585f99bf627621e81907213b7"; - sha512.source = "444735c46edc534ddd1e9a5367308ee6f24a50c15c3f3744f0dce68c0d889fd2ccd2abd47a33c45e4e776650e15ec5ab7069f3203364bdcb2a26676cdac06345"; + sha512.run = "e5130b7aa29aae3743b323b8372d86d24d77a8ec57f1d77d3ffadbfe6a68b8e097f169aea3ac277e52dafaa3779fa69949cef651135da157120819b0939b7028"; + sha512.doc = "ab499484a06a37cbbbfe6a5e7dd90b0361775a8d64d740f82377892e99fb929a943bd87cc893d71bd2672794f3f2c60fd738d710709ddc1b41cf9e2d3564c293"; + sha512.source = "54c973e9339ffcdd808f3bbc5566ae30f8b7811886b687e0f9adbef9a5bfc777eef571ba9d353700c07366bbd0526bacf1ed2bc2ba77cabe73f4c1fe4a9d8634"; hasRunfiles = true; - version = "2.2c"; + version = "2.4"; }; "bxnewfont" = { revision = 44173; @@ -4297,13 +4342,13 @@ tl: { # no indentation version = "0.6"; }; "bytefield" = { - revision = 45339; + revision = 56821; stripPrefix = 0; - sha512.run = "ae5c3c97ded2cc83be2dad6d67132b75eb55b22ffd8d4c0bd49dc842344a310c4ac80571165e43d2b446148dee1ae3927fc2193a92e85e75ad457b4732bca7ed"; - sha512.doc = "6657581a9b97383c2dc3f8972ff77461a73ea33ecc0ba4dacbf0188e1db0dbe21e2d324dbb8fac7f05fafa585d3672d6de7d7db267a8e9f5e623838d0c46df5d"; - sha512.source = "1fab74d218ade9454924cff4345c55d6dde25d4350cd238834677d24be89ddc58ce7a610e089158281a472b102db3809979f25a57c0c31ce50dbfcef398a662a"; + sha512.run = "a36c81313224ac79fdd7d51f954aef437f011314061473455f0cc2be0cc52659c83400140a3b924a75c76d825b14ce3135e324438d9bf8830cf40a1c4d536a32"; + sha512.doc = "1aa94c8da8ca322cac0360205fc2724a9108aa0ebd3332fd0cd749123d7a1fde7467006595240e65937e0a6deb78a810efa677ce27b51ef62f5f15ebd620e593"; + sha512.source = "be5993e9addb0f22a0e618b934ba77e4169f5dac3f07ca8e3986ddd4a001c7483b52fb5b3f1575c5b07339c9227891dc7794653c9be5fe531c7375dbee43ca30"; hasRunfiles = true; - version = "2.4"; + version = "2.6"; }; "c-pascal" = { revision = 18337; @@ -4416,12 +4461,12 @@ tl: { # no indentation version = "2.4.2"; }; "calxxxx-yyyy" = { - revision = 53290; + revision = 57282; stripPrefix = 0; - sha512.run = "99c3eaa37d1502328352e67091390ea47e3bf1d3fbdf776bb885e06bc2613a1e3056db4344b2a6bf968ec146bc3e3d44c1edae6a56a37eb1a8e5225ad6f62a94"; - sha512.doc = "0fd575f4c4535bcf705acd8e3e4b091ccb1d3d1edcb8e6797bb2b5f891c95c8e7de439015d565d6be0098441abf175d96ab20351a5669237ebd846e37eaa65d4"; + sha512.run = "2e9355442fdf8c4389fc09c8966c5e6b72cfe2df1b3209ec698db686579bef9ab41c17a36bd9714b3e917a8bcbc8ae568ca34bc7112a5a39d00a5b2c5340ac65"; + sha512.doc = "849652e8def77d6f9f0d16f29753df5e5b9095bcfed9be8105294df7ddc26644d1784a27a8b203d9e6c295c0f1e7f58d36f17bf98752ec9ee26ac3ac5a2f361d"; hasRunfiles = true; - version = "20.20a"; + version = "20.21a"; }; "cancel" = { revision = 32508; @@ -4473,11 +4518,11 @@ tl: { # no indentation hasRunfiles = true; }; "caption" = { - revision = 56374; + revision = 56771; stripPrefix = 0; - sha512.run = "996c26f073fa88a4f167a757ef401f91a16ae1276b78aec02b0b86fbe90ab305366fed899fd8ac3be45d295abae6744fd7dc19303b79cb2c77d4278a8e1f5d16"; - sha512.doc = "6ffa5ca8ea4070b5be4a9d83a4612199736c32dfbd1f921c011d6351668088a547ee9e40b632d43dd141256f030a5abee67be99143922835f135a93d7dbf7de5"; - sha512.source = "25362d04b953eb18bd038030dee621accf05427621fc7c264d2e5b4b616c306d61632c8760d75db1a954fc46bb2c21d48d4dc09491af9dc4356e4498bf894f79"; + sha512.run = "d0e7276e6e84cabc85d64bc397fd2e4a258e913e4f78022ae40f3c7293e7f9b3f34dd011a944223507cb1555dbf2031dc563e34a5f7064e9903964bda5a893c3"; + sha512.doc = "50018fff476b99763a3373b9defdf9de854915af11cf37f3a00907483ac481b9a0709d23f6d3612ab754c3f079eda905c5fa3447f576dadcb65f83a5ae5a98e8"; + sha512.source = "5f961b0fb1a11d5f28d75f58331d0b79bb87800d4a5412c57a66c5693c07225a46e49cb42f8f0653e06a74e2c7de38660f99d89f12905892f47fda5ba6820826"; hasRunfiles = true; }; "carbohydrates" = { @@ -4489,11 +4534,11 @@ tl: { # no indentation version = "0.1"; }; "carlisle" = { - revision = 47876; + revision = 56753; stripPrefix = 0; - sha512.run = "d3e743a5e614479167ead02eabfefeffc8006e27c486fb5c57f1cb94278418f86db0431c752310bc1f7cda6dad22b1610edf4d24742391f6b743cad4ea050344"; - sha512.doc = "8d49c9d72669bffa042defaa53b4bdacf2e107753608747162947f05ad8438b9463afd905a376e462e6491293cf0c4a202e0b76db965854c19b97641d0a7d295"; - sha512.source = "83417675f97cd8235ad3a38f3e333596188e717573a8739e41c1041d1641e1e53d48f189f6c01a58509ea8ca1c5d755c56aeeb9842e205c9aa8a01cfc7f688e9"; + sha512.run = "679a07121b01b5ef1ad15b5713bf2b38374d49458d754eb204c914bc02dfd4ed429e30826efd980be0bfd1cefad7607804a04e8a820980877bea68286b23961f"; + sha512.doc = "55265a53e2ae899bb6f856626f155c96084328b7967e6c599e56d53faa5b746efda2f98b6f9b4571d7473da8c664799c259d2f052776b4da218dddc03265df2b"; + sha512.source = "350e30ed75ab3f6b3e33d4d0c16f84cc7cf887b022175437ab11bf561698c3d06d624f02971652ff370de1c4e6454e0a3cdbb75530e08bbf141ba9ef7298b942"; hasRunfiles = true; }; "carlito" = { @@ -4587,6 +4632,14 @@ tl: { # no indentation hasRunfiles = true; version = "0.2.7h"; }; +"causets" = { + revision = 57139; + stripPrefix = 0; + sha512.run = "3dbe4a3c2e5985dbb4a36134a3739adb97636086ad2c1d3f510e4607fb6a6d0d01cbd2d4e135835a9eb88d63128e3b9a4408bce3b910c406b47dad0d0b5c19b6"; + sha512.doc = "77f5ec1d8c16bb6d3772a78913825a1652c5130327e7851ddd16d5a5b0da9315e09dc113c880659b03d4263558781c36e1ed9ac546fabb9df88cfd4b4a3fb84b"; + hasRunfiles = true; + version = "1.1"; +}; "cbcoptic" = { revision = 16666; stripPrefix = 0; @@ -4656,13 +4709,13 @@ tl: { # no indentation hasRunfiles = true; }; "ccool" = { - revision = 55425; + revision = 56636; stripPrefix = 0; - sha512.run = "1e583f234c550f6479d51ed1607323beda8b580072a47c9833ce07427d60cf77fe23639b2d6eebaecd06b502dcfcef96157e6ada03fa64b82de03c1054389a77"; - sha512.doc = "28f7a031cd4268f7c153ec9217d2dcac4979b738b7d5de9e78a561b71ca6a38ca08b2072c8291296dd7df2694319a7966cc87d2aa5f0ee6259479123d0fd87a0"; - sha512.source = "14e36b0b3c86c750c049b313b01b1036a9ed3e2352aea5ffb1707e5cfa628c23c6144de6b22ecd68bbc1c120c06b76343ebab327609bc2b5cb6853695486ad27"; + sha512.run = "4571aa4b0d83f6651784f43e5b9b982a9d42494f9ddd5006a794d4eaa94c4217ef0e85ec2170eb2502c243c02b7b67f0e8dcacdf2ad2714f70e7f6cbbc24aa3b"; + sha512.doc = "99c777464f24e2cc5775a342d682f43686d13dd13db606c30126408de8521cf68ae62acdeecf351dee510ab6550b247100bbe6cfdc2e04cbd183270fc91c62af"; + sha512.source = "31f6f051fbff8806df6bc84c03fbf5b33440800cea7083b8d6d36e585140dfe24e7fbb192531614dc65d27f23f53e46349b0c020a2cddf4817fe9d3b7b23be44"; hasRunfiles = true; - version = "3.0"; + version = "3.1"; }; "cd" = { revision = 34452; @@ -4740,6 +4793,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"centerlastline" = { + revision = 56644; + stripPrefix = 0; + sha512.run = "a695c30f3b3db43c83e1ae592de9bf32b2856cca45561835e78a03808c7d3d3d8b71f4cb2cf6ecd82ff475012787f953320e4a6a5817ea384382741b7ac88cd1"; + sha512.doc = "850bd95a2ba3c9538e08163b34c900c045808ab69ab021fbb2068e1ab0fd3c5f29fca0b95864203b52704a3c33b81df7ab3cb46eb7296131fd49de71ad0fb876"; + sha512.source = "0463b1c97472750b66fed17bbe1c644b78da98ce4e02cda29cb58c4ad680124d5c5153c0b3714aaf43aab971fe38b471e7c801885d35434210d61dc43a316a43"; + hasRunfiles = true; + version = "1.0"; +}; "cesenaexam" = { revision = 44960; stripPrefix = 0; @@ -4939,13 +5001,13 @@ tl: { # no indentation version = "1.56"; }; "chemformula" = { - revision = 54158; + revision = 57206; stripPrefix = 0; deps."units" = tl."units"; - sha512.run = "fe66366d642c6e8d517303dd62d545ecbf6906f6d148efab38f058dd71986af54b92c7e61428bb025efe7d59740270b53f8d52af495da2c7f9522c476924170b"; - sha512.doc = "f9d92d3894dab9f8cfd0d3db680de6b97e014c13d153b16ac658da6e09d3308b924857902eddb264ca971c1919d205d4e2519d4fd4ac99185c3e9171d8d3e973"; + sha512.run = "6f1cbdeb8a7a30cf561febcc1232d92feadaa59c796a96881ebb04379c49804e8d39cc65dc96bba02d1843118fba347660e23906ea5633af6f00c4fb39388e60"; + sha512.doc = "61da2685650fa1652e20c97c4ed51930b133cfb137f3c1bf8dbe0477b22293693e6837c9545bed3175aa3722e8710441ca12d063bb36542b13e2cd413849cd32"; hasRunfiles = true; - version = "4.15j"; + version = "4.16"; }; "chemgreek" = { revision = 53437; @@ -4956,20 +5018,20 @@ tl: { # no indentation version = "1.1a"; }; "chemmacros" = { - revision = 54191; + revision = 56983; stripPrefix = 0; - sha512.run = "8e70d109cd203cea5c8424dc306d6c5c5ae96ee8c83adf605cc54215a68f70dd656a6c53ace711ab99255e7ea1fa7978a2ec5fff4585d885a3cfe7c0a0951f6f"; - sha512.doc = "357b7d8c3f5cc554ce86d71e2e31cc65307ae836d8bad177b4510ae4ed59b106f9dc85d4856ade241e5bab23cf2e4d4977942f2670b609167f627eed3d82d694"; + sha512.run = "9ca4d903e5d1126aa4f6fc6c07ea2efc86a5750883c354f3bcd48dbe3960ac3ea2cbc47626c67c8f8bec5343d7dd4d61aa548faa33cc42ab09d15011da551a2a"; + sha512.doc = "3482d6c49bf23bd604a2d0c4f506762c61abc1e2785cf83685af2f96006b9093886d51fed8c16a5e430b35f138ccbd35d183291208df47e1281b47d758d7d123"; hasRunfiles = true; - version = "5.11"; + version = "5.11a"; }; "chemnum" = { - revision = 52256; + revision = 57084; stripPrefix = 0; - sha512.run = "f16b41aec7baa6cb088c008b373ff648b8e801951528b24cbdfbe4ad4d54eab12c64a76e23521396bfcc8ff8cc3089f0da9cf9fad37526d1639547412038f5cf"; - sha512.doc = "b9dfe8de349ebcfbafa967668895dbe5bb14cc6f065711f56dbfa5ef771eefda79114cc994f6de2d5d45143740aa9e93543035dfbe6cf1c2628088927e06ab06"; + sha512.run = "d3f2072920568fa5ad91d95dfd811e20eab8bee1444ac73da2bfcbe479a14a274eb71a6445697b4a916fbfe8fca2938e873a6a72f2b1d4573f10841701a30fd3"; + sha512.doc = "0b9685f0130f8a8a7fcc45f20f648af48f95e6c5b3c282a0e9b0b488e080a2fd4ae4567126a8d6389cabc6f8757526cc6df58d8c5f5ac62d14867e89b1d90169"; hasRunfiles = true; - version = "1.2c"; + version = "1.3"; }; "chemplants" = { revision = 52863; @@ -5031,13 +5093,13 @@ tl: { # no indentation version = "1.15"; }; "chessboard" = { - revision = 51469; + revision = 56833; stripPrefix = 0; - sha512.run = "ed7a1d973992897fdb174ef4e250d78a6747e40a822e026b787fd0899f6465a6e845175028279b57f5e16c50162feeb8b1c833248ae3b073e32a8d63051ac0b0"; - sha512.doc = "586202bf2d2b8bade26af19170e5129da6a2f66f78e79880929d2df2b6a7971b8d3683fb79a3ea6863eeedddfee170c06bccce88ad96ca6c7d982aed43378084"; - sha512.source = "2dd479a4ab573894437ab551bd78a1b24cff7b2ed53d2a8ab444930afcc228844bb5932302e4975bab617ad24a824810851a979eafb2433bca9dc1289860d6cb"; + sha512.run = "9447eb4dd8712ccbb519f91e99ccd1c64cc0e9ba904bd46dd8c83ce03c31e5caddca8e76c2cfeeefd5946c8881b9e6b198d50c131a1e8d5622b054d1459865cc"; + sha512.doc = "1c2e8ab2776a247ab1cbaf5527e04392dbcd1eae3a9b1c6785223268d1811a778c0812a1a5437a15cf4bbf08ff28785a57da10c472dd7567f1f0217b2d7de556"; + sha512.source = "674ac2dd69312d3959bca053d5170bf98381ec70e3d688c991e276f07260c10ded70055b4f9b819fa0cefc8f1ac7850dd9df61d38a97b58c0fc05c824a42c3e5"; hasRunfiles = true; - version = "1.8"; + version = "1.9"; }; "chessfss" = { revision = 19440; @@ -5094,13 +5156,21 @@ tl: { # no indentation hasRunfiles = true; }; "chickenize" = { - revision = 45083; + revision = 57325; stripPrefix = 0; - sha512.run = "82df32cba5f14ea8de96020b2412d7c2b3939b0afc4f42bd91e957694404a12a8ea38c9260cf472d81e9aa776556e9b5cf97a674d23ad32633f4fdefe3b3bf83"; - sha512.doc = "6d29cddc0030de2ac6b82dde660e405916bb79bb1e18fd0579a66555d49062fde5d0fa327b906baa1556efd080c55b7ee181ed7569e96dab256ab2be27620935"; - sha512.source = "bd53aa09a1a136d36f92ea0e8625684361b31ab9315a9f987560f171e893c022122b64a086aa2952a9f1fb96b7931f4e248c016cce8f0ef488c94fcd33c5e8f4"; + sha512.run = "3cb2182717630c6d251a055021ff671eb930885e5b33978c0cd51176225b1743938447e3d761cfa83c9e3f46cbca1b5686c18f734a1ea5fef50a7ce48873ee0a"; + sha512.doc = "a2a7ccaa210583de7a765b940959ed4cc2678c6800b283c05f301814b69bb8c704394f8795a1824b41b03652e27106b9e47ed9d5a57179df685294fc3caa16f2"; + sha512.source = "614f105bf01bc1a36ece9ed319763a06fc2480bb5c5b1845f47b17ae1753e9fea5e4f25dab9b35cd493d2c6c31de1c636723b676269495d85829b683420b7e6d"; hasRunfiles = true; - version = "0.2.5"; + version = "0.3"; +}; +"chifoot" = { + revision = 57312; + stripPrefix = 0; + sha512.run = "492361fbe54dae9585b4d62eb1d3c3bf4a81ff8ca8020ad997cb9b30c673cfd8b35cf8ff8d742fe6c1ec7cf529e3ce558b9d5604851fc39c75d72d0fda37dc6d"; + sha512.doc = "34f5bed1ff3660a5fb1fdacb0ec26311fd47593ed6aa659d12eca8141262d9fa7d6c75b2601dc59a38ab02212269f0e69a5fb5da3d9ae1d884f25677f0f6b545"; + hasRunfiles = true; + version = "1.0"; }; "childdoc" = { revision = 49543; @@ -5111,6 +5181,14 @@ tl: { # no indentation hasRunfiles = true; version = "2.0"; }; +"chinese-jfm" = { + revision = 57227; + stripPrefix = 0; + sha512.run = "05e8a3e66fecdbddd76da58b9827595e8f70607655fc2695521f28e2741cf3e2b563aecb433fd5e0c55fb65496031650c8616475287f3b3bd54decbd610775cd"; + sha512.doc = "8e1314ee1bafe60b73b33e7f02587843b55f3d636647dfe7dba2f571675b78718254177263478094d7814eff421f319e48dfe9873b41b4491d9e5c1763aa3b0f"; + hasRunfiles = true; + version = "1.0.1"; +}; "chivo" = { revision = 54512; stripPrefix = 0; @@ -5245,20 +5323,20 @@ tl: { # no indentation version = "1.3"; }; "circuit-macros" = { - revision = 55089; + revision = 57308; stripPrefix = 0; - sha512.run = "b2251e0fbcdf7dcddf01c8001891d593fe018d269ee1d9ab3f4ae9c30dd63a2652dcea8652b82f1ee21130bdb308af870f4a3df26834f308a4ed5b025bfd2a2b"; - sha512.doc = "73bc7ceba825afc69659dd4572f0453b3ca125a5836cab8f5d25ceded4ca8bb3fb6a19a71c8505bed60cc613412538be6d2e5f17551b990e7a6a9e52eb2c7e3d"; + sha512.run = "38e9ed7362e27f836d3a364ea50f54593aac93f30b7a2b90a7bab9f0dd72f28a14cae86fd5d3dad2f47c00ef511afb458c2da29c5da203c3d65c9829b32aad52"; + sha512.doc = "44251146179c9021159523d00acc93969c1caeb92bd0efca9701d95804fe57c8ba218f41cdab878aad8b942cdb21ace7d0266ed7c7c9373d0eb9676b9e636492"; hasRunfiles = true; - version = "9.3"; + version = "9.5"; }; "circuitikz" = { - revision = 56594; + revision = 57245; stripPrefix = 0; - sha512.run = "3f18c02e92afe11c79d7770abc45e1fbdd1bcc145b098687842a242fd37d3426fcd7a10d81441a27d549b839c0bc8fa1ca780203c263a20a52304d1bb0c0c8ae"; - sha512.doc = "ab86ebbcd68a87a650b7985345e8e1b7e0c81ed6deef6fea51bd3ccf218c2f93865df5bd131bf83962ee1ee6b123febb1f680af07669147deb02954d2ebe8266"; + sha512.run = "ae21f013de9aebe73eaf0bbca06af0beb79ead977936f3ea1693aacb24de079702ad236c16550a57e80861579c91827d1d9cd3889d19fc2b9528364365162d85"; + sha512.doc = "c7639d36e3ec1f5a0f4847bd4c0184e45882c1c10c0a7f6e9ca3259e5db5a4d686024275249230d444b5bb8ba4d26ec99863a7241cbedbc1f2bbf442fe6ecfe7"; hasRunfiles = true; - version = "1.2.4"; + version = "1.2.7"; }; "cite" = { revision = 36428; @@ -5316,12 +5394,12 @@ tl: { # no indentation version = "4.8.4"; }; "cjk-gs-integrate" = { - revision = 54155; - sha512.run = "116b0762afb445d4d25a539f08f7f7e288ecea52556205290b654f3c1a8060b9e98c24cf8d48ba1b57901706d2a663ca7d0c06705571ad4c1381d0a9a838d94b"; - sha512.doc = "7e4196ecac219d6d6b5520490b3b4691329cabd16fedb62b8f4e2d70e5ddef19c4c5da64092d9cd708beb7954f819b9167cfcf773bee708e1df5bc46f9c815a8"; - sha512.source = "39a7990c8e91a5c19af2341b5ad56f83deb7a1bfbe88cc73bad36e735a563622401393f3cb70c47fd2806ecd7b44cfe4c4ded48f440606eb3cb03dd71995f8a6"; + revision = 57081; + sha512.run = "f2b8db61f861942df199cdb6e51ca7458f22d385396382bfda6291d2f2abe5555b6b35102629c4c0d478dc01b873ae917acf10b150bae7972a6fbb03ffd03f41"; + sha512.doc = "80f8054e0841bc5605faf0abd3b17ddd16919d0228d520af00c4117f884e1105e6b818d6ec92f312b38246f591f0e6743a76ff02ac05a9e93624e8f4bfaa31f4"; + sha512.source = "5d26311844626499997323d15806a31e5144b1dc6f6c18fc5dbab10f898382eff33dc316ac8429a3d76f57867720061cb8594d5c80510b7776dbad8970f0c0da"; hasRunfiles = true; - version = "20200307.0"; + version = "20201206.0"; }; "cjk-ko" = { revision = 40373; @@ -5682,12 +5760,12 @@ tl: { # no indentation version = "0.3"; }; "cochineal" = { - revision = 56418; + revision = 57176; stripPrefix = 0; - sha512.run = "99a2a1c6b330f5c9a7a74608ff48b5bdaee6fcaad63ae0cdd2c11b351329f0082e39bdd5b3c92252b8dd1ade3c94134b123987ee04597a4b62db13635cf5af1a"; - sha512.doc = "6fe723ad3b278afa6b73a56a28544f95ff27624f999f7b84681e8aea6cde8bd1457c2cf33654f94e1170345e543244a47e0a8deffe75d398a1e12e027e001f07"; + sha512.run = "a0414a08262cc0875b7df48b08b47a980cf58f0e0bbf75dab593a7d99a9002352c34c02eee411da667b379ee92df547f81caac399096098a197f183a53ff813f"; + sha512.doc = "5f51d54cfc3f04b0857223750ba841d72250219ae5259aaaed97b3870dcdf9af70d66f0f819abba09195b2691bf34c0185e42c2315d97363ef043500b85a96e4"; hasRunfiles = true; - version = "1.064"; + version = "1.065"; }; "codeanatomy" = { revision = 51627; @@ -6109,7 +6187,7 @@ tl: { # no indentation sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765"; }; "collection-fontsextra" = { - revision = 56407; + revision = 57261; stripPrefix = 0; deps."Asana-Math" = tl."Asana-Math"; deps."academicons" = tl."academicons"; @@ -6125,8 +6203,10 @@ tl: { # no indentation deps."antiqua" = tl."antiqua"; deps."antt" = tl."antt"; deps."archaic" = tl."archaic"; + deps."archivo" = tl."archivo"; deps."arev" = tl."arev"; deps."arimo" = tl."arimo"; + deps."arvo" = tl."arvo"; deps."asapsym" = tl."asapsym"; deps."ascii-font" = tl."ascii-font"; deps."aspectratio" = tl."aspectratio"; @@ -6255,6 +6335,7 @@ tl: { # no indentation deps."fouriernc" = tl."fouriernc"; deps."frcursive" = tl."frcursive"; deps."frederika2016" = tl."frederika2016"; + deps."frimurer" = tl."frimurer"; deps."garamond-libre" = tl."garamond-libre"; deps."garamond-math" = tl."garamond-math"; deps."genealogy" = tl."genealogy"; @@ -6285,6 +6366,7 @@ tl: { # no indentation deps."inconsolata" = tl."inconsolata"; deps."initials" = tl."initials"; deps."inriafonts" = tl."inriafonts"; + deps."inter" = tl."inter"; deps."ipaex-type1" = tl."ipaex-type1"; deps."iwona" = tl."iwona"; deps."jablantile" = tl."jablantile"; @@ -6352,6 +6434,7 @@ tl: { # no indentation deps."oldstandard" = tl."oldstandard"; deps."opensans" = tl."opensans"; deps."orkhun" = tl."orkhun"; + deps."oswald" = tl."oswald"; deps."overlock" = tl."overlock"; deps."pacioli" = tl."pacioli"; deps."paratype" = tl."paratype"; @@ -6361,6 +6444,7 @@ tl: { # no indentation deps."playfair" = tl."playfair"; deps."plex" = tl."plex"; deps."plex-otf" = tl."plex-otf"; + deps."plimsoll" = tl."plimsoll"; deps."poiretone" = tl."poiretone"; deps."poltawski" = tl."poltawski"; deps."prodint" = tl."prodint"; @@ -6392,6 +6476,7 @@ tl: { # no indentation deps."starfont" = tl."starfont"; deps."staves" = tl."staves"; deps."step" = tl."step"; + deps."stepgreek" = tl."stepgreek"; deps."stickstoo" = tl."stickstoo"; deps."stix" = tl."stix"; deps."stix2-otf" = tl."stix2-otf"; @@ -6425,7 +6510,7 @@ tl: { # no indentation deps."yfonts-t1" = tl."yfonts-t1"; deps."yinit-otf" = tl."yinit-otf"; deps."zlmtt" = tl."zlmtt"; - sha512.run = "d0bec50d85039bc9e619f0ead1426869591a0163069a1391620ae63ddaa121ce9506eac06a441a73981f95860506be680c45e31fa499558c9c712de881b0140e"; + sha512.run = "a029c987592a77b94421648fcd10d085135a6518ed1dccd085c628d2d1025b081364ab4824cf571261a20146e26ef063f61030ca33be154f9160383929a27f0e"; }; "collection-fontsrecommended" = { revision = 54074; @@ -6467,10 +6552,11 @@ tl: { # no indentation sha512.run = "eaa6e54780a0813a88102258ee3bd7a4640787be0b89eff4ba2c9cc19298bf3e2799ffab4e03e49f20131d07fbac9f601a7223fc1b47257dd0feeb04797c56a8"; }; "collection-fontutils" = { - revision = 54074; + revision = 57089; stripPrefix = 0; deps."accfonts" = tl."accfonts"; deps."afm2pl" = tl."afm2pl"; + deps."albatross" = tl."albatross"; deps."collection-basic" = tl."collection-basic"; deps."dosepsbin" = tl."dosepsbin"; deps."dvipsconfig" = tl."dvipsconfig"; @@ -6486,7 +6572,7 @@ tl: { # no indentation deps."psutils" = tl."psutils"; deps."t1utils" = tl."t1utils"; deps."ttfutils" = tl."ttfutils"; - sha512.run = "b7b908d87f1fb38ee1145c820c01aecb6a61b0d2b706278f8662f0f08377335b13d0809ef6a1da8c8dd2ace32a028233a08e4dffa38e293e14e3288894c2057c"; + sha512.run = "9bc0964c2ce55e4bcab2b2ad0ae1c784a49ffc981620ef3cd549052a5e2b201325ddc444d9afbe57da6dc64d1890d61be5e97caa2c9c63ebbafc5f5d0322acae"; }; "collection-formatsextra" = { revision = 54074; @@ -6514,7 +6600,7 @@ tl: { # no indentation sha512.run = "7700a6cc293a1d45208794db34a276d5de5c975fe91cb00e5b1896515f288b05437344f00997501a54ad2af515bccc983930a75ddda55c6951edc625cd6bda35"; }; "collection-games" = { - revision = 55821; + revision = 56623; stripPrefix = 0; deps."bartel-chess-fonts" = tl."bartel-chess-fonts"; deps."chess" = tl."chess"; @@ -6542,6 +6628,7 @@ tl: { # no indentation deps."othelloboard" = tl."othelloboard"; deps."pas-crosswords" = tl."pas-crosswords"; deps."psgo" = tl."psgo"; + deps."realtranspose" = tl."realtranspose"; deps."reverxii" = tl."reverxii"; deps."rubik" = tl."rubik"; deps."schwalbe-chess" = tl."schwalbe-chess"; @@ -6553,7 +6640,7 @@ tl: { # no indentation deps."sudokubundle" = tl."sudokubundle"; deps."xq" = tl."xq"; deps."xskak" = tl."xskak"; - sha512.run = "29a3739c9a0f5cd066b6013f60b28aafae66566449e3f7b2715cf487aea221016806e5e95818c413eb2faebc99822c823806cf1f774659dc5932b69e575f3c72"; + sha512.run = "654787f158be7c9d7b019fb7091b8c9f7d4319262fc21f5e324c52e7484b4bcec3a6f211a60a2b13abfe964e09f7eb69b94ab8ef8a3a598fd50dcb587e3ca813"; }; "collection-humanities" = { revision = 56575; @@ -6776,10 +6863,11 @@ tl: { # no indentation sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67"; }; "collection-langenglish" = { - revision = 55930; + revision = 57292; 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"; deps."around-the-bend" = tl."around-the-bend"; @@ -6825,6 +6913,7 @@ tl: { # no indentation deps."plain-doc" = tl."plain-doc"; deps."short-math-guide" = tl."short-math-guide"; deps."simplified-latex" = tl."simplified-latex"; + deps."startlatex2e" = tl."startlatex2e"; deps."svg-inkscape" = tl."svg-inkscape"; deps."tamethebeast" = tl."tamethebeast"; deps."tds" = tl."tds"; @@ -6841,10 +6930,10 @@ tl: { # no indentation deps."visualfaq" = tl."visualfaq"; deps."webguide" = tl."webguide"; deps."xetexref" = tl."xetexref"; - sha512.run = "fa6f50f7c512250eeb9019432a7746c28b35b478948b155e395af9fa90ea683b8a556e3df03bbcc41eba010517d5a717ea0bdcef9f7f90514a603ce8410d2df1"; + sha512.run = "27b95358a9d963320bb6c0210ebdfe1d0057b1c17ce60c78e18dddaeb32515e763c396e046736f5803003ba175f73495ebcd3a32dcdc2ff17096cf3d01e42b68"; }; "collection-langeuropean" = { - revision = 54568; + revision = 56895; stripPrefix = 0; deps."armtex" = tl."armtex"; deps."babel-albanian" = tl."babel-albanian"; @@ -6910,9 +6999,10 @@ tl: { # no indentation deps."lshort-slovenian" = tl."lshort-slovenian"; deps."lshort-turkish" = tl."lshort-turkish"; deps."nevelok" = tl."nevelok"; + deps."rojud" = tl."rojud"; deps."swebib" = tl."swebib"; deps."turkmen" = tl."turkmen"; - sha512.run = "42f3794f5ba9859b401516a6ba5fc7d52534da01d58ef96940f478c809d6d84918c9d5b4d573d518ff746e0884d3ed339c18c8d9c981004006193c6a0fe1376b"; + sha512.run = "f66542d8abfa38917bc3455e132c276a42d1688c54abeb28eeb03447a10353ea648c45d1bcc5d1bb2ce17186dde15eeb3d963a1627c2e553a6eb5042403082cc"; }; "collection-langfrench" = { revision = 56051; @@ -7261,7 +7351,7 @@ tl: { # no indentation sha512.run = "88bdc5cefd5519bc80e50e2d808abf32aae8f7c730023afab3babb82ab817dc034c78d42b4143135df187343de7164a8fd94dc95c5ec8909e317a2f5628de15e"; }; "collection-latex" = { - revision = 56507; + revision = 57048; stripPrefix = 0; deps."ae" = tl."ae"; deps."amscls" = tl."amscls"; @@ -7297,6 +7387,7 @@ tl: { # no indentation deps."kvsetkeys" = tl."kvsetkeys"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; + deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-bin" = tl."latex-bin"; deps."latex-fonts" = tl."latex-fonts"; @@ -7319,10 +7410,10 @@ tl: { # no indentation deps."tools" = tl."tools"; deps."uniquecounter" = tl."uniquecounter"; deps."url" = tl."url"; - sha512.run = "493b72a28c23a194126feafd9e60dc6e4203e8c8db803f80e0015a20c5318f70682b7e2a226813cbea80f0e5e6529ddd9711174d9b813bdfd67b60092ee3d00c"; + sha512.run = "0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35a0e5c77fbe41bbb6fa33610321f2620624264d99675e2f88e72f9d156693143a7e"; }; "collection-latexextra" = { - revision = 56539; + revision = 57324; stripPrefix = 0; deps."2up" = tl."2up"; deps."ESIEEcv" = tl."ESIEEcv"; @@ -7372,6 +7463,7 @@ tl: { # no indentation deps."askinclude" = tl."askinclude"; deps."assignment" = tl."assignment"; deps."assoccnt" = tl."assoccnt"; + deps."association-matrix" = tl."association-matrix"; deps."atenddvi" = tl."atenddvi"; deps."attachfile" = tl."attachfile"; deps."aurl" = tl."aurl"; @@ -7420,6 +7512,7 @@ tl: { # no indentation deps."bigfoot" = tl."bigfoot"; deps."bigints" = tl."bigints"; deps."biochemistry-colors" = tl."biochemistry-colors"; + deps."bithesis" = tl."bithesis"; deps."bizcard" = tl."bizcard"; deps."blindtext" = tl."blindtext"; deps."blkarray" = tl."blkarray"; @@ -7477,6 +7570,7 @@ tl: { # no indentation deps."cellspace" = tl."cellspace"; deps."censor" = tl."censor"; deps."centeredline" = tl."centeredline"; + deps."centerlastline" = tl."centerlastline"; deps."changebar" = tl."changebar"; deps."changelayout" = tl."changelayout"; deps."changelog" = tl."changelog"; @@ -7517,6 +7611,7 @@ tl: { # no indentation deps."collection-latexrecommended" = tl."collection-latexrecommended"; deps."collection-pictures" = tl."collection-pictures"; deps."colophon" = tl."colophon"; + deps."color-edits" = tl."color-edits"; deps."colordoc" = tl."colordoc"; deps."colorinfo" = tl."colorinfo"; deps."coloring" = tl."coloring"; @@ -7578,6 +7673,7 @@ tl: { # no indentation deps."dashundergaps" = tl."dashundergaps"; deps."dataref" = tl."dataref"; deps."datatool" = tl."datatool"; + deps."datax" = tl."datax"; deps."dateiliste" = tl."dateiliste"; deps."datenumber" = tl."datenumber"; deps."datetime" = tl."datetime"; @@ -7669,6 +7765,7 @@ tl: { # no indentation deps."easy" = tl."easy"; deps."easy-todo" = tl."easy-todo"; deps."easyfig" = tl."easyfig"; + deps."easyfloats" = tl."easyfloats"; deps."easyformat" = tl."easyformat"; deps."easylist" = tl."easylist"; deps."easyreview" = tl."easyreview"; @@ -7824,6 +7921,7 @@ tl: { # no indentation deps."framed" = tl."framed"; deps."frankenstein" = tl."frankenstein"; deps."frege" = tl."frege"; + deps."froufrou" = tl."froufrou"; deps."ftcap" = tl."ftcap"; deps."ftnxtra" = tl."ftnxtra"; deps."fullblck" = tl."fullblck"; @@ -7879,6 +7977,7 @@ tl: { # no indentation deps."graphbox" = tl."graphbox"; deps."graphicx-psmin" = tl."graphicx-psmin"; deps."graphicxbox" = tl."graphicxbox"; + deps."graphpaper" = tl."graphpaper"; deps."grayhints" = tl."grayhints"; deps."grfpaste" = tl."grfpaste"; deps."grid" = tl."grid"; @@ -8139,6 +8238,7 @@ tl: { # no indentation deps."mversion" = tl."mversion"; deps."mwe" = tl."mwe"; deps."mycv" = tl."mycv"; + deps."mylatex" = tl."mylatex"; deps."mylatexformat" = tl."mylatexformat"; deps."nag" = tl."nag"; deps."nameauth" = tl."nameauth"; @@ -8194,6 +8294,7 @@ tl: { # no indentation deps."optidef" = tl."optidef"; deps."optional" = tl."optional"; deps."options" = tl."options"; + deps."orcidlink" = tl."orcidlink"; deps."outline" = tl."outline"; deps."outliner" = tl."outliner"; deps."outlines" = tl."outlines"; @@ -8225,6 +8326,7 @@ tl: { # no indentation deps."pauldoc" = tl."pauldoc"; deps."pawpict" = tl."pawpict"; deps."pax" = tl."pax"; + deps."pbalance" = tl."pbalance"; deps."pbox" = tl."pbox"; deps."pbsheet" = tl."pbsheet"; deps."pdf14" = tl."pdf14"; @@ -8273,6 +8375,7 @@ tl: { # no indentation deps."powerdot" = tl."powerdot"; deps."ppr-prv" = tl."ppr-prv"; deps."practicalreports" = tl."practicalreports"; + deps."prelim2e" = tl."prelim2e"; deps."preprint" = tl."preprint"; deps."pressrelease" = tl."pressrelease"; deps."prettyref" = tl."prettyref"; @@ -8372,6 +8475,7 @@ tl: { # no indentation deps."semantex" = tl."semantex"; deps."semantic" = tl."semantic"; deps."semantic-markup" = tl."semantic-markup"; + deps."semesterplanner" = tl."semesterplanner"; deps."semioneside" = tl."semioneside"; deps."semproc" = tl."semproc"; deps."semtex" = tl."semtex"; @@ -8403,8 +8507,10 @@ tl: { # no indentation deps."sitem" = tl."sitem"; deps."skb" = tl."skb"; deps."skdoc" = tl."skdoc"; + deps."skeldoc" = tl."skeldoc"; deps."skeycommand" = tl."skeycommand"; deps."skeyval" = tl."skeyval"; + deps."skills" = tl."skills"; deps."skrapport" = tl."skrapport"; deps."slantsc" = tl."slantsc"; deps."smalltableof" = tl."smalltableof"; @@ -8457,6 +8563,7 @@ tl: { # no indentation deps."svn-multi" = tl."svn-multi"; deps."svn-prov" = tl."svn-prov"; deps."svninfo" = tl."svninfo"; + deps."swfigure" = tl."swfigure"; deps."syntax" = tl."syntax"; deps."syntrace" = tl."syntrace"; deps."synttree" = tl."synttree"; @@ -8652,10 +8759,10 @@ tl: { # no indentation deps."zref" = tl."zref"; deps."zwgetfdate" = tl."zwgetfdate"; deps."zwpagelayout" = tl."zwpagelayout"; - sha512.run = "7251735eba465bf564b320ca79b725156618032c140e1331226cc7acc25575bd29e427aabe1d89054a8ef9c9811b51d9f899d852c6d095f312cc38801d7820d8"; + sha512.run = "1b522a670468b91abded5a379b4636f95a6cb6fc8b028c8beceb43543957b301b5f2e8ad6100dfc00839107b01386623d5b7d81204949bd1dc8c31236f393aa1"; }; "collection-latexrecommended" = { - revision = 54074; + revision = 57048; stripPrefix = 0; deps."anysize" = tl."anysize"; deps."attachfile2" = tl."attachfile2"; @@ -8672,6 +8779,7 @@ tl: { # no indentation deps."etoolbox" = tl."etoolbox"; deps."euenc" = tl."euenc"; deps."euler" = tl."euler"; + deps."everyshi" = tl."everyshi"; deps."extsizes" = tl."extsizes"; deps."fancybox" = tl."fancybox"; deps."fancyref" = tl."fancyref"; @@ -8688,7 +8796,6 @@ tl: { # no indentation deps."jknapltx" = tl."jknapltx"; deps."koma-script" = tl."koma-script"; deps."l3experimental" = tl."l3experimental"; - deps."l3packages" = tl."l3packages"; deps."latexbug" = tl."latexbug"; deps."lineno" = tl."lineno"; deps."listings" = tl."listings"; @@ -8727,10 +8834,10 @@ tl: { # no indentation deps."xkeyval" = tl."xkeyval"; deps."xltxtra" = tl."xltxtra"; deps."xunicode" = tl."xunicode"; - sha512.run = "dfab2d2976b532689105fcc1a4081f86faa400af78dbd089bdf1f26e7d5f4fecf4b432cd46219cc275603181b9b42c969e4775a21afa87d9c5870230a4b88c8a"; + sha512.run = "48c907513c676435bfe0ba08c4be0be50eb4eb04d2fc8e8db4e39ea98dbe61ee7000b643b914dff12f230df8ca4501c5ed7fb918125d0d9eb36f1b03fd7803b7"; }; "collection-luatex" = { - revision = 56210; + revision = 57257; stripPrefix = 0; deps."addliga" = tl."addliga"; deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua"; @@ -8738,6 +8845,7 @@ tl: { # no indentation deps."bezierplot" = tl."bezierplot"; deps."checkcites" = tl."checkcites"; deps."chickenize" = tl."chickenize"; + deps."chinese-jfm" = tl."chinese-jfm"; deps."cloze" = tl."cloze"; deps."collection-basic" = tl."collection-basic"; deps."combofont" = tl."combofont"; @@ -8785,10 +8893,11 @@ tl: { # no indentation deps."spelling" = tl."spelling"; deps."stricttex" = tl."stricttex"; deps."typewriter" = tl."typewriter"; - sha512.run = "e896f6bfbda00f8e75911588fa1b9aa1edd08d9f88d29cecf6a48a7c625b69d4c2ec3c64ad40d7072686098dbb91d125e11fc1d0990f632c7ff67a2ee597e06c"; + deps."uninormalize" = tl."uninormalize"; + sha512.run = "b9ca96993591c1ea819387646d7e2bdb637d7bc56b807cd1787c199fbbdb03e01f4fbe35edda68fe0a0388e5e176aa2d51871f8b902f39a42b477686d7e2f3ff"; }; "collection-mathscience" = { - revision = 56164; + revision = 56872; stripPrefix = 0; deps."12many" = tl."12many"; deps."SIstyle" = tl."SIstyle"; @@ -8822,6 +8931,7 @@ tl: { # no indentation deps."bytefield" = tl."bytefield"; deps."calculation" = tl."calculation"; deps."cascade" = tl."cascade"; + deps."causets" = tl."causets"; deps."ccfonts" = tl."ccfonts"; deps."ccool" = tl."ccool"; deps."chemarrow" = tl."chemarrow"; @@ -8897,6 +9007,7 @@ tl: { # no indentation deps."ionumbers" = tl."ionumbers"; deps."isomath" = tl."isomath"; deps."jkmath" = tl."jkmath"; + deps."jupynotex" = tl."jupynotex"; deps."karnaugh" = tl."karnaugh"; deps."karnaugh-map" = tl."karnaugh-map"; deps."karnaughmap" = tl."karnaughmap"; @@ -8942,6 +9053,7 @@ tl: { # no indentation deps."pm-isomath" = tl."pm-isomath"; deps."polexpr" = tl."polexpr"; deps."prftree" = tl."prftree"; + deps."principia" = tl."principia"; deps."proba" = tl."proba"; deps."proof-at-the-end" = tl."proof-at-the-end"; deps."prooftrees" = tl."prooftrees"; @@ -9003,7 +9115,7 @@ tl: { # no indentation deps."youngtab" = tl."youngtab"; deps."yquant" = tl."yquant"; deps."ytableau" = tl."ytableau"; - sha512.run = "aeab82783e3bac3dfc43024541e4573cbcab5f007f541feae420fd975bc56d084634a785ba7ec7a84dddfa7505b360c1ee64e6d4f6eff7b19964f95e85c9d10d"; + sha512.run = "9a7f87647d443c7e716240d2f1ab2f2d9a49661ca63d2e53742404d7faca97c25636cbe730c761322f941cb1183197f156e39ee2693d023da480e0a5da34d022"; }; "collection-metapost" = { revision = 50293; @@ -9094,7 +9206,7 @@ tl: { # no indentation sha512.run = "bd76efc0bdec2bca391cb687a379c53f08beb55bd3ec8d781743296999cb5ea3ec31cc06550dacaea61f3cc9cedd7bce43b27f3f935386c0271eb1a5befd11ed"; }; "collection-pictures" = { - revision = 55827; + revision = 57225; stripPrefix = 0; deps."adigraph" = tl."adigraph"; deps."aobs-tikz" = tl."aobs-tikz"; @@ -9213,6 +9325,7 @@ tl: { # no indentation deps."prerex" = tl."prerex"; deps."productbox" = tl."productbox"; deps."ptolemaicastronomy" = tl."ptolemaicastronomy"; + deps."puyotikz" = tl."puyotikz"; deps."pxpgfmark" = tl."pxpgfmark"; deps."qcircuit" = tl."qcircuit"; deps."qrcode" = tl."qrcode"; @@ -9234,10 +9347,12 @@ tl: { # no indentation deps."spath3" = tl."spath3"; deps."spectralsequences" = tl."spectralsequences"; deps."swimgraf" = tl."swimgraf"; + deps."syntaxdi" = tl."syntaxdi"; deps."table-fct" = tl."table-fct"; deps."texdraw" = tl."texdraw"; deps."ticollege" = tl."ticollege"; deps."tikz-3dplot" = tl."tikz-3dplot"; + deps."tikz-among-us" = tl."tikz-among-us"; deps."tikz-bayesnet" = tl."tikz-bayesnet"; deps."tikz-cd" = tl."tikz-cd"; deps."tikz-dependency" = tl."tikz-dependency"; @@ -9291,11 +9406,12 @@ tl: { # no indentation deps."tqft" = tl."tqft"; deps."tsemlines" = tl."tsemlines"; deps."tufte-latex" = tl."tufte-latex"; + deps."utfsym" = tl."utfsym"; deps."venndiagram" = tl."venndiagram"; deps."visualpstricks" = tl."visualpstricks"; deps."xpicture" = tl."xpicture"; deps."xypic" = tl."xypic"; - sha512.run = "8e08a60ca96ceb9f9395770a93860baaea5d54477c49096d7660a2709c8f3af49e1c67779056e38a39b79ac0b38eb1bf938b909dd60c91a17c7464b245f7fb31"; + sha512.run = "3b735c7bae49002ee7056fda3e0a10d24d9101bc6080571a6983a94b5bab30defb022f6b5986de5f9fa3cd66715b68f18ab9fd372f1bed58cbf70388757b4048"; }; "collection-plaingeneric" = { revision = 56496; @@ -9526,7 +9642,7 @@ tl: { # no indentation sha512.run = "653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3dcefbf0238f1b2757297ac37ec6cbd4a05283c0bfc03d6e153e57f4be23ca8f87f"; }; "collection-publishers" = { - revision = 56590; + revision = 57312; stripPrefix = 0; deps."IEEEconf" = tl."IEEEconf"; deps."IEEEtran" = tl."IEEEtran"; @@ -9570,6 +9686,7 @@ tl: { # no indentation deps."cascadilla" = tl."cascadilla"; deps."cesenaexam" = tl."cesenaexam"; deps."chem-journal" = tl."chem-journal"; + deps."chifoot" = tl."chifoot"; deps."chs-physics-report" = tl."chs-physics-report"; deps."cje" = tl."cje"; deps."classicthesis" = tl."classicthesis"; @@ -9646,11 +9763,13 @@ tl: { # no indentation deps."mcmthesis" = tl."mcmthesis"; deps."mentis" = tl."mentis"; deps."mlacls" = tl."mlacls"; + deps."mluexercise" = tl."mluexercise"; deps."mnras" = tl."mnras"; deps."modeles-factures-belges-assocs" = tl."modeles-factures-belges-assocs"; deps."msu-thesis" = tl."msu-thesis"; deps."mucproc" = tl."mucproc"; deps."mugsthesis" = tl."mugsthesis"; + deps."muling" = tl."muling"; deps."musuos" = tl."musuos"; deps."muthesis" = tl."muthesis"; deps."mynsfc" = tl."mynsfc"; @@ -9761,10 +9880,11 @@ tl: { # no indentation deps."vancouver" = tl."vancouver"; deps."wsemclassic" = tl."wsemclassic"; deps."xduthesis" = tl."xduthesis"; + deps."xmuthesis" = tl."xmuthesis"; deps."yathesis" = tl."yathesis"; deps."yazd-thesis" = tl."yazd-thesis"; deps."york-thesis" = tl."york-thesis"; - sha512.run = "5a1e89da355bc14c2faab559707a87876c822368796a57b661e7567d0ddf9f2826369de1392406ad957ea836e5660d46e7479a2b5a1f63b5a7f257ac7f4ac61c"; + sha512.run = "22a96671004c2a06fd5935793ee274ec06f3801b18ad6b3af8181667ba37eead921b84e4e1d1206f213a5ea4ccdaaa7082e8fa3b8923c266389bbda4d34e3da4"; }; "collection-texworks" = { revision = 54074; @@ -9843,6 +9963,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"color-edits" = { + revision = 56707; + stripPrefix = 0; + sha512.run = "e1023d734b7c8c2c781fd037f29a8c845a45fcd1c62d7880d51755bf943dba142fee040c2f0b9bea2ef6986818b5f67126ff468639c0d962d0a779f6840fb1c7"; + sha512.doc = "17322e4a1e9cd8cd6043a37e0c06bca019b887aad0100367b0c99b70fe3043d32568b5cf587cb42d0bdfe77cf18bf222fba126833d9a61789bba88bd121dbc4c"; + sha512.source = "b23f1893840a3a2a8d5a77386515c224656ca0c82aec3eb82209c862ebb222e8a2cdf4942bce3d43f4538bd380f9518fe031f08259dd063578760431a6230f10"; + hasRunfiles = true; + version = "1.1"; +}; "colordoc" = { revision = 18270; stripPrefix = 0; @@ -10808,9 +10937,12 @@ tl: { # no indentation hasRunfiles = true; }; "cslatex" = { - revision = 56548; + revision = 57318; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."cm" = tl."cm"; deps."csplain" = tl."csplain"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3kernel" = tl."l3kernel"; @@ -10819,34 +10951,33 @@ tl: { # no indentation deps."latex-fonts" = tl."latex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "8f8269473c2614094f5a04baf565a0df238d2422e4893bdad3d4af2bb94103c5d3a84f8359b42228fee4c1224bb3c65ab8362edd1d59719f16831cbc47a625fe"; - sha512.doc = "3972c41bc4831687e4feec3485c5ee93c497ad8e55e1b48c6e159887990675142e4e14278cfc17e7e555c60d5a8924d1150db94a9da3175655803c88fdd89973"; - sha512.source = "97eb8e87a3fc60c3aefdb7467ca3707543f2037234fb19d23ce451bc4b89fe1b8642affc592bd4398706f37952d7c3dbc1fea8d1b51a5dc92a8b573955064656"; + sha512.run = "a63f7481b5bc260ef470f69a443c9087a16ce0b6ba861f51ec75716648d72cdda2877a8322985da2666262de8c535fc56c8bc6e714d3a933ad96dc32931d8051"; + sha512.doc = "b024a1607f7c24a0d4b8241b054b3670fe5fe6796ebf3241d7db726f322912c2104f869049f36511ab1a26dc3230c2e472f77979348ad6898508c51a04f7759f"; + sha512.source = "c2d9b4c3049ae6533b272092e2f6d94bb77b65fd8421ddfff1c94dbe0ca8e6d1e7ddadab43afbf6817402bb6dd3aeba36ceacbd42937c0b61740c6f7efe5bef9"; hasRunfiles = true; }; "csplain" = { - revision = 54699; + revision = 57318; deps."cm" = tl."cm"; deps."cs" = tl."cs"; deps."enctex" = tl."enctex"; - deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."luatex" = tl."luatex"; deps."luatex85" = tl."luatex85"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; - sha512.run = "872a7456edf6aa1ae8bc124bba2a80c3e4634f663722efeb40e04ad5e5850ca68f6d298e8e35a13f3430413baef9510352a07e92b1d87a7cd2f1651061f2b174"; + sha512.run = "46a387cc8b21c6cc9bc61ca892fba1db8bde4d948ce7a4e5b7cf699c988ffbdb58e9bdaa4941ec5c8d36f0c1b9c53d1cf7bc4555e72b92420033520588da12e9"; hasRunfiles = true; }; "csquotes" = { - revision = 53041; + revision = 57332; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; - sha512.run = "541cefb84ffcb6a398c18d01cab5d7c96bfaa82841b9439c1f77f3b2b4904e0a37fe2e2b355777e4552fdff3ebb054daae9d9d9a6c7436746f44917095be119c"; - sha512.doc = "84407b58454e4e4b235d93b01bef99f7a20a5de4ebac4990c9e00694a14dd67debe27afb6f3a079040330af3ab186db11f1150e97fa9511e782e55c4abe52bcf"; + sha512.run = "d5a4ecc3202499582a7c4c03de006c6380d82754ff76b75883d5ad9eab9d1f724b76c6ab77b9efccbeaaeb5c0953cd3097ca114bd361ce8adbcc60bddb33f7da"; + sha512.doc = "c7496f8e09034c157159bfe1d465ac13e3d80e113deb83429cd09508e5389173c8e0a5c67e612b32cb06d109b6161e808d9fbdbab18a1a8724f250c5c0934c39"; hasRunfiles = true; - version = "5.2j"; + version = "5.2k"; }; "csquotes-de" = { revision = 23371; @@ -10948,7 +11079,7 @@ tl: { # no indentation version = "1.2c"; }; "ctex" = { - revision = 56166; + revision = 56705; stripPrefix = 0; deps."adobemapping" = tl."adobemapping"; deps."atbegshi" = tl."atbegshi"; @@ -10987,11 +11118,11 @@ tl: { # no indentation deps."zhmetrics" = tl."zhmetrics"; deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; deps."zhnumber" = tl."zhnumber"; - sha512.run = "69357cbdfe3548de29ce0b25622b76bfef0b433a62cefe2df2173ec8efcd02fdb4d5849cdc20eedca42f6bf668f748af2993272d274179c62adb53f6e2ad1361"; - sha512.doc = "d0e3d529ee3936cc5536b805f02268c3d1f8bfb6d50ce20b7af8b9ca14f3e3860ebb3734d55e1abe4c065dddf33623ae9e11038cf3d37948176906ff4756f562"; - sha512.source = "32039d32ecb811f8a9760af66bcada456c5c7e8c9d760920be45e86f2a8acda55c093ddf0dd67d5ad13156b54c20dfad8b372eb5ff53443b4c420fd29f58796d"; + sha512.run = "0a2c781a1dde017535ea622525413f7fddc77d6769d3b9be573877b6909850c1d932bb163adbc07363803f5ee02f07453911a7bfda216867d72f67bce49bbc1d"; + sha512.doc = "0fc122d8cce8da89227314905dc029f5599610831df5b7f53ac45b5c8dba4f275413fe650e0eba9e23726a6570048e11fd78853e3e734f9dca08dbfed6655eef"; + sha512.source = "3e3ed53b303e98e38af90bdc00803310678eaad07a34d151108977a16e7fe4f9faac4afba25d825384dd7fd9423694fa656f666fccd9d57e850a04302310f141"; hasRunfiles = true; - version = "2.5.4"; + version = "2.5.5"; }; "ctex-faq" = { revision = 15878; @@ -11072,13 +11203,13 @@ tl: { # no indentation version = "1.16"; }; "curve2e" = { - revision = 56538; + revision = 57180; stripPrefix = 0; - sha512.run = "319c3b6a3b9d0b1886ed0e5c9396c5a2ca8d24cdad6252136c4bcb87869a4fb7c0ba06544add5ee16414cc8fb4a5c9552a0aafa7c9d8df253fa00d3b0f1a34be"; - sha512.doc = "a76b224e5a64f82cd50339ad6a87e06f7a0db65294e3a8b6e69972e161211bf48114a23492e306ee25981b6725f06efd9821d56e228949e04105fdb80bb32d11"; - sha512.source = "8a446660a08991f1c795e0353c4db2813e5e679b948d18755a69495b045e3604338da123e4d33f9608d4a60f149aff3670aae4c28cdcb1ef67b03ffddd251ff5"; + sha512.run = "deaeb4ce69687eef683794d1ce1669552b8f2e76dfaae480b68c1d6fff47aedca9d21460a4a56a4ba058cf12787157e4429bb4fe8c3ede866b8379eee3e84627"; + sha512.doc = "1a98a4a5fcbe70ef2e1ba3f79e83195673f7588e53c41311a6e3efadc78b70359e0fcb000f3a1f412f228a597662c2268f64e196eb3243f378b114847b8596b2"; + sha512.source = "f66027bd0f8b7fdd658ff0f7b2ddc7636445c9f8795292d944edd1acaa28c66d7edf9f33673e42b6462b69270c8989dcd1356cb7a2893baa52b76714252f7046"; hasRunfiles = true; - version = "2.2.10"; + version = "2.2.13"; }; "curves" = { revision = 45255; @@ -11258,6 +11389,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.32"; }; +"datax" = { + revision = 57033; + stripPrefix = 0; + sha512.run = "f8eda309dcff2ea8fd827cf3dd5c15ea265105234e33f96e27c14316e5e4183ade4c6a240b174df3564fcc1a4046ba3ada482a6fae653ffb5e43e18682852336"; + sha512.doc = "e4257e66220e0048df198d60a963524187d7373ab7394f4b33944251f534f67648110a8cfda588a992500c381470dee55423be6c224a4e3cd08cf4e633bc0d3d"; + sha512.source = "c47641c49bf9c1dc0e47eb8045920cdd0e519c07eb18efa047fb7c2a6122166a4e8bc793adfd3db8373b77be901dc6cc8501f5bc9dcf895ed3bce3a261b55671"; + hasRunfiles = true; + version = "1.1.1"; +}; "dateiliste" = { revision = 27974; stripPrefix = 0; @@ -11707,9 +11847,9 @@ tl: { # no indentation version = "0.2"; }; "de-macro" = { - revision = 55766; - sha512.run = "36d6d47e8d2e04f6f6acbd46c9ad87e7b2e2f2f2dec9f5a06247e6955bf0a8efb3eb1593b6534b8e16049d00a3e66207e1627fd241d98b661dfd78b9f30b18e1"; - sha512.doc = "2c1cf50f37fe354582ff8cf1232188d3e6df1863747d04659e27dcdc1cd4ac919eb453c294ff2c0e13eea2e633e0ccccd2c3c12f9894eacd7f74dd4f6e2e78c5"; + revision = 57349; + sha512.run = "558a55b14822cda4cfaa05511bbd6030049145916669b699795827181462e628d0a84baf087b8d56e3dccb353d17f581af9bc1662506878124e5cfaddbd97b9a"; + sha512.doc = "af0a7a463c7a9623050a3fe73782076965eefb58dec17752c80e35a647b5a7a6b354a1dea89ba03b503eef0faffbd2f134a6e5666f4c68665d322bf3b77922d6"; hasRunfiles = true; version = "1.4"; }; @@ -11722,12 +11862,13 @@ tl: { # no indentation hasRunfiles = true; }; "decision-table" = { - revision = 56164; + revision = 57094; stripPrefix = 0; - sha512.run = "af023c527e7624448cf3c745ad4fc6e4216231f267707c635b6465f42a83eef96fb55ec2a44ae180a06375493abfbc070c2e7e40f72c5fdb67f3d1248221a48f"; - sha512.doc = "4866399fc44b5c87e2fb5ee125a9063b22b0d46082448cdca3518a658eacbdbc968078cba246bffc2ab7a1085028273f010d6a93302027b4c7aefcce5d5d7ba3"; + sha512.run = "2e89be9bbbc6a6f0fef9f3eb3caa63a6f8c6b749df1057f712d5153a78d4b15542f1fb30d3d5f5078d99a1b45f4d4e92be44d7c631eb86e349e56b03dcb4c93b"; + sha512.doc = "cdfa48c2835b48f5b0f7d454a4255128613b0f3f9bd2d750b8107c7d8eef1a36aaca3ff6aecc6cfbb1572fd2dca109628d94b4b9419ca44d91cd1ddb12326cde"; + sha512.source = "12f617e0aeedfae0cfd2e2a1fadad55cbfaeb51abdd2faea829fb04c47edae811eacef4a7480cf46533c3a445eadf8a9090dc47aef0d656a3e204eb6f19a26bb"; hasRunfiles = true; - version = "0.0.2"; + version = "0.0.3"; }; "decorule" = { revision = 55230; @@ -11805,13 +11946,13 @@ tl: { # no indentation hasRunfiles = true; }; "denisbdoc" = { - revision = 55474; + revision = 56664; stripPrefix = 0; - sha512.run = "60377f33d9a8b17e010ce58ec56c3727bf9ac8f168d0124a3fd2743d4e7eab67c64a4277f9c3639e7c73098f5ac465e13ddcf13f40fa5cb1176c8e21e86aa0bb"; - sha512.doc = "23b359e65d42d951f1767049413956fae16f89748358bb0bdf1e15c7a32e2612cee6987574ee36ac9fad637b63d507471f1a4854d0bf749b8fb33bd8b90cb45b"; - sha512.source = "86d3beb7cc5c67e0482f18bcefeb75644047330af1500d723b58efb82a7cbfb911d389e186401a290c1ef4d209f2904644e4c5f07569e2527285a7fbfca0cc2d"; + sha512.run = "636537275629ba01fe78b5a189e94845898555715ddc879a3558539016e9cbc814ea74d6eed0cc31e42d8062e6ba6c6bb5c00064a14644c236a3c4f48f688e3f"; + sha512.doc = "6e1715fe7ed2c3d0091688ffa4e0e2245a838063a896334727ea87bad566771fa93c66cd0580c3ce1980b217cdf5e6bfba36b77d10d19ea55afe4e8fd92db8be"; + sha512.source = "89abdd37bda49536437063229346ea70655211716ebcc0798a4df87d49df9a2fb38f201e0b80e8d3748a2d847ccc2ce320c29d71f9922d5f2932eb07de3c5645"; hasRunfiles = true; - version = "0.9"; + version = "0.9.1"; }; "derivative" = { revision = 55890; @@ -12088,10 +12229,10 @@ tl: { # no indentation version = "1.4"; }; "docsurvey" = { - revision = 48931; + revision = 57298; stripPrefix = 0; - sha512.run = "e51d73b0dc7267b0564119b6836398a939676d8929e850201900eacb49e701e873661ec897e8c0523a094d82e736014e0ef61d07e2ffb5311924d2fdcaf1d5c4"; - sha512.doc = "3231dbb4c28a03b754817f50f930f1a6eec33ca9ef6e29a1c4b1edd025315ee9f9e7a371b8733d6624cf9b02dbb705dfcc82d6f98a99aa1ca05b4f277e083304"; + sha512.run = "160f6119a60cfe9be1b53cf0cd44e6f6c03713e61dc334106d4c6e661d8c54e9bfe31be7b1f90d63ccf4a1802e9b1a7cf66a7f0e50314ea8398d324862053e3a"; + sha512.doc = "17fae45bd2dcb68c4fa91da29bec5dc809ee93f2b83c090f2abca591cda5966ed626eb1f8e6e338f66ef1ceffc67d4031659238113ecc8234c11fac08048060c"; }; "doctools" = { revision = 34474; @@ -12296,13 +12437,13 @@ tl: { # no indentation version = "0.2"; }; "draftwatermark" = { - revision = 55719; + revision = 57099; stripPrefix = 0; - sha512.run = "5114ef5194450fcc4dc8230d5f09d52d29626954b2dbca6b2c733990bb8ba725fc5f8141020e456c9a4b008d1d19ff0ba960bfd04f810c2dff69951184b67750"; - sha512.doc = "da126f371e0f7dfbb62058a7e839d3375c05456bb30ca99e51c51e962b628a1d53b8de1f79a59c960aacbf89ef04ff51ee0c5017f1c20c38299486e0533d0a07"; - sha512.source = "6825431c088ed8cf33d252685822da10f06a17ead54f809639bfabc3ba5dcb30aa0e0b71810f5a9c60ad771c30c11fea43e57b7cc0e4d1be95b7472aa3c2418c"; + sha512.run = "c12311ce3723e6b93e8d21df2a50a3c1ab2326aa5cb6a1600fb848efd5309fa9a1c920e0ad27c785925387af5872570142aae61a2ffea0b3578d10209060e9dc"; + sha512.doc = "bf3c28f78f03ebe43c84d722d668c14e0a751fb9e0d53ccb6a81cebf40b78f95b53fc3871ffa4919a94c260de861e93048b3adb590dee2bb8b600be1bbeaef3e"; + sha512.source = "7f9eacb71dc803059f6d9951aa7958effb9e97bb2030884ed02f0fcd43ad554f860ccebc455ede5893d67c527915f8a7093a94b2f146e4884e23303fe882527e"; hasRunfiles = true; - version = "2.2"; + version = "3.0"; }; "dramatist" = { revision = 35866; @@ -12395,19 +12536,19 @@ tl: { # no indentation version = "1.01"; }; "dtk" = { - revision = 54080; + revision = 56696; stripPrefix = 0; - sha512.run = "e7685e9b2e1086cf4ad240ec807334d91719510cc35442d9ca495306a3a547d381e7f476ac8027acca50a01e09c9f0fe0e7b1fb251fa746d8bc135214d5da550"; - sha512.doc = "1478a7a666e0800a8bf0d111140dda8e9148c280900a5a5b4564f72445d805bb905d8536e3a5ff99220fa508ec1366ec2da041429561dd311ca699c094f9ec20"; + sha512.run = "6553c4facf6e28210e22641d10babb0c4073c9514231e345f33aef419c95ea30b6fd744711233f91f90183624d5bd5c21ca7901c4ad46358b7b6335c09059241"; + sha512.doc = "9656de8b3319a84d5d32900a65c013e44ebfa5488761bb31a5d3f84faaf22f648367a842d274b25a19c70bb650e4043dcc18fa0fdeaafd6bc360534c118589d8"; hasRunfiles = true; - version = "2.08g"; + version = "2.08h"; }; "dtk-bibliography" = { - revision = 56443; + revision = 57082; stripPrefix = 0; - sha512.run = "be4ed6006ebcdb1804dc2a870b07fed385750069f706a4544b79efa4fae61ec995b8ebf5fc537df640f90b4fe25837eea2d37c9c333f299dc60521f91e7cfd2a"; - sha512.doc = "1a1db35af817b7f392344bcd31115aaf92037b154e30fc4766f49c187a627de0fe555ef7216881bcf8d1735cf852ee2f40056f63c4b813322b4c09c9c3cd1986"; - version = "DTK_2020-03"; + sha512.run = "bc92f3deffefc3ebfad785bd446053281ffea8a7a18ecb7d6c47983bb5771756548caee5855cff2e54a3e424d8457001ded17401d06ffeb86dec73906b888002"; + sha512.doc = "e0771bb3cc19ad7529c99d0196fd493c2d3f56eeb34f8d73d78a4dccd7cbad950b591ce2beb45d5e723fb1cd4a7fc2450ddc0f679e3a4c4f20687fb888cb2306"; + version = "2020-04"; }; "dtl" = { revision = 52851; @@ -12446,13 +12587,13 @@ tl: { # no indentation version = "2.1"; }; "ducksay" = { - revision = 53631; + revision = 56800; stripPrefix = 0; - sha512.run = "0d81bad6d32724b569a483cd6656abe3700e218a52dbce511f6740d05837a9a0cece95461d3b7cb6b4b35cf6ed860c675f2182d61eb1498b503bf1660b675441"; - sha512.doc = "9667ff1be349058cf969b512e022f354bc840867031d004759c5be53fee67cdff0abaf5a02205181ab6caded8ba46ee4d6f68570d7b92bace69164d7a2418151"; - sha512.source = "587cb02ca297e92539e017610d63daf0c66c797649fb45be11d2cf079ff9c1a07899ae53e7c93f38d5f90bcc28c34423c00ea63d79cda8451be6b08748e8fa2e"; + sha512.run = "e4538112c20c1afc2bbbea2d51d2f8a47721072e254c8578929e8acb0b0c6ca99c44eaae5ea3078ff33708ad7c573144e8d94055ac25d15032314db78c305627"; + sha512.doc = "faa84c55147187055af777b7c770781441ce3a12d46386efb7e4a0348895f130f7b748977c5914914c8040831e11547abb1b648eeb0f4bbeef2e0f93248427b5"; + sha512.source = "f7fb26b1905a612044a2a05a1cc032855fc395d290b48524b042bc5d87ecd915484fdc463a1115cbb2f5ee2baecf096717bdcdd9e7da75768820dbe9d7ac959c"; hasRunfiles = true; - version = "2.5"; + version = "2.5a"; }; "duckuments" = { revision = 52271; @@ -12591,10 +12732,10 @@ tl: { # no indentation version = "1.6"; }; "dvisvgm" = { - revision = 56166; - sha512.run = "fdf5a23b42d064283d81681c0f68cf4a8a6b566dfb842706e137754909e2389275bf1dab934c6f257a591d8079a0630b5ab619223a0b40f3a90e062c67944732"; - sha512.doc = "b7627afee9db13729f95a0f9a5136a1ee679466ac4e48de440f791d578dabbc5333872cdb9b28dc6033a7a16e2185a33db24ed234ea67f8784c7520b5e0662f6"; - version = "2.10"; + revision = 57090; + sha512.run = "fffb20aa49fc40e9cffd37e57cc06996b9a791894d204c6850f679fb33715e72c93b5c7f5429f81d4c05d31376e5d0a47e62a6dd5656d776d8f752cfd4d2dac4"; + sha512.doc = "f5e845a3c5e5ac6fa8881a3b402f20d47606100ad3f55a3da2bd615d2682a5a35249dcac4064c2cc62bc949314d9cc65b746414fb1c5baa99760095b9ddfb259"; + version = "2.11"; }; "dynamicnumber" = { revision = 38726; @@ -12676,6 +12817,20 @@ tl: { # no indentation hasRunfiles = true; version = "1.2a"; }; +"easyfloats" = { + revision = 57204; + stripPrefix = 0; + deps."caption" = tl."caption"; + deps."environ" = tl."environ"; + deps."etoolbox" = tl."etoolbox"; + deps."float" = tl."float"; + deps."pgf" = tl."pgf"; + sha512.run = "2d02a55fc3d50e5fb79ebe8188300db47aaecb42089843033c569ee0508a38f81e9409d872535e1f7fe3b13a067bdabbf8249073b803c8d232d08aa1d5520d48"; + sha512.doc = "d6e96d7af908e83b67b77f0432e6ffcdcc55b64bc63ac360e42291f16adec4ab6655a423f5fc8f31180071afc5645f47b7ecb2c1c80af719b6cb0cc6e77948da"; + sha512.source = "b21681d30b8963127d603bf81b140851b5e8ea17b63d5979bc05bcfa68efd67460b9f0d0419a69c44606a4d569f5840b3c8d6f0ce7b0cf18d86c1fa104776b5a"; + hasRunfiles = true; + version = "1.0.0"; +}; "easyformat" = { revision = 44543; stripPrefix = 0; @@ -12980,13 +13135,13 @@ tl: { # no indentation hasRunfiles = true; }; "ejpecp" = { - revision = 56188; + revision = 56728; stripPrefix = 0; - sha512.run = "599c97be880d075dd814ce080c408d3f42e4f1b4a2b218d843ac4e955429076e306b25f829d999ea48f4b6e2dc0ece9fd80601048bab4cff84254f5cff9aab32"; - sha512.doc = "88f646457e9e6e711a3b4c874b9986c5f8ed92f109237a2c77eb7ac4dc4df457f07f394e441f27ee28343cfa6126bde8ff501c99ee15b4367478baeff7028264"; - sha512.source = "763efe6fa376b9d6d82495823c888bd804c04478530811e8ad60ecb6956ed37261a9e98a6d3247532ddb76475fe339e7e7c16c88f78ced2fe64dea244be8a504"; + sha512.run = "ba16daaacf8b7d2b6d9f1bdaf6680b474715ab423959bf1e8fef43c7e823becdba5d6a6e3a094f47cd71c23ee00917cf9bd3b72fcbf1f091d42425535bca6b39"; + sha512.doc = "f44c075fc341b3ef334a8675fb0c2ea3ccdae25cc81fa9df7ba39ebc9ec6ababd3a6657734336539d64a6f8b9ff4380993dba312b58cdd83ef5f0f923196b310"; + sha512.source = "6325f999c4a435b7d2a4aff7b3bc1cf21d7eb0e806f9e7bfe2482e79689617bce54b274cc690f2435fe0c416bf32b2a76c911b793bc1ac0bfe408b9f773758ea"; hasRunfiles = true; - version = "1.8.3"; + version = "1.9.0"; }; "ekaia" = { revision = 49594; @@ -12998,13 +13153,13 @@ tl: { # no indentation version = "1.06"; }; "ekdosis" = { - revision = 56112; + revision = 56856; stripPrefix = 0; - sha512.run = "7f7cbe7a8df107562afab92b8e550610d6962925fdb21c47dd821fc2be58ed95f90278108a6592a8a8b8d1898a4d567cdc01987395c315407a94a917f5b4ce75"; - sha512.doc = "848c7ee3a706f510f557000a2f8ebe9edd5566eb07908fc351839cdfda12f2f07793abeb47484c0c5aaeca897e3e1ad858151ca79fc528639ea1acc81a0fbffe"; - sha512.source = "2a2b663657c752c9e3dfe1e91f8b40b6de3cde0c2ff8742b84e7bee11aceb584f1402ae038dcee3ed4eca20363582ccbef7bfdbb33cc42c550b473fc3440e0bb"; + sha512.run = "4d009f77a361386a77cefb528c345af13ff4626516839d93c3e3a12cb8b2a193113f4b3830f076e1e99c91523a549901aeb6e9aebd647736ff2f602e47c1836a"; + sha512.doc = "45033f4c022205cdcb4dacf542d887b452dd1102cf3c8ba65fb1adc4e1bf27b913d8de695898b9673fb4d37fac62e09ac4da55f8fac06e0189867ce55016f624"; + sha512.source = "2da1013c456c6ff85152a32072ed833afb041e756e09f36507c33ef9d36e1d7ef0181641b1584f6431dd868e8631cf8091f4152f5ba58fe2d3b59bb962c21b1c"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "ektype-tanka" = { revision = 56070; @@ -13135,13 +13290,13 @@ tl: { # no indentation version = "2.1"; }; "elsarticle" = { - revision = 50786; + revision = 56999; stripPrefix = 0; - sha512.run = "17770bd130aa601a8208e996c1bcf192459d6c6ffd4ca170a303c3a548c7481e7e3a136c64865999ab7ab38ab56b09fc2021555fab60e344a7fa23d8cd62943f"; - sha512.doc = "28c78ca516aee82dfe3be32683ae404cdb7be9d2d248fb747079e2d9cca9da44aec40145d095d2e3f0bb2f3d600712fb75a987c8d1aa1ded3f738e58350c44f6"; - sha512.source = "55755e1a228bb834820f74580935b7e8a5bb162a675ffeb617bb1c0f7a1b5d99422c53ed7ae6b0302fc51112d5dc3cf63bfa9268c49aeb66cc194529c9d36b85"; + sha512.run = "5a0a7c98a8e255e55468f9b01a43c33d757a38faa1b3130b1c3613648dfcbd0fbedfc69db99727c4406ddc0601249b2d021c680f83edd34bc3d64dcd4a7af64a"; + sha512.doc = "47fe52924e95cb8267d0f65ee6962fd56fdc4ce00ccdf49533ff7af0916a962bd8c045b31f2159d7c70d8a041f7c20aafc73b23a8982572d456223afbb85e718"; + sha512.source = "5887604f9a6ed0077bbbb2498f6ba7c1a3c8a74485688d40a6fb0e9e9765035d22e928b104876a19e42775fb766502ef71446e659f6d75a519e2b84ffdd2a01c"; hasRunfiles = true; - version = "3.2"; + version = "3.3"; }; "elteikthesis" = { revision = 55928; @@ -13219,13 +13374,13 @@ tl: { # no indentation version = "1"; }; "emisa" = { - revision = 46734; + revision = 57013; stripPrefix = 0; - sha512.run = "9f62531d3cc26b428a628d2cab0e9d3fa95b1f67e91f5ffecaa432432b02acc6076acd32ac2650eabb54d9e14b6081d70fcc09299b45a0b5bd27905f1dcc8506"; - sha512.doc = "092818afd707380679c4d3d44ad50954c48562ecb5b988d3bb94701991bc30cfa356f975a8fe8a381fe99171efea2b790115cd0a4f12b17430cecf2efc3d7d78"; - sha512.source = "cf43591889d823125ce7d49dece358563c5dc4ca5df89bddc8cb6b73550e34e5e02b5aa5c67c96c747aeafc6070fc91f899d2142ad23424b11637a7a52feb55c"; + sha512.run = "dac517c5f1f5e475948d519ef46e3639a49ab3303a5d93821707b43b224ccddcdf6edfb8576fd89888cd00705b11abf17054c46008bb288450a0c679cc0ded2f"; + sha512.doc = "7fb9b28f4675a5e14687b569e1e5394f06f25f536eaa6c36ed390d24c634d2a30fc43c558d3e1ca004bdf41436705cd7ce9b59beeb31a6dd757a5fa7421f84d7"; + sha512.source = "3cb1e47c50d4cccbfd1b428ec1193ffd0f489d0284dd095f2f969c8db76f735b854e4102f474ab5e72876bb7b6e6210dd617958e42a851cbc03f5844626030fd"; hasRunfiles = true; - version = "2.2.0"; + version = "2.3.0"; }; "emoji" = { revision = 55678; @@ -13283,11 +13438,11 @@ tl: { # no indentation version = "1.1"; }; "endfloat" = { - revision = 51003; + revision = 57090; stripPrefix = 0; - sha512.run = "2bc564cb0ad7b9bd53af9304f378b6d0cdd9aa32564f2bbb39abcf0d942c4e18015b7181d4be5e873bcdf4e8f971d65678fdbcfb544c005ad012b378eb6e1351"; - sha512.doc = "39a1cfa84a2cbe5ff1b59fd9c5fa6a19cb1d3aafac6d1fbb111f117892e34142f6a21ce7808238608ac0602d905cfff6235a78762a0d510dbc436c881baf59f9"; - sha512.source = "551afda371c0d4a6e71299cac919857eaaed3ee8891f96083cd76fb33ededfaa3daa814593efbc9e7e8dbd4e7d257945972df547d7c24665e760960eccea07c9"; + sha512.run = "9c3820ddd36934dcfd049ab766ed037119459d02e9c049401b910b1c14ae2aed93d94110db66f0cdd2149451e152b5bcac14866c7844ba4a47f8c0a27756f733"; + sha512.doc = "0004d60fe959415670b5173bbab6d37733ed82b537d714c7357dae85ff8f7204e316c48d2651b1b53cc9b6ad0206a47c9cde1acdeb6aae676a25e50f363238c2"; + sha512.source = "bc5150716b23d3aa1e3a66e29fca3e8f9703199feb05b4bf76834e79654c39b0f6790ef1f0c193abeb0acfd0b2717076d4e2c89069221e1bc45716e0de314e85"; hasRunfiles = true; version = "2.7"; }; @@ -13373,12 +13528,12 @@ tl: { # no indentation version = "0.1"; }; "enotez" = { - revision = 54512; + revision = 57130; stripPrefix = 0; - sha512.run = "cc06810fea45e42f30de3eae33850ca39e561b77641f40193c8ecc6bb830de984e236379d1367ca466cdd8c401cd059f849b9a975a347d83070150035c13cc1a"; - sha512.doc = "1e345218dc64ccb561e8cab2d8dcbebe2502d25eeb79473f1432dfd3d05d041c0bb728d6c8b75cecf88fd57ecb5907997bdbffe1b7327208b3e300910b82b3be"; + sha512.run = "1bd49ee7ece262d28d0b80f418e7aaf130044447ad341ae799c4f84c4c4e69300662951dab2733d996abf896280470857e8c35832759008881cd23f35fd52e30"; + sha512.doc = "a04cad229111ae30cb51aad4c843488661a3e59287280c9335bd82d5a5172429ebcbd31e1d7f6e2c7ec5d9a3f068bf00c88e7dc67f3e39a794f32107bc705f3a"; hasRunfiles = true; - version = "0.10b"; + version = "0.10c"; }; "enumitem" = { revision = 51423; @@ -13405,11 +13560,12 @@ tl: { # no indentation hasRunfiles = true; }; "environ" = { - revision = 54080; + revision = 56615; stripPrefix = 0; - sha512.run = "60df3a032acd64221167090c853b4a330a2cc072561a981a70be29736fa871f0bbecdfe6b2cdfdebfd448d8946c4d0bfceb252ea0693194d184bed3c4fffc747"; - sha512.doc = "8d30310ae317193925c81eece58a3d3109c1396c7e486510826fd72cb8489234867583f438873affae766a32498e375eb46db51fd0d7f9989cd61ae2109e13d6"; - sha512.source = "17531d5bcb727e94f7def5f49afd103cd6c280aff943dfdbdaed28f6cdb0a16db918ab21201447f069489f442aae93edbe77f1b4a80734d7f6e4fb6a5ebd3ee8"; + deps."trimspaces" = tl."trimspaces"; + sha512.run = "c8dec70e56651a89ae8da15abc0ad81cc2edb4487837469238e2adc0e7c58cae4c5da82b637a3336839b50103e3d846c5cee8c73141488f644469a0f3e9d363f"; + sha512.doc = "78d4d3f570470619c938687a6c9a6925aad901d781e3e893bd731a49bb8eca62bf1870e68d84f7125e10d91d7bec02a323ae42278ff59c04d7e33eefa2261496"; + sha512.source = "b30607d21bbf5ddf1c7d36bd9173a16d91bdfcfa004782be50e50f17bf54d94e943d5e524e2331b75f3ce65e81193ba98e69ab56c38959d632007f5b0a87bd6a"; hasRunfiles = true; version = "0.3"; }; @@ -13462,12 +13618,13 @@ tl: { # no indentation hasRunfiles = true; }; "eplain" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; @@ -13475,15 +13632,15 @@ tl: { # no indentation deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "8a7da7a93651d819a068d5415824fc8798e8ce54c0326f4f993a468127b07517bb0da912a1c440d60fc9f371dad460c920f13b43288556745a4121ad7756c0ae"; - sha512.doc = "6fa123f48bb7f09cae93a64a72509ae5d32bf9683f553fc1a5f66eb67bd273a20bd0166be14223a8d0fe9d4aa86da35c75011ea3edfa0d156271b991a85e5b4d"; - sha512.source = "cd030f5213b771a1c74a53aebb59ef1f9c1d8ae4136b0c852b58deb90787b663fafa333bde1b1c6fabee942399d5682d991369b781b864bd2adcb7899916ac44"; + sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479"; + sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67"; + sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89"; hasRunfiles = true; version = "3.11"; }; @@ -13640,12 +13797,12 @@ tl: { # no indentation version = "1.111"; }; "erewhon-math" = { - revision = 55287; + revision = 56703; stripPrefix = 0; - sha512.run = "2c530992e46104ec3529f2d2e5b38a66d5e27928fb819940865a87f2035152135036f19fec79b79cedf93394f62165575cd67a3ac72d0fb0669bd5825c9ec4ea"; - sha512.doc = "74a12737c8d4963da687b95c95e55835f22d2a4bf751a4f39aeea410cec684e208d2bc86bd5f5e9a986df94603a7f21f628ed5d8376a984b7522b528bc190223"; + sha512.run = "1e1bbdf2bf030e8b8c09c955ced895a93117eeb6c6a6f784ccb62c65d7e3fd6c5f536b23ea86eab3f306f0734fe3c805e22e61dedb5a5a06f41b74b8e89efdde"; + sha512.doc = "e422d287b0fa687e1bf54dc96f8adf1e979c8d2b6cfff2a5ad2e9d3ff8fde95ace136e2317235f6ad6144fe359385401569ec7aa75c273d48c3b7134b4273e74"; hasRunfiles = true; - version = "0.44"; + version = "0.45"; }; "errata" = { revision = 42428; @@ -13740,13 +13897,13 @@ tl: { # no indentation version = "0.98"; }; "eso-pic" = { - revision = 56463; + revision = 56658; stripPrefix = 0; - sha512.run = "7646578d67dcaa61bf995762b190d07bc829dcfa322211ce84fe0e107f643649b302ee2feb2b3bc83d3369157242e33fc9bcc6b3637af274638b23e84d5c3aa9"; - sha512.doc = "3b8f7ff80a6cd3a1870172884759cd5147dae4935f05e06d6fa880b7d03de9c227390353f46bc03a7f6437efa4e05f1fa845aa4571bcc4f0ea3612a9728a1e94"; - sha512.source = "08b254a5b0f129ce70259f889082f490c38fb0519c80cece7f555d0a0e6f84b9d34695612ee8bc3af24003033fb1996890c3497206ee3f9a4728d37165e55bb8"; + sha512.run = "d4020b6d7f1ed44ecfc11938d604595e48dc32a24e2e67742016fbc2022f19ab63c759ec03030d7d3a996cc00f7a08ce8cb1354d0e9234f116080d732e4dc5e8"; + sha512.doc = "96fcdb612c8473fffe672a6c443c120b2cc8dafec5b43de132cd8f758d85bb504ea14285af121921afbaafea7c6df99e32f6c50101d1d76900b1aeba38c3010a"; + sha512.source = "86655acc2d9d11084dea3791a171b01e18715cce77b2300220764eba88d4a049a2a6bef6ff7bc1b90fdf337379be065a2d998aa32e42a0dd04b21f0293d1c14b"; hasRunfiles = true; - version = "2.0i"; + version = "3.0a"; }; "esrelation" = { revision = 37236; @@ -13967,10 +14124,10 @@ tl: { # no indentation version = "3.0b"; }; "europasscv" = { - revision = 49703; + revision = 56829; stripPrefix = 0; - sha512.run = "b47453280812327a1528e7d2a484e0b92e5464381bda11b715c624bb8fb7a1f57e3df71ccaeba7dbe8b0f757297ad3c4515aed773a44bfe78efbe9f64297e180"; - sha512.doc = "e9041765db618541c6aa9a4142b047f4096bc335a9601186a26860d6b594d6b6125c0f5392fb6dae9a296392fb565ba0a8c288155e8d99e12bc12bec0bedf52d"; + sha512.run = "35aa159fd84082e1cfb65bd05ea83462400e12edf5a40a89740373954d72b42cc33516452691814359d3bbfae1e96f4605e0d19592c54f4e2e5328542cac42a6"; + sha512.doc = "834c4266e343a8b615a45a2c4b064170bf6c9516a8631342ff02d4de7154229458818192670f3f73aac5600407c830c1be384226bb3b0923af964905a39d99b3"; hasRunfiles = true; }; "europecv" = { @@ -14004,13 +14161,22 @@ tl: { # no indentation version = "1.2"; }; "everypage" = { - revision = 15878; + revision = 56694; stripPrefix = 0; - sha512.run = "6f4779a2a0e0d2352b702652a583f6ea7da71865196894b88b630e1105e56dd5ea525cbd4eccdebe8dfa347716c192fa098d5eb8501f305109b337b266e7ec2d"; - sha512.doc = "185bb6b87896f43472d8c902cfda976139d8b1df09c5eff75e8f579314867dc05b6c215f0dcb09a3438f7279c6579ffc8f92fa7fc682fce18ddf7f080e0c6e37"; - sha512.source = "ca04b157d255502abde15994da4690b99e4c6d015c86704d179001b3412e9c9170a040216657ef5afb174aafc34d4c0501b51155b84164b17401843837a9483c"; + sha512.run = "032713896e2704667582aa03e8d542062a5eb26188d41b08968955fbd8535aacc8288559112aa264c542e3523f452dd9b2acdd1dc3f66450cdc5c5c902e38b80"; + sha512.doc = "4c19f905b5a16674980da2569b2994382a2eb108fd20bfdd29a6ef4220e00aa390c197dd86ecd093a9acb83b9a2d64521f732083e3c2828478a8c8c45463d180"; + sha512.source = "f01679f5ac00d3c75a0595496b489a008c664d7197af6d267226498b821ca83d34ae842c212756ccef81aae40f4447ddae2146b5651084dc55081f75c1ec04f8"; hasRunfiles = true; - version = "1.1"; + version = "2.0b"; +}; +"everyshi" = { + revision = 57001; + stripPrefix = 0; + sha512.run = "b6219fdc669847a30ad2359d6b0888eec0980114d5385c018e9ddfd0876dc52390e1e8ffae5d2850cfa140833365c30024456bfacde6615bdbe5101e7059d52f"; + sha512.doc = "2a05f4b42c1a85b4af8fb3881d1e32d0cb8fad7070bd8eb83632b50e387083a5c8fd264b61b70416451f56a97e1c0702507bd50c534ab7baf975372d854a97a5"; + sha512.source = "4ae653fe3cf9dcfa51f461ca72954eeef666a6324321cb5e6416d7e2baa5320115818a26f1970bf7654acec9454e5174262578fc4d28f251d3476d27d6d4d9d5"; + hasRunfiles = true; + version = "4.00"; }; "exam" = { revision = 46084; @@ -14154,40 +14320,40 @@ tl: { # no indentation version = "5.1b"; }; "expkv" = { - revision = 55750; + revision = 57247; stripPrefix = 0; - sha512.run = "aa006791a5b653059e1f45458f3496b081aec50d72ee5547988d82000534c7c29fbc9639d6563eb48b6f296a967f8b05a753147043743b0b2de26f1b2e7e1488"; - sha512.doc = "8efd25dfb7c728f8a4aa57354db3d39a2a29f5eba5441853c03c24b78cecbe97af628e028d188acc043ca7a28623e8f447df3904462e666da8fc6aa58c243ae4"; - sha512.source = "23e766017e6ecafcdc409f46f12e4d775e1b8fed597fc9f020ff3889816adbb1c4b52f41695071b4d7f0972ff6b1afecb3f57de6695ac58ac5c81b7ebe98e98e"; + sha512.run = "b8270aa4e1b827a6799869584db6e30600a4779937de424548a3dc22511e4bad4d096389038f6423731fd36d3e93be59e789d957388ff243a1e7bbad65bfe8e8"; + sha512.doc = "31182e02595893c756fcac91222ef640e8c39c053ac98140769c470c126bb85d2cf17f9b342bbacc6608e136d13aab5528761650135d64b6fb3b5014547d6cca"; + sha512.source = "2c1ad532623a79222a886706c890bdf5c34b80c58a1d378c54bd4d4ef3d1ed2f38d5bab9b415d4f1b93f4562b47e387bd77463cb0ef849a8029002bd96cb4122"; hasRunfiles = true; - version = "1.4"; + version = "1.6"; }; "expkv-cs" = { - revision = 56074; + revision = 56693; stripPrefix = 0; - sha512.run = "caec26af142e07e2a3744ef1769e6e6b36dc86d963f3b46de3c30d5b0bd277e2acaf50b1f21448005d504fbbe201e4523119362cc1f841d8046ce74617501a2b"; - sha512.doc = "302633eca5dab1dcdd9bd0e27fef2441ffed13af2e713240be8530aaf7785759d19872cfe321da5fbe47c97d151a1ae5fe37798f739187deaf84a4d1453e72fc"; - sha512.source = "ba9d5293b0e548dc4538a5b86ffdbcb23e455625d43c81cb91445d9d5ee5f111d9967b3c89742d58f458092652be7335e26caefeba2eeb518c6f93143a210846"; + sha512.run = "128720f96c0801a5db0be297702367a29f9c37363e86071496c69fb5d1cc0641585f01cecebf919ab4cfe34ef93964bb96d84ae8e29ddc91bbe1e844137d52da"; + sha512.doc = "c28461c7bdcd905036507bcada41a720e0b468bf3f431b750672303baf368a1285567e632472610cedfc2de1d3b0941007113e1caee7042593c57e1f0e9fab4c"; + sha512.source = "7ce2d0ba12959c7f8e1a93f175d6637af95de461d04e651c5e356c8428e2a3f7ac2a1f240606e9feb03b4a8032d04400f2fc101c073cf09b242f3deb56b6b10c"; hasRunfiles = true; - version = "0.4"; + version = "0.6"; }; "expkv-def" = { - revision = 55829; + revision = 57246; stripPrefix = 0; - sha512.run = "7fd04f8d3722263acdcbe991cfbaa42536575a53360c6eda061c105797ca686a59075036dcdaf4baa98982f41dd0f369eed83e7ec1c6380a98a4cd62e23c56dc"; - sha512.doc = "e6e95f42feba632f0ab9b32458e8dc48010ec977b0fa32102c20cd26e7bc537150c4688d9b00284ea81cdb08cb1b0efc631684051457d1e53f876fb46f37dff7"; - sha512.source = "708154ba4402c5afa1e95d12e2979edc943462584dbf5850b6d2362d938e970edfdce24cd8d76fe16894144900a2a37cd486c9c3d1b7cf0187bc1bcf8d3bec68"; + sha512.run = "034a3f9dc0672deb9d35a1f6f27c10d77b0ffecd82697e0a09216599472cb6d982855c7900f1b7f39a748478b0d2a1ed8a434ba676293444863e50fa9b30a07d"; + sha512.doc = "b689125035104ac0693297b018f8684503b69e166f23e02e53224454d0319e9f7e6867e1bf8bc3e32498dc7af709a67165f26bfe3e39d86de0a56b0f2c16c307"; + sha512.source = "004efe1983799c06ff03d793ee11e557ad55242ad29c1821680806495c441277d9dc1bce9d01edb558b7ddd7a71ee12e597af63663f72ac728a4d0d68b0a947d"; hasRunfiles = true; - version = "0.5"; + version = "0.7"; }; "expkv-opt" = { - revision = 55751; + revision = 56633; stripPrefix = 0; - sha512.run = "b6b8756dabb464608fd668bc1c86a70be13063e59548021b43030e9e5843e25ca84b33114d528a7417dd6f992cfdac706d3311deb25466a64ac1f0d55262de27"; - sha512.doc = "dbe0454595ed2aeefea8a3966ac0ffb1d41cd6664aeabe33223580eaabba83222d896a6ce44605f5c7c913059168b5da951954838e6a8ccd94e7e6669d117165"; - sha512.source = "335e8abe27588b3430b92ae2e2fc35105e8453983a9faf52f891300827daafadff145e4c56d2d2c985cada862b30e425abc9eecf862436278b616f39fdaa5fae"; + sha512.run = "d62e5bbaddfd5ca1be219a6504774259a8c07af1e32e5c5f8085cf78eb1e0f947318f7fc6f49fbe686cbfe8261d9bd3ea70f77f21afcb2a6781074fbd7cfc2da"; + sha512.doc = "12c903eae7f081cbfe5fb5a9d19373353aad194dd90bbcb8691a3ad078903a953e3ea8156331b1d3c600f2af8f23620ef6d514b0ca55d0e3db5ac03e63523597"; + sha512.source = "5d3db8c1c829784becd1512d2db773ca75c288a39d4d0472df09d26656c873670861b80e66fd372c6e636e0b2b86ad5ee035dbdcf8b30b87484f039f7fb87e49"; hasRunfiles = true; - version = "0.1a"; + version = "0.1b"; }; "export" = { revision = 27206; @@ -14283,13 +14449,13 @@ tl: { # no indentation version = "1.0"; }; "factura" = { - revision = 54803; + revision = 56948; stripPrefix = 0; - sha512.run = "99f59272276c7723601e720287d885066b01d44e8b388ae1115bb5e14d1face1c3de444fbede9e84d66b82772982b2f0a8666d778916316e69ef32c624db6c22"; - sha512.doc = "17176702c69d98902877489d764bd3e0d0a3d2fc2e9f41fa4215a47e05c3c4e2ac9aa82c05352aeb9f674ac2ca7f08d27d9fbe45b5e0c741ac1f0913e6b81dd9"; - sha512.source = "e8ad0a22357cf28cc44a6a69f4a8d1d1c6ec57fedb3d2694094f90951b304a872c7e34b46ee8d789c964cb1e842d5b41eeab7445926da0b7f8d66149e924edaa"; + sha512.run = "a4c20cd7b7b2dbc58cd7d1e2c7cdde59710c9363a7e4878825d5aaeffa992bbf471169bdfa01c83aaf3e82aa96ab5fc634676656e2e4e6bff55cf5c4e5407f53"; + sha512.doc = "7822a8f8cef63485f2c707e180c14b67148cbde8f8f1b6d1ec6bd0d9f6e124cf4b63bafc7d01c6ec72c8b5f1edc36f68f9f48b9bac523ceaa093a861a5790f2c"; + sha512.source = "14b3c407a61583fb5cf3813d7ef379fe34415f10b985d7e71dba622dda7b118dbb197e7c8b1cb2cbb45378e38eb333f539c4e95daeb57253983699e3015e4395"; hasRunfiles = true; - version = "3.73"; + version = "4.00"; }; "facture" = { revision = 43865; @@ -14333,13 +14499,13 @@ tl: { # no indentation hasRunfiles = true; }; "fancyhdr" = { - revision = 49886; + revision = 57327; stripPrefix = 0; - sha512.run = "da99c0def1655589988fcebf627dcb35ab1a3f7ef481f141ee91045f81138cc02f849f4879507afdbd89e631460e5104d49bf0be6a640f4c7e9532acbc952454"; - sha512.doc = "a54bd1e4c0835e1d3790ceb9c50ac63766df45fb3d807b74222465c116fd103d65bd09a8e0f4cd20941422734cc508fcca9f86be3ee0cc2beb4927b9a2149849"; - sha512.source = "aad6a82c734ba3a1a571ac67f38851808e42c600884b22b64f463f7f4b41f83a85342845ffdd70244236dbe1cb013ad77f28c1897c6c28edc16590ad61d79510"; + sha512.run = "0f2df7929961837047c1e71af86b20d74f57ccf9866555e1b97ca3b38fad044e50a21a31485e8c77fc5f28c16fe30756e4824b46b4166eb48715b8be467edc21"; + sha512.doc = "6b28ae73a502eaa3656cec93b838f380b245dd2c0bd6633af87f16260a7861d6278056ee96396f0c184fdba05920d9f9dd4e92593272774bfa14eebc00eeb9e8"; + sha512.source = "8734a36cbc4fff7d9d2d535de1689ff511503b1bfd8fd07d557663ed718ae3dfa8412f267a0a4d5ecd6109a05e5318c0aad4363ef9f57756ae8ad03be7dfd506"; hasRunfiles = true; - version = "3.10"; + version = "4.0"; }; "fancyhdr-it" = { revision = 21912; @@ -14628,13 +14794,13 @@ tl: { # no indentation version = "1.25"; }; "fgruler" = { - revision = 42966; + revision = 56854; stripPrefix = 0; - sha512.run = "d189eafb4b2f7788d42614f87684bb3cc36d8e022c9c98f8f7f44babd5f95d3462ff25d2d9ab541384d35ad4daa39b09e28dadae1fbd0f7fa25d0f8ae217c34e"; - sha512.doc = "16e5f5be432e338788ea78c5e41091eac616a3ad779c3c40bff723fda2646d5205599857f0e23f1b2774fb56a2ac795c61babe21cc4de5ecc2fadb7b6d33eb2d"; - sha512.source = "789c6383611f55e5efa878efc1ba229794a888a26bb4174fe263c5cb2ea678e67422a47520410bf83b90ebc32a4c9584a7f24bb66f4175d6b71ff0ccabdb3de0"; + sha512.run = "7567024373e5043986da5e5ab1953e207ab801284f7cbac38bdd200ed607da239a37480132d3b54ae52ff4cb409414b8dfb3e998a5a70bd49161ac99f6cc99e9"; + sha512.doc = "dae1aa1a479d95ae31efcadfd3c48b28b57b10e844968550b4772ba863b6889f8d4e7c4cfe928ffdb903db611f1ecd0b4319b0be6429895f671a695fe9362fb0"; + sha512.source = "bdca41dc44cd030d9548091521d7d92986e693280977edf7a2a6f804857602e6904c85f4639e9a18eb993c89a95b1217ee35cde50e6d30b238de3f46d332c6ae"; hasRunfiles = true; - version = "1.0"; + version = "1.3"; }; "fibeamer" = { revision = 53146; @@ -14791,12 +14957,12 @@ tl: { # no indentation version = "4.3"; }; "firamath" = { - revision = 53388; + revision = 56672; stripPrefix = 0; - sha512.run = "282d1d6dc2f414c4fbeb0267ecbc52446c125e3195d82f5ecc60f1c659b0e92607fe2621f8627835732a8428d5028df47e3b75a8da051fc3da8ecfe9eb5eab1d"; - sha512.doc = "d8d3ebd6c529a7e518597b9de2372ea8aa6e07f39c281e904c2654ee575caf200bf3e18d8a9d98861aa1102be13d64d12e18860ec046374418e8226360e3aeef"; + sha512.run = "c18ab8b2e12b947144528b196c9b1de7f1930f3a38338bd114bb61205d7f910fbf1e3b20ce48ad8228fc24b14d734ae68c3c8542218a058120a62783b007461c"; + sha512.doc = "4e434c757b4ad4c82397224ab275db9a0783994dd9e3acffaecf19f73b3bfb86dc6f70c2833b2f203ec354aa275384d1e97f48deea9a765b3d972eede02a35f1"; hasRunfiles = true; - version = "0.3.3"; + version = "0.3.4"; }; "firamath-otf" = { revision = 50732; @@ -14813,13 +14979,13 @@ tl: { # no indentation sha512.doc = "497080fdad8195bdc43bef476f9e678b49d83829f10a6653c9443d327cb0da8505623e941cd3038349b6307ee37a65ce1a3d3eb48e4c6262f9d636d10d96e17b"; }; "firstaid" = { - revision = 56540; + revision = 57154; stripPrefix = 0; - sha512.run = "942020f0757742290ab01004dbbba27f5c6338df29fb088b2003ee4d65f11f9707c0dd30b140fe837308825404118372911ec63c7b576166573759488b8356c8"; - sha512.doc = "3e63cf34a4c62a583b3f7a7147c3ee817ea2c382603da13e41fa2aab24f6da3a19a4c937c58903f49fa948955cd8cfcda2263ad75e9536d4105675dd0c420300"; - sha512.source = "0c6a66c28fa54a7ef596bdc1b1c347847b844751407f89b8549a4ad06f2e1661566dad93ac2c0515da4e424d6685a8a8fefdded54e4fd36dd565b9cc0835a337"; + sha512.run = "ab371c6f1a0d7b3850f024c6a1362213c4c53cdbed7d27a019c915c603c52cfd2ea230495ca1bc714f6438dd5edf8f4cbd953f8756cd4367db89924245a3cf8a"; + sha512.doc = "39ef54e4a4d1701584402d7d3a37ad8f6b873d68bfef29749d1dfc66dad529c1e526a9e8828bf6caa9bf4672f5d65b1209231be205bbd4fac7fe5669e0e4649d"; + sha512.source = "5f01613b7bacb518f6138f359baa045237416805f8e1ec26470a6fa69847ab6b1fdf7c4c94b60013a52033f35ddca7f670e647b914f6251e65b058c523fbc3d6"; hasRunfiles = true; - version = "1.0d"; + version = "1.0i"; }; "fitbox" = { revision = 50088; @@ -14982,13 +15148,13 @@ tl: { # no indentation version = "0.2"; }; "flippdf" = { - revision = 15878; + revision = 56782; stripPrefix = 0; - sha512.run = "8f4de43f2d6310bcf3bfe350a071d43ff4ddf4d21acaebddf59e3fdc62ae562e32006707a6f7f5de1f631f9aeec12edd7cf75332b012e433478d171e149f2c96"; - sha512.doc = "3b40280c0d142add31bf27dd57cf52ab2d5f4f43637cf1a1a20202b5615b58c52567e53ff2f9875d2d1e73116c227319909d77df1609ed5590b30d2c151f2c63"; - sha512.source = "359f526185b8d3160cfe2c78c22d36e2df4ed245f574d3ed905b8e0dd95664f57f0efc128130a00d2945c666ffb094eb4333a26c13b56c9917bc0172e31041f0"; + sha512.run = "17773b1ba5f40d694cddb3d2e2742650bde889d53302e6fa6ef0686ea4cd3fe393ca2e5b31842e93e5588631ee53ebb668cb035b2843fc5bd57911167074edaf"; + sha512.doc = "d5191d079641c9a06336498c396cbcc7585c983924a646bcd3b26889ca51a08eb166ced560f45f834281fae9abaa47d02fdd4ddadd3348cef704dd9b818e7675"; + sha512.source = "95e86fe1e8ce5cbba8745123dbf6c352545d0a75f3ce679e2cf132e46184efa28123f9f9ecf805939c10f59af5bbde84bd2a75eba8f0aae3628b41226059bdfd"; hasRunfiles = true; - version = "1.0"; + version = "2.0b"; }; "float" = { revision = 15878; @@ -15237,9 +15403,9 @@ tl: { # no indentation hasRunfiles = true; }; "fontools" = { - revision = 55997; - sha512.run = "6f6951661291e667983551fbb7ffbac6e25e22aadf94f53de6960855a97a5e2b4fdfab50ceb893d82ec0b459415a95c25310cf1038be31809dad965eb9f43cff"; - sha512.doc = "de10b5508557a0a3dae7ddabbc3326c106d878492f6cd305600b20498bcfbd244a793604ec42ca44b6a51632512347ba60f70908bd669e7308b81504e96bb737"; + revision = 57171; + sha512.run = "e7ad742fdd462f7281d1af2964fd09de98cd7d4014442f63963f3fd6bad8c63e1f9e8a7209b8c372090da7a8494ef6dc6e23f745ce032bdb6d27d64e81ec1a6a"; + sha512.doc = "b36148f545f10de55e52b695369b669465dfa98fabab8d75d0650a58984aea616da753c76747fb2ea31bff630764bc8182a48de51c0f038b84de01361354fd05"; hasRunfiles = true; }; "fonts-churchslavonic" = { @@ -15260,21 +15426,21 @@ tl: { # no indentation version = "0.7.2"; }; "fontsetup" = { - revision = 56428; + revision = 57141; stripPrefix = 0; - sha512.run = "b942f52d4d5b8f62dc56f155fe1b2f250a73a076e29383b6348dfb116c5db47868aed3e48351ad1134d35fc2d7d042d782a07ba23faee4963d25a995162076d1"; - sha512.doc = "afa300891632d757c80bfcead86216633b1c6e1232ec85f8532bb5a912a7bfe3e169cdad6ba9eab80780a4969113cac34682bca007594b6f7a07303532a6f6b9"; + sha512.run = "d2adc60542c21d9694020f51815eecb79555938c9a35d9b7d0ac1c0459541e17d3b86d837dd1d615bfab3d8fa932d7dca24a69720e1565b455f871e5f11a11b2"; + sha512.doc = "a135fa4aa983a177ebd3f816a92540ca8654e14813f94b468226b17dcf8221b873f8f0c9ed3d028e98220803b0f9756861af8e1926282e3b6f6164bc4a689440"; hasRunfiles = true; - version = "1.007"; + version = "1.008"; }; "fontsize" = { - revision = 55265; + revision = 57194; stripPrefix = 0; - sha512.run = "87a6151725f2cd238634c73c1f57872771b2095ce110fe10e32ff0d86c274565f8d61bf056935b968f7ffe497374f129d3312eb07f49100332245b572d592063"; - sha512.doc = "3187d501d01780526987c9a903184f446dd9197b0b2c89afa94ec13ab19db2a2c95d3455e01194b6cce89b3c708f89be060024f1632041100587b84261c82e95"; - sha512.source = "39d501c60870666bd38b392e70c36bc36d4a262c1dd1aebbcb5da90e904fbf5fbd492dd3c518dc15fd73be67f69e57975f73e6e825e5731e9325fdc11b0684ef"; + sha512.run = "70d9e28eb47d6d4298c7ee009a080e750f624bd659637046db6911c8062b7838425eda029a5b0c1ea5c68273eb892b5f9fa240e9b28f90dc4f419ecce41fc82e"; + sha512.doc = "280b2ca0f546e1c73c6cf337de55a8c0cd7e99b1c3b9abe7df340a31f507e75d5a51ee140406a4634418d4bd8382a1f0db44f0793637fb9428584462617335b0"; + sha512.source = "6e4247f9724b586d6ae6d9ad15e970957efac5b8f518a2d5621de28669ff06123a1a867fe51d045e6ff173e901ae955805fd0875f19ce315c85a300877c0b2a3"; hasRunfiles = true; - version = "0.2"; + version = "0.3"; }; "fontspec" = { revision = 56594; @@ -15417,12 +15583,12 @@ tl: { # no indentation version = "3.0"; }; "formation-latex-ul" = { - revision = 50205; + revision = 56714; stripPrefix = 0; - sha512.run = "d705a402a4ba61f232e559e6a610646180f22f47df251d2731cf8f62a9edd26d60be53ad969ae0bb8d02a767b302df18b88c048ed1536b3677b7199d347e35d8"; - sha512.doc = "5bf8c412d061a5ce30ea3af713af400eded6a0f75ee019fc9f6e40623c3203839f718eb4b630282ec700871cf4b0cfe68ff38d43cb50f53560184d7d44d528e2"; - sha512.source = "51a77394f3471dd2fe6b29717c89cc8d2f6f0a126ad84d5973bb1d3a8600539148be0450b1e5f5cde7070224ea02b09ed9b871f743ec82c78640b9ab54ae602d"; - version = "2019.03"; + sha512.run = "30e38c93cf692aea977479159780ffa797535c938fbb0551c86979f61f459d571cf78526a5ddd435b22e850e45fd6fb33ccd6a8308a170bff034ab3d29c63318"; + sha512.doc = "3f8744fb5c3554a256a3585cfc8f0339bbe91ff94b959fc02f2afd25466333ca54003b1183ba7e770f49e296807367ba33f809424921fd437f9773cc5aaeaf6c"; + sha512.source = "52d36951555b74a8091efe64f5bb6790917fc3346a79d660f1f7c45793512efc86c935d13bcc88f0dae714223ea5af3a02b32b062880f117009bb99727fd8dbf"; + version = "2020.10"; }; "formlett" = { revision = 21480; @@ -15568,13 +15734,22 @@ tl: { # no indentation version = "1.3"; }; "frenchmath" = { - revision = 51192; + revision = 56847; stripPrefix = 0; - sha512.run = "1102ab998250a36d6d93aac7c673628eacf8b1abd203d91989922599ec6dae58439ec2700e40eade5b0ee1666a68a30d94f89d3a225082a6273ccd63f61fb586"; - sha512.doc = "622cbf8f1149c53f240036e2cf2d6245d6870ea24f9af6e1883e7fed2f1001f38227176156e8a33c9d9c07414b1accf1a924fbf7248e91903d764fb85d277bdb"; - sha512.source = "f41712d3bd58290fbe205001e9fb531a147debea4b93aeac3b9831cb3bc8edfc7d1364bee575c750aacfe1db8632c357a36fc5afb003a7c895108146a1ab3b7e"; + sha512.run = "9f05e3391576e8f37d00852a4d5c9c961369f0fa838d6942594e8b729391d41080d1bca55b258c24ed784788f5b52bb5f1ad4e0d33303676a2811c3804740d09"; + sha512.doc = "d1e39e879de7f2cc5307970b7bf2c5535aeafc67e4d79b01d217e33f32d75c482716b07539c7f58981cb581fda61d5310f9f4d23ce9c96e7f1d151cd91a6dc7e"; + sha512.source = "d2af7f5fd3f45964d851c038b533b99e6c2a813fa382a9b34333246b044c9b18db6252ebc8c997527211ddc8ce20ec3a816d11b49e1a3e185d7356dd141967fd"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; +}; +"frimurer" = { + revision = 56704; + stripPrefix = 0; + sha512.run = "81057096f64d8ed53fb8afb9bd72eac6538f5babdcc054f422c7d6d0fa73b88459d250ed56b1666ec8d6c936b52102a9a1988d04ccc2efe76761e945d9027145"; + sha512.doc = "d2c8dd345fed5935fe2e329ebfe7c2e9a5c836f3af5d52605e35ce32ebf51cee529c182505db8eaec7772476f758bc5905a8b57cad5ebd162732801c2cf6d352"; + sha512.source = "a0fc0076cb4beaf081f21ca474ee287cfcfac07c889907d690093ff7b188214875766746bfade8f7de9182e5c32c7bdf912b71336f078bee120b042615056e46"; + hasRunfiles = true; + version = "1"; }; "frletter" = { revision = 15878; @@ -15592,6 +15767,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.4a"; }; +"froufrou" = { + revision = 57248; + stripPrefix = 0; + sha512.run = "62879b91bec8db0021f41d8071ba87bf924445aae702eac318e215cad1aa7b612e17fcb52952184264cb37ca33283d1c7430afaa0c73ad8bacbdf4cb3347a8f2"; + sha512.doc = "1d1c4c1fa5f7ce6d88418c89f2cddee2fa520830f32d246814c5a26f6f2c5b675d80082b0d0075ee3a85d0a529974bb8617490f65b3294871e3bf9708a3ed345"; + sha512.source = "84f8126bb7a5bb65f69bf656c9009b57595e057f9293f0c14e90c49c164181d0218ac9f2e307092a79094662aee10eb50168a2bbbb2cfe9e4ded602c36e8d1ec"; + hasRunfiles = true; + version = "1.2"; +}; "frpseudocode" = { revision = 56088; stripPrefix = 0; @@ -15820,13 +16004,13 @@ tl: { # no indentation hasRunfiles = true; }; "gbt7714" = { - revision = 55482; + revision = 57157; stripPrefix = 0; - sha512.run = "e90253212cf40c26ab7842b04eb62cad61e7219d75b8fd3d49d3159492986fd79abc52c17b881c463f707fc80fc10d4616940e2a429cba2b4a927db2f1d7cad9"; - sha512.doc = "3b16f46fb4cee9a331d68c38f16c2e1546f6a3860b8eac7168544b3e392a8585ddaafd5b727ac8d16b5140df549028a50c82a7758bbc2aca0ae9b1d516de9941"; - sha512.source = "c44225f978569cafc7bcf76378a3ac61879e7c18b29f2665e22ad43ac0e356bc0228a95ea18a9f10c9204a567e6a2417e7895224dae2a5417ef54332c06860c7"; + sha512.run = "72021c4eb7e1ee1b9b293801988df67c0e62fb5f46c7036c4dc75357a95a80d040782c4a71e98690858854d572351445fe6c06269ad8f926d62fd668095815a2"; + sha512.doc = "c41fbed87dcb702241f8f8c3004854d725083f9e0dd2b3f1bb92a70210539617b728be086c2a7e823a8be0fc9b906cf965b9202fc5c12f4f05e87d73504444fb"; + sha512.source = "7e7e48208197fe92b939f569cbd0aaa96ba1b6b35821dece635c36572f3309f2af00d86ee70a6db35aa7ed261a4ca446dd857fdc1026bf18bf4c6adeb110ea68"; hasRunfiles = true; - version = "2.0.2"; + version = "2.1"; }; "gcard" = { revision = 15878; @@ -15909,10 +16093,10 @@ tl: { # no indentation sha512.doc = "fe296c5bc38a1e6d13d2b46dc8081a6658764f7017d0831cfd46dd86082371d6ae095ec3b52b3aaaacc0a57cbcee066b94644a5746391fae4129eebaa246e146"; }; "gentombow" = { - revision = 56429; + revision = 56665; stripPrefix = 0; - sha512.run = "f01a53df6b891306b832bd09462d3ecca748bd072ea1aff03414a38b6996842799ea32648b5494992a168633de0dd6679f76a36badf1592776c1098ca0a1abab"; - sha512.doc = "6d5c8917de96ffef7b393b5e9ba286faa968828920132f77086ab4f3ecf919ae75181ac5ab40674d400d530055de075a99900132b613fe317c691fc4d5ce637a"; + sha512.run = "e97b138d5359c3fa0635bf56001ecc7c6a5afb2ab2a01fd8817cbd956adce97bee67632f4e3ae40d56e5d2ce06bc07ab33b52bbe3978f14bf4957d2647781813"; + sha512.doc = "89912adef5b6572945a81835b1dfd0648699c03e81c6f4e06309dbb8230f536f5c93bcd46a3acb508ca92398df07cdf71e8f5fa7a2f889220a03b27ad78ac110"; hasRunfiles = true; }; "geometry" = { @@ -16184,12 +16368,12 @@ tl: { # no indentation version = "0.0.beta"; }; "gitver" = { - revision = 55019; + revision = 56810; stripPrefix = 0; - sha512.run = "e43eff82e8333af8613cc522518d060bc611273c15d105c090ab494f5f25821dd5f48e0f811edcfca5339d2cd17d3437e6183e7773cb9c538601627bcc62d57f"; - sha512.doc = "df22ad04093a358e4730acf641ecc7acaf1b9e3aee26971d82aad2fe559bb685c64a60ae67bf25028f7dff9c5ffdf2692fa8bc333da73a4144b93ab5e8cfd498"; + sha512.run = "de9440bf5a42e65d9bcea03a0ae02a77499540ed5a3f35f48f55cbf8973685c08413e8770e5aef430dedeb24ac881e15bcf72f06c689909a3988b6c3a2ce6054"; + sha512.doc = "0661e3b6e92fc80e638966e7df452693cf3a3062f9b75016d636eed986dfa265cc8b240ec8d004a604c08e2fd8fe0d75eeada9c4ce554f1dc443e5ad4a0de296"; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "globalvals" = { revision = 49962; @@ -16490,13 +16674,13 @@ tl: { # no indentation hasRunfiles = true; }; "gost" = { - revision = 44131; + revision = 57267; stripPrefix = 0; - sha512.run = "81509f8eeda503dbb62d696adebf15c7f5fccfbd34d23ca8d83a9e7e2fa328c98fc1acd1fd99061c260ace3895cadae8138f0350027c6e81a0b52fb2735a0cf0"; - sha512.doc = "4a1a95d8647cc0e2b57f7815b4b06b7fd009e78a6aae701248f70a73825b394ff508a558a03386871d0a2ce22d43af81b677a2eeb3c2f2475a64a13d87493e51"; - sha512.source = "4d54271026bc1490882e207c079a4caabb8fae9075fa39a2bab4673a4046a63d175e12182fd536d8c2e4bd049858add1739da987a4d99baf3d61a32fc0596687"; + sha512.run = "d7e26a19b61d98aa2fd0b007e5b4d3a8193f16d1fc5be40af7657e63b9192e29aadb07128414b25b1c7fa1fa15da88463def5cec46f2a2efcfed89c42be060b8"; + sha512.doc = "6948132245db5028832119139ac9eb0ab9c65bd565104c3edbaebff255881e97808d2454d03a83d484ff4d7548fed7fc4f7dfb85415b907c0c7d9823a1fc2f4d"; + sha512.source = "33704ba3f239398a7d3bdf0d09a6703bfd168bfee90f613553927cae354caad1e430dcae24d681cfd67a9a60bb55a6edce151fe43e4d2c7146f7008cb48842d6"; hasRunfiles = true; - version = "1.2i"; + version = "1.2k"; }; "gothic" = { revision = 49869; @@ -16549,13 +16733,13 @@ tl: { # no indentation version = "1.3.5"; }; "grant" = { - revision = 41905; + revision = 56852; stripPrefix = 0; - sha512.run = "849bb84949f2fc2f766556988eba540ed1a63ffe1d3a16279295cfcc772ab027dc1e9e5d55a9bf834c24e97a0bcdb04bdbfa653c71f99cf55ec3e18a83015a40"; - sha512.doc = "bfadcd59264fe3d3a6914267cc9d26c5bd6f7aa2061160a6547b04f448daed041d2c15633a61a246ea7808b778ff32679249f4c68e15b84e8502a454a4cec1dc"; - sha512.source = "183057279f539234df3f3354e0aa569679ec5a265a515dbac71aaf9cdb430d17804c001772a6ae69d7918f248d3d641c1f04740c5e9bc578dd65607cd3e4313a"; + sha512.run = "212fec263131499530ecb81d7dd23ad5d162928d4bf8a888b29c190f15d1d15df71f50ba5c243cc1cfffd324cde3362e98d2932e7562f69cdb77eb09025ac7cd"; + sha512.doc = "5170e7f01087c8198220977c1c5bef2bcd2d1a2b824122a9727fb1504576433d682caaa6c9a93454aab756dcf654875fe129c0fbe32452934b1a8b08fcac079e"; + sha512.source = "7894584e5cd67051423ec0febc19e67ddb83e6e183748f9bbe7f037073f8f3d271a6903b535cf699960ea8e8bb5a7fd47a8108cd7ca32e12d309133b9497248d"; hasRunfiles = true; - version = "0.0.3"; + version = "0.0.5"; }; "graph35" = { revision = 47522; @@ -16600,20 +16784,20 @@ tl: { # no indentation hasRunfiles = true; }; "graphics-pln" = { - revision = 54080; + revision = 56823; stripPrefix = 0; - sha512.run = "1afe8fe48cc2ad5af553629554fb83ba07c54d5f45d54ae1cb3f3f2a46235b5587ba93af191666a11f4b9d82b5eac3fbdd70b45918c754c5127636cb3005b5c7"; - sha512.doc = "3c001be0c35a778579a6439c733c8d26c3d89bb4900ee7757c35071a3258bdf1f4d0f6a77a6244b6b7780ad44b1cc3a30beb81fbfe2d5808ab933c56d6157a0d"; + sha512.run = "cbb87e4d040c6844cb2e677d352f9fdf9dca7848a894225944f52abf4b1ab9c03d6ea2881074b30bb618eee647ebfb70d8baeb2a82c3446bef40a47487e6b9c0"; + sha512.doc = "8051321f777155c8bb81d8e514a15e01d282c8ba73ceee6c60fa76201c1c91ba47299bc2ac3b21cd210a457daa1c549f73d299f94e4a972d2b7467ae9f7b9a87"; hasRunfiles = true; }; "graphicx-psmin" = { - revision = 15878; + revision = 56931; stripPrefix = 0; - sha512.run = "852b917dd2f4e4366516db9e7e22a6f34fecd1b69dddf687bd79b1dd995b1bb94c8372b85214e4d4c668a4a8d7d84a8c6e246a09e9d36937cec380c65a14c12f"; - sha512.doc = "7b2872618992fa6363b8a5a4e1d72f51779372475e7b7bf8ec3c5b9b571e77c1d80be42f2958d7c89ee4c09ce87f7c3fb76533010b0266d5108cdb89a81c49f6"; - sha512.source = "7916831178f04abfa1e9a87b993880cdaf678f567fd9bfe37a05529296c7b19ae9d1227711b7ecb829542aa49bbbe94db523ab1492e649304091a70e942ce9a6"; + sha512.run = "d0cb1283998d0ba654ec75e0696bb2b6102968a504e3dee457826cdf82d7cc5793dc8407d0145f314a780b3e015a7be49e70ed21c21e68a3735bede1aacde6fa"; + sha512.doc = "149f130b4e47f60ed3484267486033fa92aa7529169061a2dd9582daef579b6aeaaef4001261ff7bc301c17ef2817bf7bfeef909d22be44079a2c3c145c92040"; + sha512.source = "20cdc55b6645f661f5ae9ebdccbec0506c4e2a4a699dfc88aac9bb6d0ea1b0c308f7ef08abb4525faf498edc77eed5051d9130cc12769dbad7c2a31a814e46ba"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "graphicxbox" = { revision = 32630; @@ -16625,12 +16809,21 @@ tl: { # no indentation version = "1.0"; }; "graphicxpsd" = { - revision = 46477; + revision = 57341; stripPrefix = 0; - sha512.run = "b9a6cd054b8b2bf80372d1e4b7d8a29e1d0c6d0bf0b3d67d961e37ddb433a73678fbf99cc6f2b00d94e6111871b0b267b8541762b52100ee7ead3ebaa6257543"; - sha512.doc = "61d86c6eacc90a74a349eb52bbc7ababf6aa7dbd881a22ab39e06c0abdc6b8498cca525c431b2057245b294096a01a22d40c9dadbea91565b660f59c7b08120e"; + sha512.run = "c1327b1adc6657f423bf8eb0d29224773055f434cf749da8a8b2d1713c2a90a6fdeed2bded223c7cc941cb2b7403cb68927d72b0eb085e906750ce64ffcad3b8"; + sha512.doc = "082a8e580113ef796be4cc750d98f6dd0bf783298fef80a06f5387f352183d513e0d8b90dfb684bcaa575ff7b9307fe11e55f84aa66d7f29b411e06af76e70e7"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; +}; +"graphpaper" = { + revision = 56750; + stripPrefix = 0; + sha512.run = "a165d2b37800c60f0e1c90eb1f3a52395ea3cea1442a7e0b0e2a9095551c173ba0b1dafd6d7cc01101c9f27366e8af17ad9b361f91961721edb925b74412c169"; + sha512.doc = "d49846c40ec41966d297dba2ce1522c49eafe559b093a271dddb0fff9220be0e9c8244a54aede96384a796e3eb61042dc0d0ccc5d820536ab5fa0fd6bb184ded"; + sha512.source = "99dc9fab9ab9fbd3902bdd2abf8d3e4f3bde82d4b68889f1b27ef273790433a3d4a5fded0e66eafaedf33c2c6dfd236102e7f3658ae8ae7e7573e445ae088dde"; + hasRunfiles = true; + version = "1.0"; }; "graphviz" = { revision = 31517; @@ -16650,13 +16843,13 @@ tl: { # no indentation hasRunfiles = true; }; "greek-fontenc" = { - revision = 56449; + revision = 56851; stripPrefix = 0; - sha512.run = "6d9c9fe46975b52f48717fa4f8ce7547cbcc04654bdc6232b084fde4b2203bb62e07291d5061277ba4cb545b135991734b7b60d384547fa6fdd7a8c919ea0287"; - sha512.doc = "15ba839abb76454e4287c0dccfebe6e0971954c990e410748927a1ae683386e4d31f8e99edc66ee7e93fa29548369158410823187ed0dad3923eefd8cef2c0e0"; - sha512.source = "ac2412080276a750b5cda3521995838d64cae7f72570118f65014e5bc2693b0e894dd255bb4545260d0459bf2a8adc6dcb146fd895d73e3e38f94641dab2ddc9"; + sha512.run = "4b7189bd9080c0c34bb61c5d47dcd09985d61875af06c4263c408be70e85657bbd36b94a9f183b409739ff72ba59b1add5fdd8e42a1e498bb3508e3d997d2b53"; + sha512.doc = "5d6495f824069c6866f3821839b671ef872dda96435ad0dd95a2b719dadeda5325d1d96bc8c4b68876b0812fec878e0d0770ff82c73fa4ec020bf9f0e059150d"; + sha512.source = "16049d6c57eca659c9aed41e4ac18417d667d5fb39e1bfa5976b5f8980c33425bf2301288b9284b39ae00e39d9c2878d09b25cfc793e51c09df92e703f6a968f"; hasRunfiles = true; - version = "1.0"; + version = "2.0"; }; "greek-inputenc" = { revision = 51612; @@ -16913,10 +17106,10 @@ tl: { # no indentation version = "0.1"; }; "hagenberg-thesis" = { - revision = 51150; + revision = 56798; stripPrefix = 0; - sha512.run = "a8515fd281f726029f3bcc170f60c8a98447d8e16cb64ad787fdd5576ab5fb58a077666f191a02f46608e1aaf84bfcc8f1064a28e00c77f62505134a5508be28"; - sha512.doc = "e7f1ff1c796b7ec2dcd7758a46149a20ce3d33fa6bfc3dc93a0d7dc4832e4f4692e1e74037c1f9e990a0245fd6cc5791ff998439ea6604519cf40bf463be7476"; + sha512.run = "abfb384663a77bd084a7a4f3026f59015b1cb70a851e25153c921ede1089bf43b6abf3a8a50469a55cfa6598d54983604d395eab8c5115ecefe7250ba872462a"; + sha512.doc = "78b8f4fff31a9f0a63b6d31e5d07bf8bf76aa6ad5b37e8ab7a28522bb9f9963d0b8e99925681286696d8e6bb688af8ea02788faaa7bff0ab50d2f166b6c9a4af"; hasRunfiles = true; }; "halloweenmath" = { @@ -16990,19 +17183,19 @@ tl: { # no indentation version = "1.0"; }; "haranoaji" = { - revision = 56332; - sha512.run = "d13fccbff9d21d7d824b62f1a533d71108f9431e34dc8bce659ffd77f08eb259d8b35955b49c3a7dbcb0244a144d9ce9692ccccb7304eb8f69e83d26d0ff3b2b"; - sha512.doc = "7b492338b6d3019fb1f3053df064c905da971ab349aabffaa6fab83688caf697551f5bfa72ed36a30458efbd55e30a452886cc077c02e69eea7e48768520f502"; + revision = 57294; + sha512.run = "0d27d0972980c6c5298e12161a6846a2d4e12b52013022ecdeef304e8365a6ee7c73b5c9ba970390835f4cc16ec765933a31304bdbad055390bc9dee748764bc"; + sha512.doc = "22dd5648f9195ef18bd0692dc63baa6c6d570bf1646bce94a6026dcba044dd99391bf32a33ed97597dabb08429bb2fbeef20397fa2cd576f44261ae14a657160"; hasRunfiles = true; - version = "20200912"; + version = "20210102"; }; "haranoaji-extra" = { - revision = 56331; + revision = 57295; stripPrefix = 0; - sha512.run = "df0709a9ec12df5c2afa7db5ef414fb5fcb7ecd434364c4b2315bddb4739b5d0f09b54ce6d534a3230f35a9e60c3a8f6b1ac25d2a15c42d091f7db7b5ab6d702"; - sha512.doc = "c3d8c38ba36c04d5fc4c200a4e30247f39cff044d580fa47952c1f9a1d42cf6b1493db80749b2a8e3698f3f6b4469e2abdcacdd4090696d3203f5d912900b6cb"; + sha512.run = "61b6ebb1501f78da1020369edfd0c5e8162181d19e9a761654dcbda513c17491f0a0bbf455d009c6938f3e9977333b0a571c5246f746f39c09e687434fa33ecf"; + sha512.doc = "612b8a79a489d8c02c9fde6148781b6fc0941a9e4ce6c62f58282319a54f94de94b5202ace0baba4bad9b34450de3ee255ae319b991a06147ad951cdacd0afd5"; hasRunfiles = true; - version = "20200912"; + version = "20210102"; }; "hardwrap" = { revision = 21396; @@ -17134,13 +17327,13 @@ tl: { # no indentation version = "1.0"; }; "hep-paper" = { - revision = 56503; + revision = 57045; stripPrefix = 0; - sha512.run = "b534d46acfa9c4af79284db33e1ddf5cd8065ffc7245944fe9c156cf47d53933773b346f9a37c74ee2a8f996a2b0e561cdc6e16fb10bc73b97a9a3d68f2b6fc8"; - sha512.doc = "0badf0779c4cba733b71f995b51c105a906ea53fee4fbddbf3895b0b7682b5adf205b99aa60278337ba9d15c2deefbf9c4fbebe060d88273491cbce6c4b0a382"; - sha512.source = "600f5f60c241cb6ca608b1c8f0dc82054eebb1366e68da552e1138e470eaf427dd5eb6201833fb7d63e5c34b1d6bfb6d078881537608ef30a7902e4ca76cce89"; + sha512.run = "e7422cf1015b554b20d6fa6cfca317fbd2e057ef31f6d57448ba11126c3b6b863fea428c642f15b8cbbf46929ce943f362cb99cb95cbe7d1bfe821c4315661f8"; + sha512.doc = "29f71a395be21b72cfd2c0f167e11475215dbd7005529a89032a316d5802b8e2feffc7670923ea57b6f2bdab4d298b7798f122263ab496f4a4da323f8a44c483"; + sha512.source = "7610edb2223471f6ad729dca66145bb0686e56fdcebfab9260288c3fbaedad0be638f300f789158d824a0a04828297853c5b0774c4c2a96cbb0d48f2d93fd61a"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "hepnames" = { revision = 35722; @@ -17392,22 +17585,22 @@ tl: { # no indentation version = "0.23"; }; "hu-berlin-bundle" = { - revision = 54938; + revision = 56808; stripPrefix = 0; - sha512.run = "ebf45ed546b7fbe9c35d36b4b025baa6e554074261b73e0bfb754ed3de72b8f39653960717510e13fcef040326bd11ac344eaad894acd625642ab2ee2ade9e66"; - sha512.doc = "ce8fc4199cb94937e94e66688f0111150bb20e81f653ead053f0bdcec33945c96ab2f6cf4465420f19bba98d4e05565167055dd1c689585c7a80743f26ee0268"; - sha512.source = "ca75f32cc9a4eadbd5bd32c4ffb3aa86f882638e67470d2da6ba6be98460df4b38606763cc72efdfa1cb43651efe5068ca4f2e06eaef5b93bd431c837acada94"; + sha512.run = "c2cecdd1d3d4d31be7cdf4816127bef40697d26a6cdafa9d571d8495d1f7b1de7288ecbfb314d8d8754e492c06598fcbb79a50dc1eb82410adda13446d7b4629"; + sha512.doc = "ec11fe418fda3d98940b5e57de1330b784fe4579b41d3394ef82cdd24bd2298e978a7819bf676efb6aa89b67118849194c4dd63beaa2b107a0d4a5336aa1ff2e"; + sha512.source = "4258c7cb1fa54fcdc1c7d19c1bdc958ec6dd47c11cdeefb0f9dfff336f2ddd2479f200989557278a8807fac62bb30150b70bda5f140bdb83f99e507ff890dd5f"; hasRunfiles = true; - version = "1.0.5"; + version = "1.0.8"; }; "hulipsum" = { - revision = 46803; + revision = 56848; stripPrefix = 0; - sha512.run = "c43867cb608e955254f2c597d3fd9938fe815c1683c9d61dcd1cfff29608b5c391d7374a740646dd915fdcf282d9adb8f83d3dcb6781fbe547b685de81f67143"; - sha512.doc = "43dcdd731116bd1eac309b1213b3c961dd189f861b8732d73127ba6b4c20d3ea3584f03340ff5973b4aab11744e61069edfe6736d389e1487587d0372591e343"; - sha512.source = "e1290087087ab8d63d2e2de72cbf641ec71ae362a64faca2e362cccfb05890abc9cd970a2eca1b1c10cdd95760dd82e8bc90fe0e8ef4d99df6cbabba24c80be0"; + sha512.run = "32e981937f3077fb1310205f17bd10c93ae20c98e098f766b0a90218d81c7708071aa4ca605bfc55da1614116cbd8299f9cf1853426dae04a99669839b2d5c83"; + sha512.doc = "862a91b902cc8bb0d71efe3933bd0a1b0f3aba1023586595d57cd45e15a0b961cc3c56a59315eee02337f89d35582497dd6894bf3ead060d2863823765211e1f"; + sha512.source = "6de61158c97297d4c76691f6aa2686d8ff88317de0dcc951a23e6aa93c63a4fecfdcabb74629e2e12ed7878a8a74987834f36faeae3c5fd661bacf99aa7f7962"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "hustthesis" = { revision = 42547; @@ -17427,12 +17620,12 @@ tl: { # no indentation version = "0.01"; }; "hvfloat" = { - revision = 52010; + revision = 56834; stripPrefix = 0; - sha512.run = "717fd6f3a1b9f7fab0cbbfa929b09e9186637d56092f50d1f0d1603b7b7d67c300587d12e9ec25e73a89b240ac3744bbf232802b2046d34b8606263a7fb6064b"; - sha512.doc = "98b61ee75c06007773a5119a5c9ded7d0ff9579e016dd024265329193661771ae246b9e0e44c55017dae9754219f2898abf221a4affb6231e0d7ef775fbfc30d"; + sha512.run = "3ecdc2af3e48cddaded469578c78dfe9e79fc025de0f23ad0a42747cde47a95fd45220c176a216b629ff79c2409da249cfaa05f5c0c9143dbf70bcf36188509a"; + sha512.doc = "28459902c85223099ddacacec3e1e23f25868be54d713e84a1e8819821de701bd164c63f0d9f868bb97d4f8ec7f551ce72734da9379df8084b2d8f7f5f53bd4e"; hasRunfiles = true; - version = "2.16"; + version = "2.17"; }; "hvindex" = { revision = 46051; @@ -17528,13 +17721,12 @@ tl: { # no indentation version = "7.00e"; }; "hyperxmp" = { - revision = 56599; - stripPrefix = 0; - sha512.run = "8c21d5da27f7276919e0c9e7e348dcf8732e2255363ecc78c47eaa18139cb0e71d21973f5d49ea975e766496d3a8adc5c6f4d339c1fb9476bf73e0573f4c5ef8"; - sha512.doc = "f9f99cd68383ccbe7f38848e584a7a84975359e699246bd823435ec6fb7dd8a99a5c7925a8eff1dd548217954be75ebd5ec31822ab454205925d0ee6f06326c8"; - sha512.source = "7c8b84ed41d6a4b001af3be6fa1a430d99d3989fd52e564e0cabb6603af97a675dbba991b8b15aae7e7441b1daa88f70dc58c019afc88ae8c49ef245a2bc1c2f"; + revision = 57004; + sha512.run = "559312539407e1ec8eca1e476d015baa88631b8750249c724a9a99a2bb0644680ddc7b4d9c1aa8cd74dd9ff366b2e1821a01bd6d6eef54a14a72d8877f86b7d7"; + sha512.doc = "e63bb28383038ca1ac45bf0af92a95e50383b1a9dc3714b3e077a37d92022c4304dd00ab313979c7b7763f2ec6ba8946f6ba71fb09fc0870d02a0ac89be25c53"; + sha512.source = "8c7aab81881bf79fba919bb752a5d9f5c9653e89755d1c4bff5c076dc24339dc1327de57fb35393c7d80ee0ad46b4c787c81d73cc15d8d3111a580059bc2e361"; hasRunfiles = true; - version = "5.6"; + version = "5.9"; }; "hyph-utf8" = { revision = 54568; @@ -18492,11 +18684,11 @@ tl: { # no indentation version = "2.2"; }; "install-latex-guide-zh-cn" = { - revision = 56485; + revision = 57044; stripPrefix = 0; - sha512.run = "41ea58cf9cf168e1b19b65a657b052f904dee2bbcbdfd7d197897bc8fc7eda34953e794ee46720392de9d4869d4ca2ee3f0c821d4e687b042fa32464ced4243e"; - sha512.doc = "b91e7225472c9807f485737370143b1be72c0ee819135ceb6ceda6f6aabe382ac96dc0cf82ffbc98fefabf78a0bad903894bfe92e5fb69b7ca1bc205f2ccd19a"; - version = "2020.10.1"; + sha512.run = "e78b1e40d1af14893a0a9219ad702a3acfa0f9e9b4202c8f1e86962605c5967ea161d82c47982aa05c3f7af6737fc97615af673b37064a5c538452af997e6c3e"; + sha512.doc = "18898a72273c09daeac132a1ec08bd9e324aa8a3044cdb759cf7d3476e56a5b47cfc261365ec39bbec9885d9848441af58bbf40917d8fdd016bd49a7db5950cd"; + version = "2020.12.1"; }; "installfont" = { revision = 31205; @@ -18514,6 +18706,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"inter" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "44de293fff8e1cdcf36796db13bba42c7a95f3ea49b48597bb743bc08bacfa504ed5dfac1ebd7a4ff0ed02c88433679f164f2d2e406051b1d0f3e32218df4747"; + sha512.doc = "df5ce5a034ccbcf9a04f89f362a75191c6254f55cadb1abb10f51fccadaead4d9efc160df19e6eb7f81161716d27600a3be5db1a482cf23ff3416c19b3a172a3"; + hasRunfiles = true; +}; "interactiveworkbook" = { revision = 15878; stripPrefix = 0; @@ -18793,7 +18992,7 @@ tl: { # no indentation version = "2.4"; }; "jadetex" = { - revision = 56548; + revision = 57186; deps."amsfonts" = tl."amsfonts"; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; @@ -18807,6 +19006,7 @@ tl: { # no indentation deps."dehyph" = tl."dehyph"; deps."ec" = tl."ec"; deps."etexcmds" = tl."etexcmds"; + deps."everyshi" = tl."everyshi"; deps."fancyhdr" = tl."fancyhdr"; deps."firstaid" = tl."firstaid"; deps."graphics" = tl."graphics"; @@ -18831,7 +19031,6 @@ tl: { # no indentation deps."letltxmacro" = tl."letltxmacro"; deps."ltxcmds" = tl."ltxcmds"; deps."marvosym" = tl."marvosym"; - deps."ms" = tl."ms"; deps."passivetex" = tl."passivetex"; deps."pdfescape" = tl."pdfescape"; deps."pdftex" = tl."pdftex"; @@ -18850,9 +19049,9 @@ tl: { # no indentation deps."url" = tl."url"; deps."wasysym" = tl."wasysym"; deps."zapfding" = tl."zapfding"; - sha512.run = "888240841018c133c416f7dc93e29250cb9d310a6e0a0a1b17505e3ed43061424e4654faff7e973194df9ff6d2fb8b9bf2b80eb044241477af13db0508b60ff8"; - sha512.doc = "ceafb41e34d2e1ea2bcc6564fd2f2d0df8fb25c8289f9b116042caa8b208c55e2fd40952fab39e4dfc945a5047ac5652fcbe4f674311d7cb39872c1d9dc96d55"; - sha512.source = "04cef58d297fcbc27f6328747ae2992038d69733386084e868da9dec3e3bcb3d312a6f4eaa1ecd4b9233bc70d53cb62248df4b54a3d1949051aa70d3fe9fe45e"; + sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22"; + sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895"; + sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f"; hasRunfiles = true; version = "3.13"; }; @@ -18865,23 +19064,23 @@ tl: { # no indentation version = "1.12"; }; "japanese-otf" = { - revision = 50769; + revision = 56938; stripPrefix = 0; - sha512.run = "e62e32e37fd460dd16a5bf62423564a83c6fc16a9b485dafee5f00fd4c3342e3b94c78731e25a9fca3aebf9cdf91a4bd1ae6edb8213699adc4c8e7d139e14ecf"; - sha512.doc = "90d9247aecc96871f1def7db153266d9c42292c5f0fdd7b835392cdf61d2b15c908e2895868121dcc5dfd508c75c1b7424104412a2b75e430a8fd2f0107cb085"; - sha512.source = "e3cbd6b664fdaf62ef764bf10c3f42086d541805d8ddcae3557f19bb607678fadbfa2e6d7dd97e9fa914a7153765c63eb0da6e8a89506a8e3b453923e785e869"; + sha512.run = "2b239e55b0bb4d43afe140f1034ce8c6c56f2ff46e552c0075f580a8ab727c1d22b7f889b6a9be1d1961b28404c7aa5229ff3b7f5933ee0f6516f70624e9df71"; + sha512.doc = "a5bfca2b99af9923ba718c08a76e2f346eb31276724e807e5c1fb377785d331becca1ce29592a26641ee7855a8b11993032cf902084b82e8047b7cbc648450ed"; + sha512.source = "6c5a32c070e8a8b439b0c3796cf49dfa50f339a92e799de5eadb32e673d87f3cddd2613b871669c2d930d643c650a0a5b74019ec66f8726ebcb8db6b388b05af"; hasRunfiles = true; version = "1.7b8"; }; "japanese-otf-uptex" = { - revision = 54080; + revision = 56932; stripPrefix = 0; deps."japanese-otf" = tl."japanese-otf"; - sha512.run = "6588523cceb59812e63a48538684a47ca5e11208e6439dc9b0546a98931884c747c35c83167ddaf27c6db7e82b7f310b7a938705554f371dc85104af315ad082"; - sha512.doc = "4f5759c53f127aefab7bec2e9908658548cf19000372f059d1a7c16c5f48f2586357e26711e94dcc7b0454d7abd1eb0370bc6d9df8fe05e6245ddf6280ccf5d5"; - sha512.source = "3fcf2a425145af523347036de783b6a536f883ed16909689a7ee5eb95977791feb36e0efc1d61e5ce21b7895847e330160034564ad6f14caefb1ac1231a004a1"; + sha512.run = "cd95656f02cd97a06119134406b519928ced50c31647a4dd421850d7e83b3705cd2b715be2e23c45b77d1634c47fd5cf8733aea05c654a0d3fd7fd223a3742a7"; + sha512.doc = "c67265456120136645bcd45f099e62174efa2350acbc5a13e45e35e959421f94cc2f1492bba9605b087008c3fe565ae8a52f4842070ac98039d7b6d8a9bf2172"; + sha512.source = "efb029012b07e8bffa1311424138f923b4fec963bd2373a9aa083ab048007b05a2cabdf1fe53eadfc0d2431d0a48209f2e532e9a36d914868cb0dd932ce55098"; hasRunfiles = true; - version = "0.25"; + version = "0.26"; }; "jbact" = { revision = 52717; @@ -18928,11 +19127,11 @@ tl: { # no indentation hasRunfiles = true; }; "jlreq" = { - revision = 56450; + revision = 57255; stripPrefix = 0; - sha512.run = "8cdfbf489cccba9895ea88619a482c0cc79d12f713599814ffd1c6758ee69196773dc2772748a5f83eff6a7e54d3b0f599798476b55edbb009049479461a5df5"; - sha512.doc = "96bacbf8fdd7871ecd7ac06ec61129f0f6fb6406af1e2823a515f71bbaf6424730bb220cf90ccf255dccbc9069e8e22377b5cf1460594f811939781630e39333"; - sha512.source = "f2daa8c58838a543b2038f5a75efe768f55a929e6d0534b266ff567af7fec34080a7dde732e62b6341d83cc9cc81460b1ceb161a1e26293db43ae7a1ff62fe90"; + sha512.run = "3bf697f70e74e89f0ac386b873d1858b5873c7889e07c6d77f72fc5a8249d60f0253b8531d7071a0153ac1ef70a3420d0f06664535f5beb5b7c734286cc142f0"; + sha512.doc = "eaad01ae6738d1773d0f085f011f33878b1dc18950a559b2378310ed9184e68b07243aa174ff90c5fb0fd02a570ae8c063333d35b84d007a029783df0218a2a4"; + sha512.source = "6b29f1ebb6903e661924e6d83a29bf06cac256fc47f21b5098b1c0ab8954b353857729d373371d443517a47a92a7b5aa8d1808f78646d9f27b032a573b9105c0"; hasRunfiles = true; }; "jlreq-deluxe" = { @@ -18974,18 +19173,18 @@ tl: { # no indentation version = "1.00"; }; "jnuexam" = { - revision = 52696; + revision = 56867; stripPrefix = 0; - sha512.run = "9fc6ed0fc12a0eec779a511de2582cb6278b4576569cfad310a26bae0ae024336b335b2ff9760f0055463302c51933ad291a25f542a7974c56e17c3013c480c3"; - sha512.doc = "b9650a69d2f8b7c78e165d35c3b8cfebb8e76886f5b20a0592ab6b50ec63a659c5b76c6cbe02b8c5aaad5a7733623fd8c73bed624dbe9651bbb2263339f9019d"; + sha512.run = "36aa8858e22affb522332de4ef06a2760c5f4ecf24858fcad34655e0062cb319dc27a34ae1648fc89ebbdb2d3d79f8630d4d3663956022ec345a31cad58a5d1a"; + sha512.doc = "e80d4db8fd0f094589ab88ef2afb01f17be611ef07b0b6fe827e8940227c5c47fce7841881dad4ce2805c0098f41eb27da5491cd50825cc70b5aa2c5bf4b1926"; hasRunfiles = true; - version = "0.7"; + version = "1.0"; }; "josefin" = { - revision = 56311; + revision = 57152; stripPrefix = 0; - sha512.run = "1cb061f0e72671cee31091ae9814793648be204c6383faea0e57ceb8add5b33e47ed1a28e241567b4281e46e519d2a293320a7c784b9dc51e46855a5e1816f77"; - sha512.doc = "c75a3969286e3473f151e09a2ee04c79e0e145d872cafe897e71e55affb1a50bd5be8d51e5236fa3dfe134eafe417e387d866d4353e161fce24915cdcb72e767"; + sha512.run = "4f0a7e6095a676878617bf05b1680c5482b3f5f43d00abf2460bfe1d09568721afc2808081001898bebbc8e16e54f9faab0a0c9c41b0d6aa0bc43f7a829f1b16"; + sha512.doc = "2f59d8fbe271d00673bb78592d4f3a9ba70a5004236548dcf49182c4efc458b5973d1e01a3f97bc3e6556d8b70d4e20f52d7f268dd7ed2b875fc1656d6781506"; hasRunfiles = true; }; "jpsj" = { @@ -19004,20 +19203,20 @@ tl: { # no indentation hasRunfiles = true; }; "jsclasses" = { - revision = 56551; + revision = 56608; stripPrefix = 0; - sha512.run = "0b5c8198118e948edca1f997572a5e7669885bfe293a2f81864f203827dbc614a2cafa0b666c84f23921bd9d3710c69c42974698895829bf9bb6e9eda053ad7f"; - sha512.doc = "d263ac273320245d8b60025da2381002ef0d689527d314f4f1158370099add8286c13101c979fd713a77c34f362aa5748020f53838df2047994721082dd06ff2"; - sha512.source = "07742680715d6cd8a8db48b58c922c1904e85bdf378a888d637b33db3bafe94a602369ac0dc4d77f8e611390a6dfdad47ca6f2a74489bd9460bead02483acc2b"; + sha512.run = "18c5cd1e63e4fedbf1ec0faf069d40d34dd72ca18af0d634eab16b5c7ce92139cf4892492782f816c0c0deab4706ee1c5a83d052cd122f7d5df35f1d5d2ff4dc"; + sha512.doc = "f9d477ca10dfa4fe83e2f5a981f7584555e06968417c542cd09e223a0ef30074540890b3f5b28de12b9d77e9a45e3bae19590cfec31d3232528db1d854514083"; + sha512.source = "c4b4d11b3684122e47cb3b1ef59001e0163297768743b570f4c64c3eb0ab95f41a6660b44f6048acf4e9d1f4b949eae9883ee97cadec53798d363f3630cc4fca"; hasRunfiles = true; }; "jslectureplanner" = { - revision = 55117; + revision = 57095; stripPrefix = 0; - sha512.run = "c02db09361d220d33d809980036ca25ee6aae8f1f8260025b56b2f48aa4b70a22f48fed82f135b3e25638179959879c6253f64bd22f28e63b2907f7a94dd72d4"; - sha512.doc = "f69151003dae7e70219348d8ee405ba2c7da79adfdc49e609ccf3e55dde0b538e0ad60bafd84846ff3211a17d1a42d2fdb25bc852a34c2efe5f0ba890f5faf51"; + sha512.run = "022c878b95fbca48c7cd3464a12d5af8b29b26c2fe46f3c4dc2f27e6c3b3660f78f3baa7b9d289c3444fecd7186f6d6cb18d8c6c94b9ff27842f6c9018e9762e"; + sha512.doc = "1af4d1a75b6f5f056f0426f00c8c26493638e8efbdd5ff7b746f45cf4ca3c6648d97b3832885d97b71124cba7e57eb22fc2018619e5a33c66ece10ba20528a2f"; hasRunfiles = true; - version = "1.11"; + version = "1.12"; }; "jumplines" = { revision = 37553; @@ -19035,6 +19234,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.0.2"; }; +"jupynotex" = { + revision = 56715; + stripPrefix = 0; + sha512.run = "3b5cca7c6b8b14eda35d52a6db5e7ac027c0b29ee08a7b8f58411886963d8dc69348752d6cc1f010d11b9216026b705fe4cc915d2c60cb3ee9f3950fcc6bb308"; + sha512.doc = "35b8d2dbcbecfb4e7b2bfb0ef39f2d076d6f4eec9189e89cee3bdfdbb6f57d5c1dcefbca3eeecf4842f7f94616030d2e73588074618b39e232f40104e371f3ea"; + hasRunfiles = true; + version = "0.1"; +}; "jura" = { revision = 15878; stripPrefix = 0; @@ -19410,12 +19617,12 @@ tl: { # no indentation version = "3.33"; }; "kpfonts-otf" = { - revision = 55605; + revision = 56965; stripPrefix = 0; - sha512.run = "f616a5e48127bd28b80ee68c92531720478f4163f1b499106099dcf886d38e417f5c6b355e7827e20ad08450e7872b81f1a098598d5e3fdde2a86f5f6d91ad5b"; - sha512.doc = "27b5013f325a9e4aac6c6798b6cc09c1b4f1c90e1b86a41cab3b3010df44a0e2b804c52d45595ca5ffa50b08186f4a5c02efe7a933f5848850c7cb78cd07809d"; + sha512.run = "5b276450ecfc349949dc093a8d4e3cbf5bcaaba4600ebaf8806c5e1501f6cf163b56f41bd6646f2aa98c2d3dd8177c1a5455ab672227c46251417cdedc6c6a15"; + sha512.doc = "57b5064033755149ff9877f669d617f6652d698f6f63a6fea62d6b1d1c31faeaaf19ccfb5489643cdb299a4c7ad1c3a40df34ae45dbec500253c2394a3170bbb"; hasRunfiles = true; - version = "0.31"; + version = "0.32"; }; "ksfh_nat" = { revision = 24825; @@ -19487,13 +19694,13 @@ tl: { # no indentation version = "0.3.5"; }; "kvoptions" = { - revision = 52985; + revision = 56609; stripPrefix = 0; - sha512.run = "af26d9fcf6f3afbd4e4dc105aa84e77bd737649864b3a8b4ba822e1dc62f4fc95e916df704249757d1ba4ec3b8281b510a6c5278b1f82b1a3af558b67790a781"; - sha512.doc = "6f567a5310250dff8d15de8d0fcda8c6eaf392fd9e221b5ea50c0de0bab44324ffcc42902a9d3b6f13cf6090f5e8ca513b5abb218b0f1827e953d76d377ff1ab"; - sha512.source = "ccb433710f2337e3663cf295b951e7d83e1fd46420a7dab127ff3f0c78f0f8e82ec064639f9c071f2a1e4ccb454776560bc25399e22fb6621c53c984c75f34bb"; + sha512.run = "47d2d386a418ffd07810589061d13e625b691fe65522ccf5efb514750314933aeafa75f1e2a56df9851b2cabf3bd54be9bd1200df59c671f0f7c92e90d9aa9b9"; + sha512.doc = "dc8fa31afcb9c86d5a94ffa4bfd7e02fd186b27d1f645a5317c718d8079e4b003426e9202c49f6cf3017cd49a59100d8c2a6a553d16012856e340da0e9ede0ef"; + sha512.source = "90a0c6d2b03855dfa7716eb9a18d3c412e51a5bc592650677298eff8040acff81e3c2cda492daa0790372034f33e93763f4ac02821587d095f77dc0810a52b25"; hasRunfiles = true; - version = "3.13"; + version = "3.14"; }; "kvsetkeys" = { revision = 53166; @@ -19563,30 +19770,30 @@ tl: { # no indentation hasRunfiles = true; }; "l3experimental" = { - revision = 56424; + revision = 56785; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "cba1e6ae68df39b177f73cd37a61336218d2b7c3a84b13e5ec73d9983371585d79d3161fd868d46965e5742a36f2750012bba26de1b5f06c91f628626451a0ec"; - sha512.doc = "7432bb979abd6d0c126ee082df7504a16f5fab8320c21b53bfb9824a12a65cac9521687bd78d7891b382400b7b0f0bc2d91e8c7cac2fd13d9bb71d00256e8cfa"; - sha512.source = "131351b476e0d49c2052486b836535bbcd21bb5ca2f7d2ab1caeb5e5f4461c813f4b5090b9160e8fccf176352f401cf95bad6eb5867c4a3937c772d7ae3e7964"; + sha512.run = "165b85e96ac4cbc9ac1a4f2e7ae20e65ba66d1aa1f50b0a9ce36041d2accdf454a165377de5f3f09aa478986f66e866af26cdb05aa2b8f6c94ec6383b3de165a"; + sha512.doc = "9646e1a90223a22b891e5735a5199df3f81af4d9865aa4a66655202caa4e430172fd9138c5f1345d0765f869749fde87545a38b78787db4ad47d3090b4add92a"; + sha512.source = "c72ea71c020c3b53d1be361598b19f7a0ae6076b16cdb83ae5e2efb435e3ff306613bf69334f9632859bf3ff6ebd1d78dabe17fde4419f2382fb1aefe255c5b8"; hasRunfiles = true; }; "l3kernel" = { - revision = 56556; + revision = 57088; stripPrefix = 0; deps."l3backend" = tl."l3backend"; - sha512.run = "dd26d0f611e65ca01b342c2d0df47691d77e2fc251a8c8ff4f6a209cf28be9f4b078aa68a4af826b144c0a01f11e6abadd5ad3449d1d95f1ea85fd3bafe734c9"; - sha512.doc = "e301a22584d4c44961dee61fcc89da60d609d1a61726c2ea5b0b73e88c44fcb6bd9bf0a8ee3c1f5cad15ade28c554c4d07c50ed17cef1cd1bbc2d542d1b674b6"; - sha512.source = "36a813c9faaf61c4d497eed0c8b2d8b3347ab44ba34b8493b077a9327ef31517ca6607219d8566036f57280500a540e149dbffe863d5d1c10576e5004455519a"; + sha512.run = "88c7dc3c6d89233cdf67e34de15aa579049cfe3697e1732dfc0cf7b8490bf1495b33bdc2887862be0bea5d3dc52524bd98f055d86947133c612772cbd40bcd13"; + sha512.doc = "a7a2096d9f6f7e314e092c81ac077c0278f15d7a16a7e04fe579f23d641c5e7441a51e40be7a02b05ca6faef440c533a68aa2df82a10b56f142c1f3b8e838e7a"; + sha512.source = "128ec7b9af20d7c4fbbfdce6817f09be325982143a72989ac46e549e6481b67ccb8eb169c00dfdd3096612ea87e2e6764d0d69be4134be81de164c48a0bda3b6"; hasRunfiles = true; }; "l3packages" = { - revision = 56556; + revision = 56785; stripPrefix = 0; deps."l3kernel" = tl."l3kernel"; - sha512.run = "b0a5e19018f8b4520bf5fc4b4cb05f5dc33745dc230a591fed2a0b537524d0b9c7a412a17fd2ad5d13b83c80ef89ee3bb21dcf2398d7c8ab1b19dddfba7c9186"; - sha512.doc = "73d09a2d6a5466f6767333a501d8da9bdd44f3e98af6ea03f31bdf9b9c1a9e78335ffa45e66ec6eed6546a4cf16b5fbf1197561eb7a3ebc16ab9384af2642ad0"; - sha512.source = "04b20e05aab7333b4928cdc81defebe0e5b7e9c20305f8151e113e899511581b4239356dee58b62d3505ae1f0cc1b003bdfbabbf597641e5d58d9a9a9c247d1b"; + sha512.run = "90facd1c1bda7c5eadb122ea6b713c19317f88cbfb18c36a43cb5b5ef98c23653c93c4d8d809480ec2f7d5e1e95d51d1970fc0a31a774939a0e5ba4b9bb82de4"; + sha512.doc = "852cc8d995d5e28a33cd94fc6c1a97a0bb3ffed33832edeafdbd9e40c42b7adbe609210d8f8ea90050795fcc095c682136c409a35c8dc1701ed1462e78054b60"; + sha512.source = "bc575633776b67d401c03883dd319fdc6a7a191cbd67c4c31c01db96bc7ef3b5a9b88d4efd6f7f645b284da5e6d2773eca74a8d6c3e58b569a10deb5729be7ed"; hasRunfiles = true; }; "labbook" = { @@ -19708,42 +19915,44 @@ tl: { # no indentation version = "1.2m"; }; "latex" = { - revision = 56514; + revision = 57354; stripPrefix = 0; deps."latex-fonts" = tl."latex-fonts"; deps."latexconfig" = tl."latexconfig"; deps."luatex" = tl."luatex"; deps."pdftex" = tl."pdftex"; - sha512.run = "ce14f150ebcdb0c2ca9ccf2163c2a86020dd185155f551ce2a81d5f4c877b979df920fe1c1792069d3a44e549b3fd6a138eddf0ceb306c641574c47f079f6fa8"; - sha512.doc = "7e4e261fecf8a4ef3321ba7ab11c7f4a76d4dd0d52dc419e0e85a0963b25ee41c08b9b94244d68308181192ac4b3f51194d0b08741ff1f67af15c3e888bf89e1"; - sha512.source = "66f48098883348f390ec6462484f7a0c46498d2157811e08f410be6d7277f298a822a8be9ed0811b7932071169ecd8a1fb3f1f8da81579252802f8a505562190"; + sha512.run = "3dc7384b2074e86b6c45f5096b7a85a03064b0d9be4e74b46adefbfcc1fe80d66700f38494961a806ccd4710219681e2968fa5c0c071b366b197114af7c798b0"; + sha512.doc = "13b7a880f89a5cb1ea79fe32f8fcc20679ed30fdba4c27837b29a7c861f52cfabd614622bcdaa7805bd0e8f1abbaeea0336d346d3a8b990e94bddb516e093ce3"; + sha512.source = "39703818293b0deb2b337ac23e8ca6bf55c982b71e5753dbebffbc3627729f6334e60fb44e68d372401dae03bcfa3a3afedc0751dadf3934fa8037365a390f51"; hasRunfiles = true; + version = "2020-10-01-PL4"; }; "latex-amsmath-dev" = { - revision = 56225; + revision = 56791; stripPrefix = 0; - sha512.run = "1a157c1c8e74587aa626339aff4f88f25df7bb1ef9c62f95208551e3bf27a6f2ad6bcce62fe050ca2e3e4e7b00d16bbf0d82ca898bfac1654f61a90c74ba5087"; - sha512.doc = "4c9b25d22d2419a76285ede17c03857b68d43de0a0eb3ea01dab3ca4040f3ebb41964c2e810f0196c4cbdb17d43110dc802e50fafb4b00d4c1c289d23a9d7533"; - sha512.source = "0b84aa145bddc2b6867a9cd5ddee651d4eb86ef0af05e7dbe6c7354ee086868b4af0e853d9d36efa86127c37edc0594cff0e3e24939a43fa8333eb20fc95ef64"; + sha512.run = "53089df5f54a43f8e6e4835df89824ebbc7ba53d54a96dcb3419be22fb8151337d5b03dec8db095a808135e83de9739f8dd314befb52d3f3340a7f82d8b0d0da"; + sha512.doc = "ec111f9ae7c306c4a028ece6edd89b205a47d05d82ad9872235ce189354cdb2415f64a401c150327dd6cbb1b84d0ca495236b733000213f7fc9865a9baceb8df"; + sha512.source = "13564f9aa92a5e6577caacd4c912ba7b8ac1da004092dd911bc311818689b9cccdff8c5b9e6ae9fb3cbac4cfb0eca0a008d83603a0e793739f02cf4cecd307cb"; hasRunfiles = true; - version = "2020-10-01_pre-release_2"; + version = "2021-05-01_pre-release_0"; }; "latex-base-dev" = { - revision = 56324; + revision = 56791; stripPrefix = 0; - sha512.run = "468cbf9d0a4ec8c3e1a255d2d7bb7867e66fdd7c27d795ced0921a18e58af7866328ea289c55eb501de5f31c49d43cf03621d4501fecf789e445bd4dc58ea5e8"; - sha512.doc = "4142a4eedbae9d595a6f029504d735a89ad1f8cb0a5c40c3379c404fa42d708326cd62de75b422b3c30296b174bad5fbd7d7ad0aeae84fb8c0285695990356d4"; - sha512.source = "f179957b475ac896608a945dc58bae0be0d1a6601f851f8f7a43228ea1b36299e6058ccc8de92db0b4eeeff0b49fb9993737ec4d417d24421382fa7402b1f7e7"; + sha512.run = "0ed7f903f119ae884a95fbff9b7811bd8c89cc88b65f2e3f8ec5f32019f8dff661e9e569eb8093c94568009a2c1fc2d6f5a20f693f644ea73a646ab5e7ba8412"; + sha512.doc = "4286f36538034d7b96aa02aee2269b56f99285dc51ae7e1159ce3f6db87eb39d304b9ea4b8a9e7bb5a1f774071ec41e6654e78741f39b633693100182053269d"; + sha512.source = "331a76aad929e2031a9b8cb1413ef61a23a71cef5b1b4094d7a242a8e1d3f0f5cfd1393e057d24bd2b26983c85fb01c50f228d33c49d4932c506b4491156b4cf"; hasRunfiles = true; - version = "2020-10-01_pre-release_9"; + version = "2021-05-01_pre-release_0"; }; "latex-bin" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."graphics" = tl."graphics"; deps."hyph-utf8" = tl."hyph-utf8"; @@ -19758,26 +19967,27 @@ tl: { # no indentation deps."luahbtex" = tl."luahbtex"; deps."luaotfload" = tl."luaotfload"; deps."luatex" = tl."luatex"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "079f4e09098b46c5cff78b807e614211ebfdb8accdfc0f52b14419ea170efe7e5ece2fcdb8455decc8f91a349577767d10efe48c3b89eb8b093fc79dcf0bbc78"; - sha512.doc = "0a27765213e1eaa8a26e35787703d6a14bb8549517d3221e0ee20cc7c25601a1cd297b6d8c08f67e111bf318d192c85c99f08472e3dfac208400de130bc55672"; + sha512.run = "69400750697649b24d8ea6a5887bd891ce30d0d46461b6cab3de02c434de0e43c06d89f70747d7c7718ac263e6cd63457cff443af24cc53e6c75266c81999777"; + sha512.doc = "16b2f1158d4f10541fee3fa5dbe768c08418918233929786929618a0d843e135f29c5d478e938c4ab3b2020cb85577a0b75d4923902d4d96e26dc756f152879f"; }; "latex-bin-dev" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."latex-graphics-dev" = tl."latex-graphics-dev"; @@ -19786,12 +19996,11 @@ tl: { # no indentation deps."luahbtex" = tl."luahbtex"; deps."luaotfload" = tl."luaotfload"; deps."luatex" = tl."luatex"; - deps."ms" = tl."ms"; deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "7a529075098a1390adfda0787a8f9b07a896153abdbd5adbba5ec6b78bb8091a2f04de6ec1dee1f175d9e23042579982f17c02ea177f591549f8a654b8b5e588"; - sha512.doc = "97b68fd5829437018420e3bed46ad56622351ea048aa3127524500d6c24afe8fc566177cf40c1c55fcba6bc7f716ed04aa5b881f2f4c4853b8d67b9176dafb52"; + sha512.run = "0d89872b56e828ac55e08b52c05280ec6362d0c97ea80ea615c58337332fcaff4ae1f21c329cce59419eb273a5a7a8b19a15f202f87d69274b5754663542fd97"; + sha512.doc = "dc8a6d1d83e919b9382a38cd24c9e891afa3fea433ac0f045f3214bd797fec16b8b53adc95ab0a57d05e931b3a7206f589a8470c7d5062e133d4242cb8dddf86"; }; "latex-brochure" = { revision = 40612; @@ -19807,10 +20016,10 @@ tl: { # no indentation version = "2"; }; "latex-doc-ptr" = { - revision = 15878; + revision = 57311; stripPrefix = 0; - sha512.run = "dfdaaea00e167fa3e4183b6e6a223996d1364707a7cdfc0bb8cc76d02a0c5b3739d8171979dd80540edb571cef84167b24639b265349fc9646d5570e6c48dc61"; - sha512.doc = "e5ccf3968aa02ecdedc2a64f0c53b2eccfa3c4df66da5255068248de013753ec4be67937d9c41552f302979edabc53ce64d902a9f13e4174d67f39909adf9735"; + sha512.run = "22017cc47746d2e14436915a0d649b31050debff1827cca44a3ab7bf9b240f40450d445a8eaab811b8737f589839ab7f2078aced47b65b320237ddbcc443b99a"; + sha512.doc = "c7d7217a9136785cfd6ddb000e51d455e7482bfe395a9131329767bfffc71f918c2349b1426b615a6740263c958530c68c044ee3ae78300a004a8acf20bd8bdc"; }; "latex-fonts" = { revision = 28888; @@ -19833,23 +20042,23 @@ tl: { # no indentation sha512.doc = "ab9d885c811af3964e8cdd8576349059bd45d660e6b9a7e931697f7c7fa5282c725e044817de8f2648ded59519d1592945e0804ba7cbe0054ce2bd4d44606af5"; }; "latex-graphics-dev" = { - revision = 56238; + revision = 56791; stripPrefix = 0; deps."graphics-cfg" = tl."graphics-cfg"; - sha512.run = "cad01cba4a759c006242657b24ae0c9743e4d0ddfd84c15e040b540de948a35a2daf89205cb971a1d7ada9c55fae6e5ace0ddb5430ddcad004d4ff4f6756047e"; - sha512.doc = "a122a8d960776458eaed023041b53044ba88a681667409947664465253c1b87d808df525d596ad5b59ea8eac560374fdcf5a3e41f22ec4f67723405e9a29abe9"; - sha512.source = "8104e54078c023c145c3c78ed5cec1d184a274d1849ef84f386b7e61e331dff9c7ba5934824977007f25771bc63d40f9f97c8c9da749c8cff9b590d6793c0dcd"; + sha512.run = "0c92c61b530930e7e1d7d0343bc5b471b340d9bdab2b277afce01140d1bf7c6f7b0d7658309173d480ecffbe764ab0669335d3db9bd3c0d4be10aebd19243133"; + sha512.doc = "5ec398dcd9ba55e35f1575a09b10d6d589238089ded1653f00dfe15e60cdb1f46df88fe8d21807aeee598cedc66791609a525f01bfdef14c1d5225ee4295cd73"; + sha512.source = "db6214e4fec5acbd0c9f23d64f6e1a19e8ffebf2b2e5240498067a1cffb96b66abbc7d53d2ca02cf1b4962ffc34d79ac0ec6c53ba4a250ba5b518b54017f11f7"; hasRunfiles = true; - version = "2020-10-01_pre-release_4"; + version = "2021-05-01_pre-release_0"; }; "latex-make" = { - revision = 55486; + revision = 57349; stripPrefix = 0; - sha512.run = "71ce373d9bad144557b6cbf8f7865ff27065fd4624332ef53b6a4d6a7fceaaddc8cc02f1c014b1bd5d6ab099acd3bcff3b7e93cae4e5732f76ff8d3a28c397df"; - sha512.doc = "088eecec7bca420b76439c6bc5b9681eccf20fafba661db14727f9185e11cd7cb5abb1214ac87d2ed5174a4dde4dad679578a8045964d706dbbd2ebe260c87bd"; - sha512.source = "591c2354e2c0e833cd54ae7a88312ff4d2b3219dfa280c8e543d57e01ffcda85e89493e19e7d5762cebb1746feb7ea341a1548f478da818048c81e5794fd0e92"; + sha512.run = "1813e8f2c768d7bc33a44d8fa11609915bb392d08da86718ed969fbe3c4284d57619a39284e611ab454d207edd054b36322d5e621cd23e302e85c17c52c5060c"; + sha512.doc = "71111a4f203b1ac200515ff1668831265733c9b7fd6884c4612f1261e65ad6cb1336258e7ef47f51f0d0e12a98f3efe4884f38426c0905164b3a9b8ffd47895b"; + sha512.source = "9aef117c9db4a8e59715ea906c8293fb460ea4026d583d33bb34c3e14ad92ccd536d831cd2e3eb8729eac3b4654236e73419a2bacf84e1c10d640ab9274db2fa"; hasRunfiles = true; - version = "2.4.0"; + version = "2.4.2"; }; "latex-mr" = { revision = 55475; @@ -19887,13 +20096,13 @@ tl: { # no indentation sha512.source = "b99ef070ff70c055aaa13c12e04f1c26fbfda4b663ab98b03b053de76e4ffc80afcaabc7b53633e38a7ad67fa650ef9ede55fd1c924fcbff31c17cf5edfbd73a"; }; "latex-tools-dev" = { - revision = 56225; + revision = 56791; stripPrefix = 0; - sha512.run = "37235091ed24b683b1a396508c793eaa8390fedd65efe50467f5462c97a07dc6520c279bd35b121033ec0d6dc1abb8bf24b0da13c40d640800c010ebeb5a339f"; - sha512.doc = "adb0a407f6914c54c2a11f99e71e53c446439bcdae6bc373197a6dc381925d7b89fd7874998079eebedd69ecb74be25c0cf3443a524638f2b06999a23764b93d"; - sha512.source = "abe9f049767020d20af6850937779a17da1cf0a09ca46150f45161f8d91a4cad467bea4034bfa661e66c888bfc9ea9182f4a9e4732f0980dff3b322672122151"; + sha512.run = "4bbd234013b4105948cba255d8b49f603fc0efc43e563bd95bb9b50612c5e3e1d80cc702d85e53331cd81bff670959683e9be539833138829907ad3af05959c5"; + sha512.doc = "850218831c7ee628c0d6f9764e9b2dc954886c7552b2f7c8a0dc020caa9f629c988b800da7dc46117b950bcf9645ab1d676fdd3b7ef5fcb9b5956d994725e872"; + sha512.source = "16c6e4c33282d4ecf648d549826142c090fbf874bf9dcc75d93c2006b7a264259b997dc2b3d58227200fd57787831b64be32d99a02405fc011526209920818e9"; hasRunfiles = true; - version = "2020-10-01_pre-release_5"; + version = "2021-05-01_pre-release_0"; }; "latex-uni8" = { revision = 49729; @@ -19924,22 +20133,22 @@ tl: { # no indentation sha512.doc = "a972860f65d763c6fb45e9726e5dd7b8234509b90634f45b8b25e090da92d0ac577bf8b33ea7b0a0f91e4e5639bf62c07086dc36708ae697c1e16e644acc83f0"; }; "latex2e-help-texinfo" = { - revision = 56291; + revision = 57213; stripPrefix = 0; - sha512.run = "24c1c19d33f814968553e165fcf715176b6c9d4abefe6ea01281daca347973e3b151f6c3cadf0e9d5e7c7f0fa237f0a79ee2c33c9c7ed424da280d7552700c9c"; - sha512.doc = "875a385bf04aade55883f6e4f55f4d26eed6f6693dfff7d4761b8686cdcafb2b0c9b4f6527e78516db081daa35d0bebe3a19c6c1708cc871a7d4e0dece209f55"; + sha512.run = "914b0959cd94f13c8c8a9e3bf4ce88988816298853d73e02ef3bef24a03e621a43d6e7e2a33a0253991c32c4a02b87bff7eb6d6a8cec7f4ca80142308c4d79bd"; + sha512.doc = "d659abed2563ca91820af487693cc91919ee3ae10c077c40a27fdbcc5ef1b7fc223007945bfe15ba6e5e8c2522b0f46c78810342cbebf9a6e9a96563d42c583e"; }; "latex2e-help-texinfo-fr" = { - revision = 56275; + revision = 57275; stripPrefix = 0; - sha512.run = "867b2ffa7d59a932d5e3194d6fed32f1942f7fb8e241f2c281e3be8618b4d7279794e8fa14a96ea712dee3cf66b9bf211b02cd209303e05725369e4876b9da0c"; - sha512.doc = "97647985c6c205e3f934369ce51a159507a9e24a1c0cbb61fa78bb0a5cb771c3fd0f44b68987ff1682b2819913df1adfc99940a05ca7c077ac12e1c8245974dd"; + sha512.run = "d531614aca1d80614fd6fd8f56ff8c5542c5c2f1c944083d151317820b9019395a7d3ec4daf91d7afc53d3852aee1fbfaa6ece12bc08783d508e996b330e5059"; + sha512.doc = "91f4166da251720271be473412764934212e19fbe21a4487245a0b19e08967c2693b81c89d98788ff7a768f1da462a5cd44aeec95ac459c912e0f128ebe65ecc"; }; "latex2e-help-texinfo-spanish" = { - revision = 56291; + revision = 57213; stripPrefix = 0; - sha512.run = "2dc0cbab315728797ec5e039768ab1eff74f251e7be397cc4b7d440002c329103ddc1b608b343e1f3ade367f89e36216ce94ca38794c8b4386de07b2dd3bc651"; - sha512.doc = "4038cd8f5d507f959234ce1ea704987d9ef1553e2708ea5ca74d8acc090fb39018e1f6eeabdfd6cfadab89f648d156e8c3d2d3993e1479024e9167f57e26e893"; + sha512.run = "d6181f2049056c06911b5eabe977d07d24099bc2bfbfee3ff4d2bee811af9b2a6165fd8ee464fe68172f5b8d47d85ac9ae973a2bbe8dcbe0529c9d68d9c3c692"; + sha512.doc = "8b8bc956d914b97d2679274e6f3e4ef62022eaf32e20dbac83e0c995e0c85ae33e8cf707f94a2ae9890747bedcc27ec46f627dd4a2923f10a4a7ec62d039194e"; }; "latex2man" = { revision = 49249; @@ -19985,13 +20194,13 @@ tl: { # no indentation version = "0.2"; }; "latexbug" = { - revision = 56434; + revision = 57299; stripPrefix = 0; - sha512.run = "2c1c06b809fb954a00b917b23c4e19c887ad54676692aa22a2e791ce273913e80a4768ae6752f89037c83acd83a5d0e98454778a03089eb1a3535c268be5440b"; - sha512.doc = "f2f4f368a24c754a6617449b140eae7b6c865a77043b216d0f33d21982bfd026dfce6306b4607a09d27693550491c830ba73c64fbcc0dfcfb7ee7365dee8b3c7"; - sha512.source = "84c3287dd88f67dd61da423859e2319fecdd268534785c77ff4fa25d384f079d5f98d4a3811c1aac5a82d063df97ff0b889f2722ca44a72c5dec538a65a91fe5"; + sha512.run = "f7045e463fc2496c48fca4d20d8a16c3e19951144fd9e4d5e4c1bfa3e1c43205c28d07bf40e56a4706fba444861fa5f95d941ff5fc65fe1b85f02407e5d91ce3"; + sha512.doc = "48f63935627b204baf755c380cec4e9e1e44ae1f041d7c84849a477e19f836958020c792d81034a1c466aa7ca2dc91ec7bb3dcd4745882efbd37e17a9a24af44"; + sha512.source = "82487020d630979c3f0237a1805427653c4213d06e42c78828dc8e38014746780296d8a528e53a40498c8570a74af5986c207d93dd915614de5cd2789a7b27bc"; hasRunfiles = true; - version = "1.0h"; + version = "1.0i"; }; "latexcheat" = { revision = 15878; @@ -20083,17 +20292,17 @@ tl: { # no indentation hasRunfiles = true; }; "latexindent" = { - revision = 55520; - sha512.run = "9dcd8267d22238e19d0eaa5f59cc3e0982793bb8c95285621a9837960cf8f17278429db212247050f8ab3b4155e32d10c30539bc022ea5e1af9f95850633f838"; - sha512.doc = "08c0145cb2ce2d5afbd1ce78173512b0aa13efc954eef445e3c93cae54e3159bc0e8c4f7c1cff5e0e67a75991b858202953f83dc7681364586ab25855449eed7"; + revision = 56869; + sha512.run = "478b25241fe302b4380193aec2493d8e1e9af701150e012e5b39a19033cd3033d0ecece5a6339fa6bc0b1a5b9b7b228f832ef482d58b14167f481a630f27d309"; + sha512.doc = "a45278547647407029c0633c8932be1c88e240cae0adce10d5a84d7a5531a71706f48d0e7d09a0c673467340fe2ebe80dbbcc4c8ecc2c8fe78419ae9e96d7818"; hasRunfiles = true; - version = "3.8.2"; + version = "3.8.3"; }; "latexmk" = { - revision = 56490; - sha512.run = "419df4657513224fa1586c29fb0c0468c0e31b3c87b85af349d44f236656144e5ccbc145956dde8e3d008c708cb66b7fe4e131d6721893add4fda38a4fd87bb7"; - sha512.doc = "892870b84be7dc2ce87083ad370cb5cefdc4cf27798f633e15b42c6af17b09b7ee803b9c960a311a86e9f7985acdea4768de73d3a992416a6c65ad57d3d1e58b"; - sha512.source = "8ba256d30cf89300645d8412a1117ce914ad59c0c8044fee48728b94fd4ea11c0cdd2353e4d3a320d7d0f4a5a5203deb24af0a7b160f99bafde1b709c09aeab8"; + revision = 57213; + sha512.run = "6f27053fe1356cf751b39801a2d1cb208b5309f45202ac11d87a4b8a573291aedabefbffb4e355935dba8755862a89b5d47eab820d939e6f5f851a7009933d7d"; + sha512.doc = "fce0c767ac6aad345b5cbadb31bda92e1483723299e877ba83983c1fb9346bf776ceaefac89be265d45d5348777f8e5d072306432fba9a81010d2cd15944e48c"; + sha512.source = "32d772c91be32f870d11891f4a34bd7bc903b95d27725edb6e9e3fa8a2b163ea4730c09ee4e0f93babad123f5f25c30f5efcbcfcb64837a7793e9c3d51da9ef4"; hasRunfiles = true; version = "4.70b"; }; @@ -20214,13 +20423,13 @@ tl: { # no indentation version = "0.6"; }; "leaflet" = { - revision = 43523; + revision = 56878; stripPrefix = 0; - sha512.run = "b819cae65ac9f38d7170f4aec4f94adfc547afdeadc345091fad170def744247ed46d653975e493aa64a28117e89a5414463f693a4b2f7e28b9bf998b8859915"; - sha512.doc = "d2355c9b93ae490f4087bca09ed3acc815abb714fa7508b64155d8b5994c967b7296b79f8b3d68cd59d082d7d3d7c618c0d4d0fa50df23724ed50718f0433f8d"; - sha512.source = "38cdcd9b452afc6ff98e946d162119615e44f372322664894a479130035a2a05520b7b1e7f616f17b04914c5caac6910ff18fd71c06a31dae9d4e044c6106627"; + sha512.run = "ec809f2aa4cbc16dd26aae988e2e3b5fcef9284cd31deb126d26989358e52596a50fd63df07095f0bf081c46d1e8af3b3f59572d372be873d9afe1f3db3cee95"; + sha512.doc = "ccfee44447524b112f47211729bcd2c78021dfd19394b82eb7024bd10a68d1a04789d01d16cc9f3b5eab7feda884eae6bbd47b6abe8023893587c49613b44d6a"; + sha512.source = "cb505761b78adbc0dd69fba2888ab86394c7c32fd590969f721cebac249ab8298c87fad284fbb8bd9d557e4f7741559536e504155ee3b4f771dd135204857337"; hasRunfiles = true; - version = "1.1b"; + version = "2.1a"; }; "lecturer" = { revision = 23916; @@ -20429,35 +20638,35 @@ tl: { # no indentation version = "0.02"; }; "libertinus-fonts" = { - revision = 56148; + revision = 56656; stripPrefix = 0; - sha512.run = "d48b4185c711150cc0b72fc9c446a2d1d60141d1a2cdf76b16a279a6c6e17ed52a6183c52fe2809d6df040a700f4273c341e28903b3493ea03caf7856c0cd000"; - sha512.doc = "fbd777f3f6bc9eb1e557b28779957607ed48bfe87bd61567535e31755dc0a50b7da05e115c8ff4a8f69fb2aae72cce9663cc7a3d8e075dbbf665c3dd7043e4d4"; + sha512.run = "2470e6c0ca297b9e8ca6658594e8ed4134320148c71d40a95eaa67969ddd94643bf5375e5a799d3e4a3aa6aa2304170c53e2faa63a0ec571943aa6aee86f68af"; + sha512.doc = "1d869f2e19e7305aed20d4ee530ea10465c12fde92eeaa0c284b1f21a0142e6cb352678c99f49ab1912da7babb34697c9cd51e9b0952fe876fac5d1499499430"; hasRunfiles = true; - version = "7.000"; + version = "7.020"; }; "libertinus-otf" = { - revision = 56017; + revision = 56649; stripPrefix = 0; - sha512.run = "d9f4ef880b9e781d8af175adbdbb36d9a2f3ae9df719260595db0dd329f7a23fa32394cd068df8b93a862316f327f7c5cf61db41e197bd35b0cbcc440d8cfa9c"; - sha512.doc = "d2ceaa1385d4800f95f16b7c9d5a1fce5c9c7dd9c9a51f8baa81d745562d434b42cf82165c265b465c4165dd40fe10f9771fc432dbd46ed9bc4d0470e4d84300"; + sha512.run = "651889d25c03fea583215317148ed157aa23ce66ee911b4b15eb2948f4a658c133108eff6429bdff4ee009241b22ce8ae27cd6820bcff41f21dd47410b110e7e"; + sha512.doc = "c667bafb28873707c0528c7b9a1f0c16cf1b37455d99b62e8dcc80ac09acfa09c16a1fece05eebdfd5e936b4d97d719be928916e878f25126c1d657835252623"; hasRunfiles = true; - version = "0.26"; + version = "0.27"; }; "libertinus-type1" = { - revision = 56160; + revision = 57159; stripPrefix = 0; - sha512.run = "93cac61cef7a6ea024e22e0b082b19404c402898cd900af3cf6fed31111ad1a800b16f59027c4bd7c6d96a8bbd1eaa9866891a090992e210b6f498865ff0ee59"; - sha512.doc = "dc0d3dcbf3180d7b01c65ad301784400a250e33e71f5796e9e22fff9f750dde2c00d129a9e9442cb1aff842fc8e672b8696f80c704bbd236dd1e3645cce266f7"; + sha512.run = "b348fc16903aa7a6ec39ec1266c361966f29c6a15172da955b8f863b834d1bef31c2a1fb430ee268d8ddc55b31b4f848eaf066b1a6e0c8ae5924bdc8918cb145"; + sha512.doc = "7a4bf5396bbd08aa911cf80897d9226bee8bb19b68e54424722cd091f7c39b3c57c3162eff25b8e50c69956f7b569059fb36d84e8ba11173068126f8f08918c0"; hasRunfiles = true; }; "libertinust1math" = { - revision = 55517; + revision = 56861; stripPrefix = 0; - sha512.run = "b6088ae126a70323332c08589903407d849353e979cef4cf5420b2a4556e874d66cd207a51e2ac44b126ff9fec0df19ca1631b174c7533f00ebc081d6a361038"; - sha512.doc = "2ecc63bbb6bb2adaf6720935b0bbe05d354538ff9bd99f21bf783ae3995e89fd88a39128f1b1f2c0b534f05eb9ca4790126f8cff5b51c625c02c777fb9ef7f3b"; + sha512.run = "a0720e690aecd6e8239aabacdb815ebd70512b067782d0efbef9da437b8cbed9edc70f5650eae18f51e3cd37b4dc966af472690fac9bcca0dd025faf591b26fc"; + sha512.doc = "d963d7e8541a8a7df1ab8da508cee578abffeebae9d1326ed0d11f1c28831b6f6656429988ea77378477d7a5680aab1fcadd793931908a93cb16548265c7a96d"; hasRunfiles = true; - version = "1.2.1"; + version = "1.2.2"; }; "libgreek" = { revision = 27789; @@ -21022,10 +21231,11 @@ tl: { # no indentation version = "3.0c"; }; "lshort-italian" = { - revision = 15878; + revision = 57038; stripPrefix = 0; - sha512.run = "b92c1566d1a7c9a079d3d770e9d5bc8e33e61da53100c3cb4617e37765076accd16b89210da12ff954e25a97c55d8a2168f81789ab31c05f66bcd6a19168f719"; - sha512.doc = "2f46613ff2ebaad079a8f2bea6756932aa9dd0840977dcbb8ee195072c1d8c590549e362dc979e9bd373a46ec44d21303aab72f351d799d2a7a3f5b6883e2c06"; + sha512.run = "05435f3a1af4c589267f1841e9af267fc12e2a3fe5b3ea2c586fd352f4a1184f1fc4be408780ff6db1b9212e1e4d1bb7263e3b35e7be9358e97e1712e9abcd6a"; + sha512.doc = "6caa8b7d2795779ef010c0ef9ac387c73b15715929557a6227e0a8112f4d99717ad82fdcdf8d1fe18ad5ea9b502ed559bd7b44f73381475034b481eeb6ab1c9a"; + version = "6.2"; }; "lshort-japanese" = { revision = 36207; @@ -21298,12 +21508,12 @@ tl: { # no indentation version = "0.2"; }; "lua-visual-debug" = { - revision = 49634; + revision = 57349; stripPrefix = 0; - sha512.run = "2b809e240570105b46f361ffcc031719f4afcdba45d14b4e51d4cbca10a7d189b385c00c9b277180bed4ceae45b8ad58e2145ac6f8de5d0568ff5f86b67c2cc5"; - sha512.doc = "814f650ce8505338b41a91e1e7e55872f1f35252ed5f1c3c74f73379b4c60c62e40d48a2cc5eab62b4a726db29fce70761ad7a2a0a17b7d5019859fcd72098f5"; + sha512.run = "f98f686ab3d03e48e377ebec624297f858be03097ed66b6448e82869942ce87f8d1699e4dffa9fc3294a3a8a79a2f547efe0e006eb132ba77eabb714e31d8b40"; + sha512.doc = "dc1deb6a514397c745001c5635d5205f03b44cefb43d6618f83a2314453928141ed9591b5ad8539db96998901981f20ffc80f89b4b7d5532abf736cb9ae0bdb3"; hasRunfiles = true; - version = "0.7"; + version = "0.8"; }; "luabibentry" = { revision = 55777; @@ -21444,13 +21654,13 @@ tl: { # no indentation version = "1.1"; }; "lualibs" = { - revision = 56259; + revision = 57277; stripPrefix = 0; - sha512.run = "bd43f1752b80c18abe12fe34134c8df328e45db3cfeb7a717280bddce543c36ecbedd1c005faad72987ed114bebace499b18287767ed1f9c2fae078d328422a5"; - sha512.doc = "19693085ebf60832de8137807c015087130705b8b90d25fe6b709f73f2cb836fee7e21fd29b3a89b9a2b31292e148b0b6f44b1f75324ab472c22269909890402"; - sha512.source = "21aa116488a057400212e0bd2f5994561fa2c2c1ca0adc1b80dfa4a107a3b019064f6242379214b96ddfdcc12c8cf9ab0feaba883817c52dc4044f4c287c283c"; + sha512.run = "ccdbde1b5b9abd3478e3912ff20b1639c3504f06433eb10cb174a3a413642629ad9eb0ecb3fc7dfe3ee1e7e2dac2e552dd86de98bd89e3a65bc6736bedf181af"; + sha512.doc = "4d3771a5cee5a1ef7a7a7d3d88cf44020563c8bf50328bd6cea42a8ddc731da294e6b300ed9318030b00f0ccecc0de8667382d41727dc02353e68fe635d0aa19"; + sha512.source = "f504562bce245c51567eb54963de87702a4651b73bce71144d2dbd91e6f9894c5d20fc43ae7a7d68c92995f6cc077bcf76875fea7309a09b288e6bdde2d55222"; hasRunfiles = true; - version = "2.72"; + version = "2.73"; }; "luamesh" = { revision = 55475; @@ -21461,24 +21671,24 @@ tl: { # no indentation version = "0.6"; }; "luamplib" = { - revision = 53904; + revision = 57266; stripPrefix = 0; - sha512.run = "fbb99aa90563e6cce2e5e9c417f739868130f8a2dd9875fba8a44e3f92e94643f2a9446cf686f222067c5aec66e5199eb5fc134458d2a72f2fa8bc949ed51a1d"; - sha512.doc = "e0568e3547253f6dc9d12f927c3d7025454520ec8611ede49497f80a6354518d07eb9d300208fa4a8173b068ce65904f45c071d0fea5bfb3bfe8de1d29e6a0ec"; - sha512.source = "3a00f23c25b683b9c8949a7cb4841fa92babc470d40f756898c68fe2ed82e090cd7cca2dfaa4fa7894d7a4ea96ce5db5936ed2b1d509af118cdf039ea7a8e7a3"; + sha512.run = "031db09bdfdc98fc7b0016c5fd3254545eff1aaeab5fb9b75dddc15550a2027f1b1c8878dbf2aad91e85b81bd83ebfcfd8ff3b0c0324d9f8d9bb25209b9bddac"; + sha512.doc = "a50f02149ecd45c7cac42c74b581743db01bf689bf67647886c37df5058cd1c0eb12f4ac4d7a85619cc6cab66090a523265ce4ad503c7e3fab3512934846c845"; + sha512.source = "77cfe57ac556db077cc9d90fecbcf23d46a115172bbc687f9d2b902ee720eb404105ef09aa0ec7ecf6ef5785a4e11a21663568a10539f6057418c62745e2e51c"; hasRunfiles = true; - version = "2.20.5"; + version = "2.20.6"; }; "luaotfload" = { - revision = 56269; + revision = 57274; deps."lm" = tl."lm"; deps."lua-alt-getopt" = tl."lua-alt-getopt"; deps."lualibs" = tl."lualibs"; - sha512.run = "e915714444f7ba08d0e89f7eb32664604b4612e17e8e0111f69b98d363463a2d6a4aebcdb63e3e6368f8c84b4ddbf44c60c20f45ebef1b500e921c821ca1cf79"; - sha512.doc = "4f228bf21cb6b6470006fbab8b40b5c17b80d45121f5b0a485b999b705806499fe2c466baa2de9a57bd033268103b67fc10fd9fbb4a0a8ee310b63ea76fcd00f"; - sha512.source = "6d3031b65304d40805895a810b450119af78e174ee8f883a4b3a139ac3e8b569b0108ff4fea3056236a9b43f91549512fc3bf07a0a03f4d122ab7f1fc941d710"; + sha512.run = "bcb7ed2e9f43869bc688a015eed9fe4dc2d461d3fd88b13127b7eabdf7735a7f2963033c9008ffa92ba2ba22f43b9318f3feeb1684fbfed8f98ffcf3ccb80070"; + sha512.doc = "749a19ca6a24da022749f49b4304aba729b374ff772fdee3de6f4563497c701f55c66036a49c70dd3aeb8418f36e07fc49ad63878f069edd3de4cd22c7414539"; + sha512.source = "65a16fa2461a415f063a4adaa939dcfce6824fe929eced5af3dadc66907cb6a009500132798db48fa59dd7ce8ffc24437a2736beea260518d223f0428cb9f199"; hasRunfiles = true; - version = "3.15"; + version = "3.16"; }; "luapackageloader" = { revision = 54779; @@ -21547,14 +21757,14 @@ tl: { # no indentation version = "1.3"; }; "luatexja" = { - revision = 56594; + revision = 57316; stripPrefix = 0; deps."luatexbase" = tl."luatexbase"; - sha512.run = "fe1dfb500f521ed9d4483a1d68d04809ccf522f22653a96bb986ae5cf12db4e83066c023e9eb428f773140230e3e465daa0ec43d330c4626e59cec03719c737c"; - sha512.doc = "ff4ac33a13a07ecb5f12fce341a4d722a62acb85b6ac33171bd3b573c44cd24af0e296a24f44a3a6f6c8a6a01071c65aad1865ca2b42c27b47c3c21bf4e6a2be"; - sha512.source = "7e78d256ca58d27fe0b31905c8345d99d637910ad32dc4beed8f0d113af3bb890a800103916a748cbb143ef06c7bda47da287bca48b473079e753fad8c04ef29"; + sha512.run = "10ec5e05c3a24b37d95cb26f53afddc0b2f988e6bf25b55275e1d524fdf9308b1309168b88a8b30087e8a79555fcd99d14c3dc3e268c7c1ccd6de080091deddf"; + sha512.doc = "b89d4e091e378a8b76c289ee9aa20cdee8a10a8d1eb6536dabcc88137b9f17c70c93e1cd4d9f1ab09e64ee4e4268d4f556d65a0ec5ba98af0b9842610a55a772"; + sha512.source = "2d77ee37710f8ffaafb39aae2eea53efe64d9b5acd8ee28ae41e8311c98ca321bf562f09ea7c1df9bea536abbba00ac6acfb9b082edb7d410eae28c14ed5aba1"; hasRunfiles = true; - version = "20201005.0"; + version = "20210103.0"; }; "luatexko" = { revision = 55969; @@ -21591,20 +21801,20 @@ tl: { # no indentation version = "0.1g"; }; "luaxml" = { - revision = 55891; + revision = 57183; stripPrefix = 0; - sha512.run = "5b380b50ae7d2e8a96e23def259f28696805c280629234e1c88172ee2550f78b3919f1895be60df7abfcf46ca7a33dbb413b4eab0418070a5072982a7c4324ca"; - sha512.doc = "adc6cc1b6b81219ab7d1dd4a45c8df4a6103f33e0ed5c93312e439fd0a953122f6e3df5ff3a2202970416c9db625078a6488954cbaec22189a757f4a45346f69"; + sha512.run = "53c98fe9b23a51e57244d73e5a4c572a14f130da4ee34c441d953d4ec0f3f18900df9f522d7710fc2b1ad25dda672c8d4c49e29e2a0b764c8df542fac024c40a"; + sha512.doc = "9985335dfb4b95482f685af3df692b8763815cf38439743dac4d993fe215a27fbbc08e1193f46a19535ef3a210540b57ba10f1a6fb0f66b4c6e5789354cfb4a0"; hasRunfiles = true; - version = "0.1m"; + version = "0.1n"; }; "lwarp" = { - revision = 56584; - sha512.run = "e5986b58e1a8629310a9b9bc451ad65c37f94c2f63ccddcec35f8857489b364cf90c1bbd410011ee24eb8f4004658e099b940d54fba6ac5673d55de67fbf40a8"; - sha512.doc = "ee5e8ef3feaaa70941219833997634d00ef01d704211ebd81e2e78a472800423728ad8a2b111aa49a489fae86ddbae17c445685fdd4c34f1f49782e5d791c4e2"; - sha512.source = "1235cb6c13122595e5c94e2a9b1bab193478aaf782a08cac9d97cead1fc02528686625cdbe7cf239038a978adbf3c569bd51d1db6f6c1866cc92133278593436"; + revision = 57217; + sha512.run = "fd540625da2dae954e27a5577edd73affdca126a30c86b3450629474023b26b412edd6919deb27353075c552b54feae1ae0d06eae1a0d000d423daf820f2f73b"; + sha512.doc = "347ea74a5fb83bd2c1fb5114a6711960a1dfadcade6a7228732132bd184c43063c425e4ff4d2fc8d19bdaee90f2cc95d3bd8322a3d6ae24ca926147001d061e3"; + sha512.source = "04e6447b0f09cfddb697e917008db4119749d0fd4fa5b7bb4b82e8c5b24a6350013a6b056d46bde7893918ef33f12847520aa508e9d4fbcb30c943352c78f5ee"; hasRunfiles = true; - version = "0.892"; + version = "0.894"; }; "lxfonts" = { revision = 32354; @@ -21855,13 +22065,13 @@ tl: { # no indentation hasRunfiles = true; }; "marathi" = { - revision = 56099; + revision = 56781; stripPrefix = 0; - sha512.run = "4ceb6ad6392742da2bf2b6a2ea5d909c5d12793586da4626b901132c7e2cf2174e159990318ef96ef82c687a7ee101a17293484503ed51353ce6afb1b1124d66"; - sha512.doc = "43d3a5d4b9abe7b35ed2dd0a3ce9352bbd492e7e52b4fa5dbbac53f111f20c310f5c6703d78980faf0c997a00a4cc9337a0e5a0ef3b69533a1aeecb4575d751f"; - sha512.source = "5a1e86466d03541305827c1dd31bc178099adc47ec23082b82a5708493a16c3a2c02291db22b8bcebf94c1db6d107dc4073ad6b8d8854201c6def2faefaea03c"; + sha512.run = "2e76c85b62b77d6c06583bb2c32004d56e667e59b9421aea092b1a8e70557ccdd81b9bde7b6642880abf7ee0e2c9c786d64be7d47f599876c542328541ffdd7a"; + sha512.doc = "578f82df4421539ac07f19bd78f521ef1b529c8cf07021519ac1faebad92dcfb61cecefad485adb7b5d2b204ef0131898030bf5c96b85a27d4b96ab272dcdebb"; + sha512.source = "bd4a298971ba46d991d84f6def53e7ba60669f2047109d3b8491e6aa956788431fd65e30479b4c2d8048059991f37f462f6728079ceeb9aaecfe64eb34a227e2"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "marcellus" = { revision = 56016; @@ -22181,12 +22391,12 @@ tl: { # no indentation version = "0.4"; }; "mcf2graph" = { - revision = 56217; + revision = 57310; stripPrefix = 0; - sha512.run = "4905ad4033c29884811f0ef2da7da18be259904f41fda3f6d3145c7dca3f490ee317faffcac30a643ee04465ce3180025e8687dc878c713fc1623e341e95934b"; - sha512.doc = "65759a94b05106edb4cf8453b47694c8baf4bfd68b7165bbbd57979881384e7a0862d4d14b8d3650e7a2dafaf46744059ee9a393f53f67565b75396a7b532209"; + sha512.run = "84b6d52b4d742a576a30f70bfaa0e000269a774edabaaadc200e09abb464ac6a109288f39bd8bf06ecd2347583b36e11d9b1834983a3280977163d731f5be05c"; + sha512.doc = "82df67f90a41a7ab131409e1ac57f9a98e8be3bf95fd1457632e39ad5a2191a0e00a1e9eca36c334d7669b87e02939d3612b6d4b0814ef7a9163f92624119e0c"; hasRunfiles = true; - version = "4.52"; + version = "4.55"; }; "mcite" = { revision = 18173; @@ -22206,13 +22416,13 @@ tl: { # no indentation version = "1.2"; }; "mcmthesis" = { - revision = 53513; + revision = 57333; stripPrefix = 0; - sha512.run = "5768d3d07c88c186c9b1937efb3b4fb21cdb1cf9b05cf653657f34839e812c0072b0b0a24f05fc24cb29fe084fe8d26a099481c8b753e99c08b481957635470f"; - sha512.doc = "5bcea5b94809ebf47416a9638112979d47a64aaf7ec02e1729bd8004f7159383f2c07db03164f44fc450548a80a7905569aaddd0fbf89775f3e1f894bffb20ee"; - sha512.source = "23016bb72ae6eb43af0903440fefcd59d0a3b3b7d23afe5a834f1497d4cfdb62b88ecf78232909a33efef3f15370efe116e193f9904b9aca9385c282773e1548"; + sha512.run = "128de0bf3c8f5ddd7ad5b456d92ee434573bee9e7df028799991068802c0997330ad6a3c8b0d295db7d9eac9e7540d5159cf5ef037ccb1e54cf95dc31c8cceec"; + sha512.doc = "d93bc6ec219a32ec688933f598042a04f0f7642dc875291ba2437085349e4e697107d2a4bed2c22b2abd3f00009d92fcc01930060ba38aef3444fdbbfed811d1"; + sha512.source = "dc9cb93c8975fa3e7d50e9067dc39c29875f6086a4dbfe657ca77e38feca4af419eac429ed97df41d442ee016f7f6205cbd1aaefd2a2e734af7ca2ea4c79344d"; hasRunfiles = true; - version = "6.3"; + version = "6.3.1"; }; "mdframed" = { revision = 31075; @@ -22372,13 +22582,13 @@ tl: { # no indentation version = "0.1"; }; "menukeys" = { - revision = 41823; + revision = 57172; stripPrefix = 0; - sha512.run = "690a07e343a3358179b271fb51b33f6b9dd952fead758405bdbdea9afc8d410d1bc72a15557d90d0699f26dcf7e51a6df3aec1ddb7ca752f5088de46dd5b7711"; - sha512.doc = "4b962d91d637a69f7443fb6ac4a94fe63901a7fe7a2d880eed320314ac6114c341add9e589547649331f123d9bd3af7830c19f83389581a936c67fd0dfc4424f"; - sha512.source = "35b57df92bf1eeb8ecec107c913ee8be0c84d27c2f98e7f2c7ee42b182905d3da1ac0e0969056d4d5db849c47d6953a8d2c6555259dc37fbcc432df4dd0e3808"; + sha512.run = "4e046853dcf7daa04a1375e19f35219b65177479807420d8bdb2e4449324b9fd38a17535e170b46a64de7a975fd0ca39c3150014ccfcc80f544f57475483727e"; + sha512.doc = "9ee80a77fabaabb1b29826e2d54dfcacdff7b758bcda83559d694a76cee579d4815e346c314d224001844c64cad40f04980d7dc09a45918a664f8cf76723b91d"; + sha512.source = "e4c6817611e5dd8f33e0e9f5771ae6f7c04b76d49002e6fcc466090cf5423ad4335d2d5d144817c6a03518f338256ca383e0b0df88947087c98f60f07f3dbe6e"; hasRunfiles = true; - version = "1.5"; + version = "1.6.1"; }; "mercatormap" = { revision = 56060; @@ -22461,10 +22671,10 @@ tl: { # no indentation version = "0.91"; }; "metapost" = { - revision = 56291; + revision = 57271; deps."kpathsea" = tl."kpathsea"; - sha512.run = "a1d4f231a7f6e2e0329e5cbac27dc7ad65992704018848288cf3b8943ff8dec154cf76f6ffde081d18283f73438e7c7c4fc41569651d0c9b6218b2f5490a14ee"; - sha512.doc = "f3a3c5f6afe186602b7648cad5dc0874df88a6b5c847c454da4088efe3a240dbf93aebd9780b9aec37ac9d5c53e6af30b5d69aa00ab96adfc6553573692f1b21"; + sha512.run = "50f2bc7ff49104e7b320b944e8f9793ec91be31e3abb4e6f702ee8d6a5d5f886709378421b2b1375660c1a80dd168e8e841afd2719b3c53f26d35d3c46ad9d63"; + sha512.doc = "d7ae54803d27f28f83134f14b4be66965484b96d89527ebcaa732f3d162a365177127e0b20606358e3e731236f1e4864bff134b9d3eb5ab7712000064f2353fc"; hasRunfiles = true; }; "metapost-colorbrewer" = { @@ -22559,11 +22769,11 @@ tl: { # no indentation version = "1.05"; }; "mf2pt1" = { - revision = 33802; - sha512.run = "87a90bdf45883da1291d8ef5a21e6f7fa51480f9933b92ad4a87384037de991ce36b47c238f822d466238f4bca6aa41a123c76a34f9f6efc2e43a2104f85182e"; - sha512.doc = "8e672808d60133e8a06bfd7350b1f9f5a4b1e706e565382b015f8eb9dbdb6da246b12815388f445fec87e63305381717d817c1eaae7762fd7b8043c89e1f2401"; + revision = 57018; + sha512.run = "87df5858f4a383f4915d469479460d55a6975a841d31b9993c9e3c9af422965d5eb869eac82c2dda968c17160e96c794ce85760c56d3d931d09fd13425d3c508"; + sha512.doc = "5320e1d724fde19f8c0c1b85902e57609e938243baadd00edb8294867a1df792ac2f72bcd1bf7350f4a9efab1563c9fea4361e423079b1f75ab9ecdbf2da4b90"; hasRunfiles = true; - version = "2.5a"; + version = "2.6"; }; "mfirstuc" = { revision = 45803; @@ -22688,13 +22898,13 @@ tl: { # no indentation version = "1.1"; }; "microtype" = { - revision = 52853; + revision = 57096; stripPrefix = 0; - sha512.run = "eba24c7a1e0f18e5d559d559745cecc9398630e4491b5c71f695e0e6893e74a87171e6cddaca8345e99ddb63558ad2a712822819c17fe1c20684e043adde4fdf"; - sha512.doc = "b0222af67733ff7e11717388d10e0b57fbeca805c85844360ce70bfc3b5d0c18157a12fb40156edddc263b8970c9b172d3fd4a1210450efc250aa05334d2c5b7"; - sha512.source = "638efade6088401e90aed764f47927b28d8840dd4e8fa1db2d1ca160a746e0633ae5da9f4e9947fde49ae2288fdf48dd37e7771b4e0011d10c2066a9cf4fb4ed"; + sha512.run = "5851f12f20b323578d718eda8692022823ff3ce24ae4eaaca265e45773dc5d0229adf4bb8ecb32d9f790123f883ba322d25956ad2c245d919f5de7dcc626df92"; + sha512.doc = "8180be5d0fb14dc25289bac9aa2589bcfff519b44e1812b23a1974d05288a28fba03b6007b5c8ed4cb8235cce38bc56e8c78e6db54bd6f0ff10e50741327b425"; + sha512.source = "3cc2aea22dedfdfb92fc1c7cc6710772f52bb012962646766b191f1235a151e617b433153ce9ffada1e07411859b12d17a0ebd904320f89193afeaa46a2e121a"; hasRunfiles = true; - version = "2.7d"; + version = "2.8"; }; "microtype-de" = { revision = 54080; @@ -22828,13 +23038,13 @@ tl: { # no indentation version = "1.8f"; }; "mismath" = { - revision = 53245; + revision = 56949; stripPrefix = 0; - sha512.run = "0bf6eea83401374473c001b3ec6a39c70d14551983a89fafdab854b12000d7806b76bbf10fd3fc393d5e7bee0880bb9fff9087da274b643a1123c128d708e22c"; - sha512.doc = "359a86cc49554c0efbb932b0cc8e7698582b01fdd7935d88d50a754d91bbc7bd8d69ab3cbb18a81ce89c3614fa5a22ff27bcdacecaee1dce3adf35be9dd119d3"; - sha512.source = "bdf6b92a81afceff6705e7ce4aac5b50de44dff45b84043638c807ebec3435d732e1dfcbb91118e1963eb7e585d6f22188be75abfa5b34c14af3c5e7f0e42046"; + sha512.run = "68bfec9f2b2d88d248416c43368831f76a8b5700252cd2adb4b7dbc0ca05d66243d1e8c8f587bc39da32f3f0db00be60a7f07047af2484ec9227055325a62922"; + sha512.doc = "70d308ce935a64573b9b9e96b0cb158518a61748c05ab79d9abb0445043ee3343b18d5babe5c3436f42d1e277cb374fbf40c470e85ab99dcf8da841bf0918bd8"; + sha512.source = "938131fb63838e1ab7e2cae20d037c3cc24d22e152cad295c227e7fe12a3b4cfb2ccdaa0a1b3753c63071d253ebbb8f26c2ed7fa1056d4de517317c3fb3bee34"; hasRunfiles = true; - version = "1.7"; + version = "1.8"; }; "missaali" = { revision = 54512; @@ -22882,13 +23092,13 @@ tl: { # no indentation hasRunfiles = true; }; "mlacls" = { - revision = 56166; + revision = 56878; stripPrefix = 0; - sha512.run = "42846f4ffe7176efac7f6f4755954452f99d7337b4e967ada72b0eb087714d5cc4a4ed1de3e90d3132a7626d9e3d457fad7f09452c95cde655b0d5fa516d05cc"; - sha512.doc = "12e6c4253c3318a21a0af476f4e8b22950ffe6b84f1316b08d0e30fe2bee0a3f42b363cde58b7267b6a3270b9ac6594b8ebeff14f988fa187965a83b9668b88a"; - sha512.source = "f06b5402113cf66070b48e607fa277e2da20007fa751fe9a86304eb93075985a9d80151689c2e16ba4a1b22568ea779756185baa5c519a94c9e05cfc20fa747e"; + sha512.run = "08ca934862fed7674f4b8a77ffbc1e42a043777e6baf8b1cf52ce6cde912899bf92d74df52bb35dc6cde64711b8d375266695d1eb4cb301204d90ad27fbc2a86"; + sha512.doc = "687c4beca93574ee7687d7586eda818d94538782acb9b7cca98ddfae6921af5c53ade7b87a72006d8271bb517d02c7a5575043ad8c94e4894d53c58e2c6f6d0f"; + sha512.source = "46d2f1929f334932409e3a9e04a698424ebba99337c4ce48d4dd2c8d63f828ad9c7b81dc4e550e69ef5ba2d17d359a0e1e4360db7175ecca63456aa1c1213c56"; hasRunfiles = true; - version = "0.8"; + version = "0.9"; }; "mleftright" = { revision = 53021; @@ -22909,26 +23119,40 @@ tl: { # no indentation version = "0.6a"; }; "mltex" = { - revision = 56548; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."knuth-lib" = tl."knuth-lib"; + deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; deps."latex-fonts" = tl."latex-fonts"; deps."latexconfig" = tl."latexconfig"; deps."plain" = tl."plain"; + deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "14caee4bf5ef1ff939e00b93d244290f83c732cc857981d7e64b93a9be16b996ef034c4c88126075c73dede1508dc3ee6988bae3b084a79f484f2493080f6d0c"; - sha512.doc = "9c73b1c0fd3e9bb88d0ffa7dac2c308c3a9811a6111cbdcde56206cb40dd3b78dd1301831bf57afaa30fd55611a9c94e892d4279c0c4141bf2dbde73e9f0cb29"; + sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5"; + sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53"; hasRunfiles = true; version = "2.2"; }; +"mluexercise" = { + revision = 56927; + stripPrefix = 0; + sha512.run = "9af80a432fdcafefdabe9697cdfc16dcdee9f6a15d85d3e15774860e94bd579ad523c370b289e823f82372dfaead086ae0ed175fcdc51cafa53bd98076a8664c"; + sha512.doc = "bafd00d7a14ddafeccdfb2bb4df613dc0ad6428445722b29ba6875d0dbc3feea9ab5ff86d8e7799f4a907840c584c2e37cb54e89b5d978e67b8f7e4b7fc7ef51"; + sha512.source = "aebb67b8257f675b1237a362ae5ddb523d983717056915db5e482da90fd5674d7620aadc9b81b2667c9e78ad590b2cf670463eada81154f379e5693f411bc3a6"; + hasRunfiles = true; + version = "2.0"; +}; "mmap" = { revision = 15878; stripPrefix = 0; @@ -23015,12 +23239,12 @@ tl: { # no indentation version = "4.2"; }; "modiagram" = { - revision = 52589; + revision = 56886; stripPrefix = 0; - sha512.run = "aee09f61375cde8fd2ad80099fc42234a4ba787b212cf8f5e5e28a09480bcda5c307bc3e2b0e027b18666808debaa2f5215d3e98f9cd816b9f31192b30f5993b"; - sha512.doc = "d07402a534917ec27c6415503c73ea5b680515a223d41d2f16ceddbf6805c61c29404d4628cec21cb15ec8e8cf3ac62c5756744fe5eb0545e9381d001d05a3e8"; + sha512.run = "3da30c6f2759d1beebc0f33c61846343b505da9527f2a34ad7e622958802cfd08e1da9ca297003330451aa913b45c872b4eed4cad3f5bf5f8e597a2b0800a09f"; + sha512.doc = "cc0513fdca073761b8f6f9e34c826af2de587c9c6ef47bbe54b45e60427c5536a2c4743e2c187a9b089eeefe82359962d1081f5dd66fad9072e4c7adcb580763"; hasRunfiles = true; - version = "0.3"; + version = "0.3a"; }; "modref" = { revision = 15878; @@ -23092,13 +23316,13 @@ tl: { # no indentation version = "1.03"; }; "moodle" = { - revision = 39367; + revision = 57334; stripPrefix = 0; - sha512.run = "839db4d5082703e0b6d5516b6ec3c18b4fa4b449e732904569e839028bc3f7e27def83c56eb9929f65b0527cec9b180fd743aa3d0df2194aa6372922582173ce"; - sha512.doc = "9448341e5c33054a39f6990b4f7942f45fbbd884cd5691fa8c0b82fa1b3f9cfc887a02edadcb0df0a7a62c53c9f4b20496db5e6e9ecca4bd6ce8bddf2749a71d"; - sha512.source = "332251d2357ce64268a1bddf7e77f28f7cf4be10846da84c1512bb39eb804e671f38aea4843af0f1357307869794029c259a52f6ab62d96736fb691436d841c4"; + sha512.run = "50b712781d14be099022f093f98f7725c2e80932e05f23da4f04a8a68f2a99e2c5526166b1cb9a2b3f4cdb7170cfd925bb1166a3d919d1645eb9c0c64c7a5cef"; + sha512.doc = "d3d3d7a05e98295af949f98c728eda7970df9370e1e45d32dae4daebade3e3777b8db3ecf0bd9d648884448407966e642a2a697577559cfbbec5f64dd3877494"; + sha512.source = "5feaff9520731afe0a6c078ab153f1f0d5c6f9f0f6b90cf90d1645d4d5b9ccecf7bd7a716d8f5e44d689119ff286ca9f57034901719418d1ddedcbb60b0489dd"; hasRunfiles = true; - version = "0.5"; + version = "0.8"; }; "moreenum" = { revision = 24479; @@ -23241,10 +23465,10 @@ tl: { # no indentation version = "1.5"; }; "mptopdf" = { - revision = 54276; + revision = 57347; deps."plain" = tl."plain"; - sha512.run = "54c2ff5a18827c1c41783bfdf034ef7ee265ef23dab283f03724781d98d6cd1aa8eaddf24b3d409947f6be58aa736ffb714c4a3f4d024691c7e2f16b3bc032a0"; - sha512.doc = "de67e891cc8825f9de1de134d71d39bc8da37f0d4818228b32adfe698370314f3e457b75204d7719053c1de7691bbab5b323d63c4fb08ab9a03a6b97e3db6609"; + sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd"; + sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769"; hasRunfiles = true; }; "mptrees" = { @@ -23256,11 +23480,11 @@ tl: { # no indentation version = "17.06"; }; "ms" = { - revision = 51784; + revision = 57002; stripPrefix = 0; - sha512.run = "883832298e0135980808249f5af0b28e3dad7941f401e3ac031cd558b9c6b895bde1f5dc459de9f4c5f6ae41d6a6aac08137be09f9a91b26761399868ac7457a"; - sha512.doc = "adc189823e89d6cd90369497dc4468b72a36af808eb2c8d6738b3a00082335f139ecc54ad6b601a027b6961890b5bb6975e46d1de26a1e0ac7dfc9e8766fa6f1"; - sha512.source = "41bdc589f6553ca981a7f0e7340f4e1163396a12acb1b7210fb5e9efc83924961d0e04f8ae1aa10b0db3266f63d4cdfa4f52d59f7624c321dfe0bda53ec6776e"; + sha512.run = "c8d9761b6bf47d53346b8e9e7d6a9899275417942c637cba776a4b897c19345e65731b6d842899f1d3d658618580dee7daa6e568c1e1e2293047a1603aad0bf4"; + sha512.doc = "650de14d399fff8efe00564db21625bd2914901951736d127be23ef290be5f10c8f1e077ce11c8262975a39b92d6ddceeabd8c90c7200d012950f28f1e1afad8"; + sha512.source = "8534e3d8d7049955da808a5a03a713aa7459f898f0fdee6ec002292b982a23245ba987b3521ccc8fccd495482e70bf050e03fa4d040f942fa70cfc3bb317a52c"; hasRunfiles = true; }; "msc" = { @@ -23321,6 +23545,15 @@ tl: { # no indentation sha512.source = "bbbd79aef8db604e5349cfcac7fceed96d8b2570cbdb455b36f96d99e52660562b6d84bdb5a9e1a4c9ff32c9199867f491e91f96758635ca800ad5b69039b120"; hasRunfiles = true; }; +"muling" = { + revision = 56991; + stripPrefix = 0; + sha512.run = "d5b89d93bb67e46618a30e5bdbc988a6849a7cbfee84f4486cf4557e750ae53f64aad188f74b1a96b1dfbaddfaea3a6a0380bd955ce79ebeb095fe1a54194e5a"; + sha512.doc = "ce1e2ac1e50e164bba6ff3911fe9ecb8f85ff2930f21f21e6721e153ffdc9c81798857cfe73c62f783f8909a644efd9f5a048565e054b0543973c4625d96976f"; + sha512.source = "877f34b070dd1549f649ce99a322f7221c9dcdaae5aa80ab36c6e340285ac9ebea09e9496ec87e6d881608f30d9d7b24faff6f8671f57a2b18ff96a127a30311"; + hasRunfiles = true; + version = "0.2"; +}; "multenum" = { revision = 21775; stripPrefix = 0; @@ -23435,13 +23668,13 @@ tl: { # no indentation version = "1.0"; }; "multirow" = { - revision = 51278; + revision = 57314; stripPrefix = 0; - sha512.run = "61a072b45e6caac673ae4e5df536f12ba0bcefb3457099a0a03c73f5177bf94b1f0da056f622d3963e07dd82fc1f18eaf892f2205ad34e221963a07a9458cccb"; - sha512.doc = "ae7b86866d6271f99bbda77e1df62276383b3759f59c30c86eaee3a5e14e0633dee081bcbb39fc9e52a5f4afe43ab0357aaeb11d81560a7c1c671d8773de742f"; - sha512.source = "fa10c678e843835d7d6ca2081ecbaf3a5347eee25da109e0db85be9422c2d0e8d2844e7e66784761f0877ed52f860bf1242aa05ab3015e6698891f3629fdc377"; + sha512.run = "5193e06d94390aa692b025eb1865ca76db7628a97518d36e42b630b47270b58c71ebff90eb3ccb9ca92ddb421a2b7f91207479b0130560be767668b2c1569ea6"; + sha512.doc = "293c2026118b824be7cb8d6a298d8ac1c7c0d005247737038dbe36daea7834dfcd8fb027385ba2fe55a04e32370e4e2b8cdf8ead127ebc38b0581ee97bb7dfe0"; + sha512.source = "fab2e95812d614914c1776ea15ff97654595a8d75b8a4e33daf277f69a3faaf4a86dd9718f190e52ceb9c06b538efbfe6395e8050b594f0f047dfb746b044461"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "munich" = { revision = 15878; @@ -23482,12 +23715,12 @@ tl: { # no indentation version = "1.2.2"; }; "musixtex" = { - revision = 54431; - sha512.run = "e6b86fccd628293534edf4687ea87b7b45d2ead29d6bcb3d0d5bfaea9c14fd0cd0559af4bda2400791d789f72ef59234f56479343509d65174ffbbe6339158d3"; - sha512.doc = "53c05e91b19e9a53f5f8b57c9295261e22d34dcdc97d2d007d534dc3f05a20ab54619ecf0a8584ad52f8b61b65558a2e0eab4c590875b7c4785f97931baaf40a"; - sha512.source = "c59e464486c3f81d4cb97a30c096b8cab312d60ffac0f0d2f2cfc82527b1f92990ae16ca03989a4cec59bf01f4225a179cd8298fb3529eb08fb916892352a366"; + revision = 57353; + sha512.run = "890faab60e994520b74081e0709217549d4d91bf0d9cd28bf8b08d33b474edd584b1af8810bd9e8f1899e9de9ab88f4091594ce3ad25671312856b1870711a51"; + sha512.doc = "65380d56ef9403c633f3459192f21191912065d2a6b34efcba1c002dcf836353be7a6c532f66a11478002f34e2f53c35ae9e7d705ff716fb9c4f929dbbd82490"; + sha512.source = "bc2d254ec56217edc6f5fb75229f0484ed8ae494da9dace2e86f494670e49bbc60b962d59397c0dc1ef40e7633cc97c9f75b4ab26ee7ff528fb8169b4e625660"; hasRunfiles = true; - version = "1.30"; + version = "1.31"; }; "musixtex-fonts" = { revision = 37762; @@ -23570,6 +23803,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.5.6"; }; +"mylatex" = { + revision = 56751; + stripPrefix = 0; + sha512.run = "b7ffebb46952c41818081cc14545d429fa65e376a2214d0ed41b56cea05cb1d3146d87513b4a701825b01bcf1ab268cefe6e9d709cb627dbe7b95daaf439d509"; + sha512.doc = "791cce1eb8370e62642b64389b26a91af563ca875268039ffa978cd07a743b999573199f1a3851ee65f8118cb462ab5d5c658118a735875db90eb8482246e889"; + hasRunfiles = true; +}; "mylatexformat" = { revision = 21392; stripPrefix = 0; @@ -23614,13 +23854,13 @@ tl: { # no indentation version = "0.7"; }; "nameauth" = { - revision = 53940; + revision = 56995; stripPrefix = 0; - sha512.run = "847d9562465a4b1a8d126b2f35acafc9c2121ad7dc2ff6cea5ffa4edd744baef0710192bd196fa8f11f9972f5ea57db1df7ec2b533cbd473dcd241a1f9ed3794"; - sha512.doc = "4a57f0325184b04c59e9686d64c2361cc139000ecdf9517cf56f2f9023d4c8942ea7104524583eb8b8bff1bcfe9f2da9b26342b5df146ff5974c5d70c037948c"; - sha512.source = "2daa93fc8a1177cb1667f8b654399f6e90ef79e29130a2a802ecb976c2b5a7478484af6c207eeae8cf350d300cd43115196db8d199637bf5390d7282911b865c"; + sha512.run = "95be72c8782dd946dccf8bef5aaf64ad7711056953045deed6ef4e207845ee3464cbbb5cd645d7779e1b2baafb9067fef22e817c3da808f45e29bc2a18ee6fb1"; + sha512.doc = "d057b83a631f43944bdd7f7dfe87ebaadae37d38a47fb27d0da3f440e73bd54a6b758ec4ade9913f72ae2018e5de4d922c9e103b91efa8812222bd45a135ce75"; + sha512.source = "43cdf2f0683611534a65ab4c313a5506e9b3c0bc05d57ce01f013d9d390c3abf9c34d6f45b4918e7222b4f2b151c4d537a035fd46a3b6814c49d27e56a2da3a4"; hasRunfiles = true; - version = "3.4"; + version = "3.5"; }; "namedef" = { revision = 55881; @@ -23791,12 +24031,12 @@ tl: { # no indentation version = "2.0"; }; "newcomputermodern" = { - revision = 56419; + revision = 57309; stripPrefix = 0; - sha512.run = "1e2071c050c5d83c30be99ca00d2aac216a67d31acfe19528307947542bff56104a376e0405478b42ea1e0438dd94e068cd29b5b146d6606ca8639b600dc0c1e"; - sha512.doc = "d7d00258a36842d7f518505aa803a7efd557f754cf85bee5ee9bf7a9a721522be1b858fc9da0c70881831a5eae0f78481bfdaec9e0654eb84eb32e5ac38b90a6"; + sha512.run = "224ed498d10dfb5a855f94e8cb605b7664d9f4f0624ecc5a813ad8a899a29da613026428def92f3e36bfe25a69eef043330cffdd23ea537050d7e15f8afe1564"; + sha512.doc = "7a75899ee918d4a80d9b1f6d9f0c242671c86710d119511f1345d979f412dc426164ae93ade55dfe474aeb24d8ab462d16e904573f57911cb4dbb0aafc60c04f"; hasRunfiles = true; - version = "2.31"; + version = "2.34"; }; "newenviron" = { revision = 29331; @@ -23834,12 +24074,12 @@ tl: { # no indentation version = "9.4"; }; "newpx" = { - revision = 55619; + revision = 56845; stripPrefix = 0; - sha512.run = "4f2b5dad4cbf34e4f836b9a1c5a4c639e8ef7815894ba6299fe9da1718000ecd3f6802d434efe86f2d5e0b00523b0f32305adb965af79813e0aa2cae95b89348"; - sha512.doc = "1a438ebc99bf20ac2d4776e1b60ef0545dd6c1c74e568bbf2d89ae3d8e115060fed467db92305f7086764efd38a7c97b71a52b8e855b174b14c2e85a37f09254"; + sha512.run = "7dbbfd4e3e32b0c5a303ecfeb776793c1b1eeaa13b934e9e02ffbce49ca6d6409f5b920dac798a3abd52ddc87eab7ec9937060f3ddcbff5023005a6cce363899"; + sha512.doc = "49e38fe4adf7291e3c174c9bf91f1f48ebe22639c542cd4fc707bce846e6fbb38a8bd0ed8a459c5dd61de314cb1a8a24aece5efc1f3febd5b0ac467c3051e3fe"; hasRunfiles = true; - version = "1.413"; + version = "1.414"; }; "newsletr" = { revision = 15878; @@ -23858,13 +24098,13 @@ tl: { # no indentation version = "1.0"; }; "newtx" = { - revision = 56384; + revision = 57192; stripPrefix = 0; deps."kastrup" = tl."kastrup"; - sha512.run = "e7e6044ad539556834004525fc6ea51e2b5de9e20c3c862c0eef2006fc2852141914c99841509f30fd63e6710d3b1e1790756b2cf3bd35090d9cac108a33bc10"; - sha512.doc = "4928447c1382918e6facf5cfcc0b3fd50e3a1d07b61125a2a6ad0f799526e6bd720b9383ab8588945061b98036879a8251454c4d34a11ee46fc4c43b1e4d1b8a"; + sha512.run = "24077fe936a3466e58e0df7b3e13580c896d5adddd1e81617cebeb3175a9c1f8f9f1bc4ac9b4956e2d253fb75a12edd2ad9592cf71ab63a9bcc75a2424dbf181"; + sha512.doc = "907434ec4719730ec6829f9a2396070fd5b050420de81d6f173eac5aedc143a85b1ef4bb1c89153201309937d5c793d98211b77a6b0decfa438b2f554bd836eb"; hasRunfiles = true; - version = "1.630"; + version = "1.640"; }; "newtxsf" = { revision = 56527; @@ -23901,13 +24141,13 @@ tl: { # no indentation version = "1.1"; }; "newverbs" = { - revision = 56247; + revision = 57349; stripPrefix = 0; - sha512.run = "a28b12fc2741b5e467f95194d447df1da76cee1c63b66fc7d057406624e4c06f693e82f721cb355e469838d4ec96a14c4b26f64de094dbd1f0873c1e2e2b5751"; - sha512.doc = "7f868f5c76c3339005b0033d4777b6c166a9f7482327155e59e15d338ad387dea30df13a070d80d4bc935ea112db9c826f9597dfbbbd6a13b4f3ff4ee196496c"; - sha512.source = "6674e96c603d7f9b5dc4dc61bf1173498d4fb4e568b0c1fa08a34f7b8be214c11e932f16dd1f6adb3867e0d4daaf3970850e8adcc1af7e4f3061ce961d35ff28"; + sha512.run = "6a6216b524f4e1d7b2624ac81ee3659574da20b7c548148f91442b27977ef6c3797f6747b62d47a3db339d5005dfe0773d88d7afdd13d071199f87b41603af7b"; + sha512.doc = "72717e810564fb09db3fbd658c3c7c0cbe50abda9f6f9bb111191046cec568f8a83ed2aad3741f73bc933b6eefc9bc0ce58ef086828e0b7d07f9e0dfd2136ff1"; + sha512.source = "052dae2308f92e904649b41778ad16853e73d31da50853b0e14901f9f73f4b06b6987ba9e4119d29102320ee54c9a1fbeaee39cb872143ef673637a5074d499f"; hasRunfiles = true; - version = "1.5"; + version = "1.6"; }; "nextpage" = { revision = 15878; @@ -23949,13 +24189,13 @@ tl: { # no indentation hasRunfiles = true; }; "nicematrix" = { - revision = 56574; + revision = 57352; stripPrefix = 0; - sha512.run = "5e98840803c3736bfdd413be148696604faf1248afe0cb6abc80cdca9c8f88d334f54f26a43e2fc674e4ee97b1fbacb66366aba3f79b5cc9005563212e550ee5"; - sha512.doc = "26ca8493ec64c5a4a1211d42d6a4db40e6f22eaeb8febca5bbbeefc0ed42e7c72e0761dc7993ef2d0312d295cb911813a96b2cec77081854939cec4c5964046f"; - sha512.source = "ed00d9558fcc15266c6907731f96c3bef924c30bf8409d14cf88092dd76f1c0df3f3a750984eb3d6ed0537659a6cf5e84aff867a8ffe0724596bbe453ea201a1"; + sha512.run = "d92856d1776fab4b877c575100b61b2bb9514dc50971f36acd14faa513e7eb0ea07f9931b393d176ed2def3eaa854d4de5f71536a8eefadb3cfb62b73a96fda9"; + sha512.doc = "033981751ab3f0bed9a635f943a013327c3d5b412a9babe72ea64b49c5e99255a287c02870340656b4bc88c630f3bfbd2a22aecd67f0ecb0199c8ec76999968e"; + sha512.source = "b7bf6249f08a92d09c31c0c58f4772dd5dd2d04c7f08d6fd3d8c2fdb1b4d2e118baf5e489dc6d0daf7536c5ac6fa446f12efd6d5bc100e70c23b4a6b02ed180f"; hasRunfiles = true; - version = "5.4"; + version = "5.9"; }; "nicetext" = { revision = 38914; @@ -24059,13 +24299,13 @@ tl: { # no indentation version = "1.0"; }; "nodetree" = { - revision = 56532; + revision = 56742; stripPrefix = 0; - sha512.run = "024245c0d86766f354032d27159f7add43b3ed7b7b3e0be698fa57c6cd76259a632d57a3da8f598bdbf5e2cae850ae932cc517645897708a2cafa80b447872c9"; - sha512.doc = "f93e97278395b379e6fcd8ed3791b0eff1d02fd0b11f5ef51a98a2eaac569a193322ab20639a5de4a5ae5bd5a239500dfcc6627069375eba97367948eb6194be"; - sha512.source = "73f7491750f8100a1758ddf2625aa80973374eb42bf44cca06d6aa851603c879996e7cc202e027a96e1af787f1c5a9f112376a05d51d67a7c40779e66a1595d1"; + sha512.run = "315216d397894f9b49109c4749dd91953d4bde0c220c37eebdf762f2427bed4f5bc9657a7088a479c78832fd7dfebbbec1b09e25b0a2f5600505a8d5cc58869c"; + sha512.doc = "2a20d35c7a1f01657455b239916ad7c9fbdda81aac26d1cfd01d9c4e193ed75d02ee30dc884fef6df722042c3096fe350f6e29b73c00a3edbf4d2a85d364a1de"; + sha512.source = "579e92f7185814a062cc74619641a3010b55c3e21fa2a8cc13d402b50db4ab5ba05527174a90361521d13e483a87b73758c4c52068b6e94d8e73d8aea76a88d4"; hasRunfiles = true; - version = "2.1"; + version = "2.2"; }; "noindentafter" = { revision = 35709; @@ -24093,13 +24333,13 @@ tl: { # no indentation version = "1.2"; }; "nomencl" = { - revision = 54080; + revision = 57263; stripPrefix = 0; - sha512.run = "afc93122b5bf8dbcac2eaf61c4e90792107249cdbcea44e0067d704b35756d44c249df4e6924f1a74b68dc7ed753467a73db687b9ab38ec965a5722348b7b3c8"; - sha512.doc = "17ff56c02b4bc66cbbad73cdd05e254fafc4b44dbd45bb7e749c0e9f25a8dc3c6f4a4e82690a5dc13558b52f1dd679235cf78b15aac22825db1c7a2cf9308c48"; - sha512.source = "6561f296ccef879ed95011bddc7472b1f6049e262e2ba16a996ca703aa665fb2c3f186271a1256c509fdc10db407a20acc87ad13b30edd1249a14e49bb02512a"; + sha512.run = "f63b053f8d95a58e2d8ec5d42177f13bdaa49f6cec710e166a96f45187b51cbe12b34c68918c0ec42b12250ecf1af80f5dbb83f4161b2d0dc94d51ccf218391b"; + sha512.doc = "cf29a353af0a32e41d18087d3ae9c8447d52cb0f95dabfbde01150d15637022d53a8576c362bd7489e8110cdc5dc1892159652d67e61f165f25a78b64d8e095c"; + sha512.source = "e64dc93929ebdf9716208bc51af759003b7e3263a95d58dab5bfe740a71c966d4f51d561e4cf2d82f90bf3e081b4cb0c7a50a1e0a657d2b33b3a065a2e88a557"; hasRunfiles = true; - version = "5.4"; + version = "5.5"; }; "nomentbl" = { revision = 16549; @@ -24225,12 +24465,12 @@ tl: { # no indentation hasRunfiles = true; }; "notomath" = { - revision = 56050; + revision = 57177; stripPrefix = 0; - sha512.run = "e3c3d3774f43a15661a6141f9d7c86f67bc4e5b696c19352c01e6a10e42645632651f8b74e4a8e5019d410392b75e8030d4ffdbe771015326db8b385cbe98572"; - sha512.doc = "4f0a09d5e458090c586bfcfd3d34054ffbe96f248cf8f6303bfc50cf2f9b4426280e9f913c224f8f6190317d2307a2d7e3385eebc7c075ed858d8be928f333ce"; + sha512.run = "cfcc20cee5c36055658d79a345b33dc24605c7b11131fe3b3db9c148b0e0df514316a296e6404976487b20528362d13474e41fae8c04458652dbba0295327d9a"; + sha512.doc = "0a65bf4e4cf30687391c7634512458b8f0baa3b959887aab267ca17a6d03aa491e5f8c4c7e65ca03aed2976c7a735e909cf8b8fe22f6de7203b73d4a57e5ab16"; hasRunfiles = true; - version = "1.00"; + version = "1.01"; }; "novel" = { revision = 54512; @@ -24274,13 +24514,13 @@ tl: { # no indentation version = "2.01a"; }; "ntgclass" = { - revision = 53882; + revision = 56959; stripPrefix = 0; - sha512.run = "c92ad04449f1cc888b80d0f5a6baf318bbf2f743f5131f8c3fafb263f88a2f9df2037c1e8172806a41dbfb96d447c1e55c949e99745a60073431f4affc27cba0"; - sha512.doc = "18703b1ddaf9fbfebb2a546bc8e63f5e15958c6f07087d936a0751786f5fc620011654649999c815c3cc0e78a04c6efac736e1f36708ec858438770c27e9398d"; - sha512.source = "1ce750624629809e1a13ff91be63584528c5d7a85f44304ea21b1beb6a01363d7727c1ff1268c1c373e3d0132b0e6701e3cf65c3be7ea01848fd08578581c90b"; + sha512.run = "bb1cd3532f91bde7768a027d51216bd56c8401cbcec4996587760e3289d892d2f1d4efe834d55146026ecab413b04d1f4e8e132a53e3b6f925f4aaf0bc1124f9"; + sha512.doc = "a58debb1c6a07c63dfb45ea6647db75bb09217a2c7680318cd6ee56575dfde985ae88ba361ea9ed1adb26ecea430e851599ccfa900292e4847b70e02eff65887"; + sha512.source = "989942960e4cc5320f3bc877cecec195dca4f8263b3de1b0d2a233adedef0380cabc5d017cb256ff8c46889df8878bc68a855a754cdc8b9dd0cd6a7b05242c08"; hasRunfiles = true; - version = "2.1d"; + version = "2.1e"; }; "nth" = { revision = 54252; @@ -24370,12 +24610,12 @@ tl: { # no indentation version = "1.39"; }; "numspell" = { - revision = 45441; + revision = 56912; stripPrefix = 0; - sha512.run = "bf6d58521c82638b9f9e93fd5314db075fddd4cb249d7e8fe8b605581ed19414d259eef98a4f205d497fe4b9c552427ac202c0c0b5810e81ce1bf7ea903ec3ae"; - sha512.doc = "6f3f26985e8c656fd68fa716fcd3ffbdc890da7cd0797934351b4d128444eeff4b2f2adb05210fe45fdd627c0da22716153aa8ebaf4b5d7644235ed8b6c2b507"; + sha512.run = "e3731b00f027319e67ece82e727fde32be4fd80ba508b173f54f89edab3fdf5a98148ea925f68039adec2c09fa7d2284d1809d5a95aebd0e0d364f1b8b82b698"; + sha512.doc = "368b5af91cf3d8142bd243d42a6f3f939a2172aa4837487b78de51caa5ff5801123af307c14aa7b66a32fa791268503bc7ed6ed1cc7ddbaf59c84a57914d615c"; hasRunfiles = true; - version = "1.2"; + version = "1.4"; }; "nwejm" = { revision = 54392; @@ -24534,12 +24774,12 @@ tl: { # no indentation version = "1.00"; }; "oldstandard" = { - revision = 55359; + revision = 57213; stripPrefix = 0; - sha512.run = "5643f4697ad2e3aa8acc85c9ef7de993681c584340d3b09431cf05210c36457dd4bec07b8ae4e9c5890891412060f725e037b825d344c7e0ec5ba17ad44e6253"; - sha512.doc = "b70897b4d5bdff4514fe43dd06d016e6ed56b8ad29ec68ef3b76091ed37344ec954abd55041214226560c1fff13a52aa1a0d251612a10310b92587972aa15dd7"; + sha512.run = "848400b102d5ba0ceb56c4d50c65482bf5b3c468f4ed71d0ead25f0612d54552150bf467b50ca5686028797a25e46db195307ba0764473ce520e14e93403140b"; + sha512.doc = "13d73f373b75de8be6e013595eb257ad4f2cb601f56ce5ee57a16cb427068ae597f3fb802b781f9c60e5e1e502f253b09ec3d2740355929ccb236a1d55ae1933"; hasRunfiles = true; - version = "2.5"; + version = "2.6"; }; "oldstyle" = { revision = 15878; @@ -24630,7 +24870,7 @@ tl: { # no indentation version = "1.0"; }; "optex" = { - revision = 55655; + revision = 57197; deps."amsfonts" = tl."amsfonts"; deps."cm" = tl."cm"; deps."ec" = tl."ec"; @@ -24638,10 +24878,10 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; - sha512.run = "3231c87a4ef894a7ef934eb57d69794f31c0ea371417fe066ab0df4ea4069d151155e72fd3422f1b4091d1a789e8739e429dd78b75c64d77702b8ca85d5c397a"; - sha512.doc = "1b5c6741b70d4212973635b26121dc432bcca676cb42a6c946c43909c70f8bf201aced0e9cd2266bca4c8e7cddc5f3200f59a48c2f4d69ea8fd6c261b6b11d6f"; + sha512.run = "ac605b244ff6440f4e590b83ed14648354468021123e832bcc1f07d07cbbf35ea2facacf7c8b6c13b8d5f571514ade94747bc3f216261377fa47f2d7c8a5bc39"; + sha512.doc = "e6015799a9854606474f30f7dbeb5089cd5eeb0f3a9813cc03d907ce652b51b52d9f17f0dfbffe7316eb0db877ef733b331990fdc54d439c5f911140aa647d1d"; hasRunfiles = true; - version = "0.15"; + version = "0.18"; }; "optidef" = { revision = 50941; @@ -24667,6 +24907,15 @@ tl: { # no indentation hasRunfiles = true; version = "1.0"; }; +"orcidlink" = { + revision = 56976; + stripPrefix = 0; + sha512.run = "542f61e6b025f4ced8a8d6f352dceed72c7a1726cd345185fc016fe9555dca6788f12e16ad714c5cc8216bbe6fea8160604c015b2401d4b2b0df2e02e4bb3846"; + sha512.doc = "851a2e20013f01c2bc71ed3974e347251f73d30641b5ff5e162ed068ae717814c5cc00980b04e83008153c7e14e139ee9f6401a5001d49ec9d1570ed8a644f35"; + sha512.source = "fc0f7f0abacacff6a893fe3eba8f90610b3020d36ddea15f07b0ae4f35c87d75f5946c2fc9e167dbcd8041dfa6c0cf9a31c76f3f14b4ba98c90a7c711ef64e22"; + hasRunfiles = true; + version = "1.0.2"; +}; "ordinalpt" = { revision = 15878; stripPrefix = 0; @@ -24691,6 +24940,13 @@ tl: { # no indentation hasRunfiles = true; version = "1.7"; }; +"oswald" = { + revision = 57253; + stripPrefix = 0; + sha512.run = "faa9493780681b7485a642e45cfbb71e81ca408e2e65acd77b22f0655a0d98598558e4557737fa0615794eedaa42cd8ccf9bd04323b55a39db6251f52b11897c"; + sha512.doc = "e20776527a53c7da8a07d3c08314768cb3c0e2bcdbae90b30e7407c95546f1187f65fbcb8a52915ca3b1d26ffad2191733f26b9f105403ec574ab4912bcae915"; + hasRunfiles = true; +}; "ot-tableau" = { revision = 44889; stripPrefix = 0; @@ -24729,10 +24985,10 @@ tl: { # no indentation hasRunfiles = true; }; "oup-authoring-template" = { - revision = 56594; + revision = 57349; stripPrefix = 0; - sha512.run = "52d8c2aab996e2a068032086e1fb057b9feccf9469bbdb7c5b9819975ffe74974ba8a7aef8dd221898ca81c647ebd82e2bcf45ecc9832b26aa64cb413971c68d"; - sha512.doc = "817ad802170495066f3985b11320abf136572ca03fff8040b31f274907f5665d9906de2194d2959eb5b2a781b2266c740e883085134b65f158a33f8ba1a78e0f"; + sha512.run = "a74ceccc072a75c9f1f5ae906c5766a8bc8bdb459987c655f529ada87b609361e91d542679776c70a4d77941e3fefb0c2933b3003a4679f4f33f354c25277a93"; + sha512.doc = "25b5aa90b6143a4913c29a72b81513306d03af2ee988c83a9f591e735cb40a6f63a3eb51d1bd9bfe64daaaf8a2ef4ae280cac833c67c1fe9745f22fc6d2d8a19"; hasRunfiles = true; version = "1.0"; }; @@ -24959,13 +25215,13 @@ tl: { # no indentation hasRunfiles = true; }; "paresse" = { - revision = 56598; + revision = 56621; stripPrefix = 0; - sha512.run = "34d307329e04d1c2ba29363fbcbb76d31280ecc13384d171a216fdd8df3201da8a84f54e3fea97b4fc97f23a690ea70c8a75726b132936c0742a3e83a6b2cd41"; - sha512.doc = "2e1df81de22eb486134319ff822e4ed2642e6427cb7a6e442e9dc231d0cc44e7ccf6bd72b2fd940d37315e45ba59e87edf6fe849d0890f8f5f6c0db884b21573"; - sha512.source = "4048d419d91e8e8e4c64b4a0e0683369e6ed5517197b9047413b4e70d8f8ad172296caaa37ed5a4ea24e480d26b415c66faaad31a720a02d467eaf28e2983094"; + sha512.run = "7be25fc749a18d1cabc6ee720cef15b89e323d4e07716b63aa49a5eb4c89208f730513491a7b6740069f0daec3015ada3d673aed6407b21a8a1ae1dd09f60d7b"; + sha512.doc = "cb01df5ac56c7cbeab0cbfdb99950ddbe58cb432885702b2212c89c654cb2a88536be20a4abfdda5321f2cb36e8528fdbe2b96a129eb8afa2c1e969c0f22398f"; + sha512.source = "50f683ae5a7d46faa5740766e01a7637e9e1f149b6763e48ed0029814add723b551d76fae9baabf562b1bc5268ed015b7619fced2492478b2be2ec4c4f63f57f"; hasRunfiles = true; - version = "5.0"; + version = "5.0.1"; }; "parnotes" = { revision = 51720; @@ -25117,6 +25373,15 @@ tl: { # no indentation hasRunfiles = true; version = "5.0"; }; +"pbalance" = { + revision = 57161; + stripPrefix = 0; + sha512.run = "7db75e950aca473dffc3d3efb419bbe33b5f04d1a0295a73de3d7385883d576f46bf377554ffaef44608cc8c6df3f3594bd0a0e5ed7ca649c7ced5c5834192db"; + sha512.doc = "98828ffca4f1e4dab5b51e45028058cff1af38cedb05f1b0a201bff1ddb508374da6fb0d77ff4d14bdef6ec04a468435dd9870ce0f1e34685fb982f21c982e79"; + sha512.source = "21236f5d7cc9a64472d9f214777331d3b230773d134b0ed5a83d1a3dd21c2d4a76df78f42824012d4edaabfeab612684fa2577bac3bd4070ed2b5956d19272dd"; + hasRunfiles = true; + version = "1.0.1"; +}; "pbibtex-base" = { revision = 40986; stripPrefix = 0; @@ -25216,9 +25481,9 @@ tl: { # no indentation version = "1.15"; }; "pdfjam" = { - revision = 52857; - sha512.run = "9515d6156948df018b5c775e0882912aea5231ba73a30c5dbd33c258542a6afa936eaf9a366a0d498faf231e4e5ebe7485ad928c78114ddb9399b6f26f48c5ea"; - sha512.doc = "b2d6f867ed37f8f3443e0a88b2e1547ef755756409ea0f25e0982410394807f40a7b0bbb89d56e6bddd8fd65607d43bb28ff7bed6751fcabecb284ed1c2aee89"; + revision = 56991; + sha512.run = "1b1084859a811861e60e27186d67d267d3740152331f50fdbe67ce7226a76b4db24d79b674e6511d2f3de9a711da3369c565d781614f5d0c1a8021bc1ac18827"; + sha512.doc = "a29c09a2e843188135265aaec690e09cd08fe29076a0378b308ec0e48aa7936ba0edfa7d6ad3ac808ec334bb5c2793a32d8ef625f4ad9b3fea40d4db567cae56"; hasRunfiles = true; version = "3.03"; }; @@ -25247,13 +25512,13 @@ tl: { # no indentation version = "0.92"; }; "pdfoverlay" = { - revision = 52627; + revision = 56803; stripPrefix = 0; - sha512.run = "089e33b32284fa775bd8a5e9b47604f5639060928f54397f775103823822eab11640660a982ff8229e8c1d63baaa26086bc144f2160401fc25855015638c5f0b"; - sha512.doc = "e4d21dee8c619fc301a75637f2f5fe8279e4deba63f627d153d47a90ee0cc19031547631acad2e9936aae456c330a7242aac9540a0b5c217ae7fbbfa2b15a29d"; - sha512.source = "ac11650b32810ab9b1b05892d301b089eb6bb81304720ea258d7ad7efccc036528dd2acf5b0d0eb8666a238e4c01557c60d86571cbfb083475904c52f6a2c5fe"; + sha512.run = "8d18271d6c0738ade2f16a4adcabaee8b94a0cbe30a526e71e7a255ab0edc7146b660cf253991622c11c027778446f1c29e3871e71dda2ed9a5a05890c40be4f"; + sha512.doc = "47768bc52cd654275b751e7522cfaf28f66960002215036671bbe27db6ae63152e31a7ed2c372e7a63272bd97a26fddbd9fc18c5ccf0aa43744162da8517f1f7"; + sha512.source = "bbbc147cfad53a18327c53b640d0da125674ac33bd841fdece54e472763b75f34ca32e69cb53fc001a16d806778def2083eec70298dcf92bf51b99233094c3aa"; hasRunfiles = true; - version = "1.1"; + version = "1.2"; }; "pdfpagediff" = { revision = 37946; @@ -25277,12 +25542,12 @@ tl: { # no indentation version = "0.5q"; }; "pdfpc" = { - revision = 55536; + revision = 57181; stripPrefix = 0; - sha512.run = "13ac7327ea2efbafd7e6babb80ebf092b7435adeed1bf82228daebaa2bfa1aa84f840c517a842127deae42cb9debcbf4837d90d2ecae7e3d9c7c26eeb15e6255"; - sha512.doc = "830fe7ac4066f9cd8ab68c2cac02420b8034ccc9cb87004ca7178d760d736abbd128490b61488d88777efcfa49490811a62982500db8cdafb70014f2da45d582"; + sha512.run = "44e2b5c47109809345d1f3b981e9f505e1b01d27e39b9e29d0eb314fdaf40d096f3a39e5a3ade261c4772fdbea7930b73d9b45d5d23d5d379ed8c1488571660a"; + sha512.doc = "2d2fbeca36a35bac5301ce2e4e88a5e23de5f45d591d786ff7e6aab8b7d29197d87c29115485115391c9017ab66d76ed96d3721691479e7ab8055be52bc70709"; hasRunfiles = true; - version = "0.4.0"; + version = "0.5.1"; }; "pdfpc-movie" = { revision = 48245; @@ -25401,11 +25666,11 @@ tl: { # no indentation version = "1.6.3"; }; "pdfxup" = { - revision = 55656; - sha512.run = "95571c2914ccbc305331dbb0ad6f0deb6a393f22ed56c55da9936f4c39054c076b8136237d8f2479d7522b68e9c47978de950c4133370a3feff6f2f45b2992dd"; - sha512.doc = "4c532ca5731b8515c73a0bdc5355e9c1286a6e52f9c14b964454bb4331f22446ec0d189976d85b8df024441cf5cd21d74c77aaaccd94758a415cce1bcbc1cc6d"; + revision = 57166; + sha512.run = "c000299a0f21b6fbc60e23ac163c55414e939f5542006a1508e8f5e143fb64cd40b8b57e986c07d99e4bec8e9f1d0d325955b4d34af08ba73a58f77c1a0d442a"; + sha512.doc = "9ffaa67a311531694f67a88cf41266858ba1d92a6d390fec2885a30a734922a48f4afe390eb6b3ea980c7ac79ff67f0d393927f7bdf3ad0bd3d30e64fd098d96"; hasRunfiles = true; - version = "1.60"; + version = "2.00"; }; "pecha" = { revision = 15878; @@ -25493,7 +25758,7 @@ tl: { # no indentation version = "r36"; }; "pgf" = { - revision = 56512; + revision = 57240; stripPrefix = 0; deps."atveryend" = tl."atveryend"; deps."fp" = tl."fp"; @@ -25501,11 +25766,11 @@ tl: { # no indentation deps."ms" = tl."ms"; deps."pdftexcmds" = tl."pdftexcmds"; deps."xcolor" = tl."xcolor"; - sha512.run = "7c60057a60eb038aec5df5db9695ded7e5397666ad9f7fab62bc5ebb975dcf989708f0bbc1cb84a64319136f88b4b1178de3fc7d2e1ad23bace4501e4f0de100"; - sha512.doc = "b9dcdabfe05ec6663871666e4aad38a6d60933cab0d9b0d3d2af1e119335cdfcf4c8179c350340bf83cf2839f96a080edc675adc6d876e6594813d50381f025c"; - sha512.source = "48b1b38739d9c7e18a5e363ea92f26e0b786f4f1053f5f9dae9dcee27521a945cc7c7f31d626099c1933626c62e786f9d228463501026e9d87bedd38e21847b8"; + sha512.run = "da45fe7a5b4e9aacf39c64da1596a30ceffc8751ceb6543b20f6d3f2134da75eff7684a72ce15fee9d1e4404efcf98d9fd3354d9c178caa3881a735be87c9073"; + sha512.doc = "697cc2e2503f3d71cd751530e1e9d8c9ada584690b212f03b7a15808b9f973de532dbbc144ef924b4e806d849cabe2850d1ae802c51b073d84e567349c29fb90"; + sha512.source = "2fc269eea7ef0c9ee04e15961494f4efa6c12a03a6c0a269a400d031fe154796c67ad96e22efc4ae077a87c38802471b4e0add5e1187249a2b939f8e8fe13d77"; hasRunfiles = true; - version = "3.1.6a"; + version = "3.1.8b"; }; "pgf-blur" = { revision = 54512; @@ -25608,11 +25873,12 @@ tl: { # no indentation version = "1.20"; }; "pgfopts" = { - revision = 34573; + revision = 56615; stripPrefix = 0; - sha512.run = "39b29273305a894c37bbb8f2edc899eb69cabed78623ec5ac66d6a75fd7d6b344c1fe4813f56383acd1c51acdd099fcaf3e97af294c5fd63ffe47e25e9cb9caa"; - sha512.doc = "8c5df446fe33e40503caeb8740becb28b3328490fb6aac2cf858645a5d896681d6448e5160cd32e7220c164838fb65dcfd85a22a6c6b9205511f6055f23dcabf"; - sha512.source = "ba4043a5ecaf21c1afc3328160c6832b67103a9b9c278665f0ebd91f21d842f85eb70e7a2d7385d66f9910006205d59042aafc994a2eb62762f3dfb5917c10f6"; + deps."pgf" = tl."pgf"; + sha512.run = "7d672d626428c37fa749a810c57be43c6102e1325a6d3e16c57bc560b6d65a57bae94e619a73f3e0efb46ce7b4783d05a6e98c64b1e90c6e0f94f1dd9acd676f"; + sha512.doc = "ff82e0502fdeefe6afe90aad4e7615de9be4ef8e2e6a69e7a537202af77aed00c0895269ceed3d38e0f34345efbdd771d22b0c8759fcb46ff8e91ce639dcd21d"; + sha512.source = "758da1f3daa0ef888b484ea657fdd4384102868e4eee543bc97e73f103b67c367277f5c00efd06a2080f9ac3fb82c909cd30f641363120e70357450179dab6c5"; hasRunfiles = true; version = "2.1a"; }; @@ -25731,13 +25997,13 @@ tl: { # no indentation version = "1.2"; }; "philosophersimprint" = { - revision = 41788; + revision = 56954; stripPrefix = 0; - sha512.run = "05f9639dbc34d0fd653f2609c581df2e50825cd61af7eaca55f03fddee2b0bf1c0c6bb3258fe10265cdadf0d8371d351aa143327a07f3739defb4ca3ca9b4f16"; - sha512.doc = "45bf6648cf92ee58d35847845094614884ad300d5ae745a57bc036d72bf7a1cf8dc7596daab8c606266c717b0114727072298f91b61e92c40dd180bfeb678a3b"; - sha512.source = "9522941d5b9fdeb2eec1f3f91bdb6649da45ba930ccf11599e532352170279f67e40779b9af5d46a4dece5b14ca2ef421280ea31eec24b686db6a9a4f2709a93"; + sha512.run = "8b4a1b9bebf971b0963fd20c01807d5d541a978b88a1b07bdb950c1e39fcb20b8750cc0c78bb97d663c00bac2a714fa95f0a088a1c84f371261d236c941cec4a"; + sha512.doc = "9c6d1f01b2e815c4c33c4e95be40d1a7819568bbf22edacc202c3346ac4f7373ce4b6e8316ed194a32551f07296628d1d8f971ea856ddc33c1d964efd6388d4f"; + sha512.source = "12c557b2f273c06ccdc322195340e10f50d54986ec8aea4ac103a173c9a31514d5fbce39413472fd530f0c41a21e1e5d7fb5ba03b8dd3008efb8056adc22dbee"; hasRunfiles = true; - version = "1.4"; + version = "1.5"; }; "phonenumbers" = { revision = 51933; @@ -25805,10 +26071,10 @@ tl: { # no indentation version = "1.0"; }; "picinpar" = { - revision = 20374; + revision = 57349; stripPrefix = 0; - sha512.run = "9706ae1d10df99327d4778ec538ffc9aec465a04382b0732005d25660f452dda539b736be50a271c9be623a823be113696471da6c2d482dbf8a269af7c1143c2"; - sha512.doc = "73b28f87550924b208b48ca9a066861e02b1a8360151ad89609e6d8c36a772192f174befd87fb02b65e92370fec332fca5d67a2e84e97c7549b86825384dcf34"; + sha512.run = "e6c7beec7eb6beac3ddf2621adc68ffa90eb24d0df02b8be23de1c1c59ffc76709307116c9d305db3735cd5c1cb2276ad11f9ce4c9fc171f67ce95293264f4d3"; + sha512.doc = "0e79c8b6b93fd8e424504286d1010879c52e83c2f216c55e34d28dfb94ead43d43c750e637be938c9b6337e6b8e07f6b6a34271cc93db3ece846d5e4d55671d7"; hasRunfiles = true; version = "1.2a"; }; @@ -25937,12 +26203,12 @@ tl: { # no indentation version = "0.7.0"; }; "pkuthss" = { - revision = 54512; + revision = 56838; stripPrefix = 0; - sha512.run = "b311d7519c761f42ab5e45c4d8dbd800ce6e9b36118c738301ee58ba4b776f31731be0f4a9b15195a1827584ba464847ad9f68cb5e5cf1715bb9b354a63f1cba"; - sha512.doc = "0e761ae1f6ee318021ad5de11ba354181bd6aea7d7df4bfbe4a20723ee6d7078751cbb74f0acfa3039274120a976eb7a2a4b0a4208ef5add17f4bc25867405eb"; + sha512.run = "5c788b191a0910098fa99dc602456621e82b18bb154f863a287dce24a02c55c2af89583836874aad7ac586b971461636482481cee9c9e9cc9511a503d8fbe86f"; + sha512.doc = "a5e8421992285f670676e21ba766d054c96933d7b79de1fd8d3de7e5310f529da3db82454aedd2bb890f07e592f06d280a01539349cb2da9d8084bf9840e710a"; hasRunfiles = true; - version = "1.8.2"; + version = "1.8.3"; }; "pl" = { revision = 36012; @@ -26037,11 +26303,12 @@ tl: { # no indentation version = "0.1"; }; "platex" = { - revision = 56582; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -26050,21 +26317,20 @@ tl: { # no indentation deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."ptex" = tl."ptex"; deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; - sha512.run = "cd3497755c0de21fdc3ac8641209f18493226f9000e9b9aebdef2e287e7343225495b3bfd54e7226b8fb45d69a77bed6a3534011da052bfadac96e4a8e0621b2"; - sha512.doc = "71e142cf280de0157df824f75c7b0b59bbba3436ae2ac2d74124372d46ae47a1b2a477ec10bed4f7e10f0a62587713fcd7504a87bf7deb3a7e6c216ec5c2c2f8"; - sha512.source = "0adf7a4a01a56f4e1755e1680d2dfbab4b900c93de5603d256c478333b6601ce08f58aab920b0c5aa1dce026f8493c5c4d1814106898c93a1ba46d3f8b906dc5"; + sha512.run = "f3c9bc21a559c81a4c8d41e15217d0c4364cd356a9c8c71a3bc603a38a20116e89f24cd91267422e76e5b386e989f9277f611d463083ece758e15fa4c2ce667a"; + sha512.doc = "03780b761451754e85186259b21e265bf1a7ef8c9ac9f2a3368042be635df130ad2a80929179b5c9b5a861861fcee154f1ed9712e9ac4dd7e44ec3f9c2405888"; + sha512.source = "11095a028b2d53692300e1beff7165c2fdc26657d102a92a9fa11da8d323485966c47c70cc8affeb9df3da76b3bbe40a600e38356d1659a3361982201ba4604a"; hasRunfiles = true; }; "platex-tools" = { - revision = 56451; + revision = 56661; stripPrefix = 0; - sha512.run = "826f3b18d6624afb6097d15b29b2fa48a8177c0bf81b5608b90cb6b0ee092181facc6814afa3b2659d9f4c30cf64a837fe54ba12f0e8b9b33a343bd5b94aa414"; - sha512.doc = "be1e37396366b32141bc5751906c707b1c40f83d6e4b8c27e1cae99cf738ab7f0ba57ef0c2e3b31b6367fe466e3d106dde9051e0c523408296edc76f15f53f30"; + sha512.run = "1821edb26aea01156fa0d3619837d27a72d61613dac0fff39d86cc48c04fbdbae5bb25cf22ac74875e7fd5de6cb5d900b655045fdb15970d66af25bea8372ccd"; + sha512.doc = "6fbf99e5b83b0f04c382a87d543ab187b14865a1ae3523bca86d28e586b932fbc35a823bd2d12d8bc3a268ed35b7005b939ae93ec0566d8f9bcec88420154de9"; hasRunfiles = true; }; "platexcheat" = { @@ -26075,12 +26341,12 @@ tl: { # no indentation version = "3.1"; }; "plautopatch" = { - revision = 56452; + revision = 57011; stripPrefix = 0; - sha512.run = "4720b0f0434438bffa80422973825d1d2677aadf158a9a6ddbbf92377bdad4005e37ad58202bc49f15739a4c8d8e3de5c60dc0318b236ceccd12fb0a8c10b2e9"; - sha512.doc = "652220d9bf383c58da2a94bfe9a8b202c2e0474a19ae882af4adc29bf2d827a1de228e765218dfa9c32485597e102d8bbe931954107cd1dbe81cd14553a5c2ff"; + sha512.run = "3751a0c14ef0101a114875887065e2e5c70e06f83415b08103fee2dd003c6039062e87786b737d831b574f512a607f670c5d4c54cfa22556c105260bda110391"; + sha512.doc = "f873db8451ec707ab7f94a31a4734e1636cfd4b68f16925fb4aa9c70261d8f367aeb46177bfcba292ce658086db0775bf52245ad8d153f68347b25f1fbeebfc2"; hasRunfiles = true; - version = "0.9j"; + version = "0.9m"; }; "play" = { revision = 15878; @@ -26112,6 +26378,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.07a"; }; +"plimsoll" = { + revision = 56605; + stripPrefix = 0; + sha512.run = "c0b44cf022ca470767d296af1ad80b2d5ede92adb22635f7ef34b9fa81ec523f769dfbfa6a78005a46bd9a4886507fa7b3a4f761bcb8f686dbf736e3ad92676e"; + sha512.doc = "9ee880e89387986e228f357f59981b18fa8565d60e88d6f1b15c4109f9f7f20108c447fb995f0edaf64723ac37635b56cb5d097e93e0374a0f64adda4215eed5"; + sha512.source = "2967c9b53daaeba02405da837050a53c69b725da8daeba1d6a9c58dbef0387628aa6dceb07815c5bb0d2cc37c6a1b66f5c64037ad33d74e1179dc3fc0f0431a5"; + hasRunfiles = true; + version = "1"; +}; "plipsum" = { revision = 30353; stripPrefix = 0; @@ -26146,13 +26421,13 @@ tl: { # no indentation version = "3.0"; }; "pm-isomath" = { - revision = 55711; + revision = 56868; stripPrefix = 0; - sha512.run = "30d5661e06082d77e40123724ea390a76cb25d76a15c234dfb23cc5b79b357d86a4091484ddfb3109026a6677cea41f0f80dfe051bf34a6ef002ceeba4fd5c79"; - sha512.doc = "e8497850203dd2943990a7d744aff1ef88860836de5fceb6c994d89aa13aea93f586fef61649f6d257d101f2f54d6d442c07ad6d9f377aa695fba82bfaa27385"; - sha512.source = "16eae51b5991c2b59cfd889c5fd024134cc2e15358fc9892cb6d14cef047e1660820b26c7a957fa8fd63bdfac93a4f5c04dec6af27eb0d6b97626c8c4d8a900f"; + sha512.run = "095ed443c74eb0693331a6ca3c736f61ed5c34314e207cd379e26e523507f48c160671136b36dcbcb287bc1165da8223048e18261a4312ef07c129b79ad57ecf"; + sha512.doc = "7c5ee2ad9ee1cfcb8e6766de6a0aca29524dade913bd32e54fee1f5645934fb9840764b98542ed31bb94560f6589c5a074c2b3dadd59b7f20515fbc47c8ad981"; + sha512.source = "3f69521a43a3fe5821904adc9c15d7dcb993b1bc8f86c2ea7ff5729945b45af955c47a89e54b031b596d47fc83bf983b6eb18f15e5b1ef3a97786b2e5b80975d"; hasRunfiles = true; - version = "1.0.06"; + version = "1.0.07"; }; "pmboxdraw" = { revision = 53046; @@ -26262,7 +26537,7 @@ tl: { # no indentation version = "1.101"; }; "polyglossia" = { - revision = 56594; + revision = 57098; stripPrefix = 0; deps."etoolbox" = tl."etoolbox"; deps."filehook" = tl."filehook"; @@ -26270,11 +26545,11 @@ tl: { # no indentation deps."iftex" = tl."iftex"; deps."makecmds" = tl."makecmds"; deps."xkeyval" = tl."xkeyval"; - sha512.run = "e1b5bfa9db72d2109d1efcc5b8252b820df187377e04984fc8f537b018efc16b89f98f982031d431a81681cbba76e02e725452342578c766219af4c70e9eb3e7"; - sha512.doc = "b0087ddf99e1c8134ed9529f5b5fb511aaae51ffe5f84ec2252dc5e56276591fec9d460864039dd0520a28b37a89f4bad5625e056b10e435754e8b31e1f7de4d"; - sha512.source = "38f8e00dd65248f90cf63877b75ba664695911fc2209088bd035b18afe3e0f677b3c4bdc530260619c9796d0d6d04f2aa8f6903bb0ba7f6450521de851c82dca"; + sha512.run = "3dcecdaa957e21a3d66aeea9379548e6e51d5d72143a9d1160cfa2742d36f7d5d04d4e4afcc04ca12e84f2c71f328e528f16115418b25996a762e73bb463d975"; + sha512.doc = "e19e864c189fbf815b3a0c0b9b2ac03daa1da0d0bc6471ed2b82355b253c7ff5147ad65cfce53e2b52adc7931df5f99f59923f4f02704533c5dcdf1de90cff85"; + sha512.source = "b15e8404baad0e3be832919a1746379661b94677125319853c17ea0bb00090d136eaa5a32062be7889f13506b3b76d1d0371b906f05b32fdca9f96c738255fd1"; hasRunfiles = true; - version = "1.49"; + version = "1.51"; }; "polynom" = { revision = 44832; @@ -26386,6 +26661,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.0.3"; }; +"prelim2e" = { + revision = 57000; + stripPrefix = 0; + sha512.run = "9f9fa79056db5be108c3b34b2ad61d964ba35fc1b6f7e9375c9e2ccbf66cd2028ef9e6689751c90c9ca236719ed1a001ae26753305fa3454bd88650cb12ae82c"; + sha512.doc = "196640bfbf73f3f269f5b27f024f4c1e677b61b6cc452d796f025196786c166f60bd2f41ad83ac6cc6b9eca56778a07b77af05fc68f05330f14c92cf391bbbc2"; + sha512.source = "1f2629a45183a026fe7bb3c83baa96ccf437846f902b5075fc210e47b6e3b99e81e5983bdcf617ba7bcdea60851154cb70bee3abe227420b5cc3c5a65e631973"; + hasRunfiles = true; + version = "2.00"; +}; "preprint" = { revision = 30447; stripPrefix = 0; @@ -26429,13 +26713,13 @@ tl: { # no indentation version = "3.0"; }; "preview" = { - revision = 52590; + revision = 56708; stripPrefix = 0; - sha512.run = "176ec9db33dd9d95583216b4003921842df3e2eb76ceef40abe3a6f39daac058fa9807ddd2f2b789d011b415473b88d15f60916828317d30b65c8ceeb5d45422"; - sha512.doc = "b6834905bc34836b33970933cb8a7b1a94a8d030e0da112a3092ea3ba3abe1fe1ec248aca3fd362eef653df5b05ebe7b2aa04338e721edcbd4358ae83b034566"; - sha512.source = "c4d3f247edc4235ae2a4fa6ac6d0a8cba2f6f6b56b650b3fdb9c8b585d9f7dc9549aed6b5f072c7a89a6baf31ff4f3a5ad08dada4ffc8dd6d0e748644fb087ba"; + sha512.run = "8a582c5e78e5a4ef28d3857e397d62579be41f4445a3b0ea1ea76b9080997e5eb23f2bb90197237101d03fccc8cd53c8a3263d19385dac4b63161a568528b017"; + sha512.doc = "d6edac136429cc1d0af86381812c798d72e15b0e33cc0dec643e86fc5a323df057bfe196293381f2d85644f6784cb97bd7a612828ce829d0d8baa57a51f00bce"; + sha512.source = "f9e6df7cc6c5649e103832477218237d4008e66707a229680448a05a058d5b9ee47775c96466068723a6cdba362a17420d3154d69535c7b3b65c1e752e6654e7"; hasRunfiles = true; - version = "12.2"; + version = "12.3"; }; "prftree" = { revision = 54080; @@ -26445,6 +26729,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.6"; }; +"principia" = { + revision = 56773; + stripPrefix = 0; + sha512.run = "6b66ca93b0d8d0892df056608b2f3805e23cf0c503ffeab6cf30b0420250f8cae91a0dad06eba4bbd72fd524925d4f7ae926916c51715eb9dbb63b6c1534b154"; + sha512.doc = "cf3ba4c336b47274f13868a09805a339f9b343a93ca0830a110b8354e83d60ab83d794e880a3d9b65d053ea52bcf5d6021a65c3145c75a7e5f5dfb706d96e662"; + hasRunfiles = true; + version = "1.1"; +}; "printlen" = { revision = 19847; stripPrefix = 0; @@ -26718,12 +27010,12 @@ tl: { # no indentation version = "1.10"; }; "pst-3dplot" = { - revision = 56043; + revision = 56758; stripPrefix = 0; - sha512.run = "687b4c42fe942f7c873b840c2ddfc943ced0ad6f3bb5953a16b9eb23d90ec1680f346f98636460bf1fc4fef9bb3ef3b4b348cabdd809ae96e665c38d0486bbd7"; - sha512.doc = "9590cda23271fd116566f5a4431d94cf9dd6df32a8188dd5eb0829e986c2e1f549dd5b4719f4756de7eb581f8981322d4c9e940143c61d9c908be164315d7985"; + sha512.run = "6b12d6273f5025b4afbb1adac35e73f60a1ca6430b24c40c145af1a50e35150a34cc70ff14e9904caff34be6955146f358f4231785aa8b7ff662978a846857f2"; + sha512.doc = "615081d1b54074e8cff1dfc9eadee490526fa22673204fe8f37554474cf89688507989c8701e3633275558165fe91e6684624ebcb0c2b2983cb38c5a2d55d014"; hasRunfiles = true; - version = "2.05"; + version = "2.06"; }; "pst-abspos" = { revision = 15878; @@ -27230,12 +27522,12 @@ tl: { # no indentation version = "0.3b"; }; "pst-pdf" = { - revision = 52819; - sha512.run = "e262eb62c86631aeb04bd4268672fcdb7da5eb458d91cfaf78ed668e0afe585bada46bccd9eaaa7374e23d9efb79106ab7ffde1ff879993a7138475b8f8d6599"; - sha512.doc = "d16ca8328cdc79dc6c3488a68a537ace21d2f124604b69c79be6860d9913c8eac3d3093b9fcf03a17dbfe184a73c168a13d2e5a54056fe076e0e01941740f4a7"; - sha512.source = "67286e2f38bb3c88d48f0cde11494a64e0bc751d65b997ae50f4f50df980ad396b58e1eb37e544d050b52b691bc9fedaa0a15018d8d1836b22e3dff6253f942e"; + revision = 56622; + sha512.run = "5f5850f0e908bf6b10977bf616aa82ce05d1f0afd4127b5db14379a510ca62614a3552cc85ec0136805fb479201c817442872f9d1074fa6cc1367f41403476e1"; + sha512.doc = "eb5013040f3774e81d019c0010e8fb507d22cb2fb9c74e75f2c14aa0e4edd20245ddaaa3744fec7204c607b5f6329425f8f2b6e09bd153e6df6a3ae39d1e1625"; + sha512.source = "1c353ad8d3b62fd5e5bb8746f69f00b8df2c7b53dd558ec8b24d571b1fe84fdab02daa4d7193f67a258c7390d50f25cd5270578d742b085634980eefc744b09e"; hasRunfiles = true; - version = "1.2e"; + version = "1.2f"; }; "pst-pdgr" = { revision = 45875; @@ -27564,15 +27856,12 @@ tl: { # no indentation hasRunfiles = true; }; "ptex-fontmaps" = { - revision = 54473; - deps."arphic-ttf" = tl."arphic-ttf"; - deps."baekmuk" = tl."baekmuk"; - deps."haranoaji" = tl."haranoaji"; - sha512.run = "7e37ae074eaaea59387edb85169cc2cf8ed48b4cd1268d528b7cd2647d91a25b77a67f9ed2f8c91dc177c18ffeb237b92069071887e4b0065abab45cb22208ac"; - sha512.doc = "795c03ae0d6440f4bce215a1f116af73dcd1c4165fe0312235a5b6b9e63f78f9c8dc70a9672a9c74c4edb394202a760c02578e4b4b78f836b286f74d5bb171df"; - sha512.source = "42caef22cb254c1be2f0af0cfc7c416b58efa101c959a15ca1eca802869a1102e2d8d8a9800a0957285e3a338a4afbdc7bb95d37204340fb07966829b0fca04d"; + revision = 57239; + sha512.run = "168de4ff3435d1148bb718b15953dfa79172c6829e95824d998d9fff193c27f7677ae014ba54c507840b9b630dea12168f9a70d30a4cead922a461a52e63d8ab"; + sha512.doc = "42e7f0eeab1000b2c49d714c40405e008cc7b08648bdac1bac8f5459bc64eb3fd6fb526fabbbc2c7774a1b12abd37396e389e7c90351eba92a5aeef53ac3e558"; + sha512.source = "f7875a39315715c60069521903a103e5ab12ec52970ee00f3b95a498075d39e68d6f5b12373b4b31f6681a31561d740b584a65ba566d1db5ffadefdb620cf1da"; hasRunfiles = true; - version = "20200217.0"; + version = "20201227.0"; }; "ptex-fonts" = { revision = 46940; @@ -27582,10 +27871,10 @@ tl: { # no indentation hasRunfiles = true; }; "ptex-manual" = { - revision = 54450; + revision = 57128; stripPrefix = 0; - sha512.run = "8f79b2eaac03b1a2450389aa58aa9a893a8c73fb0f77d73b10878e2acfa9e822284bd42de0086aa7a19fe0faeab26e1907a20528e5dd0f5949a9310dcd58929d"; - sha512.doc = "004944f1c2959bf6a7ec264b8972e66eaa703c79916df24e83da7dfe945b96e5e7deedd22444308cab3e0731aa2a5cfdebc82f44f3e5ca947938eff3051fe78c"; + sha512.run = "ea2bc5648ea4dfee37b9df34ed786ff2fd400644defa7b2623435d4e448161b8bf45f07d5d2caf18bf280008d5e4253a4ad2f62dc88375500b635bab1c201491"; + sha512.doc = "162b7d40353fc0c892b257170cb5a335930936c776ff4b5bb91fa41d27a859d43bcedaa053aa5c2ca7d732993212c470670e1abfa4b1149c0867cdcb4b68011f"; }; "ptex2pdf" = { revision = 55219; @@ -27649,6 +27938,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.1"; }; +"puyotikz" = { + revision = 57254; + stripPrefix = 0; + sha512.run = "635d17a49a905c99e895df3e777eed02f4c5e91a38d083e57890cd13c927bc68098d5f0864d6e32b2585d288091d15e5cc1303e04e26b2267d7e78a07f77ea0d"; + sha512.doc = "64750274694fa8c7fc792d6f5ba19ab756366eb87668469aa6da9df74f4f7bc571772cc6a406f7c3453f306f36516aca9c2444ce126ff4968d1cc49d2c4585db"; + hasRunfiles = true; + version = "1.0.1"; +}; "pwebmac" = { revision = 56383; stripPrefix = 0; @@ -27698,10 +27995,10 @@ tl: { # no indentation version = "1.0"; }; "pxjahyper" = { - revision = 56573; + revision = 56662; stripPrefix = 0; - sha512.run = "8e0d6170b7a581100aea33f1780a0449a5894b43ff12bb9bb1d3b6213b8a2a33c5dd7e74e2894ae6a58f7ca56008f4b9a7192775cc3518c0326a6b953b31260d"; - sha512.doc = "b251f5de00df4ec6f7b69023e6bb33ba35453e5c2b92acc969d59ee0d44e82b8e1845c2d1efce71b75d610d3463154fde2bd4b7a299bfa01c3af30b78e27682e"; + sha512.run = "21fe7aa128154a4e6086ca8e8a14f3130278517277c47a46beaaa0e2c6a53e691060ad00868fe4e38105c63688fb4e10a5fd1f920bd8fd4fb102a2215ec97d45"; + sha512.doc = "e39ffa2b648e3005dffb32d06db950ed72dd5a6b2cd75f63e57a58ede9bdaaf4adc5349027ca6e077a39b1e35f7679b199aaad7d22f19c8858876382764c8eac"; hasRunfiles = true; version = "0.6"; }; @@ -27755,11 +28052,11 @@ tl: { # no indentation version = "0.6"; }; "pygmentex" = { - revision = 34996; - sha512.run = "d6e6327d0bce32aafb4be5a30eae63ab0418506367a4a18305f2fa45156b27911bf2cb945289323839c82bfacd6d8d3a588a302bff1cfc29911cf7d761d83cc9"; - sha512.doc = "effc3db243edd25d4aecf7c2de6eeeaa18ff085f6304bc390ee0276c07d7672d17202d8832a012e9fedcf3bbd16771aaf78a4262366744f5a27266693fb0e87d"; + revision = 57190; + sha512.run = "6dc3ca792953c15b2777457b62a08c8d3b0275df8f8da9442590f61b64cc0640ddeebd7190375dfdb8d4bbc8582ed6da5ab7035bb0ff6617a27c2ddc0824d523"; + sha512.doc = "a4ef61d97ea11b6595ab94b68697091b88d4b1b83a150f7faf30863ef91e7d1681662410d7c45bad9426644b554fa078979d0a3b3c8baa11a6714d49b811f5d1"; hasRunfiles = true; - version = "0.8"; + version = "0.10"; }; "python" = { revision = 27064; @@ -27882,12 +28179,12 @@ tl: { # no indentation version = "0.9.6"; }; "quantumarticle" = { - revision = 54080; + revision = 56862; stripPrefix = 0; - sha512.run = "b51f05fef8e15ef25692066bbae15e4b73c44f4fa42cd5b4fbd274314f6ea0c0d490f0ce709834063998d156d64bcd22698e7da635dac1fb7ab09de0c42510b1"; - sha512.doc = "5157726c7805ede45bc89e974b46ea09447d6eed19a9ec818a43a7609e28df15aa031d64259d3df8fe347e1564d0896ed6ec434d3b77908ff14d23d7cf333832"; + sha512.run = "2d06c5ba42e81ff65171a37ad78e6bc8331bb4eb294056d6955bd1cc48e8c257c6eccf1055772147f6435094b934ea6792ea638c9eca58e94f3c1e387ecf3375"; + sha512.doc = "6de1d9d40a6055f5e7282b532c6f4078d749620fc720c9d23841f5a335bd7bf5d37017ee82fff8f91811b2ea32b8792936592de20c9e48001bbc942f673f09d7"; hasRunfiles = true; - version = "5.0"; + version = "5.1"; }; "quattrocento" = { revision = 56020; @@ -27913,13 +28210,13 @@ tl: { # no indentation version = "1.0"; }; "quotchap" = { - revision = 51591; + revision = 56926; stripPrefix = 0; - sha512.run = "df77f5d148beb1b70d0d2683c1be2a1b556ff1fdd90e109a29fb222b5eadb5008dcd1bee4e36cbeabf484fe90cfbc7bd07f87d40a70cc0675fe18b9019ed712c"; - sha512.doc = "b705fe959bdc23b5633f850831fe7b8a5261e55cc7cf71e75f4b626cd6a35201f0dbcbcdefe1994c5b4eeeb6d914cb07a5f335a165835b26a45d256772613403"; - sha512.source = "d1aceae7227bd9080cbbd015fd2e3954e12330bd33ae06a6b98c9c63717a30796034d8bfc5dc1cd30ad07b2e55425ab2cd71e9145100dff87d98a11b11a84ce3"; + sha512.run = "7d94162630e53133b79e33b60abb7c4664d3e486da611e37d48593757f39b0526831cedd0c236ce9b4d8ffc85b35734acadc98236435345180b999d7ea68c1f9"; + sha512.doc = "e2fa71ee21ad019ef785a3c74ddab5f232d3a6d1e9fcdcedb34c216eb5e6d44abbafcaae5d1c4557bc1e4aae92561a75ba2c3723707328a12cdb6ff4c1b72dbf"; + sha512.source = "eed36464f1b04852e8af08c5fd91c42ccccbbaeccad565e6f338ed5c87b003b2dd1704e1dad0ce0e49651461b637e8ed613399a0ae8122081e9084e47704665a"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "quoting" = { revision = 32818; @@ -27940,12 +28237,12 @@ tl: { # no indentation version = "1.0"; }; "quran" = { - revision = 55530; + revision = 56684; stripPrefix = 0; - sha512.run = "2537ed4fc565e4f6f1504901f5e470e928b0e0693712df79baf310886a133cba69990046d82e50f7af824e4e9b0c2c8abee8d8db41aaf0d36c3cf89b0b76ead9"; - sha512.doc = "0f64e7c7f3390f5b8e5dfc4d3babd93f88d26cb7371b73dc7e4849892039eff5946616c779d56bb56c873872306d424068f2cca26eef1e8584da6e3c99aa2683"; + sha512.run = "2fd7a6547c41da0d41514a83359ede8ff5668cba61b7f2a0d98daa26d12fdc795b01c0e3f8590af8698c20038b5adf1b26ec4bd206f164fdc7e1bec71627f6d4"; + sha512.doc = "6279cf0224a7d97fcce72a4ffdb63f40840ebbcd8fb5c18e4ea6d7d331fb875f8a5e6e96f2b913b08e2454c291d71aeb7c2acea7a809d6536379677c11d6feaa"; hasRunfiles = true; - version = "1.7a"; + version = "1.8"; }; "quran-de" = { revision = 54191; @@ -28132,6 +28429,15 @@ tl: { # no indentation hasRunfiles = true; version = "0.3d"; }; +"realtranspose" = { + revision = 56623; + stripPrefix = 0; + sha512.run = "413eb0a65d79521c81417afdb2d7f0ed8bc625d107d2fa19db84ae04a1f27f2da8f07fea27139dee411e1850d8646d63412eb581b08a9c4dd69c886457027cd1"; + sha512.doc = "a2382dcfa84f3a2773ef6cfdd5a10bf23cd541927e2844419d75be6206ff5b42f37243ab2157ed5765c0f9c090340b6b75b35271157daa3440ee9d81ecdff9b7"; + sha512.source = "5fd124830f8e5e29cc9b1a2ef967a21c2065d183bb8ae1560b95e66b09d1248b8bb6a65e6321651c23d309c2508c05629c2b7740e8c57e4130d2f06b99347097"; + hasRunfiles = true; + version = "1.1"; +}; "rec-thy" = { revision = 55427; stripPrefix = 0; @@ -28267,13 +28573,13 @@ tl: { # no indentation version = "1.0h"; }; "reledmac" = { - revision = 56423; + revision = 57182; stripPrefix = 0; - sha512.run = "d3060776c444f292580157d7c4eabe9727624b38abc52b5fdb90b4fab8d7cfc48b508302aeff8ef5b1f7224613898839a80e5ce47fa02be889214e30114f64e1"; - sha512.doc = "91bc61458e584e0c2020d435c91c79e3d2cda8f357bc9d335a6054b59a0f7b14c4a989cf9086cd19d4c539e66d48a3918ae2d29688044627a66e56d6b7b86a5f"; - sha512.source = "fa5fb2fce8b6a648c2931bdd5ab998e29d5f654a7306d2ae2d32e303f85e1b8005c32bd88ba4735d95f1d9a91b144f39e087415334056877dbaa8ffbbe36ccbe"; + sha512.run = "ef0d0e5e36768e71b31dff43f5c67666946901e5420c9b94776526262793cccb8f890f17693c6a96a90fa697c738e0e6f0d19cee6e9126d1509536311d4b2084"; + sha512.doc = "90c66da0d277201d6955868ed39a16d4810a3f77062a7c7cff369a3d2529e4a9d09c24a4857d1fbdb8ce62cbd51c49cde2d6af474fe6cd072847213400aec98b"; + sha512.source = "2cbd05c957456c916799ec6a3a25b197ca42f8b0291f9128ca38ea3c9eb0d5399af3140c8d8352cc033117c63f8b468db025ec214b956c05917887902dd6debb"; hasRunfiles = true; - version = "2.34.5"; + version = "2.35.1"; }; "relenc" = { revision = 22050; @@ -28345,13 +28651,13 @@ tl: { # no indentation version = "1.35"; }; "rest-api" = { - revision = 55643; + revision = 57068; stripPrefix = 0; - sha512.run = "800bba664ba22f42e7a2152064809af8caf45316b4b6e22b6f4aa40a8dedc6f70c636bfde52e5ac7979ae122d1e1561903f06d2cb3da2b42caf0e8e09c278304"; - sha512.doc = "4514cc0fb0af136783257d4587b29112a38fd07a5c33f461ca9d0ef8f9fb6a10eff189c02eed5c8f7ed2de49c8b2d25a47628687125217677271a80db272b0e7"; - sha512.source = "167bcb6de80f699afc12ed6a0616edb63e0d063f875f9ecfff1942ee7fa3141c3a740c3cbae14bed1234c7247b488e999fa41acc77d3d9bb2da11de4de1c5be1"; + sha512.run = "a5a8f299d6feaaf4079e4a99fb84bdf7752016c92aaca0d0060692c13a7656c230e611e06bdb805712e7427d2e6cb599b96bee77e0c51ed769c4bc49cec32f1d"; + sha512.doc = "b823828c122f971101a161168cfbd489985c159278de80db86647b0c0adff207747b6877795ca97b27f541c7907aff90213feee61d4b039dffbb8b7514923e54"; + sha512.source = "2869854fc933ed536ef425d8418303e3558ed8e0b3681c2d7042e1386b0069dcf70286ee732e0f8ace19cf6965e3bb046caa0384ce1423e1c71d9591012e5a10"; hasRunfiles = true; - version = "1.3"; + version = "1.4"; }; "resumecls" = { revision = 54815; @@ -28453,13 +28759,13 @@ tl: { # no indentation hasRunfiles = true; }; "rmathbr" = { - revision = 40415; + revision = 57173; stripPrefix = 0; - sha512.run = "71ad547496a4159f2ac609bd695bd3a38879dad118cc18bc58d8fc4c5a8da3d77abc609a0638584495dbb77bdf2078a30ac82f2534bfdf5b620d056b20aa7a8b"; - sha512.doc = "ab1b89d94e5fe92023ccfad1264aa38dac9be485d2717b4afb82a441e6bd8eb5813892c20c33a65741f62e6a8c4bbd3e3c778fe86f7d0da72080d51476f49a38"; - sha512.source = "255ef1cae8a42e34e11e1cc4b8599afe1f166208bef00372d89ab34baa55d3fcba298e01bc2d639568135c66e77e7fe62e558a6e3ba38485dde387ad76e0da4c"; + sha512.run = "d1394e40203bc7a0adffd26587870ad4aca0faaff6226047cedd5ece5e55e6a99e56829a38ce40b6736c1f9a03b9bc4b337a0e4f9eadf0617ddc385a60372176"; + sha512.doc = "e7c8d4f198399ac35e51a0d1c2c6ec420c746768de362a8179c0208325a45b11a8ba6445c2b7a433e7689e677505e3baa4b87d48a749bea5f3243d10f43deb83"; + sha512.source = "44e4859933c2a5f664feb1bd40ce1e51da845fed56b8594d3fcbbc814654c80b18d20760db3c2690fbfa74233523e4e8492471415154942cd2666cc52837a98f"; hasRunfiles = true; - version = "1.0.3"; + version = "1.1.1"; }; "rmpage" = { revision = 54080; @@ -28499,6 +28805,14 @@ tl: { # no indentation sha512.source = "d89d02dd79142344334678f2d8ec4f34eb825532e8be9260cd08a43b28e1aa94ff5655c1c1eadb2f9a365e51693f6195a4851e1420072c867d8b2c0f1cbcbbb4"; hasRunfiles = true; }; +"rojud" = { + revision = 56895; + stripPrefix = 0; + sha512.run = "cd7065dc6a916941a0fd05ea342d29499b6f7496d1934e06c49e7ea1a99c5be5cd515bbcbc2b5935ff8132adcc7b94e653d55de967700410ace55697f6fc156e"; + sha512.doc = "fb9c9f00433ba959ad8f7b5acc93b1e7b0db1cffec96b7c988eeaaae89ceecc815071a1e21f78d36279e529f4e9095602b1887d3c5d4164494be502cf4a19873"; + hasRunfiles = true; + version = "1.2"; +}; "romanbar" = { revision = 25005; stripPrefix = 0; @@ -28918,13 +29232,13 @@ tl: { # no indentation version = "1.5"; }; "schemata" = { - revision = 54326; + revision = 57057; stripPrefix = 0; - sha512.run = "a2a5d5d4665d0ab72a57f868acc5f212650268682458caa4c82e1be01456596bc5b9e876565b6ea35b47e7fa521be8ef42db68897925648a0c28d5cef3a63eb6"; - sha512.doc = "cb4c1d4c2cc64056058cf4da0fb0af81cb93971486c1fb573c0f1a00df46f7ec1426669c2860d312772f3a1fa4701ad95453e8281194955413a2edd038ce999e"; - sha512.source = "72b4edc889166c8770867c45454eb738c239f34d67a29de28517843882011c1e885c3ab201d00bc485c85e8705577340ee5c71853b9c2c2449f04e0537c24d6e"; + sha512.run = "9338ce1959b058e03fad1ce16dc5aef04587d047a515d785fa3fda528d90f366e367d0e6e1be8badf283d968a9e5c9c9bdf2195417011508d338f149688157f6"; + sha512.doc = "21cea587af8a4267ee31a4c2542d52513f463e2d396911da33e92aa94f36db01cfa1e168accb3bbc6fe6c54b7c15ae3fe611c05cc4e9db1284914305e2eb0596"; + sha512.source = "f9b17fe6450ec13e8e585efcaae03a5e20f47ce61fb52bf847d3fa2eab19417986ff205df9986cf8926f215a8d9b41be8171bf6e45ec6c7b93c0fe08ad072549"; hasRunfiles = true; - version = "1.1"; + version = "1.3"; }; "scheme-basic" = { revision = 54191; @@ -29202,12 +29516,12 @@ tl: { # no indentation sha512.run = "44bc102582ef5f6e0499efde6d3190b86988def41aa062a6239075b9371f6c9deef91e4f2bb299b3cc831dbcee9289fafd4c1c6d2a55a747d340fb580ae918e3"; }; "scholax" = { - revision = 55400; + revision = 57178; stripPrefix = 0; - sha512.run = "0023d97820f5bb525411525bdb2b07ed77ebb4fcce63a658768bd23a82c9ab06afa823f86127f742ed1789f6231bc4bd4abf1dd6142c92e147230e2ccd19ad8e"; - sha512.doc = "6c9d902af034e6e7dd82c9db64e5c74a3d696d75b87581e00e8b94cd21bb72b4ca701c07e1d45ac677db631b0aa4a9a7f9a5b163d985bb2e1ccc8723994c270e"; + sha512.run = "7b515c99016c587f6929077d10efeca0e46555b79dce5790d61905e1ab7f76b1cda7d1122d8d25557f5a03a98fd70c2615dee2f25fb182d786875e267fd913e4"; + sha512.doc = "da152b0ef3367b2d150601e5c8f9912b4a10ade27bea004500bf9a5f8652785029c79956a3f616bacb2d9908f5223d19bfc82dfb56c95b40bd3d7f71958473be"; hasRunfiles = true; - version = "1.026"; + version = "1.029"; }; "schooldocs" = { revision = 55838; @@ -29219,12 +29533,12 @@ tl: { # no indentation version = "1.0"; }; "schule" = { - revision = 48471; + revision = 56683; stripPrefix = 0; - sha512.run = "8f59d31e7bebb741a7c23c2559f0e90979df2d7ed1482d3dc09a1f5fd95ba7ee358e3acfd5bcfe0a708d36cecd4e36b226db4addcb007168789311758a444bc9"; - sha512.doc = "dbc4cb7922524e2a73c56861ebac5487b508016107bc7c2a104d93edafa816f27f84a142bd0d228aed008f85ba7aab53b694771a001657ac068db169b87b72b1"; + sha512.run = "7125beaddb825fca0c9ff686ab97fbe7cb3744b74bde693107e26fc2797ac9bd29146683174ac6d7703370cf7f5f09809165b2f371c56a8b27ae0de8980ab467"; + sha512.doc = "11aa5b1eb25301e61f2438f4607cfba35721dcbb0904ce3fdb923f69f71b1f1e1ebc3a50706b09e306e2b9197194a3c6ebb12a1fa7dc27b94686df11be3501c2"; hasRunfiles = true; - version = "0.8.1"; + version = "0.8.2"; }; "schulmathematik" = { revision = 53815; @@ -29337,12 +29651,12 @@ tl: { # no indentation version = "0.1"; }; "scrlttr2copy" = { - revision = 39734; + revision = 56733; stripPrefix = 0; - sha512.run = "7aa7ac841d667e627056ed0ef3e55368f580e9d8a35a35239780b12d0a18534086844009ba1dc40a1b6ef29ad64d06e1e2e8ffef216e89c15e684975acd87192"; - sha512.doc = "08e87246b20cc0ea9ed30cd74993aa2af520d8b01878e1f54c802b5beef4347c087ec36f32220581eefe933a524c813ec30b3235989453ff8b7be93ac35b725d"; + sha512.run = "5b2f1c1c86a8b3df5bb4d5edfc002ff80449d2cdcf6ec7aea3732d0ba8e6bcaa105675f9f37dd5280d3b9061400d8edc0c67460ac9f1541159484aa51b851fc2"; + sha512.doc = "04728375909e27e0814f9c2dee14697711ceba7b132ee6de63f257e2a6c3eff11a8e808d7929bbd0c9346b459afec57dd62d523314381c0c19a5e2b8b3650f20"; hasRunfiles = true; - version = "0.1d"; + version = "0.3a"; }; "scsnowman" = { revision = 54080; @@ -29466,13 +29780,13 @@ tl: { # no indentation version = "0.302"; }; "semantex" = { - revision = 56585; + revision = 56863; stripPrefix = 0; deps."semtex" = tl."semtex"; - sha512.run = "480b165a88b0917e6d87e0471438ebed20788d53abb1f52dea80d3d3c0b0e05a3bb78990e9a66afd076a27fb3ec0524a070ed4ee3ace27b5658f9823637f4e07"; - sha512.doc = "261eec5a77ad195c8af13be9ba8bee89df307b1f4e03c05be5d7ad6262db083713bcb2e6fbde298e95e0099653212cc2789723ac0d7f51f8c9ac25e85e33b974"; + sha512.run = "d09b5dc2e6b8031c03b59254b442a8c5502cacd2d24c91f47ae6243cf5908062e79ab0e7a521c2208848ae7f9acb147716cd8a399b362a91a5cfdec87e213814"; + sha512.doc = "829286b336f1d05afa9561d3937fa526b6062b03950b3f350fb4fc586f45fa253d93939b6432685a08c967eb85c053d07c6fe3e08126869ef63fb43bd0acd992"; hasRunfiles = true; - version = "0.461"; + version = "0.463"; }; "semantic" = { revision = 15878; @@ -29497,6 +29811,15 @@ tl: { # no indentation sha512.doc = "ef0c85ca5e86a17d59c03255d679d54cc8fb36eec02c8546f29e1c514408559788d1dbe3ac7565224b320b71e9ad77979b1092fb0f098a1c48c3a7093b72b172"; hasRunfiles = true; }; +"semesterplanner" = { + revision = 56841; + stripPrefix = 0; + sha512.run = "26c7b18796dee2f703f22ace3aae21b38f98d9250b1896a3cfe5214b42551ae3fe4accd9e8bf905109c05169370317608e23363f4bb512e794cfaa528b645119"; + sha512.doc = "32c29aad8acf63e60f07262930f267a295daf9498621c48f0b9697fe31e4dffc63c8992b5c5f60b1d61188de893421906aa3abf160a79c6dd5429eca87c03fb1"; + sha512.source = "709556569a5defa5240781ac1bcac0af6e9cacc0016d6ff057a4414a67c69cf8d11a17c716748dfdc81fc31c2bdee230c9c4adb7c4978ccba20b7330db47ea81"; + hasRunfiles = true; + version = "1.0"; +}; "seminar" = { revision = 34011; stripPrefix = 0; @@ -29916,12 +30239,12 @@ tl: { # no indentation hasRunfiles = true; }; "simplebnf" = { - revision = 53370; + revision = 56761; stripPrefix = 0; - sha512.run = "452c83082541e5e1c41687f9a6191f5bc86241454c34f3dd775671019a3e5ddcc22f7c6b2203f7b07aa549a5a84b2047af89ecad9a4ce43075d89fb490653acd"; - sha512.doc = "8e47242ee6423bdf2c2222a10f4197a615e59bd6514a14b1d3c657b9669dcf2be312c334f8b98459d9953ff36d3584b0b47c25c82e2c23979a738f9aa9ba82e9"; + sha512.run = "f306851371767da793a60cb604776aa7f537401a3dcbdca899b347d090baee3d3e6d28550f8d95a287e722a92550137f9241d2c207d955b47fe0b392a44b5ed8"; + sha512.doc = "cd4c3786d953669b53e9a3b5f6e13591ed67efcfbda7eac37f3e7c3709a8b6599f3e9f363e91658019fc03b91c4ed190ed40c81cc9e935bee697a77b51f4238a"; hasRunfiles = true; - version = "0.1.0"; + version = "0.2.0"; }; "simplecd" = { revision = 29260; @@ -30040,13 +30363,21 @@ tl: { # no indentation version = "0.52"; }; "skdoc" = { - revision = 56183; + revision = 56950; stripPrefix = 0; - sha512.run = "1f5d5a78e50ecbd21aa462659dc259403d877fe1f09eff6f0c81515adc091f20e562b572b30a207c8efa701881ba4a4736c532003a01d2578f9ae35636eb9833"; - sha512.doc = "785463688da548e082422a70223758d9ef80d51de5d1c862c3ae4e8f482843acfa7ae9d9ae5652668f3f732f64ed83bb46f03ef0f958c8b390f9c389deb9cdc8"; - sha512.source = "ba52139b687fde6cf94eb09e9f53b70982767642073511d9095ade3d7b1b4e1cc82e1de7c2e1ea05cda4935eecf8e5f6e0797077ca1cdfe646d56992ba1c0cad"; + sha512.run = "d00944f58e9842c0d1841b73fb1936dc14655f07d51c60140581d597a93a0e9ce9fe65941cc343979e549620edec6a8339cca6089df068d932e1344556c3449c"; + sha512.doc = "481e590c14396f3318999524157f8e5a8dafd0b6f553414d3ee09cb0dec6d356c2b422b6598b613ec4d29b35f27a59024dc9e5bcb49ea2643205f37c616788d6"; + sha512.source = "70343ccef329a3dce81aca0c0253b42450e7eae4560b58d69d9f12d7ef32d25023d5f09208f22f7d65414a089d2992c28079dfb708ab701803cb42fe41480691"; hasRunfiles = true; - version = "1.5c"; + version = "1.5d"; +}; +"skeldoc" = { + revision = 57315; + stripPrefix = 0; + sha512.run = "45f922b11e2bc7eda71173fd41514da5742477d47a2ab1baeebdb7f1ef936e3c5216a70fd4fd390dab9ca94f6e27d343da735f3848455f0e54aef3e3b2d69857"; + sha512.doc = "c2728c436730877fa0b191d89805e42b544ef94eb0261f551022189fe2b9befc03dcc863295ba9f27a202ad901c9e607db839113df49b4d190f5cf55a890e943"; + hasRunfiles = true; + version = "0.1.1"; }; "skeycommand" = { revision = 24652; @@ -30064,6 +30395,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.3"; }; +"skills" = { + revision = 56734; + stripPrefix = 0; + sha512.run = "0719d385343a79a261409a07d659c0fba4f861e69b082278b1442a12408bc3601de789575fdf566ce280a2699dc10b28aada80d490396498fa9a6bbc8d064eb9"; + sha512.doc = "9b2339a50fbc759d9e5bc907a4d8dca2f06293d5a5f38602213a859dfc34da1715105b2b5a46e82a23f71b741e4db713b0044f345767a1f87c32526b57fb0103"; + hasRunfiles = true; + version = "1.0.0"; +}; "skmath" = { revision = 52411; stripPrefix = 0; @@ -30140,21 +30479,21 @@ tl: { # no indentation version = "1.2"; }; "snapshot" = { - revision = 55064; + revision = 56735; stripPrefix = 0; - sha512.run = "ca5986d7b5a2a69693d6796d1b10ff767814a9405465beb09bf2954800b7b01adabb8944e623cb028372d64462099af345cbba3471005fe35ea6e542f0952596"; - sha512.doc = "a7c5ba3f2acbfd07cc2eff958ccf0788b0f87654ae102fccd1ec908c2b0b72eb2a90158704f5cecf1e8921c97f5d3f8b97f75328aaeec5d15b480fde6861c13c"; - sha512.source = "04e6a3c06250c4fa70f3dab1f740338e164467f3ca9d3f094a4b281487bf8df3141704d6f9ffa32f22fc8913068bad11f3b98fbd3d50b13fd6ac403c0d362d13"; + sha512.run = "2b9bba924070f81319758c4b8a8e85533ff5099e901598248d5a645aba249e7158587e7d90072d3e8fa4d544d09f800b94aa415117683a8bb8c6d7ff642c313d"; + sha512.doc = "b1dda7b3fa9195e5d0e425a4b7facc75f8737446b65b29cd5f3c954dad348055c8544968b3c68f9b2256e8d827ae73b54b765d23b958abc383bef072d9eacfe7"; + sha512.source = "ae57330c3c69e82c638e07ca7d2d011838a85ae79f3f16fcb8909076f375da51f2b1d3487aadf55cf93306c035099397fa826a7bd9654e6756cde66d2138b15b"; hasRunfiles = true; - version = "2.13"; + version = "2.14"; }; "snotez" = { - revision = 30355; + revision = 57147; stripPrefix = 0; - sha512.run = "e1e6ecfd64a317745fba39643c70ef5a71719e3c4ed3644569ab7a4a549a44eb58d1fd1d77608fd455282124d0e7372a364f95f7b67de192b1cfca1a9644086a"; - sha512.doc = "6ab47280669285be6cd72e2027b939ab2c2e2df7c910b5775dcf02b570ba558a3c89832a45d65cf1a8a649dad67606a2d2fe3d4e477de67098dce497f0c2beec"; + sha512.run = "f55e6af23e02c4a56827b405cefff308087be9a78c1c171b4d8a20d9669cff44d43cb60f522694708b39b8b010576ab0ea6ad2d2355f5b9113ba9e19ef913a87"; + sha512.doc = "b68442cfbe57907bf3bd1843cfd4006fc3fd0947d5ff06c18afa50d206f4f2890f7e804f55bb9a3c4f16677deca81f3fc41c75bcc5fa4d55e4aec23a644a86ec"; hasRunfiles = true; - version = "0.3"; + version = "0.5a"; }; "songbook" = { revision = 18136; @@ -30251,13 +30590,13 @@ tl: { # no indentation version = "1.4"; }; "spacingtricks" = { - revision = 52063; + revision = 56840; stripPrefix = 0; - sha512.run = "6dddc3f6b839c16902a590184955cb1f220fc5d1d2c2accaf4bebb70ceba0f446ffb5cee8c8649261d22df79e556016361550570b04f22c3d61644db2d188034"; - sha512.doc = "bd416ed7ba7dd3023be779ce3d67d1534fbcecf49c36c5b97ab29006f182e77f2882b0c0646da559b6132a40d97723414912bdb920804c5c1bf40facdb0a8c52"; - sha512.source = "5ab93bfc21fc3bd52cd5721c4c7160ed200f39bd8546a6ad84779a1af0d09b3cde0202dbe1230e2f16918ea43708109dc556f363ced43c7b0072671d8d494197"; + sha512.run = "9cb9ef080cb14f9a4c7004221cdf8f3d5b90a74ba90a37960b6efa3a33aed501a68e2d8ae23d3262e8fb17816e4565e26722b78e1caa14b7455199e52d8fd3cd"; + sha512.doc = "d5ab0e38687f00099830015bc469060e6e7a96ef5a199b0352e4a6ce82d50ff6df0b04de20bd683a03d9980a3c45c63905043177fd8ca9cf1f009e978d5dc12f"; + sha512.source = "dcdc75265a9cf0131cf90beae018f35a54fdd201a641368c5380f82258e7c1bb5a680d1b104146c886df56f148921db0ca304063b2cc9532b0aa32b3288812c7"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "spalign" = { revision = 42225; @@ -30293,10 +30632,10 @@ tl: { # no indentation version = "1.2"; }; "spectral" = { - revision = 56153; + revision = 57296; stripPrefix = 0; - sha512.run = "e6cb5c7284b42a1ae9b3b2cccffcbae0ce5ce395dbbbb1584e271181d78836c933f470a8b86543acd290c3085a9fe01e4090d66f4eff52b4e1be4d3adbb93395"; - sha512.doc = "414d277326ae8526820e4a21e387034f093632960982f655729919f9df6a06beece7eb3fc95ca91c6a86f724d9d481b91b76eb4a12891f28d3bde405f9f3650b"; + sha512.run = "46f6aba88425deb74e921ceafa578e9e8c467a5f9ada72b1372f6e70957946adb56bb05700a839249b2387472f4059a2dfbf4b83cb9979a4936442dac5c9258c"; + sha512.doc = "6166a19151b57d2fe23833a5583b838fff6af01d96c1056bd79532af45efa8cb58f75d9c2993c7512f69fc7716d746d16de8bc5b2143cb07790cd19997bba5bc"; hasRunfiles = true; }; "spectralsequences" = { @@ -30521,6 +30860,12 @@ tl: { # no indentation hasRunfiles = true; version = "1.04"; }; +"startlatex2e" = { + revision = 56809; + stripPrefix = 0; + sha512.run = "e8946fbe61c9c52a3fe5cc7b6b4adfdd8a90312fc146f331f0dff774e819ed1a789ad047c2587816b7b8568f4a520b2c0600a4b39ff3586254bfb6f15db28b79"; + sha512.doc = "767c9defb727f206c8e2090a1501e8435bf77859b6546690c7a8d1cb6481ae4c576346449fe760423eaf126858e521b020404cbe84ab2f02c95f07e1af8f93c5"; +}; "statex" = { revision = 20306; stripPrefix = 0; @@ -30618,12 +30963,20 @@ tl: { # no indentation version = "11a"; }; "step" = { - revision = 53731; + revision = 57307; stripPrefix = 0; - sha512.run = "dab392c9d8182e0d06605b82f123223d6bc811291f0b6ee2c35b75a21f868a5e249a330a2c0876dd1e4fa6395e11000d0f6db687aa85e1eaf1058e933fa72160"; - sha512.doc = "2f862061aa868cb2a74766270b42685f5625adfe42c46c6fb83d7d0efe5bccca2843275e9b68d11610174de193f0f754d976d64c11ee27fab0d128e63b0aa964"; + sha512.run = "d1f19415ceeefb879a3b4017fa286e5e5806e193fc75159b515fe21a9a6093c6a95d04e2e2e3c7ee457edb8ad717b88043c58727fb3924cb192e05aec12c5c07"; + sha512.doc = "bbf49f36bf7588c83e237d58d49ff7453c368cbe7e3a32c431944a2249c0dd75c2c1081d10bc2279e0836384602268ad163ffa3eb7108cd28a6c510a18f001c5"; hasRunfiles = true; - version = "2.0.3"; + version = "2.0.5"; +}; +"stepgreek" = { + revision = 57074; + stripPrefix = 0; + sha512.run = "c322bb089a887b36c4008502160f0970ff2ca33f05391010adc38c12726b2079085bb1775934597fa1758effee14eda76647b886644971e7c40a451154e446f9"; + sha512.doc = "c3f4c2b1ea06a012ba4d5f5ca72faa0a6c1b4ae5c132b17bda0b6bb895f34e555724f93cd791fad8c6ff846027dbedd723f874ae1e772de95c64bf54f5fa0265"; + hasRunfiles = true; + version = "3.0b1"; }; "stex" = { revision = 50489; @@ -30634,12 +30987,12 @@ tl: { # no indentation hasRunfiles = true; }; "stickstoo" = { - revision = 54512; + revision = 57193; stripPrefix = 0; - sha512.run = "f4539fa4c7cef2b69a595bc202e7e49294473556538e9258c27502217e397cdf6eb0395a7afd70ef70e9c784a46b324ae4952b1d14ada4a3116b72e594756af4"; - sha512.doc = "098345e6d2fca73d375bf0a170309bc32a611863728b13ef717d99e08368cbd16d173564e28bd5aaa9057301aed1207cd5388a8db1b69fae737fd8c361337faa"; + sha512.run = "5da4a3d412ee4c015e0f15939edf71bd8dd16f218ca3d8d236cb071554af2dac9fb4e71de4b18626578134e94262582dfb62071c1cc4af5ef2fb6111b6430d92"; + sha512.doc = "0a36ffbe112993a90054e3ba413725abb4259e10a3f439eff694c05ce8b99592e7d1001fda13cf49d1ce0e89f388e1726962b58e74e13eea4b918ee85303b24a"; hasRunfiles = true; - version = "1.033"; + version = "1.034"; }; "stix" = { revision = 54512; @@ -30710,13 +31063,13 @@ tl: { # no indentation version = "1.12"; }; "stringstrings" = { - revision = 36203; + revision = 57097; stripPrefix = 0; - sha512.run = "8ed9dc3bbc869f06126280a4dfab23da73b57a9c5c1058dd9764e2bece26840ad37637d4e83aa84e6d9a17d92095803788697b8d325bca7fd57c7135ade7cbf1"; - sha512.doc = "fd794606d8eb3a9ab27957268aae1b35b89c1bfc1b3d5602290797a6eda8551e14471d35fd85cc6d0561a1e74523a36450c958a0cf5881d42742eabf085bc794"; - sha512.source = "79d8d86c7c3695b8d821bd1bf5400b5195c753877f8aa6c24094acc87d91ba8b58b086b760e87acc6e1d4b7e3898c7530f40567f626cb3b002ee7064c636359a"; + sha512.run = "fbc29bbf65e7d4a1fd367b03490f73bf44349427f6c1a7e826135ee9092c9b592a4cf23454919e0bcc74dc59d3a6ad072dea16096e4850780ff295dc3caacc48"; + sha512.doc = "1779de4af914b69ab258bc1f69a807c12f750e5919936c78ace4496f86200bfc4c3146dffbb27ac5977c2e8d41ec8d0139cf2a2560ba7c627dacd70b34cc69ea"; + sha512.source = "94cf26d431d3638f769166c999e3dff156bd37e02a7099129f1259b7259be95896b694a64fea657aefce22f3a1e98ec2bbbf0f6f85171ccf977068ddafbb8078"; hasRunfiles = true; - version = "1.23"; + version = "1.24"; }; "structmech" = { revision = 47859; @@ -30735,13 +31088,13 @@ tl: { # no indentation version = "2.3c-0-g7d3fc5b"; }; "sttools" = { - revision = 43684; + revision = 56774; stripPrefix = 0; - sha512.run = "acc5c6b470d1e5fd96eaebf3792b3c2402a8fe4a07409328878313cfbaa1e0febc758ae75c6d736e9320f6a332c67f7d6898c761b9c5e30f6658e9049df889b3"; - sha512.doc = "15292806d0f8f4a0364076fa225b7d914a4ae88935e08f87a46978f5a561405f6fe4dc2d471c974c85b369e57bcdc00a5a4759d66d296610713d858dcdd4da34"; - sha512.source = "b22286c3e7b1bc31247fd52e0c64a5f3dddf35e69c2af8e2a617530a24f82e9504f9f0db82d3cd1c57bae61aba526d941636aa32f498ccb3b06983e6e5f511fe"; + sha512.run = "d9707fc22ad26d291288debdb2d9bb492175dade76ed398c3c0ffd1d4ba256d8c691bc2fb9d537ff01af4de7bf1352d4b1f62cc6c54afa8c02eea8b69185382b"; + sha512.doc = "b32bd4fa10599b3ace5bc8e1b2dae79750aace26a98806de275fdd358554b6f26fde48c9e7b0fbb108de0a771728a68f6c09fa9c568a5e2fce7b9aaa1fb1f58f"; + sha512.source = "56a096fbc8f28a0ea2f1ef31ebf277204319eaf6fb9bfcbd5449d24b2689a111f192ee1c723adcf8800c9ca2069c934cde8d0bdefae473e6eced2b043b7fd8d8"; hasRunfiles = true; - version = "2.0"; + version = "2.1"; }; "stubs" = { revision = 19440; @@ -30835,13 +31188,14 @@ tl: { # no indentation version = "2.1.5"; }; "subfiles" = { - revision = 56291; + revision = 56977; stripPrefix = 0; - sha512.run = "97d7baa174b71b76161f5df79844d6fb76f03bd108c6152146c0257c6a6a019608bc35ac95393fe034ac15198cc52925f294b2a417501179a0e3e59a01346070"; - sha512.doc = "d18ad89705a0dd1c6c8ab3c7e4c2755f1f3d447811da53e0b0894083cd9b422b1c78f030ad56a678d9553231082f86c14ce6ce9ee8f83bc256b05fe144fffa5b"; - sha512.source = "76cbafa28b75979dfab0f00d31d3c7ffeb17240cf60cd465457d97da70f4a98fc600bea04cf01642593ef1a7c843262aed9f45331971f04a58dac3891f0c44f4"; + deps."import" = tl."import"; + sha512.run = "8f842b0debcae3110f0a4b2f59047cd55c2726d128bf3e159f2745a4b8a645c3f8471fe218ca34c32f2b35d42d1c5023a25f09fc3bf0c1a4f0c33197776b1cec"; + sha512.doc = "f54f52c5cee01b7ae8e01bff5a4d828b5c6708c31f2cf40d7e83c8a91c4c597945695dd7062b6088d3f91f7a9858e3227c850d658ae7a7bf94392e00e3eaf9c7"; + sha512.source = "2623a0ec244722c1e3194d9ff1237305c1b7bf8c3baf6f60edd69b165bbd5ea83fb73ad23bf9aac1937b4ecf1059754e798eb2c97f7bab5d550fabbe84b752c0"; hasRunfiles = true; - version = "2.0"; + version = "2.2"; }; "subfloat" = { revision = 29349; @@ -30911,13 +31265,13 @@ tl: { # no indentation version = "1.0a"; }; "suftesi" = { - revision = 55669; + revision = 57196; stripPrefix = 0; - sha512.run = "50fe43276eb3d2af661bd552d7e3cfb76552337a298040c0f2024f767a8b81793dc6f5abb41a997674987ac9f6573dec517b03f1a2d0065a4953c98a25bf4a07"; - sha512.doc = "f6e398837eab6df3612577bc59b56f2eb18a4298d121f34c716aaa3e338fdf690ddc74b9e9f91671953e3680b31fc0842cfc007785413fad33974c7a23c69fd8"; - sha512.source = "601f33a2b8d66f9300d8d7d49b66d39cc1996f4298ff7b3bfa9292744808dd730e4a3b802c233becf8469e212b6bb54f3082d043e8670e719fa6ee23978523ea"; + sha512.run = "c958210ead2ebbda3350b8255ffab0acd1eed0b4f17c94b5abe31902660bcc296190a749fcaa2b2a9e786bcd1e3dd969723d0e9310c7e7f87a5b7fdb48be3e42"; + sha512.doc = "c059b70e4245212526a5a8ee112a27450fa71a7fe86dd012c78dc82e25aa9fe31b9fa131cab62d265b05a4bfb6a6682fa6f7c2d0e4b746caf4aa880ee507a9e6"; + sha512.source = "85f7189e7b13f76d828e4596f55c9d5eb14fbcf667e1e9a3a3f696ce8cfc8dd31e9004afffe21748273364a8fca20bd7adef9ccbeb56d0aa959284d15eb2bba4"; hasRunfiles = true; - version = "2.9.10"; + version = "2.9.11"; }; "sugconf" = { revision = 15878; @@ -30951,13 +31305,13 @@ tl: { # no indentation hasRunfiles = true; }; "svg" = { - revision = 56475; + revision = 57010; stripPrefix = 0; - sha512.run = "d004a25b7b836ab9ac3011c3160fad8d7b35fca5a3748800ab10d2ab6c7a08833461b72346e80329add288759fc468914c4f3133a1e30314e5e60a74e26db3bd"; - sha512.doc = "a03754d3f939c595ab65af88999c2fd37cde6c317f019ebb5d1191d505126b03f9e9aa4b305d76c47bcb73cde8e98c238c8b43160293b9532353604e6f8700b4"; - sha512.source = "d0b7b0783c30beae687f984de3a7453b29e4ff589c97acda1105e98f9e2581cecba5ee34e75b245c043a5ac7112af854b419f91b1abe361a11128ae0416d6192"; + sha512.run = "fd2c051969ea85b2e5c2818292128044038003456f8019efc3c6decb7e811f3eeeed6f3505cb661ee2b4768fa7715f5b3aff4583124d6cc99fef5c5f6a2fed77"; + sha512.doc = "84f35fd26786e57a8eea08af996d6edc93116529ab364e2b2e23ea6826748435d8487264438f7ff6b44b6d6975e0f18b1f27599e0e554b3d664055296e8fb0d7"; + sha512.source = "834958e4f8a0d8102ff88af0c499455c9bdcf61b0bd2795e25a07507c55ad6e7a5bcd131bbac48e463bd93b4bf49dee9aebe46a8999d75c24218a332814d5974"; hasRunfiles = true; - version = "2.02i"; + version = "2.02k"; }; "svg-inkscape" = { revision = 32199; @@ -31024,6 +31378,15 @@ tl: { # no indentation sha512.doc = "a3db201554a0b828cfc72d47a22b777fd7b44b25c361a4d8f032cc62658780628e83f6eabfbf342b867fda335c1ddc228347f5fc66651193c8229e0bc6e46f67"; hasRunfiles = true; }; +"swfigure" = { + revision = 57213; + stripPrefix = 0; + sha512.run = "128965eab86a5028904bb2486c7adfead525ccc26a912cd4f69b63a11e18fadb3f8b0f42a9ba3e8296952afd3be0be052fa721a0edd6df320827acda82e6271a"; + sha512.doc = "968b87d733ec7bfabab4a7996482c54b184e8e46c8f5e30078e9c8957923c2fda3f136b65d5b1be392b62fce5fd1e016066dd86d42da3e43997b04a723a491fd"; + sha512.source = "fa34afb85d7380539e283d5f1aca26468c31b6d631d28618a3cde73e3bfa493a3106f4321a5cbe172d86ef547165fc255f02f44957b28abf15c1b08d36e72952"; + hasRunfiles = true; + version = "0.9.18"; +}; "swimgraf" = { revision = 25446; stripPrefix = 0; @@ -31052,11 +31415,11 @@ tl: { # no indentation hasRunfiles = true; }; "sympytexpackage" = { - revision = 45818; + revision = 57090; stripPrefix = 0; - sha512.run = "14813cf24b562ed135e6d5a0078306f0687cd464915ecc17e61df0bb5d9900d7110e8338c469d4d55664b2fecd1eeb6bb4f359b11fb2a07bad72a442b7698842"; - sha512.doc = "c4e7e386852b3acd071d1addea10435985e7722dfffd4933ac2c3821b5a75e8c9500f5c42bb6b3e2315bd06b8d3e2ad12423c2c43547bb51b2f59bd982d7dfd3"; - sha512.source = "7dfa3975f5c042f7196ef6a76e31b79caeca4101026afc53aed719239e7ce701a7917e733bb77297b569333adccab6b5bc7149befdd6eed4f09d46ea38684579"; + sha512.run = "9a1fa177703dbed088861ff47e5b53f3c0f433abe15d471d181368c52e0cdae7350090ce5cb3c25d4ca816d1132eb009359977ada3f3c0b5c3b80bc0873f8110"; + sha512.doc = "0013c9c1e21f70e36e6b30f12d777f9f78b727ee1beb2f893133248fffb75f0bc4523c0787c0e292f197ce1c01b5f37b34c33ae97ed713bd900848657d803c59"; + sha512.source = "45df3251efd8a8e5669f72b83fc8c07c9df777ec90bdae9b8a92ff3c1875fe623574365f69162cc4c2f89e4fc7ea32dd1ac0ce164ee804799496be25466a12bc"; hasRunfiles = true; version = "0.3"; }; @@ -31080,6 +31443,14 @@ tl: { # no indentation sha512.doc = "7d0754c08081abc9867d0d40fc910ae5f8b34518004bf698dddc184f0b514d75a7feb3085870cf8322b3d6f3bc4c32ab50acdaeb56b574bf41604a18c23a6656"; hasRunfiles = true; }; +"syntaxdi" = { + revision = 56685; + stripPrefix = 0; + sha512.run = "79d5df672a25ed58919b7e054be992986edc8484348388d5eb318dfa99fc55ad3c452d6924c857c1bfb46361d59fe1d4e38cf84c9cfecd241f7d0c9d184f7995"; + sha512.doc = "a7c370c6b6c3877098e5cb216c4e82d382dfba0627de6abbca8f4e1bc6f94f53f11bac7456be213fa632d501dbabe910ef94680cb2cb20549c292ec5ffe79451"; + hasRunfiles = true; + version = "0.8.2"; +}; "syntrace" = { revision = 15878; stripPrefix = 0; @@ -31241,11 +31612,12 @@ tl: { # no indentation version = "1.4"; }; "tabu" = { - revision = 49707; + revision = 56615; stripPrefix = 0; - sha512.run = "b5ee526ac9f68edba34784ed646557b8b1b28a0192c5acefa81dab5a637050798c4a7410589ff98549b2a29e30686c518d2f319144c7e4fb2ab1464d56d2fac6"; - sha512.doc = "b7cb976e6908f219d50bb3e30dc7874b3c9843c8c36bc59cfb909fd54472c4767e914889cb4f50b4ad426176764a09633254e05d271daaaefe0b0beef80161e9"; - sha512.source = "0684c272a9dabb794a0dbb3900006abe2b0997b6e3335668d058bd9195a6661ee523bb7324ec2e98a7cbfa88416310ec2427c1abcf01986ad1e07a1008bd506b"; + deps."varwidth" = tl."varwidth"; + sha512.run = "cee6894fac19a98293402b714cc52eaf8ec0b9965a8e9ab9f5125388a2e4709e5d33063286eac9e45a3470f551d1aeeb41d09623b5dddd6563c1c462c2582ba3"; + sha512.doc = "9e10613a8ca8b29d61ab5a394ece8e25e0e8abea4b7a70b01382935650c86e9554712635c78f3b097afc5f9560cef2fceb984b383826e206233c28144f332c2f"; + sha512.source = "7b88f0fee52dead2555b4dcc11699ff167207f210f663faccccc1f951e40a53a5a572840c43070d4f86bd183c5e0d9e456c548013160a39264bcda10e71ca49d"; hasRunfiles = true; version = "2.9"; }; @@ -31375,12 +31747,12 @@ tl: { # no indentation version = "2.40"; }; "tcolorbox" = { - revision = 56480; + revision = 56610; stripPrefix = 0; - sha512.run = "316879b98b72f6de49a754eb06e45811d543f2a666d97710d67cdd7b5e700b3994651ddd486d0f661ba6b6851569421c7d75295ce04717f59980096f8f69a4dd"; - sha512.doc = "b52d85403473020b20ff44d5ade3c2325f629ff0fd947082dc93c796e1deff82449532c059583d6f5444ffba98e809cd6d452ce22e6e7db61702798428dfd483"; + sha512.run = "70647656ee420fcb3c832e8552c2340229b0586a638f7c55404f96f20dcb3e8fd2c561a44ece09e6f507a3c4e2be189aa4cb3a3c4d8bc338ca4396e5d4b9416d"; + sha512.doc = "5ec6c748b48b0166555437e0f75203e616e43a8b15787890b00d36df7c86de1971d2a876c5e7228f60f9ccd2e14c7b30ec061f35127a76f6194722c7103c9c0f"; hasRunfiles = true; - version = "4.41"; + version = "4.42"; }; "tdclock" = { revision = 33043; @@ -31547,13 +31919,13 @@ tl: { # no indentation version = "1"; }; "teubner" = { - revision = 40197; + revision = 56956; stripPrefix = 0; - sha512.run = "196c611d9a1f8231541a345a71bb45279715a748a8ef624865c076a8f346f8ac9a7be636feed01130d98445f8fa032ea8f22ff4f4194ae45efa0073231d5cc41"; - sha512.doc = "3714dd9003e03f0758031dce6dbd5a3840b2d9fee53382fdc66e99d4baaba153694c88fa5afc8e2ffd4af64e210a7e65e2a663baaeed7d96c0800a3fb08cc983"; - sha512.source = "667dc5669ddda08eb3f100a501d3d5f3822c8bf1f58d51356fbd51bba3a98b53c47df32243e5733e8da4d136074b8e4c29caed91cb6c5d349079ed1387f3de82"; + sha512.run = "efccacf859896fceb752c0326c99512066779111503a654e2ae48a673bc832fd2c88608843ea1383d1bfd981a3e07c565e1c61a19043efbd91c4a0ab90939472"; + sha512.doc = "191e7cd08cec3620cdd274a85c32d0071a74b8b4b102838ed7c2fc8ce4f4d2bd20570dc181549e4743fadf4a663313b1761a6da6c7e04bb54033c7038ec554b4"; + sha512.source = "6301aad96ee81cb82372f4ac827b3b02db8b0ff0808caeec797d9984e545903b7f13e49a52e06afcd3d9995d1392ab74e5ac8df817172d3f2ca723f30d9b731c"; hasRunfiles = true; - version = "4.8"; + version = "5.0"; }; "tex" = { revision = 56291; @@ -31643,10 +32015,10 @@ tl: { # no indentation hasRunfiles = true; }; "tex-refs" = { - revision = 44131; + revision = 57349; stripPrefix = 0; - sha512.run = "12ce34f2173ddb5be885b174a6be708fb47822cdd34e05ffcf6f17cb28ccfc32528206c9e73373a6f68a5f3987cb9e244c5093539f14db3a4eab0daf8ff7fbaf"; - sha512.doc = "318f2872f308b2f22d96af2a553d9e13b60e1f6ffc1cbdf44e123fb2ca82423ff8bb7aba524f0e8570b8086ef85833cb11070d7848b3212b87ae0046405c1a5a"; + sha512.run = "aa03714a0ebb90c7431935608851c504080f8985db3bbba98cbfa9b957e0a3fbb87de8e0119bfdcc996d664aa46bb943c6f90b36c4408a42f14fcc8387508df6"; + sha512.doc = "f033d8d8bfafdece7b79c8417bce19dde484adbaa958497c0b4426448e6ebbfe8dcda07a34c336c3abe038447ea9e5177bce4660c9b8be36b0f94d02fc7a41d5"; version = "0.4.8"; }; "tex-virtual-academy-pl" = { @@ -31656,16 +32028,16 @@ tl: { # no indentation sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee"; }; "tex4ebook" = { - revision = 56291; - sha512.run = "d55f39a6e7d528a0085eb8e3c56b31b71cc399dff0f97f46f73d362e460b4998cc69e3d52b2b8f2ea7d57fd9f495be58a1072d1deaf50a6b77ffa55598ed30eb"; - sha512.doc = "98e031478e7f9bc08c2837d172f4e7e8d9df8202fd2ff4737356d4f2384b0841518497834c4695bcf5fc9176f70df819e38378deb60321d97fbec4e5bbc845ad"; + revision = 56878; + sha512.run = "9ef3a2b820f1f7015b61b8cff017affbf8cdc07fb1d4c39f629e46e2457a08875dd83252526e75465ec75a42d6580b7ec75b085455e5ba62dd14dd13a898a8f2"; + sha512.doc = "0a01620564aa41d076a998910eff5a1fc45b7a0f2a3b2f606191e1442c49ed6685c8ac51a099834da2765de030d2f099a79fd03d6aebe08f78837f18638bc9d2"; hasRunfiles = true; - version = "0.3b"; + version = "0.3c"; }; "tex4ht" = { - revision = 56601; - sha512.run = "6b64db1d0732fb2f8e54950a7147a4f85cd19067efd1ca4be2c5ec69eaf48cf4bbe324a78a6f9b6f6d0489597c77e1a7835e583018a1a5af5dcf4f76cdd72f88"; - sha512.doc = "487e1db18d843e1c283c2fe26761d941aef1edf7ff696557ddde45adf498d66d6f90f4e597a79b9f7a6a467c4887ae6e6dc566605602ec318853e58db4d023b1"; + revision = 57348; + sha512.run = "341481505d1dfe7013df6df04b257826a54c64364885100b35b92db839a4877aba4835bad9fc5c30e924de01d8729cdc606a3a54d602cc6b16c95312db158394"; + sha512.doc = "36417937a23fa3f3de091c717ab0dcdbef63a3954d238240e2cf275acaeeba84361113a6727bd19e8a51d90afab66304059c3c3a50ef8e72f29127a8e0f51080"; hasRunfiles = true; }; "texapi" = { @@ -31766,17 +32138,17 @@ tl: { # no indentation version = "0.1"; }; "texinfo" = { - revision = 55833; + revision = 56777; stripPrefix = 0; - sha512.run = "3ff0c13b5713df9ca112f7625e0fd2add2a4de5ec5209aa19f35d45d0373418e89e38483ed9f1ce7cf73bd73c215e9f04044888e5ca0cc8283df9e04b264d2ea"; + sha512.run = "d6e9bfbb2df017fe05f62028e28d837bbed63a19fc0d4b56c4b717e8386324314d40f4c7d64f0379ef0bf9142ddcdb365566b5b05720fd02151ca0647c986937"; hasRunfiles = true; version = "5.1"; }; "texlive-common" = { - revision = 56460; + revision = 57339; stripPrefix = 0; - sha512.run = "e3416fc60057ae5a8c9d8e08a27d5ec91f22bc15ae767068980f56f01435615b7aa8cf0d4585d9a719777cd4a784ca82402a1f5b5fbcb3559380b4826e4b0f5c"; - sha512.doc = "3f9c68c9823aef62fa679c247790704febedcfe0b45f2a3fddb588e85919214567fd9afd27f2123e9931e586fbd2b748ecdd141471b39bb2a82afce238200e42"; + sha512.run = "196156b586b808882f75a5c06e224804e0fd8899ca284a0e50f6fbd8b3563584f00013577d8347da0682582cf29ab0798e36a71fbc2ad8a616335c72f70406e5"; + sha512.doc = "54f72e1aa3e4e2c4384ddcef42649519db85be0fddf170b1d3988bfa9cba8025f8bba0d57b69f978dbb59d6fd142af81b8fae765d591958fdce9c7b51e4254b6"; }; "texlive-cz" = { revision = 54496; @@ -31785,15 +32157,15 @@ tl: { # no indentation sha512.doc = "ecfc4149bddfb665c6f48e65b719cc3d2240d0be151bec94676a188da08a203e84443b4c8e77590476c3194fae55ea23753a248c6f60ddd0b27895dea703a219"; }; "texlive-de" = { - revision = 54604; + revision = 57223; stripPrefix = 0; - sha512.run = "29e24971280fae6675d7531bb538fd7cd8f9a0d5ea2a2fceac79b563b8c046fd760dcb1da6ca6c39e8f262c025158391a262cdd6cada739034e39558d5b4cadc"; - sha512.doc = "ee0e8cfd65a4ef9771b54b6ebbedfaf3854452fe76f889af98e6bc3bdc14fd009a13d484d658c2b4ff67dd1bc23ebe33b3669d26b6a1ede9801f3f43d58a8004"; + sha512.run = "e0cd9ddb94d90668dae30df9368ae1e724c37f44237d1a4a807439086d23f07040c8d34f2d177559c0776478487c7f863c3c1a51549005c8e7ba59520869fb25"; + sha512.doc = "14073090ad0d3e834f4f7d07455732d35f82b84b7070a54f1df09b46c057e2c80ca704fa2e956fa713b430660cd69d28854c0a3f59cc043ad49ff25e6bf6eba0"; }; "texlive-docindex" = { - revision = 56593; - sha512.run = "173e31439332ea688b0ae817dbc5160fa355bc6c5049e78aa1666847a868dc2bc111652f0dcb7f4a64a00c252f8ffc0274b731713af4c763b92eee3cb3d6004b"; - sha512.doc = "46c8eeade7d0a51bf75b21711bdddb7de815f29c82195d479e934696ef596282b0a1e2a36d5f1169b28f9b49f4e3a78ef00f17ca4d6906cca28daae6000516a2"; + revision = 57339; + sha512.run = "9c978b6362cbd159c6e8fa02ffca98d6f815528c1ae5393019a4a1ef5512aff2977cc91c078404f4c7a4a1991022d07dea6eaab805a7aa25fcb3795531a295b5"; + sha512.doc = "cc3e60ccc7d26bcccfcd96b45e053ad08fb6bf865ce7549dc95e8155f0802e5ee0bc048916ccb429ad1fb537e3ea4e50444f9cbd60e824807cfc226a771b9df9"; }; "texlive-en" = { revision = 54755; @@ -31826,8 +32198,8 @@ tl: { # no indentation sha512.doc = "04dde56c7da52ecb10d94508effeb715fdd8abd95e3db301e5bce469d9db6a76a52268c3bb06d6800cb28a177570b22f90d2482bb5333eff82cd1f9c378a7cf6"; }; "texlive-msg-translations" = { - revision = 56471; - sha512.run = "7b7571932366f6cede88d2b4091cdb8f2ad9037b889e9efae591d9603c700fc11a82e495a14690d33687a5ba7cfd658e86a45c4adcf4141bd680f4095deeb9ef"; + revision = 57063; + sha512.run = "435ae1fedddc3556b55f4be2a131d1de2789785accbc06b0659f93435fbeda99afb80bf57d002d4da7bdb1b6b2b06dc030fadcd757e864929976c3d45a7d6619"; hasRunfiles = true; }; "texlive-pl" = { @@ -31843,9 +32215,9 @@ tl: { # no indentation sha512.doc = "32ab76462c2bab0979029ee9eabd3ddfacebc791083276369dca96c11e3a594358145c4325f088f30966d7cb6482cf708c4b226d6cf0a4c990bda12ba660fd88"; }; "texlive-scripts" = { - revision = 56579; - sha512.run = "eac71dbab40aaa375650d15b51c6ce646b418a3c07a3603a5dd02079bdaed0d7cf4926f1bca69dac567c49c3d766da16c7abde200ddc021f3530f75619978df4"; - sha512.doc = "7d423b4727501048627fa1bf1bf2a558d60e77a03aac1f808cab176ae4fd500029653ca9f09ebcf5f6165af24f4739206217ca25675a5360de8e892aab42c01c"; + revision = 57344; + sha512.run = "d903448e0f0381e55bcfe6a00c446d5b9c66dba9d90af61cbfac64277e512c70c037534080a973f064b44a3938ac01d7ff2a835d47f593905930f4d4d8443bf7"; + sha512.doc = "d0748c5cf97d864ce667dd43b50196ff1e16cb9e6bb442a35c6d418b231a0c9c8b57f52bc4e1d452dff0e58917a95dcfe22868dc211cd0c16757cf1b8016562b"; hasRunfiles = true; }; "texlive-scripts-extra" = { @@ -31905,11 +32277,11 @@ tl: { # no indentation version = "0.2.0"; }; "texnegar" = { - revision = 56215; + revision = 56742; stripPrefix = 0; - sha512.run = "ea05aed87a09be31df532f15bf38c22e4fa0c19860921192d42bed49729de932731bb429115a8448bb05421e9ba69342f86bec61fac5d84a2fd2eaf7e01c0e5c"; - sha512.doc = "bf4d0c943e209477ee36b89457687353a9c60f78c554b2a46dc3a9d7f72d645594f807a4ac59c331303d9993b235b79a6a4febcc305d217c6673b2ce7df39405"; - sha512.source = "63efdcad942c40ce156dab0b720b5fc727b0f0c25ccc4b0a2cafbde86dd09c497326fb1dba85249b9e943608f72fea8ea4ae29ab45a66dd49f1c210094268283"; + sha512.run = "0865a25dd321367903caa20dd3679ea26c41259a434c7b58a30ab86df9ce3091736512bc315f0684d2fb59108daa8a3fcbac8d440ec6c034628d27fd7eae197b"; + sha512.doc = "bbf1a6934b000a1f41b61d4377869a470c3fb7a89d528c8f118e987fbe1fdd2bf1615b8422d5ff1d55a6626e9b14400b2710dc9eca4c26bca3a41ce37894e3e5"; + sha512.source = "37cfd0a3b018c09c4a320c5be47af494fa84c876d5f3fa4c3d23c174d1065a19e72494c61a07decf503d10f24786f595d56d49b6464a52cf5f518b938a1d6fc0"; hasRunfiles = true; version = "0.1b"; }; @@ -32145,13 +32517,13 @@ tl: { # no indentation hasRunfiles = true; }; "thesis-ekf" = { - revision = 55662; + revision = 57207; stripPrefix = 0; - sha512.run = "7c50f0bfb5d38cb5dcedd7927b6bc9b3c39e0b3f35627c522c7f96f4f19f2744815d9571cfbf8e63bd1ce21e1d59ed3fcd6d015aaee1bb39b1c90a38ae5a40be"; - sha512.doc = "963b98d0537919d97d254176c6b4a368b70c23b1841002f4ced8a8a2a3536b67717d276206a38414ed2da511d111caf6468b3d333e6f3917053fa3c5c9ab22fe"; - sha512.source = "ee4a96c69819bde61c0be220cb61973c1f4c1ac8ebcbb1595cd5fdc7f10988d3a1c14b175eb4b12370984b60c93c4f44e59c41750f168917645a2b27d2150496"; + sha512.run = "34f9f72bd8ef813c0ef6a01956304ef99f8a0fecf17786f9aa51fc6aac4655f5a76aa030509379699f6dcbe6a7245cd1d01f2fd0df8fd3bc77e5f8ddaa0ffb8c"; + sha512.doc = "48989f4df56a2820c048651831b598fd3c956ffb2733a9d3e8a68891e7c410a72425ba3a32a4a0ecd6f7640f7054d85016c7c9dd129ad59849588cdc09547548"; + sha512.source = "45c2329fa7994a119e1c8c2d3e777b4ab1083496c538edcda3382d2321a4b7cea97daddde8efd75bad12b79d95d635f45bd79f1db682a384ef320d4b000c1ec1"; hasRunfiles = true; - version = "4.0"; + version = "4.1"; }; "thesis-gwu" = { revision = 54287; @@ -32286,13 +32658,13 @@ tl: { # no indentation version = "0.1"; }; "thuthesis" = { - revision = 56305; + revision = 56659; stripPrefix = 0; - sha512.run = "fb7efc08f75995cf1598ddf6c7c9c18fb23110fab75cd3d2c2412f2b1b0788a03673db76339b01ef97a539eddefc69d371a50b947bbdba94e011aba9c9c39edd"; - sha512.doc = "839ba4e7ef67c769e89f4f26882487a999d77da4de4c37f90e0814b57db0a43f4f527fe12b7077fac85d9ffc7e5ca77bc9026ebc1e89f3cb480e9be4cbcaa4bd"; - sha512.source = "608175b2b46369d59b108e1d0c1bdc0e4677c56bae5ca9b0fd7a98c078fe25952f3265ca2d85cc785a4cd548b3dcf2ad8764908f485268e471c8c210ea9ee89a"; + sha512.run = "0d95c02814b57c503d1cdab1094caa8d44288f400f333547a2cbb0d75f9158d7c262ce6ca7d103ef46db5eb116dab9198b227c138dfe98e13cfe4a99f831a054"; + sha512.doc = "85b211be8449a5d280db6a427e36ff8dd6daf66d2f8c07e1e99d9faf656a00b8fba1315ee8b919ee7c37527c2291004aa267cd385269e518fba507a3f1b7a793"; + sha512.source = "c360eec95b59cbb77b9ef51b454b48bcee07763ea733c187c0f8c5a39f4052d744f5b3c17ad7fc786539b0190bd03e906f487462ece32661f45a7ecd42ccedda"; hasRunfiles = true; - version = "7.0.0"; + version = "7.1.0"; }; "ticket" = { revision = 42280; @@ -32324,6 +32696,14 @@ tl: { # no indentation sha512.doc = "0fd9bde0f12ddf5a4bf6e2e1df66a9aafa42e81cd945b41e09e8d289c57b04faddd303a415c36239e6686be90f06e8a7cc794ea50d17ec54f1e25703314257da"; hasRunfiles = true; }; +"tikz-among-us" = { + revision = 56820; + stripPrefix = 0; + sha512.run = "70eb06187c5146c9238e2074acdc39df7b40b9bef3cf34cd820d925ed482df07a1b3042b3f83e6cece15eefda4d28b483888c1b9628a55fb57cc0788ca263746"; + sha512.doc = "c272447fed242f2d6539c665684732b0953587924e4b921872bc420ea09a2c178779903c5f44ca72bf7a310ac03c6367fb5e801f4c30000406dd93c8a43098ab"; + hasRunfiles = true; + version = "1.1.0"; +}; "tikz-bayesnet" = { revision = 38295; stripPrefix = 0; @@ -32365,10 +32745,12 @@ tl: { # no indentation version = "1.1.0"; }; "tikz-feynman" = { - revision = 39582; + revision = 56615; stripPrefix = 0; - sha512.run = "1a1ebc5d2f2eca4e5dd16ce744774add9b8f5b4c3124dee46f0366f43a59b188b0873939d2b68ff0d679f3e52f1a6bc387ab81c363912024efd0eb4110e2ba27"; - sha512.doc = "b3e90aa1d8476aed01faef977b75f4e3450cab121d457eca0bb254075c1e2ed58fe15196ab0d923906dcf6af4f78bc76d6053343f6444c8294bf7d5bbceb3cd1"; + deps."iftex" = tl."iftex"; + deps."pgfopts" = tl."pgfopts"; + sha512.run = "34c147e6ee16643e99d2c8fa789b39aea6f3b9ae7de93fd5c65d1b0daca1e9514d484b5b38892a0cffa1aeedcd405df0bc6621bf68e587311bc9fe45205c29fc"; + sha512.doc = "ae0510a7971538fe458d83d4da4c78f7d607c7a1298344a139c02c49985f9005f6a81ab15f9dc621929d70d634c2cec4189ac4a2955e994611247af0c96986f3"; hasRunfiles = true; version = "1.1.0"; }; @@ -32521,12 +32903,12 @@ tl: { # no indentation version = "0.7f"; }; "tikz-trackschematic" = { - revision = 53754; + revision = 57300; stripPrefix = 0; - sha512.run = "5e00ec05ccd6c6900d8919efc35afc54051a25f8f57812fc476ab6a28f4cc194eb4887699e6353b15b76a68de799fcf9c96c4018ddfcf75d7fb889d998a6055c"; - sha512.doc = "ded12f30baf163ea465531960745af6ab473ff59e21c579e2c58151b61d2aa8d9b04a29d580a8ed86e88dc1a11a98b7d9dbec9d853bbd8a7556c0b3d634a2947"; + sha512.run = "3936b79ad3e687002ea2d52ef03bcd468518bf67e24a9e6eb83e9c5379bc244dadb3acbefd3bbfdaa84a5811f32b89a7bdca2bde4861ef6bda2021e7ee289828"; + sha512.doc = "0fd357b0e571c0bb9b0954338ab45147748574143c01c413700d7bda39d0171f037eb207770fbde9b366618fe60f5cff82d17900295ec14322373f2fe0f919ea"; hasRunfiles = true; - version = "0.5.1"; + version = "0.6"; }; "tikz-truchet" = { revision = 50020; @@ -32562,12 +32944,12 @@ tl: { # no indentation version = "1.0"; }; "tikzlings" = { - revision = 54838; + revision = 57065; stripPrefix = 0; - sha512.run = "f729a5ddd2318f78f7c18b5d22c35e31908644202d365cea821f94f0ecf32f6e1b4f48e056d7346ea825f5f39664a49590e6d70934b0e58e942a82a2908f59ed"; - sha512.doc = "fe8d9c9da1c9f9b2561388a64e5a531fa0d716db57a1512046ea49e94c5898b0908ee7434825a8c9edbe4fc3d7245a7a9050f7a0d9e08c7a3d51c52ce4772f68"; + sha512.run = "7a40509b00bef9ae0bf340e7bb5ae6509d9b17ca1902829912e33247067fc8d0349bc494df747052a00688d26ae43261f202e2d75f6830447c6f891b47028ae8"; + sha512.doc = "7473801c56837199ad2b1b4934b9c723489bb0f0ca831a802b6d4ded218df2f7dfd354c04c5ed81be4820f4118f54a60febc0293b7525f590d1673581ef8aef8"; hasRunfiles = true; - version = "0.3"; + version = "0.4"; }; "tikzmark" = { revision = 52293; @@ -33135,12 +33517,12 @@ tl: { # no indentation sha512.doc = "ae2f1aa60162512287f15c770a465c2e39abe1fa5d1223d96c524dc81bf065d62f307893d22dfc06fc50da8d63d817ed60c8f07fd4fede984b6febe9c8b7b710"; }; "translations" = { - revision = 54929; + revision = 56889; stripPrefix = 0; - sha512.run = "266840c17d98e67173b6d30c33ad5a8f281198f214174e63a741e53f0b52a92ff91e577dbe4075125dec5373dfaf95d8bd583fa20992d3d971f4e37f90928574"; - sha512.doc = "4dc935b51f06489f68602e91a7c67875cbc1ce4f3bb91158160057f9b6b2528272d8e9258fa6f9a2cd8729acf60e20cba855239a4b3a6a67a9aef1831f7c0263"; + sha512.run = "32ddc7d2d79734605f4cfc34fe7de5753392eea42dcb338301f14d453a81cbf2def0967a903c7d5db09c3d12fb9c5adb9736580f0c3b3efd60a4af44109ff1b4"; + sha512.doc = "81f4aa459b55a567e5585a3b4dbc83a2b9031c3d78e0dfacbb825672f704bba442e98aeacecfc326900b230e4edab873b47555da24c2f5c41a641bd0c5d3880d"; hasRunfiles = true; - version = "1.8b"; + version = "1.9"; }; "translator" = { revision = 56052; @@ -33248,15 +33630,15 @@ tl: { # no indentation version = "1.0"; }; "tuda-ci" = { - revision = 56594; + revision = 56921; stripPrefix = 0; - sha512.run = "9b91e0cf986b2ad57eb481dcfaeb4dd6458ea0080fb426bc62e1d0b7a19d06f7136bd97ac7627de54b23dc1bd43e6ca2907743e2a6d71b6771d70e8f2e182a24"; - sha512.doc = "56a10a7b200ad240c1721a7208ab814f9063fa2d6e676138410080fa58082b043486aaa89d7289c1ea7acdcc35465214e1f10fc3dbe9b98e0a7544bb885530c7"; + sha512.run = "da22e5de9085e794f62b437c44865c766412f8311c787bd236c6038a96216428de469ca3fd3300ccaf2ad61a17099705645d6bc5850cf50d3a62eabc8d89ed04"; + sha512.doc = "4ed12173409c1a27ce3700b024247e841e153719971ecf3e8e088eaffb53362e6d974b43227820c167f901a268bb5e91a78f73b5272285820a8dd6b3a926d7a9"; hasRunfiles = true; - version = "3.04"; + version = "3.08"; }; "tudscr" = { - revision = 56481; + revision = 56909; stripPrefix = 0; deps."cbfonts" = tl."cbfonts"; deps."environ" = tl."environ"; @@ -33273,11 +33655,11 @@ tl: { # no indentation deps."trimspaces" = tl."trimspaces"; deps."xcolor" = tl."xcolor"; deps."xpatch" = tl."xpatch"; - sha512.run = "bb58cf1988e3660e3bf684f6f9025e87abc4c1c95dcfe88cc1540381362c4d0ea5eea70971d1937a0257afee850ec9ce6b7b52518ac0f3aaa14c1e04e03b81c7"; - sha512.doc = "b587fe479e1efce354398bf723cffabbcc8c07bc24106bf720186fcc66a091b2ba318a0d21c6755437b0e949621805f6b53f536a5e1fb4cf21bd4d3fb983138e"; - sha512.source = "cfb0a8a6dc094989149386b545ebd1d52303aca0a7ab71c21775d288362321adc08662ba0c06b0da683b67ec667d73ffc3fc1bf473196ef03d6f380ea83201eb"; + sha512.run = "38c93ccfe8521a355ab9c0bccf6a9ba4e4a803397d8ac59cfbea118d13ffde5c70e300a44d339df72f3b8f591ff568baf0b86cde882b8990f1f42d4b74e5821a"; + sha512.doc = "f84f8c0422a25e07475918fedb39d9427a2ee7174720c82fdadd23bb5549e1183c28ce11ce3d6e84e93184010ff6caa50e6b33ef08a96d235ac5bc7c672ec901"; + sha512.source = "102690681db659a244bcd56baf8fb5d49063ce183f3ded0108e750cb45f16cb312bba9a70dda56fb4ab2cf22a74c63ab6b429cb841318309f908b1eacf8bcb58"; hasRunfiles = true; - version = "2.06j"; + version = "2.06k"; }; "tufte-latex" = { revision = 37649; @@ -33294,13 +33676,13 @@ tl: { # no indentation version = "3.5.2"; }; "tugboat" = { - revision = 54261; + revision = 56942; stripPrefix = 0; - sha512.run = "1365beb024d47ea6875839920a1b74c53ed29e835937573dc179359a6f02bcb28f46b901e47a2b7b8541ae076b2fae7d98c760d1cc93897648a0d7014ea097ff"; - sha512.doc = "6b4dd305ef9b9d2cf870ad2096be6c6733e094f98c7e12f19eea4197fcdb84343a6b79ddf57ab4edc9585709d09d000f438e17e8779c1f1bc4012ec13f3bfcbd"; - sha512.source = "086926280261fc8bfc994c33acfef8855d8ad55130fc4883960cea6071c81b2ce5928b5550e9c220dc42f2ab7b03097bc78cdbc900168534b72180ddec0bb1cb"; + sha512.run = "1a58d5dbb3c68ae1abc78265f5583943dbbe673efe5fe81aaa4f5b66e18afe573a2e135637e24b0026d68de994a143d2d9ea172c1bfebf4adb15927abf5f74de"; + sha512.doc = "7db84d7657506ef2837eae7a8658c64cb0c6e6d58d5638f7abd936670166c0e75c6822f9deb6ab5916ef0d51f25a3bbfc76f0906c086dd6edb703140b68d72e5"; + sha512.source = "9cf55ebca59c961ec144fe53d73dc01501b8f621716d20655661c133afbfa2b4e4e4169868d9f419f968787bdce3f6fadf66084dafcd542cb505aa1f7acb4e3b"; hasRunfiles = true; - version = "2.23"; + version = "2.24"; }; "tugboat-plain" = { revision = 51373; @@ -33499,10 +33881,10 @@ tl: { # no indentation hasRunfiles = true; }; "uafthesis" = { - revision = 29349; + revision = 57349; stripPrefix = 0; - sha512.run = "3f8146ae2cddcc8f136c7dad5cd926919d4d81a2b43038fcce55620c6c240326123b6f48c32504b44cbbd9b62aa3a61cd80f5b85c9890ecddef9d96342cc0eb7"; - sha512.doc = "bb1e0fddf66350187d8507b34811c0c1ea84fbf0c6cd3e9eeaec8ef6c7111fa2ad1eb4d805df01fa6bed58030056ddf0b2b4305ad821e696fa6de977cff46c98"; + sha512.run = "52e0fde63c966392a235239725e2db7cea70a300837cf53003f961d32f54787d8c4e70ee76577889ea543f884ed5ec281b345bc9e83872e5a131e55429f7afe0"; + sha512.doc = "92c2a15a214f42a9dad8c0c50a67c68d037980b813e8ea4f6067341628f19f51de36a20b0e0d8fc49acbdf6ff026a729dc86e65dd4b8fa148a541d9535db0f85"; hasRunfiles = true; version = "12.12"; }; @@ -33768,10 +34150,10 @@ tl: { # no indentation version = "2.1"; }; "undergradmath" = { - revision = 42926; + revision = 57286; stripPrefix = 0; - sha512.run = "1fa7b30670ff888b7b848b756b960690489aa7ea12e5cc5cc97b56061cc91c2fc4bb2ab0a3a2eaf13177baf760edf8bd7f222dbe02cc16ad7b53f57b4b4340fc"; - sha512.doc = "5dfa5955c7e9ed8fe89f6ccfb4517e699861b95619fc2013631d457938d64bd56bf34718c29b154a46b8519ec61bb102963668b13bb414a3a7ab35b748a981c7"; + sha512.run = "948d0f0ac20a63fb0c6de8003c572c11704d2016d2ddea6674f58742e997021d709d51806b5acb4716c79539b96086758814f4f5d303a257768c8716821e8451"; + sha512.doc = "6300a5d0781bae331091cfc8007e974ed3534ec3672dedc080c8e118e8526c98206438a6841d50d2e642e8d6c7859cabae14e140c211bc8175e7f9d1cba0ddfe"; }; "underlin" = { revision = 15878; @@ -33852,12 +34234,12 @@ tl: { # no indentation version = "0.01"; }; "unicode-data" = { - revision = 54758; + revision = 56768; stripPrefix = 0; - sha512.run = "ed05f1e6d7bdcaa1af1f4de575ca7e8495bdcb4682368e4e014a0d44dacb5c3221e66a3b73d946d1a7c5c3f3e36ad3b2d78d6f3d0e35affe926dfcb80f2a22f2"; - sha512.doc = "42511daaa2e1f7f9aa5cbcd12091dabbf8d6d4a030ec6808d06dd43d6c9c1b74684207f99ed6e87a5f279c73d3d76d5c65a150b0e7a4aa252e8118f512ddc3eb"; + sha512.run = "f966d643732bc6d9743d54cb2981e6420dd5bc33a3c2f43bf17f2f14afdfccf0ddd8068a13ce9547d60c8ee77559834f3cce97df8bd5d7252eebf978a3429b0c"; + sha512.doc = "1093c6e78d8f8716cec8ed34444d5e95628c2d0be4b61cb3dae72563b2e3acfc1596b5e25dd8c101dbc8ffe15b7483a198c30f459eb76418381be3dc6caadbef"; hasRunfiles = true; - version = "1.13"; + version = "1.14"; }; "unicode-math" = { revision = 56594; @@ -33878,6 +34260,14 @@ tl: { # no indentation hasRunfiles = true; version = "1.2"; }; +"uninormalize" = { + revision = 57257; + stripPrefix = 0; + sha512.run = "b9b0e91a61d99005be4f37d2e5aababf70729c60d959cc57295a7197b5e360ed183bb9cd80bbb287508bf584db48f061bcbb25c6a5bfd0936923b106d9962f60"; + sha512.doc = "804c2e70ff09a677c30f531db5605512453506ab83dce8f9dab4bfbb5602f8605376becc8f65cf375b28c9d6d35ad9f3a92d6f185697e2e9f9d367638d58fb56"; + hasRunfiles = true; + version = "0.1"; +}; "uniquecounter" = { revision = 53162; stripPrefix = 0; @@ -33954,12 +34344,12 @@ tl: { # no indentation hasRunfiles = true; }; "univie-ling" = { - revision = 55664; + revision = 56913; stripPrefix = 0; - sha512.run = "d72eea1b32aad88f34ebf20c40bac851ada821a1262386e5b0426a68ccf8e6ac8c4abf4ca1dec9ace44c4a4f4aa2f868cdefccad9b6ed07200272d23e5623ba4"; - sha512.doc = "58c284ab2c8b77d73fcf69d8dfceb2040b6d27068a98b7b21867fbf258f11920e0f2d0f027275f8e95f4d1c77906fef9fa56c8ab29ceed5a62007bfbee6f3cab"; + sha512.run = "d4c0a0d760fc6d9c5fb2a56a7040b37a2fd5e20c13761374fb8e83763e0e01090ba3079a589cd6544c707148c17c389e377598f420d73cb942da591ddeffb943"; + sha512.doc = "ded1f91665ad5a8e13bdbc5b01fad86f73efa77d144b946f8049fa6876b26cf237f645250137899e06d93bb19117120be9fd8d9651857bcc0a19df49ce87b664"; hasRunfiles = true; - version = "1.12"; + version = "1.13"; }; "unizgklasa" = { revision = 51647; @@ -34019,11 +34409,12 @@ tl: { # no indentation hasRunfiles = true; }; "uplatex" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -34032,15 +34423,14 @@ tl: { # no indentation deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; - deps."ms" = tl."ms"; deps."platex" = tl."platex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; - sha512.run = "3e7613e0de1d38ac64903fd16648d17624efe5f5ff32e50e84d58a1315cdea3017ea845e962fb6e9e2e276a6b7d77960ba93da95e5c792df560877f629da8b40"; - sha512.doc = "f84129ccbc081938e4ea01a70edad624fbbaf00d97f4bb665836baf2b622880cdfdc552a3c7071e27c7d1d102c44918df7727cd49c38fdbb84ab99b52cf0e461"; - sha512.source = "93d3a54b7af909f6ef1a8cbac752e6870ffaaef844eaaedf526449b109cbd553777869536cc5102127a057a115fd73488efeb1cea98655b1d037dece4292b79d"; + sha512.run = "e3fe867719f3e9dffba2d93de857e96e7db105c02aafb7cb5484fb19f4862c4e84a658930bd236dfd3693d829bf312c57665a554622b0aace50ed20ef14fd968"; + sha512.doc = "e0fceb0b765482e8979efc04be549e19e49fd8c2118ae039ee0792c3eb49bb4fc4f7b9f1deaf6aa3ee39cca5957a875c8cfab78a16e566860c171ba151e51b81"; + sha512.source = "2c2ae9a74d4ef567e2683c47c6661deaa9ebf85ba348a9cd0c138f49f2cacdcd59a419dc8a0f1378e68d960cbab31bff90b65e4cb6b83053cd4b50d887ea6b3e"; hasRunfiles = true; }; "upmethodology" = { @@ -34082,10 +34472,10 @@ tl: { # no indentation sha512.doc = "7da25d9527ea65993d9c530d6149f1385b41b8573a106f7812ad4b4d29caf7191d6248b0f104e6f41da86a83a25c59a0f7dbdc1a8f1a9e40e0ae234ca794943d"; }; "uptex-base" = { - revision = 56489; + revision = 56832; stripPrefix = 0; - sha512.run = "f4ee4a59f772851c8bb47968cdf0791d70875efdd929ae682b6987599d6c6bdd9388e287b44ab2bf864f7b5c9800edd78559953299b57e29689946be6def592c"; - sha512.doc = "12a8f25aeb59b6202977d8661b3bbbd6253d58e05ab60dc408245a9becfadd9048a147b96b9e78821b7fb8ce8f89abefb5f5e20be2fe776fa1e9fc6adad437f1"; + sha512.run = "ad62a640e04807f62f9efdd67720f57c7dbab0190fcfea7a82109f4f8223138b8d413c49e878c70ea04f733576828a4bdf475ebd1b6ed471268cb21bbfaebfae"; + sha512.doc = "dbfd62df1619e9a5814fde01796203180f77fdd48fe603cc1fb6701b2c2763d507eaf9925d2555a9fa6281e9dbf35c7218a9f888d325b628bc2d8036bb393637"; hasRunfiles = true; }; "uptex-fonts" = { @@ -34179,12 +34569,13 @@ tl: { # no indentation version = "1.0"; }; "ut-thesis" = { - revision = 38269; + revision = 57349; stripPrefix = 0; - sha512.run = "06a8933b03e02bd092a09843686d518ab58a47a4821bcafbe9568eebbe6d4e72e7815752016200ba5d68ab193408847c9f0a784bae9a65af4d1ad06b501c03f1"; - sha512.doc = "13dcfbd7dfe45a4d1fa0e2ad8a06bda30cf5a76c993e6a6614d4fcf18964f5d44072c9c75acb6739b8df977590fd2c55aa193a2c88665e38a4e54e4411ca85b6"; + sha512.run = "3fdb252a0630b0a2c568adbbcf74cec52f717c7a886d4141bcf6b5b3e8023be99d17b59290c8fc1291364d8b71668bf6cc37718898151e5a795760668907a880"; + sha512.doc = "2a59fe984f3d72a1876d732db9275fc49a3df55572788b3773a4a74baed7263558706c31fc4aba305a2f914381b4a3388589d4df800c6dfcd8732ac5e0f130af"; + sha512.source = "3c1301d7e71c3ca780173df44bd3a1ed893d63eec44f7cdf2ff372618e29c492a554e9baacefdbeaa49115bb442b6216e2a44f8a2595986014d0b40501013593"; hasRunfiles = true; - version = "2.1"; + version = "3.0.0a"; }; "utexasthesis" = { revision = 48648; @@ -34208,6 +34599,14 @@ tl: { # no indentation sha512.doc = "cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e"; hasRunfiles = true; }; +"utfsym" = { + revision = 56729; + stripPrefix = 0; + sha512.run = "cbc9203663a121f2c421d07bf630831db438aa74c6d6ca95d3d7d7f5a5736db351e0fea5fb269ed2b02eaaec5d85de52f2f9ca90d753d41ca9da7328c6af2326"; + sha512.doc = "3b90dd9075fa3b4602e76593b90603ff4022a003599d12297bcb482fc28995ac204de1908baef9e4506a0bba82edf09dbf6314dd7034808aaf7aa38af3bee6d7"; + hasRunfiles = true; + version = "0.8.3"; +}; "utopia" = { revision = 15878; stripPrefix = 0; @@ -34310,12 +34709,12 @@ tl: { # no indentation version = "1.0.1"; }; "vdmlisting" = { - revision = 29944; + revision = 56905; stripPrefix = 0; - sha512.run = "58cab8cd7d23326b39e76a91db1bdb0b0cc9e1e6bf457d151af39a4c94886f623b8178de835e673118d5b797510d6f2fe5f97f6c0c8b5bcf679b9158ded3c941"; - sha512.doc = "a71b798d364f429c4894db38863301c1601ba7f2bbb2cf8e4394b48c5b7e3541cefcf915ca52860c0c55744ac2aa8fad82ea66142ed2fbfa81c05da211f04f74"; + sha512.run = "4c4b5deda36fab8ac8cadfea2093da188284cb26eb9874f27ffbedab1235d4e7bdf48e977a714fb33f0ef2c5cf4c0b92c14767c565efa6842cabf451af51c1de"; + sha512.doc = "fcd476e8ae2db61e3a71b1dd4bffae34e6eedaa409dc3434179ca66bafa2dc4b5790bd06bf90db609f91c682d2b7bf9d5effa893e5fb914c26c20acf67f8b22a"; hasRunfiles = true; - version = "1.0"; + version = "1.1"; }; "velthuis" = { revision = 55475; @@ -34391,13 +34790,13 @@ tl: { # no indentation version = "1.2"; }; "verifica" = { - revision = 53722; + revision = 56625; stripPrefix = 0; - sha512.run = "7fbb232e4d732df813520c0a4085540bd5b16ca5cb4a68ad3fdffec8de273d821bbcc6304cb74fd06d30ea8f30e50475074c183ca96c9d46c32e818249f7cc45"; - sha512.doc = "822e444c7657427dde2b3a51b3f2f42f6088e66933e51d1533782ae76f2e8de31d2cf1c5e7824e3d90600a971f253a7eb84e0dd0c874446cc0bc0b914e0a691f"; - sha512.source = "a3418fecbaf2775b3aef2db90603dc64b0a2be211f02010d62e3c73517334d2628a68b17f911b3ea257f3cf439b5bf1f8360e97f5c3ea6ad0d7605ce904922b0"; + sha512.run = "8c3258fdf2040e00495b56605f88160b5179743a7ae3abc6334e734ba9f1fb122bf2e4847fd9a577c1221c9e22dcfa650f15612d7a005b3719ce6c92df180bb3"; + sha512.doc = "de41df53ca78cabf7ab3f672dd00c0042cfd8a71219d694985c18aeffa045dcd37c7b999058d7edf6a2348d83c9ae27d1e242f17a91d43b61f2b873ee2d157ef"; + sha512.source = "85e46be6f8ee729753362243492c7946166049ebd0a89f0871bb9308e6803f5ef9416c30fe380be4961aa466a03afd9541d09e5920a196550582d326a6de8b9f"; hasRunfiles = true; - version = "1.2"; + version = "1.3"; }; "verifiche" = { revision = 55777; @@ -34694,10 +35093,10 @@ tl: { # no indentation version = "1.01"; }; "windycity" = { - revision = 56492; + revision = 56911; stripPrefix = 0; - sha512.run = "0545b92bb12e732f7db8a1f56621fce9ad85991c7ff7686ab467dc964b80355a5783eac1c41bd7e24faf9026a0f0025a952668d24563844015b56a05e6190ca7"; - sha512.doc = "42e4f754fccbcca5b5d4e685e1ad6106dd1c2695b5ab317c429da384ff9f4f1af6555d701f4e2ba1e55a399faebda5d77eb368d7eb6845d0b011146dfbda00c5"; + sha512.run = "26f30ba28b11ed7b95f34c24daa8d9a66473b6138e9b8ca8f815174bad88cad01108000c97998ed48fcde64be525b6f888ed1732bcad6c3a7f582005af7ce565"; + sha512.doc = "97d0cd506e158d2f26e25577f684f1cc5ce05f01a351abdab2a9f6eab3f7b674c80ad509a7371e4b5ad06895308639b665de89c8ff9739e63eae7f8298728855"; hasRunfiles = true; }; "withargs" = { @@ -34815,12 +35214,12 @@ tl: { # no indentation hasRunfiles = true; }; "xcharter" = { - revision = 56391; + revision = 57009; stripPrefix = 0; - sha512.run = "55e129c487cbdd022aa76092f106882b6e761acecf35e12a5ad6f13118bcd88c46de0e1f0b0a0a5df3a9ce508c5897d1353775a7df202790c5c978a2ec370933"; - sha512.doc = "dfc951e9260a64b4a6624f1f0500b1827b3c283c04db28e59be1e8c6e4415928a92ea257a8956402e3ceef15a593fb8450d18fdc47039c3cd5f6032277912497"; + sha512.run = "aa2b679b4396f52297dbd288d9f8aef74c83dc6f4532b1b72781f0544524152e840ac5359064c2a39b2550afcd2ffc43ca5c6009a813a202a486f2ef62e3ba6d"; + sha512.doc = "7273a77b41ee407fc7fd7ccdea9e8755c1c78939e6a6a8c147710c7049b81f1cd46d6a67751fa273340e7c9f9246d98481df24d337228c62065d1fa9dbfee40a"; hasRunfiles = true; - version = "1.209"; + version = "1.213"; }; "xcite" = { revision = 53486; @@ -34942,13 +35341,13 @@ tl: { # no indentation version = "1.0"; }; "xecjk" = { - revision = 56166; + revision = 56711; stripPrefix = 0; - sha512.run = "78f63927c6509c135219c16ac29f0c39e6b6441c48389bb496611cc8cff85d84e2f1209df680bddb78ebdef9c65ca44c0c32dd1981f09906281f0c30121ffaf5"; - sha512.doc = "4ce8a0bfdcbb697fb8eb67be86f75f13bd021cdfc65cca04cfd6a71a702b43af69630d14ca2431ace6c4dd50eaa19e6da5887ef53d71072223451fa063996afa"; - sha512.source = "3333e91f348e7df2e7376830747c6f3f118e93ce4cb9bee83468c0a8bf1100616435128456dc87efa62acaaa0e02635b80e3b6dcb0fe4cacaac1b24526b334ce"; + sha512.run = "6a318c27555cd58be7f3f8893ef4345f37b619cab2088a0ce5627000eb8375724a1e3e8df741cff2558143ad58a3d336d67aac4ff2dd8ca226b223ec103f9d3d"; + sha512.doc = "72446201ddef073b1b37686ecd0ff7569db34d3240b549b5e9ac2c5e6fbcd7e64a070afdc6ee40e83a4d95172cce37da092e463e4c55e5f293b92c39cd4817a3"; + sha512.source = "32c1905ffe53dca84509cf51fd4f2b2eff1ca1d03e97bc1f03009d236e476f8d8573ef3267e6466eb63e18b70207ba62558afcd1a64d9a1af79a7a6cfe5c050f"; hasRunfiles = true; - version = "3.8.5"; + version = "3.8.6"; }; "xecolor" = { revision = 29660; @@ -34984,24 +35383,25 @@ tl: { # no indentation version = "0.3"; }; "xelatex-dev" = { - revision = 56548; + revision = 57186; deps."atbegshi" = tl."atbegshi"; deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; + deps."latex" = tl."latex"; deps."latex-base-dev" = tl."latex-base-dev"; deps."latex-fonts" = tl."latex-fonts"; deps."lm" = tl."lm"; - deps."ms" = tl."ms"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; - sha512.run = "71284d60c86af780209a149efd5cbdafd90f19546046995b42569dbe5709799c1dcb7a15a593b18126801a46c4251f37b7afb7cb7e8d9ab1b41275459334c751"; + sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; }; "xellipsis" = { revision = 47546; @@ -35048,13 +35448,17 @@ tl: { # no indentation version = "2.0a"; }; "xetex" = { - revision = 56548; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dvipdfmx" = tl."dvipdfmx"; deps."etex" = tl."etex"; + deps."everyshi" = tl."everyshi"; deps."firstaid" = tl."firstaid"; deps."hyphen-base" = tl."hyphen-base"; + deps."l3backend" = tl."l3backend"; deps."l3kernel" = tl."l3kernel"; deps."l3packages" = tl."l3packages"; deps."latex" = tl."latex"; @@ -35064,8 +35468,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; - sha512.run = "a1468b805c3211ae4827c4e5ec54231b482ab43f5d58c1252e31bf009d4ea796d3f3a6f7336284e5f2a44daee0e0145e8c2c0e6f87b7e55c46333ce8068ea06e"; - sha512.doc = "4b9af8ba74489d3b40750369fa5a2e2f30706890905e22b1bf25e3f0f4d67c3bd11489770d931a9e36df243824f26d2cb0e5832b79e78b4cf52162e510c5f4bd"; + sha512.run = "60acec44d673f73ff7fb6291a8f7bbc2ae4329cb587f010378359ce8c89a28e810d3312a3ab379b4dcb0be67c3ae1186ee4290ef30456d2583313a4e9ecd9d52"; + sha512.doc = "254560a4bb4a2296d469d6b31163ba31a41cd48d309cf7492d070134e34ad6031c30cf98b3e63c0ab27863b63cda7fcd130f1c11cc47ef3fc3ed7afe669c0f60"; hasRunfiles = true; }; "xetex-devanagari" = { @@ -35229,29 +35633,29 @@ tl: { # no indentation version = "1.0.1"; }; "xkeyval" = { - revision = 35741; + revision = 57006; stripPrefix = 0; - sha512.run = "5d49a32326057d18ebb2bf25d29e06362c23d9a2f9df5058457fd84c9faebb545316c502a7baa19073abdd661e9497255cbcb938684dd006b0c10ba7c957c627"; - sha512.doc = "a2c51df068c738d598c472143af901392d181db37bb416a2e406ad1d65c6679e428efc1281256edcbd04bf6a64ffd23dd568bed007ea278362ae7378f5371a03"; - sha512.source = "6764eee7ff0c7649a4f6b809753134dd047ab6bfc3ba1bf16e5ae0fef2df0f3b40cd83b662cde002954ce705e8f8ee5950da36b38b2ee6533e6b089e3a32bf20"; + sha512.run = "39ae2a2d595c6808aab31a1f97caf31418e8aad6c05bec8812b0fca4a69c19eeb88e559940f952309f69a4b2d6342cce804f7d4d2b6270878be51c9b3cdf4ee1"; + sha512.doc = "58a64143df3ca2cfd5b8260dbe5df4900586d3131f7914ea1da9b0a8f53c84e2ce49a6e36c03be3c3a508b4a9f26e61c167c600e73105709d6f36b2acdb6bd2e"; + sha512.source = "ba88cb7ecf4e7cf2b3f125c989199abccf8cea300ba291f3dc9ce0f5259534b75bea6af23770e4d772c264eff9267530ce5759b62c33ea5bf998b97996ec2d52"; hasRunfiles = true; - version = "2.7a"; + version = "2.8"; }; "xlop" = { - revision = 54936; + revision = 56910; stripPrefix = 0; - sha512.run = "616697adfe84cc937830738b58108c511a1f21b95d814ab70d88c43e6022c263b0df2a855600977e6006803677cc3d69d4f0408f89a4b21e7e497b23574c20ab"; - sha512.doc = "e242468b910c0a9cfd3521eecb25423cf1f34b7fdddd3e7538201a6537755e00f4189e7fd636e154a04aa18fcff7c3b11169c4f4448f68eafd6d05cbe630840c"; + sha512.run = "6d1ebe5d3870a07175b5c07840dd2170f2309790d1b828df69b716aa83db1a35ff70d265a33d8fc0f6ebe0c4385b7fccee8445ab93b2649d3b27bb65e41f87d5"; + sha512.doc = "9e1cdf96a23bd468c2e4f358ade19c509685563376d5a7ffedf5cfc122138b14d1075c7ae8c8a00261f789d4010a9df7dd5b1e6a9db5bc7efb067168e7866540"; hasRunfiles = true; - version = "0.27"; + version = "0.28"; }; "xltabular" = { - revision = 55561; + revision = 56855; stripPrefix = 0; - sha512.run = "090fa8d3b10f979b12a1dd1f90bd71382307d9c75864f44b35483fddcb3e304e7651c066c202ffd4497e08fe0c854ea93435b159787f9d857a9e5ff826ba733f"; - sha512.doc = "9b80c2bd979030046c6d88f52c0951c6cade5388ecc477ac7ad867cb4220c0571374b47f2094a27f414805b8015b29a62573d9fa25ad57d411e831d6f4d7d0db"; + sha512.run = "6e49b4a2adc351394bf5ab5cc04d532c36196919a4de8be1ecdcc22c6f226a2d035987df9aa70144d701d9fdeae1dfa07280458a934e289a5d1b5976b2be3ce1"; + sha512.doc = "daa1f1ee3092d545b3949afa781e40a576a8a3ab1c20e40237d83c14455fcece353dee03161ed1725d3f54c8963ba94c683ae0874a8668c8e5c27ad3b58f227b"; hasRunfiles = true; - version = "0.2d"; + version = "0.2e"; }; "xltxtra" = { revision = 56594; @@ -35264,10 +35668,14 @@ tl: { # no indentation version = "0.7"; }; "xmltex" = { - revision = 54498; + revision = 57186; + deps."atbegshi" = tl."atbegshi"; + deps."atveryend" = tl."atveryend"; deps."babel" = tl."babel"; deps."cm" = tl."cm"; deps."dehyph" = tl."dehyph"; + deps."everyshi" = tl."everyshi"; + deps."firstaid" = tl."firstaid"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."l3backend" = tl."l3backend"; @@ -35281,8 +35689,8 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xmltexconfig" = tl."xmltexconfig"; - sha512.run = "0fd2ab53c983706e42c33804e886f20956a08410e0e32976fb956cecf224c9ed397cb7ceb8aa9b717e3459084d597d715363752a346322f9c04e16acc86c9e46"; - sha512.doc = "51f8a23a2f59a079909d580a8587d1a403bc0fc75b13adda212cca8fb9f58d8f19debbf53783eada1e80389d8556b742f62f575712eb5fa15f90e4c9933ede8c"; + sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead"; + sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb"; hasRunfiles = true; version = "0.8"; }; @@ -35301,6 +35709,15 @@ tl: { # no indentation hasRunfiles = true; version = "2.2"; }; +"xmuthesis" = { + revision = 56614; + stripPrefix = 0; + sha512.run = "3c9bdbd54cb99bddb9356586a1ba16d8e0ebe10d0120f6d6e7ae1c60375a41ce9ae9c01eded07b122aa323ddcb0e3ed9c68f6da6e716915f523e77bb343ee665"; + sha512.doc = "07e9b8eeaa864efbe6fb8e1c54e183a65f177b81454a2abc049e2efef8fae1d61a208273fd3cecb9d8bb8d601266f1c4897939c52d43fb5dff92ecdd3855c322"; + sha512.source = "9f3eaaac30cc9f396a3e33f6216b56485c27eb2f855b511642204025c27b40a529aa6dd1952c753a1fd50474ee6c5ef020f859dcc71e07ece39df090ed7ef46a"; + hasRunfiles = true; + version = "0.4.1"; +}; "xnewcommand" = { revision = 15878; stripPrefix = 0; @@ -35360,13 +35777,13 @@ tl: { # no indentation version = "1.2a"; }; "xpinyin" = { - revision = 54959; + revision = 56709; stripPrefix = 0; - sha512.run = "7212843681fd11e08bd7474194348f78cb56cb74421fae5020a7cab8afd766718e9d5ed0672dec3272498b186f4f9b79a774d4de5026345df033ef5f1e68313c"; - sha512.doc = "edecda1ff3c1ac3a1c6b563da9a36ee0ae41ac1b9952c994ece387cc0985e045efb80d50b8fd251fb8a6167fcfc6b154b1f08ad7aed1ce1c12a8907bd7d954e4"; - sha512.source = "8bde3970eed2f31970218d7ba6a7ac74d47ae51d3d6ba70f9e66a80a061518ee8aac1e1914b32468f1aa11e7d7ac3b0c3b1d27907d17111776c2a4d97d0a4203"; + sha512.run = "94ea16ea9d649e28094173862ce5e31c655acef0c21dcd03a6f7d3f5463cdca15da7ea9b4408d539900a7c2d55a7418f4fac8defbe914bcad8c4a58f6e1bdb4d"; + sha512.doc = "58715c5eb8e0e336bf6de29b47760eedc27802fd82bb120ce37a6502eeb00c8b8230503d660e687131d8312be93a72dc6b2dc15b89cb82d46be5f5b7200a91e9"; + sha512.source = "edf759656775c8e8f1b3953949d0d1b1d3d34a165b51781d4748034e5a8d3ff19650a4e9a2d7397156f0f77104b5513c61ac84afaf7634a49c52044ee8c03bc5"; hasRunfiles = true; - version = "2.8"; + version = "2.9"; }; "xprintlen" = { revision = 35928; @@ -35454,12 +35871,12 @@ tl: { # no indentation version = "0.981"; }; "xurl" = { - revision = 53538; + revision = 57265; stripPrefix = 0; - sha512.run = "c034606febfdf397774f51f5057fb12243e5fbcd6ff8c9aa1fe60fa2643b5cdfe6c36558e5a4398e7c38c0da520ffeb53a930fda983b79c9d41fb31b74d6ad25"; - sha512.doc = "6c8833dcbec24d6b336b6dff58558ce4c38de22032f24d7510db85e987c83b2cd2089bc1a5b414ac82987bd8387dadf3456f0ca3885607285834688fafd29175"; + sha512.run = "51251afe43f9b175e4afd901f10edd63bad590b0591f117d423866ed1a82e2c0ab35dee7e03250c331f8a8605f9c6ba8357e93ef0aa80d40dc03379bde24dd1c"; + sha512.doc = "df7e35d13f340c44813e0656c36148b92319a7099ae47eb02513d33834b642528eff2e81299aa670c2a4572e78c830d48c83b46996700e9fb568db16b84f1e57"; hasRunfiles = true; - version = "0.09"; + version = "0.09a"; }; "xwatermark" = { revision = 28090; @@ -35543,13 +35960,13 @@ tl: { # no indentation hasRunfiles = true; }; "yathesis" = { - revision = 55578; + revision = 56667; stripPrefix = 0; - sha512.run = "6568c02322bed6aa694089977c81d3f86d9cc184fd75afbb23a1b41021dd304f36ba9e5809c233ef9b0b04709f7e98d77b526569d8dc134de527985093b8b50a"; - sha512.doc = "9212f8068e78c12e315f2fad35ace56881d7c4ba8436bed2312fd37083ffbba6fea408df29f7b88578ddadbc3697416726f21395c56ca1dc71d60e80c8cc6456"; - sha512.source = "e8960ed6c320f403d84eec1be5fa4b2c459715f315623c7384538dd91369e65ba848e6e41e796f3bde7c29618f8ce80b785b05ac841e87c66bd7e359fba25a3c"; + sha512.run = "e0caca0434238bcc76c8da3f9c59ecd412618d9bd64d0085782a54dfd63ef1f4f37089a362d97182a645624f92a616814bbb908fb11f3c859793546a9240b629"; + sha512.doc = "be719c2eaecaa6773b68a1497b6819d0d3e3d4f08887351ffab7a9089167d5ef268d55386c644c8fb9fdf5141baf7203755cbc4e5892fc47b269ccb654796e77"; + sha512.source = "ff6674724d8c12dd8e78244330cd42fe934038cf6f026e0463209a99f65cd7b23c33e4aa053592350509afa7daa1058674db862975609abc33f1f4f5db74a593"; hasRunfiles = true; - version = "1.0.3"; + version = "1.0.4"; }; "yax" = { revision = 54080; @@ -35642,12 +36059,12 @@ tl: { # no indentation hasRunfiles = true; }; "yquant" = { - revision = 56189; + revision = 56830; stripPrefix = 0; - sha512.run = "acee12495068caed7b37268700dabd4d753495dacae3c91e2d932081af326ef46f1575b5b4a8b29a08767b25c64c8195aaef4d4132813a7177762c7ac6fdf796"; - sha512.doc = "c8d299c28e32670222473bba56dc8d11b8e6f843f5714d62dba36ef4d8cf1a43dca1fcc8bc213d67a7a0cda5d792d23c51ec74256157b07a819d7087b75d2951"; + sha512.run = "b0227b4573dc18aeaa6563afad2bfcff8190a3cbb63c3ef8406755b117035b1c8d7665c4998ef10ec81cc0619b30382a04be0cf9a8d43861ce3fa17f910b4f7d"; + sha512.doc = "06aa69f822908763495da04ca1e5dd1913ccf84c92d9eb56fc616a5b3d11ad85307cf3aec8370f7badf61677081b9dc8c26ded52fd282d4fdfa6cfb6f6b24dd4"; hasRunfiles = true; - version = "0.3.2"; + version = "0.3.3"; }; "ytableau" = { revision = 27430; @@ -35761,13 +36178,13 @@ tl: { # no indentation version = "1.0"; }; "zref" = { - revision = 55327; + revision = 56611; stripPrefix = 0; - sha512.run = "ab36a4be0c9fd15b9b8c6ec1b726deb6e7a3a3974d4c50fec9712aa34ce5f719a67903807e0781574872d56d62e27ee8bce73a87b4be4393bb9e9ba44e256719"; - sha512.doc = "42f84e5df57b2032a0e6ba3acb1d509f6eae7742ac7e3ad1e8952c60d13e38482b63498e40aa9f1830e023569edc957421b481a84dde697893e914911661d7c7"; - sha512.source = "03d16a0069569f08a6b564c50948ae813ffe56839876e6e05bef2f5aa10703dda88209c34432bbf0913afd95d3437ec71e9288858d60ae9d0ad015f71df5d253"; + sha512.run = "f64604e9308278b34347bcbcaed39b500371c575082311c1fb28bf6bd7db26fc2d2e3d3e8843e3a195fd22050450bffb18c3e8b64a54f0787c1122ac3901ad2f"; + sha512.doc = "928c54696572694b1fc7712a0f8357851c18d83bf723c6f03a9f784dfbd123b2c886593bc95de0d3b7f8109e1d0b3a52cc6ef1a877c0506130e7c5d96b046a67"; + sha512.source = "82e6c4210453e9f7adfd93673aa2e7dfbf2c39e938b9ad0d2309ea59b53259d1d1d9b05924f2f6f9f64ba29ecdbda8e074527923fdfd1551a42b1057450b2fc5"; hasRunfiles = true; - version = "2.31"; + version = "2.32"; }; "zwgetfdate" = { revision = 15878; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f95c6e8bc51..fa0149c5789 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,7 +142,13 @@ mapAliases ({ emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacsPackages; # added 2019-08-07 + emacsPackagesNg = emacs.pkgs; # added 2019-08-07 + emacs26Packages = emacs26.pkgs; # added 2020-12-18 + emacs27Packages = emacs27.pkgs; # added 2020-12-18 + emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 + emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 + emacsPackages = emacs.pkgs; # added 2020-12-18 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 @@ -210,6 +216,7 @@ mapAliases ({ }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 @@ -666,6 +673,7 @@ mapAliases ({ uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 @@ -794,6 +802,8 @@ mapAliases ({ gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + todolist = throw "todolist is now ultralist."; # added 2020-12-27 + /* Cleanup before 21.03 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfd791fb089..7f1637192dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -500,7 +500,7 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -1287,6 +1287,8 @@ in google-amber = callPackage ../tools/graphics/amber { }; + hakrawler = callPackage ../tools/security/hakrawler { }; + hime = callPackage ../tools/inputmethods/hime {}; hostctl = callPackage ../tools/system/hostctl { }; @@ -1498,6 +1500,8 @@ in babeld = callPackage ../tools/networking/babeld { }; + babelfish = callPackage ../shells/fish/babelfish.nix { }; + badchars = python3Packages.callPackage ../tools/security/badchars { }; badvpn = callPackage ../tools/networking/badvpn {}; @@ -4441,8 +4445,6 @@ in gnutar = callPackage ../tools/archivers/gnutar { }; - gnuvd = callPackage ../tools/misc/gnuvd { }; - goaccess = callPackage ../tools/misc/goaccess { }; gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; @@ -5371,6 +5373,10 @@ in kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; + lagrange = callPackage ../applications/networking/browsers/lagrange { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; ma1sd = callPackage ../servers/ma1sd { }; @@ -8154,10 +8160,6 @@ in udptunnel = callPackage ../tools/networking/udptunnel { }; - ufraw = callPackage ../applications/graphics/ufraw { - stdenv = gcc6Stdenv; # doesn't build with gcc7 - }; - uftrace = callPackage ../development/tools/uftrace { }; uget = callPackage ../tools/networking/uget { }; @@ -8384,6 +8386,8 @@ in whipper = callPackage ../applications/audio/whipper { }; + whitebophir = callPackage ../servers/web-apps/whitebophir { }; + whois = callPackage ../tools/networking/whois { }; wifish = callPackage ../tools/networking/wifish { }; @@ -9786,7 +9790,7 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackages.melpaStablePackages) irony; + inherit (emacs.pkgs.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; @@ -10058,7 +10062,17 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_7; + llvmPackages = recurseIntoAttrs (with targetPlatform; + if isDarwin then + llvmPackages_7 + else if isFreeBSD then + llvmPackages_7 + else if isLinux then + llvmPackages_7 + else if isWasm then + llvmPackages_8 + else + llvmPackages_latest); llvmPackages_5 = callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; @@ -10497,6 +10511,12 @@ in swift = callPackage ../development/compilers/swift { }; + symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { }; + + symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { }; + + symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { }; + swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -10867,6 +10887,8 @@ in polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; + prjxray-tools = callPackage ../development/compilers/prjxray-tools { }; + pure = callPackage ../development/interpreters/pure { /*llvm = llvm_35;*/ }; @@ -11496,6 +11518,8 @@ in cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + clpm = callPackage ../development/tools/clpm {}; + coan = callPackage ../development/tools/analysis/coan { }; compile-daemon = callPackage ../development/tools/compile-daemon { }; @@ -11922,6 +11946,8 @@ in jbake = callPackage ../development/tools/jbake { }; + jbang = callPackage ../development/tools/jbang { }; + jikespg = callPackage ../development/tools/parsing/jikespg { }; jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; @@ -12420,6 +12446,8 @@ in terraformer = callPackage ../development/tools/misc/terraformer { }; + terrascan = callPackage ../tools/security/terrascan { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -12446,8 +12474,6 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; - todolist = callPackage ../applications/misc/todolist { }; - travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -13232,6 +13258,8 @@ in funambol = callPackage ../development/libraries/funambol { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + gamin = callPackage ../development/libraries/gamin { }; fam = gamin; # added 2018-04-25 @@ -13351,6 +13379,10 @@ in glew110 = callPackage ../development/libraries/glew/1.10.nix { inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; + glew-egl = glew.overrideAttrs (oldAttrs: { + pname = "glew-egl"; + makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ]; + }); glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; @@ -15652,6 +15684,8 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pe-parse = callPackage ../development/libraries/pe-parse { }; + inherit (callPackage ../development/libraries/physfs { }) physfs_2 physfs; @@ -16500,6 +16534,8 @@ in streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; + sub-batch = callPackage ../applications/video/sub-batch { }; + subdl = callPackage ../applications/video/subdl { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; @@ -16634,6 +16670,8 @@ in tremor = callPackage ../development/libraries/tremor { }; + trillian = callPackage ../tools/misc/trillian { }; + twolame = callPackage ../development/libraries/twolame { }; udns = callPackage ../development/libraries/udns { }; @@ -17753,9 +17791,6 @@ in }; mariadb = callPackage ../servers/sql/mariadb { - # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". - # https://jira.mariadb.org/browse/MDEV-15034 - jemalloc450 = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -17813,7 +17848,7 @@ in mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost169; # Configure checks for specific version. + boost = boost173; # Configure checks for specific version. protobuf = protobuf3_7; }; @@ -18776,7 +18811,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.wireless_syntax_error ]; }; @@ -20356,6 +20390,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + prjxray-db = callPackage ../data/misc/prjxray-db { }; + profont = callPackage ../data/fonts/profont { inherit (buildPackages.xorg) mkfontscale; }; @@ -20391,6 +20427,8 @@ in sweet = callPackage ../data/themes/sweet { }; + symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { }; + mime-types = callPackage ../data/misc/mime-types { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -20562,6 +20600,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + ultralist = callPackage ../applications/misc/ultralist { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; uni-vga = callPackage ../data/fonts/uni-vga @@ -20665,6 +20705,8 @@ in masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; + masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; + aeolus = callPackage ../applications/audio/aeolus { }; aewan = callPackage ../applications/editors/aewan { }; @@ -21268,11 +21310,10 @@ in }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_09 - docker_19_03; + docker_20_10; - docker = docker_19_03; - docker-edge = docker_19_03; + docker = docker_20_10; + docker-edge = docker_20_10; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -21391,9 +21432,7 @@ in elvis = callPackage ../applications/editors/elvis { }; emacs = emacs27; - emacsPackages = emacs27Packages; emacs-nox = emacs27-nox; - emacsWithPackages = emacsPackages.emacsWithPackages; emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features @@ -21464,11 +21503,6 @@ in }; }; - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacs27WithPackages = emacs27Packages.emacsWithPackages; - inherit (gnome3) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -21859,7 +21893,6 @@ in callPackage = pkgs.newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; - python = python2; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox @@ -24240,6 +24273,10 @@ in recode = callPackage ../tools/text/recode { }; + reddsaver = callPackage ../applications/misc/reddsaver { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; remotebox = callPackage ../applications/virtualization/remotebox { }; @@ -24707,6 +24744,8 @@ in taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; + tap-plugins = callPackage ../applications/audio/tap-plugins { }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tabula = callPackage ../applications/misc/tabula { }; @@ -25648,7 +25687,9 @@ in xrgears = callPackage ../applications/graphics/xrgears { }; - xsd = callPackage ../development/libraries/xsd { }; + xsd = callPackage ../development/libraries/xsd { + stdenv = gcc9Stdenv; + }; xscope = callPackage ../applications/misc/xscope { }; @@ -25700,7 +25741,7 @@ in yate = callPackage ../applications/misc/yate { }; - ydiff = callPackage ../development/tools/ydiff { }; + inherit (gitAndTools) ydiff; yed = callPackage ../applications/graphics/yed {}; @@ -25843,6 +25884,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + electrs = callPackage ../applications/blockchains/electrs.nix { }; + ergo = callPackage ../applications/blockchains/ergo { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -26358,6 +26401,7 @@ in megaglest = callPackage ../games/megaglest {}; mindustry = callPackage ../games/mindustry { }; + mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; mindustry-server = callPackage ../games/mindustry { enableClient = false; @@ -26634,6 +26678,8 @@ in solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + soldat-unstable = callPackage ../games/soldat-unstable { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -26956,6 +27002,7 @@ in tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; + unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; @@ -27833,6 +27880,7 @@ in mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; + stdenv = gcc9Stdenv; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; @@ -28646,6 +28694,8 @@ in OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + pcem = callPackage ../misc/emulators/pcem { }; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin = callPackage ../applications/misc/pgadmin { @@ -29000,6 +29050,8 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; }; + vsh = callPackage ../tools/misc/vsh { }; + vttest = callPackage ../tools/misc/vttest { }; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; @@ -29347,7 +29399,7 @@ in apeClex = callPackage ../applications/misc/ape/apeclex.nix { }; # Unix tools - unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); + unixtools = recurseIntoAttrs (callPackages ./unixtools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf getent locale killall xxd watch; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 8075b7da4f5..d0bb7c56d99 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -82,5 +82,6 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; + withPackages = emacsWithPackages self; }) ) {}) diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 52ad7aecd28..d0a71c43a96 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -34,8 +34,8 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26Packages" - "emacs27Packages" + "emacs26.pkgs" + "emacs27.pkgs" "steamPackages" "ut2004Packages" "zeroadPackages" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6440d01b45d..de358159287 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15106,6 +15106,21 @@ let doCheck = false; /* wants network */ }; + NetHTTPSNB = buildPerlPackage { + pname = "Net-HTTPS-NB"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/Net-HTTPS-NB-0.15.tar.gz"; + sha256 = "0kwc4z8pqnbc396wjnlgdmri10zdh91f2bi6saxkpfjzlm7wysba"; + }; + propagatedBuildInputs = [ IOSocketSSL NetHTTP ]; + meta = { + homepage = "https://github.com/olegwtf/p5-Net-HTTPS-NB"; + description = "Non-blocking HTTPS client"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetIDNEncode = buildPerlModule { pname = "Net-IDN-Encode"; version = "2.500"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 95b6d96644d..cb3cfdf7651 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -310,7 +310,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) ]; postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; - configureFlags = "--with-gettext=${gettext}"; } + configureFlags = [ "--with-gettext=${gettext}" ]; } { name = "gmp"; buildInputs = [ gmp ]; configureFlags = [ "--with-gmp=${gmp.dev}" ]; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d2d53aedf2..97fd9c0e02b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -242,6 +242,8 @@ in { aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiokef = callPackage ../development/python-modules/aiokef { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; @@ -541,6 +543,8 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + awesomeversion = callPackage ../development/python-modules/awesomeversion { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; @@ -1157,6 +1161,8 @@ in { cerberus = callPackage ../development/python-modules/cerberus { }; + cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; + certbot = callPackage ../development/python-modules/certbot { }; certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; @@ -1294,6 +1300,8 @@ in { cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + cloudscraper = callPackage ../development/python-modules/cloudscraper { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cma = callPackage ../development/python-modules/cma { }; @@ -2431,6 +2439,8 @@ in { genanki = callPackage ../development/python-modules/genanki { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; + genpy = callPackage ../development/python-modules/genpy { }; genshi = callPackage ../development/python-modules/genshi { }; @@ -2771,6 +2781,8 @@ in { guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + gviz-api = callPackage ../development/python-modules/gviz-api {}; + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { pythonSupport = true; pythonPackages = self; @@ -2944,6 +2956,8 @@ in { hydra-check = callPackage ../development/python-modules/hydra-check { }; + hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hyperframe = callPackage ../development/python-modules/hyperframe { }; @@ -2977,6 +2991,8 @@ in { icecream = callPackage ../development/python-modules/icecream { }; + icmplib = callPackage ../development/python-modules/icmplib { }; + ics = callPackage ../development/python-modules/ics { }; identify = callPackage ../development/python-modules/identify { }; @@ -3231,6 +3247,10 @@ in { joblib = callPackage ../development/python-modules/joblib { }; + johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; + josepy = callPackage ../development/python-modules/josepy { }; journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; @@ -3796,6 +3816,8 @@ in { manuel = callPackage ../development/python-modules/manuel { }; + manticore = callPackage ../development/python-modules/manticore { inherit (pkgs) z3; }; + mapbox = callPackage ../development/python-modules/mapbox { }; mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; @@ -4088,6 +4110,8 @@ in { mt-940 = callPackage ../development/python-modules/mt-940 { }; + mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; + multidict = callPackage ../development/python-modules/multidict { }; multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; @@ -4782,6 +4806,8 @@ in { python-openems = callPackage ../development/python-modules/python-openems { }; + python-prjxray = callPackage ../development/python-modules/python-prjxray { }; + python-tado = callPackage ../development/python-modules/python-tado { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -4846,6 +4872,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; + poolsense = callPackage ../development/python-modules/poolsense { }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; @@ -4914,6 +4942,8 @@ in { else callPackage ../development/python-modules/prettytable/1.nix { }; + primer3 = callPackage ../development/python-modules/primer3 { }; + priority = callPackage ../development/python-modules/priority { }; prison = callPackage ../development/python-modules/prison { }; @@ -5228,6 +5258,8 @@ in { pyerfa = callPackage ../development/python-modules/pyerfa { }; + pyevmasm = callPackage ../development/python-modules/pyevmasm { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; @@ -5254,8 +5286,12 @@ in { pyfftw = callPackage ../development/python-modules/pyfftw { }; + pyfido = callPackage ../development/python-modules/pyfido { }; + pyfiglet = callPackage ../development/python-modules/pyfiglet { }; + pyfnip = callPackage ../development/python-modules/pyfnip { }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyfma = callPackage ../development/python-modules/pyfma { }; @@ -5368,6 +5404,8 @@ in { pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + pyinsteon = callPackage ../development/python-modules/pyinsteon { }; + pyipp = callPackage ../development/python-modules/pyipp { }; pyiqvia = callPackage ../development/python-modules/pyiqvia { }; @@ -5392,6 +5430,8 @@ in { pykickstart = callPackage ../development/python-modules/pykickstart { }; + pykira = callPackage ../development/python-modules/pykira { }; + pykka = callPackage ../development/python-modules/pykka { }; pykwalify = callPackage ../development/python-modules/pykwalify { }; @@ -5446,8 +5486,12 @@ in { pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; + pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; + PyLTI = callPackage ../development/python-modules/pylti { }; + pylutron = callPackage ../development/python-modules/pylutron { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; @@ -5496,6 +5540,8 @@ in { PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + pymyq = callPackage ../development/python-modules/pymyq { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; @@ -5555,6 +5601,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; + pyosf = callPackage ../development/python-modules/pyosf { }; pyosmium = callPackage ../development/python-modules/pyosmium { }; @@ -5582,6 +5630,8 @@ in { pypcap = callPackage ../development/python-modules/pypcap { }; + pypck = callPackage ../development/python-modules/pypck { }; + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; pyPdf = callPackage ../development/python-modules/pypdf { }; @@ -6318,6 +6368,8 @@ in { pyvcf = callPackage ../development/python-modules/pyvcf { }; + pyvera = callPackage ../development/python-modules/pyvera { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { @@ -6366,6 +6418,8 @@ in { pyxdg = callPackage ../development/python-modules/pyxdg { }; + pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); @@ -6382,6 +6436,8 @@ in { qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; + qdldl = callPackage ../development/python-modules/qdldl { }; + qds_sdk = callPackage ../development/python-modules/qds_sdk { }; qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; @@ -7255,6 +7311,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + stdiomask = callPackage ../development/python-modules/stdiomask { }; + stem = callPackage ../development/python-modules/stem { }; stevedore = callPackage ../development/python-modules/stevedore { }; @@ -7293,6 +7351,8 @@ in { stytra = callPackage ../development/python-modules/stytra { }; + subarulink = callPackage ../development/python-modules/subarulink { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; subliminal = callPackage ../development/python-modules/subliminal { }; @@ -7337,6 +7397,8 @@ in { sybil = callPackage ../development/python-modules/sybil { }; + symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { }; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; sympy = if isPy3k then @@ -7389,6 +7451,10 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; + + tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { @@ -7405,9 +7471,10 @@ in { cudatoolkit = pkgs.cudatoolkit_11_0; cudnn = pkgs.cudnn_cudatoolkit_11_0; nccl = pkgs.nccl_cudatoolkit_11; - openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; - inherit (pkgs) flatbuffers; + flatbuffers-core = pkgs.flatbuffers; + flatbuffers-python = self.flatbuffers; + lmdb-core = pkgs.lmdb; }; tensorflow-build = self.tensorflow-build_2; @@ -7449,6 +7516,8 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; + textx = callPackage ../development/python-modules/textx { }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = callPackage ../development/python-modules/testrepository { }; @@ -7495,6 +7564,8 @@ in { threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; + three-merge = callPackage ../development/python-modules/three-merge { }; + thrift = callPackage ../development/python-modules/thrift { }; thumbor = callPackage ../development/python-modules/thumbor { }; @@ -7543,6 +7614,8 @@ in { tls-parser = callPackage ../development/python-modules/tls-parser { }; + tmb = callPackage ../development/python-modules/tmb { }; + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; todoist = callPackage ../development/python-modules/todoist { }; @@ -7646,6 +7719,8 @@ in { tubeup = callPackage ../development/python-modules/tubeup { }; + tumpa = callPackage ../development/python-modules/tumpa { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; @@ -7758,6 +7833,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + unifiled = callPackage ../development/python-modules/unifiled { }; + units = callPackage ../development/python-modules/units { }; unittest2 = callPackage ../development/python-modules/unittest2 { }; @@ -7938,10 +8015,14 @@ in { wasabi = callPackage ../development/python-modules/wasabi { }; + wasm = callPackage ../development/python-modules/wasm { }; + wasmer = callPackage ../development/python-modules/wasmer { }; watchdog = callPackage ../development/python-modules/watchdog { }; + waterfurnace = callPackage ../development/python-modules/waterfurnace { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; wcwidth = callPackage ../development/python-modules/wcwidth { }; @@ -8085,6 +8166,8 @@ in { xattr = callPackage ../development/python-modules/xattr { }; + xc-fasm = callPackage ../development/python-modules/xc-fasm { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xcffib = callPackage ../development/python-modules/xcffib { }; @@ -8103,6 +8186,8 @@ in { xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + xknx = callPackage ../development/python-modules/xknx { }; + xlib = callPackage ../development/python-modules/xlib { }; xlrd = callPackage ../development/python-modules/xlrd { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 48e4618762a..b3fe7bf8c94 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -50,15 +50,6 @@ self: super: let # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) ; - # Force everything to link statically. - haskellStaticAdapter = self: super: { - mkDerivation = attrs: super.mkDerivation (attrs // { - enableSharedLibraries = false; - enableSharedExecutables = false; - enableStaticLibraries = true; - }); - }; - removeUnknownConfigureFlags = f: with self.lib; remove "--disable-shared" (remove "--enable-static" f); @@ -102,12 +93,6 @@ in { clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; - haskell = super.haskell // { - packageOverrides = composeExtensions - (super.haskell.packageOverrides or (_: _: {})) - haskellStaticAdapter; - }; - zlib = super.zlib.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unixtools.nix similarity index 100% rename from pkgs/top-level/unix-tools.nix rename to pkgs/top-level/unixtools.nix