diff --git a/third_party/nixpkgs/doc/languages-frameworks/java.section.md b/third_party/nixpkgs/doc/languages-frameworks/java.section.md index 77919d43f7..371bdf6323 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/java.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/java.section.md @@ -72,6 +72,15 @@ in ... ``` +You can also specify what JDK your JRE should be based on, for example +selecting a 'headless' build to avoid including a link to GTK+: + +```nix +my_jre = pkgs.jre_minimal.override { + jdk = jdk11_headless; +}; +``` + Note all JDKs passthru `home`, so if your application requires environment variables like `JAVA_HOME` being set, that can be done in a generic fashion with the `--set` argument of `makeWrapper`: diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index 0cec4d2dd6..79ae9055ce 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -197,6 +197,30 @@ rec { */ toYAML = {}@args: toJSON args; + withRecursion = + args@{ + /* If this option is not null, the given value will stop evaluating at a certain depth */ + depthLimit + /* If this option is true, an error will be thrown, if a certain given depth is exceeded */ + , throwOnDepthLimit ? true + }: + assert builtins.isInt depthLimit; + let + transform = depth: + if depthLimit != null && depth > depthLimit then + if throwOnDepthLimit + then throw "Exceeded maximum eval-depth limit of ${toString depthLimit} while trying to evaluate with `generators.withRecursion'!" + else const "" + else id; + mapAny = with builtins; depth: v: + let + evalNext = x: mapAny (depth + 1) (transform (depth + 1) x); + in + if isAttrs v then mapAttrs (const evalNext) v + else if isList v then map evalNext v + else transform (depth + 1) v; + in + mapAny 0; /* Pretty print a value, akin to `builtins.trace`. * Should probably be a builtin as well. @@ -208,7 +232,8 @@ rec { allowPrettyValues ? false, /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true - }@args: let + }@args: + let go = indent: v: with builtins; let isPath = v: typeOf v == "path"; introSpace = if multiline then "\n${indent} " else " "; diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 772985f950..bde2aaca2e 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -240,6 +240,11 @@ in mkLicense lset) ({ fullName = "CeCILL Free Software License Agreement v2.0"; }; + cecill21 = { + spdxId = "CECILL-2.1"; + fullName = "CeCILL Free Software License Agreement v2.1"; + }; + cecill-b = { spdxId = "CECILL-B"; fullName = "CeCILL-B Free Software License Agreement"; diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index b124ea000a..46ae3f1363 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -162,13 +162,24 @@ rec { baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; in if attrNames options == [ "_module" ] - then throw '' - ${baseMsg} + then + let + optionName = showOption prefix; + in + if optionName == "" + then throw '' + ${baseMsg} - However there are no options defined in `${showOption prefix}'. Are you sure you've - declared your options properly? This can happen if you e.g. declared your options in `types.submodule' - under `config' rather than `options'. - '' + It seems as if you're trying to declare an option by placing it into `config' rather than `options'! + '' + else + throw '' + ${baseMsg} + + However there are no options defined in `${showOption prefix}'. Are you sure you've + declared your options properly? This can happen if you e.g. declared your options in `types.submodule' + under `config' rather than `options'. + '' else throw baseMsg else null; diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 204c86df9f..119a67fb7d 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -247,7 +247,9 @@ rec { showDefs = defs: concatMapStrings (def: let # Pretty print the value for display, if successful - prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value); + prettyEval = builtins.tryEval + (lib.generators.toPretty { } + (lib.generators.withRecursion { depthLimit = 10; throwOnDepthLimit = false; } def.value)); # Split it into its lines lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value); # Only display the first 5 lines, and indent them for better visibility diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index 4b2e5afc1d..00eeaa2a77 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -529,6 +529,25 @@ runTests { }; }; + testToPrettyLimit = + let + a.b = 1; + a.c = a; + in { + expr = generators.toPretty { } (generators.withRecursion { throwOnDepthLimit = false; depthLimit = 2; } a); + expected = "{\n b = 1;\n c = {\n b = \"\";\n c = {\n b = \"\";\n c = \"\";\n };\n };\n}"; + }; + + testToPrettyLimitThrow = + let + a.b = 1; + a.c = a; + in { + expr = (builtins.tryEval + (generators.toPretty { } (generators.withRecursion { depthLimit = 2; } a))).success; + expected = false; + }; + testToPrettyMultiline = { expr = mapAttrs (const (generators.toPretty { })) rec { list = [ 3 4 [ false ] ]; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 892f671d3b..0326ca7a98 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -2599,6 +2599,10 @@ githubId = 202798; name = "Pierre Bourdon"; }; + delta = { + email = "d4delta@outlook.fr"; + name = "Delta"; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; @@ -3251,6 +3255,12 @@ githubId = 13485450; name = "Emmanuel Rosa"; }; + emptyflask = { + email = "jon@emptyflask.dev"; + github = "emptyflask"; + githubId = 28287; + name = "Jon Roberts"; + }; endgame = { email = "jack@jackkelly.name"; github = "endgame"; @@ -4671,6 +4681,12 @@ githubId = 36193715; name = "Lassi Haasio"; }; + ilkecan = { + email = "ilkecan@protonmail.com"; + github = "ilkecan"; + githubId = 40234257; + name = "ilkecan bozdogan"; + }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 0d22a67036..360b9f2058 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -437,7 +437,7 @@ printBuildSummary <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) <> "*" ] - brokenLine (name, rdeps) = "[" <> name <> "](https://search.nixos.org/packages?channel=unstable&show=haskellPackages." <> name <> "&query=haskellPackages." <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) + brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " numSummary = statusToNumSummary summary jobsByState predicate = Map.filter (predicate . worstState) summary worstState = foldl' min Success . fmap state . summaryBuilds @@ -464,8 +464,8 @@ printBuildSummary if' (isNothing mergeableJob) "No `mergeable` job found." <> if' (isNothing maintainedJob) "No `maintained` job found." <> if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> - if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too much outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too much outstanding jobs on aarch64-linux." + if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." if' p e = if p then [e] else mempty outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m maintainedJob = Map.lookup "maintained" summary diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh b/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh index d73c091223..18db1da0f2 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -75,6 +75,10 @@ fi echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" +# Update the list of Haskell package versions in NixOS on Hackage. +echo "Updating list of Haskell package versions in NixOS on Hackage..." +./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh + # Update stackage, Hackage hashes, and regenerate Haskell package set echo "Updating Stackage..." ./maintainers/scripts/haskell/update-stackage.sh --do-commit @@ -84,7 +88,7 @@ echo "Regenerating Hackage packages..." ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit # Push these new commits to the haskell-updates branch -echo "Pushing commits just created to the haskell-updates branch" +echo "Pushing commits just created to the remote haskell-updates branch..." git push # Open new PR @@ -93,7 +97,7 @@ new_pr_body=$(cat < clipcat, an X11 clipboard manager written in Rust. Available at - [services.clipcat](options.html#o pt-services.clipcat.enable). + services.clipcat. + + + + + dex, + an OpenID Connect (OIDC) identity and OAuth 2.0 provider. + Available at + services.dex. @@ -1051,6 +1059,16 @@ Superuser created successfully. changelog. + + + opencv2 no longer includes the non-free + libraries by default, and consequently + pfstools no longer includes OpenCV support + by default. Both packages now support an + enableUnfree option to re-enable this + functionality. + +
@@ -1070,6 +1088,40 @@ Superuser created successfully. linuxPackages_latest) remain untouched. + + + In NixOS virtual machines (QEMU), the + virtualisation module has been updated with + new options to configure: + + + + + IPv4 port forwarding + (virtualisation.forwardPorts), + + + + + shared host directories + (virtualisation.sharedDirectories), + + + + + screen resolution + (virtualisation.resolution). + + + + + In addition, the default + msize + parameter in 9P filesystems (including /nix/store and all + shared directories) has been increased to 16K for improved + performance. + + The setting @@ -1235,6 +1287,73 @@ Superuser created successfully. + + + The + networking.wireless + module (based on wpa_supplicant) has been heavily reworked, + solving a number of issues and adding useful features: + + + + + The automatic discovery of wireless interfaces at boot has + been made reliable again (issues + #101963, + #23196). + + + + + WPA3 and Fast BSS Transition (802.11r) are now enabled by + default for all networks. + + + + + Secrets like pre-shared keys and passwords can now be + handled safely, meaning without including them in a + world-readable file + (wpa_supplicant.conf under /nix/store). + This is achieved by storing the secrets in a secured + environmentFile + and referring to them though environment variables that + are expanded inside the configuration. + + + + + With multiple interfaces declared, independent + wpa_supplicant daemons are started, one for each interface + (the services are named + wpa_supplicant-wlan0, + wpa_supplicant-wlan1, etc.). + + + + + The generated wpa_supplicant.conf file + is now formatted for easier reading. + + + + + A new + scanOnLowSignal + option has been added to facilitate fast roaming between + access points (enabled by default). + + + + + A new + networks.<name>.authProtocols + option has been added to change the authentication + protocols used when connecting to a network. + + + + The diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index f22a532972..56babf8ac0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -32,8 +32,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). -- [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o - pt-services.clipcat.enable). +- [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#opt-services.clipcat.enable). + +- [dex](https://github.com/dexidp/dex), an OpenID Connect (OIDC) identity and OAuth 2.0 provider. Available at [services.dex](options.html#opt-services.dex.enable). - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). @@ -330,11 +331,21 @@ In addition to numerous new and upgraded packages, this release has the followin respectively. As a result `services.datadog-agent` has had breaking changes to the configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst). +- `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. + ## Other Notable Changes {#sec-release-21.11-notable-changes} + - The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set. In particular the versioned `linuxPackages_*` package sets (such as `linuxPackages_5_4`) and kernels from `pkgs` were moved there and now live under `pkgs.linuxKernel.packages.*`. The unversioned ones (such as `linuxPackages_latest`) remain untouched. +- In NixOS virtual machines (QEMU), the `virtualisation` module has been updated with new options to configure: + - IPv4 port forwarding ([`virtualisation.forwardPorts`](options.html#opt-virtualisation.forwardPorts)), + - shared host directories ([`virtualisation.sharedDirectories`](options.html#opt-virtualisation.sharedDirectories)), + - screen resolution ([`virtualisation.resolution`](options.html#opt-virtualisation.resolution)). + + In addition, the default [`msize`](options.html#opt-virtualisation.msize) parameter in 9P filesystems (including /nix/store and all shared directories) has been increased to 16K for improved performance. + - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. @@ -381,6 +392,16 @@ In addition to numerous new and upgraded packages, this release has the followin `myhostname`, but before `dns` should use the default priority - NSS modules which should come after `dns` should use mkAfter. +- The [networking.wireless](options.html#opt-networking.wireless.enable) module (based on wpa_supplicant) has been heavily reworked, solving a number of issues and adding useful features: + - The automatic discovery of wireless interfaces at boot has been made reliable again (issues [#101963](https://github.com/NixOS/nixpkgs/issues/101963), [#23196](https://github.com/NixOS/nixpkgs/issues/23196)). + - WPA3 and Fast BSS Transition (802.11r) are now enabled by default for all networks. + - Secrets like pre-shared keys and passwords can now be handled safely, meaning without including them in a world-readable file (`wpa_supplicant.conf` under /nix/store). + This is achieved by storing the secrets in a secured [environmentFile](options.html#opt-networking.wireless.environmentFile) and referring to them though environment variables that are expanded inside the configuration. + - With multiple interfaces declared, independent wpa_supplicant daemons are started, one for each interface (the services are named `wpa_supplicant-wlan0`, `wpa_supplicant-wlan1`, etc.). + - The generated `wpa_supplicant.conf` file is now formatted for easier reading. + - A new [scanOnLowSignal](options.html#opt-networking.wireless.scanOnLowSignal) option has been added to facilitate fast roaming between access points (enabled by default). + - A new [networks.<name>.authProtocols](options.html#opt-networking.wireless.networks._name_.authProtocols) option has been added to change the authentication protocols used when connecting to a network. + - The [networking.wireless.iwd](options.html#opt-networking.wireless.iwd.enable) module has a new [networking.wireless.iwd.settings](options.html#opt-networking.wireless.iwd.settings) option. - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. diff --git a/third_party/nixpkgs/nixos/lib/build-vms.nix b/third_party/nixpkgs/nixos/lib/build-vms.nix index f0a58628c6..0f0bdb4a86 100644 --- a/third_party/nixpkgs/nixos/lib/build-vms.nix +++ b/third_party/nixpkgs/nixos/lib/build-vms.nix @@ -4,15 +4,14 @@ , # Ignored config ? null , # Nixpkgs, for qemu, lib and more - pkgs + pkgs, lib , # !!! See comment about args in lib/modules.nix specialArgs ? {} , # NixOS configuration to add to the VMs extraConfigurations ? [] }: -with pkgs.lib; -with import ../lib/qemu-flags.nix { inherit pkgs; }; +with lib; rec { @@ -93,8 +92,9 @@ rec { "${config.networking.hostName}\n")); virtualisation.qemu.options = - forEach interfacesNumbered - ({ fst, snd }: qemuNICFlags snd fst m.snd); + let qemu-common = import ../lib/qemu-common.nix { inherit lib pkgs; }; + in flip concatMap interfacesNumbered + ({ fst, snd }: qemu-common.qemuNICFlags snd fst m.snd); }; } ) diff --git a/third_party/nixpkgs/nixos/lib/qemu-flags.nix b/third_party/nixpkgs/nixos/lib/qemu-common.nix similarity index 83% rename from third_party/nixpkgs/nixos/lib/qemu-flags.nix rename to third_party/nixpkgs/nixos/lib/qemu-common.nix index f786745ba3..84f9060acd 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-flags.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-common.nix @@ -1,12 +1,12 @@ -# QEMU flags shared between various Nix expressions. -{ pkgs }: +# QEMU-related utilities shared between various Nix expressions. +{ lib, pkgs }: let zeroPad = n: - pkgs.lib.optionalString (n < 16) "0" + + lib.optionalString (n < 16) "0" + (if n > 255 then throw "Can't have more than 255 nets or nodes!" - else pkgs.lib.toHexString n); + else lib.toHexString n); in rec { @@ -14,7 +14,7 @@ rec { qemuNICFlags = nic: net: machine: [ "-device virtio-net-pci,netdev=vlan${toString nic},mac=${qemuNicMac net machine}" - "-netdev vde,id=vlan${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" + ''-netdev vde,id=vlan${toString nic},sock="$QEMU_VDE_SOCKET_${toString net}"'' ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 7c8c64211f..a1c3624d14 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -217,7 +217,7 @@ rec { nodes = qemu_pkg: let build-vms = import ./build-vms.nix { - inherit system pkgs minimal specialArgs; + inherit system lib pkgs minimal specialArgs; extraConfigurations = extraConfigurations ++ [( { virtualisation.qemu.package = qemu_pkg; @@ -257,7 +257,6 @@ rec { inherit test driver driverInteractive nodes; }; - abortForFunction = functionName: abort ''The ${functionName} function was removed because it is not an essential part of the NixOS testing infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index 1d23b9b724..ec6b2ad3b8 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -6,7 +6,11 @@ let cfg = config.documentation; - manualModules = baseModules ++ optionals cfg.nixos.includeAllModules (extraModules ++ modules); + manualModules = + baseModules + # Modules for which to show options even when not imported + ++ [ ../virtualisation/qemu-vm.nix ] + ++ optionals cfg.nixos.includeAllModules (extraModules ++ modules); /* For the purpose of generating docs, evaluate options with each derivation in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}". diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix index 1d2bc8c728..5d2f9a21bc 100644 --- a/third_party/nixpkgs/nixos/modules/misc/locate.nix +++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix @@ -43,6 +43,9 @@ in { The format is described in systemd.time 7. + + To disable automatic updates, set to "never" + and run updatedb manually. ''; }; @@ -192,6 +195,18 @@ in { { LOCATE_PATH = cfg.output; }; + environment.etc = { + # write /etc/updatedb.conf for manual calls to `updatedb` + "updatedb.conf" = { + text = '' + PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}" + PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}" + PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}" + PRUNE_BIND_MOUNTSFR="${lib.boolToString cfg.pruneBindMounts}" + ''; + }; + }; + warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; @@ -238,7 +253,7 @@ in { serviceConfig.ReadWritePaths = dirOf cfg.output; }; - systemd.timers.update-locatedb = + systemd.timers.update-locatedb = mkIf (cfg.interval != "never") { description = "Update timer for locate database"; partOf = [ "update-locatedb.service" ]; wantedBy = [ "timers.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index a27baa7018..bff7b83ea7 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -963,6 +963,7 @@ ./services/web-apps/calibre-web.nix ./services/web-apps/convos.nix ./services/web-apps/cryptpad.nix + ./services/web-apps/dex.nix ./services/web-apps/discourse.nix ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix @@ -990,6 +991,7 @@ ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix ./services/web-apps/node-red.nix + ./services/web-apps/pict-rs.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/pgpkeyserver-lite.nix diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix index 8187042b4b..3cf21c1baa 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix @@ -310,7 +310,7 @@ in # the service - therefore we sleep in a loop until we can ping the # endpoint. preStart = '' - while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done + while ! ping -4 -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done ''; script = let diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix b/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix index 826e512c75..f970b0a095 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix @@ -65,7 +65,7 @@ in { unitConfig.Documentation = [ "man:lircd(8)" ]; serviceConfig = { - RuntimeDirectory = "lirc"; + RuntimeDirectory = ["lirc" "lirc/lock"]; # Service runtime directory and socket share same folder. # Following hacks are necessary to get everything right: diff --git a/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix b/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix index 516d0f70ef..27616e5f82 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix @@ -66,7 +66,7 @@ in RestrictNamespaces = "yes"; RestrictRealtime = "yes"; RestrictSUIDSGID = "yes"; - MemoryDenyWriteExecute = "yes"; + MemoryDenyWriteExecute = "no"; # v8 JIT requires memory segments to be Writable-Executable. LockPersonality = "yes"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 155c6fdd0a..904a3db493 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -20,10 +20,16 @@ let ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); + configIsGenerated = with cfg; + networks != {} || extraConfig != "" || userControlled.enable; + + # the original configuration file configFile = - if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable + if configIsGenerated then pkgs.writeText "wpa_supplicant.conf" generatedConfig else "/etc/wpa_supplicant.conf"; + # the config file with environment variables replaced + finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; # Creates a network block for wpa_supplicant.conf mkNetwork = ssid: opts: @@ -56,8 +62,8 @@ let let deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${configFile}" - else "-c ${configFile}"; + then "-c /etc/wpa_supplicant.conf -I ${finalConfig}" + else "-c ${finalConfig}"; in { description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; @@ -69,12 +75,25 @@ let stopIfChanged = false; path = [ package ]; + serviceConfig.RuntimeDirectory = "wpa_supplicant"; + serviceConfig.RuntimeDirectoryMode = "700"; + serviceConfig.EnvironmentFile = mkIf (cfg.environmentFile != null) + (builtins.toString cfg.environmentFile); script = '' - if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then - echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." - fi + ${optionalString configIsGenerated '' + if [ -f /etc/wpa_supplicant.conf ]; then + echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi + ''} + + # substitute environment variables + ${pkgs.gawk}/bin/awk '{ + for(varname in ENVIRON) + gsub("@"varname"@", ENVIRON[varname]) + print + }' "${configFile}" > "${finalConfig}" iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" @@ -155,6 +174,44 @@ in { ''; }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/wireless.env"; + description = '' + File consisting of lines of the form varname=value + to define variables for the wireless configuration. + + See section "EnvironmentFile=" in + systemd.exec5 + for a syntax reference. + + Secrets (PSKs, passwords, etc.) can be provided without adding them to + the world-readable Nix store by defining them in the environment file and + referring to them in option + with the syntax @varname@. Example: + + + # content of /run/secrets/wireless.env + PSK_HOME=mypassword + PASS_WORK=myworkpassword + + + + # wireless-related configuration + networking.wireless.environmentFile = "/run/secrets/wireless.env"; + networking.wireless.networks = { + home.psk = "@PSK_HOME@"; + work.auth = ''' + eap=PEAP + identity="my-user@example.com" + password="@PASS_WORK@" + '''; + }; + + ''; + }; + networks = mkOption { type = types.attrsOf (types.submodule { options = { @@ -165,10 +222,14 @@ in { The network's pre-shared key in plaintext defaulting to being a network without any authentication. - Be aware that these will be written to the nix store - in plaintext! + + Be aware that this will be written to the nix store + in plaintext! Use an environment variable instead. + - Mutually exclusive with pskRaw. + + Mutually exclusive with pskRaw. + ''; }; @@ -179,7 +240,14 @@ in { The network's pre-shared key in hex defaulting to being a network without any authentication. - Mutually exclusive with psk. + + Be aware that this will be written to the nix store + in plaintext! Use an environment variable instead. + + + + Mutually exclusive with psk. + ''; }; @@ -231,7 +299,7 @@ in { example = '' eap=PEAP identity="user@example.com" - password="secret" + password="@EXAMPLE_PASSWORD@" ''; description = '' Use this option to configure advanced authentication methods like EAP. @@ -242,7 +310,15 @@ in { for example configurations. - Mutually exclusive with psk and pskRaw. + + Be aware that this will be written to the nix store + in plaintext! Use an environment variable for secrets. + + + + Mutually exclusive with psk and + pskRaw. + ''; }; @@ -303,11 +379,17 @@ in { default = {}; example = literalExample '' { echelon = { # SSID with no spaces or special characters - psk = "abcdefgh"; + psk = "abcdefgh"; # (password will be written to /nix/store!) }; + + echelon = { # safe version of the above: read PSK from the + psk = "@PSK_ECHELON@"; # variable PSK_ECHELON, defined in environmentFile, + }; # this won't leak into /nix/store + "echelon's AP" = { # SSID with spaces and/or special characters - psk = "ijklmnop"; + psk = "ijklmnop"; # (password will be written to /nix/store!) }; + "free.wifi" = {}; # Public wireless network } ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix new file mode 100644 index 0000000000..2b5999706d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix @@ -0,0 +1,115 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dex; + fixClient = client: if client ? secretFile then ((builtins.removeAttrs client [ "secretFile" ]) // { secret = client.secretFile; }) else client; + filteredSettings = mapAttrs (n: v: if n == "staticClients" then (builtins.map fixClient v) else v) cfg.settings; + secretFiles = flatten (builtins.map (c: if c ? secretFile then [ c.secretFile ] else []) (cfg.settings.staticClients or [])); + + settingsFormat = pkgs.formats.yaml {}; + configFile = settingsFormat.generate "config.yaml" filteredSettings; + + startPreScript = pkgs.writeShellScript "dex-start-pre" ('' + '' + (concatStringsSep "\n" (builtins.map (file: '' + ${pkgs.replace-secret}/bin/replace-secret '${file}' '${file}' /run/dex/config.yaml + '') secretFiles))); +in +{ + options.services.dex = { + enable = mkEnableOption "the OpenID Connect and OAuth2 identity provider"; + + settings = mkOption { + type = settingsFormat.type; + default = {}; + example = literalExample '' + { + # External url + issuer = "http://127.0.0.1:5556/dex"; + storage = { + type = "postgres"; + config.host = "/var/run/postgres"; + }; + web = { + http = "127.0.0.1:5556"; + }; + enablePasswordDB = true; + staticClients = [ + { + id = "oidcclient"; + name = "Client"; + redirectURIs = [ "https://example.com/callback" ]; + secretFile = "/etc/dex/oidcclient"; # The content of `secretFile` will be written into to the config as `secret`. + } + ]; + } + ''; + description = '' + The available options can be found in + the example configuration. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.dex = { + description = "dex identity provider"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ] ++ (optional (cfg.settings.storage.type == "postgres") "postgresql.service"); + + serviceConfig = { + ExecStart = "${pkgs.dex-oidc}/bin/dex serve /run/dex/config.yaml"; + ExecStartPre = [ + "${pkgs.coreutils}/bin/install -m 600 ${configFile} /run/dex/config.yaml" + "+${startPreScript}" + ]; + RuntimeDirectory = "dex"; + + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + "-/etc/dex" + ]; + BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql"; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + # Port needs to be exposed to the host network + #PrivateNetwork = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectHome = true; + ProtectHostname = true; + # Would re-mount paths ignored by temporary root + #ProtectSystem = "strict"; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + TemporaryFileSystem = "/:ro"; + # Does not work well with the temporary root + #UMask = "0066"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.md b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.md new file mode 100644 index 0000000000..4b62204990 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.md @@ -0,0 +1,88 @@ +# Pict-rs {#module-services-pict-rs} + +pict-rs is a a simple image hosting service. + +## Quickstart {#module-services-pict-rs-quickstart} + +the minimum to start pict-rs is + +```nix +services.pict-rs.enable = true; +``` + +this will start the http server on port 8080 by default. + +## Usage {#module-services-pict-rs-usage} + +pict-rs offers the following endpoints: +- `POST /image` for uploading an image. Uploaded content must be valid multipart/form-data with an + image array located within the `images[]` key + + This endpoint returns the following JSON structure on success with a 201 Created status + ```json + { + "files": [ + { + "delete_token": "JFvFhqJA98", + "file": "lkWZDRvugm.jpg" + }, + { + "delete_token": "kAYy9nk2WK", + "file": "8qFS0QooAn.jpg" + }, + { + "delete_token": "OxRpM3sf0Y", + "file": "1hJaYfGE01.jpg" + } + ], + "msg": "ok" + } + ``` +- `GET /image/download?url=...` Download an image from a remote server, returning the same JSON + payload as the `POST` endpoint +- `GET /image/original/{file}` for getting a full-resolution image. `file` here is the `file` key from the + `/image` endpoint's JSON +- `GET /image/details/original/{file}` for getting the details of a full-resolution image. + The returned JSON is structured like so: + ```json + { + "width": 800, + "height": 537, + "content_type": "image/webp", + "created_at": [ + 2020, + 345, + 67376, + 394363487 + ] + } + ``` +- `GET /image/process.{ext}?src={file}&...` get a file with transformations applied. + existing transformations include + - `identity=true`: apply no changes + - `blur={float}`: apply a gaussian blur to the file + - `thumbnail={int}`: produce a thumbnail of the image fitting inside an `{int}` by `{int}` + square using raw pixel sampling + - `resize={int}`: produce a thumbnail of the image fitting inside an `{int}` by `{int}` square + using a Lanczos2 filter. This is slower than sampling but looks a bit better in some cases + - `crop={int-w}x{int-h}`: produce a cropped version of the image with an `{int-w}` by `{int-h}` + aspect ratio. The resulting crop will be centered on the image. Either the width or height + of the image will remain full-size, depending on the image's aspect ratio and the requested + aspect ratio. For example, a 1600x900 image cropped with a 1x1 aspect ratio will become 900x900. A + 1600x1100 image cropped with a 16x9 aspect ratio will become 1600x900. + + Supported `ext` file extensions include `png`, `jpg`, and `webp` + + An example of usage could be + ``` + GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 + ``` + which would create a 256x256px JPEG thumbnail and blur it +- `GET /image/details/process.{ext}?src={file}&...` for getting the details of a processed image. + The returned JSON is the same format as listed for the full-resolution details endpoint. +- `DELETE /image/delete/{delete_token}/{file}` or `GET /image/delete/{delete_token}/{file}` to + delete a file, where `delete_token` and `file` are from the `/image` endpoint's JSON + +## Missing {#module-services-pict-rs-missing} + +- Configuring the secure-api-key is not included yet. The envisioned basic use case is consumption on localhost by other services without exposing the service to the internet. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix new file mode 100644 index 0000000000..e1847fbd53 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix @@ -0,0 +1,50 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.services.pict-rs; +in +{ + meta.maintainers = with maintainers; [ happysalada ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc pict-rs.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > pict-rs.xml` + meta.doc = ./pict-rs.xml; + + options.services.pict-rs = { + enable = mkEnableOption "pict-rs server"; + dataDir = mkOption { + type = types.path; + default = "/var/lib/pict-rs"; + description = '' + The directory where to store the uploaded images. + ''; + }; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IPv4 address to deploy the service to. + ''; + }; + port = mkOption { + type = types.port; + default = 8080; + description = '' + The port which to bind the service to. + ''; + }; + }; + config = lib.mkIf cfg.enable { + systemd.services.pict-rs = { + environment = { + PICTRS_PATH = cfg.dataDir; + PICTRS_ADDR = "${cfg.address}:${toString cfg.port}"; + }; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = "pict-rs"; + ExecStart = "${pkgs.pict-rs}/bin/pict-rs"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml new file mode 100644 index 0000000000..bf129f5cc2 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml @@ -0,0 +1,162 @@ + + Pict-rs + + pict-rs is a a simple image hosting service. + +
+ Quickstart + + the minimum to start pict-rs is + + +services.pict-rs.enable = true; + + + this will start the http server on port 8080 by default. + +
+
+ Usage + + pict-rs offers the following endpoints: - + POST /image for uploading an image. Uploaded + content must be valid multipart/form-data with an image array + located within the images[] key + + +This endpoint returns the following JSON structure on success with a 201 Created status +```json +{ + "files": [ + { + "delete_token": "JFvFhqJA98", + "file": "lkWZDRvugm.jpg" + }, + { + "delete_token": "kAYy9nk2WK", + "file": "8qFS0QooAn.jpg" + }, + { + "delete_token": "OxRpM3sf0Y", + "file": "1hJaYfGE01.jpg" + } + ], + "msg": "ok" +} +``` + + + + + GET /image/download?url=... Download an + image from a remote server, returning the same JSON payload as + the POST endpoint + + + + + GET /image/original/{file} for getting a + full-resolution image. file here is the + file key from the /image + endpoint’s JSON + + + + + GET /image/details/original/{file} for + getting the details of a full-resolution image. The returned + JSON is structured like so: + json { "width": 800, "height": 537, "content_type": "image/webp", "created_at": [ 2020, 345, 67376, 394363487 ] } + + + + + GET /image/process.{ext}?src={file}&... + get a file with transformations applied. existing + transformations include + + + + + identity=true: apply no changes + + + + + blur={float}: apply a gaussian blur to + the file + + + + + thumbnail={int}: produce a thumbnail of + the image fitting inside an {int} by + {int} square using raw pixel sampling + + + + + resize={int}: produce a thumbnail of + the image fitting inside an {int} by + {int} square using a Lanczos2 filter. + This is slower than sampling but looks a bit better in + some cases + + + + + crop={int-w}x{int-h}: produce a cropped + version of the image with an {int-w} by + {int-h} aspect ratio. The resulting + crop will be centered on the image. Either the width or + height of the image will remain full-size, depending on + the image’s aspect ratio and the requested aspect ratio. + For example, a 1600x900 image cropped with a 1x1 aspect + ratio will become 900x900. A 1600x1100 image cropped with + a 16x9 aspect ratio will become 1600x900. + + + + + Supported ext file extensions include + png, jpg, and + webp + + + An example of usage could be + GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 + which would create a 256x256px JPEG thumbnail and blur it + + + + + GET /image/details/process.{ext}?src={file}&... + for getting the details of a processed image. The returned + JSON is the same format as listed for the full-resolution + details endpoint. + + + + + DELETE /image/delete/{delete_token}/{file} + or GET /image/delete/{delete_token}/{file} + to delete a file, where delete_token and + file are from the /image + endpoint’s JSON + + + +
+
+ Missing + + + + Configuring the secure-api-key is not included yet. The + envisioned basic use case is consumption on localhost by other + services without exposing the service to the internet. + + + +
+ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index d8dc2675f0..16b82f972c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -264,6 +264,7 @@ in kwallet-pam kwalletmanager kwayland + kwayland-integration kwidgetsaddons kxmlgui kxmlrpcclient diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index d934e3cf02..34a44b383a 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -1139,10 +1139,12 @@ in source = "${pkgs.iputils.out}/bin/ping"; }; } else { - setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.iputils.out}/bin/ping"; + ping = { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.iputils.out}/bin/ping"; + }; }; security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index be5fa88b8a..a7011be7e0 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -4,7 +4,10 @@ { options, config, lib, pkgs, ... }: with lib; -with import ../../lib/qemu-flags.nix { inherit pkgs; }; + +let + qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; +in { @@ -12,8 +15,8 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; + requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; script = '' export USER=root @@ -30,7 +33,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; cd /tmp exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${qemuSerialDevice}; do sleep 0.1; done + while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done echo "connecting to host..." >&2 stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion echo @@ -42,7 +45,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; # Prevent agetty from being instantiated on the serial device, since it # interferes with the backdoor (writes to it will randomly fail # with EIO). Likewise for hvc0. - systemd.services."serial-getty@${qemuSerialDevice}".enable = false; + systemd.services."serial-getty@${qemu-common.qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; # Only set these settings when the options exist. Some tests (e.g. those @@ -57,7 +60,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; # we avoid defining consoles if not possible. # TODO: refactor such that test-instrumentation can import qemu-vm # or declare virtualisation.qemu.console option in a module that's always imported - consoles = [ qemuSerialDevice ]; + consoles = [ qemu-common.qemuSerialDevice ]; package = lib.mkDefault pkgs.qemu_test; }; }; @@ -88,7 +91,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=${qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ]; + [ "console=${qemu-common.qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index b51c29f83d..494c2c1428 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -10,10 +10,10 @@ { config, lib, pkgs, options, ... }: with lib; -with import ../../lib/qemu-flags.nix { inherit pkgs; }; let + qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; cfg = config.virtualisation; @@ -75,7 +75,7 @@ let in "-drive ${driveOpts} ${device}"; - drivesCmdLine = drives: concatStringsSep " " (imap1 driveCmdline drives); + drivesCmdLine = drives: concatStringsSep "\\\n " (imap1 driveCmdline drives); # Creates a device name from a 1-based a numerical index, e.g. @@ -108,39 +108,44 @@ let '' #! ${pkgs.runtimeShell} - NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}) + set -e + + NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}") if ! test -e "$NIX_DISK_IMAGE"; then ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \ - ${toString config.virtualisation.diskSize}M || exit 1 + ${toString config.virtualisation.diskSize}M fi # Create a directory for storing temporary data of the running VM. - if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then + if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) fi # Create a directory for exchanging data with the VM. - mkdir -p $TMPDIR/xchg + mkdir -p "$TMPDIR/xchg" - ${if cfg.useBootLoader then '' + ${lib.optionalString cfg.useBootLoader + '' # Create a writable copy/snapshot of the boot disk. # A writable boot disk can be booted from automatically. - ${qemu}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1 + ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img" - NIX_EFI_VARS=$(readlink -f ''${NIX_EFI_VARS:-${cfg.efiVars}}) + NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${cfg.efiVars}}") - ${if cfg.useEFIBoot then '' + ${lib.optionalString cfg.useEFIBoot + '' # VM needs writable EFI vars if ! test -e "$NIX_EFI_VARS"; then - cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1 - chmod 0644 "$NIX_EFI_VARS" || exit 1 + cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" + chmod 0644 "$NIX_EFI_VARS" fi - '' else ""} - '' else ""} + ''} + ''} - cd $TMPDIR - idx=0 + cd "$TMPDIR" + + ${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"} ${flip concatMapStrings cfg.emptyDiskImages (size: '' if ! test -e "empty$idx.qcow2"; then ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" @@ -149,17 +154,18 @@ let '')} # Start QEMU. - exec ${qemuBinary qemu} \ + exec ${qemu-common.qemuBinary qemu} \ -name ${config.system.name} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ -device virtio-rng-pci \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ - -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ - -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ + ${concatStringsSep " \\\n " + (mapAttrsToList + (tag: share: "-virtfs local,path=${share.source},security_model=none,mount_tag=${tag}") + config.virtualisation.sharedDirectories)} \ ${drivesCmdLine config.virtualisation.qemu.drives} \ - ${toString config.virtualisation.qemu.options} \ + ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ $QEMU_OPTS \ "$@" ''; @@ -270,20 +276,21 @@ in virtualisation.memorySize = mkOption { + type = types.ints.positive; default = 384; description = '' - Memory size (M) of virtual machine. + The memory size in megabytes of the virtual machine. ''; }; virtualisation.msize = mkOption { - default = null; - type = types.nullOr types.ints.unsigned; + type = types.ints.positive; + default = 16384; description = '' - msize (maximum packet size) option passed to 9p file systems, in + The msize (maximum packet size) option passed to 9p file systems, in bytes. Increasing this should increase performance significantly, at the cost of higher RAM usage. ''; @@ -291,15 +298,17 @@ in virtualisation.diskSize = mkOption { + type = types.nullOr types.ints.positive; default = 512; description = '' - Disk size (M) of virtual machine. + The disk size in megabytes of the virtual machine. ''; }; virtualisation.diskImage = mkOption { + type = types.str; default = "./${config.system.name}.qcow2"; description = '' @@ -311,7 +320,7 @@ in virtualisation.bootDevice = mkOption { - type = types.str; + type = types.path; example = "/dev/vda"; description = '' @@ -321,8 +330,8 @@ in virtualisation.emptyDiskImages = mkOption { + type = types.listOf types.ints.positive; default = []; - type = types.listOf types.int; description = '' Additional disk images to provide to the VM. The value is @@ -333,6 +342,7 @@ in virtualisation.graphics = mkOption { + type = types.bool; default = true; description = '' @@ -342,10 +352,20 @@ in ''; }; + virtualisation.resolution = + mkOption { + type = options.services.xserver.resolutions.type.nestedTypes.elemType; + default = { x = 1024; y = 768; }; + description = + '' + The resolution of the virtual machine display. + ''; + }; + virtualisation.cores = mkOption { + type = types.ints.positive; default = 1; - type = types.int; description = '' Specify the number of cores the guest is permitted to use. @@ -354,8 +374,34 @@ in ''; }; + virtualisation.sharedDirectories = + mkOption { + type = types.attrsOf + (types.submodule { + options.source = mkOption { + type = types.str; + description = "The path of the directory to share, can be a shell variable"; + }; + options.target = mkOption { + type = types.path; + description = "The mount point of the directory inside the virtual machine"; + }; + }); + default = { }; + example = { + my-share = { source = "/path/to/be/shared"; target = "/mnt/shared"; }; + }; + description = + '' + An attributes set of directories that will be shared with the + virtual machine using VirtFS (9P filesystem over VirtIO). + The attribute name will be used as the 9P mount tag. + ''; + }; + virtualisation.pathsInNixDB = mkOption { + type = types.listOf types.path; default = []; description = '' @@ -367,8 +413,78 @@ in ''; }; + virtualisation.forwardPorts = mkOption { + type = types.listOf + (types.submodule { + options.from = mkOption { + type = types.enum [ "host" "guest" ]; + default = "host"; + description = + '' + Controls the direction in which the ports are mapped: + + - "host" means traffic from the host ports + is forwarded to the given guest port. + + - "guest" means traffic from the guest ports + is forwarded to the given host port. + ''; + }; + options.proto = mkOption { + type = types.enum [ "tcp" "udp" ]; + default = "tcp"; + description = "The protocol to forward."; + }; + options.host.address = mkOption { + type = types.str; + default = ""; + description = "The IPv4 address of the host."; + }; + options.host.port = mkOption { + type = types.port; + description = "The host port to be mapped."; + }; + options.guest.address = mkOption { + type = types.str; + default = ""; + description = "The IPv4 address on the guest VLAN."; + }; + options.guest.port = mkOption { + type = types.port; + description = "The guest port to be mapped."; + }; + }); + default = []; + example = lib.literalExample + '' + [ # forward local port 2222 -> 22, to ssh into the VM + { from = "host"; host.port = 2222; guest.port = 22; } + + # forward local port 80 -> 10.0.2.10:80 in the VLAN + { from = "guest"; + guest.address = "10.0.2.10"; guest.port = 80; + host.address = "127.0.0.1"; host.port = 80; + } + ] + ''; + description = + '' + When using the SLiRP user networking (default), this option allows to + forward ports to/from the host/guest. + + + If the NixOS firewall on the virtual machine is enabled, you also + have to open the guest ports to enable the traffic between host and + guest. + + + Currently QEMU supports only IPv4 forwarding. + ''; + }; + virtualisation.vlans = mkOption { + type = types.listOf types.ints.unsigned; default = [ 1 ]; example = [ 1 2 ]; description = @@ -386,6 +502,7 @@ in virtualisation.writableStore = mkOption { + type = types.bool; default = true; # FIXME description = '' @@ -397,6 +514,7 @@ in virtualisation.writableStoreUseTmpfs = mkOption { + type = types.bool; default = true; description = '' @@ -407,6 +525,7 @@ in networking.primaryIPAddress = mkOption { + type = types.str; default = ""; internal = true; description = "Primary IP address used in /etc/hosts."; @@ -423,7 +542,7 @@ in options = mkOption { - type = types.listOf types.unspecified; + type = types.listOf types.str; default = []; example = [ "-vga std" ]; description = "Options passed to QEMU."; @@ -432,7 +551,7 @@ in consoles = mkOption { type = types.listOf types.str; default = let - consoles = [ "${qemuSerialDevice},115200n8" "tty0" ]; + consoles = [ "${qemu-common.qemuSerialDevice},115200n8" "tty0" ]; in if cfg.graphics then consoles else reverseList consoles; example = [ "console=tty1" ]; description = '' @@ -448,17 +567,18 @@ in networkingOptions = mkOption { - default = [ - "-net nic,netdev=user.0,model=virtio" - "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" - ]; type = types.listOf types.str; + default = [ ]; + example = [ + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; description = '' Networking-related command-line options that should be passed to qemu. - The default is to use userspace networking (slirp). + The default is to use userspace networking (SLiRP). If you override this option, be advised to keep - ''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} (as seen in the default) + ''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} (as seen in the example) to keep the default runtime behaviour. ''; }; @@ -472,16 +592,16 @@ in diskInterface = mkOption { + type = types.enum [ "virtio" "scsi" "ide" ]; default = "virtio"; example = "scsi"; - type = types.enum [ "virtio" "scsi" "ide" ]; description = "The interface used for the virtual hard disks."; }; guestAgent.enable = mkOption { - default = true; type = types.bool; + default = true; description = '' Enable the Qemu guest agent. ''; @@ -490,6 +610,7 @@ in virtualisation.useBootLoader = mkOption { + type = types.bool; default = false; description = '' @@ -504,6 +625,7 @@ in virtualisation.useEFIBoot = mkOption { + type = types.bool; default = false; description = '' @@ -515,6 +637,7 @@ in virtualisation.efiVars = mkOption { + type = types.str; default = "./${config.system.name}-efi-vars.fd"; description = '' @@ -525,8 +648,8 @@ in virtualisation.bios = mkOption { - default = null; type = types.nullOr types.package; + default = null; description = '' An alternate BIOS (such as qboot) with which to start the VM. @@ -539,6 +662,25 @@ in config = { + assertions = + lib.concatLists (lib.flip lib.imap cfg.forwardPorts (i: rule: + [ + { assertion = rule.from == "guest" -> rule.proto == "tcp"; + message = + '' + Invalid virtualisation.forwardPorts..proto: + Guest forwarding supports only TCP connections. + ''; + } + { assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address; + message = + '' + Invalid virtualisation.forwardPorts..guest.address: + The address must be in the default VLAN (10.0.2.0/24). + ''; + } + ])); + # Note [Disk layout with `useBootLoader`] # # If `useBootLoader = true`, we configure 2 drives: @@ -560,6 +702,7 @@ in then driveDeviceName 2 # second disk else cfg.bootDevice ); + boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}"; boot.initrd.extraUtilsCommands = '' @@ -618,6 +761,28 @@ in virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; + virtualisation.sharedDirectories = { + nix-store = { source = "/nix/store"; target = "/nix/store"; }; + xchg = { source = ''"$TMPDIR"/xchg''; target = "/tmp/xchg"; }; + shared = { source = ''"''${SHARED_DIR:-$TMPDIR/xchg}"''; target = "/tmp/shared"; }; + }; + + virtualisation.qemu.networkingOptions = + let + forwardingOptions = flip concatMapStrings cfg.forwardPorts + ({ proto, from, host, guest }: + if from == "host" + then "hostfwd=${proto}:${host.address}:${toString host.port}-" + + "${guest.address}:${toString guest.port}," + else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" + + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," + ); + in + [ + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0,${forwardingOptions}\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ @@ -646,7 +811,7 @@ in virtualisation.qemu.drives = mkMerge [ [{ name = "root"; - file = "$NIX_DISK_IMAGE"; + file = ''"$NIX_DISK_IMAGE"''; driveExtraOpts.cache = "writeback"; driveExtraOpts.werror = "report"; }] @@ -655,7 +820,7 @@ in # note [Disk layout with `useBootLoader`]. { name = "boot"; - file = "$TMPDIR/disk.img"; + file = ''"$TMPDIR"/disk.img''; driveExtraOpts.media = "disk"; deviceExtraOpts.bootindex = "1"; } @@ -672,15 +837,26 @@ in # configuration, where the regular value for the `fileSystems' # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). - fileSystems = mkVMOverride ( - cfg.fileSystems // - { "/".device = cfg.bootDevice; - ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = - { device = "store"; - fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; - neededForBoot = true; - }; + fileSystems = + let + mkSharedDir = tag: share: + { + name = + if tag == "nix-store" && cfg.writableStore + then "/nix/.ro-store" + else share.target; + value.device = tag; + value.fsType = "9p"; + value.neededForBoot = true; + value.options = + [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" ] + ++ lib.optional (tag == "nix-store") "cache=loose"; + }; + in + mkVMOverride (cfg.fileSystems // + { + "/".device = cfg.bootDevice; + "/tmp" = mkIf config.boot.tmpOnTmpfs { device = "tmpfs"; fsType = "tmpfs"; @@ -688,32 +864,20 @@ in # Sync with systemd's tmp.mount; options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ]; }; - "/tmp/xchg" = - { device = "xchg"; - fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; - neededForBoot = true; - }; - "/tmp/shared" = - { device = "shared"; - fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; - neededForBoot = true; - }; - } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) - { "/nix/.rw-store" = + + "/nix/.rw-store" = mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { fsType = "tmpfs"; options = [ "mode=0755" ]; neededForBoot = true; }; - } // optionalAttrs cfg.useBootLoader - { "/boot" = + + "/boot" = mkIf cfg.useBootLoader # see note [Disk layout with `useBootLoader`] { device = "${lookupDriveDeviceName "boot" cfg.qemu.drives}2"; # 2 for e.g. `vdb2`, as created in `bootDisk` fsType = "vfat"; noCheck = true; # fsck fails on a r/o filesystem }; - }); + } // lib.mapAttrs' mkSharedDir cfg.sharedDirectories); swapDevices = mkVMOverride [ ]; boot.initrd.luks.devices = mkVMOverride {}; @@ -734,7 +898,7 @@ in # video driver the host uses. services.xserver.videoDrivers = mkVMOverride [ "modesetting" ]; services.xserver.defaultDepth = mkVMOverride 0; - services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ]; + services.xserver.resolutions = mkVMOverride [ cfg.resolution ]; services.xserver.monitorSection = '' # Set a higher refresh rate so that resolutions > 800x600 work. diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 8d95df53a5..f92a9241c5 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -97,6 +97,7 @@ in cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./dendrite.nix {}; + dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; @@ -478,6 +479,7 @@ in wiki-js = handleTest ./wiki-js.nix {}; wireguard = handleTest ./wireguard {}; wmderland = handleTest ./wmderland.nix {}; + wpa_supplicant = handleTest ./wpa_supplicant.nix {}; wordpress = handleTest ./wordpress.nix {}; xandikos = handleTest ./xandikos.nix {}; xautolock = handleTest ./xautolock.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/boot.nix b/third_party/nixpkgs/nixos/tests/boot.nix index bdae6341ec..e8440598a8 100644 --- a/third_party/nixpkgs/nixos/tests/boot.nix +++ b/third_party/nixpkgs/nixos/tests/boot.nix @@ -4,10 +4,10 @@ }: with import ../lib/testing-python.nix { inherit system pkgs; }; -with import ../lib/qemu-flags.nix { inherit pkgs; }; with pkgs.lib; let + qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; iso = (import ../lib/eval-config.nix { @@ -23,7 +23,7 @@ let makeBootTest = name: extraConfig: let machineConfig = pythonDict ({ - qemuBinary = qemuBinary pkgs.qemu_test; + qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; qemuFlags = "-m 768"; } // extraConfig); in @@ -65,7 +65,7 @@ let ]; }; machineConfig = pythonDict ({ - qemuBinary = qemuBinary pkgs.qemu_test; + qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; qemuFlags = "-boot order=n -m 2000"; netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe"; } // extraConfig); diff --git a/third_party/nixpkgs/nixos/tests/custom-ca.nix b/third_party/nixpkgs/nixos/tests/custom-ca.nix index 26f29a3e68..05cfbbb2fd 100644 --- a/third_party/nixpkgs/nixos/tests/custom-ca.nix +++ b/third_party/nixpkgs/nixos/tests/custom-ca.nix @@ -82,7 +82,7 @@ in # chromium-based browsers refuse to run as root test-support.displayManager.auto.user = "alice"; # browsers may hang with the default memory - virtualisation.memorySize = "500"; + virtualisation.memorySize = 500; networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ]; security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ]; @@ -113,7 +113,7 @@ in # which is why it will not use the system certificate store for the time being. # firefox chromium - falkon + qutebrowser midori ]; }; @@ -152,21 +152,21 @@ in with subtest("Unknown CA is untrusted in curl"): machine.fail("curl -fv https://bad.example.com") - browsers = [ + browsers = { # Firefox was disabled here, because we needed to disable p11-kit support in nss, # which is why it will not use the system certificate store for the time being. - # "firefox", - "chromium", - "falkon", - "midori" - ] - errors = ["Security Risk", "not private", "Certificate Error", "Security"] + #"firefox": "Security Risk", + "chromium": "not private", + "qutebrowser -T": "Certificate error", + "midori": "Security" + } machine.wait_for_x() - for browser, error in zip(browsers, errors): + for command, error in browsers.items(): + browser = command.split()[0] with subtest("Good certificate is trusted in " + browser): execute_as( - "alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2" + "alice", f"env P11_KIT_DEBUG=trust {command} https://good.example.com & >&2" ) wait_for_window_as("alice", browser) machine.wait_for_text("It works!") @@ -174,7 +174,7 @@ in execute_as("alice", "xdotool key ctrl+w") # close tab with subtest("Unknown CA is untrusted in " + browser): - execute_as("alice", f"{browser} https://bad.example.com & >&2") + execute_as("alice", f"{command} https://bad.example.com & >&2") machine.wait_for_text(error) machine.screenshot("bad" + browser) machine.succeed("pkill " + browser) diff --git a/third_party/nixpkgs/nixos/tests/dex-oidc.nix b/third_party/nixpkgs/nixos/tests/dex-oidc.nix new file mode 100644 index 0000000000..37275a97ef --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dex-oidc.nix @@ -0,0 +1,78 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "dex-oidc"; + meta.maintainers = with lib.maintainers; [ Flakebi ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ jq ]; + services.dex = { + enable = true; + settings = { + issuer = "http://127.0.0.1:8080/dex"; + storage = { + type = "postgres"; + config.host = "/var/run/postgresql"; + }; + web.http = "127.0.0.1:8080"; + oauth2.skipApprovalScreen = true; + staticClients = [ + { + id = "oidcclient"; + name = "Client"; + redirectURIs = [ "https://example.com/callback" ]; + secretFile = "/etc/dex/oidcclient"; + } + ]; + connectors = [ + { + type = "mockPassword"; + id = "mock"; + name = "Example"; + config = { + username = "admin"; + password = "password"; + }; + } + ]; + }; + }; + + # This should not be set from nix but through other means to not leak the secret. + environment.etc."dex/oidcclient" = { + mode = "0400"; + user = "dex"; + text = "oidcclientsecret"; + }; + + services.postgresql = { + enable = true; + ensureDatabases =[ "dex" ]; + ensureUsers = [ + { + name = "dex"; + ensurePermissions = { "DATABASE dex" = "ALL PRIVILEGES"; }; + } + ]; + }; + }; + + testScript = '' + with subtest("Web server gets ready"): + machine.wait_for_unit("dex.service") + # Wait until server accepts connections + machine.wait_until_succeeds("curl -fs 'localhost:8080/dex/auth/mock?client_id=oidcclient&response_type=code&redirect_uri=https://example.com/callback&scope=openid'") + + with subtest("Login"): + state = machine.succeed("curl -fs 'localhost:8080/dex/auth/mock?client_id=oidcclient&response_type=code&redirect_uri=https://example.com/callback&scope=openid' | sed -n 's/.*state=\\(.*\\)\">.*/\\1/p'").strip() + print(f"Got state {state}") + machine.succeed(f"curl -fs 'localhost:8080/dex/auth/mock/login?back=&state={state}' -d 'login=admin&password=password'") + code = machine.succeed(f"curl -fs localhost:8080/dex/approval?req={state} | sed -n 's/.*code=\\(.*\\)&.*/\\1/p'").strip() + print(f"Got approval code {code}") + bearer = machine.succeed(f"curl -fs localhost:8080/dex/token -u oidcclient:oidcclientsecret -d 'grant_type=authorization_code&redirect_uri=https://example.com/callback&code={code}' | jq .access_token -r").strip() + print(f"Got access token {bearer}") + + with subtest("Get userinfo"): + assert '"sub"' in machine.succeed( + f"curl -fs localhost:8080/dex/userinfo --oauth2-bearer {bearer}" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 4c3c26980a..e482223436 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -119,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("The pullImage tool works"): docker.succeed( - "docker load --input='${examples.nixFromDockerHub}'", + "docker load --input='${examples.testNixFromDockerHub}'", "docker run --rm nix:2.2.1 nix-store --version", "docker rmi nix:2.2.1", ) @@ -378,5 +378,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed( "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" ) + + with subtest("exportImage produces a valid tarball"): + docker.succeed( + "tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/firefox.nix b/third_party/nixpkgs/nixos/tests/firefox.nix index 4ad45c0224..dcaf369b62 100644 --- a/third_party/nixpkgs/nixos/tests/firefox.nix +++ b/third_party/nixpkgs/nixos/tests/firefox.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { ]; # Need some more memory to record audio. - virtualisation.memorySize = "500"; + virtualisation.memorySize = 500; # Create a virtual sound device, with mixing # and all, for recording audio. diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index e88b60d335..192dc810d7 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ let linuxPackages_4_19 linuxPackages_5_4 linuxPackages_5_10 - linuxPackages_5_13 linuxPackages_5_14 linuxPackages_4_14_hardened diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 22f7ca5a9b..8b947ddf0c 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -8,7 +8,7 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let - qemu-flags = import ../lib/qemu-flags.nix { inherit pkgs; }; + qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; router = { config, pkgs, lib, ... }: with pkgs.lib; @@ -42,7 +42,7 @@ let machines = flip map vlanIfs (vlan: { hostName = "client${toString vlan}"; - ethernetAddress = qemu-flags.qemuNicMac vlan 1; + ethernetAddress = qemu-common.qemuNicMac vlan 1; ipAddress = "192.168.${toString vlan}.2"; } ); diff --git a/third_party/nixpkgs/nixos/tests/pict-rs.nix b/third_party/nixpkgs/nixos/tests/pict-rs.nix new file mode 100644 index 0000000000..432fd6a50c --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/pict-rs.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + { + name = "pict-rs"; + meta.maintainers = with lib.maintainers; [ happysalada ]; + + machine = { ... }: { + environment.systemPackages = with pkgs; [ curl jq ]; + services.pict-rs.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("pict-rs") + machine.wait_for_open_port("8080") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix new file mode 100644 index 0000000000..1d669d5016 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix @@ -0,0 +1,81 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: +{ + name = "wpa_supplicant"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + # add a virtual wlan interface + boot.kernelModules = [ "mac80211_hwsim" ]; + + # wireless access point + services.hostapd = { + enable = true; + wpa = true; + interface = "wlan0"; + ssid = "nixos-test"; + wpaPassphrase = "reproducibility"; + }; + + # wireless client + networking.wireless = { + # the override is needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + enable = lib.mkOverride 0 true; + userControlled.enable = true; + interfaces = [ "wlan1" ]; + + networks = { + # test network + nixos-test.psk = "@PSK_NIXOS_TEST@"; + + # secrets substitution test cases + test1.psk = "@PSK_VALID@"; # should be replaced + test2.psk = "@PSK_SPECIAL@"; # should be replaced + test3.psk = "@PSK_MISSING@"; # should not be replaced + test4.psk = "P@ssowrdWithSome@tSymbol"; # should not be replaced + }; + + # secrets + environmentFile = pkgs.writeText "wpa-secrets" '' + PSK_NIXOS_TEST="reproducibility" + PSK_VALID="S0m3BadP4ssw0rd"; + # taken from https://github.com/minimaxir/big-list-of-naughty-strings + PSK_SPECIAL=",./;'[]\-= <>?:\"{}|_+ !@#$%^\&*()`~"; + ''; + }; + + }; + + testScript = + '' + config_file = "/run/wpa_supplicant/wpa_supplicant.conf" + + with subtest("Configuration file is inaccessible to other users"): + machine.wait_for_file(config_file) + machine.fail(f"sudo -u nobody ls {config_file}") + + with subtest("Secrets variables have been substituted"): + machine.fail(f"grep -q @PSK_VALID@ {config_file}") + machine.fail(f"grep -q @PSK_SPECIAL@ {config_file}") + machine.succeed(f"grep -q @PSK_MISSING@ {config_file}") + machine.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") + + # save file for manual inspection + machine.copy_from_vm(config_file) + + with subtest("Daemon is running and accepting connections"): + machine.wait_for_unit("wpa_supplicant-wlan1.service") + status = machine.succeed("wpa_cli -i wlan1 status") + assert "Failed to connect" not in status, \ + "Failed to connect to the daemon" + + with subtest("Daemon can connect to the access point"): + machine.wait_until_succeeds( + "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" + ) + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix new file mode 100644 index 0000000000..c3c33267f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix @@ -0,0 +1,113 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, fetchzip +, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, libGL, python3, ncurses, libusb1 +, gtk3, webkitgtk, curl, xvfb-run, makeWrapper + # "Debug", or "Release" +, buildType ? "Release" +}: + +let + projucer = stdenv.mkDerivation rec { + pname = "projucer"; + version = "5.4.7"; + + src = fetchFromGitHub { + owner = "juce-framework"; + repo = "JUCE"; + rev = version; + sha256= "0qpiqfwwpcghk7ij6w4vy9ywr3ryg7ppg77bmd7783kxg6zbhj8h"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype libX11 libXrandr libXinerama libXext gtk3 webkitgtk + libjack2 curl + ]; + preBuild = '' + cd extras/Projucer/Builds/LinuxMakefile + ''; + makeFlags = [ "CONFIG=${buildType}" ]; + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp -a build/Projucer $out/bin/Projucer + ''; + }; + + # equal to vst-sdk in ../oxefmsynth/default.nix + vst-sdk = stdenv.mkDerivation rec { + name = "vstsdk3610_11_06_2018_build_37"; + src = fetchzip { + url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; + sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; + }; + installPhase = '' + cp -r . $out + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bespokesynth"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "awwbees"; + repo = pname; + rev = "v${version}"; + sha256 = "04b2m40jszphslkd4850jcb8qwls392lwy3lc6vlj01h4izvapqk"; + }; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + xvfb-run sh -e <uid != 0) +- return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), +- "sd-device-monitor: Sender uid="UID_FMT", message ignored.", cred->uid); + + if (streq(buf.raw, "libudev")) { + /* udev message needs proper version magic */ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 656c5974be..54e45a432f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.9-1"; + version = "0.9.10"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-EmnrwBMHb9jpEZAG393yyMaFRRQJ6YYDRvsp+ATT7MY="; + sha256 = "1iBA7R63g0UOuCmnFONc9j/7jfcHA54jJ327AL/aPIE="; }; - cargoHash = "sha256-WzsaUrqe7F4x+ShqG14kq78MTSWIxIMRa3pdr3RXrwk="; + cargoSha256 = "1ysbyv323qmpswbnd2lvisrwnk30l4zvcidh866nrk6b6jqjag42"; nativeBuildInputs = [ clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 298b678a31..99c9d6dccd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -1,24 +1,24 @@ { rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper -, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump, libsodium +, cargo, pkg-config, curl, coreutils, boost175, db62, hexdump, libsodium , libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true , withUtils ? true, withWallet ? true, withZmq ? true, zeromq }: rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "0nhrjizx518khrl8aygag6a1ianzzqpchasggi963f807kv7ipb7"; + sha256 = "0zn6ms2c4mh64cckjg88v0byy2ck116z5g4y82hh34mz3r11d9mn"; }; - cargoSha256 = "101j8cn2lg3l1gn53yg3svzwx783z331g9kzn9ici4azindyx903"; + cargoSha256 = "16il7napj7ryxsap6icvdpvagm9mvgz2mpshny9wn56y60qaymd0"; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost174 libevent libsodium utf8cpp ] + buildInputs = [ boost175 libevent libsodium utf8cpp ] ++ lib.optional withWallet db62 ++ lib.optional withZmq zeromq; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlags = [ "--disable-tests" - "--with-boost-libdir=${lib.getLib boost174}/lib" + "--with-boost-libdir=${lib.getLib boost175}/lib" "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" ] ++ lib.optional (!withWallet) "--disable-wallet" diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 753428f9cc..e3ce4e5c87 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -711,10 +711,10 @@ elpaBuild { pname = "crdt"; ename = "crdt"; - version = "0.1.4"; + version = "0.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.1.4.tar"; - sha256 = "1qqfjvkajwhdhz0jhqixdn68l1rl02pn2fmxizzsv0as20v0ay0r"; + url = "https://elpa.gnu.org/packages/crdt-0.2.5.tar"; + sha256 = "092f82kq78c9gih6xri4n3ma5ixw9c8mx12i00c174g0v041r6sp"; }; packageRequires = []; meta = { @@ -756,10 +756,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.15.tar"; - sha256 = "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx"; + url = "https://elpa.gnu.org/packages/csv-mode-1.16.tar"; + sha256 = "1i43b2p31xhrf97xbdi35y550ysp69fasa5gcrhg6iyxw176807p"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -831,10 +831,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.28"; + version = "0.29"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.28.tar"; - sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0"; + url = "https://elpa.gnu.org/packages/debbugs-0.29.tar"; + sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1022,6 +1022,21 @@ license = lib.licenses.free; }; }) {}; + easy-escape = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "easy-escape"; + ename = "easy-escape"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar"; + sha256 = "19blpwka440y6r08hzzaz61gb24jr6a046pai2j1a3jg6x9fr3j5"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/easy-escape.html"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "easy-kill"; @@ -1101,10 +1116,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210822"; + version = "20210925"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210822.tar"; - sha256 = "1682hl8s15snz9vq2r0q7jfpf81gbhlyxp55l2alsmxll4qq72wh"; + url = "https://elpa.gnu.org/packages/eev-20210925.tar"; + sha256 = "0kwmjspmvz9lfm6y0kls9v2l55ccni0gviv9jlzxiwynrc01rz4y"; }; packageRequires = [ emacs ]; meta = { @@ -1224,10 +1239,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.6"; + version = "7.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.6.tar"; - sha256 = "03cp6mr0kxy41dg4ri5ymbzpkw7bd8zg7hx0a2rb4axiss5qmx7i"; + url = "https://elpa.gnu.org/packages/emms-7.7.tar"; + sha256 = "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1405,16 +1420,16 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }: + flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.1.1.tar"; - sha256 = "0lk2v34b59b24j3hsmi8d0v7fgpwcipv7ka9i88cdgjmjjmzgz5q"; + url = "https://elpa.gnu.org/packages/flymake-1.2.1.tar"; + sha256 = "1j4j1mxqvkpdccrm5khykmdpm8z9p0pxvnsw4cz9b76xzfdzy5pz"; }; - packageRequires = [ eldoc emacs ]; + packageRequires = [ eldoc emacs project ]; meta = { homepage = "https://elpa.gnu.org/packages/flymake.html"; license = lib.licenses.free; @@ -1828,10 +1843,10 @@ elpaBuild { pname = "ioccur"; ename = "ioccur"; - version = "2.4"; + version = "2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ioccur-2.4.el"; - sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9"; + url = "https://elpa.gnu.org/packages/ioccur-2.5.tar"; + sha256 = "06a6djln2rry3qnb063yarji3p18hcpp5zrw7q43a45k7qaiaji8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1938,10 +1953,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.1.tar"; - sha256 = "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.2.tar"; + sha256 = "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -2208,10 +2223,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.1"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/map-3.1.tar"; - sha256 = "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx"; + url = "https://elpa.gnu.org/packages/map-3.2.1.tar"; + sha256 = "1vy231m2fm5cgz5nib14ib7ifprajhnbmzf6x4id48h2491m1n24"; }; packageRequires = [ emacs ]; meta = { @@ -2855,10 +2870,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.6.tar"; - sha256 = "0mfwyz9rwnrs0xcd1jmq1ngdhbwygm6hbfhyr14djywxx0b4hpm5"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.7.tar"; + sha256 = "0y5milfjf45bi7gj7brl2lhyla8nsj3dc1a4nfq1wx3zw8arlc50"; }; packageRequires = [ emacs ]; meta = { @@ -2915,10 +2930,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.6.1.tar"; - sha256 = "174fli3swbn67qcs9isv70vwrf6r41mak6dbs98gia89rlb71c8v"; + url = "https://elpa.gnu.org/packages/project-0.7.1.tar"; + sha256 = "1ip8s924n50mmh068p42zi0ylvv79a2pi9sji1c2pqj2q19d7jr6"; }; packageRequires = [ emacs xref ]; meta = { @@ -3411,10 +3426,10 @@ elpaBuild { pname = "seq"; ename = "seq"; - version = "2.22"; + version = "2.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.22.tar"; - sha256 = "0zlqcbabzj8crg36ird2l74dbg5k7w1zf5iwva0h2dyvwyf9grma"; + url = "https://elpa.gnu.org/packages/seq-2.23.tar"; + sha256 = "1lbxnrzq88z8k9dyylg2636pg9vc8bzfprs1hxwp9ah0zkvsn52p"; }; packageRequires = []; meta = { @@ -3426,10 +3441,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-1.0.0.tar"; - sha256 = "05k65r5mgkpbj6f84qscgq4gjbj4wyn7c60b9xjvadw9b55yvfxk"; + url = "https://elpa.gnu.org/packages/setup-1.0.1.tar"; + sha256 = "1n390hiv5a8ij584r24cpbahj2sb12wjh0l3kzhccdxnxskrzgmh"; }; packageRequires = [ emacs ]; meta = { @@ -3576,10 +3591,10 @@ elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/so-long-1.1.1.tar"; - sha256 = "0qgdnkb702mkm886v0zv0hnm5y7zlifgx9ji6xmdsxycpsfkjz1f"; + url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; + sha256 = "053msvy2pyispwg4zzpaczfkl6rvnwfklm4jdsbjhqm0kx4vlcs9"; }; packageRequires = [ emacs ]; meta = { @@ -3786,10 +3801,10 @@ elpaBuild { pname = "taxy"; ename = "taxy"; - version = "0.4"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-0.4.tar"; - sha256 = "1iy1761v2q0i020x8ch4z3vljx2v62pcy5bifxq8gw5qx0115576"; + url = "https://elpa.gnu.org/packages/taxy-0.8.tar"; + sha256 = "00pc6lh35gj8vzcsn17fyazb9jsc4m6nr7cvb32w02isadv8qd3m"; }; packageRequires = [ emacs ]; meta = { @@ -4050,6 +4065,21 @@ license = lib.licenses.free; }; }) {}; + vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vc-got"; + ename = "vc-got"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-got-1.0.tar"; + sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-got.html"; + license = lib.licenses.free; + }; + }) {}; vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vc-hgcmd"; @@ -4116,10 +4146,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2021.4.12.188864585"; + version = "2021.9.23.89128420"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2021.4.12.188864585.tar"; - sha256 = "0np2q0jhf1fbb1nl5nx1q9hw40yg62bhlddp2raqryxbkvsh0nbv"; + url = "https://elpa.gnu.org/packages/verilog-mode-2021.9.23.89128420.tar"; + sha256 = "1sgmkmif44npghz4nnag1w91qrrylq36175cjj87lcdp22s6isgk"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 1804188cdb..be3c69e114 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -45,16 +45,16 @@ license = lib.licenses.free; }; }) {}; - caml = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "caml"; ename = "caml"; - version = "4.8"; + version = "4.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/caml-4.8.tar"; - sha256 = "02wzjdd1ig8ajy65rf87zaysfddjbhyswifwlcs52ly7p84q72wk"; + url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar"; + sha256 = "00ldvz6r10vwwmk6f3az534p0340ywn7knsg2bmvbvh3q51vyl9i"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/caml.html"; license = lib.licenses.free; @@ -841,10 +841,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.3.0.tar"; - sha256 = "1bsyv0dl7c2m3f690g7fij7g4937skxjin456vfrgbzb219pdkcs"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar"; + sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp"; }; packageRequires = [ emacs seq ]; meta = { @@ -946,10 +946,10 @@ elpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "0.2"; + version = "1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-0.2.tar"; - sha256 = "1xhlx2n2sdpcc82cba9r7nbd0gwi7m821p7vk0vnw84dhwy863ic"; + url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar"; + sha256 = "0p2a10wfh1dvmxbjlbj6p241xaldjim2h8vrv9aghvm3ryfixcpb"; }; packageRequires = [ yasnippet ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 3eae4bc52c..1e47b28173 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210906"; + version = "20210920"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210906.tar"; - sha256 = "04aqniwix4w0iap38dsdskndknhw9k6apkmkrc79yfs3c4jcsszq"; + url = "https://orgmode.org/elpa/org-20210920.tar"; + sha256 = "01b44npf0rxq7c4ddygc3n3cv3h7afs41az0nfs67a5x7ag6c1jj"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210906"; + version = "20210920"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210906.tar"; - sha256 = "1v0yy92x8shwp36qfyzmvk8ayz9amkdis967gqacq5jxcyq7mhbn"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210920.tar"; + sha256 = "1m376fnm8hrm83hgx4b0y21lzdrbxjp83bv45plvrjky44qfdwfn"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 2b89f5466d..56acbe9081 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -279,11 +279,11 @@ "repo": "afroisalreadyinu/abl-mode", "unstable": { "version": [ - 20210122, - 1508 + 20210923, + 950 ], - "commit": "fdd83e732b2c870f4ddc0f62b5b261e03bfb212a", - "sha256": "1ny3386n5h3s3lg9235vj17vwsx6n1y99kln6vgqy6kk37q0ig42" + "commit": "fc0eeb780d22aa1aac337f06cc9b479c51600243", + "sha256": "1vv3p6fkp352chrjm7jwc3frifzfral1jyrkx4m8pfq0cyj2g197" } }, { @@ -297,8 +297,8 @@ 20210519, 322 ], - "commit": "fb1fe91ab8ec75dcd52130c38f13759f19d20fe9", - "sha256": "05fqxsk0fk6llc5sgk4gqnpx4xy598nyl2kkjv6rhld2xjaps3q9" + "commit": "85d0512e239f2ec2217da7f316a5aed350041fd9", + "sha256": "0ca375q90fg29c0y47s7ljb5ymwf8wnq6b8v375r06rkqvi7svdx" }, "stable": { "version": [ @@ -1044,8 +1044,8 @@ "auto-complete", "yasnippet" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "933805013e026991d29a7abfb425075d104aa1cf", + "sha256": "0qzb6wlh2hf0kp9n74m2q6hrf4rar62dfxfh8yj1rjx2brpi1qdq" }, "stable": { "version": [ @@ -1070,8 +1070,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210820, - 1000 + 20210909, + 918 ], "deps": [ "dash", @@ -1081,8 +1081,8 @@ "s", "xcscope" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "933805013e026991d29a7abfb425075d104aa1cf", + "sha256": "0qzb6wlh2hf0kp9n74m2q6hrf4rar62dfxfh8yj1rjx2brpi1qdq" }, "stable": { "version": [ @@ -1148,8 +1148,8 @@ "auto-complete", "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -1962,8 +1962,8 @@ "annotation", "eri" ], - "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", - "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" + "commit": "7f58030124fa99dfbf8db376659416f3ad8384de", + "sha256": "0hhc3n6z7p366rywn0zal5lakzpl6m71jxcy0ddd2f358hfzz8ac" }, "stable": { "version": [ @@ -2194,15 +2194,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20210802, - 1950 + 20210916, + 1135 ], "deps": [ "flycheck", "s" ], - "commit": "9e66137860d05e9c8e1d70a087bfd9cb5ca5ec07", - "sha256": "1xnb2n77bj3ynrgrl13pwdjbbka9s6gwdskz99cjdky2m7z1xh0z" + "commit": "217ffe99e3acf7d545827605ec95434e392a9f5f", + "sha256": "09wd1k3hnf1hri8c9m27g8cnqka59szr2anfkkh35s52bynvpxf2" }, "stable": { "version": [ @@ -2338,14 +2338,14 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20210817, - 49 + 20210925, + 414 ], "deps": [ "flycheck" ], - "commit": "59aac2167ca623358ddbb800abe5912194137f74", - "sha256": "17vn4hxkvd1nkn7gjjg867rjd5r0qsb7qlf2fh75pikk806x5sa8" + "commit": "955c616be9725c819fa6ef27cebe537c2e51bf56", + "sha256": "1qzqadliwlv33n6p5gma25yck1d83jjcpxriifbd8zg0rp3svwmm" }, "stable": { "version": [ @@ -2542,14 +2542,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20210727, - 808 + 20210927, + 1407 ], "deps": [ "all-the-icons" ], - "commit": "165f1702f6f49f4fc2fb15534ede141102657aef", - "sha256": "0k985lg08dml5cpw9piqhwrh27bbxwqgsy4zcj4f40niaallk6fy" + "commit": "f689582a413ba5bb722067ea470829819e1f1131", + "sha256": "1r4v86jgp656cs1mxxsb30i1kwka29nzfri151bjrnbyy0z99qrg" }, "stable": { "version": [ @@ -2604,15 +2604,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210823, - 1544 + 20210927, + 1411 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "09b887c01aeb33d715a1f8269f45c38594614d93", - "sha256": "0l6brqdqqgcijd2jfycy3i2n39bwcq7m12km8hg3kx4bv0zmn00g" + "commit": "8c0cd543c8d79cf223216b3f44ac3a4b0695c484", + "sha256": "0yhg39gg5w3gjhwfgz6v33ld0qyjj4v627ka9az97biz2xvvvrl1" }, "stable": { "version": [ @@ -2678,8 +2678,8 @@ 20200723, 1037 ], - "commit": "4aba676d49b0705cb4431b7e7c733ef8eac7d5aa", - "sha256": "1z5b5ivn81hmvndd7ari07kj1bsp9ziyxcrgf7xq21g1dfsbq8cs" + "commit": "fb8550cb690b0ec954968afc7e8e953fd6859cdb", + "sha256": "1flw5msh1sda3ymkkg8xcgixpa5jgm2i1ligna5h501xbybnk1iz" }, "stable": { "version": [ @@ -3204,11 +3204,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210819, - 1443 + 20210923, + 1338 ], - "commit": "4ae1d4f2a6b6d7e598285c6a43ae1785d44147e5", - "sha256": "0i1ldw5iz61p3sp8anihf3a16z56jqgznrwphgf0b1kl0sdsq6lq" + "commit": "c737b516b8058cbc0c6f2bf8f3431339be854217", + "sha256": "0v00n5gwkzg428rqrjbapx9vca4m7zaf33fz4qm7ah7plha6b0k2" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", - "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" + "commit": "7f58030124fa99dfbf8db376659416f3ad8384de", + "sha256": "0hhc3n6z7p366rywn0zal5lakzpl6m71jxcy0ddd2f358hfzz8ac" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20210828, - 1913 + 20210928, + 1628 ], - "commit": "f1d4bef95c3be736c15f0d9b41037ba02933acf1", - "sha256": "1a6s7zcz176845fp38n1ilpqkgzzpq3miwg7cpymrcdnp3kxvc0n" + "commit": "f7a6e278e11bc725b6e4d56c5cc166790fec4740", + "sha256": "1lvgd312kh58dhfr64ylzraa1g95lbis43sdi4vqz8b4ms0qkw2i" }, "stable": { "version": [ @@ -3889,14 +3889,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20210527, - 1341 + 20210907, + 1455 ], "deps": [ "spinner" ], - "commit": "d7c87812c205bc01c8c8a7ab02f201b6138c7e57", - "sha256": "08hjyxz187hc07d0g8s7z7d3pa2z9f8lwdzramki95gm27q08n4y" + "commit": "6d2d1122924370ffa17ce337e3b02ecab79d861b", + "sha256": "039h4hkl7n9ypdwi8zqs10fcbvwh5c2qmlz86x66xlp0wamg827r" } }, { @@ -4220,8 +4220,8 @@ 20201026, 339 ], - "commit": "375488bed4f279cf56a5c60ff236b320d3bfa169", - "sha256": "1kms5dkxz5ppf2iw95p4mvnkssp2iwp483mn4x0xvv53lglnjlxw" + "commit": "781e07c6972591e4147edf81f6314f297cc4c0df", + "sha256": "0gzhf8004fz0a3zi9nihdgyhya01zihhcqfzr2wdp8a9rczlavrb" }, "stable": { "version": [ @@ -4244,8 +4244,8 @@ 20210731, 609 ], - "commit": "e586473d49acbb16c092017e3e65bf8798c397dc", - "sha256": "0xpbxzv5rc3260bl3d54n7r3r14r1pkvwz48p2nl15hr2fzxaass" + "commit": "69780e11cfccbd05516b7c2724e02242e3d188d7", + "sha256": "0vp4hm4xgi7kq97b4gyzafs7sbyd9mjrzwnv8xwacib71jn74vnr" }, "stable": { "version": [ @@ -4442,6 +4442,24 @@ "sha256": "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz" } }, + { + "ename": "audacious", + "commit": "cae5fea61b0007626ec1a52783b58165e3bebd9f", + "sha256": "13gzvrwm48jxxr0mjammz64blsdb95lhv2hnwhwq2j5bzfy2bjy1", + "fetcher": "github", + "repo": "shishimaru/audacious.el", + "unstable": { + "version": [ + 20210917, + 51 + ], + "deps": [ + "helm" + ], + "commit": "65c37f12a5c774a0ae434beee27ff7737006dd2f", + "sha256": "1pj3ryi1crnfvq3m8wyysb6pyvsp0x2wrvddlnpj031qk7xxdd6h" + } + }, { "ename": "audio-notes-mode", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", @@ -4527,8 +4545,8 @@ "keytar", "s" ], - "commit": "ab6f89a412ae47d257352b26f9667c3c062a7328", - "sha256": "1ha0v6np9qwg7lqcj0srq0qljs6yx2rgdj0dzwk74mqlk1xb5lzv" + "commit": "30d8d0dac138eae9423c90d59f5bce2957c0de77", + "sha256": "17jaaxj0nk5iylgcqlwvj9xb9cjng9gba1j131vn4b8hvkm2ccb5" }, "stable": { "version": [ @@ -4998,8 +5016,8 @@ "deps": [ "ht" ], - "commit": "3425ee2eac724d1d64170a8b9d23afc18f8951a9", - "sha256": "08m6wyfvy6i99q25nk6b7d1bvlfalvdlafh7ajglj6fnpdjmnk0h" + "commit": "9fb8243a1357afc118f67d3b7d5a6c2a441260ba", + "sha256": "0xzv0iim8ngds4c87za0kap0ffc5pymfkya9nn12y5ly30p05w3n" }, "stable": { "version": [ @@ -5148,8 +5166,8 @@ 20210805, 1344 ], - "commit": "0967cc8e5aeaf7f6a36793e2d36717fd125647a8", - "sha256": "0y1hwwk2rijfpjkagn9c3rfvf350d8nas9g3lqgc7baq9jragizi" + "commit": "0f138b6e64d79d16ccdd0b74995d7e30aff9555a", + "sha256": "0a2inh57vipf24ahjp00lbb31v26z8gj1931pb5rxz6nry9app3n" }, "stable": { "version": [ @@ -5353,11 +5371,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20210720, - 1810 + 20210917, + 1556 ], - "commit": "b2c8d431f89788d1e01d42c55e65612e6fc11b44", - "sha256": "05378j4pyxb9s8wpffmmrcn09inxjipiw1sy8jqgc5cslpd1jl3g" + "commit": "709dc5b3bf5963f527006cbd504e7d6d558562db", + "sha256": "0w9rm66d6dvb8qmpsfwxhmjgcpwmn3jkgsiq91qhphwqvmgl3vvy" } }, { @@ -5561,8 +5579,8 @@ "avy", "embark" ], - "commit": "d21277a638827623ab84e9e6341312a2da5062ab", - "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" + "commit": "1492aefc00abc3355bf04c2ed05f40ff2f523fcf", + "sha256": "1yira5lg4kgf94pd9w96k9vlj9lfcs5sz97li45wpiy1l6n0430d" }, "stable": { "version": [ @@ -6791,8 +6809,8 @@ 20210715, 1004 ], - "commit": "eb389204f9dadd8a040a78e79a17732daca7e253", - "sha256": "1m3v51hnhrfxpqqalkx26d1x6v109w83w7h5mwfa64hmgpax9r7i" + "commit": "319c24d9aa46a66d43cf689134c7e1703288d251", + "sha256": "033kaj3pbfggm55dgb9xagfdzzmrybsmz7kr358az7233cl9qasm" }, "stable": { "version": [ @@ -7035,15 +7053,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210903, - 1125 + 20210926, + 147 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "3af0fd5f4255e8c6ffd104cdfa6ab56f522fecc6", - "sha256": "0x7q3rp92w2698pllnjbn1x7bai8jmnrk72f02i4wjkdm1jwb2jk" + "commit": "7f0781ec446b5ca653e10cabe1126c909a7d8ecc", + "sha256": "0fj6y0fbzd0fc728bk4nkhkaff6hc8fxjv38jb9ry5xb3h2rcqla" }, "stable": { "version": [ @@ -7076,8 +7094,8 @@ "parsebib", "s" ], - "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", - "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" + "commit": "bb47f355b0da8518aa3fb516019120c14c8747c9", + "sha256": "10y6k1jch43jykd8g8xi10k8wq98x2w2xap64smrhxvgp53y2765" }, "stable": { "version": [ @@ -7929,16 +7947,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210831, - 1634 + 20210921, + 1154 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "05ccaad63d01688b86b7e44955815f97fc011ec1", - "sha256": "03fy4kwy6vka4w2hmfb6h68hxcm4gslknpdlxq4s8szww7a19cc8" + "commit": "ee88a9bbb3d39e2fa216984b6349a122a80e3c99", + "sha256": "0y28i8zqy6i93bajqldfwqwvlln75s81aadqq04sy6krc5nlfldy" }, "stable": { "version": [ @@ -7969,8 +7987,8 @@ "epkg", "magit" ], - "commit": "0ff7d7e469d75c26caed8d50ca80299cc4a77b88", - "sha256": "0jsk7dqminrx5l4npxv6ssyll07287ffzbpsim8d76phv279hdc9" + "commit": "541f384a08737294e90d5a526ff6a06a647aab16", + "sha256": "182zlkss87bari6f5mx8lzgvsk5hzgbv5j029h8i5lc23hkck5r5" }, "stable": { "version": [ @@ -8514,27 +8532,27 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20201221, - 122 + 20210914, + 1251 ], "deps": [ "choice-program", "dash" ], - "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", - "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" + "commit": "b903e97e47b463e08468011dc74689d61b2e52ce", + "sha256": "0fd1zzhvp2a7dvzm5vcywxx3iigcdz8vp7fw505mwc7hhbxv3gv0" }, "stable": { "version": [ - 0, - 12 + 1, + 0 ], "deps": [ "choice-program", "dash" ], - "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", - "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" + "commit": "b903e97e47b463e08468011dc74689d61b2e52ce", + "sha256": "0fd1zzhvp2a7dvzm5vcywxx3iigcdz8vp7fw505mwc7hhbxv3gv0" } }, { @@ -8569,20 +8587,21 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210904, - 211 + 20210927, + 1513 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "7bc51345993ee83dc721a1e00cd0b998782b16da", - "sha256": "1ybdpz8cqfklia0m23c4l0dk6ng8jadxdji7z4ms8nkb35y2ykbn" + "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", + "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" }, "stable": { "version": [ 0, + 3, 2 ], "deps": [ @@ -8590,8 +8609,8 @@ "ht", "s" ], - "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", - "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", + "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" } }, { @@ -8677,8 +8696,8 @@ 20200924, 345 ], - "commit": "a14568210e212a4dfb93898218c4df58ff204089", - "sha256": "0b7lc14sn88r3wf8yqnx41wr704fm8kd6nxbd4874jaw01yp8x63" + "commit": "db7ab16c98307855e7e258f215703a54911be22c", + "sha256": "05g1k43ilkfx9mxqmikkd8v6yv89lri5m4mr0prpq4yqb3xv0bx3" }, "stable": { "version": [ @@ -8698,8 +8717,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20210722, - 1703 + 20210907, + 1145 ], "deps": [ "dash", @@ -8708,8 +8727,8 @@ "map", "pretty-hydra" ], - "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9", - "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn" + "commit": "a68e0eb2719c67ab8a3ad56c4036364061d06004", + "sha256": "155g4p2yw88cpc8ydfzybc4r6ab2qwcmzdwkrrhnra4psimahjq6" }, "stable": { "version": [ @@ -9044,28 +9063,28 @@ "repo": "AshtonKem/Butler", "unstable": { "version": [ - 20150812, - 8 + 20210928, + 230 ], "deps": [ "deferred", "json" ], - "commit": "8ceb35737107572455cca9a61ff46b3ff78f1016", - "sha256": "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg" + "commit": "10943ccdf2030187b2f7bd97337d78acb7fd31c9", + "sha256": "028c5mqhxpq007s7c6rha47zzyj6nsf49mnh99b0mfg9d95s4057" }, "stable": { "version": [ 0, 2, - 4 + 6 ], "deps": [ "deferred", "json" ], - "commit": "0e91e0f01ac9c09422f076a096ee567ee138e7a4", - "sha256": "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj" + "commit": "454cb9d3980b9ac555f3f77e4e48056de07f051b", + "sha256": "1wsk5isza8xqr84w6haal95ssifz6j2lrr5phbsdc90jb9hicbff" } }, { @@ -9696,20 +9715,19 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20210825, - 649 + 20210907, + 2124 ], - "commit": "3b6913ee6af31139bdee2c236ce2b3a10eabc74b", - "sha256": "0gsbhwymr2c3fy6mzrvk70q874r9yxf46vlkyljwp1srw095xi7x" + "commit": "2905a436e956c5bba16c4633a6e4c4fceefa6535", + "sha256": "0i1p4w9zkbvpcplhvkk8n8ymcp8i7cxn2j6can70rlwwbcnyvzjf" }, "stable": { "version": [ 4, - 7, - 1 + 9 ], - "commit": "9803cf37ac52bbfa5130fde0f228dc51c4590c2d", - "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp" + "commit": "2905a436e956c5bba16c4633a6e4c4fceefa6535", + "sha256": "0i1p4w9zkbvpcplhvkk8n8ymcp8i7cxn2j6can70rlwwbcnyvzjf" } }, { @@ -9757,17 +9775,17 @@ 20210707, 2310 ], - "commit": "7cce94fc97d042134e5c7f96a3b9a509340fae1f", - "sha256": "0rq26qic7w8gninvg7jdkxpn8jv0ih215bijai2vsd66ca1ic6w1" + "commit": "c8189ec3c27dacbd4a3288e682473010e377f593", + "sha256": "0753krbh42f625byzcl87lx3a7zjq5zzfrha5ihqyg96lny2jw9r" }, "stable": { "version": [ 0, 9, - 0 + 1 ], - "commit": "7f554a89784d3455970fe1edfb9f0044ac570aeb", - "sha256": "038i40apywn8sg95kwld4mg9p9m08izcw5xj7mwkmshycmqw65na" + "commit": "b49431c48d40490ef979247d308af63345376cee", + "sha256": "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5" } }, { @@ -9917,8 +9935,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210903, - 1216 + 20210911, + 1856 ], "deps": [ "ansi", @@ -9929,8 +9947,8 @@ "s", "shut-up" ], - "commit": "7b637efa35148dca5e6de10d0beba72168762f1c", - "sha256": "0sv08984k5lpcb56hs09pjwi54nzq232a6gwzikqxs2mylqdaic5" + "commit": "72464c1a0793fa066f3ecaf16dbb6ae2e3895534", + "sha256": "1k32xx8bxbqsmin2lwd5x7qzvbxhkaj1nd0bw63y6y3pzrmbnb8d" }, "stable": { "version": [ @@ -10446,8 +10464,8 @@ 20171115, 2108 ], - "commit": "8c6b2b326ce7b454b31450d093776b9d0bfbcb19", - "sha256": "1pc5szlb06y27ivwgk76im72x0gq8gcn1p14gw0r3qx9krnj1vla" + "commit": "fe08fd5eb8b04d4298481f2a039fdcd6b1c52d85", + "sha256": "0mp4425i27z84cwn9j8rip255ss5hhmkz6kydw6rpmzjimvz2nvw" }, "stable": { "version": [ @@ -11237,8 +11255,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210902, - 1412 + 20210927, + 641 ], "deps": [ "clojure-mode", @@ -11249,8 +11267,8 @@ "sesman", "spinner" ], - "commit": "76dea32c7757949a708d27d1f8707782edad5650", - "sha256": "080kcbqiiikna4r6c9a1q0hnrlkpmzz4xixgrp54ld7nzp59ls48" + "commit": "cb41ed315e73988a3ec7e937ef63bac4821b7f2f", + "sha256": "0g6x6ba1v8fq539kfy3plnfk3ns72nvmiz1qixwfa88bphg88rhm" }, "stable": { "version": [ @@ -11519,8 +11537,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210904, - 1235 + 20210910, + 1836 ], "deps": [ "dash", @@ -11531,8 +11549,8 @@ "s", "string-inflection" ], - "commit": "7908e48a82dc615cc643d03e63107dcbf499caf8", - "sha256": "05900z5j1px6rnm1xby5krhz1j6rb4fqfhdzra31zs3zj063bq8j" + "commit": "91d7630de1ec61ff5d5e62c27d820207ec5bb1c6", + "sha256": "09jyhlkjbwbhmlvyv5gv0mnjfsvmj5j44r8bs5sp0ldnsrds0srd" }, "stable": { "version": [ @@ -11598,20 +11616,19 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210902, - 751 + 20210927, + 1344 ], - "commit": "09b618f73c47abebcd26c8fc8484a5816c36ab6f", - "sha256": "1ib748is5983fzgjpbdnki9x3s232gdw58af93jhw34kmakrlgac" + "commit": "76a22f014df9e0fe1c0932aefd7a76e2b7197c7d", + "sha256": "1w0xcdsn6kf2xgjc5cqmjrp3v2cxz7zaj0mvfj9mn1pc66h2b1vr" }, "stable": { "version": [ 0, - 1, - 1 + 2 ], - "commit": "b74147e2a166e27c7c6074ffeaa5f273d4f938bf", - "sha256": "04vpcn8x188kl43pra3y57n1kky1fm96q1ym8f8kq93qnbjz0b9x" + "commit": "32b79a94db62194d96e73064ab804b7efa920795", + "sha256": "10lryjy3771hs8lavh7818a5ia9ia1qwrhzfmgr5sb4c0gn36wcg" } }, { @@ -12364,26 +12381,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210616, - 1951 + 20210927, + 2245 ], "deps": [ "emacsql-sqlite" ], - "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", - "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" + "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", + "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" }, "stable": { "version": [ 1, - 0, - 6 + 2, + 0 ], "deps": [ "emacsql-sqlite" ], - "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", - "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" + "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", + "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" } }, { @@ -12547,17 +12564,17 @@ 20210104, 1831 ], - "commit": "86ee38d75678d68bb1a79b9fa443b42723b09f23", - "sha256": "1lqkaar17d4jvabhfwir6s47a618a3bhh18m3xvv08ryjw0nc3d2" + "commit": "700f76299c40ba2c17841b69e480d13055743a0c", + "sha256": "1zabnvh3b6hvhx2nlid6lc6pl4cszlxvibpk87h7p936fa6s0z6z" }, "stable": { "version": [ 3, 21, - 2 + 3 ], - "commit": "31c5700d4322ecfa169db2fccf385d6eced4e737", - "sha256": "0vjrv831qjc0fkayd096nmb0l0q3aphbd8gp5c6xk1hckpgzgwl0" + "commit": "7612abd52f192a13848a4d74191633a008892449", + "sha256": "1sg0vishbwhyxvw9p8vaqbfyaqaybv4bdkb32448irgsi382jp7w" } }, { @@ -12652,8 +12669,8 @@ 20180304, 1155 ], - "commit": "634ace275697e188746ca22a30ff94380ec756be", - "sha256": "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l" + "commit": "88ef936373a5493183d49ec69ca541bcc749a109", + "sha256": "0mm9lj5mvidb69zq6a9daibdm4l6y4vw389hr5052qnj0qljb757" } }, { @@ -12709,11 +12726,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210902, - 740 + 20210925, + 1531 ], - "commit": "4e973e01220ad7a3e2d0d50a9c5192a9385e0ede", - "sha256": "0vqradjcflvajd5i069vlkynd6kyyfvmip39xr5bhrb4my07z1wb" + "commit": "031f726941994d4a98649631eceeebb44b515b1b", + "sha256": "1rdrzrflnvskv41jg92zl5l99m3rzh1a7gwm325bmmi5fvsgsndd" } }, { @@ -13054,11 +13071,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20210528, - 2344 + 20210907, + 1208 ], - "commit": "c1a1091e39ecd69822e1494d8b6f0bbcb21eb9b1", - "sha256": "01afmfisii9cyri198s2g9rivkisfn6d3g40nyi0sgsx14jbyddz" + "commit": "e2857533627f3eda3e9e21de7f2a99b8634c1c15", + "sha256": "0hi1wg9v5ax71q14jk6mpp3mpfx2ma490l0kxdq2wkajkmh4apr1" }, "stable": { "version": [ @@ -13163,8 +13180,8 @@ "deps": [ "s" ], - "commit": "e91006ba4a77b8ea8c4fe4085ba5676c97cf0315", - "sha256": "0icjcmfmwdwas59425baf2s3zw2iblidx6v3jy6k53y1ac5qn7iy" + "commit": "19bec333477f36e14acc9d00813e4bcc6201692f", + "sha256": "1wb7kig728dbggd2q24kgy6381gg2zpqdr9az5q3yg0326zns62y" }, "stable": { "version": [ @@ -13498,11 +13515,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210826, - 2148 + 20210926, + 2358 ], - "commit": "faf897296faed0b3342e1c325fc05727029ce7fe", - "sha256": "11qxc7gq97z9k1j63zrf4fh485qnapcz4qzjzyffwk8svl48gh0g" + "commit": "5c84da83e7b8289170d811ac164e10a4d548962c", + "sha256": "0glzpbs1gxkb27fhvyax2vbvspwzwi67a5iv0fchh3kdz3hvk8na" }, "stable": { "version": [ @@ -13957,8 +13974,8 @@ "emojify", "ht" ], - "commit": "cebfff07a21f885f87a692ec4d5e7f84468c6565", - "sha256": "1ishjn1biv9irm3ih96b0larsz6jq81lxd7jjkh4nqjs1207gcij" + "commit": "5cc4bd886c1fc373eb1642ab0f0ba33de4f5d3d2", + "sha256": "0d383561fb8nfgqns3j9s0sjwgqchwpil0gs4n4vw31yaphyy83l" }, "stable": { "version": [ @@ -14053,16 +14070,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210716, - 926 + 20210924, + 1159 ], "deps": [ "company", "ht", "s" ], - "commit": "b4fd1c8d128ae345176f713dad2c04944a9cf27c", - "sha256": "1fhkc49xp4yfqry6a0w7bsz80c7v5kc60jzd3ran0yjr9q9yzx8i" + "commit": "371d32ae7b488f76905fe98f3063ae30a72010fd", + "sha256": "1r3l2z6lagfj5piibph3n9lsb8fl3w5l8q6qg9z4fqfqrl9xclxi" }, "stable": { "version": [ @@ -14314,14 +14331,14 @@ "repo": "debanjum/company-ledger", "unstable": { "version": [ - 20200726, - 1825 + 20210910, + 250 ], "deps": [ "company" ], - "commit": "9fe9e3b809d6d2bc13c601953f696f43b09ea296", - "sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8" + "commit": "c6911b7e39b29c0d5f2541392ff485b0f53fd366", + "sha256": "08g4f8w9lhfypy4m3vcfg8d8gqn7w2g8qjksl7bzcnwg2d0yqld8" } }, { @@ -14601,8 +14618,8 @@ "cl-lib", "company" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "933805013e026991d29a7abfb425075d104aa1cf", + "sha256": "0qzb6wlh2hf0kp9n74m2q6hrf4rar62dfxfh8yj1rjx2brpi1qdq" }, "stable": { "version": [ @@ -14856,8 +14873,8 @@ "company-quickhelp", "popup" ], - "commit": "2e82273e206f78f015e67f799f51e3f3458d6d94", - "sha256": "0miylw8lhs4jgfa47mis6k68jm69jwbmpgms0dl9rnjgpmyvr133" + "commit": "40c2fc569bfc0613b8fac4b9d6242f6682f50827", + "sha256": "0kd2f1qhxmg1x9wlz1gqi5m772sk865csry6zm6xznlzbggc7h5a" }, "stable": { "version": [ @@ -14963,8 +14980,8 @@ "company", "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -15411,14 +15428,14 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20210513, - 409 + 20210916, + 1316 ], "deps": [ "request" ], - "commit": "70cae42f0d624b6ce03b55c35ba9a6c2318a827d", - "sha256": "0k2249iyjrgghsp6yy7qrlc7n7m7b5vp44mda40d3058jv6ryxgi" + "commit": "9ea0cc78ac40f667dfaf9277758a22b9058ca434", + "sha256": "1b6cj5scc5n78kmdz9ch574ln91v9hj4svk6455crs8rpqgs7k47" }, "stable": { "version": [ @@ -15728,11 +15745,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210905, - 1657 + 20210919, + 1618 ], - "commit": "c89fd0a1299f8bd6a123427c6ce48239702dfe84", - "sha256": "0425syvnw592kwmci87lwqvgxf9bvl8v6cmzdf4g3kkhva2y0sym" + "commit": "6f07e1bdb2023871855b44f44153ad87af15a9ee", + "sha256": "07galc5zsrxa09s2q4wq11rp2qhpi76k1v65442abdsa0ljfvsrg" }, "stable": { "version": [ @@ -15751,15 +15768,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20210820, - 339 + 20210917, + 435 ], "deps": [ "consult", "project" ], - "commit": "e87362a89c91b33fa683f58ee05947ae4565fda3", - "sha256": "11zrwchwdzbrq97dvi2kk8ff1mic3nx8pl103w3i4c8h2w6a51nx" + "commit": "d3bb96abb5ccca29f4b04c6f623818386167a2b2", + "sha256": "1pqzc45g5db69nx5vq3qm48i47f3gjrdkq81pnh705vh4q7qgpky" } }, { @@ -15865,29 +15882,29 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20210630, - 1151 + 20210928, + 1113 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "e8a50f2c94f40c86934ca2eaff007f9c00586272", - "sha256": "1xkkybfdzr1xqhvc2bamp253icm75dz7bkdz6bv8xj8688p8vrm9" + "commit": "8ed43c6eaaf3ff8963861fa3234e81683be91e45", + "sha256": "03llb6dwwbl1p085kalgzxr480hzg4xppcw482diw515g8jp7zyr" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "e4a0b9403477fe90741ac84d0d2ac3729122b363", - "sha256": "00rrc17axn7pmvzy1q95nf0w036cx7fhxwhimamh9cmijkdsf5w5" + "commit": "eb5dae1f98dc1d4bdbdd374657e1a01b6cd2f066", + "sha256": "10x0mxhcz5mmgmw3y8xqcd5sg8m06h510w575dya1dvcf3aj9fzw" } }, { @@ -15898,27 +15915,27 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210815, - 1919 + 20210909, + 101 ], "deps": [ "consult", "notmuch" ], - "commit": "5e5f42faaae3e0d372f103b9de276d1f7f1c18e0", - "sha256": "1q8ynrrii92x0wv6hm8zcy0nydshg6jqibm7a85vhbnanh161qx1" + "commit": "015642e88a48b1e3b4791a5badd8dbdfe6a6037e", + "sha256": "1nbyd21n3dfdikr2dv7bcb2rg2sar22dmirrlkd5bz0qniaqim4n" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "consult", "notmuch" ], - "commit": "a5133b9e1f19b6d51e51dd5c5e3a4f236ca29b57", - "sha256": "0x2lz2df1rjq3vdxvqqnxqxh257hq5iyx1w3yc85w7lmnb59gbvy" + "commit": "f978408fb4f7bae1b2d2913d71d7a816c18b78b6", + "sha256": "04ha4mysxvfz6yzbkgrl1mcwic1lwr1xx6gdy5rl6hn1wwnwam4p" } }, { @@ -16271,15 +16288,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210819, - 1455 + 20210928, + 949 ], "deps": [ "ivy", "swiper" ], - "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", - "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" + "commit": "5f49149073be755212b3e32853eeb3f4d0f972e6", + "sha256": "0255rzzmqg6cq7qcaiffzn52yqfkzg2ibr8z9kljzgfzbarn337h" }, "stable": { "version": [ @@ -16447,8 +16464,8 @@ "ht", "s" ], - "commit": "413047aedb20e85555785123dbd54eb8e91f6014", - "sha256": "02ni7lmm1mpxwha39cnbqjwzgdff55af1d9b05dkl0n01q9vglfg" + "commit": "378803ac0040c04762ff001ab1aca7d4325ecf22", + "sha256": "121cgrlwp7sigs26hvavgnbgmbz0fhv2cpagx73gm1vrnr306s45" }, "stable": { "version": [ @@ -16473,14 +16490,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210725, - 821 + 20210929, + 836 ], "deps": [ "counsel" ], - "commit": "84fff26b0f207131c2e6669bd7f510eac43973aa", - "sha256": "07445bbr68q1pnwpj5bwqmml9ky1gq67g24zswv8fylnzjkhy9wc" + "commit": "eb6a1319f6dccc252e11ed9c79c064b970c52274", + "sha256": "15nl0b2dhjyd7icxqmwplwfjxjvx63w5iig64hhriqy6klipwlfv" }, "stable": { "version": [ @@ -17451,8 +17468,8 @@ 20210826, 421 ], - "commit": "fe8a68e9849fc7617e0c870cacd6599b8a797638", - "sha256": "1pry7p51qc0q4jpcsi60nxb9q7pkkc2gh1340mvbk62jj5f4qbbj" + "commit": "4a5114abe76b1e3859fcfe0f5b35b53f57343d47", + "sha256": "0a50llp0n2jcr8zgkx7nn925xhwh3k1iiz67662xplfl5gmww4g1" }, "stable": { "version": [ @@ -17697,11 +17714,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210724, - 126 + 20210912, + 1913 ], - "commit": "b78e129a8a4fabfebba8cdd5ef51278d0d57e0f4", - "sha256": "0j3rsax644x8753hginn0cd8sm86wf521p1rjqspdhgpi4dv0cdq" + "commit": "b8a7899faf9d37f1990dfefd9c6b2998c40d7fcc", + "sha256": "0y9vqkwf8v6135s4p6y7whqf3dpsj47alby4jq4jhvg28dxbjbhr" }, "stable": { "version": [ @@ -18144,8 +18161,8 @@ 20190111, 2150 ], - "commit": "2b52df4d75d185f7ac8b4230529e7fc2428a3605", - "sha256": "0ykzj10pcn3yfwxl8ydl2vj6mvk5gbwzs2zzagsn3zv29y7wqj0a" + "commit": "cce3693f14060433fcf52e2ba034c1b77a26c9e5", + "sha256": "1m8ib0i216w7rbqlhk0fww3l88bw88z1vpglsab8yh8z4mz31908" }, "stable": { "version": [ @@ -18296,11 +18313,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20210429, - 657 + 20210921, + 1255 ], - "commit": "e4d1f2c76245fe9d0d07133a841e789d139df28d", - "sha256": "1ii3cgf4hlclwaraisxksv98mmhajx517i60p1cgd7vapznn2b6v" + "commit": "ab7ed176c523a21a194a202096b0efe10cc523b1", + "sha256": "0gz4hymbfb40zw23m2y8qnhz6zyz0mdi8znl4ws8mh0mak4yapx4" } }, { @@ -18352,8 +18369,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210904, - 2033 + 20210928, + 1349 ], "deps": [ "bui", @@ -18365,8 +18382,8 @@ "posframe", "s" ], - "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", - "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" + "commit": "85e52751eaffbe7f0e695ac615299c4026525a4a", + "sha256": "06kp9pn4wg1c8vlnkf75lg8nvw68v1qjlg93hg04gijqravdq68j" }, "stable": { "version": [ @@ -18616,8 +18633,8 @@ 20210826, 1149 ], - "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", - "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" + "commit": "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718", + "sha256": "14fwib33l32fmmjr03zyk9xynblrkggb1b47x2ihh6jfxq8i9qm1" }, "stable": { "version": [ @@ -18692,8 +18709,8 @@ "deps": [ "dash" ], - "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", - "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" + "commit": "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718", + "sha256": "14fwib33l32fmmjr03zyk9xynblrkggb1b47x2ihh6jfxq8i9qm1" }, "stable": { "version": [ @@ -18716,11 +18733,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210827, - 239 + 20210928, + 656 ], - "commit": "f7287f026103a44cf290fe737b6b9d841eddcaca", - "sha256": "184pa120is5jk71174bna61yii2pmdkj1m6r7v16pzvqg5zqbsgj" + "commit": "66bf051f9df70070315c920daaf7ad44a86a0386", + "sha256": "12h6prpci7nlzaplkpd7sl6012hs3wcrplbqb1k5rxs6ailnclx3" }, "stable": { "version": [ @@ -18762,16 +18779,16 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20210108, - 1857 + 20210927, + 1042 ], "deps": [ "dashboard", "f", "s" ], - "commit": "947c8c99e9abb38852d895f8792258783e3c4e1d", - "sha256": "1iwm1kzjbvfamdzz79bkyq848z3wgr3cf2692dmfah58gy5wkb0z" + "commit": "2639eb0f20a7b62be4106f555d00862c161bebf0", + "sha256": "149a0lhdfqm8rv78yi5v3a6ndrf44m2zv4f3mphzalmq4wslvmww" }, "stable": { "version": [ @@ -19237,6 +19254,30 @@ "sha256": "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj" } }, + { + "ename": "declutter", + "commit": "7cabeba75d08f570743c192e50cc4ee89fc18b48", + "sha256": "0vnfa61fxmwfqxs1q9k3jlwjlfy4q952msiqd12gi9dahkhv37wf", + "fetcher": "github", + "repo": "sanel/declutter", + "unstable": { + "version": [ + 20210904, + 2039 + ], + "commit": "e08195e2f5691ad0ec9090d7edf550608e13fcfa", + "sha256": "1hjdjd0nmknv8yppda89hsgkyvk52zcwz92cdxsng87rlp9hwddv" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "426760126ab2d8300059cc9d2d808b7eb4ce9c7c", + "sha256": "08wbil5ynpsjw8b8ld666zh9l2zc7cczwjakqv2nrpcb89hk12qw" + } + }, { "ename": "dedicated", "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", @@ -19357,8 +19398,8 @@ "s", "wiki-summary" ], - "commit": "1861c57e67315bcb1ff88f37184cf7e2d6167642", - "sha256": "104dfryn6ql2a4l7nd9x0984qpyxhn6kv0432h1lha5adb8g1h10" + "commit": "57a9c601e732c85b0b45550434b04d996c1b92a3", + "sha256": "14bm85a5im3m910gsmp220brqrlm4190zl9qbvqmp180c63j43yc" }, "stable": { "version": [ @@ -19720,11 +19761,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210904, - 1759 + 20210919, + 1042 ], - "commit": "df9cec79ed6e7147a71fcad84835b928375047a7", - "sha256": "08zl01vchv6vdixqk021iwjvfbk125vh2ww59mr36cs8ibd887va" + "commit": "a3177fde9ed48c1b1bc0a17f0e08338dc3f67e37", + "sha256": "0x90kb5kmjdp8rhk92s6nq7mxxvw7yfc2xppp4yiiwh57h62kkcx" } }, { @@ -19937,11 +19978,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20201006, - 1436 + 20210921, + 603 ], - "commit": "3fcf861f1f8b91d97000bda32345bc92df8e2d37", - "sha256": "0x0awnasdjkmmrm11dqs4spkx2j3prkiqrmf5w3lxp2v28i4m2qk" + "commit": "63951d8236163d86d5261b35d6c9a3f3f280e876", + "sha256": "1l1smrb2xmnz4cyimyvhq9hl406w364gkvqsk32b1q4jcvqhmdz4" } }, { @@ -19952,14 +19993,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210831, - 118 + 20210928, + 139 ], "deps": [ "cl-lib" ], - "commit": "a682de60187763128d2d0a85f1d168d89877691f", - "sha256": "1bcswy1mkpp0ly36l65amq4f8gyarm2gmzv8v8h6s96vg433nwkb" + "commit": "6b7ca8c310ec1c1a83990c8d1c013c68f61d9d51", + "sha256": "1iigna8p76v57hahw3qcsnkd86gqspfb738c74vj5chb1wgb48dw" }, "stable": { "version": [ @@ -20265,8 +20306,8 @@ 20210715, 1026 ], - "commit": "fcc43f38431d4b16b2fd8d15e799488a7fb60966", - "sha256": "1r5a98viw7j2nfmhgf5v9whkya3h9s392drz764a9ivj2znc0qg5" + "commit": "2cb177f70e5dc2e9df45844d565280b79cfc68a5", + "sha256": "13km90jhjpmlxcw8gpmlzivy8mvqys418n9ca6sr08cj9sbnjsij" }, "stable": { "version": [ @@ -21961,8 +22002,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210829, - 911 + 20210914, + 1348 ], "deps": [ "dash", @@ -21972,25 +22013,25 @@ "tablist", "transient" ], - "commit": "f050d64c81575429c3c5562a1c8efddfb1ac22b4", - "sha256": "1izy99and0jm7dmmgv9zjy4586xzi15dpa789fl2yw6xc7609khy" + "commit": "4fc69969b11687896b6c71b099de5d4c12c1c685", + "sha256": "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173" }, "stable": { "version": [ 1, - 3, + 4, 0 ], "deps": [ "dash", "docker-tramp", "json-mode", - "magit-popup", "s", - "tablist" + "tablist", + "transient" ], - "commit": "e127a157f8d0d9ffd465075ecf6558f36d2d3b24", - "sha256": "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw" + "commit": "4fc69969b11687896b6c71b099de5d4c12c1c685", + "sha256": "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173" } }, { @@ -22173,8 +22214,8 @@ "deps": [ "s" ], - "commit": "aa8c20d162d5e0b3a8677f2f4f3519ce6fdbe2e5", - "sha256": "1vlvxjfw7f3dsa69gg952fv68vswsh3wkxcwz4irwkk0pfcbyxbf" + "commit": "18266d097a760e0378414659969980bd67d36381", + "sha256": "1c2ckd5mvid4wsrl4pplgcrifm6x56a5qxf94g3h30sf84mcg1cx" }, "stable": { "version": [ @@ -22197,11 +22238,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210825, - 453 + 20210923, + 1515 ], - "commit": "c7c8687ae8a7f1230732eaebc89ea668b4f7a37d", - "sha256": "1cylpcjgd8v8kp93x5w1nal5m66bb8j44c7rsm6qwl099br3pa72" + "commit": "fe7ec7cf99608412073d2d68885577b9135a94ac", + "sha256": "1kjv2sh9pcmvciay1y6kp5k9lqm3mqm90qqlwh5g844bc5p7dgbh" } }, { @@ -22212,14 +22253,14 @@ "repo": "alphapapa/dogears.el", "unstable": { "version": [ - 20210903, - 514 + 20210913, + 1259 ], "deps": [ "map" ], - "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", - "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" + "commit": "c05b69e504a538c9e00fbb0ea86934fafe191d0c", + "sha256": "12qvzd8wvryr2hnlv7l683148vxd1sry7s8y12xnysc7yz4dhsgv" } }, { @@ -22334,16 +22375,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210823, - 1606 + 20210925, + 603 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "16c654c1212e97a1441cac45fee2dc5cda022103", - "sha256": "1r75kbmzrr3m5rx8nwp0v2cs4aim6pr2p42i3774012q3hi333kv" + "commit": "ffedb34800db41f5e06e8a6f03698b56593c5024", + "sha256": "1gds3qgbi8xlsvfcqg9m7rk04qqcd2dgq1752dk20h447bhdv2hb" }, "stable": { "version": [ @@ -22387,14 +22428,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210731, - 818 + 20210916, + 2120 ], "deps": [ "cl-lib" ], - "commit": "65fb964f36939cf412d03b3fe410618caf99c494", - "sha256": "0nrgy82l9jffsgd12kx6z2amc8z9d9i9clqc3gvdzx6g0nlnyfli" + "commit": "e716ddbb882a3a06744faa74decb2fea1569c921", + "sha256": "02gp36hbmxcadp4567mnsj29b2ql9favhdcr9sm4pyp9bszm75ns" }, "stable": { "version": [ @@ -22638,11 +22679,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210730, - 1158 + 20210922, + 1038 ], - "commit": "62c960dbfe9cadc72784878c1cff20389895e193", - "sha256": "0wks8jcdfbahlv98v41h5jv8slc0c9aqyza9s2lmyi9a0xglp6i7" + "commit": "943faeda66931dd275fe83d858945bd07abacc5a", + "sha256": "01k8i4g0vv7m2jgjmj3y2n1821965r4m1j3fra5v30pnljjl7zjb" }, "stable": { "version": [ @@ -22880,8 +22921,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210906, - 46 + 20210926, + 541 ], "deps": [ "cl-lib", @@ -22889,8 +22930,8 @@ "s", "seq" ], - "commit": "1e871c7675e7617ccd1bc7186a15ebe577dac46e", - "sha256": "0chaffjwbqlrbhf0if817d5ril7xhyzwf72ik3yldyrymwknnbfh" + "commit": "f6a94d86263041f9a172cb7df90e00d1ec44604a", + "sha256": "1q29lpza8rd209zh0n04ia6n359p372czkm57hhmvcd9cmi91fc8" } }, { @@ -23048,20 +23089,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20210715, - 548 + 20210909, + 1010 ], - "commit": "fd81ea25790c7134032f1d43df0fc84cbaea979d", - "sha256": "0qv1pybkx22m5vdf499sl7wrwx6c97wwdl1cxv4ld6cnsjbrx1r6" + "commit": "f3564db95e776f94d3cfcbb1f529f28c8c3b1197", + "sha256": "1qw14ga3c8gnkc5zdiwds3ny3s5rfd5wn8fz5lqzxdf9q91xgpzw" }, "stable": { "version": [ - 2, - 9, - 0 + 3, + 0, + -3 ], - "commit": "641a95d2254ca7c51c97f07f2eed85b7a95db954", - "sha256": "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b" + "commit": "3cb82b394cb8e13b2e1be32c57aff321e563c6ff", + "sha256": "1c04qk2k3v1m0wp6scsqh0bq3wwkmazfr9apzqsdhw0pm83z4kx0" } }, { @@ -23231,11 +23272,11 @@ "repo": "zellerin/dynamic-graphs", "unstable": { "version": [ - 20210430, - 352 + 20210908, + 2010 ], - "commit": "f7239e381de56af5d6ff8e0d6ab31a78d3e3da58", - "sha256": "1v3p0ycm3yh8gvpbr96ml89470piam25qyhrwrkin228k17949br" + "commit": "64ca58dffecdecb636f7fe61c0c86e9c3c64d4dd", + "sha256": "15raac8fvsrlsca7vr4dakj4bh1zqc8fq61wkn6wh6pfyjm76r22" } }, { @@ -23285,20 +23326,19 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20210603, - 2331 + 20210924, + 2026 ], - "commit": "d3cc361b70b5dc4542624ced9c326523939ca021", - "sha256": "02mz2dfqfycw64z2906f9dvl5x6qb53xbhkn3hf5205hcg58w5zh" + "commit": "76142cf100d9e611024638a761e62bd82af156cd", + "sha256": "1fsydk7pld2xpmmp1jnm8b3y7zdynibwicgmsfxpk11915y4fh6r" }, "stable": { "version": [ 0, - 2, - 0 + 3 ], - "commit": "d640a557e3e7197cebb56365ad3552ffda39b838", - "sha256": "1fd17xryl2pkdlalc9jgwdkgl2mgks83wh5s8wilvwb21y8g306l" + "commit": "c17de670bc5ab4cc866d470f44faf733351428d6", + "sha256": "02ffmssibnx78m352f6qr705cswyzz5lvgpryv9d7kjpbzvqya6k" } }, { @@ -23597,8 +23637,8 @@ 20210903, 230 ], - "commit": "16f262dbeec1e0b9f7f3a6a7cbafbed76e39d8d8", - "sha256": "0j359dvmgkwrwcx24ncg34sfyxmkharpsniszmd7gjl2cq8sjja2" + "commit": "0f24876223a358d2718383e9e4975a26cee55f9d", + "sha256": "0a6kvjb7f4wn4yn3w4vgq98wkl02fvscvh6j6f9l573h6hhxr204" } }, { @@ -23624,11 +23664,11 @@ "repo": "cpitclaudel/easy-escape", "unstable": { "version": [ - 20161209, - 1544 + 20210917, + 1254 ], - "commit": "a6449f22cb97160ee1c90121968de89e193268df", - "sha256": "1spbavcs4a3vn1ggdcgwgb2wvq4lbk74xyfagr4y5b5w2azlkh51" + "commit": "938497a21e65ba6b3ff8ec90e93a6d0ab18dc9b4", + "sha256": "0bqwn6cd7lrk7f8vgcvclryvlpxvl2bndsmwmbn0zxmvqkdba7l1" } }, { @@ -23639,15 +23679,16 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20210815, - 2059 + 20210929, + 239 ], "deps": [ "popup", - "request" + "request", + "transient" ], - "commit": "be19464f1e4487414a29650b7dc46e984d3f73cf", - "sha256": "1cdg98303b3k5am7lqyjffx4n09qr49v9fsip8w3p6m357ls7wqw" + "commit": "687bd2f8c6e5b056859764e25325c6ba676883f6", + "sha256": "1hgh0y6q46bwnlh4qwmrmm930c2xhmyz50dvfy5i0smgsgalc2dm" }, "stable": { "version": [ @@ -23817,14 +23858,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210902, - 2151 + 20210921, + 1010 ], "deps": [ "parsebib" ], - "commit": "85da632406297f7289b9bdd3803684575cfae886", - "sha256": "0hbpchpmby54jp5xflj8ckdcpjj9chyhl6fkk7ng6l0rgzxi1z30" + "commit": "e312da65ff3f699e7bc7c1f7aab9ee8faaeb4801", + "sha256": "1v5ik5fyh2r71nqcrr1jxxcx2j4wy8w2ymsdk6ynyb7ngcfi2kja" }, "stable": { "version": [ @@ -24797,17 +24838,17 @@ }, { "ename": "eide", - "commit": "4b0915b90f1e0832b5920bee860723473acae4dd", - "sha256": "0ir02p1qrkxsh6b2v2aagkxzzzbd8hysxhr5zpbp11gv6sw4harj", + "commit": "d952fa4c9b2ee754a14cea8aa818142f80f11eea", + "sha256": "0ylnjvyb598h6pq1x14ysbg5x9z773lvx2jlzrq6gwvfpjbzfb3q", "fetcher": "git", - "url": "https://forge.tedomum.net/hjuvi/eide.git", + "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20200702, - 2009 + 20210818, + 2149 ], - "commit": "b1dfdaf06b00409250135cb1000beac60c7f659b", - "sha256": "17wzffhqnd65c94qcxlwmb4qyw44kq39hvkqlwpxx8g4wj0lql3j" + "commit": "a547b8f46ed905f456ac37f4693279532cc1d886", + "sha256": "0xk7i9da9qglz924hfw14hk4l3lxjqrmlyv9i4ai610a06pnq7rk" }, "stable": { "version": [ @@ -25808,26 +25849,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210831, - 1423 + 20210925, + 2 ], "deps": [ "elfeed" ], - "commit": "2c8093e83491b9191115276e649dd87438726348", - "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" + "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", + "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" }, "stable": { "version": [ + 1, 0, - 8, - 6 + 0 ], "deps": [ "elfeed" ], - "commit": "2c8093e83491b9191115276e649dd87438726348", - "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" + "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", + "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" } }, { @@ -26488,26 +26529,20 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20191006, - 1953 + 20210916, + 655 ], - "deps": [ - "cl-lib" - ], - "commit": "827e2723b123618aaa32642d78c447cf2979a00a", - "sha256": "08psgia9vwwil16nymy0z12p823in3bxf9k7phjrmdicqqc01k42" + "commit": "2549b14e8688e9ee866e0ec9f1b6d9cbc97f462c", + "sha256": "1rjc64j7a786xna8xcfp1kxvx1y0jfqxajicbbyvcnhd17g6a7z9" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 1 ], - "deps": [ - "cl-lib" - ], - "commit": "827e2723b123618aaa32642d78c447cf2979a00a", - "sha256": "08psgia9vwwil16nymy0z12p823in3bxf9k7phjrmdicqqc01k42" + "commit": "2549b14e8688e9ee866e0ec9f1b6d9cbc97f462c", + "sha256": "1rjc64j7a786xna8xcfp1kxvx1y0jfqxajicbbyvcnhd17g6a7z9" } }, { @@ -26560,11 +26595,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20210823, - 941 + 20210911, + 2038 ], - "commit": "0d65ffa3ab238529a11d5c1a5d2dea5a6c27e9b4", - "sha256": "1s6mh7a9r3s0b2nk019pdzzp646ny43mihjd68yq1m2yad7d6y5x" + "commit": "fbf5fbcd3e0d82c9d7de7d4db5166620dbb31791", + "sha256": "1dcjm1a8rpl00kfgpcp0mjmiwj7jjhl3rbajsc9slmkl4n242azs" }, "stable": { "version": [ @@ -26912,11 +26947,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210819, - 2127 + 20210918, + 1436 ], - "commit": "5aa6369b58e72ef2348a5d6ca6bdf32299329c58", - "sha256": "056hb1mss84d4m7fb052c10bfmshf00x772rlpck671n83fi14li" + "commit": "a457a596401dc5caa9c9a2ebb627bd4af0607780", + "sha256": "0670dxmvy38rl3mh2gh2ab8hp4y7z90kg3w340mfgx50fbwbcfs4" }, "stable": { "version": [ @@ -27009,6 +27044,40 @@ "sha256": "1c84gxr1majqj4b59wgdy3lzm3ap66w9qsrnkx8hdbk9895ak81g" } }, + { + "ename": "emacsql-libsqlite3", + "commit": "4e7ce4ac946c7b7e2c4feecd3b753ea163ecc435", + "sha256": "0cpniv5r9k38qapyzhzcjhb0hpv7i6jxqnxy6nwm7ml6nhrgkai9", + "fetcher": "github", + "repo": "emacscollective/emacsql-libsqlite3", + "unstable": { + "version": [ + 20210927, + 2137 + ], + "deps": [ + "emacsql", + "emacsql-sqlite", + "sqlite" + ], + "commit": "d0fac65db8bd10abd845fa18c275d581219086d3", + "sha256": "00w1p1ax2xiv1m0p2wlrawyj98fwg69y2p2scqkd4ny1zydc7x73" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "emacsql", + "emacsql-sqlite", + "sqlite" + ], + "commit": "d0fac65db8bd10abd845fa18c275d581219086d3", + "sha256": "00w1p1ax2xiv1m0p2wlrawyj98fwg69y2p2scqkd4ny1zydc7x73" + } + }, { "ename": "emacsql-mysql", "commit": "9cc47c05fb0d282531c9560252090586e9f6196e", @@ -27233,11 +27302,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210905, - 1435 + 20210918, + 1609 ], - "commit": "d21277a638827623ab84e9e6341312a2da5062ab", - "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" + "commit": "1492aefc00abc3355bf04c2ed05f40ff2f523fcf", + "sha256": "1yira5lg4kgf94pd9w96k9vlj9lfcs5sz97li45wpiy1l6n0430d" }, "stable": { "version": [ @@ -27263,8 +27332,8 @@ "consult", "embark" ], - "commit": "d21277a638827623ab84e9e6341312a2da5062ab", - "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" + "commit": "1492aefc00abc3355bf04c2ed05f40ff2f523fcf", + "sha256": "1yira5lg4kgf94pd9w96k9vlj9lfcs5sz97li45wpiy1l6n0430d" }, "stable": { "version": [ @@ -27431,29 +27500,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210825, - 1456 + 20210911, + 2031 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b582a75d033e5a21090c854f58abeefdd238798f", - "sha256": "1gmgh9llriqgq8kjdffmyjw5gb9k385fbh258bf7n5yvgpd3bbsn" + "commit": "c42fab572846b1dd76d82c5293ccfb6ee2c45991", + "sha256": "1jb4di2v1fxjd7qw8mjwzqpr3j8jcbli4jx7236b7kmcid9zfds7" }, "stable": { "version": [ 7, - 6 + 7 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "8b32529950e5a2e1dd7afed8757ff6bc923c95e2", - "sha256": "0pcs95nmdbxahwsqp1fz0m8pgwsxycvf7xixh40sfjgifvbq0a21" + "commit": "bc0d2ec1ba99409421d3f75aae315e10b5014b31", + "sha256": "13jwf5dxhj1ch2l4klxjy1h1by70lhx99bsjdx23pvr6di0srnj9" } }, { @@ -27724,8 +27793,8 @@ "emojify", "request" ], - "commit": "f05ab06436e13b3578f3d4d183fcb1bc3a4eeab1", - "sha256": "01dnab8mqz03rdd3xcb48csx56cv2ik07sykyqscbiib5vcw5k5k" + "commit": "23a0cf469999854fa681d02e3122840864fd4c65", + "sha256": "1n3znp78hhbjna6w0raixd439nmy9m0sa38g4pd70kj5l0ci1848" }, "stable": { "version": [ @@ -28182,14 +28251,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210806, - 1315 + 20210927, + 2133 ], "deps": [ "closql" ], - "commit": "23045743150f9a50ccc164a710c4d495820de803", - "sha256": "0v5v7iw9qyp8ckh9ana61r0fbhffbpsmhjr2yx88kc6ia59vn561" + "commit": "366b48e05d4e18eebd6c9d5285d0b0696a5a66bf", + "sha256": "0nidb5wyli3rda3yx47anh57mrfs6iw8hs1saq8zkqvja5nw3nmy" }, "stable": { "version": [ @@ -28340,14 +28409,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20210731, - 2016 + 20210913, + 145 ], "deps": [ "dash" ], - "commit": "f9d741baf42232125663c1d27e01ec04ab0ca85f", - "sha256": "0cxax1dgznzvfzwy00spqi609q93gxkabcy6jm6009029gmsdhdr" + "commit": "4d6ef75a4d91ded22caad220909518ccb67b7b87", + "sha256": "11xfr71y78idcn461p4pz7b0k01nhz15cyl97bjqq6ii5xhbhvdx" } }, { @@ -28837,8 +28906,8 @@ 20200914, 644 ], - "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", - "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" + "commit": "7f58030124fa99dfbf8db376659416f3ad8384de", + "sha256": "0hhc3n6z7p366rywn0zal5lakzpl6m71jxcy0ddd2f358hfzz8ac" }, "stable": { "version": [ @@ -28861,17 +28930,16 @@ 20210315, 1640 ], - "commit": "2ef0ca21ddf75c28b6a1ca07d20c33cbdc24e853", - "sha256": "1dzj8frv80lx34chv94ksm83749l7f8195iy337vcpbvgpzf4arf" + "commit": "c730c47fa4d22507d6210f8da8e9e6070b20bac8", + "sha256": "1l6vj36x1qjfm5imwravw5maxm8m3avm3fkrlzxkzd3f6b44rask" }, "stable": { "version": [ 24, - 0, - 6 + 1 ], - "commit": "163593593441984f8446f513bdc7684ac5fe067e", - "sha256": "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z" + "commit": "1b0a9a039a1d078c8e4f25f3eaa765259b256ace", + "sha256": "1zxiqilnjrja2ihrsnpzlz2achkws1b7dnliw5qnzvz2sn9gf6fx" } }, { @@ -29417,11 +29485,11 @@ "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20201115, - 440 + 20210925, + 110 ], - "commit": "d7d874ce3da3ae55a42f669aca723a8774c8292c", - "sha256": "1ahydmiffxn4mp76fmzax73fx1lws37nacnnxp1imxnvmk8f0zjp" + "commit": "c2078093323206b91a1b1f5786d79faa00b76be7", + "sha256": "1zchbl59jkay46w8rf2skza71al2xf9lqsssjd22s5h5vwkl64kn" }, "stable": { "version": [ @@ -29723,11 +29791,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210818, - 843 + 20210924, + 1606 ], - "commit": "a7ce81bb768d7cc410885711cf99bad0f8941ac3", - "sha256": "0kz9diqb26ksrgnfqdcdgf48sqjapvfg6z1fjk9ib2q2si6nv0yx" + "commit": "b1d299c96e73dc892b0065c1617205dd4b9f8ab8", + "sha256": "0i2qbcnym942y9lcx5950pqbi5l9f3ihndvs84w2crr9d7s2v13d" }, "stable": { "version": [ @@ -30520,15 +30588,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210904, - 830 + 20210926, + 2019 ], "deps": [ "annalist", "evil" ], - "commit": "869d056dcab5eb9781824bcd591bf946969b8b41", - "sha256": "0vm5xncxvnys957pxq6ih6bz65v65aglpjavbf5lypycwjq55iqn" + "commit": "74f8c302ab626904de5beb26feaeef2ebff3d220", + "sha256": "05p7f3b3m20cr8j8i801a17jrj880xjfvjsf2pgk7yrils6snpak" }, "stable": { "version": [ @@ -31086,26 +31154,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210819, - 5 + 20210923, + 931 ], "deps": [ "evil" ], - "commit": "24a95751f48fb64246de15278734e0179c9f622f", - "sha256": "0gdfnpzzy6y9626nqia7rs5l37bl31nndn1m71dnm0qns5cqfngk" + "commit": "9b228b097a863e9deef8033b11747597e055674b", + "sha256": "0cxv1bmbnir59k778dip5mkjyqhbh10pk9b4ayvwpgiz25dlp4ss" }, "stable": { "version": [ 2, - 3, - 13 + 4, + 1 ], "deps": [ "evil" ], - "commit": "80dc731ab736545541546ca64187e850bf0e39c8", - "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk" + "commit": "9b228b097a863e9deef8033b11747597e055674b", + "sha256": "0cxv1bmbnir59k778dip5mkjyqhbh10pk9b4ayvwpgiz25dlp4ss" } }, { @@ -32038,15 +32106,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20210904, - 1350 + 20210927, + 630 ], "deps": [ "evil", "tree-sitter" ], - "commit": "a315a8832fc170c163be01c31b625b19641ce20a", - "sha256": "0msg9kpj4sajcszjamb8gqbi9hdhybsg1gdajprzg0p5z09sv863" + "commit": "84c292c69bb5edbbbe7b84d319ab7484a449988a", + "sha256": "09xh56zdlk4iyccah6wjy31hd5sjr8qjh641kig4mb0wgssggms6" } }, { @@ -32461,14 +32529,14 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20201215, - 33 + 20210914, + 1247 ], "deps": [ "cl-lib" ], - "commit": "bf4bdc8b8911e7a2c04e624b9a343164c3878282", - "sha256": "0b19lhidn2kvkc4aaa1x634y2biryq85di1iwxdh8070k4j2yw9s" + "commit": "0a07f5489c66f76249e6207362614b595b80c230", + "sha256": "081p104ma9b7nzhs42y6zn8r8vz5dp7kz6vp79xdyl42w9dqinww" }, "stable": { "version": [ @@ -33223,14 +33291,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210901, - 637 + 20210909, + 752 ], "deps": [ "popup" ], - "commit": "a2e8449e4ceda45adc5ab7b7d2225c2cc3765371", - "sha256": "165mv9v18fyyha4b27yhardb1k8i30qjchz1lgrfnzv15qv0d7yg" + "commit": "9435ad63c1c4756f574ae98d2d63ecf1189ec832", + "sha256": "1qnh6ykmwvwk06rpi8pcvql5zq9gpiz2xiyl3j2imhmx1jiw4xdz" } }, { @@ -33288,14 +33356,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20210905, - 1203 + 20210925, + 1532 ], "deps": [ "s" ], - "commit": "352fc9ae3230e87470fcbb638d623169c2e582f9", - "sha256": "06w54klzl9781bxmxhx0vhj1yj6ym8i68fb1bry9yhy8r3qamyip" + "commit": "1b5c4337137a5ea1576e0389672b1c13e4d135bc", + "sha256": "1lyk5saw0skn4554z2199gybp5ckcwbhx95l6swwxwq0iq7xmilg" } }, { @@ -33635,11 +33703,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210817, - 1612 + 20210926, + 753 ], - "commit": "47152970a98734723b5086b5c774f50da34c0488", - "sha256": "1p9fi5rrqlcx9gg5gljdndmi318x0z5zzxryi1kbqkkc8119kbsg" + "commit": "81a3be351ce35d57c648d7b1cf83fbf70600cfba", + "sha256": "0hfid4zi7c9hjszv8awmapvac5g2z4cwyvr34iaa7kmjyqljlw8r" }, "stable": { "version": [ @@ -33681,8 +33749,8 @@ "f", "s" ], - "commit": "142a7a5ecd79b4a3db7ce3dfdd0d87ceeedab468", - "sha256": "1lmfnc5nljghqapciaqrvmj177v3m1ybndf7mjj74d6n41gphwcj" + "commit": "3d524dd404862de1a40ec5834cc1b85137a1acd2", + "sha256": "1ds46hl7givwmw4zsz4nx7wg4n9xxmn1a806dxkjjqcp0cvhv4l5" }, "stable": { "version": [ @@ -33792,8 +33860,8 @@ "dash", "helm" ], - "commit": "f7dd8a310f5364f1e1549082ef231c3c27285e89", - "sha256": "1w1f924as6l0s9dkpjjk6bnkp29x52mf5pzzqxqsigp2r1z6k2lk" + "commit": "4d93a560f28a7f130800ac5a778f3e4da41a30e0", + "sha256": "10idrmgq58w3nbskhw9513kvza0by9dfdin8bh0r4kg99kvhrmdh" } }, { @@ -33853,8 +33921,8 @@ 20210707, 354 ], - "commit": "cad66696f334f70adf2b8bdf9910852c017dbdd0", - "sha256": "0jg7gppjf39qzwb44n1q7bikhqvxs5hr4yd403v7apf75z0hpc3m" + "commit": "562d6d5118097b4e62f20773fd90d600ab19fb61", + "sha256": "0v5irns6061qx0madrf2dc1ahkn4j90v8jpx16l69y9i98dh6n5k" }, "stable": { "version": [ @@ -33976,20 +34044,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210813, - 657 + 20210924, + 952 ], - "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", - "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" + "commit": "1d2f0b374460be798ba5c4854d3660e9b4d6d6f7", + "sha256": "1aqsgfbhc382h009hv3xqh5kq5x7y3smk1vc0vj3bwfg95fw6jdx" }, "stable": { "version": [ 6, 1, - 1 + 2 ], - "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", - "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" + "commit": "52274e6001545bdf45c6477ba21bfaa8eca04755", + "sha256": "0v5c9cnwlbw6jj371swhd5bs8sb2zf6g5yjvhdsfnxly7g3dg636" } }, { @@ -34098,8 +34166,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20210904, - 1352 + 20210919, + 929 ], "deps": [ "async", @@ -34110,13 +34178,13 @@ "s", "transient" ], - "commit": "0895002dfacdaab9010a35c190139384935cb4d0", - "sha256": "0cg6axjv41da3ryxq2vszhn8f7jslc8ipf8izh1h7ldg2li5kz9c" + "commit": "ae37ef3a81107b92623187443e764ce0b3d92a6f", + "sha256": "1n4qks5i75w07hrradai67chpbrz0wgck52ydylmjkkjwg2n1bp0" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -34128,8 +34196,8 @@ "s", "transient" ], - "commit": "bf720fec1fcd46664dce66a667ef77a1c80ef89a", - "sha256": "0q55ny88rpc2xrnkbpmifb9nnshjlx69mwf6kvxqryljvcjbk69y" + "commit": "b7cbb5fa672031cbc9d7de18797ecdd2df8e224f", + "sha256": "00rimqh2hmz9hzqq5piq0bn60rh820ym18r7irh6dv4vdk06zww8" } }, { @@ -34535,11 +34603,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20200707, - 630 + 20210908, + 1423 ], - "commit": "5a30b1cd344ac0d3c3bf9dab017805ab96897b54", - "sha256": "0vcinly3lrrkbihafgxcv084zn8fhw94wc8qjjq2lwcc1db7lfjc" + "commit": "33726cd072ad83c6943e1c3b83db2fff60f324ce", + "sha256": "1nai41dzpnmv63k75xnhc64vipb9nqyv3k75mp2g8csxz569ph2l" } }, { @@ -34634,27 +34702,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20201218, - 1549 + 20210914, + 1255 ], "deps": [ "buffer-manage", "dash" ], - "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", - "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" + "commit": "64f61ba1c113be38e4eae2a1fcee5596223c5d85", + "sha256": "143fzny0l5d8vci43nsgaq2a4ns1qmz01bd35c0s66gl62f02w74" }, "stable": { "version": [ 0, - 7 + 9 ], "deps": [ "buffer-manage", "dash" ], - "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", - "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" + "commit": "64f61ba1c113be38e4eae2a1fcee5596223c5d85", + "sha256": "143fzny0l5d8vci43nsgaq2a4ns1qmz01bd35c0s66gl62f02w74" } }, { @@ -34848,11 +34916,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20210304, - 1341 + 20210914, + 17 ], - "commit": "960b63576a13b7bd3495d0ad1883ed736873543b", - "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0" + "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", + "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" } }, { @@ -34870,8 +34938,8 @@ "flutter", "flycheck" ], - "commit": "960b63576a13b7bd3495d0ad1883ed736873543b", - "sha256": "0l6k8ydrdbwms8va45jw88514ichj1qxbxkq8mfvvacb3rkb0gj0" + "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", + "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" } }, { @@ -35907,8 +35975,8 @@ "deps": [ "flycheck" ], - "commit": "6e2bc77da6e2a8812246b4717d97b68675ed84f1", - "sha256": "02m22d9y152aj7aba736j5gxpniqr0rc2k8iyq9cgbgavfhbr3ac" + "commit": "8b68168db13df4e393d65ca8c0464019dcc45745", + "sha256": "1fiycjznzpv0gm41xx8xgqkzsjg04zgg6v4prlaqx4vfzh069a2k" }, "stable": { "version": [ @@ -35986,8 +36054,8 @@ "grammarly", "s" ], - "commit": "c4b3c5b4889ee719b6dd0800305f9be869cfd7ec", - "sha256": "0sb8fvkzhc1f1p28mmplj2ld97v8lkpwz4frf62hn3jg21fzj7pk" + "commit": "509641db723adff48781cfaef391f87e19d043a4", + "sha256": "1gqd21w8n2b4yfdi46qn0q01csglw5gr1f7l8maldxff10l11fyg" }, "stable": { "version": [ @@ -36412,8 +36480,8 @@ "deps": [ "flycheck" ], - "commit": "c4a1dd0b23b8b25ba706eed48ae7d3e97bf4f349", - "sha256": "1zcp9brh9cygga0yflw4saf7bf503ll1l4nmhf79h039xm7p3rcz" + "commit": "4fcf88d131fd0e149a7f1c787c07f4e03ea24fe8", + "sha256": "0p1fmxgbpfh3bihpdaqd2dfsgi3s9x17nhb8439livfrjhqdhfhd" }, "stable": { "version": [ @@ -36620,26 +36688,26 @@ "repo": "GyazSquare/flycheck-objc-clang", "unstable": { "version": [ - 20201003, - 1053 + 20210911, + 1023 ], "deps": [ "flycheck" ], - "commit": "5e74a5a796e73fca7f3fd15986fefa56529b8e98", - "sha256": "11sdxlqwk4wa3pgbfyxjq100yra11iya61wnx6c01n2fxmf82iih" + "commit": "5a441a31e58de17da94f933277150be39198d98c", + "sha256": "05j5bngvf3vpabjv7gcm5qar73mr1dyba7z9g1x4i385dgm97f6z" }, "stable": { "version": [ 4, 0, - 1 + 2 ], "deps": [ "flycheck" ], - "commit": "5efd0a929cefacbe1020fe1a80d27630a619a165", - "sha256": "10cqqy78jfsmqx6m8i0xfm9iwfjffaf1c29c8918bc9hw813gpaq" + "commit": "5a441a31e58de17da94f933277150be39198d98c", + "sha256": "05j5bngvf3vpabjv7gcm5qar73mr1dyba7z9g1x4i385dgm97f6z" } }, { @@ -36842,8 +36910,8 @@ "deps": [ "flycheck" ], - "commit": "ca00e018ecb9ebea4dde7f17eadb95d755ea88ab", - "sha256": "0j2klnv15v2gqnly5vgdrdrkccsza9mwz5c87i6qgnfawmnsh32d" + "commit": "3c303551cb9c317e49878cb860c6ed6d142d9613", + "sha256": "1mm558vjyjk5cxxwns69fh477ws02hhmh0ain46zp7qdz6h08nbk" }, "stable": { "version": [ @@ -37152,8 +37220,8 @@ "flycheck", "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -37305,26 +37373,26 @@ "repo": "GyazSquare/flycheck-swift3", "unstable": { "version": [ - 20201003, - 916 + 20210910, + 1244 ], "deps": [ "flycheck" ], - "commit": "f83b2bb7086e54beb2bd2df406a498927a7b2fba", - "sha256": "04rdc8jsb8gx2bhrf7rwpyrw4pw04638j574g6614f9h1whpw9jw" + "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", + "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" }, "stable": { "version": [ 3, 1, - 1 + 2 ], "deps": [ "flycheck" ], - "commit": "35119a559206fd62e87018c605d4f302300e831d", - "sha256": "1m7jay1fvi2zljjd0j1ghc1n1cqpz4l8vw94jfywz4l8w0c9xbkh" + "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", + "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" } }, { @@ -37683,8 +37751,8 @@ "deps": [ "flymake" ], - "commit": "afd458daf88f475cfacdd22375635e43a5017564", - "sha256": "17fzs4r22nlf27xcdfj9qs337879xkk9hgq121dgxd93xy3n0ky7" + "commit": "0c9f3fa273cf1cea8fd64c2b3c20119e2d5c8f6e", + "sha256": "0vw21na55i7fxrls5b3frf2mml7nk8k6y39936r7gbnmn00dcmam" }, "stable": { "version": [ @@ -37904,15 +37972,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20210814, - 1628 + 20210913, + 1416 ], "deps": [ "grammarly", "s" ], - "commit": "28888bc8d1c795e1b2d798fb5c6cdcc16571c73e", - "sha256": "0vm10sx3w3y110s0qkdiabqnf5fvfjixgnq456rbh8v30y1wgrkc" + "commit": "3cdf30a6d45778640252c6ab563b53382fd4a4d3", + "sha256": "0hbjixzzgm0jmpp5xp3407n0rm0b1iah94kzj2mqk2xrg1qmbbbk" }, "stable": { "version": [ @@ -38161,8 +38229,8 @@ "deps": [ "s" ], - "commit": "5c93f538978f2d272e5210b27f5255ee87b6b61f", - "sha256": "1awd69ns238ia27k2njlx65gkyscxzayyyx777rbmy6g259bndzq" + "commit": "cd6e5602e58bd9c03ec1c6a3b01c337d17ebf0fe", + "sha256": "1gjwxycbpvf3z332y5my6w57mjmqgs9mwfcfi0p3jdby18ykwyd2" }, "stable": { "version": [ @@ -39286,8 +39354,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210906, - 1234 + 20210928, + 1925 ], "deps": [ "closql", @@ -39300,8 +39368,8 @@ "transient", "yaml" ], - "commit": "86e18914eac706928e66705418c765f34d077703", - "sha256": "01i8vb120vn8wmiscyjhk3zl7qk0zrnydkq4d282w9b5sqzrgjpp" + "commit": "f747447557cd33df2d2914f7fad564df4798ea2b", + "sha256": "1ab7b54wqmp779s7fwhbgdfha3sh2jr55xs1pnjrx60azkvllzq3" }, "stable": { "version": [ @@ -39355,15 +39423,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210824, - 1659 + 20210917, + 651 ], "deps": [ "inheritenv", "language-id" ], - "commit": "06d4d9ee6dd79941d26798cc9754b9c9be87e932", - "sha256": "1bcqj4v5zrqs1ysvvnvar422c3xh1n5yvl1mg7rfwybd0l5pzc80" + "commit": "dfaf3e4a80d064f2a138b0a4b6a7e85263168fbf", + "sha256": "0l0cqcfr48wkihba6a6krh38z0xgmbd9vdgf0izx6vzdl6j0r2zb" }, "stable": { "version": [ @@ -39983,16 +40051,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20210809, - 1702 + 20210906, + 1634 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "bed6c483445017698a1ec27fc61edeffefc004b2", - "sha256": "0yriw08f9crl2basr1a06m73kln8qk1w0n1ljcr4zr6j7ya1fcdf" + "commit": "387fa2a61a9e4b50701aece19dd798361f51d366", + "sha256": "104nhnix34ymkkgdvxn612d1k4iy95swrmb5isknd48c5mys94gq" } }, { @@ -40863,14 +40931,14 @@ "repo": "emacs-geiser/gauche", "unstable": { "version": [ - 20200802, - 1300 + 20210911, + 1041 ], "deps": [ "geiser" ], - "commit": "66e51430bded0f0e2037f474818a7bbaafb2906c", - "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" + "commit": "fd52cbaed9b0a0d0f10e87674b5747e5ee44ebc9", + "sha256": "1sv1a6lhxn8xhbgajz2knrblnaaryp3fz4yw19ggzdx4r30k278y" }, "stable": { "version": [ @@ -40918,14 +40986,14 @@ "repo": "emacs-geiser/kawa", "unstable": { "version": [ - 20210427, - 1626 + 20210920, + 1607 ], "deps": [ "geiser" ], - "commit": "3d999a33deedd62dae60f3f7cedfbdb715587ea7", - "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" + "commit": "5896b19642923f74f718eb68d447560b2d26d797", + "sha256": "1vv8i3qqk8690p4cpklvy7g3alh5fb3v7h3b91dj1gardzf0vwpf" }, "stable": { "version": [ @@ -41034,11 +41102,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210901, - 1406 + 20210909, + 1442 ], - "commit": "0a02e97cc2ce2ddd97c7624187c7e7b6ab2e9fe7", - "sha256": "18vd78ya03d3x7aib2x7d3snripi7r5xrkyi7vm2xxzx91fan4rf" + "commit": "60bd07b3a1e532c950c132673777ceb635c9960d", + "sha256": "1dj6bmlrqkqvykasdav9f4jw8aykqj6c0jr09r9x4sb2w0pcd9ik" }, "stable": { "version": [ @@ -41058,14 +41126,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200516, - 50 + 20210918, + 1525 ], "deps": [ "cl-lib" ], - "commit": "a0b17d207badf462311b2eef7c065b884462cb7c", - "sha256": "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv" + "commit": "a78da8f74fddb84412b98b9a8c881af4dce7ab24", + "sha256": "11rx5i0fmigjydpm2w4gwgrsf74a4xa856i17i6056mw1sjsjwaq" } }, { @@ -41183,11 +41251,11 @@ "repo": "matsuyoshi30/germanium-el", "unstable": { "version": [ - 20210821, - 1813 + 20210912, + 1407 ], - "commit": "88a14826695b60ac218c2b3beadba0dbd89bcd60", - "sha256": "1h85zpli5ysbfx6j0ajmkyngmj1nq6qwkx94kl0risamz8lxvk7r" + "commit": "22e7aac319f45b45c884d504f060f27b2dae159f", + "sha256": "010sn05dpscj8nikr8hgvyybqdya6597kvh9a0ck1a4papqncbvm" } }, { @@ -41198,8 +41266,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210620, - 334 + 20210923, + 1846 ], "deps": [ "dash", @@ -41207,8 +41275,8 @@ "magit", "s" ], - "commit": "ac555ccec74c48297bac0944a207e5b8aceac49e", - "sha256": "053gn6ja80810y4a2dayz3xy1bmzb7w06lvf87difa0nhm3mr54g" + "commit": "6c0321c4d0a73ff10212a5c254928fcada711081", + "sha256": "0b81ysgpvpsqgjpjdjphxbr0yjpdyq803smfg4bn6i6jw2y1ipmm" } }, { @@ -41466,15 +41534,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210727, - 1414 + 20210923, + 2031 ], "deps": [ "let-alist", "treepy" ], - "commit": "00a77b79c28e22db1b151c3f7857073ccbeff726", - "sha256": "0qrp2n53fhvwr5ndnmfzh841g88hzmcgz3i54hbcqq1gj6vwqd7f" + "commit": "0f459abf32f18b772458a5f7458b4bfc2c680b28", + "sha256": "03417ddx12f1yxw8bfjgkq24yzs8kywxckgn34kw53qa8h6akspf" }, "stable": { "version": [ @@ -41832,16 +41900,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210806, - 1607 + 20210920, + 1355 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", - "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" + "commit": "f53148a569191bdbfb78d76f28481b91c60cb846", + "sha256": "0nlw3p77d625dw7maaihs65x5dz0i7alnzyinjiw42kd1cvyxrgh" }, "stable": { "version": [ @@ -41935,11 +42003,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210730, - 429 + 20210928, + 1629 ], - "commit": "1003c8cbe2367482ad02422ace0a85a7d56d01d3", - "sha256": "1w2rlxn731jly7v8ks0w670i6351darkh75dvczic50116hfnwnv" + "commit": "f9892f0fd1ad881fb293c161b0aba81ac6e8a2e9", + "sha256": "1ymrmzrcjqqv8sdgi5lyl50nkzpqxfq3s721q31mpx79mkjciqip" }, "stable": { "version": [ @@ -42958,15 +43026,15 @@ "repo": "Kinneyzhang/gkroam", "unstable": { "version": [ - 20201204, - 917 + 20210914, + 1311 ], "deps": [ "company", "db" ], - "commit": "b40555f45a844b8fefc419cd43dc9bf63205a0b4", - "sha256": "072r4q03ddy4mkqqlvhsgjh6i5pcjkgzvpv8n7433qgxgdbyhwaa" + "commit": "a9c9034a8fa3c08ec3097ae40e227d400d766db9", + "sha256": "1fc8srqvygiv3h2hw31vy20ip6kbm2m1aq5imx01fw9qig7xfv47" }, "stable": { "version": [ @@ -43249,11 +43317,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20210904, - 509 + 20210907, + 223 ], - "commit": "c1203e8ff655ba776ecdc49b3420aaed4bd37952", - "sha256": "1hicrnwn4z0q0v39qdhfwgailgy6fw433gvk70pm779npp2zv90s" + "commit": "f66273ba34a6f1d2bbb39bec9a6b4e38dc8d48f1", + "sha256": "1540z31hkz4mg9kkxkl7ii1pz1hy446j23r42la1qbchif6q0zpz" } }, { @@ -43389,11 +43457,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20210604, - 720 + 20210920, + 902 ], - "commit": "09b9e96f8e0ab006d9cfe8f5ab000ce7e50ef4de", - "sha256": "0qsnfiqcivy7czg2j7kdsifz7p5nid1zvw6zdnaihghzdxa1w1ia" + "commit": "dfa0e687601e78d6be82530413cb00edb1a39889", + "sha256": "021rq3qp3544abqzr8cdsblpqh8yh2ss3f9gsf5sifckz7127h0s" }, "stable": { "version": [ @@ -44383,8 +44451,8 @@ 20180130, 1736 ], - "commit": "d88a5b7b59948d23977942ee62037e8912ff68ce", - "sha256": "1k29za2g3b10jy3nlkg09h5jn8d25w9yghrmz8cvm8zghxkqi2m7" + "commit": "9a6a5d3db386f1ebc6ad4a47a719cc92d2f34464", + "sha256": "103kz081y15jcajmkaqaxc57gx8v0aypa91ql8gjwjx5hapawhvx" } }, { @@ -44626,8 +44694,8 @@ 20210323, 332 ], - "commit": "1ed2df72f495784a2eccbe61de5f1b01b854fbea", - "sha256": "0hr6yhsr2x745i1q9sywvgr8xwvnpc05lr3zi84gci0frlab92d9" + "commit": "51a66148c31f0ee7fdcc7aa554ae42e9c4db876c", + "sha256": "1g5ccjlqrgwifnsxq995isd09h7dx182ii0gxb5536dp26cd0464" }, "stable": { "version": [ @@ -44713,8 +44781,8 @@ 20210323, 422 ], - "commit": "4cef6cab89eab5906330412efee6a3d9564f6e14", - "sha256": "02hywgvy9d0mhan595jgc2x6vqy428hi9ha9zybiz1hl2394xila" + "commit": "0af704e85d3b15ecb8c45b2f48ed9a34a375a2fe", + "sha256": "05h7jzm31b139vsv1175ck0nk33wim63k01x42dn6ffmlgkvc8lc" }, "stable": { "version": [ @@ -44743,8 +44811,8 @@ "magit-popup", "s" ], - "commit": "e49ad93a11f6e0528d1dc2b6d6d4ec2a131636e0", - "sha256": "0hs2vk9fp860y2fldr6d85hlpizccj0v5a7bjmkirvfnk2w086mv" + "commit": "66669ef8d3089209f3295f0fba6df9a470e7ddbf", + "sha256": "02jcrbi8hal0nmvnjwq9rb7ax9r2f8z2z0ca2gkar2qpdia87hhn" }, "stable": { "version": [ @@ -44978,8 +45046,8 @@ "s", "websocket" ], - "commit": "46e802631a136cf356f5563005c9f9f5dedd09ed", - "sha256": "01vw411ngj325q1irhkx3fmf7g0mh99yrc72cxz3275mnc0dpdpj" + "commit": "e0ae37f23a34ff0b7959963314410f30d75dddb1", + "sha256": "0pjvlamld25rbphpnwjyvfscmk7im6qvj9cgy8gd8d7hlzch49cv" }, "stable": { "version": [ @@ -45157,11 +45225,11 @@ "repo": "davazp/graphql-mode", "unstable": { "version": [ - 20201001, - 2113 + 20210912, + 1544 ], - "commit": "2371316a750b807de941184d49ca19d277ecadcd", - "sha256": "07k0r4khzx58m6bb13lsczlxakzipl9zxn68ymag4ibim5wf2j3n" + "commit": "1912bd08f558e4609f4dd30ba91181b6ce7f69d9", + "sha256": "0938cb40i5gs8sqksn2k1zpjm1g9a989dm7fb80dzm71r32y596n" } }, { @@ -45502,11 +45570,11 @@ "repo": "rexim/gruber-darker-theme", "unstable": { "version": [ - 20200227, - 2238 + 20210921, + 1408 ], - "commit": "7f95ce96079eb22b9214435ed25c5af98f60b482", - "sha256": "1zdqbjhcb8b1f4szzjmkzhpxcg17dqfp91882h95f1x9c2an5gdw" + "commit": "091515cee37e586f2028d1226f5ec40e2080f2f9", + "sha256": "0dp2c97rww8brpw933szfcgdvxaxnq748bs274favsq9ikm12708" }, "stable": { "version": [ @@ -45890,11 +45958,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20210812, - 1631 + 20210923, + 2359 ], - "commit": "35a4b0f45437309a10e2c72e523012c2e2eded07", - "sha256": "16h691h1078m5gm1xqypiapr671i7phsc3kl196m8n3dqypwjj9m" + "commit": "b5c7121a4a6e67c7e90bb6d8363936e50876093f", + "sha256": "0iccr1sjkbaw4lb3dja9bgyix6gwknvbmkk7xdn3misphl0fvnk1" } }, { @@ -46085,8 +46153,8 @@ 20210226, 1226 ], - "commit": "cea521750eddb3a70ccd38789d12b09bbdc7e906", - "sha256": "0mc9v8az97kap11f8np55xkbrl4mbiy6jfg76jaagkdsfizqpx5a" + "commit": "ccfa75c0b3d67201cdf0f2324f311544ade498db", + "sha256": "0cssj9ql66l842kv5lnkp26cf5r21a0b71l3bypv671jxqsc5l2h" }, "stable": { "version": [ @@ -46477,11 +46545,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210816, - 716 + 20210908, + 1543 ], - "commit": "333205066754348b3dd47c5ce834757dd1bbdf48", - "sha256": "1dd79bhvqcz2jwwki6q99815a99agadqk2dbbn7ib4s135xy4fyb" + "commit": "8402caa341d90b4236f5c0a802751f9023ccfbe7", + "sha256": "05pp38r8gb94w8gxnm3rkrawa7d73538lpz7lwccmlr83pvpl0cb" }, "stable": { "version": [ @@ -46623,6 +46691,36 @@ "sha256": "1j9cvy95wnmssg68y7hcjr0fh117ix1ypa0k7rxqn84na7hyhdpl" } }, + { + "ename": "hass", + "commit": "d9f55bfa87d6fbaeafe713f8862369ea013a0c67", + "sha256": "1jmxngfjad8vqd6abgqhf2a8x3vysxfhwk4qs0c327qfazmd7vq3", + "fetcher": "github", + "repo": "purplg/hass", + "unstable": { + "version": [ + 20210913, + 2051 + ], + "deps": [ + "request" + ], + "commit": "1a9d6dd6ce52938a5e5aa34d737ea5eab8f4c193", + "sha256": "0hs7qfd6ns7lsvcnh12z8yq171yhj2l4qj32m3xq9qrmimzdc9g9" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "deps": [ + "request" + ], + "commit": "7b068b91f99ac37c36ad9785863bb2e626179a8b", + "sha256": "0w7q0394q52bxhmn1f72dmfrisg03y6j35hp0rsb2i7rqzv8fdkp" + } + }, { "ename": "haste", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -46752,8 +46850,8 @@ 20200315, 2129 ], - "commit": "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd", - "sha256": "05j97g2l4rdx35a435xpdpq1ixgf9j94828fx4yhh4g60fjwwb82" + "commit": "e4d9eef631e8a386341ae8f94f7c2579586e65b5", + "sha256": "19xdag5qn3sgp30xdpannb9qa36jy6hl5n7pf866ir4l4lgpz6nx" }, "stable": { "version": [ @@ -46811,16 +46909,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210906, - 651 + 20210922, + 840 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", - "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" + "commit": "06c60b663babdf64383e5dc28b99ac910e04e6c8", + "sha256": "0l6q6crc7x3729sp8mh6g3ampzrgcjg6kjwh7nkw994vd82vg4m2" }, "stable": { "version": [ @@ -47113,8 +47211,8 @@ "cl-lib", "helm" ], - "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", - "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" + "commit": "bb47f355b0da8518aa3fb516019120c14c8747c9", + "sha256": "10y6k1jch43jykd8g8xi10k8wq98x2w2xap64smrhxvgp53y2765" }, "stable": { "version": [ @@ -47282,8 +47380,8 @@ "bufler", "helm" ], - "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9", - "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn" + "commit": "a68e0eb2719c67ab8a3ad56c4036364061d06004", + "sha256": "155g4p2yw88cpc8ydfzybc4r6ab2qwcmzdwkrrhnra4psimahjq6" }, "stable": { "version": [ @@ -47719,14 +47817,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210906, - 557 + 20210926, + 757 ], "deps": [ "async" ], - "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", - "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" + "commit": "06c60b663babdf64383e5dc28b99ac910e04e6c8", + "sha256": "0l6q6crc7x3729sp8mh6g3ampzrgcjg6kjwh7nkw994vd82vg4m2" }, "stable": { "version": [ @@ -48027,8 +48125,8 @@ "dogears", "helm" ], - "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", - "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" + "commit": "c05b69e504a538c9e00fbb0ea86934fafe191d0c", + "sha256": "12qvzd8wvryr2hnlv7l683148vxd1sry7s8y12xnysc7yz4dhsgv" } }, { @@ -48283,8 +48381,8 @@ "deps": [ "helm" ], - "commit": "5d6366adc14c51570374320fa827b0772833a61e", - "sha256": "0nrkghnsn83ah0jqbv7fx2i90p1z37lfmh6kwgjkr2aq4ggrcklj" + "commit": "0828c3c8975b34394d6ac7b73940113020cd50ab", + "sha256": "0pmrypz9zbs3zc26brh3rl30jmzxxh1iyjdg2rvsx0630bdgkfw9" }, "stable": { "version": [ @@ -48548,8 +48646,8 @@ "flx", "helm" ], - "commit": "9d57e4802aacfc50efe4804e45ace16f6931635c", - "sha256": "1l2vjksmgp7djxfwp6lyg9vqbsx2snc8h3wnf9pf020p3h4ccy9v" + "commit": "8d44247fd3600fe3e5e7a64a1904ae6b11bcc9fe", + "sha256": "1k86gz89s16sxqyab3gc6lxafdxcddvwmmpgqbg9mn2c8imsl8hd" }, "stable": { "version": [ @@ -49349,26 +49447,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20210906, - 738 + 20210927, + 710 ], "deps": [ "helm" ], - "commit": "178192296acd59c53d933dfa55e8a27b8ce802cb", - "sha256": "1wrnjzj53n78bll3jlqr7gwlx4x2awxh2zr34y9q02izlgvwwq4z" + "commit": "139f06f2cd03983da9ad509af5022b2fba0eff27", + "sha256": "0dc5kqza53i0gf2b78maflybczbmz5l34xnbxsy6z5h2a7l395fl" }, "stable": { "version": [ 1, 9, - 1 + 2 ], "deps": [ "helm" ], - "commit": "7b7b6dc2554603ad98412927f84a803625069ab3", - "sha256": "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi" + "commit": "563f664df4076ec214035c8c1f8cee47841565de", + "sha256": "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi" } }, { @@ -49818,8 +49916,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210608, - 1556 + 20210922, + 615 ], "deps": [ "dash", @@ -49827,17 +49925,22 @@ "org-ql", "s" ], - "commit": "94f9e6f3031b32cf5e2149beca7074807235dcb0", - "sha256": "022arhyyn8hbb1hzjkv4gl3dr8lz1gv0x4h70x0970bsbqlsa27w" + "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", + "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" }, "stable": { "version": [ 0, - 5, - 2 + 6 ], - "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", - "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" + "deps": [ + "dash", + "helm-org", + "org-ql", + "s" + ], + "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", + "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" } }, { @@ -50580,8 +50683,8 @@ "helm", "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -50715,8 +50818,8 @@ "s", "searcher" ], - "commit": "76a8de11e39da5c7a94066bcf3d515cdd23c6f63", - "sha256": "1698j6x0vbxfdpdknrzwihr4pwpl1914i3azarmngkh8wnhma26s" + "commit": "326b5777db284f1e24c4f94730834e4b1e2bb66c", + "sha256": "17dzzqgd3sn69g3idbrdbqw162rsa7s4fa15rh6jpyx42ylbgiba" }, "stable": { "version": [ @@ -52467,11 +52570,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20210617, - 1324 + 20210926, + 22 ], - "commit": "0ea43d320219ba4e6b7b1be36a5c1533ac3edb42", - "sha256": "1hg18rm7lqs45gvv1rb5d3vqh6g9nmyf2wd2sichl06a2cn48n16" + "commit": "27e3ab4195c70cfb5983c8c56b369b887efd3144", + "sha256": "0g351ybkcr5xh9a6gl8i85j04yg6d06qm03nz00cp7h6h6aciqjp" } }, { @@ -52555,11 +52658,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210828, - 1225 + 20210909, + 1114 ], - "commit": "d13a0892645536b970ce130a01ebe5f62e04689f", - "sha256": "0fw0qwxrc05paq17vdhvvwlzwrl351js8wf4mc5crkhahry9608a" + "commit": "42f744ffb513cf2b95517144c64dbf3fc69f711a", + "sha256": "1f84d4wms8q2kcj5mb6ih6b5ni35fwqvckp2j3mcdznms759j7li" }, "stable": { "version": [ @@ -52784,15 +52887,15 @@ "repo": "dunn/homebrew-mode", "unstable": { "version": [ - 20210820, - 1735 + 20210919, + 331 ], "deps": [ "dash", "inf-ruby" ], - "commit": "78e20613674247a65483f89a7912111e3ce4b9b0", - "sha256": "0snclyby8y2k7ps1qrbb18sx3d8h3dkw0d81sg1kxhlwddpp6n8y" + "commit": "8c630c6f768b942a86a10750f720abc64a817cd0", + "sha256": "1n688qffn8nrr45hnq4mmxr8v1wccjim50206c1xw8mvd63hnzhc" }, "stable": { "version": [ @@ -52896,11 +52999,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20210731, - 821 + 20210924, + 936 ], - "commit": "c09ee50c337a56114834b66ab3475985e3099d06", - "sha256": "1bl99zr75cbknvx1iilw7zjzzmpcv3h541jsz7cz8si1s4dcyhcq" + "commit": "e963cef1bf24b2da491c1aafd4260ee6ae3a766c", + "sha256": "1w51drd0zchgl5yxyg1a3rd0xkxf6cybfalzdz7cjprd8kmipmj5" } }, { @@ -52988,16 +53091,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210903, - 201 + 20210909, + 2000 ], "deps": [ "org", "promise", "request" ], - "commit": "61489045a1b1982d9bcd307fcc5bbd9195133c06", - "sha256": "0crzd0qyq751rlljs31vxblyvjcyjzfnj2x78rmqp7vj6hyr7xfg" + "commit": "a01971a7279c8a031de78513c004d7a09d293712", + "sha256": "05jmq05bjj0rfc6c69ykjrv6lavxpb21fnjny958if8hxzd7v1v8" } }, { @@ -53190,8 +53293,8 @@ 20200929, 559 ], - "commit": "97f885a550bed05f2fbdd933718313e6645a6ea1", - "sha256": "0b8wz43k64c2ca4kqjlp9zx97hafwmnjc38pa7lyip9yhhnhkkf5" + "commit": "ec85e68a4cba064d4caa593e1dec69b1b35b12dd", + "sha256": "143c4in1hykd3rnzrznri60aikmsm9fyhmmsx5gzapyr18lbw9wq" }, "stable": { "version": [ @@ -54078,17 +54181,17 @@ }, { "ename": "idle-highlight-mode", - "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", - "sha256": "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc", - "fetcher": "github", - "repo": "nonsequitur/idle-highlight-mode", + "commit": "43c7b0d74b482de5134de097e982934cd72c5f04", + "sha256": "1yrvvizw48lky06zjsx2n2w5cb2c5qz2kvcm9bpqyr5gp2w63pls", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20120920, - 1648 + 20210928, + 2305 ], - "commit": "c466f2a9e291f9da1167dc879577b2e1a7880482", - "sha256": "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv" + "commit": "3d785f0f1d5a41ec70453c3000ba3a3e5f0f7dbb", + "sha256": "0nfn1k7d6czqp0gib2mf4x2lrsjvcw1n6d7d4si85f14f3jrphih" }, "stable": { "version": [ @@ -54597,11 +54700,11 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20210515, - 829 + 20210907, + 1717 ], - "commit": "94f12bb6d2e03690562647b5fbb7b6672ac83e37", - "sha256": "1flpzvrnp3ilkal6xidmajipzhn9yzwkw8nwnl25bl9m4kjl129v" + "commit": "2854e73cebb463007b686a784b66242999c3366b", + "sha256": "0fyjdfv2pw7lkh3dgmp7cjlcpnsnn82ssfh19wngiskf3p405s1v" }, "stable": { "version": [ @@ -54764,20 +54867,20 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20210615, - 1506 + 20210918, + 2046 ], - "commit": "b61b1582abe8f7a389883f48b7e5243abb010a69", - "sha256": "19nbas7kpbxksd0vqbvf8awzpnrmy97yxd616kcxcp86qk34mlwr" + "commit": "e69a09e7962afe81474aa6c88974a1e6add15624", + "sha256": "0953irnlzx0nl4iirpgf7llyld2n8yl1w9yjkh0lvlz1l9gcpvqy" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], - "commit": "100d62c7095743fadddfad5b9e0740ee386ba4cf", - "sha256": "0wpfl74v7xnvsk3ribxkfyy4p5p9j2wskrcf0naavqpgm6fc6jvr" + "commit": "e69a09e7962afe81474aa6c88974a1e6add15624", + "sha256": "0953irnlzx0nl4iirpgf7llyld2n8yl1w9yjkh0lvlz1l9gcpvqy" } }, { @@ -54954,20 +55057,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20210126, - 1127 + 20210922, + 1826 ], - "commit": "c5684a17c78e6e05ea0bdb63e44373b064db935a", - "sha256": "09fw0bgqr7fhwhm7vgdd12iw9nbgn19qna7k6vv1ljsdfcmwg5s5" + "commit": "c3f35042264a734fb5cb105a81689c35e0622df0", + "sha256": "0r5q7i6rjxbi3vn2013261il1zk5si66b7x8npqmgrpd8bx8vvap" }, "stable": { "version": [ 0, 7, - 0 + 1 ], - "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", - "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" + "commit": "b2b625f690e207bab7b60a23585eba9c2831607a", + "sha256": "173mw87hbr1hk0k859liba7sybsxpmdv0d7d97iyy2khhmn7xkn6" } }, { @@ -55055,8 +55158,8 @@ "deps": [ "impatient-mode" ], - "commit": "bcb636dbef4630c5ae654642c6a637cceb588cac", - "sha256": "1nnmx7f256cll04wxwip3a1pll3rayiqx4ynirrm1ld97q8hdc3v" + "commit": "04ba1617d9f11105f7db01ce39b4c7746aa13974", + "sha256": "0pjr6bnd3vjqf3i64gyp9sqx81an9xc2sgawza33b8hmnwvgarmw" }, "stable": { "version": [ @@ -55172,8 +55275,8 @@ 20210508, 309 ], - "commit": "bfacd60a4be68a89d150f0bf2a9fb8714591f6f5", - "sha256": "1dxdzvg6bpz0wgj2amqy7q9xl8xi7clsw10d9c86gbq87b9js681" + "commit": "ed99e867f81ef69854182b519db1b9141fcdb2a2", + "sha256": "04l6ws5fr19k7klpib5yz4zyqmf2aiywdm85kz5skhf196hm21g9" }, "stable": { "version": [ @@ -55829,11 +55932,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20210716, - 58 + 20210916, + 454 ], - "commit": "c3683aa99c738eb46cf310ba23162dbb315a5ac5", - "sha256": "14k3n5kn9z2lqdhm00qy0hz8synnv28i17gn518ps4cyk298dmby" + "commit": "3c66d4a09a0dfa7275eae125dd00a5677f2fba5b", + "sha256": "0f9g9j3kbld208rvgby1636gmjy26hv5sd5nbnfd74hm56gfh2rv" } }, { @@ -56335,15 +56438,15 @@ "repo": "Sarcasm/irony-mode", "unstable": { "version": [ - 20210321, - 1750 + 20210605, + 1018 ], "deps": [ "cl-lib", "json" ], - "commit": "ec6dce7ee16ffaa9a735204534aa4aa074d14487", - "sha256": "0pabzcr06jywa3n4bax8dxxkmb1ffq3cpw1jnxnqpx18h96pfar2" + "commit": "b9c64abf81e73860e39ecd82dfa00cca90b53d99", + "sha256": "1ilvfqn7hzrjjy2zrv08dbdnmgksdgsmrdcvx05s8704430ag0pb" }, "stable": { "version": [ @@ -56425,8 +56528,8 @@ "deps": [ "f" ], - "commit": "796e4e9a2508120ae430f522115c7d174d912276", - "sha256": "0wlh2ph87qa3i3n7j2mvih428ih65gqj0bzqwqw123cfflcz6xy2" + "commit": "ac829919c144aef94232837a63ed19f029a90515", + "sha256": "0ykzjflb101jn7x6g902xn2bkpc6v3ymm79vwndkl01n172v23m3" }, "stable": { "version": [ @@ -56658,11 +56761,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210903, - 1814 + 20210928, + 949 ], - "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", - "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" + "commit": "5f49149073be755212b3e32853eeb3f4d0f972e6", + "sha256": "0255rzzmqg6cq7qcaiffzn52yqfkzg2ibr8z9kljzgfzbarn337h" }, "stable": { "version": [ @@ -56689,8 +56792,8 @@ "avy", "ivy" ], - "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", - "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" + "commit": "5f49149073be755212b3e32853eeb3f4d0f972e6", + "sha256": "0255rzzmqg6cq7qcaiffzn52yqfkzg2ibr8z9kljzgfzbarn337h" }, "stable": { "version": [ @@ -56714,16 +56817,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20201014, - 803 + 20210927, + 1205 ], "deps": [ "bibtex-completion", "cl-lib", - "swiper" + "ivy" ], - "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762", - "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s" + "commit": "bb47f355b0da8518aa3fb516019120c14c8747c9", + "sha256": "10y6k1jch43jykd8g8xi10k8wq98x2w2xap64smrhxvgp53y2765" }, "stable": { "version": [ @@ -56936,8 +57039,8 @@ "ivy", "s" ], - "commit": "3ad203f6166f82c7a09ab4ad065fd40136915fb8", - "sha256": "07mdv0cnrjys0lcxamwpg5xl0g7wb0mgnzbkqyaik559avp5kq5a" + "commit": "368c0c2db6b2ff279a956b8075eaf9ba2c334234", + "sha256": "1q2k6118yip8vlpaf8jhygi23wvf7zy7s3bpv51jgfkw89a3vgxa" }, "stable": { "version": [ @@ -57057,8 +57160,8 @@ "hydra", "ivy" ], - "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", - "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" + "commit": "5f49149073be755212b3e32853eeb3f4d0f972e6", + "sha256": "0255rzzmqg6cq7qcaiffzn52yqfkzg2ibr8z9kljzgfzbarn337h" }, "stable": { "version": [ @@ -57226,15 +57329,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210609, - 1053 + 20210922, + 24 ], "deps": [ "ivy", "posframe" ], - "commit": "9c8382823392d5e64fb4879055e43ab4a029e62a", - "sha256": "1dqbgi12rd79jkrbyd59lrx9b5wi5a0k2xmf927c4mcqjfbvih2w" + "commit": "b4a522b7f81d49e7664f90a4f9ff1c2def08a3a9", + "sha256": "05rd1kylq0114mnw0rfj2k15pir9shgy19n1ih86i85h718z2z80" }, "stable": { "version": [ @@ -57357,8 +57460,8 @@ "ivy", "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -57390,8 +57493,8 @@ "s", "searcher" ], - "commit": "84faba3cd87374f54d5e27344d4812737375fbaa", - "sha256": "1lxiamv0960j1sfs9afqbdkp7mjkdbi1nw1nh5w8q3m9a44c1h89" + "commit": "0e8280ef40814eab1065d442146fe81ab1fc6149", + "sha256": "0cfhdmbrm41q3iwmrr0amhk3csrwxhqbisayjc5s01bf129rx7rf" }, "stable": { "version": [ @@ -57670,11 +57773,11 @@ "repo": "brianc/jade-mode", "unstable": { "version": [ - 20160525, - 1441 + 20210908, + 2121 ], - "commit": "4dbde92542fc7ad61df38776980905a4721d642e", - "sha256": "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1" + "commit": "111460b056838854e470a6383041a99f843b93ee", + "sha256": "1v6j0658dch5v0ddkkgw99194jlh28p5cjvkcp6cabwjb7s4pvim" }, "stable": { "version": [ @@ -57718,11 +57821,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20200509, - 1651 + 20210924, + 44 ], - "commit": "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7", - "sha256": "0qj0gpycv2f3z1dgz1a27bjn983hrr3ppvrp7csl34lagnmp89rz" + "commit": "9e3254a0249d720d5fa5603f1f8c3ed0612695af", + "sha256": "1c95znizd2xs84ggk70qy0lya8s6w83d0d2fl95iccj37r12m00y" } }, { @@ -58776,14 +58879,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210830, - 12 + 20210906, + 2337 ], "deps": [ "cl-lib" ], - "commit": "b913961e410dbfdc52a80d62eb4cfe7a305b4e3e", - "sha256": "0xxb25a6vixzfxsndyy2mgwbpr4h5pm76fq9ibw7434yc8zjwmrj" + "commit": "e6a9059fc823a17496e1a5114652d92a9071a78f", + "sha256": "16i0i0dz6yk24ny66irlfh9xjllp7a78ccx95mrlpqcxsjkcqv62" }, "stable": { "version": [ @@ -59249,14 +59352,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20210408, - 639 + 20210913, + 1256 ], "deps": [ "s" ], - "commit": "79e686e3ebf164bd39fc2ea5cf09d38d0e1d763a", - "sha256": "1dn1n726lp5m744s4qib6rgcp2an01qblj7ynams3drgca6j6076" + "commit": "3f888ecd30f613ed50f67c614be0b42b7546c693", + "sha256": "04baf40gqd1mzk7pvyq663ndg5byyq848r802j10zvggvacjwcbx" }, "stable": { "version": [ @@ -59540,6 +59643,41 @@ "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" } }, + { + "ename": "justl", + "commit": "5a74b3213ab362fd00a11409e046854ec832c827", + "sha256": "01s9szxr83mdjnzhjy0xr9fqk4vzv3spphq68jpzcj56njah6r9b", + "fetcher": "github", + "repo": "psibi/justl.el", + "unstable": { + "version": [ + 20210924, + 1138 + ], + "deps": [ + "f", + "s", + "transient", + "xterm-color" + ], + "commit": "18604956b8f6ba58cba99470464c67f7b16ce329", + "sha256": "1d6y84gm5n9gkn7v9rhxhxsihabrdgx6mddam0pw75ka53q5s8wi" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "f", + "s", + "transient", + "xterm-color" + ], + "commit": "db77f4ada0840dfb6080121f80249b11721ee779", + "sha256": "0250yayv136ypsy5gy814lv1schm1pza51lvsad7ayr3z1l812b3" + } + }, { "ename": "jvm-mode", "commit": "7cdb7d7d7b955405eb6357277b5d049df8aa85ce", @@ -59869,15 +60007,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210814, - 1741 + 20210928, + 958 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "716aae7e64637e1a7fdeed8ef5b278512b8076f9", - "sha256": "0h7ipf2n9bbp6k1qda1g634gvjx2p3x2g4nkf8473iihk8960k1p" + "commit": "69b4695dd3bce88aa3352fc390ea6ef298b15f09", + "sha256": "0qiz078jf2p4j0arxvz0xlwaj9h9amvql06zfpfpsv6a3lkgh8gg" }, "stable": { "version": [ @@ -60446,8 +60584,8 @@ 20210523, 403 ], - "commit": "075b05b6ed7fe1b9f4f22544bc26749243de6808", - "sha256": "01qwcr65qzz0ilzj9318hnz9hs3gdd722xpajmp8sa1520w9vhzm" + "commit": "c49bb51287f953ccc62e4f1afc12ca9bfeaa416c", + "sha256": "0xxgym0il50piqyyyywjma8ks328pzy0g743rnxkvsikinwzg6ly" }, "stable": { "version": [ @@ -60492,6 +60630,30 @@ "sha256": "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c" } }, + { + "ename": "khalel", + "commit": "6860800b52e2c06ae339f5f65ace6a5e05ddcbbc", + "sha256": "1g5r1zz3x8w3azip72wrw0168n3fzkzgik3w094yapchrrv13cpq", + "fetcher": "gitlab", + "repo": "hperrey/khalel", + "unstable": { + "version": [ + 20210920, + 1848 + ], + "commit": "f51941f933bb3778cf2cea2f6736969d8de3ae06", + "sha256": "00bw21pjwfig7z91k57924dgh20aj6yhpfdhvk18pwx0yc34yw18" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "f51941f933bb3778cf2cea2f6736969d8de3ae06", + "sha256": "00bw21pjwfig7z91k57924dgh20aj6yhpfdhvk18pwx0yc34yw18" + } + }, { "ename": "khardel", "commit": "d0dafe07d355f705b268b19460cf071ab878961f", @@ -60678,8 +60840,8 @@ 20210318, 2106 ], - "commit": "92ff508dc17831a57a4bb900d7bc218b577e066e", - "sha256": "1gmkf00mka99griysazipph27xfx42s5jfrrcy3mxwmlzs6zgfd3" + "commit": "d526ade135ad19546c3870cae18873deb9be0039", + "sha256": "0jn793ngr998aaznws0axfkcraxbzqq55zxvqgycw9z5viacxf6k" }, "stable": { "version": [ @@ -60699,14 +60861,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210811, - 31 + 20210909, + 30 ], "deps": [ "request" ], - "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", - "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" + "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", + "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" }, "stable": { "version": [ @@ -60865,11 +61027,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20210831, - 1802 + 20210917, + 1911 ], - "commit": "876cc27dc105979a0b59782141785f8e172891e8", - "sha256": "1vyls3ilypxskhng96z1m8byripmbsghgfalsg4qnmn8lakaq68d" + "commit": "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb", + "sha256": "15gxznanmcgjgcqlcazschxcwlsmd4rzivw0jb6pvz3m7zabd16r" } }, { @@ -60963,8 +61125,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210623, - 1316 + 20210927, + 1601 ], "deps": [ "dash", @@ -60972,8 +61134,8 @@ "transient", "yaml-mode" ], - "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", - "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" + "commit": "e3fc9f2dd37f36433718f9ac8a835cb19c1d9afb", + "sha256": "1yjfm1aa9319bvl8rsaakknlfh7nhjrrizwhvhgvz6qnjfsr5ni9" }, "stable": { "version": [ @@ -60998,15 +61160,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20201223, - 1657 + 20210922, + 2325 ], "deps": [ "evil", "kubel" ], - "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", - "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" + "commit": "e3fc9f2dd37f36433718f9ac8a835cb19c1d9afb", + "sha256": "1yjfm1aa9319bvl8rsaakknlfh7nhjrrizwhvhgvz6qnjfsr5ni9" }, "stable": { "version": [ @@ -61029,8 +61191,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210830, - 2219 + 20210914, + 1158 ], "deps": [ "dash", @@ -61039,8 +61201,8 @@ "transient", "with-editor" ], - "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", - "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" + "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", + "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" }, "stable": { "version": [ @@ -61074,8 +61236,8 @@ "evil", "kubernetes" ], - "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", - "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" + "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", + "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" }, "stable": { "version": [ @@ -61289,6 +61451,29 @@ "sha256": "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy" } }, + { + "ename": "lacquer", + "commit": "c06360c9aeee408d144f756943a65cf465e41139", + "sha256": "1bi59x2l6xxayr4dqy2bpkfx4gd5sc9ban9dc2hykphvz560qmqn", + "fetcher": "github", + "repo": "dingansichKum0/lacquer", + "unstable": { + "version": [ + 20210928, + 1043 + ], + "commit": "53f78259023d7aa58045d63e74bab0279f2678fc", + "sha256": "0ds3lz9by4q8p06zpaad6qw7hr48la6vi3mk97sb66jvd06g18x4" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "53f78259023d7aa58045d63e74bab0279f2678fc", + "sha256": "0ds3lz9by4q8p06zpaad6qw7hr48la6vi3mk97sb66jvd06g18x4" + } + }, { "ename": "laguna-theme", "commit": "58566386032a017c26ab07c551e72fbe1c20117d", @@ -61335,8 +61520,8 @@ "highlight", "math-symbol-lists" ], - "commit": "4cf69db45aeeb01feb6b38c88b6aa2d01ae4da13", - "sha256": "1ihs24dqnbzj37y9zrwdwzwnr1xrxcs4qxm0z3d1bjalffai2x13" + "commit": "f7edfe41b3e71c1d3aaec8ec66f29e4ab9997ca1", + "sha256": "04c2hmik964lqfz7liinhx7i7gq76cfayyjy3hkqa7lgzkd9zdd5" } }, { @@ -61461,25 +61646,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210822, - 412 + 20210916, + 831 ], "deps": [ "cl-lib" ], - "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", - "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" + "commit": "906fac7d91994d02120cfb5f547c1d06cea1ad69", + "sha256": "1rgf90z6rl5g348s49w39ng7avq2s9qwi7mmpfxi3hjaslazn1jl" }, "stable": { "version": [ 0, - 16 + 16, + 1 ], "deps": [ "cl-lib" ], - "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", - "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" + "commit": "906fac7d91994d02120cfb5f547c1d06cea1ad69", + "sha256": "1rgf90z6rl5g348s49w39ng7avq2s9qwi7mmpfxi3hjaslazn1jl" } }, { @@ -61845,8 +62031,8 @@ 20210611, 1550 ], - "commit": "a4fd520f5c31f54e0797155866e0b35df277664e", - "sha256": "0xy1zjr32xpj4kkl3rxshcz5x2qvkn1ciq4v61p6a7vfr3qmkiz2" + "commit": "0ccc52bb85592d09499a09768a61ecfeccbfdf1e", + "sha256": "0nwma6cvvlfyjxkrzi724brkx5s6k64n994nbwp7zaz6rqs1xmfd" }, "stable": { "version": [ @@ -62057,11 +62243,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210831, - 1906 + 20210918, + 1346 ], - "commit": "db13769ffc821dbcf6daa37f9add46de21ed1a3f", - "sha256": "1xxhbgyki8nkkjnfzqxllrcfmqlj6sqgvwxvqz7v4j6m40c745m6" + "commit": "c368480d6b5d5b80d204e160cd1a5f0a98b3404f", + "sha256": "0ypazrmj7wq32ijm512q1k73ibi4avpyckab5s3ddh1zfa0yf2f0" } }, { @@ -62263,11 +62449,11 @@ "repo": "mtenders/emacs-leo", "unstable": { "version": [ - 20201122, - 2210 + 20210922, + 1138 ], - "commit": "b9d8f6705dcec4fcefd4209c18a043c355988c3a", - "sha256": "053w15s7lr5y4vay6057by15lymk4n18a8a6hac3a4jrjkzj2f8j" + "commit": "2ab30fe567412b4f4e69bc8014b8886d19b30f30", + "sha256": "1sjgp0yfa3ynrksrf33gc4qrhj7819lih2ax0sq83vd4gn2m6lcn" } }, { @@ -62654,8 +62840,8 @@ "deps": [ "request" ], - "commit": "bfd5ef11f26ba46c8e0894ea08ffec74cca72288", - "sha256": "1x02lwplyd41qaxy27np2fza818p0h62np6kd9sqqxkng4ahy97z" + "commit": "9d945eecb31c6be02bf0388c5c6883dfd1782bb9", + "sha256": "1f1ykbjrvz11i4sj1ff9hyl3kl65ll1c88gxgb66gmbxggqy5mja" }, "stable": { "version": [ @@ -62696,17 +62882,17 @@ 20210303, 1751 ], - "commit": "edd5c702a7b94440bd76f7ef16ca58f028d06ef6", - "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" + "commit": "04fc9f1b106ab34e1a7cd7aa618682d09ecbe83e", + "sha256": "1lhxzhh72wysmnm3qigr7bfxa7bak074i4bdl49w7n229g90whkj" }, "stable": { "version": [ 0, - 24, + 25, 0 ], - "commit": "c351737acfdd778b81a64065d8d20ebb10a006f0", - "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" + "commit": "5f32e8ef0fbebcb413fa1e8a3c5c15985b51cc42", + "sha256": "1lhxzhh72wysmnm3qigr7bfxa7bak074i4bdl49w7n229g90whkj" } }, { @@ -62724,8 +62910,8 @@ "fringe-helper", "indicators" ], - "commit": "38ca45f01b31d5de07a4a5e43ec54c4644718dcf", - "sha256": "12qcrsjb9j9w7nqr28ff1gnk4icl134pgjvm9ph5psf6a6qd9d78" + "commit": "97494f705c0208ccc8dd51d8c0366cb2bd5f228e", + "sha256": "023kx8v7phaw3why3zkh1q7n6igqb0zgf37zkli6gi8y4spzlbns" }, "stable": { "version": [ @@ -62857,14 +63043,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210727, - 1302 + 20210926, + 1333 ], "deps": [ "avy" ], - "commit": "d3c5bacc9c697c4cf8b14616c4199210f9267068", - "sha256": "1d25lf556c9idr0slzakcks93rcw032bp1hbbcqffrljqzapxz4x" + "commit": "4326da5617e5d04715538536b93c44a085f5dad1", + "sha256": "024cyywz38bpb9szqjnnc0pjrl7cxi7k59bbgpa740r7713qybs4" } }, { @@ -63061,8 +63247,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210906, - 1503 + 20210914, + 1209 ], "deps": [ "ace-window", @@ -63071,8 +63257,8 @@ "iedit", "zoutline" ], - "commit": "e5d0f949f76df23245e3904463c433d0908e9b7f", - "sha256": "05qagghksg1m7dd0dijw0xjzn1yqpfb6n7vr759injpa39lswcrh" + "commit": "9568ee1aa5ac12e0ed03b9904b77c7a5bc4bb2e2", + "sha256": "1ysprqpha2nxf3zak0lssls66asfl95qn58q90k57p1hpf0qbs06" }, "stable": { "version": [ @@ -63218,22 +63404,20 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20210812, - 1729 + 20210927, + 1452 ], - "commit": "a8cc3c5d1f0f4b710e15e76477eae40a99a79ad7", - "sha256": "0n6xiyx9syxxq7867ir1nrm5bzjilrp7vcjch279754v238lgcpf" + "commit": "644536a48ea9dcca12a971184e02eeb6352305f2", + "sha256": "040jq7vjzmirf1dblvx1kaccbcm8883ihc46y0cdq951n5h7p0r5" }, "stable": { "version": [ 0, - 7 + 9, + 1 ], - "deps": [ - "seq" - ], - "commit": "06eac24b6d229eb559eb7f8e6097614e647b4dab", - "sha256": "1mdmpm9iv0zfv64sjnfvx8pqm7vi8v053f2rpj7glkgm8nmms5lb" + "commit": "4c442c18ed5e4865393e72ffff16de9919b54456", + "sha256": "07h55vsfmpf4r1dggjn4a0xxpxahbj1amyfywbf21wx59p17aja8" } }, { @@ -63511,8 +63695,8 @@ 20210701, 1955 ], - "commit": "21fcb1a86167e93bf847d60f4f1b4e99eb2f1641", - "sha256": "0rl1cmlx1g07ncyksj1ydi5mvy58ax67jnzdfq6c3s5jlc93kxwd" + "commit": "f23aae022ecd85eb7a88f390dc37d34ec2ce7ceb", + "sha256": "0y5nl75y06m4jn63lwx7j2qjh012ix75hfmbvnpzscgqm54mm8c7" }, "stable": { "version": [ @@ -63907,8 +64091,8 @@ "ht", "s" ], - "commit": "497eb1fa71340a8d7758dd7c8115de05ab452129", - "sha256": "1c5psadb590wbcqab0bjdfdsfd3rninbahr42pbi8gvdg0ay9qws" + "commit": "904d90665fc67b5baba0357bf1ef2ac87e8cd43b", + "sha256": "1adqlm92skfndv4f6qpy3kas6mk23dy3b54f9i6b8pbw8g7p13rs" }, "stable": { "version": [ @@ -64142,15 +64326,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210906, - 1614 + 20210923, + 2332 ], "deps": [ "map", "seq" ], - "commit": "74840299407b23a75bd415903a2157e71e68bd7f", - "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + "commit": "57542718c108e959c1577a0ea6531badc8221d01", + "sha256": "1z68kjhbsm97w2alr5rkks9qx1yfka5igg57p1rmm1mncnkmv3k9" }, "stable": { "version": [ @@ -64181,8 +64365,8 @@ "dash", "loopy" ], - "commit": "74840299407b23a75bd415903a2157e71e68bd7f", - "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + "commit": "57542718c108e959c1577a0ea6531badc8221d01", + "sha256": "1z68kjhbsm97w2alr5rkks9qx1yfka5igg57p1rmm1mncnkmv3k9" }, "stable": { "version": [ @@ -64363,8 +64547,8 @@ "request", "s" ], - "commit": "bb7fe5d70a3d21813858d93f70fe807beba99688", - "sha256": "143afkkfm7dvhlpl77j98hbm5fk2jsrrkxkx1dpn17mj74ijq0ix" + "commit": "0a8d9468aeb414bc698566534389031837ba354d", + "sha256": "17vgbqyij0q0yms5sxk9f66cxzczfpxf8wykmsgpc7xac1igf7pm" }, "stable": { "version": [ @@ -64461,8 +64645,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210806, - 1842 + 20210928, + 1353 ], "deps": [ "dap-mode", @@ -64474,8 +64658,8 @@ "request", "treemacs" ], - "commit": "2a7d27e899edf7ad221a546ed67711ef5487f3ec", - "sha256": "0w5rq9g3gr5miqkhbj400r7gazsxs4lf9906y7a3p2avr400h930" + "commit": "b3f2081158284c77665a0dd5e9f815535ff080b3", + "sha256": "0p3sydid77zbrqmkm1l9igbhbzyp9q4229dqgly8dbsgkmyfrl3h" }, "stable": { "version": [ @@ -64616,30 +64800,30 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210826, - 1034 + 20210924, + 1003 ], "deps": [ "f", "lsp-mode", "s" ], - "commit": "59ecc6db3bcf80568241be2d99bb7ef60c58e502", - "sha256": "0avl1ifkc106gaznpwli0gqwfbfsxj8zij3sc4vy2d00ppr4173r" + "commit": "16ba29ed600314e28b18eb1b3dd47d84035d5403", + "sha256": "132bnkgwayx91v33ic7rw9j59l24i6ndg6s65f2fvhy27vm6qcmj" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "f", "lsp-mode", "s" ], - "commit": "5d25bfdc80da46b4839289164d1c4c3699c8908f", - "sha256": "1xf1pxbgjql9badcb1wayzv7j117syh488y82m5q061nnpq4lz06" + "commit": "7ff60400f23efe4916778e7b21a238114e5cdba7", + "sha256": "0s7xi41di8gszn0fz04lpnv610xgydfr5hylp3z1dshba2kpkk1f" } }, { @@ -64650,8 +64834,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210815, - 929 + 20210914, + 1821 ], "deps": [ "dap-mode", @@ -64663,8 +64847,8 @@ "scala-mode", "treemacs" ], - "commit": "ca927e5a837c4e613727c804a14d9c8d36ecfcdc", - "sha256": "0yz4z53iwrz7kz45fqsy3921badcszn6c8zwxsnzgw2qd191hwy1" + "commit": "695291761b2a3db734c3f53bb7fc4acfe0a5eb94", + "sha256": "0kg51yjrjrmsz78aj3ahbk2knrn8ccz4ccs894p8li6vz3gxm2fh" }, "stable": { "version": [ @@ -64694,8 +64878,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210905, - 1124 + 20210927, + 714 ], "deps": [ "dash", @@ -64705,8 +64889,8 @@ "markdown-mode", "spinner" ], - "commit": "d9c8ed3a932b568614d9bbf682271cf43bb8ec73", - "sha256": "0bj87sfadry03lsnlmy4d75za5a2q5p8i981pnz8gvhi154fhz93" + "commit": "1f1a97331da472627dd08bfe3e463cfbc5fa0f0a", + "sha256": "1m54fbx2adhav9hbip9jxpiq7bv56cqi1wbzf0720rv5bi1cnc04" }, "stable": { "version": [ @@ -64974,14 +65158,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210826, - 1046 + 20210914, + 605 ], "deps": [ "lsp-mode" ], - "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", - "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" + "commit": "bfcae3f53a500b712f503f5a16d25502a480a892", + "sha256": "1x7winhg20qz95ca4vxaaxqrxgjqg86wslkrl3p7yindw03xywih" }, "stable": { "version": [ @@ -65003,8 +65187,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210904, - 2039 + 20210923, + 2112 ], "deps": [ "dash", @@ -65013,8 +65197,8 @@ "lsp-mode", "treemacs" ], - "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", - "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" + "commit": "7bf3d52bccb4a5fdce4fdde9ff61bc75161b97af", + "sha256": "0vbwam492y858cq1mrka9bn2i695c6rxvap8z92diklmaawdkg4p" }, "stable": { "version": [ @@ -65281,8 +65465,8 @@ "f", "request" ], - "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", - "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + "commit": "f0212bea838f0c284ea97e051c9c6c63f1b527ff", + "sha256": "03mnj12b7y597p77066c979d0pbyz4a092vgjyb830dhihms2x5y" }, "stable": { "version": [ @@ -65536,11 +65720,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20210903, - 1345 + 20210907, + 804 ], - "commit": "d5da43b6a49b7b6a0b6b9ed19c13ac5a076b79b2", - "sha256": "15d4vzr4cww25ic6im9372nl43pdsn8bm9hnpyqjfg3c3axnfp4l" + "commit": "6fe271f371ccb06b599a782839030bb8dee8535f", + "sha256": "178whq47zs055srly8wzdai5p0d0s1n3p349kb5wx2d9c2lg0pnm" }, "stable": { "version": [ @@ -65560,8 +65744,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210906, - 1023 + 20210928, + 1325 ], "deps": [ "dash", @@ -65570,8 +65754,8 @@ "transient", "with-editor" ], - "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", - "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" + "commit": "f53148a569191bdbfb78d76f28481b91c60cb846", + "sha256": "0nlw3p77d625dw7maaihs65x5dz0i7alnzyinjiw42kd1cvyxrgh" }, "stable": { "version": [ @@ -65849,14 +66033,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20210525, - 2326 + 20210921, + 257 ], "deps": [ "magit" ], - "commit": "cf3b4646aa0205e8d7f47e45165fe6403d6440f5", - "sha256": "1j96vg9kc03vxxq4r5a7v4di88pvbb5i01n8js06lgs9qzl097k7" + "commit": "bd548da8b0c982c346c5c3d11641b9602415ab74", + "sha256": "0i9mgnssa3982k0hin9kil6kj1xvjbwyhkm76pynlws0bxx786ih" }, "stable": { "version": [ @@ -65879,28 +66063,28 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20190831, - 118 + 20210918, + 2000 ], "deps": [ "dash", "magit" ], - "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", - "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" + "commit": "ee005580c1441cce4251734dd239c84d9e88639e", + "sha256": "1mv5rw65gn2rsk654q1ccp7hdg6jfap123b652cf9chwxy6c6nrk" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "dash", "magit" ], - "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", - "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" + "commit": "ee005580c1441cce4251734dd239c84d9e88639e", + "sha256": "1mv5rw65gn2rsk654q1ccp7hdg6jfap123b652cf9chwxy6c6nrk" } }, { @@ -65918,8 +66102,8 @@ "libgit", "magit" ], - "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", - "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" + "commit": "f53148a569191bdbfb78d76f28481b91c60cb846", + "sha256": "0nlw3p77d625dw7maaihs65x5dz0i7alnzyinjiw42kd1cvyxrgh" }, "stable": { "version": [ @@ -65994,14 +66178,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210616, - 1302 + 20210910, + 1333 ], "deps": [ "magit" ], - "commit": "623d1a6a3bfa0f01bcaaffa13ad5ce5ae29cdb0a", - "sha256": "1dds83a6fcpakmhny5n3s4ibcvjba4p07pg8bpy37k32c704lw27" + "commit": "875f8ace4c38d1f6f2126ab0f038687c42f1ab2b", + "sha256": "1mbh5qshaiv5x6rlklzx9l3icccb9kn3rvbdaq1xbqbgfdpfhfwd" } }, { @@ -66086,8 +66270,8 @@ "deps": [ "dash" ], - "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", - "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" + "commit": "f53148a569191bdbfb78d76f28481b91c60cb846", + "sha256": "0nlw3p77d625dw7maaihs65x5dz0i7alnzyinjiw42kd1cvyxrgh" }, "stable": { "version": [ @@ -66705,8 +66889,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "ae46a80e27dc42913620ad78d7a84ece12643bd7", - "sha256": "16ygsxk5raa6p767jp6g5hmgsghq0dpk102g526d770iim5s8nlb" + "commit": "22a00d919d56ae7b3c3bf3090cafacffaeb50d7e", + "sha256": "1pidsjdx1wdd02vmcl74ps622n9fyydbn8jpbrlbm6y6ffhy6rrz" }, "stable": { "version": [ @@ -67005,8 +67189,8 @@ 20210904, 733 ], - "commit": "4810cac10355310ec76cd0946d0af92d595b3b81", - "sha256": "0yl98mk1qbgwk3qhnkq73njfkrb7hxydk66lax9r2900dnrifhlg" + "commit": "862ae8addd29bf6affca1a35fd0176cb0c1392da", + "sha256": "0dd0p04ip5wac7vcimlsm33l5nwswyf6riq2wzp3j5ppkr57x1s4" }, "stable": { "version": [ @@ -67217,8 +67401,8 @@ 20200720, 1034 ], - "commit": "67d19ed3d74c335a6a0e4798c98841c940ec911f", - "sha256": "04dyb3nn5rdgic1m74sv9wzxkfxvszk3sj2fnixp41dj3pvwwdwb" + "commit": "5a63cff899eeb58abc3d0cdc6a0e5a6bbf13eaf6", + "sha256": "0g47ch2wnd25vc2g0mypkxdgjjkqznknk14qxxmmyf5ygp5f4ysg" }, "stable": { "version": [ @@ -67345,15 +67529,15 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20210729, - 1842 + 20210909, + 1220 ], "deps": [ "dash", "s" ], - "commit": "b6f54d7a53d2ed5c71fc9ab6d65da63103c799bc", - "sha256": "0hzchn5m5r0iv0im43paxbpd00fyv4m1rv53asp1fg2h27zg7xfz" + "commit": "90821e2993c8976e6a06f3bc2bf39aae6fbad016", + "sha256": "04hb48ncxvh3ia416iyy0x0wpvkhmpqg369565zgmhg9mvl3njmz" } }, { @@ -67517,26 +67701,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20191006, - 1930 + 20210917, + 1715 ], - "deps": [ - "cl-lib" - ], - "commit": "7230902e1f844e0a1388f741e9ae6260cda3de69", - "sha256": "09qsc4dl9ngl11i92bfslpl1b1i5ksnpkvfp2hhxn3hwfpgfh64s" + "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", + "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" }, "stable": { "version": [ 0, - 5, + 6, 1 ], - "deps": [ - "cl-lib" - ], - "commit": "7230902e1f844e0a1388f741e9ae6260cda3de69", - "sha256": "09qsc4dl9ngl11i92bfslpl1b1i5ksnpkvfp2hhxn3hwfpgfh64s" + "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", + "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" } }, { @@ -67923,16 +68101,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210825, - 1800 + 20210908, + 1532 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "56f0365dca1dbb3e97a32cf3da65f817598731b2", - "sha256": "10qp7s84p0j9byrwsfwbr1vyvad8v5y28v8dv7x7mm05pkcr9vv1" + "commit": "3e58697695327d1ecf2a210af645e8f2db845c32", + "sha256": "0fl9fc7sibivna92ddnh6vv271qykkn9bw97nak1cnn9isi5hvn6" } }, { @@ -68162,8 +68340,8 @@ "deps": [ "magit" ], - "commit": "50dd3d92a1794f24b7e375b74e5199c63b54a2d8", - "sha256": "0l2wpapm0gng4jwicwi6w2sz71v4f2j99faakyh07acyvry1wdbi" + "commit": "40bc2e554fc1d0b6f0c403192c0a3ceaa019a78d", + "sha256": "0cmkiggrl42sjx31dwnzac32bs3q2ksmamkq1pjjl8fwshp4g8sv" } }, { @@ -68305,8 +68483,8 @@ 20210422, 326 ], - "commit": "543813e0acceb55653d876302a5d5741879fb717", - "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" + "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", + "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" }, "stable": { "version": [ @@ -68397,8 +68575,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20210606, - 1501 + 20210927, + 2356 ], "deps": [ "cider", @@ -68408,8 +68586,8 @@ "projectile", "s" ], - "commit": "ddba1d60d6729bbeeefd0f76dac4e6c20e848f67", - "sha256": "1c454baagnvbg79yia5vwk51n0fp031rz0xhgawk70lrfjbc8256" + "commit": "8573bd3d2a755cf1ac055036ecf5553f9bdb7444", + "sha256": "19bi5fplp8vg6c81dk2fhw345qh4ydw8gjjqcbhli18a29q2yrbm" }, "stable": { "version": [ @@ -68428,11 +68606,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20190324, - 1908 + 20210131, + 2152 ], - "commit": "6a7d904fae5014aabae8c91add220485108d485b", - "sha256": "0r0msrnbz9177cv1mlacsyd35k945nk2qaqm1f8ymgxa99zy124i" + "commit": "b9741e87bd2b343e7f26197f59fe58f20659f7ec", + "sha256": "14fsj44alspmqaga89fakdfwwp69qqj754iy5his7qfgx40gl1ir" }, "stable": { "version": [ @@ -69035,8 +69213,8 @@ 20210601, 2158 ], - "commit": "cc19df172e2e20a76861ac75ead3616f2f7eb870", - "sha256": "10ca4q7j83kvk2rv5dghqs56lilkdxsq0zfz0ycvdk41r26cr10z" + "commit": "a9f2abd32f2517392a396d61e558bea3c887b5b6", + "sha256": "0affcw4vnk2jk7pn56alg4i1vmhf3db9dz0x06k4wl2jcm5cslzd" }, "stable": { "version": [ @@ -69440,15 +69618,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20210716, - 148 + 20210917, + 748 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "8b11b67ac738cfd95babbcc7543467fd9190fc7e", - "sha256": "1y0y2fwyi1qi5k3nypdv51rfyf06f2q2c6ki5yz6bl82lhd0vb1l" + "commit": "1905cc0c5fe7a306abb4e862c36f00471ce9d0cf", + "sha256": "1xmv6wkbrra3prdm2s3c6hjw5fzp082w15mha60638i3rfmj6sm8" } }, { @@ -69498,11 +69676,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210906, - 1104 + 20210928, + 812 ], - "commit": "a30b42395cdfd8759b71193e2f0804c8e54926ad", - "sha256": "12d6mg6nx7lirj0cb4r90rcnnzrlmk3165lcmcmxrjj6v7g523yr" + "commit": "2b27c14d792f08da6650c566cd3a58b9b3405be8", + "sha256": "0fkj5as1lx6q7n6iny9x5hhhswfgg9f5ky3d82832hrq5a1jc0mg" }, "stable": { "version": [ @@ -70133,8 +70311,8 @@ 20210306, 1053 ], - "commit": "7e8beed3ddad4f8d1065cbab52f24c16d31f5898", - "sha256": "16ahy9myimsjg0csff5b6gpj4vvy1pz6y5rpvhwwg4c6id5wz1fi" + "commit": "10b69af9e93a062525924041ffc419b0f8779b73", + "sha256": "0962ckdzrywrb7yqajgik995p1rayrh41ya0mhlif0b6j570caz1" }, "stable": { "version": [ @@ -70569,11 +70747,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20210812, - 1721 + 20210927, + 1759 ], - "commit": "34b9b3cbe50eaf48a636f2e05a3496111429b265", - "sha256": "02hqz71ds2alb95y65iii6b9rj0r7a9ymib7yv5321ys25j5bqzl" + "commit": "b76a5989cafe88a263688488854187a015beef41", + "sha256": "06jd6pj5ngq5j5r6s7d7298jjfy1xkk0ribxrfsg6vpmd111brbf" }, "stable": { "version": [ @@ -70814,14 +70992,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20210620, - 48 + 20210923, + 233 ], "deps": [ "dash" ], - "commit": "65699ac6a2f787a07908466e1cbfe3333ace7532", - "sha256": "05h4rh5g8kqz8sl31r8800rkrcv9ir6jh6qr38qwj1zrcd77zk02" + "commit": "03ae81739e44b70903dcdaae86a5ccaecc73eb9b", + "sha256": "1qvlf7f1wjlai25a09fnir3gsida3zpnr8vfvv687lxvngf7r53r" } }, { @@ -70868,11 +71046,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20210814, - 1656 + 20210908, + 1233 ], - "commit": "151b4fc935b6f4b286249ce52d6473440fb8d1c5", - "sha256": "0jqfb7kdm5ajdxvy5fmrp240zjlrf8mzhv77hyvipg1yzkka99gb" + "commit": "e213d1f64e173b437a2981afc5d85f90aa40a03e", + "sha256": "1cpssylbfw3ir4dh14z5p4b7yfw4k2ky49i09jk2prq7swk0f6xm" } }, { @@ -71818,20 +71996,20 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20210711, - 217 + 20210906, + 1942 ], - "commit": "55786c9582410a5637b5635fea022aae564205cd", - "sha256": "0pj92h241k17hvlx7x0nx2hnjg6vyz65sa4ghyqhwa7mdn0c12pi" + "commit": "2e31f32085757e1dfdd8ec78e9940fd1c88750de", + "sha256": "0wzk6nqky5zjpds9mmi1dcwn00d3044l7a0giawqycsa4zcybdlk" }, "stable": { "version": [ 1, 1, - 0 + 2 ], - "commit": "9054a0f9b51da9e5207672efc029ba265ba28f34", - "sha256": "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic" + "commit": "2e31f32085757e1dfdd8ec78e9940fd1c88750de", + "sha256": "0wzk6nqky5zjpds9mmi1dcwn00d3044l7a0giawqycsa4zcybdlk" } }, { @@ -72271,6 +72449,21 @@ "sha256": "1zzsfyqwj1k4zh30gl491ipavr9pp9djwjq3zz2q3xh7jys68w8r" } }, + { + "ename": "newspeak-mode", + "commit": "79f89e772cae716a3e635e7b4588727e0647616c", + "sha256": "1xi3nv5zni52r9z8sbam8pc3l244pfm76d7hhfrvaxrvlyyq9dc5", + "fetcher": "github", + "repo": "danielsz/newspeak-mode", + "unstable": { + "version": [ + 20210913, + 1029 + ], + "commit": "4bfef8f834b021d65cf6f920b02c082a719a302f", + "sha256": "1ng024c5qw38p9qlmldh9r08wcvivs17vw2kl8y17z6d233xrgnw" + } + }, { "ename": "nexus", "commit": "80d3665e9a31aa3098df456dbeb07043054e42f5", @@ -72511,8 +72704,8 @@ 20181024, 1439 ], - "commit": "e90dfd3c7528b9c620eab29121a3591af7bf035e", - "sha256": "052shini6g1a5zjqqrwxvjk92c597qxfkar21pdzs4na0sij7szw" + "commit": "a280868e9c2c791a0d1529c7002786a117bd16fc", + "sha256": "0dldqdwb466h6n6cm4g5dsa6v2vjhmplk98h633q6ijxpr8n0h6i" }, "stable": { "version": [ @@ -72792,8 +72985,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210820, - 1503 + 20210926, + 1845 ], "deps": [ "anaphora", @@ -72801,8 +72994,8 @@ "json-rpc", "rbenv" ], - "commit": "1b064aa49da9ab24fb36d208ec35a40c29d9e5b3", - "sha256": "0sp807drgl8hmxwhz12r0zr371x8x5f5amp2aap4b4irf665dd22" + "commit": "168b5ff1d8d8c39ac2db31e56fbab0927d557d7f", + "sha256": "1vka4i3hsgvwiwqh06xsdrlf50q7mjzyvc4gdk28705gaxnzqmiy" } }, { @@ -72813,16 +73006,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210729, - 953 + 20210921, + 1131 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "3a2fc7da6c6cfaba15fabcf1f3c9cf57b016c362", - "sha256": "1z91i6kl0bpsk87rl0ysfm8wifb3a196r82bxb6wlk6lkxlqr8jq" + "commit": "4e584d4da81c400de145dbb7a58e63819cbaf340", + "sha256": "0z5bww7cmlri2hn3fz3yad0scbsnhhddi21f50cmhdghgn1iaw41" } }, { @@ -72848,8 +73041,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20210708, - 43 + 20210912, + 236 ], "deps": [ "anaphora", @@ -72859,8 +73052,8 @@ "s", "virtualenvwrapper" ], - "commit": "60bf11fdba8ff56b6b4b21f5f0c04953834d8a14", - "sha256": "1b6i4kwjb81s7x56g7xmkynryw8xzrpbbkfy03597ka0v0n8i717" + "commit": "cb22a8480e9688f16f3764953cebebe64df31ccf", + "sha256": "0qpy3xymzryncbiz4cay4bzmmarbs575dgh3db2iibaffwb4qb0x" } }, { @@ -72871,16 +73064,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20210104, - 1423 + 20210911, + 1751 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "174eb3bdb1339872b62fe2bf0c27d9a3eb142d27", - "sha256": "089zsy7f69h6kj6rckn5big2bfdn6hgdwamacsgsb8fpsvmy3ai9" + "commit": "a802ef9b589dda41bcb5d6cfce2faf8948c20c8c", + "sha256": "0fcskdyapz59cvik117vzj7hyv8kvvp6kh0aing2bgndwvai4apg" } }, { @@ -73226,19 +73419,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210830, - 2334 + 20210920, + 2339 ], - "commit": "49aa44bb012e8c2412b5447119b78b61842740b8", - "sha256": "008f86pb2zn3xi9d862c2bz0yzavyrypf6bzc3q275il876x4c9z" + "commit": "81cbffa65f4a4bf46a7ed0985171e82db82beced", + "sha256": "1dswhkn3njgkx7v1fi1s9d5x9nhybzj0c4ybdqs2qfkznfyqs61q" }, "stable": { "version": [ 0, - 33 + 33, + 1 ], - "commit": "676fcd70ff5aa5d88943a5982a4187cc5699aa4b", - "sha256": "0wpczv0s0sbdd0p4qhhkw50f5pz5jpx41gaf4c7afc88lwgqr8lv" + "commit": "8e59438025c88ebd83a78cf12c06ff954d979e01", + "sha256": "0ksfvcm98bam6pkilmfiwl2aj0112vyj0g01nmp9cfqf6pvli7j7" } }, { @@ -75102,11 +75296,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210617, - 1726 + 20210923, + 1348 ], - "commit": "b78f73f9c3a689be73dd6061f3898c8b998048cb", - "sha256": "0ma9ysizvnwlzb4d1dzfd8n5948gq6zy897526dwwfdj105fsmdi" + "commit": "4715402fe4e96a49096862a50e183f7a0b6acf35", + "sha256": "1h4m9wzyfmx66zj6qa6rmd9vqwry7g3cw0sq4yv3pzamgdd1smzl" }, "stable": { "version": [ @@ -75299,26 +75493,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210827, - 934 + 20210915, + 1404 ], "deps": [ "org-re-reveal" ], - "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", - "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" + "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", + "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" }, "stable": { "version": [ 3, - 23, + 24, 0 ], "deps": [ "org-re-reveal" ], - "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", - "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" + "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", + "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" } }, { @@ -75724,16 +75918,16 @@ "repo": "willghatch/emacs-on-parens", "unstable": { "version": [ - 20180202, - 2241 + 20210928, + 1913 ], "deps": [ "dash", "evil", "smartparens" ], - "commit": "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4", - "sha256": "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn" + "commit": "b8ee8cea45c9b34820fcb951f522f13e3736d216", + "sha256": "1i7xhv2a22n6lq0n1pd494g1a5s7sv52i2gblg6s9h87dnb4r9l6" } }, { @@ -76046,11 +76240,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210812, - 2035 + 20210912, + 1932 ], - "commit": "1a7011ac9c476dbb083c5ead88462a5f520ef8aa", - "sha256": "0gmlxfn14gdb241ari4ix3wf9wxg2vpq2kg55h46fchs22wwqyal" + "commit": "62f71c34baca0b7d0adeab4a1c07d85ffcee80d9", + "sha256": "1spab90q4illpsajw0hcfz8s76c1gp8qpmc6zmv14slg1i9m5yri" }, "stable": { "version": [ @@ -76151,15 +76345,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20210828, - 1822 + 20210922, + 125 ], "deps": [ "alert", "org" ], - "commit": "67b2e241d9eafcabcbd7de48cca031044ebc8221", - "sha256": "1bglyry80sbsj0x4w20ncvdsnn8lw7j2ry0rnfsb866fhq03zkrn" + "commit": "c039d0121d21e4558c0f5433135c839679b556d7", + "sha256": "0xalf5bbawnxm61askvldg2g93gvf6i1bpxqk55bglnl2cdq6g2i" }, "stable": { "version": [ @@ -76587,14 +76781,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20210829, - 2145 + 20210915, + 1435 ], "deps": [ "org" ], - "commit": "a9acf45aaa174aacca248272fb30a5698b5163ae", - "sha256": "0wfq0gpv89sqdzi3acw9b4697lnnpjqvf11mjdlq69y20vfm1qsv" + "commit": "83f1cb5f4a011bedab15d2649dcf46f38f05eaca", + "sha256": "0ryy72d8k2753f4gxdchafln538vlrx4i1ldxijxjc8ll998q24x" } }, { @@ -77326,8 +77520,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20201112, - 253 + 20210920, + 112 ], "deps": [ "f", @@ -77335,14 +77529,14 @@ "org-agenda-property", "org-edna" ], - "commit": "034edc545335ecc0da20b4f1bb4aa9f048454afe", - "sha256": "0yhnrz7kcq81842sv7zf58fqc6wiy4ckcjyqy8m6bn2z6rwpj655" + "commit": "2ec885871b0c76b4fb06d4ae6d84066ce515cd6e", + "sha256": "1bg4qjy47gg387dmjsg23hb6pw4mcf4gzvznk5bmm6mjpahz9532" }, "stable": { "version": [ 1, 0, - 3 + 4 ], "deps": [ "f", @@ -77350,8 +77544,8 @@ "org-agenda-property", "org-edna" ], - "commit": "4716603f3719acd89a268fb907b91fd3d6af311a", - "sha256": "1sjdgdg0j8j7qd5scls9rbyk445bcmkf84iz4kgiyca7bb7rap57" + "commit": "2ec885871b0c76b4fb06d4ae6d84066ce515cd6e", + "sha256": "1bg4qjy47gg387dmjsg23hb6pw4mcf4gzvznk5bmm6mjpahz9532" } }, { @@ -77501,16 +77695,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210813, - 1834 + 20210918, + 1741 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "f64e5da352193d8e8bc4d9f5678c8e971265e6d1", - "sha256": "0wrnkpx7ypjfajbfq2dnqxaq18rlvl7fgajsk6a6fsb2sbhfkb97" + "commit": "f21e897865a35231b280a38bb33ed8dd44101615", + "sha256": "1yykxnz50wpg9b8997z5316sqq6j97y94izr33icd36y25mzhjwm" }, "stable": { "version": [ @@ -77541,8 +77735,8 @@ "deps": [ "org" ], - "commit": "9757996ca058029800c4801fba315b1d1614dcb2", - "sha256": "1h7b165y4z2p7qqbndqh2jyw4fgq50hqxmj2xv24shbjyqg350dh" + "commit": "01efa117248622728d5aa88ab9b8c70c68b6d3eb", + "sha256": "1szy1v7m3qbj4w6hsq5pciapxxbpq4hrmmvr5fc9njcsasjw58ac" }, "stable": { "version": [ @@ -77654,14 +77848,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210830, - 1447 + 20210913, + 1134 ], "deps": [ "all-the-icons" ], - "commit": "19deeb8f212791cf4698a7cd844df5b3e1b5952f", - "sha256": "0p3iy23nr2saznjz94j0f55qswzmr96x39awd9r8fpvpsm02j14m" + "commit": "cea63752b23c55b3a37ae56cf9938a166b056a3c", + "sha256": "0jwf5fd7zfmg726yxvd0028ljlk8hzg5zz54lg1ycrizkvg89w09" } }, { @@ -77826,16 +78020,16 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20210627, - 1623 + 20210911, + 2131 ], "deps": [ "dash", "org", "s" ], - "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", - "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" + "commit": "5d61f456b0a639e178d6ae4f210e28be5621a620", + "sha256": "1ca6wgjwslv3582fmsxna81mgryziw9v9zh1836sbp3yszqddday" }, "stable": { "version": [ @@ -77848,8 +78042,8 @@ "org", "s" ], - "commit": "4435cd5fc94c00f6e6054324a3e022ad0e37ae0f", - "sha256": "0vk9zv6zx7s1wryfhjwzmpj5asdlkn7zlwwvk9hvf5cv9injf1wx" + "commit": "0a96482452fc60170e3f5b8cf3a259b2b09c9ef5", + "sha256": "1ca6wgjwslv3582fmsxna81mgryziw9v9zh1836sbp3yszqddday" } }, { @@ -77870,6 +78064,37 @@ "sha256": "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn" } }, + { + "ename": "org-movies", + "commit": "ea06dc48003ba3c4f8e70fef4738cdb306362198", + "sha256": "1l4vd091vqhcs7qgws762x4cdnalj1hiq31d6l740miskc8nb8hr", + "fetcher": "github", + "repo": "teeann/org-movies", + "unstable": { + "version": [ + 20210920, + 101 + ], + "deps": [ + "org", + "request" + ], + "commit": "e96fecaffa2924de64a507aa31d2934e667ee1ea", + "sha256": "1h514knqys20nv9qknxdl5y6rgmyymyr42i07dar8hln9vj0ywqm" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "org", + "request" + ], + "commit": "e96fecaffa2924de64a507aa31d2934e667ee1ea", + "sha256": "1h514knqys20nv9qknxdl5y6rgmyymyr42i07dar8hln9vj0ywqm" + } + }, { "ename": "org-mru-clock", "commit": "b36bf1c1faa4d7e38254416a293e56af96214136", @@ -77902,14 +78127,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210901, - 1630 + 20210916, + 1114 ], "deps": [ "htmlize" ], - "commit": "599e8b056c30e84d584aa54dd7c85339cdb9dc43", - "sha256": "07mjxzip1n3j8lksfq00mfy4s015n28wxiczczqvd6cdhgynshpg" + "commit": "77f5911b7d390a069104db20be86293506ffbff2", + "sha256": "08kv8639zdfr3fpzx4zpbgf40vjpa1xwkhxzz7vdpmjq19i3c28w" } }, { @@ -78059,8 +78284,8 @@ "repo": "doppelc/org-notifications", "unstable": { "version": [ - 20210826, - 1721 + 20210918, + 1827 ], "deps": [ "alert", @@ -78068,8 +78293,8 @@ "seq", "sound-wav" ], - "commit": "04d648ab5f5f65b600a3af1c9e8ce4e07800d995", - "sha256": "0xi1shrm3a091fa8zv7nr1425f23z8cb1d6qb2xl1b772q9n7bkf" + "commit": "b8032f8adfbeb328962a5657c6dd173e64cc76e5", + "sha256": "0px7syqcz300mxcns1bm0yn3i9n2j5cx58lzjjqpp6v36xn6x4k8" } }, { @@ -78369,14 +78594,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20210905, - 1559 + 20210911, + 1528 ], "deps": [ "org" ], - "commit": "04487392d977258351d06ff693a591d8e77617b7", - "sha256": "11f8ffwjllzqpqp0s0610cakh1j8028lvknibajqid4ljidm0mcj" + "commit": "5f7345e75d0fe71afb19fd30c841dff5bdd6d1ab", + "sha256": "13i6yqhizh86608hwlkc4ipsaxx44y79v40kpn007h8p1wl1ba7a" } }, { @@ -78481,8 +78706,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210713, - 233 + 20210922, + 615 ], "deps": [ "dash", @@ -78496,18 +78721,16 @@ "transient", "ts" ], - "commit": "94f9e6f3031b32cf5e2149beca7074807235dcb0", - "sha256": "022arhyyn8hbb1hzjkv4gl3dr8lz1gv0x4h70x0970bsbqlsa27w" + "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", + "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" }, "stable": { "version": [ 0, - 5, - 2 + 6 ], "deps": [ "dash", - "dash-functional", "f", "map", "org", @@ -78518,8 +78741,8 @@ "transient", "ts" ], - "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", - "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" + "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", + "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" } }, { @@ -78730,8 +78953,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210823, - 27 + 20210913, + 1445 ], "deps": [ "bibtex-completion", @@ -78746,8 +78969,8 @@ "pdf-tools", "s" ], - "commit": "37b64e6cc1068c1b7ffe579851a345aa57772333", - "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" + "commit": "8c503e61681a39cfb104793b35f2f7b801c6830f", + "sha256": "1pz4gwi8gwlbnxa003hk2k0arzic8700xsj0bhpnh2d0zarghcj0" }, "stable": { "version": [ @@ -78772,6 +78995,25 @@ "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" } }, + { + "ename": "org-ref-prettify", + "commit": "557733f8732fd48bd68990616190fa9b4dc3c657", + "sha256": "08bkrl973nawchnc35ixz3zvb4kdbibzmpv532p7n53qc8i2zqjx", + "fetcher": "github", + "repo": "alezost/org-ref-prettify.el", + "unstable": { + "version": [ + 20210920, + 634 + ], + "deps": [ + "bibtex-completion", + "org-ref" + ], + "commit": "29e05416f102ceca50ac8b118a19a16f9fe7eb2f", + "sha256": "1215hrinfggvwz89i15lhpqraa3rhafnqx8iwvfzb0p9fyqfgwg5" + } + }, { "ename": "org-repo-todo", "commit": "d17b602004628e17dae0f46f2b33be0afb05f729", @@ -78875,8 +79117,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210901, - 1143 + 20210926, + 735 ], "deps": [ "dash", @@ -78886,8 +79128,8 @@ "magit-section", "org" ], - "commit": "1795039ab93ef19611dbb3fca21c4211c4e655a9", - "sha256": "1hrb4l7b31f9glrdhn30lldqkzbyw0rhw03d5ij49pygfma2qwl0" + "commit": "17d8e84ea57d4ca27dac999c661a03653cc92a80", + "sha256": "12vs81f3lf2j5nmia5xkqwkgs2sfyb0x220wzjc6sxvbmqvnyxsm" }, "stable": { "version": [ @@ -78915,16 +79157,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210903, - 2120 + 20210928, + 818 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "9675eee4183301b16eb27776dae93e8c0b99eb07", - "sha256": "1n4nfs9ifzdmzj60adbam4qfw6vkm8z4yh5mp23gvi0j9wfx99s1" + "commit": "003bb093a283fb19ce592095500d11d864adf2cb", + "sha256": "0ygish2sgclbnlaaamzvmhg8z66g4f0ks3fb4zsfng05g4gfkywq" }, "stable": { "version": [ @@ -78979,8 +79221,8 @@ "s", "seq" ], - "commit": "db59e2e9d4230997cca4cbf3a5bb1a89fd38f87f", - "sha256": "1444qsf3fyygw0bpl805fqfyh2mygc821iy2i6cpfyaibrz0n6hj" + "commit": "f4c5e612d87d1ab96323b09cee1da859d9d74775", + "sha256": "0jbvrzigw0bjcm4lq7mmg97yh2kzchcmv4gwpmd6izgr1ajp2nir" }, "stable": { "version": [ @@ -79061,19 +79303,18 @@ "repo": "alphapapa/org-sidebar", "unstable": { "version": [ - 20201114, - 507 + 20210912, + 1321 ], "deps": [ "dash", - "dash-functional", "org", "org-ql", "org-super-agenda", "s" ], - "commit": "1b37069e47d1ea4745eacdf2dec2bdad756ee235", - "sha256": "0sf406dz4mkpaqaql3z8xs6jcksxasa5j7xkk79a9xnbanaxhzaq" + "commit": "288703b897449f5110c9c76e78eb9a928ffc0dcd", + "sha256": "0ama42nkc90mzwik516kfsh5rdx47yhaarcsqsknxh7xcrm2v0r1" }, "stable": { "version": [ @@ -79125,16 +79366,17 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210806, - 154 + 20210909, + 2032 ], "deps": [ "dash", + "lf", "org", "s" ], - "commit": "8b7bbcb239cb08ca96a950cf59bb5e9617bee2cc", - "sha256": "11qni2i00ck0kh2x334gahhr4lhnh03mvn69bzvivnx8rlk6w1f7" + "commit": "1e9731dfd79b0605ee88c8cc891d4b5106c9e0f4", + "sha256": "0lp0gn7p5d0fkm3wy27xhj2q6snhl1ssqqhyl52hw06jhifamm8l" }, "stable": { "version": [ @@ -79310,8 +79552,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20201211, - 918 + 20210928, + 916 ], "deps": [ "dash", @@ -79320,8 +79562,8 @@ "s", "ts" ], - "commit": "a5557ea4f51571ee9def3cd9a1ab1c38f1a27af7", - "sha256": "1xbdkscg32pqpwzs50igdwkyi2k2mgi01wkqm7rc6bhrpgsk9gkw" + "commit": "fb5e2ef277bc811a3b061106c99e4c47b6b86f80", + "sha256": "1sjx5ahyjpxv5xkxaf1x0p64bjls8ralv9knf80w17nb87dk3p91" }, "stable": { "version": [ @@ -79347,14 +79589,14 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20210216, - 1925 + 20210915, + 1934 ], "deps": [ "org" ], - "commit": "9d64c42e5029910153ec74cb9b5747b074281140", - "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a" + "commit": "03be6c0a3081c46a59b108deb8479ee24a6d86c0", + "sha256": "0w97xqvbgh57227qq750b8rxlkkdd61j9frz7wc9f9x1mya305j2" }, "stable": { "version": [ @@ -79730,11 +79972,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20210224, - 1213 + 20210915, + 335 ], - "commit": "9d2ba1df456d8d7c6372c8c294dbe3ee81540b33", - "sha256": "145avv616k190wzirlrh7rljysfffhh3j37wr7p6sk13wayqc27h" + "commit": "571ff333084dad83a535becfc1fdd601ead2da02", + "sha256": "0k1lg3rc6x6alxhjwggh3fdlmpbx8qni8d6qakp6i1ba7459d0mj" }, "stable": { "version": [ @@ -80050,8 +80292,8 @@ "counsel", "org" ], - "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", - "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + "commit": "85f9fbc0fdef6310647d9457e9a242826f387877", + "sha256": "1vdgjwab872kh009lminrrwkghl3ylswn54qad4ahwhmkdz2p5ra" }, "stable": { "version": [ @@ -80075,8 +80317,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20210422, - 339 + 20210929, + 17 ], "deps": [ "htmlize", @@ -80084,8 +80326,8 @@ "metaweblog", "xml-rpc" ], - "commit": "543813e0acceb55653d876302a5d5741879fb717", - "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" + "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", + "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" }, "stable": { "version": [ @@ -80265,8 +80507,8 @@ "ht", "s" ], - "commit": "cd931a01adb23dd473ca1abd22f45ac0a5661cac", - "sha256": "0cmr4dq90kvmscsm2jvvpdijbmqh0skra79cybcj4pdzafx79c8c" + "commit": "0a716d38268735b1df336161b3a7f3f8303539bb", + "sha256": "1nh51npi4j0g4kpshsipy9midi8n17qddfcv0isaizv6bm3z8aa4" }, "stable": { "version": [ @@ -80463,20 +80705,19 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20210722, - 737 + 20210926, + 2314 ], - "commit": "3a6bd917c524c73542315f7c2b0d68161fd5c228", - "sha256": "0kjyg2vif12whfjdj7d4byjw9a4y6q9s40552v6i8b7f1yc7rz0k" + "commit": "b99455846908d007cf50ca1ef7093554dc3121a0", + "sha256": "1z4hva6dzqrkkabv1apqhic3d2r21dsf9m60blmbnhx6hbc5vgv3" }, "stable": { "version": [ 1, - 2, - 7 + 3 ], - "commit": "c63c1682de9a10c6d6946978c154f09bb6fa7284", - "sha256": "0vp4s8m1rg0q3pd8vdk8ys03dzsibglpkx30hfw10z847fbif85w" + "commit": "b99455846908d007cf50ca1ef7093554dc3121a0", + "sha256": "1z4hva6dzqrkkabv1apqhic3d2r21dsf9m60blmbnhx6hbc5vgv3" } }, { @@ -80487,11 +80728,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210830, - 829 + 20210925, + 1850 ], - "commit": "5e826d36402f822c5981593cd106ce06420638a3", - "sha256": "0jhjm28ypqrvvxdpjqpvwrlsg0gbrnkz4hlfvivlf7wd58852r86" + "commit": "3ddf2fc2262ec7d1ae62aff251a70dcb26dd5f04", + "sha256": "09lj6kw1fz1hmrr703rx46d3zsp1kpdzavc3nv1q8x7ii9q0w9bw" } }, { @@ -81237,14 +81478,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20181230, - 620 + 20210919, + 1844 ], "deps": [ "org" ], - "commit": "efb74df1179702e19ce531f84993ac5b5039075f", - "sha256": "0sxwbqk6sm8qfpbcxhclin21k6xx5286df57rr0m72xrqqpdsw1p" + "commit": "d60ac439278cec214882f92c47bc16e0f43ae98e", + "sha256": "1h5vjw4byhixl1vwgd13cy09z7zdh3mjrac4ffvc7xpzkmg4r0zm" } }, { @@ -81433,14 +81674,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20210727, - 117 + 20210916, + 1332 ], "deps": [ "org" ], - "commit": "6ec3d054ddadbca1f5effb961c1db583e377ca35", - "sha256": "1vhyq9hbvbny9lj0h8fw7xk2i0fxcwn3v8rhwh6fjns86m7zy0lj" + "commit": "f0357fa7449cc8baecee588dab7dcf9ea243f3b4", + "sha256": "0rxkdwcl75yn79sxxxprlj2594h2d8cclikqsz8m9pljmqx0wjnk" }, "stable": { "version": [ @@ -81547,15 +81788,15 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20191225, - 750 + 20210928, + 347 ], "deps": [ "org", "s" ], - "commit": "11609b0a4125d1cc6a1149748eeddeeff4e5df63", - "sha256": "0kkv0g1dg0wyygi098667rip0778pd00xd6mafm4rgc6bdjhxz9i" + "commit": "4d2e0aa7f92d07e16cea2dd5e1d250a3f243c3cf", + "sha256": "1h5930953nnddg7ysr87m5r6gm517zbfi7jbc77hmrywgibqvpik" }, "stable": { "version": [ @@ -81799,8 +82040,8 @@ "deps": [ "org" ], - "commit": "fe9148b670d144124d9697fcf5d0528f19025104", - "sha256": "034gkbc03z9jzj7ad34mmqgmvj4f14ap7iixh3zx4wp2ipw5xb7c" + "commit": "624dee4ee2300315eb1a32b17e8831ce6677fc72", + "sha256": "1n49iwrfzxx9ad399sm5q1phzlv5890i3vacxci6hpmi26bnqb89" } }, { @@ -81884,11 +82125,11 @@ "repo": "dantecatalfamo/ox-ssh", "unstable": { "version": [ - 20201217, - 317 + 20210917, + 1517 ], - "commit": "1b39849e3a315de95543eb3cf69c42fa33a8f5cd", - "sha256": "0hcm91fh3qcxp6n40363sxdk3hz87vsmbw032d7iwb2wmdfwh6b4" + "commit": "be3b39160da6ae37b1f1cd175ed854ac41d1cb63", + "sha256": "069qvxsxipgc7sh112ci2ynv406kj5vrsjgqhdhmnzkp6fhyhm9n" } }, { @@ -81899,14 +82140,14 @@ "repo": "yashi/org-textile", "unstable": { "version": [ - 20180502, - 947 + 20210919, + 1738 ], "deps": [ "org" ], - "commit": "b179abaa6616604c6efe32cb509e62ad46e7374e", - "sha256": "1hwrnnrhrdp5cjn81wipzi5j8zr82kpwlvr6hna2cj2zr3r7a6m8" + "commit": "5f2f61f572c24d702e922845c11a4c3da38ab261", + "sha256": "17qf0346a5n1sy3cjzfx8r9kblrlfbnp8hy74y5fq2dczmhqrjrh" } }, { @@ -82699,15 +82940,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20210819, - 1141 + 20210910, + 2043 ], "deps": [ "dash", "hydra" ], - "commit": "39167ff0e9293b4632cf162a32c9d0b6990a371d", - "sha256": "1rbn8vj1aazwzzzs79455qcd5w04l82xw4y00xn199mch95rim5d" + "commit": "bf01a14e99304653ae722226ea064c7d4b641774", + "sha256": "0g64fbcbw8pfq92drgixgplrljw954y9fyp9gjbmc5rq2dhpck4l" }, "stable": { "version": [ @@ -83054,8 +83295,8 @@ "deps": [ "s" ], - "commit": "0c4c92283baa951469e75f632fdd08f0cb9fe6af", - "sha256": "1g34wkb3ca6wgjkgmzbhaak95bpdh1k49p5m00ajhg1rqicxwdzw" + "commit": "f648a43a4085ec2ab31979a5fb8830cb6407f090", + "sha256": "1ch039rmaz090y2cnhswh5v8ix0djywg46xffkqjdg01q3a6in4l" }, "stable": { "version": [ @@ -83132,26 +83373,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20201012, - 712 + 20210928, + 730 ], - "deps": [ - "a" - ], - "commit": "1bb3800f8f2417b0b881f57448ccb4acd1fe5b8d", - "sha256": "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb" + "commit": "1c8f833b4c3b3487f5853321902b276ff3e84590", + "sha256": "0rn72iwsdlmixkrg97p3km0a85bxvx5lnvsnkrga3rv48lxxq7h9" }, "stable": { "version": [ + 1, 0, - 2, - 0 + 2 ], - "deps": [ - "a" - ], - "commit": "1bb3800f8f2417b0b881f57448ccb4acd1fe5b8d", - "sha256": "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb" + "commit": "1c8f833b4c3b3487f5853321902b276ff3e84590", + "sha256": "0rn72iwsdlmixkrg97p3km0a85bxvx5lnvsnkrga3rv48lxxq7h9" } }, { @@ -83162,28 +83397,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20210729, - 1657 + 20210927, + 706 ], "deps": [ - "a", + "map", "parseclj" ], - "commit": "7b9ca20b398ca0ca0e3005e84c16f23aab49b667", - "sha256": "0knv5m6w7v9zi94b6qi861r271l49pxzmwzp4nm595c33lxagqj2" + "commit": "e7ff673cd9b83f1add17f55d71894f66d0409802", + "sha256": "15rp708s46f86w8scd72pr7ikp87c69pzfybnslqbahw7s53lhpq" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ - "a", + "map", "parseclj" ], - "commit": "d25ebc5554c467b1501f1655204ed419e00ca720", - "sha256": "0271amhw63650rrzikcyqxa8sb42npnk7q3yrsay2v79wbqkdaw9" + "commit": "e7ff673cd9b83f1add17f55d71894f66d0409802", + "sha256": "15rp708s46f86w8scd72pr7ikp87c69pzfybnslqbahw7s53lhpq" } }, { @@ -83310,8 +83545,8 @@ "s", "with-editor" ], - "commit": "3dd14690c7c81ac80e32e942cf5976732faf0fb3", - "sha256": "10015qvf98j4m26rprrvhbfj4dg4j5sg2c0ps7x94cjjxrph7kf6" + "commit": "04cd3023f48cd203f6c0193e57a427226e8b431c", + "sha256": "0r5irpzqpglf486zsl78wdwqhkgsqb24xg4zp2isjczs2gl0fi6m" }, "stable": { "version": [ @@ -84261,25 +84496,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210821, - 259 + 20210920, + 345 ], "deps": [ "cl-lib" ], - "commit": "1c257f35ccabaa807d3a79f6daed7b6a5872d27b", - "sha256": "0rgkajcw7fismqmww1r0yy84hnqripx5dwklf2mfm042whn9bqgf" + "commit": "acad4fb2cfe27feb0ecbe07e51c364bfa5ea4f47", + "sha256": "05mv85fn6vil8j8xizq0myd9hgy7h94cz89m6i0ia4qs2yf9c29g" }, "stable": { "version": [ 2, - 16 + 17 ], "deps": [ "cl-lib" ], - "commit": "c052ab2ce23f969ad2b7853ba0b3cbd4a5954c47", - "sha256": "0hg4rj3v748f6k4fwa21g683vs3bfya0wg9r9xdg216kdhfdk5j7" + "commit": "53348cea0f46655c4c072da5984f6a652726df4f", + "sha256": "1nmz39pcaa969g1966ykblzrz6lr3ddb0ip465y5in1fj498as6y" } }, { @@ -84676,25 +84911,26 @@ "repo": "OVYA/php-cs-fixer", "unstable": { "version": [ - 20210729, - 1022 + 20210923, + 718 ], "deps": [ "cl-lib" ], - "commit": "cc9a3624dcdc72d748d91e3d7cdb8544a1d85a51", - "sha256": "1iiazmyzr6gxwsdpx687j0zp3s1zs0rk4kgv4hicl9mjda2f7dmz" + "commit": "7e12a1af5d65cd8a801eeb5564c6268a4e190c0c", + "sha256": "1i0jlszc5z59arwknclhi3vmwp0mf6jk18axisvh5xdqggiwpjqf" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], "deps": [ "cl-lib" ], - "commit": "95eace9bc0ace128d5166e303c76df2b778c4ddb", - "sha256": "1pl6zw1m8n3ir48h58gaq2f474w9j20a6gk4r0cq5vgvzxx25f0h" + "commit": "ebf78243b468592f4fbeb714923ecc8709d33ae0", + "sha256": "0ik5va5q7gpz6kmaaiarh6wjaafal22qcimflfwizs3nbl49y9mx" } }, { @@ -86551,11 +86787,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20210521, - 1131 + 20210907, + 807 ], - "commit": "7d1f822f0833b43326cc9253dc8a3e267ad4b376", - "sha256": "15gyqf9vs3yxls8l830ik5rdhvd0wiybqpi0yxnfpd6g9pcajm6w" + "commit": "54888d6c15249503e1a66da7bd7761a9eda9b075", + "sha256": "0zxhxsil1p0nf4n75saz33d00xl7d4g528n7qj9xx84gq92g4fnb" }, "stable": { "version": [ @@ -86676,8 +86912,8 @@ "yafolding", "yasnippet" ], - "commit": "3c011744e81263dab6a4b20e96ad1d290ef9d320", - "sha256": "15ach67d9n8csbsabm6lhmhli9f397pjpf6vk1rn59bfqrhdakmn" + "commit": "d3b108338219ff275e4ed2c67a2c5f2ce334bb94", + "sha256": "0klpwchiaqrg9gclpbc4ya4kkf33bl6h7khp1b4pjx6zg28qk8ih" }, "stable": { "version": [ @@ -86754,11 +86990,19 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210610, - 1945 + 20210917, + 302 ], - "commit": "4c51182f5f5dd7a1ffa69fb994ef5ef6f9592686", - "sha256": "028wfdi240r8xdz7j77fv29brk5ck6yhhh1vj9p58m4f4ff8r9ik" + "commit": "9b1cff1b571e90ad92f29f1c412afa91923535a7", + "sha256": "1apdj3wkvgsbiw98f6prna36j7h4lg243g92hkr3bz2bv4lld6dc" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "cc7336c4e30fc9fef129ad82e59fcdef24f0b73d", + "sha256": "0qkxxdawwcjswfxnxmih5cgq7klp78l7vc82kj09a8qh400wzr5d" } }, { @@ -87365,15 +87609,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210606, - 1152 + 20210920, + 1251 ], "deps": [ "iter2", "nvm" ], - "commit": "e38d21a885e234af9ea6b03f499c487175570571", - "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8" + "commit": "da32141e78ae59023477d15d56b7a4fca632e5f5", + "sha256": "01q0kj6dkqbhy8khjl04a857mb6mpw5dwrhaf81d7jj4vjbldccy" }, "stable": { "version": [ @@ -87780,8 +88024,8 @@ 20210715, 1213 ], - "commit": "e8c22beb14aff6d5661337feb6cebd7af3a3d454", - "sha256": "09zp7896ndmksk7mywdwhrh4bq951vj5lqjls7ncihifwlgcxa7w" + "commit": "4b059ff6ce8cc2ca817247fcc251994bee2090e4", + "sha256": "0jn8drn49ab15a7j0584hihzyw66zyq5zv7wwbipnwwkqrd4cagk" }, "stable": { "version": [ @@ -87945,11 +88189,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210905, - 629 + 20210913, + 1840 ], - "commit": "6516a9ce574a9cd8903d0148fe06fa49f954972d", - "sha256": "0pgrpdgpx7c55csrznhydfpsx5mfi8dy2g7p5mkhz7xmrqqw9ipl" + "commit": "ca89722f947710221d18c1b8e27b2a5811da176e", + "sha256": "0jgnb88bfnsg40y0hawhzz9hz173sw4s7sd7hbq1pskwbcswadc9" }, "stable": { "version": [ @@ -88352,11 +88596,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210820, - 2321 + 20210918, + 2238 ], - "commit": "51696277a4dc30acd61e9ebb400d99934955e450", - "sha256": "1y9bnylzml5ijczac210cs3fpy3qdx01c1wqghdvnr3a1p71w71r" + "commit": "38ae8fdf23f37af71b8a4f9717ba48c52653db63", + "sha256": "1x5d0rki2lsyg85srldwg34jaiq14l1nw58bab74n7xhp426pvyw" }, "stable": { "version": [ @@ -88459,19 +88703,17 @@ 20200619, 1742 ], - "commit": "10d0faef6de038960ec825c003c85581800fba1c", - "sha256": "1lynx4vj7w8mlf9mbwz5gwxfvr6iqp99sj89zr88bz5vynl6l43j" + "commit": "b83d5919ce6d9e0a8cd0dcd5a9b95eeb7678bfd3", + "sha256": "1xp4qcphhkhys08l25w227q5cpcnlcqby03bph0n1jppgy2hb1my" }, "stable": { "version": [ 3, 18, - 0, - -1, - 2 + 0 ], - "commit": "32461877b77f61ed8926b1f12641cbe7ea7af713", - "sha256": "0kyg8j3f94n2f2qfsgdijyqmaxp0hq9mzj9ss3dm5kg4skgdq8pk" + "commit": "89b14b1d16eba4d44af43256fc45b24a6a348557", + "sha256": "0nhjw4m4dm6wqwwsi0b18js5wbh3ibrpsq195g6mk9cx54fx097f" } }, { @@ -88614,15 +88856,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20210203, - 828 + 20210921, + 1158 ], "deps": [ "async", "cl-lib" ], - "commit": "ed53362af4dfc813505c30ca40227072df16fdfc", - "sha256": "0crq5ynhqi6lbq471nskcnjplyj6i80rxl3z00iyisc9184r7wwb" + "commit": "ae7ce9de253d1b3a8dba5fa4df2c42f8f5db5757", + "sha256": "0005iwl8f5qp09fvx5lir1mhxxaqn1zsgnfiwm59wik5z1jpxzpv" }, "stable": { "version": [ @@ -88738,8 +88980,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200618, - 2203 + 20210927, + 1933 ], "deps": [ "deferred", @@ -88747,13 +88989,14 @@ "s", "unidecode" ], - "commit": "88aeb71ed4354af0b58354636ee6a9485887213d", - "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q" + "commit": "e1ac5433daf966cf7c5e9178b037191e1eb3e4bd", + "sha256": "0ylsn36zmrn8mds2z74vbyv7sd4699a4wicg4shrf2gd5bbsi72g" }, "stable": { "version": [ 0, - 5 + 5, + 2 ], "deps": [ "deferred", @@ -88761,8 +89004,8 @@ "s", "unidecode" ], - "commit": "d781870e2f57e40110e07768289ab81d8554f122", - "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q" + "commit": "e1ac5433daf966cf7c5e9178b037191e1eb3e4bd", + "sha256": "0ylsn36zmrn8mds2z74vbyv7sd4699a4wicg4shrf2gd5bbsi72g" } }, { @@ -88872,11 +89115,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20210824, - 1555 + 20210928, + 703 ], - "commit": "3a3272c881945f0dfb4467f7f053d0853f612186", - "sha256": "1m2z4sif8558qyjzp33kfbjr1laz3nh79qbpzbnykk0j73q5zb9z" + "commit": "a076d32f281d2984c6072461d034688c41eae3c1", + "sha256": "106qvdspwahyahd4my5wby02ffykbwb04ahlqcrbdapw6aflnv19" } }, { @@ -88946,11 +89189,11 @@ "repo": "gnuvince/purp", "unstable": { "version": [ - 20190629, - 1829 + 20210912, + 1940 ], - "commit": "f821a7c30452d970ccb0ee08b68d56603860e31d", - "sha256": "170k5xkbqr0dbwcwhy75k88qjlnkw6l2ipaqlbr1hdnw17vp2qy9" + "commit": "8d3510e1ed995b8323cd5205626ddde6386a76ca", + "sha256": "0b3xpiwrbwsc5fmh6k2kj1wxhp3xl4dablxwap07q0kcnp3q47d1" } }, { @@ -89330,8 +89573,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210828, - 1848 + 20210922, + 1338 ], "deps": [ "ivy", @@ -89340,8 +89583,8 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "bbc532a85b7a5555cbf1f0b4cd91214cf9fa6751", - "sha256": "01c52vl8ynlj6awlqja461q75hz9d87l84phgdfsfngs6grvayzf" + "commit": "fed7b84350aab3aba27b0fca2ee53e4094307f7b", + "sha256": "1spkxz5ryq4gjqi37d2ci099ww2y1jzk8qv5vl1rzqnhb663hxkr" }, "stable": { "version": [ @@ -89536,17 +89779,17 @@ 20210411, 1931 ], - "commit": "97f7933d9838853cfff901db37545b9b8478296e", - "sha256": "1zjp3h8k6a16b03zn7k1s0lar83ps9ndqqsgbnsn06h29gfzl3h6" + "commit": "20304a6cfb0dedec8ca7878822b8db1fd3cc71cc", + "sha256": "023m59d9rq47dvv17w1bihjcvpq4shmjmk5s6wivc04gq7v5igrl" }, "stable": { "version": [ 2, - 10, - 2 + 11, + 1 ], - "commit": "591a23adcfdd2fe20b8cfdb9e4e07772c8f454f8", - "sha256": "06xrv79ns4bsk819iqrhjcb36k925yl2zi93l6sv7r228y0y8jl6" + "commit": "d98e6e8adcdc5ebcd9c863f630e748cdba639b0a", + "sha256": "08kc9139v1sd0vhna0rqikyds0xq8hxv0j9707n2i1nbv2z6xhsv" } }, { @@ -89817,11 +90060,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210809, - 1849 + 20210928, + 841 ], - "commit": "f43ab088af83ec20c5a70acc3559980c94ed2910", - "sha256": "0bflpbjv5j9q15qhm9q0yaaw0sfncx3dw5najvsj2rhiw5i47xx3" + "commit": "479b4051c4c3e7b2e938064bb3e73af41ea94af3", + "sha256": "1029l2b2ijym7fhh5vmxwzjz1wa35xhcvvk61fz2cchparphza2d" }, "stable": { "version": [ @@ -90025,6 +90268,29 @@ "sha256": "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947" } }, + { + "ename": "qrencode", + "commit": "f92852347c03b1e5c225c72a5df16fe5a1614c21", + "sha256": "031x3pl71dh9838l9k3w77xi730q2zvaq1k1ci7r8bq6nb7wjf12", + "fetcher": "github", + "repo": "ruediger/qrencode-el", + "unstable": { + "version": [ + 20210927, + 2212 + ], + "commit": "ccdc9366fe490f8bbdf7cab7d52d9daeb717a492", + "sha256": "0yjmrnb4srari7sz301k5rxmmwbnymw628ps8d3ipw6zvr9acviy" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "1e99f16ff78720111009eccaad2d00603c41ae49", + "sha256": "0729846bybh23bpy4sqn19n6l3ahg9lpc7rw9sakcigdfny7109l" + } + }, { "ename": "qt-pro-mode", "commit": "e9af710be77ccde8ffa5f22168d2c8a06b73dd6a", @@ -90438,15 +90704,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210831, - 2045 + 20210916, + 1812 ], "deps": [ "faceup", "pos-tip" ], - "commit": "a879a8d67b062c9aa0c6e60602eedba80a2069c5", - "sha256": "1cf104yb8qbq6dwjk0kplz2snpb565mnpirjdsrhi0hrndd6ryh9" + "commit": "4dbf807eb640536467f737b7eaf0029749273789", + "sha256": "0mvsdy5v3fwjfmbq0jqhj0phbb83f7ai6ddx190dyjl7z2x854zp" } }, { @@ -90635,14 +90901,11 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20210412, - 2342 + 20210927, + 1227 ], - "deps": [ - "pkg-info" - ], - "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1", - "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw" + "commit": "4ee9045eeb90f7831d7c0ee2e4adfcd957f712be", + "sha256": "0z8yclpb67x0k7x4ai13wvpc6w6s9z6kkib6a1lm4jpp4gyyraqw" }, "stable": { "version": [ @@ -92397,8 +92660,8 @@ 20210816, 200 ], - "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", - "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" + "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", + "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" }, "stable": { "version": [ @@ -92425,8 +92688,8 @@ "deferred", "request" ], - "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", - "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" + "commit": "68003b3f859724de621d0e5a8b0aae51ce708d1e", + "sha256": "1xqxrr2law67zm68gxylxrhivashzl8prq21kl01hs4a4q87slja" }, "stable": { "version": [ @@ -92569,11 +92832,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20210813, - 841 + 20210923, + 2234 ], - "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", - "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" + "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", + "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" } }, { @@ -92591,8 +92854,8 @@ "helm", "restclient" ], - "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", - "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" + "commit": "94d2e8421fa14d0e3307d70e1d1e2db9d43b2f95", + "sha256": "0c9z6316pdi30w63a4zqn3b84ciqgxfi7mal6rd3micxg6qpv27c" } }, { @@ -92677,8 +92940,8 @@ "f", "s" ], - "commit": "eaf177324482d0eadf0e97a892a156c2d503f245", - "sha256": "18krcfbjvm9g67846dn3q7a2y4z3figirk3pvdsdb0fv425j11zr" + "commit": "ef244995476620a133da5f94a7a1f79aabe5aade", + "sha256": "1ki0f7kmg791nhqjyqbwl3vj370isw1bdxy7xpsqvywzdmvmr3np" }, "stable": { "version": [ @@ -92845,15 +93108,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210625, - 939 + 20210912, + 1227 ], "deps": [ "transient", "wgrep" ], - "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", - "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" + "commit": "fa7293df75e1a3f2fb26add6bc96058000e6fbe3", + "sha256": "0a9xhfs1knxxqilpbpw3li8vipg248nqhpqq5d6sqqn7gfz4zmjb" }, "stable": { "version": [ @@ -93225,11 +93488,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20210824, - 110 + 20210920, + 1617 ], - "commit": "9b1a5abbdf461e6d4bfee50f71e3c85d00da1c0c", - "sha256": "1lmddhaabxq8kzyb54d944xwmdkcb9a6s4gi5wn3dp7sld7yvn4a" + "commit": "54bdd5090e0e3ae907d3f9075eb3a3fab0ba497a", + "sha256": "0i11kmqnbb201x9gmai279lni7csgq6isi1klpzch2c6y6pw01n0" } }, { @@ -93240,14 +93503,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210818, - 2338 + 20210906, + 2250 ], "deps": [ "inf-ruby" ], - "commit": "9e3805c5c7fadcba0da31a59985a8daeeb8a7b0d", - "sha256": "1bmp317cacl5hmmr5rm7jimxw4k0ggrz80c0vfygb5fx02s5jy0w" + "commit": "fd972e912d0c6c310acb2d057da1be1149937d0e", + "sha256": "015mciv5d9dap7h0gnjm93fr4jx46dsm1rkp84x8kflmw747g1yk" }, "stable": { "version": [ @@ -93479,6 +93742,24 @@ "sha256": "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp" } }, + { + "ename": "rsync-mode", + "commit": "3571304cfc14998f72c39067dfbbe879721332d3", + "sha256": "10mqm2dmmpl9sz8r5x9qzipbbj8smk40iim2ai2xb9y11854i6wk", + "fetcher": "github", + "repo": "r-zip/rsync-mode", + "unstable": { + "version": [ + 20210911, + 0 + ], + "deps": [ + "spinner" + ], + "commit": "2bc76aa8c2d82bb08ef70e23813a653d66bf3195", + "sha256": "0yy0d5pwy61ybrpblljk4z9qwyii0jcgxgv1y6sckai2qr5dia2x" + } + }, { "ename": "rtags", "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", @@ -93490,8 +93771,8 @@ 20210313, 1541 ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -93516,8 +93797,8 @@ "deps": [ "rtags" ], - "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", - "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" + "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", + "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" }, "stable": { "version": [ @@ -94503,8 +94784,8 @@ "deps": [ "cider" ], - "commit": "c813d94ee8d0a85dd33d0c5dbae832c24cf37e4f", - "sha256": "0r0c6h7nikb4181a06bs88sqnqa68jw2f550q2zz34khl7zpr2s6" + "commit": "614d44b4abb49d0cc3fdd40580d30b9d572d34b2", + "sha256": "03wh1kr9yhcagympbd7h3qgrs7qlycd68b0a6nswva48hdc4ay89" }, "stable": { "version": [ @@ -94554,8 +94835,8 @@ 20200830, 301 ], - "commit": "f673cf6ab9d13e376d5c71230a693a6b88730e76", - "sha256": "0paflmwafmhk2lcsh74vixids7xkmgacnzn0pm1i7jhkp3a4mn1d" + "commit": "ea97f85951c162358d1fa95536d45df32895b440", + "sha256": "12qc3bqpw4h5mddv9n2pvjn9j0301mr730zbzqhnnc511i1mav4z" } }, { @@ -95144,8 +95425,8 @@ "dash", "f" ], - "commit": "46eefd5b3f4a6f24b2f88c8aa18cce0abb32edb1", - "sha256": "0fi04v84gp74xr84sh7blbc5s93xxb6apsrdh8zlc9dvwkkh5gza" + "commit": "137c5791fb5a307192138a6d7c62340253bb4521", + "sha256": "0i6k8nlvacnpfq9cj42crs2h6iqgsfnkm73f8dhc8nn9lyz6chf4" }, "stable": { "version": [ @@ -95622,11 +95903,11 @@ "repo": "brannala/sequed", "unstable": { "version": [ - 20210417, - 28 + 20210908, + 651 ], - "commit": "b28e20bf3e0ec7c56c705632e38ab842083d9c49", - "sha256": "09bw3kjr32z8hlhrczl8i3h4yavdcmfx6bk7qxsyhn1f0vmskh03" + "commit": "c78ef34da948576290978d876b776c21f8832136", + "sha256": "1g11hkh3n74f7asgxjpq8isbvghwd82n6rjpjzcvrrwmkrgkhxam" } }, { @@ -96442,11 +96723,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210825, - 707 + 20210924, + 445 ], - "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", - "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" + "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", + "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" } }, { @@ -96521,8 +96802,8 @@ 20210715, 1227 ], - "commit": "28dc1d6faf21efbc49436b4458821a2d46e38ffe", - "sha256": "002vyik2nyqcvrf6d0qfbxc9bs95bc74crmyn9havlr50bw52wlc" + "commit": "83b9465a3081436df69afc03f9a4f1debdf57882", + "sha256": "1qy7ld64qcj4i8c0v6ddp88287gkm2rn6s696bwfgch7ddviya0q" }, "stable": { "version": [ @@ -96895,11 +97176,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20210829, - 2323 + 20210907, + 1213 ], - "commit": "bc41cab4b1765e48096006465c95f62f66fcaf2b", - "sha256": "18i7c0knhl8gvwr1hhlnnfl08sh9h48f7vl31cw8jrx817kzgf2y" + "commit": "ea4f25355ca071c7dd2a636dc841008f4c6b622b", + "sha256": "0c6kr5a13x478h4jnkiwavp7jfdjdkp4mq2sgr9ac5a2y3fvra9w" } }, { @@ -97114,8 +97395,8 @@ "deps": [ "cl-lib" ], - "commit": "2281065d00ff8f78a03c1a66fc168fdb198f3d89", - "sha256": "19x12bw75sizc8b04i930zv5f5jypvmhw45frb0z79m7rw41pbs4" + "commit": "7eec13672c2b6d0226d56de8b8b1e12a1f78aa57", + "sha256": "03mxy2f4i8pjmb1d9s6llaa4pmzrsigxaf1srfdwzc8ccaj1qi5n" } }, { @@ -98978,26 +99259,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210711, - 2145 + 20210927, + 1622 ], "deps": [ "cl-lib" ], - "commit": "030964f7c62696c8cfb29125df6e7649d2bf9aeb", - "sha256": "01c1lkr21y0cd6gixzd38mql89k70jn049jr0xhazgz16cnw1g7j" + "commit": "46408f4a105e216c3c2d88659b8b28601d37d80e", + "sha256": "0wq5ckwx3wv4c4l8f9hz3ak6v5wy4lg5yh8xlsgn1h1x6yf8afpp" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "030964f7c62696c8cfb29125df6e7649d2bf9aeb", - "sha256": "01c1lkr21y0cd6gixzd38mql89k70jn049jr0xhazgz16cnw1g7j" + "commit": "46408f4a105e216c3c2d88659b8b28601d37d80e", + "sha256": "0wq5ckwx3wv4c4l8f9hz3ak6v5wy4lg5yh8xlsgn1h1x6yf8afpp" } }, { @@ -99093,20 +99374,20 @@ "repo": "cstby/solo-jazz-emacs-theme", "unstable": { "version": [ - 20201106, - 1640 + 20210924, + 7 ], - "commit": "3a2d1a0b404ba7c765526a1b76e0f1148ed8d0f2", - "sha256": "00fs6ylz29p7fsqvc7jgdbbsakkkvf27w3cxg0rlja87m7628khs" + "commit": "f7b9ff800cef2c17ecaad9556fca2bfd4b6cc13d", + "sha256": "109r3fsxl1m7cf95h264ncnz91dmlhq6i15lavvg4j7fj3rmh768" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "16a943f8ea86e0dbf737a8c1e779b3002e6e140b", - "sha256": "0crfnpxh32lg2f3crv92j81ylc0h15hkhgbyg708wzlv2bjrxibh" + "commit": "82e9ab129d9c2949a4d91b81c2235295a8d83cd9", + "sha256": "0v3zhjx685ppngb01pd1p2iplafwvy9j60z1hgdrixdm2pji3f8d" } }, { @@ -99569,11 +99850,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20210706, - 1210 + 20210924, + 1220 ], - "commit": "dfe06629f8211ccd9933fc0d457019401ecbe594", - "sha256": "1apa6bp3lxs6jia37k079yd3qx79wclzh02bf66xpsqkwc2xg5fr" + "commit": "e5ed346b9c31f0b43eb359614efd9aa439e1d18d", + "sha256": "1d9554sbyg7y2a07dn2v4y8wms60kr1lpdgy4mq7wgm5kxzi8v85" } }, { @@ -99820,11 +100101,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210814, - 748 + 20210927, + 234 ], - "commit": "10823ae58f88874aff2a6a35f2da75c8503e726e", - "sha256": "0s7d1fgjk6cc27y37qlqfcjrrpqa0fxagr92qxzcn0mp2lb7pnhc" + "commit": "e193c114c69f99ca23458597f16dcd421616fe35", + "sha256": "1zgidr6sh5rad494qcplfmfc7i3zvid50j7q7x44ibcisvprfkmd" } }, { @@ -100836,16 +101117,16 @@ 20200606, 1308 ], - "commit": "ed1651792509ddbd1e139a884d26e6cd818160cb", - "sha256": "1kk5f1i3dl86svvnl845ya2vgc0xhhfp1lgns2bl6glpf5qy8bxb" + "commit": "689689adb35f984f9fd833a6b92d4bf50ac565b3", + "sha256": "1iighf4kx2azakrqjf4s08nnsafzp6bh66d15qd68k5z1lkgljsl" }, "stable": { "version": [ 1, - 1 + 3 ], - "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", - "sha256": "09d69q9m4k4pwhl2k5r7d7lqd4cj0qf22cys94zjkrsyw5gggd36" + "commit": "05900351a9ec7b774931a2a59c15c9f0b6d443f6", + "sha256": "0wa3ba7afnbb1h08n9xr0cqsg93rx0qd9jv8a34mmpp0lpijmjw6" } }, { @@ -100886,11 +101167,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210610, - 1256 + 20210920, + 1345 ], - "commit": "e69b7532ceb27126fb9516c9a8aff652b032088a", - "sha256": "1jcqcf34d55r1z786gpkj7jwap646izk498pn2dia7skiwwljx5b" + "commit": "caf1c099ee5da59c6686af99c36eb846ebb7a610", + "sha256": "112l5g5s71r8krbcx03xgm18v5lm3r4dz10a3qss27s2m6a1y8i5" } }, { @@ -100953,11 +101234,20 @@ "repo": "fosskers/streak", "unstable": { "version": [ - 20210901, - 1646 + 20210917, + 4 ], - "commit": "ac05a0d74ceaccff15f1f7128fbb976be53db549", - "sha256": "0wffyf382d2mgs4asfbljvlzz3sr1mrs0analkj1ywqblv0z8xhh" + "commit": "70e31b43cf7d1e1e390dc718702591cfc9ef5431", + "sha256": "0vpsr8ss2cr2q80g3db2rvjc1v4p64fqkl6247r6yp73x5iasadp" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "79058bac46f5c510a1d1dc007e4963a955a3621c", + "sha256": "0fcgxi1sk80w3rdb6rrhwc3p0pdrg5pd9c11qwymbd74ikz5w7q2" } }, { @@ -101034,20 +101324,20 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20210729, - 658 + 20210918, + 419 ], - "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a", - "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd" + "commit": "fd7926ac17293e9124b31f706a4e8f38f6a9b855", + "sha256": "0wskrp3v5gi3b3s9471ijkdncnfd888qd50c72rv2p8846174paj" }, "stable": { "version": [ 1, 0, - 14 + 16 ], - "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a", - "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd" + "commit": "fd7926ac17293e9124b31f706a4e8f38f6a9b855", + "sha256": "0wskrp3v5gi3b3s9471ijkdncnfd888qd50c72rv2p8846174paj" } }, { @@ -101197,14 +101487,11 @@ "repo": "brianc/jade-mode", "unstable": { "version": [ - 20150313, - 1512 + 20210908, + 2121 ], - "deps": [ - "sws-mode" - ], - "commit": "4dbde92542fc7ad61df38776980905a4721d642e", - "sha256": "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1" + "commit": "111460b056838854e470a6383041a99f843b93ee", + "sha256": "1v6j0658dch5v0ddkkgw99194jlh28p5cjvkcp6cabwjb7s4pvim" }, "stable": { "version": [ @@ -101341,14 +101628,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210902, - 2047 + 20210909, + 1003 ], "deps": [ "transient" ], - "commit": "5740a2b96c827c499f3ac506f98ec5f9ed31ea37", - "sha256": "0qr96a86zj6kipix6p831hj0nkcyj3kvaggyy2zsmvhx7wjavadf" + "commit": "a4eb0da98a3909d301a7c07ae2e64197f8db22a0", + "sha256": "1pwy3h7k8y8hwb2dhpcx22sc5qzyk22r6hvvs4yd2gyjd4lw77vi" }, "stable": { "version": [ @@ -101904,26 +102191,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210810, - 757 + 20210925, + 430 ], "deps": [ "seq" ], - "commit": "800efe2910e0a8517ac720c8bd0e0714fef142eb", - "sha256": "10b475axhqdqighfisnq505m2lk66bpcq1qgry0fd6iq4m8jkia6" + "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", + "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" }, "stable": { "version": [ 8, - 3, + 4, 0 ], "deps": [ "seq" ], - "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", - "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" + "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", + "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" } }, { @@ -101988,14 +102275,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210521, - 1319 + 20210919, + 1221 ], "deps": [ "ivy" ], - "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", - "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" + "commit": "5f49149073be755212b3e32853eeb3f4d0f972e6", + "sha256": "0255rzzmqg6cq7qcaiffzn52yqfkzg2ibr8z9kljzgfzbarn337h" }, "stable": { "version": [ @@ -102146,11 +102433,11 @@ "repo": "brianc/jade-mode", "unstable": { "version": [ - 20150317, - 1945 + 20210908, + 2121 ], - "commit": "4dbde92542fc7ad61df38776980905a4721d642e", - "sha256": "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1" + "commit": "111460b056838854e470a6383041a99f843b93ee", + "sha256": "1v6j0658dch5v0ddkkgw99194jlh28p5cjvkcp6cabwjb7s4pvim" }, "stable": { "version": [ @@ -102235,16 +102522,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20201223, - 2054 + 20210928, + 2346 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "ed65cd9c22550e59f723d7fc36ecc313aedc83da", - "sha256": "19a5l2g5j58rfyws78jdnfd4g3dbc5chhq59xps7kghbzm0nmvvv" + "commit": "ffffb0a73e85a3619bef01fc3fcacd144c031118", + "sha256": "1s0wwz37kggl8vsny4g0wq6m77kpivgbb59wbqzlyh44iym9f081" } }, { @@ -102325,8 +102612,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210829, - 2036 + 20210928, + 1519 ], "deps": [ "evil", @@ -102338,8 +102625,8 @@ "seq", "undo-tree" ], - "commit": "cd80cfbff832b64de65fc4ecb50a53956dac760f", - "sha256": "1nh6fncm46lml9df9vlj3s21qxai43fgsvl3b8mzr7rp3c0f40l5" + "commit": "edb171e575c454b77bd7e0842236ba5f095d8c30", + "sha256": "1jgq0k8id3df6qbgxxxgffv5237f5rz85ckcd50yhdmzpa2ss5wr" }, "stable": { "version": [ @@ -102572,16 +102859,16 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210906, - 1438 + 20210910, + 1952 ], "deps": [ "hide-lines", "hsluv", "ov" ], - "commit": "f0d25da654d0666c6084fcb0d075326e13ec06c0", - "sha256": "1baa9n85vq77xha89j09n32zmwppgrwxg3z30vrbbjqaiwlb6nr3" + "commit": "072664784dae41a573a9de8d178bf577b7526b82", + "sha256": "04ddpn6il6mh1f992x3fxl6yljryghi51q4845lx08cbc74wnfz0" }, "stable": { "version": [ @@ -103202,15 +103489,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210903, - 2313 + 20210924, + 1550 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "5450160db7ab7661ec2519d53bb26429ea90a1fe", - "sha256": "1yzqlnw1vmbk2dn790ljirp253k4h5j12r0pm2zpp4iachl1z2kw" + "commit": "5cb57beb4caea2c50418808aff35f6632eb73847", + "sha256": "0h53ni59xm9qbhyl2fr9vmwnw6xk8aic9jcybn8jsfdxax46s3mm" }, "stable": { "version": [ @@ -103305,14 +103592,14 @@ "repo": "lassik/emacs-teletext-yle", "unstable": { "version": [ - 20201019, - 756 + 20210927, + 825 ], "deps": [ "teletext" ], - "commit": "c5ba744191eb35b6877863b31bc00e6e9a264927", - "sha256": "11rck07k0fz1rflzwb8b9h7kc7xsgq6q8nhxfnb0pswd58dnrxiv" + "commit": "9c8f4b503923c4ec688e2dcc9dff62d71bc55933", + "sha256": "0j0qd75nz0b97pg7x58cf6cxanmwkbyam6raq6zwdlvllwmsq6qd" } }, { @@ -103801,11 +104088,11 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20210514, - 737 + 20210927, + 416 ], - "commit": "5d35efbf2c1619d9385ef00ed74e9de1ea7cf32d", - "sha256": "11df5606hiqgglxi6xrrljwh70h2wgkib447ggvs2r3f2jayilr4" + "commit": "16ee53bdfd15498434100db8976efa0884d9644a", + "sha256": "09529irjqzasma0f7is7a7ralmmwj0rpdmjn60bkny62cr5x8j7x" }, "stable": { "version": [ @@ -103994,11 +104281,11 @@ "repo": "juba/textile-mode", "unstable": { "version": [ - 20170304, - 1716 + 20210912, + 906 ], - "commit": "c37aaab809503df008209390e31e19abf4e23630", - "sha256": "16543im5iymc5hfcix1lglbvpq4v0441vb7sk58nbnffqba83yzy" + "commit": "a49d9bf42166584cca395a92311e9d0a199efc46", + "sha256": "0b7vbqy2ryp5c0jz7gb5ddpa3mlqmkd7jlf94hdb0d0ffapspqsv" } }, { @@ -104293,18 +104580,18 @@ 20200212, 1903 ], - "commit": "3569010b61baefb4324d4b28f1ae60799283a4b5", - "sha256": "10y5h8qfcbgxnihnm61ab9xs74128jni5gha9k3m7afa5wg8j84b" + "commit": "8d2ff653bb2e73769141402bc6cabe79b5e68a65", + "sha256": "1jw3rpj4nfwmabfab5qqjv02gp2qf4lljhby9x215w97mwl8jd3i" }, "stable": { "version": [ 2021, - 8, - 30, + 9, + 27, 0 ], - "commit": "9dabbd58640cfe95ddb7f30d497693f4ba6d9f01", - "sha256": "0mw7vhs78m0zk7mz8icd6zr4bzsjn82jcdgrb13bw76xw6i88161" + "commit": "5bb1655b47d8510f1ba9362fccd56e834d6a14dc", + "sha256": "15cl4x2i04qbnjvd1z1x4sqrrd2z7vk13r9yqqhnalm5pfz3bqky" } }, { @@ -104360,8 +104647,8 @@ "deps": [ "haskell-mode" ], - "commit": "638a1079a0ba8cd757bc74f99a58d5724b3314f5", - "sha256": "1ki0i9f1fvvhkac1ivd7smg5c3vnbdrfyxr6v9q4fms4mczj4jc9" + "commit": "7d282b3e82cc1dff07a97047f1e10ab764087b2b", + "sha256": "04qm39gn3xicyrxz797ia9rh988bqcqki0dhn7q4rkyak6diskjd" }, "stable": { "version": [ @@ -104394,8 +104681,8 @@ "s", "typescript-mode" ], - "commit": "1e376e3e9798206ea3e42a5c037a7c00aa64ee00", - "sha256": "1g5q70j55qbvsl5ix9hsbmf5xllph1ch27miln7j3y5mi56k0lq9" + "commit": "296c0e0e3a134c35df468fe870a877b35dcca3c6", + "sha256": "0sxjwdczlrbsqjbxsim89c7p9inwzvxxk67i9q57lpn45lzz4mrc" }, "stable": { "version": [ @@ -104422,11 +104709,11 @@ "repo": "emiliotorres/tikz", "unstable": { "version": [ - 20200728, - 913 + 20210927, + 1704 ], - "commit": "f1495516657da6dc2296ffb6c38a3bb4acf118ad", - "sha256": "0w9xff7y6zhb28b1cfbbam9gy7dp11i96yb4rn4lj8h2yry89293" + "commit": "f9ea0793affa34be29e1861bfa559fd248b7d22e", + "sha256": "03jcj6vkb8i7jqfwyiix5achq5bgwvjz97w2pwr46v3hbrf4r62q" } }, { @@ -104609,19 +104896,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210828, - 2241 + 20210925, + 1118 ], - "commit": "07fa0c6287612693a4d9b571d6a9a72e498e41c2", - "sha256": "0fswhfn0qjpb94dlbl3rivgkbz3vdly4hk5hgl017zgj3nfb06vn" + "commit": "ed7f90d74d87e629dded6bfe0de2d04a856c5d61", + "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" }, "stable": { "version": [ 1, - 5 + 6 ], - "commit": "f3243f0d27988eb4c29215dbe07d35f37031114f", - "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" + "commit": "acb033ab8e3f4ab7899daa7a7fc0d67187b0554e", + "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" } }, { @@ -104728,14 +105015,11 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20200330, - 1025 + 20210921, + 1715 ], - "deps": [ - "request" - ], - "commit": "d59405bd72f3379417b9e73f06e8848b43cb021d", - "sha256": "19yb4cxcaif73yvf62d4891l5rvp8ynhxl0f2wc9lvssg0lpx5y0" + "commit": "d3fd2a809a266c005915026799121c78e8b358f0", + "sha256": "0jbyz1anxq2ql8351v97dw9l70akys7mvh5m8q35nska2sgbzkax" } }, { @@ -104819,16 +105103,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20210905, - 2024 + 20210922, + 2254 ], "deps": [ "dash", "org", "transient" ], - "commit": "cd934e50d6a226c8718957877aedc4d2d947ac59", - "sha256": "12v9alrkvzwihkldn2wbn3xc3yc408kmp155j9pn9vjy53fypvg1" + "commit": "3662c323f02e89d48c206103b43a185b930220e7", + "sha256": "02wwsaj7vc5vs8xij6kzgqqdwigy0qcvridbp8zsjmhy2rgq4w3w" } }, { @@ -105381,11 +105665,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210819, - 2118 + 20210920, + 1038 ], - "commit": "65f4eac82c564204d20df0a606dc2fcaa72cc41e", - "sha256": "1avxr5xdx8awzj63r97a505xd32d49qwjszbjzd0yfs3i5y243li" + "commit": "7c67773735dea5a0c41ad8afb69fdafb62c46c7c", + "sha256": "098pfyrkpkj3dqh5pq6dzgphpnh2m7jw5yxxc07f3aqip8nkh3b9" }, "stable": { "version": [ @@ -105514,8 +105798,8 @@ 20200910, 1636 ], - "commit": "d2651b913a6ec615e6285712833566a79dca7247", - "sha256": "0pw401npbahlii6x37c6mi66ghd16mv04d6y0d1nirflvg4nfl8a" + "commit": "a31c7aae9d48edfcd10ccefc7b513214d6ddfb29", + "sha256": "0c7q250bkhjrqb8nzbciggngywbh5rkvbpzay8pcqnb04phxxvax" }, "stable": { "version": [ @@ -105622,32 +105906,31 @@ }, { "ename": "tree-sitter", - "commit": "315cccbfb1a9aadb546a5b62de5c3b681108ba6c", - "sha256": "1y7y8qrzc4nr31rh9gi8y3qpgb33jfl8aj8lmbagw5b7pc3v5f11", + "commit": "cb5169a41c3284f1fe1887cd2d32f9e98e34fbe0", + "sha256": "1n08rsf1cmxsrpld9j78a8smzckcpg006za93h464gfqls4y2kl2", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210904, - 216 + 20210912, + 1211 ], "deps": [ "tsc" ], - "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", - "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" + "commit": "2acca5c8d2e3dc66d4d0a99831b33140b5a5f973", + "sha256": "00qlrjh3my8w96lvxx3bfx8pshr58irzmrnvr8qrkwzyv3hs0rbl" }, "stable": { "version": [ 0, - 15, - 1 + 15 ], "deps": [ "tsc" ], - "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", - "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" + "commit": "2acca5c8d2e3dc66d4d0a99831b33140b5a5f973", + "sha256": "00qlrjh3my8w96lvxx3bfx8pshr58irzmrnvr8qrkwzyv3hs0rbl" } }, { @@ -105683,32 +105966,31 @@ }, { "ename": "tree-sitter-langs", - "commit": "4163e6e43626c5149be06b95ec2e6de55acb85cc", - "sha256": "1bkjd5h817dw5zkbfb1dn4yg6cy29m9g0d650ap5ldi2y605zz5v", + "commit": "cb5169a41c3284f1fe1887cd2d32f9e98e34fbe0", + "sha256": "0dqz421vwbgmp83nib9jigwi0rayb9hqsralwhj0139w6jkvxmmb", "fetcher": "github", "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20210831, - 1555 + 20210918, + 1621 ], "deps": [ "tree-sitter" ], - "commit": "ef42920bb573b40e64b35e43968dac355f87e959", - "sha256": "03257nqxz11g4qivmq2h7gs98ssrmpvdyaghrfxpaizagbk7clmd" + "commit": "2b845a70080c0edd66f13200b9dc8d6d0c3f42ce", + "sha256": "0w3jzy4n445nrbcj7i46nbg7jk81gjqjs6zahsjnal8dhyjqaymi" }, "stable": { "version": [ 0, - 10, - 4 + 10 ], "deps": [ "tree-sitter" ], - "commit": "95c8d2869926014351ffb932ad6749f5dfaff033", - "sha256": "19rjnqsx7xi4g5dj32nb4x7xlxmbhagrm652khfn1chlwd7z94la" + "commit": "28e98d52e8516d73cce76e7ce5c6294a9728bb56", + "sha256": "1zy1wjw6ixpl5mw8f3drp47w256xbbzgxrgs2kpgj0w7wif10yjc" } }, { @@ -105755,8 +106037,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210906, - 1653 + 20210927, + 1735 ], "deps": [ "ace-window", @@ -105768,26 +106050,26 @@ "pfuture", "s" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ "ace-window", + "cfrs", "cl-lib", "dash", - "f", "ht", "hydra", "pfuture", "s" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105805,8 +106087,20 @@ "all-the-icons", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" + }, + "stable": { + "version": [ + 2, + 9 + ], + "deps": [ + "all-the-icons", + "treemacs" + ], + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105817,27 +106111,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210821, - 1041 + 20210927, + 1735 ], "deps": [ "evil", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ "evil", "treemacs" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105854,20 +106148,19 @@ "deps": [ "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ - "cl-lib", "treemacs" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105886,21 +106179,21 @@ "pfuture", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105919,21 +106212,21 @@ "persp-mode", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105952,8 +106245,21 @@ "perspective", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" + }, + "stable": { + "version": [ + 2, + 9 + ], + "deps": [ + "dash", + "perspective", + "treemacs" + ], + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -105971,20 +106277,20 @@ "projectile", "treemacs" ], - "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", - "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" + "commit": "747c51fc22475f1576c79c417b09f29503cc8c27", + "sha256": "14vvil3056vnw6lppc0a77vi20hpysjq7cz881j9v60lvl6ym30j" }, "stable": { "version": [ 2, - 8 + 9 ], "deps": [ "projectile", "treemacs" ], - "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", - "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" + "commit": "8a726dc2047163ba6fcb1cb9fde3fe9238021362", + "sha256": "141mgd742grvs94mnr62w1fiwmlhkq8b2131dh4mqrdjgcrd1kl8" } }, { @@ -106221,26 +106527,25 @@ }, { "ename": "tsc", - "commit": "c44eceafdfe3dd4a98010a8dcac2e9e3ddaeae4c", - "sha256": "1gwavabszakqvvyw8yrr17dng7k9w27g8dsaf5zwihp8j46wim27", + "commit": "cb5169a41c3284f1fe1887cd2d32f9e98e34fbe0", + "sha256": "0di9v57sn2b6dvgf7id409drk9ir65brv2mdigk54gra8801fk64", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210825, - 1402 + 20210912, + 1211 ], - "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", - "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" + "commit": "2acca5c8d2e3dc66d4d0a99831b33140b5a5f973", + "sha256": "00qlrjh3my8w96lvxx3bfx8pshr58irzmrnvr8qrkwzyv3hs0rbl" }, "stable": { "version": [ 0, - 15, - 1 + 15 ], - "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", - "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" + "commit": "2acca5c8d2e3dc66d4d0a99831b33140b5a5f973", + "sha256": "00qlrjh3my8w96lvxx3bfx8pshr58irzmrnvr8qrkwzyv3hs0rbl" } }, { @@ -106310,14 +106615,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210904, - 917 + 20210913, + 1031 ], "deps": [ "caml" ], - "commit": "eb0bff8d7bdf229322aa28ff0a8f44ba5e162202", - "sha256": "1y2dpc2hndqwk8gc6lp6f1c4px3kak514hk120sjxpb3133g3ivf" + "commit": "00faf47a7c65e4cdcf040f38add1c6a08cd2ee2f", + "sha256": "1rjz11q9ww5bvmfp2jri0nlrv9aiw7qzl80wlkmkcv7lv3qmvblb" }, "stable": { "version": [ @@ -106574,11 +106879,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20210830, - 1858 + 20210921, + 1849 ], - "commit": "2a58631230fe2d176352af262a0efdecc21f90ac", - "sha256": "0fjgw71sgyrygzk9s6hfrqky06lqfwzz75bjxkxhb7yl5mdj8ccv" + "commit": "c9b22f5f338c4efa138a79d551c4cc4a9e9e7826", + "sha256": "0gvh52ms1kg8bjdgnq94fhnvg0h75vp5b97h9g2gcc6kys0r3qbj" }, "stable": { "version": [ @@ -106824,6 +107129,36 @@ "sha256": "15nspdkjwbvxbqxlhmpsbhdf1zij9zd2z2xxhkmvdyjy89w0hyzp" } }, + { + "ename": "ue", + "commit": "dc9ec7c99477746b1bddc97231a8f5ee37322d11", + "sha256": "0ig2zapbd5iw3nd6rmxy2dnn1wq3ipf54rygwz28z5l3fs6wr0fr", + "fetcher": "gitlab", + "repo": "unrealemacs/ue.el", + "unstable": { + "version": [ + 20210928, + 1227 + ], + "deps": [ + "projectile" + ], + "commit": "c34ffb97e2c082b4608d387f3e51e85a716a00dc", + "sha256": "0m7nm3icl8x17bci1269dv1j5sp7nljyamjr3nb47iqcb18plilz" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "projectile" + ], + "commit": "c34ffb97e2c082b4608d387f3e51e85a716a00dc", + "sha256": "0m7nm3icl8x17bci1269dv1j5sp7nljyamjr3nb47iqcb18plilz" + } + }, { "ename": "uimage", "commit": "346cb25abdfdd539d121a9f34bce75b2fc5a16be", @@ -106969,8 +107304,8 @@ 20200719, 618 ], - "commit": "741ab716ada8e71a94a9dae3daa4236298d29bd7", - "sha256": "1ibjwmvx4p7kchxlnfpqxj4p3k99nwxwhzk4m2b1yyswpiad2k0z" + "commit": "fa821425572cc75fbc7b990c800d4659dd893a4e", + "sha256": "0k9b5lv9nkfjk8r1kmcal7b4jsgiglpgfwzhfczc61lj4q9i9zq7" }, "stable": { "version": [ @@ -107091,8 +107426,8 @@ 20210106, 220 ], - "commit": "eef1614c79eb259cb782437a25680246793a924d", - "sha256": "0vx0sv8595lbx8x23ly3dg6zb73skp4cxi8l6m2h4l4v8fs6r0fl" + "commit": "3bd4c8d3df15fb54a79f97e26177819fc0ebf877", + "sha256": "1dwy1pcvsqdxi7zrfgh3k9g2h9dnc3yyaqabmin5h3abs6mivb7v" }, "stable": { "version": [ @@ -107234,8 +107569,8 @@ "persistent-soft", "ucs-utils" ], - "commit": "e3942fe40b418bfb2dc4e73633e09195437fef01", - "sha256": "1vyldpmbi92yqzj0v7wbxma86f3cla0jhxbmq8jzl94pqy6q98jc" + "commit": "47f2397ade28eba621baa865fd69e4efb71407a5", + "sha256": "1c9byhlkzjvijhl7izwxfp4z6dwism4np4m8705i23ccrpf039jw" }, "stable": { "version": [ @@ -107892,8 +108227,8 @@ "deps": [ "s" ], - "commit": "aa6e271e8efc3a93caaaa740245d126d24e778ab", - "sha256": "0a8qb7wyi5pkg7g0x7imzzxryz55dr8msiila9j9skq6jlmn84hl" + "commit": "c9d72f638367e58631099c39ed4851eed5622a1e", + "sha256": "1f9g3g7p32iq8i48v26v95i8ryn7v8w68lv57lrm1c8x5r9cyw56" }, "stable": { "version": [ @@ -108250,11 +108585,11 @@ "repo": "venks1/emacs-fossil", "unstable": { "version": [ - 20210124, - 812 + 20210928, + 737 ], - "commit": "5d66231e25f34aaedb4befa0fcd80a9c30d7e607", - "sha256": "01r8j7a8b3icfgyxpgxh3pimzwig0xbhmggahzllgn96w5fafgpv" + "commit": "7815c30d739a01e1100961abb3f2b93e0ea9920f", + "sha256": "0j33cmnl9ka2r7ahf84dkj6y2lf8m455986y7rms1d62ih9fq6ds" } }, { @@ -108434,16 +108769,16 @@ "repo": "justbur/emacs-vdiff-magit", "unstable": { "version": [ - 20210614, - 1630 + 20210908, + 135 ], "deps": [ "magit", "transient", "vdiff" ], - "commit": "fa62a260411387702dd4cc4791075c737519001f", - "sha256": "04n47g3ffnh3bjq5575b6l046cpy7dixksfjy8pzsgh9ah1h37lz" + "commit": "d3a39c3f8cb7ad9a6a769ce45f633b613b067490", + "sha256": "0ci5zsmd4r7z8h7g19ddd29y09lja0ikkm9rp8d2whxi9fz37dha" }, "stable": { "version": [ @@ -109025,11 +109360,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20210210, - 255 + 20210928, + 758 ], - "commit": "dadf36158c7ff89291bea4695999860cca2d094e", - "sha256": "10vnw6p5zg3azn1hf74014497qyxbxh6rr27lba45nrnxiz6wfmp" + "commit": "24271e081be3bb9ebcb41e27e1dad9623a837205", + "sha256": "1np4mbw1fry8ja74vy3hjs9fx301c7k8zq3h4a9i7jbnkvzh9iyi" } }, { @@ -109128,8 +109463,8 @@ 20210419, 857 ], - "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", - "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" + "commit": "bd78372bd3d8f3e90508e1eb0c9d1a53948dcc2b", + "sha256": "18ynnvz7an3bg33pd4fhkk0y85j2v48bgxny163ya6nbk0xp074s" }, "stable": { "version": [ @@ -109356,8 +109691,8 @@ 20210627, 2121 ], - "commit": "28398f1059f88e7e242f39cfa0ff8213cdaefc42", - "sha256": "0ln5idsmj7x0b769g7bj9wk0bjr826kq4bryw206dxxnz06s3wcs" + "commit": "fc9766b4d772df7006998f3d863e9469498cfdc3", + "sha256": "1ssjwmv0f24zx0hp1rhicgza1s3pfcr6b04kf2n00zdyn37gwfvn" }, "stable": { "version": [ @@ -109379,8 +109714,8 @@ 20210627, 2121 ], - "commit": "500d35f051fca07459abd163d5692c853a49329f", - "sha256": "1k5akiim0c0qiv10np5yzdndz8p499qhzhhrp1i8dz36gbp5x8ll" + "commit": "1211f09ec83f3f375b2e38e4d704bd102bf3f6e3", + "sha256": "18ciz8rvx5n4hqqbr4y7vjkjzyq8dc2393yxfi6rhp3hkdld043p" }, "stable": { "version": [ @@ -109414,11 +109749,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210720, - 1218 + 20210925, + 1940 ], - "commit": "aadf603bccb51addfcbd1ee4f684f720d56df56f", - "sha256": "0zskaz2np8x6wz3zrkqw5bhmwzyq8llvqq5sbwjzlgdl2xph876f" + "commit": "b6ab14278cc0aaac13fb7cb3a12e73985a781cb7", + "sha256": "1f24cd9isxhlr1rdbk3inhc2rx9n090wx35fs47nxicicz8hncas" }, "stable": { "version": [ @@ -109453,11 +109788,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210905, - 903 + 20210908, + 640 ], - "commit": "db9f47f62391e9ac02fff6f0c63528bd8e5658de", - "sha256": "19fvxyqcrhim6p06krsh4zaqkl49vcdpkd6i9xqldsmm4lzmcqj8" + "commit": "2681120b770573044832ba8c22ccbac192e1a294", + "sha256": "173qhfj5h4xd8rrf4avzknp24hzl0nlxs783pr7900d980cpbygr" } }, { @@ -109596,16 +109931,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210821, - 1625 + 20210924, + 535 ], "deps": [ "org", "org-roam", "s" ], - "commit": "bc0abbc81917edf130476db7007184c015768d05", - "sha256": "0wjpvspyg6h0692gy9vfz42wcwsr599y53b8mfkjmnbdkbdwy1i0" + "commit": "fd2acf7b8e11dd9c38f9adf862b76db5545a9d51", + "sha256": "1hx7732q6mdb9q0dqpyiy1mvjgcc2hb6bkavy50rlbl6jmh5ra5m" }, "stable": { "version": [ @@ -109675,10 +110010,12 @@ }, "stable": { "version": [ - 20201005 + 0, + 0, + 1 ], - "commit": "34ba004717ecb9d46c3fc20162005261cffb0bcd", - "sha256": "1n9bbc8s8ls9idjbh1f2nsf4cb829qpdbdq0iws56xqyd8sxsss4" + "commit": "1dbdc056f507172857195b5e14b7550c565018bc", + "sha256": "0wy9yvbb3a6j797z19ja3mkc0kcp0gprka3pzn865frdkd4bq29s" } }, { @@ -109689,11 +110026,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210906, - 347 + 20210923, + 2248 ], - "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", - "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" + "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", + "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" } }, { @@ -109784,8 +110121,8 @@ 20210903, 1619 ], - "commit": "8fa54f3cf7921e961e46d20e1afc51eec8286003", - "sha256": "196y13zjbp4j1fjsgcaqri9bplzj5445g8i8l4plv4ff9nkyyc2p" + "commit": "627e94389fe754da9802a8c93e4a3d1a1831967b", + "sha256": "0i0a9imkpz0aq4r340vd2li22m1wnv7p83s4bcaihl1z8axfa611" } }, { @@ -110337,26 +110674,26 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210906, - 1254 + 20210919, + 1547 ], "deps": [ "templatel" ], - "commit": "e49a901223b9f5db390adf01e3928f134aa66f25", - "sha256": "1h1k54p5sfd5bxqg40w62nprii28g0pjkfy0ayf0vyxsyhdj6d9y" + "commit": "0f8ec7e9065b2962c93209ee30b46f91843e2815", + "sha256": "0jiq879m74ysl0gb9wh1qmxyxi79nhnr2b1slq33mwf98r1nzcbg" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "templatel" ], - "commit": "3c860c7b52ccee2f8d0b96e8a9e65e9695eb6e0a", - "sha256": "1lia9g9dpmn7l7valyw7mvh7ipy2nanhjbd60gha1k4p4ypx3sla" + "commit": "0f8ec7e9065b2962c93209ee30b46f91843e2815", + "sha256": "0jiq879m74ysl0gb9wh1qmxyxi79nhnr2b1slq33mwf98r1nzcbg" } }, { @@ -111450,11 +111787,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210524, - 1654 + 20210928, + 1826 ], - "commit": "5519b6a67ecd66865b4fdd5447425eee900c54f4", - "sha256": "1bmvkrfnjzrf0ch2mh75cv784mzs64i4f44l91xysapjqv46lfqn" + "commit": "5272a3c7af183eddf59cbcd7cc82203755b61300", + "sha256": "00n8yqkhnbwb7vf00j7n54cm0ay28z638c0l05svkqsnbcl70v21" }, "stable": { "version": [ @@ -111576,26 +111913,26 @@ "repo": "10sr/with-venv-el", "unstable": { "version": [ - 20200125, - 1620 + 20210925, + 2336 ], "deps": [ "cl-lib" ], - "commit": "51ba19ac75a2796d494587b3b20ce51d4eb178a5", - "sha256": "1nbw88727spdgivrafjnlzbda81nnd1xprqdgmy6h2xfvki23zzb" + "commit": "773192d892ec0341e023d8b5e80639f8eb79f2a5", + "sha256": "0dh412qj2v4mz6mcjgkiacdcl8pbh2lgyinm70j3dr7qdsbadw97" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "d12341b93420f4acd7a277ed0cd4a54767bc5bd6", - "sha256": "0knv2ybf4sbn31zyg9ms44mxvmvg7b51krq320g8fpcpa1bq28s6" + "commit": "c34979519278a6e17312e8c47a19eb7bc94e5002", + "sha256": "1wwj5pyhb3vxrpyqxrmfayjkyamf0v84jq6bb7j2kl90aa8b2m90" } }, { @@ -111770,8 +112107,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210826, - 1000 + 20210913, + 1123 ], "deps": [ "ace-link", @@ -111779,8 +112116,8 @@ "swiper", "zoutline" ], - "commit": "aab516cd0cae65796cce89b29691e95d18bec3ef", - "sha256": "1kiy00r01h05p5i2g0z5kv9dhk3hcbfhjc3gibcx7bspsjsnmn7q" + "commit": "238b7c89229e4b56b36e81f06a2a49488940212a", + "sha256": "06qlkxkdq316habdxvhyyrf6d25i9pdxwjc4dmk3l83sg61rlg79" }, "stable": { "version": [ @@ -111954,14 +112291,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20201229, - 2242 + 20210927, + 1301 ], "deps": [ "visual-fill-column" ], - "commit": "b648b340172ce4e44307375697e190bc723203e0", - "sha256": "03dq65wsfwf4xdl6rj5zpk72gwzwydfdapfz8gh797jn2mp1dqnk" + "commit": "eac1da790f316f357ed76ed67fbb790d6a4d126a", + "sha256": "01yrz25aymzwkcj5yzs8pmswsg0jgzbynbp9hmjnf3sqlgmang62" }, "stable": { "version": [ @@ -112060,11 +112397,11 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20210316, - 156 + 20210915, + 1113 ], - "commit": "986c9d96ff898d346b453422e8e312f7976e6089", - "sha256": "17wls9mn097kwpcg9f4dxa6is0yshxgmjh2z1pk1nwfd8mdpczvg" + "commit": "cf4cfbcdc8e756986b927224a42a9006d070f36a", + "sha256": "1ach6c5y54gcfgq1nmgla7lri8mi7nja8a85slws4zxvl4b6802w" }, "stable": { "version": [ @@ -112199,11 +112536,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210905, - 1756 + 20210925, + 1643 ], - "commit": "b1316dbf6b8b381a6d9149e1b09c645b748cab78", - "sha256": "1jwgw5s1midak6f15d7azvqa48nljmdbn36sjcm39xfq55m9rfj6" + "commit": "0e834f351733fcae07e1cbd1a47d6330f17a8d74", + "sha256": "1gs5iynyljvjcwxjgvm7xj4zjk5ca59bpxgm016lmxkmdnr68fy5" } }, { @@ -112214,11 +112551,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210904, - 716 + 20210925, + 1645 ], - "commit": "2c39feb58415d5163e821bf83d0fa2b6d1a235c6", - "sha256": "062mxc8zbhjing13anx3hd4wnj0702r6ppwbj6glbrvvrjx44ly8" + "commit": "e07a32c338391d61a24a4171a910147eee028805", + "sha256": "1qrnawjrdv6qv6mfa2qx1ah9wb2hknwkyz87jkkfad7g6vnfcmqg" } }, { @@ -112229,11 +112566,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210902, - 518 + 20210925, + 1648 ], - "commit": "a4cb60fb893b62d39ebeb79e5c322d1192c7cf4b", - "sha256": "051m6697fxkff7jh8nhzxl9dh6vjw75ndgfz1cf743i79gdgj8nk" + "commit": "4ac27d806b17d646cb46167da30b8163d31d5073", + "sha256": "1zww1ycn14jajav9cx71yxn4sdc1hbba9wis8f449ij03cvpbl7y" } }, { @@ -112244,11 +112581,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210828, - 1914 + 20210919, + 1355 ], - "commit": "0258ce1969ea4766a2b1a89d3c091cc96ea7ae16", - "sha256": "1vfnx4p2361pzr3lf4bj09xqbp93g1s7a7fjmgfz4f7agaph77zj" + "commit": "de9df16b79ec7e2caa81d7d53c8312a54bd52100", + "sha256": "13n4h58nqlxyfjwz4lq32lig73imvq4jk87w72j8cin5hgvnsv30" } }, { @@ -112259,11 +112596,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20210828, - 1913 + 20210909, + 1528 ], - "commit": "849683fa055afc982af4811f89998281ffe99315", - "sha256": "0zcjb8glb28q1vskyp4mwqpysx1nphyciw8jszfhxqgsbr7nq3fv" + "commit": "9610142c9edbeb312f3c510af9e3ccfa85fb0014", + "sha256": "036gk93hkllhwl76y284c8nk39r6m1yfsjaj8wbmhgmqz4yidyqi" } }, { @@ -112274,11 +112611,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210902, - 519 + 20210925, + 1653 ], - "commit": "a8ef9b5597ab176015c185a9da435b2d5e5d5b71", - "sha256": "0hsy7y1vdc8warh4h0yanckm5b0jh6kpmwhyh035j7xvkg6lzf4w" + "commit": "d99cce539d82cb4f0e10b7c02b5500561b13ff09", + "sha256": "07mlhsxhb3l3xawlvzx76jy4z6q52znjapmpj47w8hllnaibmhmy" } }, { @@ -113220,11 +113557,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20200406, - 830 + 20210914, + 634 ], - "commit": "3df4e8ce65f55fd69479b3417525ce83a2b00b45", - "sha256": "13q84a4q5bv56r9dhi84jqbkx7dc1bvi42s01ahh8vmdvg4h39d3" + "commit": "c9347e3b1dec5fc8d34883e206fcdc8500d22368", + "sha256": "0gkz4f0yfpfchh78v1c0plbjafag23y18gcg8a8rc5s21nqqhkj4" }, "stable": { "version": [ @@ -113392,25 +113729,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210808, - 1851 + 20210910, + 1959 ], "deps": [ "yasnippet" ], - "commit": "8bf33e9e54de0dca1728221b0dda6789d99b7930", - "sha256": "1gz4q8knyss9bsz5s5vywi4qvazgwg8ryh7byxkrmbrxibvc9d18" + "commit": "f50b4c16ca2a73fd04ebd301f0bf2f5ab6107d88", + "sha256": "0iglhbwnx2pk2p05ym43fh3p4vwd77kch6f8aw63jz77ia05cba4" }, "stable": { "version": [ - 0, - 24 + 1, + 0 ], "deps": [ "yasnippet" ], - "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", - "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" + "commit": "c0ef1e8cfd05ef77b9240f3d9e8f0798bbcf9a58", + "sha256": "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r" } }, { @@ -114091,15 +114428,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210819, - 1048 + 20210919, + 1306 ], "deps": [ "ace-window", "deft" ], - "commit": "910a6607e172ae20347d74e651d29ebedc58ea06", - "sha256": "1cccj3y7a353b2b8gvbbs2ami1g3a7961j3dwmcar9lc0yrh3hys" + "commit": "f4f227a9cdb69cf06fd3715e40ddf17a069063f1", + "sha256": "0baydmll48m0z2pk8gw5z5ki9b04mc7xjxw8ljaz58ph7ik1dpi0" }, "stable": { "version": [ @@ -114127,8 +114464,8 @@ "deps": [ "s" ], - "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", - "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + "commit": "85f9fbc0fdef6310647d9457e9a242826f387877", + "sha256": "1vdgjwab872kh009lminrrwkghl3ylswn54qad4ahwhmkdz2p5ra" }, "stable": { "version": [ @@ -114605,11 +114942,11 @@ "repo": "abo-abo/zoutline", "unstable": { "version": [ - 20210901, - 1100 + 20210913, + 1117 ], - "commit": "3c0b5072a2f19a35d92dde6377ae7c1ac0d3bfe7", - "sha256": "0ickivsq8zn0b50mqfa94c63id3fki94wd1w9br84dbd6kjiy1s7" + "commit": "d678b0ea805dd18c18746455c70ea68e51422c1d", + "sha256": "134c9ibk920nnhmgnvkr97zwgxy7a41kqj14dkrzxmw9lhxnmz20" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix index fcec55871a..0675ceaba9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix @@ -32,7 +32,6 @@ in stdenv.mkDerivation rec { git gnused nix - nixfmt ] } oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')" @@ -42,7 +41,6 @@ in stdenv.mkDerivation rec { default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix" newTag=$(echo $latestTag | sed 's|\.|-|g') update-source-version ${pname} "$newTag" --version-key=version --print-changes - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix index 79a171d6fc..46e5ce420a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix @@ -86,5 +86,9 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # sse3 is not supported on aarch64 badPlatforms = [ "aarch64-linux" ]; + # added 2021-09-30 + # upstream seems pretty dead + #/build/source/src/operations/denoise.cc:30:10: fatal error: vips/cimg_funcs.h: No such file or directory + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix index 886a753ee2..d3a46482be 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qimgv/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "qimgv"; - version = "0.9.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac"; + sha256 = "1wybpmqvj7vj7cl6r4gif7mkrcdr6zpb939mmz46xsil5vb4pirh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix index 55560c50f1..3332a08f22 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.8.4"; + version = "0.8.5"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; + sha256 = "1vgymc99nci8rdq8hd7i98x77x45jnpcmhgb8v7fzsz3br6raxcm"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index ba2e881951..1cab19808a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs="; + sha256 = "sha256-M63KFQ+g4b0HiWlv1Kym0ulqZcCMdfU9SoLhpaI4q/o="; }; - vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k="; + vendorSha256 = "sha256-yP4iF3403WWgWAmBHiuOpDsIAUx4+KR8uKPfjy3qXt8="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix new file mode 100644 index 0000000000..24a16eeb8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "limesctl"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sapcc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fhmGVgJ/4xnf6pe8aXxx1KEmLInxm54my+qgSU4Vc/k="; + }; + + vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI for Limes"; + homepage = "https://github.com/sapcc/limesctl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix index 159ecb9f55..8999c3b8f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ICUF/LJhsbzDz9xZig1VE6TdG3u0C6Jf/61RoAjx3KI="; + sha256 = "sha256-kiLmdEyOnD1wPS2GuFF5nTK9tgUOI6PVCzCRZXdObEo="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix b/third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix index 5a4b6f385d..9e4dcd783b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/psi-notify/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D psi-notify $out/bin/psi-notify substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify - install -D psi-notify.service $out/share/systemd/user/psi-notify.service + install -D psi-notify.service $out/lib/systemd/user/psi-notify.service runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 52e3b9d847..6c24f65d76 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pkg-config +, openssl +, oniguruma +, CoreServices +, installShellFiles +, libsass +}: rustPlatform.buildRustPackage rec { pname = "zola"; @@ -13,9 +24,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n"; - nativeBuildInputs = [ cmake pkg-config installShellFiles]; - buildInputs = [ openssl oniguruma ] - ++ lib.optional stdenv.isDarwin CoreServices; + nativeBuildInputs = [ + cmake + pkg-config + installShellFiles + ]; + buildInputs = [ + openssl + oniguruma + libsass + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index c509941b8f..df185c4c76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.29.77"; + version = "1.30.86"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "LJykdig44ACpvlaGogbwrbY9hCJT3CB4ZKDZ/IzaBOU="; + sha256 = "0pg29i01dm5gqfd3aagsc83dbx0n3051wfxi0r1c9l93dwm5bmq9"; }; dontConfigure = true; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { ln -sf $BINARYWRAPPER $out/bin/brave - for exe in $out/opt/brave.com/brave/{brave,crashpad_handler}; do + for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" $exe diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index c789e04957..9f9143c698 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.17", - "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", - "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", + "version": "95.0.4638.32", + "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", + "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", "deps": { "gn": { "version": "2021-08-11", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "96.0.4651.0", - "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", - "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", + "version": "96.0.4655.0", + "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", + "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", "deps": { "gn": { - "version": "2021-08-11", + "version": "2021-09-13", "url": "https://gn.googlesource.com/gn", - "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", - "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" + "rev": "de86ec4176235871a7cb335756987e41246dae4a", + "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" } } }, diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 54763b8018..c8f28b551c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -196,11 +196,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Mozilla Firefox, free web browser (binary package)"; homepage = "http://www.mozilla.org/firefox/"; - license = { - free = false; - url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; - }; + license = licenses.mpl20; platforms = builtins.attrNames mozillaPlatforms; + hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 2ea7ea8d24..aa0abbae42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.3"; + version = "3.7.5"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs="; + sha256 = "sha256-QJXCVcEf23oaTDemoCV/2aaajbubfXg0AfZrlSTS4Ag="; }; - vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg="; + vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 3652405194..e37ba9e73f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.6-k3s1" }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.21.3-k3s1" }: buildGoModule rec { pname = "kube3d"; - version = "4.4.7"; + version = "4.4.8"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-S1vHmXUCP1ayPo3vvHAbNCqNm1ueJ0jE4NUBvg5P3MU="; + sha256 = "sha256-PdbAkiua9AdcNDCpu4UILsmAz0nb4nLjahYomGSHqnc="; }; vendorSha256 = null; @@ -17,10 +17,9 @@ buildGoModule rec { excludedPackages = "\\(tools\\|docgen\\)"; - ldflags = let t = "github.com/rancher/k3d/v4/version"; in - [ - "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" - ]; + ldflags = + let t = "github.com/rancher/k3d/v4/version"; in + [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index 7c04f6e9eb..61e2913405 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.20.0"; in +let version = "0.21.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-7lBIqaozVBoiYYOTqAxq9h2N+Y3JFwLaunCykILOmPU="; + sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index e49d0450d9..f3cb598d24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.23.0"; + version = "1.23.2"; - vendorSha256 = "sha256-KhUmyQn97rXX49EFqUrR7UEm0J5gIdogUJMVW1Wjrdw="; + vendorSha256 = "sha256-Q6DadAmx/8TM+MrdaKgAjn0sVrKqTYoWdsmnN77yfKA="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Cf77qaAsavkSpSoBJz3kcPzL2SL7X9O9lCTYcm1tFFQ="; + sha256 = "sha256-PIgzGikVIno2Gd+kSjF4kLHuUKgPrPHoIJxAGblI8RQ="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix index 3a8a26af3f..542eeb6add 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.7.2"; + version = "3.8"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; + sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc="; }; ldflags = let diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 5e2253aaa6..85b6cf679a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.7"; - sha256 = "115gb4mqz7lzyb80psbfy10k4h09fbvb1l8iz7kg63ajx69fnasy"; + version = "1.0.8"; + sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index b238e5a4b7..1c52f56437 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.32.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1s6/Xn/NsClG7YvRyzpvzMy8HmDITNCQUJxHaA84470="; + sha256 = "sha256-FvgB0jG6PEvhrT9Au/Uv9XSgKx+zNw8zETpg2dJ6QX4="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 65093878da..f1bce0b8fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.8.5", + "version": "1.9.0", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,7 +57,7 @@ "allchange": "^1.0.2", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^13.1.9", + "electron": "13", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.2.2", + "electronVersion": "13.4.0", "files": [ "package.json", { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 45f2a5638e..3aeaf58dbc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -42,43 +42,43 @@ }; } { - name = "_babel_generator___generator_7.15.0.tgz"; + name = "_babel_generator___generator_7.15.4.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; - sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; + name = "_babel_generator___generator_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz"; + sha1 = "85acb159a267ca6324f9793986991ee2022a05b0"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.15.4.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; - sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + name = "_babel_helper_function_name___helper_function_name_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; + sha1 = "845744dafc4381a4a5fb6afa6c3d36f98a787ebc"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.15.4.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; - sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; + sha1 = "098818934a137fce78b536a3e015864be1e2879b"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.15.4.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; - sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; + sha1 = "09993a3259c0e918f99d104261dfdfc033f178df"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.15.4.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; - sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; + sha1 = "aecab92dcdbef6a10aa3b62ab204b085f776e257"; }; } { @@ -98,43 +98,43 @@ }; } { - name = "_babel_parser___parser_7.15.3.tgz"; + name = "_babel_parser___parser_7.15.6.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.15.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz"; - sha1 = "3416d9bea748052cfcb63dbcc27368105b1ed862"; + name = "_babel_parser___parser_7.15.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz"; + sha1 = "043b9aa3c303c0722e5377fef9197f4cf1796549"; }; } { - name = "_babel_runtime___runtime_7.15.3.tgz"; + name = "_babel_runtime___runtime_7.15.4.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.15.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz"; - sha1 = "2e1c2880ca118e5b2f9988322bd8a7656a32502b"; + name = "_babel_runtime___runtime_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz"; + sha1 = "fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"; }; } { - name = "_babel_template___template_7.14.5.tgz"; + name = "_babel_template___template_7.15.4.tgz"; path = fetchurl { - name = "_babel_template___template_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; - sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + name = "_babel_template___template_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz"; + sha1 = "51898d35dcf3faa670c4ee6afcfd517ee139f194"; }; } { - name = "_babel_traverse___traverse_7.15.0.tgz"; + name = "_babel_traverse___traverse_7.15.4.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; - sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; + name = "_babel_traverse___traverse_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz"; + sha1 = "ff8510367a144bfbff552d9e18e28f3e2889c22d"; }; } { - name = "_babel_types___types_7.15.0.tgz"; + name = "_babel_types___types_7.15.6.tgz"; path = fetchurl { - name = "_babel_types___types_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; - sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; + name = "_babel_types___types_7.15.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz"; + sha1 = "99abdc48218b2881c058dd0a7ab05b99c9be758f"; }; } { @@ -169,6 +169,14 @@ sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; }; } + { + name = "_gar_promisify___promisify_1.1.2.tgz"; + path = fetchurl { + name = "_gar_promisify___promisify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; + sha1 = "30aa825f11d438671d585bd44e7fd564535fc210"; + }; + } { name = "_jimp_bmp___bmp_0.16.1.tgz"; path = fetchurl { @@ -457,6 +465,14 @@ sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; }; } + { + name = "_npmcli_fs___fs_1.0.0.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; + sha1 = "589612cfad3a6ea0feafcb901d29c63fd52db09f"; + }; + } { name = "_npmcli_git___git_2.1.0.tgz"; path = fetchurl { @@ -530,27 +546,27 @@ }; } { - name = "_octokit_graphql___graphql_4.6.4.tgz"; + name = "_octokit_graphql___graphql_4.8.0.tgz"; path = fetchurl { - name = "_octokit_graphql___graphql_4.6.4.tgz"; - url = "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz"; - sha1 = "0c3f5bed440822182e972317122acb65d311a5ed"; + name = "_octokit_graphql___graphql_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz"; + sha1 = "664d9b11c0e12112cbf78e10f49a05959aa22cc3"; }; } { - name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; + name = "_octokit_openapi_types___openapi_types_10.2.2.tgz"; path = fetchurl { - name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; - sha1 = "9897cdefd629cd88af67b8dbe2e5fb19c63426b2"; + name = "_octokit_openapi_types___openapi_types_10.2.2.tgz"; + url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-10.2.2.tgz"; + sha1 = "6c1c839d7d169feabaf1d2a69c79439c75d979cd"; }; } { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.16.3.tgz"; path = fetchurl { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; - sha1 = "264189dd3ce881c6c33758824aac05a4002e056a"; + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.16.3.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.3.tgz"; + sha1 = "6dbf74a12a53e04da6ca731d4c93f20c0b5c6fe9"; }; } { @@ -562,11 +578,11 @@ }; } { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.10.4.tgz"; path = fetchurl { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; - sha1 = "33b342fe41f2603fdf8b958e6652103bb3ea3f3b"; + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.10.4.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.4.tgz"; + sha1 = "97e85eb7375e30b9bf193894670f9da205e79408"; }; } { @@ -586,19 +602,19 @@ }; } { - name = "_octokit_rest___rest_18.9.1.tgz"; + name = "_octokit_rest___rest_18.10.0.tgz"; path = fetchurl { - name = "_octokit_rest___rest_18.9.1.tgz"; - url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.1.tgz"; - sha1 = "db1d7ac1d7b10e908f7d4b78fe35a392554ccb26"; + name = "_octokit_rest___rest_18.10.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.10.0.tgz"; + sha1 = "8a0add9611253e0e31d3ed5b4bc941a3795a7648"; }; } { - name = "_octokit_types___types_6.25.0.tgz"; + name = "_octokit_types___types_6.28.1.tgz"; path = fetchurl { - name = "_octokit_types___types_6.25.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz"; - sha1 = "c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"; + name = "_octokit_types___types_6.28.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.28.1.tgz"; + sha1 = "ab990d1fe952226055e81c7650480e6bacfb877c"; }; } { @@ -698,19 +714,19 @@ }; } { - name = "_types_node___node_16.7.1.tgz"; + name = "_types_node___node_16.9.1.tgz"; path = fetchurl { - name = "_types_node___node_16.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz"; - sha1 = "c6b9198178da504dfca1fd0be9b2e1002f1586f0"; + name = "_types_node___node_16.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz"; + sha1 = "0611b37db4246c937feef529ddcc018cf8e35708"; }; } { - name = "_types_node___node_14.17.11.tgz"; + name = "_types_node___node_14.17.16.tgz"; path = fetchurl { - name = "_types_node___node_14.17.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.11.tgz"; - sha1 = "82d266d657aec5ff01ca59f2ffaff1bb43f7bf0f"; + name = "_types_node___node_14.17.16.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.16.tgz"; + sha1 = "2b9252bd4fdf0393696190cd9550901dd967c777"; }; } { @@ -746,59 +762,59 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz"; - sha1 = "95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz"; + sha1 = "e938603a136f01dcabeece069da5fb2e331d4498"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz"; - sha1 = "52e437a689ccdef73e83c5106b34240a706f15e1"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz"; + sha1 = "0c900f832f270b88e13e51753647b02d08371ce5"; }; } { - name = "_typescript_eslint_parser___parser_4.29.3.tgz"; + name = "_typescript_eslint_parser___parser_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.3.tgz"; - sha1 = "2ac25535f34c0e98f50c0e6b28c679c2357d45f2"; + name = "_typescript_eslint_parser___parser_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz"; + sha1 = "8f9a2672033e6f6d33b1c0260eebdc0ddf539064"; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz"; - sha1 = "497dec66f3a22e459f6e306cf14021e40ec86e19"; + name = "_typescript_eslint_scope_manager___scope_manager_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz"; + sha1 = "0c21e8501f608d6a25c842fcf59541ef4f1ab561"; }; } { - name = "_typescript_eslint_types___types_4.29.3.tgz"; + name = "_typescript_eslint_types___types_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz"; - sha1 = "d7980c49aef643d0af8954c9f14f656b7fd16017"; + name = "_typescript_eslint_types___types_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz"; + sha1 = "5f255b695627a13401d2fdba5f7138bc79450d66"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz"; - sha1 = "1bafad610015c4ded35c85a70b6222faad598b40"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz"; + sha1 = "4a04d5232cf1031232b7124a9c0310b577a62d17"; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.31.1.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz"; - sha1 = "c691760a00bd86bf8320d2a90a93d86d322f1abf"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.31.1.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz"; + sha1 = "f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"; }; } { @@ -866,19 +882,19 @@ }; } { - name = "ajv___ajv_8.6.2.tgz"; + name = "ajv___ajv_8.6.3.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz"; - sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571"; + name = "ajv___ajv_8.6.3.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; + sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; }; } { - name = "allchange___allchange_1.0.2.tgz"; + name = "allchange___allchange_1.0.3.tgz"; path = fetchurl { - name = "allchange___allchange_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.2.tgz"; - sha1 = "86b9190e12b7ede4f230ae763cbd504c48fd907b"; + name = "allchange___allchange_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.3.tgz"; + sha1 = "f8814ddfbcfe39a01bf4570778ee7e6d9ff0ebb3"; }; } { @@ -922,11 +938,11 @@ }; } { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; }; } { @@ -1010,11 +1026,11 @@ }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha1 = "b15474a932adab4ff8a50d9adfa7e4e926f21146"; }; } { @@ -1050,11 +1066,11 @@ }; } { - name = "asar___asar_3.0.3.tgz"; + name = "asar___asar_3.1.0.tgz"; path = fetchurl { - name = "asar___asar_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz"; - sha1 = "1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"; + name = "asar___asar_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; + sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; }; } { @@ -1234,11 +1250,11 @@ }; } { - name = "boxen___boxen_5.0.1.tgz"; + name = "boxen___boxen_5.1.1.tgz"; path = fetchurl { - name = "boxen___boxen_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz"; - sha1 = "657528bdd3f59a772b8279b831f27ec2c744664b"; + name = "boxen___boxen_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.1.tgz"; + sha1 = "4faca6a437885add0bf8d99082e272d480814cd4"; }; } { @@ -1322,11 +1338,11 @@ }; } { - name = "cacache___cacache_15.2.0.tgz"; + name = "cacache___cacache_15.3.0.tgz"; path = fetchurl { - name = "cacache___cacache_15.2.0.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz"; - sha1 = "73af75f77c58e72d8c630a7a2858cb18ef523389"; + name = "cacache___cacache_15.3.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; + sha1 = "dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"; }; } { @@ -1610,11 +1626,11 @@ }; } { - name = "core_js___core_js_3.16.3.tgz"; + name = "core_js___core_js_3.17.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.16.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.16.3.tgz"; - sha1 = "1f2d43c51a9ed014cc6c83440af14697ae4b75f2"; + name = "core_js___core_js_3.17.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz"; + sha1 = "8e8bd20e91df9951e903cabe91f9af4a0895bc1e"; }; } { @@ -1625,6 +1641,14 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "core_util_is___core_util_is_1.0.3.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + }; + } { name = "counterpart___counterpart_0.18.6.tgz"; path = fetchurl { @@ -1754,11 +1778,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; }; } { @@ -1946,11 +1970,11 @@ }; } { - name = "electron_notarize___electron_notarize_1.1.0.tgz"; + name = "electron_notarize___electron_notarize_1.1.1.tgz"; path = fetchurl { - name = "electron_notarize___electron_notarize_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.0.tgz"; - sha1 = "00ed0182366b97f5593cb5ccdcf1120f1de37179"; + name = "electron_notarize___electron_notarize_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.1.tgz"; + sha1 = "3ed274b36158c1beb1dbef14e7faf5927e028629"; }; } { @@ -1978,11 +2002,11 @@ }; } { - name = "electron___electron_13.2.2.tgz"; + name = "electron___electron_13.4.0.tgz"; path = fetchurl { - name = "electron___electron_13.2.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz"; - sha1 = "332d91891d0db4f9a1d22d4d0bc3b500e59dc051"; + name = "electron___electron_13.4.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz"; + sha1 = "f9f9e518d8c6bf23bfa8b69580447eea3ca0f880"; }; } { @@ -2346,11 +2370,11 @@ }; } { - name = "fastq___fastq_1.12.0.tgz"; + name = "fastq___fastq_1.13.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; - sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; + name = "fastq___fastq_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; + sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; }; } { @@ -3602,11 +3626,11 @@ }; } { - name = "minipass_fetch___minipass_fetch_1.3.4.tgz"; + name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; path = fetchurl { - name = "minipass_fetch___minipass_fetch_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.4.tgz"; - sha1 = "63f5af868a38746ca7b33b03393ddf8c291244fe"; + name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha1 = "d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"; }; } { @@ -3650,11 +3674,11 @@ }; } { - name = "minipass___minipass_3.1.3.tgz"; + name = "minipass___minipass_3.1.5.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; - sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + name = "minipass___minipass_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; + sha1 = "71f6251b0a33a49c01b3cf97ff77eda030dff732"; }; } { @@ -3722,11 +3746,11 @@ }; } { - name = "needle___needle_2.9.0.tgz"; + name = "needle___needle_2.9.1.tgz"; path = fetchurl { - name = "needle___needle_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.9.0.tgz"; - sha1 = "c680e401f99b6c3d8d1f315756052edf3dc3bdff"; + name = "needle___needle_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz"; + sha1 = "22d1dffbe3490c2b83e301f7709b6736cd8f2684"; }; } { @@ -3762,11 +3786,11 @@ }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_fetch___node_fetch_2.6.2.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + name = "node_fetch___node_fetch_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz"; + sha1 = "986996818b73785e47b1965cc34eb093a1d464d0"; }; } { @@ -4178,11 +4202,11 @@ }; } { - name = "plist___plist_3.0.3.tgz"; + name = "plist___plist_3.0.4.tgz"; path = fetchurl { - name = "plist___plist_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.3.tgz"; - sha1 = "007df34c7be0e2c3dcfcf460d623e6485457857d"; + name = "plist___plist_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; + sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; }; } { @@ -4666,11 +4690,11 @@ }; } { - name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz"; - sha1 = "9f8749cdc05976505fa9f9a958b1818d0e60573b"; + name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; + sha1 = "869cf2d7bd10fea96c7ad3111e81726855e285c3"; }; } { @@ -4682,11 +4706,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.19.tgz"; + name = "source_map_support___source_map_support_0.5.20.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + name = "source_map_support___source_map_support_0.5.20.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; + sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; }; } { @@ -4890,11 +4914,11 @@ }; } { - name = "tar___tar_6.1.10.tgz"; + name = "tar___tar_6.1.11.tgz"; path = fetchurl { - name = "tar___tar_6.1.10.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz"; - sha1 = "8a320a74475fba54398fa136cd9883aa8ad11175"; + name = "tar___tar_6.1.11.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; + sha1 = "6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"; }; } { @@ -5130,11 +5154,11 @@ }; } { - name = "typescript___typescript_4.3.5.tgz"; + name = "typescript___typescript_4.4.3.tgz"; path = fetchurl { - name = "typescript___typescript_4.3.5.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz"; - sha1 = "4d1c37cc16e893973c45a06886b7113234f119f4"; + name = "typescript___typescript_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz"; + sha1 = "bdc5407caa2b109efd4f82fe130656f977a29324"; }; } { @@ -5409,14 +5433,6 @@ sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3"; }; } - { - name = "xmldom___xmldom_0.6.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; - sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; - }; - } { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 27a5204e9e..c14f408441 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-i9PWGEcf+EOn6j++GuYt6xmwYycmW5hE5xhpRMOFBGM="; + sha256 = "sha256-vsLu41n3oCSyyPLgASs7jZViu6DPkWmMfSO7414VPO4="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 05c5e732ce..d1f128dda1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-E3H6iXBRi4mnhu0mu96ly9f8AYOiMFf9zTcpjDmfHy4="; + sha256 = "sha256-QMLa1Bgz9feAAR9PKVXAzlRDztJBZnGIG+SsPgwvYRw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index 89d4931a2f..3bd1564af2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2021-04-23"; + version = "unstable-2021-08-10"; minimumOCamlVersion = "4.08"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "861c59bb7cd27ad5c7558ff94cb0d0e8dca249e5"; - sha256 = "00waw5qr0n70i9l9b25r9ryfi836x4qrj046bb4k9qa4d0p8q1sa"; + rev = "73d87e9a62d534566bb0fbe64990d32d75487f11"; + sha256 = "0wk574rqfg2vqz27nasxzwf67x51pj5fgl4vkc27r741dg4q6c5a"; }; nativeBuildInpts = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 418d490bbd..1d7888f78c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,19 +1,20 @@ { stdenv, callPackage, fetchurl, lib }: let - mkRambox = opts: callPackage (import ./rambox.nix opts) { }; -in mkRambox rec { + mkRambox = opts: callPackage (import ./rambox.nix opts) {}; +in +mkRambox rec { pname = "rambox"; - version = "0.7.8"; + version = "0.7.9"; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage"; - sha256 = "1y3c9xh8594ay95rj9vaqxxzibwpc38n7ixxi2wnsrdbrqrwlc63"; + sha256 = "19y4cmrfp79dr4hgl698imp4f3l1nhgvhh76j5laxg46ld71knil"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage"; - sha256 = "07sv384nd2i701fkjgsrlib8jfsa01bvj60gnqdwlnpphlknga3h"; + sha256 = "13wiciyshyrabq2mvnssl2d6svia1kdvwx3dl26249iyif96xxvq"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -21,8 +22,8 @@ in mkRambox rec { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = ["i686-linux" "x86_64-linux"]; + maintainers = with maintainers; []; + platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4c9a1b30e6..48ba14824c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.17.2"; # Please backport all updates to the stable channel. + version = "5.18.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -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 = "1fmn2i6k3zh3d37234yxbawzf85fa66xybcli7xffli39czxbcj3"; + sha256 = "1pajv9f6xl06597322swkjzhfqvlfavsbhbn1xnvy4r28i84mp7d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index de453c4d19..1cdce2638b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.1.1"; + version = "91.1.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/af/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/af/thunderbird-91.1.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ba98ba0ac513e9f8ca047bd08b38e2391d5b67b4195c2c1ac7d90498e148ad6b"; + sha256 = "f786ba47061600b2a4fce6dc537e4d5f41ef7e496ddd24e06e5cf2d2bc7ae615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ar/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ar/thunderbird-91.1.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3514eadb52d000429f16417d3af5ce648cfdeaa583bb3602623f40abfca72fec"; + sha256 = "70e13fa57939ec35fed7e537c282411e022e2e596af298ff68ed06d29149ad44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ast/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ast/thunderbird-91.1.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c630ab402c6f166181474b0e7299dc24ff0de5ce92fa0894adbc3dbaf8878f59"; + sha256 = "22ac54e15cc8d89412f26906b10d7274a90d86f298948998dabbbb63000fd9bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/be/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/be/thunderbird-91.1.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9f484652940fec35d9adad996e80092cedabc789952e083107b405992b1ecf9d"; + sha256 = "bb59b38220fc5a2e429df9bf521610678b7b3c7e47e4a3208c9e0e54860ae098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/bg/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/bg/thunderbird-91.1.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f784957e36cb9a92083c275eec887d3a6847439281e94346e5bf0e065ec23366"; + sha256 = "7a0d50876f51664074b6eefd20dc727cea2d4a0feceb721c63fa9e3872ea6d07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/br/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/br/thunderbird-91.1.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2817bf350195954464db3a936db3a3730c2d33dfea9333165e69418b627d575d"; + sha256 = "8a49fe9b26d1a5c5b3c28209cbb6d81e785235f4e1b24e4638cf5a5fa720d68e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ca/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ca/thunderbird-91.1.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "176b8f2463267ad2aed07ca6966609c600615763caba662ac68c45b5d36e367c"; + sha256 = "380d655a39c7f20067045cf2ec75e5bca0ba0e8291d187fd87ac42abbbce7dc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cak/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cak/thunderbird-91.1.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7ff8fc736dd4232801d0e50b154747827cc818fe76782b219d683a8b2bba8969"; + sha256 = "ff12816d6dac6311b2f0a358ee4a30e80d3a346c9a2fc08c9c4d72b2e7421b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cs/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cs/thunderbird-91.1.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b6763048e3fab66a4f08fd8c868d7c9c51258c540801546546b7da3b2ea64693"; + sha256 = "fc8ed1c83b76329aecd9b6b7b4c2278b2703dc267ef25ad973deefff01cbb29d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cy/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cy/thunderbird-91.1.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "810213d5f90387bd6f46436b1479b977248ec043235f2f97b7e8d0a3b296eaec"; + sha256 = "50e10c11f341b75e4ca464911a7229d22073d72b53731ba92cbd39c52694e0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/da/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/da/thunderbird-91.1.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2c85f4ea05fb03aaf88f4cb028375a628061f2699adde13f78cf6e76b7564e7d"; + sha256 = "1c041fb7c71e9d0f07c82652129a6b48f2f633a7781c41a3c439dec1d7fcabee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/de/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/de/thunderbird-91.1.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9a05ca5400224fbf0923a331e1ba986d38038df24340c6aee695c24f96f75e0e"; + sha256 = "c9ed27ee3f1a631c6a7d7a5a854e48f3285b9f01c81bc9ee3611bbdd9f483cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/dsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/dsb/thunderbird-91.1.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e06a84821ba0354e4d5efe0e080734e39f376ba3e1f1c385ab939fd4cb84301c"; + sha256 = "3c00604247dee961915f2aff628bd7d1f53c4f7e48bb848ef6065e41f189495d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/el/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/el/thunderbird-91.1.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "32a1de995a05495721a4c6a6a74ec27b68c03d7b2121ea7d6ce6d295ceb8d328"; + sha256 = "b9ad1ab6b7d33f477f51e4337d914f8f8d2f6d7bc1b3b884d8b71b17547c3fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-CA/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-CA/thunderbird-91.1.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "95f2dd81dc1958f2acd8a801fe7a87dfa0a00c6b91b8bd669f8e3caf6d90aad2"; + sha256 = "80e6b5785d334bec69455ca5f5039bbd4fbebd663ea91d17d0fbe8e33d747670"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-GB/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-GB/thunderbird-91.1.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3177bce52669f44ae58ca447b54a86329cdb5b8006199e86fa66b5bfe96ac8a3"; + sha256 = "da2388577784df3faad7b40566e2e1eab2b95dd9455a1e4e3ee43433f4fb189e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-US/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-US/thunderbird-91.1.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c0331b86ef72bae3d769ca977b0c9adeb9a29145dab1eb0013f4d88fa9caeedc"; + sha256 = "1354e3ad2989749fe79b404ccae3002de8b4e269c98388d9abebe456f3de47d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-AR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-AR/thunderbird-91.1.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e2aee8223131a46bf99140ebdb56ab76ca03eb5eb66dfbee75f23520d95d1971"; + sha256 = "f51d4a1109d30d4857673575aef173026e2c90fc7ece6835a34a0e792672cf8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-ES/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-ES/thunderbird-91.1.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c8e189dc7a57d47c6dba9e4cda3068b327fa10cff3818e97a4942c71c1d0cc87"; + sha256 = "38196b265eeaef2222e624e2fb0cb7742b2171965aa0725b3d524e9199ea4f91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/et/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/et/thunderbird-91.1.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "76e094d63467fb36622b64361f86041f0e6361a4fb1f1702c8a0e88bc57cfc96"; + sha256 = "ab3b04c02b730f92db4f24daac688e1966349cf4c978ed06138285fcb2d72769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/eu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/eu/thunderbird-91.1.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8f09dc4bbbb76b660acf4664f4fb083a50de6523842171b4fe9558e7255c8bbf"; + sha256 = "4431e16f70b6182b1ec2bed64d149ffc7e46f1b2536268e973eb984439eda400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fi/thunderbird-91.1.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d7dba3916342bfefe549ad21a70a438c8f2031fc5f0085fc4e236d0f8d07c948"; + sha256 = "8ee9b2983d1f214f4589d7d99d1ac1a577f92dd3cc73f516dcc050079ed85904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fr/thunderbird-91.1.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4088b924197a6baf7ea3ee233d566b9799cbab955a135bc870eaf6e08ce70915"; + sha256 = "b614dadf34774ebf45c88ae0c72c6d8779beb8310a8353aedeca1a493178c376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fy-NL/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fy-NL/thunderbird-91.1.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "59cd7d50cdbb7867f746b137ec8f70407ae649b03e86a73a2be642eab9256be4"; + sha256 = "00693bbfda9377d2695fc8c7c242b0e4a3c1b745e8779ebabe5686eca4fc928a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ga-IE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ga-IE/thunderbird-91.1.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "10936f6c941d8c94eea200c1c3bb8919066714129eb3b34d67df87c9b93f331c"; + sha256 = "00d26b39726e2de2e799b3dff97c79a590f712f3347232600d1f2771523d0ab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gd/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gd/thunderbird-91.1.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4ee24daec40780a8148092c96140575e7e5d1169fd37ffc6d46879f76f976f80"; + sha256 = "d9a35fbf9f4069c6f4dd796c8f9465053413d806093d1456e643c9bdb081ad45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gl/thunderbird-91.1.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0126bc6b167b8bcb2135e02c289f26aed82e4ab8dc820fa9468ebb41fd05604d"; + sha256 = "9e7f237b55f81a44a984be4b4e1001c8ffd7742eb14e654397e80b4e4b765d0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/he/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/he/thunderbird-91.1.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "58ae78aee2da5f8a33edf8c87a743ea7f3da6702f25682869db9bbfcb53d4df5"; + sha256 = "b86d479dd64ac86d43fbfb54c8ec36ea6b4516ded0383f81b78c11365290f21b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hr/thunderbird-91.1.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "c4543e54a9fa59906c64b8830e4ce6218279872e6beafeb67d13250159eca8f0"; + sha256 = "cb7e8d0dd04c5883f2ec0f47d81a751b901e0036f151ab1c0f3043ba7ebf4a74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hsb/thunderbird-91.1.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cded10c83585c5d6ebdae4a0740262f43203b7a9252144a6f97eb6b329cea95a"; + sha256 = "d3141a413d82814067de2791091473e0b44f8939825cc3071b1fbe86e08dd49a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hu/thunderbird-91.1.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f6dcdab2dad04a9210f509a62da49ec5269bf5c9f40e74cf9d2f43edb0abd422"; + sha256 = "b76860152f68b2dfabef9847c83356af34b8fb1913d0d55a397be3d4e4e08b31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hy-AM/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hy-AM/thunderbird-91.1.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b3f8a1b6d4576dbf660bee6404b97babeb04bf0c1c6ff27aab25a073436f43a4"; + sha256 = "5aa35ed5d577befb7a37d5407bc7ff78c54314a7e5ed77bda588bd74111e263b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/id/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/id/thunderbird-91.1.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e1bfada3b7d33e01462cc303b22298850c5923f42e8ca656cdf5b2dc72c00745"; + sha256 = "0bb53b2cbed8a9412c6776435381d5c859a9993b4bd2cdf5ecd4145d13776d09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/is/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/is/thunderbird-91.1.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "602ee80721bfa921805c1fff2b0802d7845d7970645cbb839e5d0f6e25b5fe65"; + sha256 = "566058b39d98a777cb1c333b66cac66851d0c369918e58c592b8e0151b778f6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/it/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/it/thunderbird-91.1.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e55d0b20027e23d3340a593beeebac0fead2dd0d048133b2e42dbb33288c4c5"; + sha256 = "b88fb1b473a7b0b1a4af08a09aadf5b7502f03462a1f4661ed2897c2705e5b4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ja/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ja/thunderbird-91.1.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "df67309b344f46f9ead5939a2f0f7bc34b90bf4cfa4cc28a662391146951c4a0"; + sha256 = "6b69cd834280b36182656bd97b117c3f70bbcd947ab25e1936294a85149d3501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ka/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ka/thunderbird-91.1.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0992f5884dec1431a1c82e289195db7561a8089e7cd7d8fb940c0435e365b6f2"; + sha256 = "87d8bc04c278d8c675665d0211917a854d43a17d24173627703268a785ff2206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kab/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kab/thunderbird-91.1.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "37eb0b67bb564762f8c88fac75c9ef8a51ad4ca302e3bc5f4d99ff799a141309"; + sha256 = "fad11f653198314683faaa758422506d27706b6dca90a4d5b0d3693810843fba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kk/thunderbird-91.1.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "16fcf81dd18c51826d3a93e6393c820227322ad4cceaa668a22fcf79d9fe0773"; + sha256 = "67469c2c4e1352db94339687f93c0afefe41244bfc952d77c2e41e31a652f095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ko/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ko/thunderbird-91.1.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4e6b0bb94ae1442b987b5e98ef287f6cdd354d13ecbb14dfc25b04ba17b3961d"; + sha256 = "93bb5a6973bbd0eaac721ffd59c19edce400471c08d76aa629b2fe66fc98ddf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lt/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lt/thunderbird-91.1.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "03364e6f6104f083bd38dbd65c1d451186757e07460840a1fc8ed8d71f00cc8b"; + sha256 = "f4dda73c80cee8aaceee0f4ea0956303f9a50aa2431c6eb8a34d7d22b5fe53e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lv/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lv/thunderbird-91.1.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4da6a4e457aadb58819c3b44432c5a5ff17f2be378fb461d859a92768e2c4b7e"; + sha256 = "65325a804f5aec439501bd70e5423d56ddc5a10636b639e8db85ce8881c1586e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ms/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ms/thunderbird-91.1.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8aae1245c40ba4b7682f5d26f3b90d9b5cfe53fbd00a755e699ddcea6ac5164f"; + sha256 = "f2715978bc8e2d7878f8ec47b4a29cccaa42a24bd97f013f6b66aaf47db83359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nb-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nb-NO/thunderbird-91.1.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d279ee97817a87a87b8848f6cce8e1b0a9643095dbf46e3632df6242f9b05b23"; + sha256 = "c252fdee3a9d9c43b46786c528bb8ac39203b7d7c746f9c9f04287cb1253ded6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nl/thunderbird-91.1.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f1d58f439aa8276b5baa475e696a6eedb484059eef66ed8ab6ea27f66182d53a"; + sha256 = "1708531ca0b765292206fa9c533200266f5eb48fbbc74daade404bdcbfdcc750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nn-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nn-NO/thunderbird-91.1.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "703745b4b07778058a8ed8d4072700033f268ea513abc9f4dc7d1cdcf07c9c2c"; + sha256 = "dc26c1333787accc73624bc5bac820af1743ea30d85e9da9a0c30f6b9b0c3bcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pa-IN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pa-IN/thunderbird-91.1.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "46d756ecb4d5e566dc4a72115874b32bce8eba5de141448d461d795b0c81e78c"; + sha256 = "fc508dd719c18c250560b5d4fc4672ce83a9f52b6103d3f33034eca89ed2935f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pl/thunderbird-91.1.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7384fd09796d727f82dd9f92b3faa67d53c415c01b44c885a998039eda703545"; + sha256 = "eb54040a841d0da1e84dd2a6ba3c894a57d40fdb0bf99f21b7fbbe3ea8cd755c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-BR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-BR/thunderbird-91.1.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dcd97601965c25f43fc10bf59c5ccd3d62439ad3f1ed724c379951d2b514df72"; + sha256 = "45226857a691f8568c769f652820eb5b86b0928c271b2751014bd6e7ab29ab80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-PT/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-PT/thunderbird-91.1.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "225c2c87e5e18a987c1cad74622ace48bcda9dac7d420694f91c0c30757bfa23"; + sha256 = "532f18bbe7fc09793bd688e5bc48c65658e2a48285b97c611b68611e9f13257d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/rm/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/rm/thunderbird-91.1.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "07ca0312828ee92b9d04ca5e62f6f4f65260faba80da1da5365a2614edd43dae"; + sha256 = "8d0f2ec43e6e00118d7c1d5877bfbc5b5c87a8e449a0358acc6e71244a0716b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ro/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ro/thunderbird-91.1.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3cee1abefb6bcd9508a14e0b03e14f30b6aba95245ba79993d293fc92a3f7bb4"; + sha256 = "dbfd5500b337132ab14266d2b87224c917086afe3f210127d73848d360299241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ru/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ru/thunderbird-91.1.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e6491ab33fa05012206b22223f78e2f6f575f9e99d33159f0c853b538c3ab9ce"; + sha256 = "06f6077ba98fc2605718266e57b9c5c54c3d7901f2b7233f38d7fd02d6d063a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sk/thunderbird-91.1.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b4cc3471da1cd3f1f9146bf5ba9d33f706df6d2988375a7f148223eba2cb88e5"; + sha256 = "af1224613b3e962265d83b154cbf69053906197f2b7f12e5004ad862bef09aaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sl/thunderbird-91.1.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a83b61af2283d3c694ede815faaa0abfb3e6b7a346d9d984dbf3e50856532473"; + sha256 = "597cd2732960eadd0121c4089a703cc86a0d9a361ff024fe047c8c624dc05afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sq/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sq/thunderbird-91.1.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6562243bd3ca68b6b09c12745111c36a269e60593c5c458e04da12a9f1cfe7dc"; + sha256 = "c107fb5653cb7adfa79aad501e585943159fa9297ef360b193075a9b49e91d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sr/thunderbird-91.1.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2b8dee91bfe25480f1a7b12b3825e2445b369d6125df9a13271ef6a6af015db8"; + sha256 = "33964cc6308a8e7ebc154c057f90729a92d2a9127f9d8c4592f884531d094334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sv-SE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sv-SE/thunderbird-91.1.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "113e0ebd096ef5ea225c76e930cbdc58f2b529b39fe799310098abefa4652ee1"; + sha256 = "91fa282c3baee03653ffe5164844e06a9813a40c360ef24e94ff525638f187de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/th/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/th/thunderbird-91.1.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "71b62b60167d06a02fcc90017b33d65c757d18d05fbf689607631ff1783941ce"; + sha256 = "99ea8b61e102c3394073f3a817d3eeddc3cedb51436b66303730394f362e91f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/tr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/tr/thunderbird-91.1.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ab7f254131c8fdcc040d06d29ffdb0da6d95b9970f7640851bbdad337af0bd0a"; + sha256 = "bb1d417239c31c6ae9bf62cd545f2fad316915ce6bcb707f2deb65f0cc24425c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uk/thunderbird-91.1.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6da1aa51763b3acb2015eb78b50d5d6cc080bd606e2afdcf181d84095b0cedc3"; + sha256 = "8464520b025c29dcf3376d7c47d6c7596ff60eeabe63fc5c41082ceb4fbe148c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uz/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uz/thunderbird-91.1.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "933513bdc1b1137dc627ec4895c3299d3633a105eadf2216b682fe36554c5f5b"; + sha256 = "d4ba9eaafed3d475dd0fe3a7df7f9910fe3a95a74b9a83f2a00aa73441ae8a64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/vi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/vi/thunderbird-91.1.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8f3eb2210a070983d87e6d5ec9908cabfdd012a4691443c39cbf2212d79e2394"; + sha256 = "8c7f222e0c65ad2daaf37ab46fbe58e005aa89379a0a87f4b2a5f19528e0e5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-CN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-CN/thunderbird-91.1.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0faa621dba2d2725bcd6b2a337feac5ee2d6bf66900ce30e1e5abbcddc15ca45"; + sha256 = "1cc053e2e9e751ca14da4a09c276d2c78f61ef4e7d74ac4019849f6ebc044d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-TW/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-TW/thunderbird-91.1.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e236b7d2b9187a0ac780d7e0821cf29138d5f03321248e4edab0d1f2a7267cc7"; + sha256 = "b77a3eb6d1e51388d1b084956b7cc579e1e3c8ed2bc72d7943ac5d6188e43938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/af/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/af/thunderbird-91.1.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "624e9894eba97eafff7241dd73c2edd685e0786ba3e12f525980012d7dbae0e6"; + sha256 = "c2015b0cfa07309ca6afe5fefb24c1393a397b1d592dd80ec8b62bd4ef8a3d35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ar/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ar/thunderbird-91.1.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "62f250a1925e8b3cf2c98fe877b7b5a6d559d3fafb1320312fc765630c23a71b"; + sha256 = "f36b4e7452ae39bd2bf63231ab884356c7b77d6015993e09046b3d6a63443920"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ast/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ast/thunderbird-91.1.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "102b2e3d812eb4737f3d4ab63e2b696cb7cc2478ad438bed5c19299d65dc5ac6"; + sha256 = "600d102bbb18bac81e3d50c9ef9a578820b0fa1ba2a6f6d756da6e391fe0f241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/be/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/be/thunderbird-91.1.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ed15b0cc8c4d0dcc4071ccdc602fd796c5dc42a027f26595d1d8df2ab10267ba"; + sha256 = "46032acc1c16e2c9bd7905799db6253cb16fb6269bb79edf6141b9d2bd5c0b15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/bg/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/bg/thunderbird-91.1.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "234f8ff03dbf19bd9100663ee517fa1630d0e7bd00953a056d5085021fa90324"; + sha256 = "d21bfe3ad0c2c900de1ab9a88d62fc74c4c1767bb41121159c5c0c9bfe270a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/br/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/br/thunderbird-91.1.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "34c578de385448cad19dc368a04d0285cfb1520c31477f6eacc10ffa2e81a02d"; + sha256 = "8e20c1ce0867bafde00c3e8fc55d5841a14e91fa8039fc7259269da8bfbd4373"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ca/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ca/thunderbird-91.1.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c3d3dfdeaa72254d02b12f72c83a95a2904a13f2e0c721d3baa5da0dd76bc2c8"; + sha256 = "175bfb1b0ef94897ecd359c54a2767ca039a259300a5716211fa0c0593b81023"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cak/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cak/thunderbird-91.1.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7cf60b8ecc692696081115f1df65f9976613ef34b57d412a6d3333a18400aa3c"; + sha256 = "65cf8763200cd10cbc016c9d447703b640c52165c691a604092376de09dc1376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cs/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cs/thunderbird-91.1.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "59f01da4722c4317f80a7174f85fff9ba60a8341d589ef2cc27c565a529af2f5"; + sha256 = "8d019c4f92f60c44f1340f96892c0a4060d4ceb86d188f5f81911d92ff2957f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cy/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cy/thunderbird-91.1.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "470e65ebf016cd8fdcba1ad405df36d556c6fa43c23856b88d6da3fc58f80d81"; + sha256 = "29049a5f4849f7e2bde8ec122de33edb7c86e87eca46b72086e53caedcad7ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/da/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/da/thunderbird-91.1.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d1e95c7744d5058354e8626c361b7d529fefb2032cf380f8f129e84243221b9d"; + sha256 = "39d9b429b8ee92b045abf48a605e32a577da1f61459b597698f87b1972993f2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/de/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/de/thunderbird-91.1.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dbb632f5fe3a3ea2ffce78ef8984e78debf2b0d09ec42bfd1b642a7fd68dc93a"; + sha256 = "b8ccae9622a8fa684c48a39a409af461238325d91db5edd8d9ecbeaebf2fa999"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/dsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/dsb/thunderbird-91.1.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ab5d84870b77376fee50b082e14f2d5ce915f9041a63f09519ea5b8ab2c8c990"; + sha256 = "a32e1ec050968c94c2b2c1c175d13629fb5feda14e91a0e6c78a9e1bf4092ebe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/el/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/el/thunderbird-91.1.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a96a8d96484b441210b98e768462237ad2e4306bcb20412028613f480160fcd3"; + sha256 = "7599c18f5c79d6aebb652308fa3fa9b13a4883c0dfc47e8bef6b6c118a2ed909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-CA/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-CA/thunderbird-91.1.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f43fa2abb60bdeb571ec665d8f5779b049d3270f05e01e43795408e450240d85"; + sha256 = "47c49908cf59a8fa6ec1de512cd01907412cfc5b0f56709611b71eb0b3e6cdee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-GB/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-GB/thunderbird-91.1.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6c3c9f1c8f4e3f6cc6008cec83e5c234f797762ae05cdfe7dd7e95794f3fa007"; + sha256 = "9f379c2837dab6ece5306117065ddb1f19d3fa08900d5ed63abc34fff8755dda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-US/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-US/thunderbird-91.1.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a6c3f8b935f8c5e185e621aed1725b82db1007c977949fb9f786b86bf024dffb"; + sha256 = "97aaf105ff5fd3ac8b2b85ba0de87b1fe6ba01f647d32571b787591ba5f6e1cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-AR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-AR/thunderbird-91.1.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e431f72359b602e4bb784626bda3f4526eda6ee5bddbe51d5c67fb62325da237"; + sha256 = "4db46b699d6a65fe482dd8f7bde005b5a4cccfbe7ef777f23f1aa57577d33a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-ES/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-ES/thunderbird-91.1.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3f7ccfb4b86b11583289036792e78d080f558d8d58d1b11929664952076ed152"; + sha256 = "0a63e85f6992ce683f35ecfe6f0e10854fd8cada33f8a2e066d5ab140ef8c401"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/et/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/et/thunderbird-91.1.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4d224ed49c4cc300e22add49b79931b753155f5052d7d0572a3b99833351feb3"; + sha256 = "522ec0185345054abf61b84dfdb36ce3dbe01c70f5bae11aa17321d18091d759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/eu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/eu/thunderbird-91.1.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "84ec201b40080de068c9a2d9ca4effb360102d34970964813f4335187fa0c472"; + sha256 = "c4e28df0193175149303d80617f04df4d229d8eee2a75129b315a0c23b22aba5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fi/thunderbird-91.1.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "633a45dd1dd870dd0d486715328152ee092a5297f95f35ad4ac8c1a0fa59caba"; + sha256 = "046b39db1f3f7c4fbe23e93053d43fe81e1b8751bb0558ad1bad3a50ab698673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fr/thunderbird-91.1.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1a5e668cdfc500652d3429ecddd987993c60032de0dd570c14256642927910e9"; + sha256 = "39d15a1aa3f7c3e360e817baeb3747a49ae8f42d1b46208832eccb0107ca1b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fy-NL/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fy-NL/thunderbird-91.1.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "86d52dfe0a63c7f066f4d6b677d1b2d1025b60d7ca556f2cce074ac529d49948"; + sha256 = "17c971a57634050faa9fe747055a671ac1ae0022a9b06a957eb05f7bb64f31cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ga-IE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ga-IE/thunderbird-91.1.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0a116945f0ce9f51feb9658756bbb706830709155d21f4d32be5bb9c2ba3924b"; + sha256 = "58c17ea964de2b60440bb1a078222ab5b6199b83fa5f2854926b9f0c2a6cb3d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gd/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gd/thunderbird-91.1.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ddf29128560baf824d5ab984cc4c219318d62d1f6946c83f1e281bf59dfde046"; + sha256 = "4ee45ae272d53f523d2855083f27a0ce005d93ca95d13c2037621a87c294413c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gl/thunderbird-91.1.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28e291c985d8b618bb88a65995f0c523d18a231bd9e3020b743815754d2f761a"; + sha256 = "68012e665dea95fd4ce4f76dee0b246d2f94890e5a9b3c797e93ae7d450adc58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/he/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/he/thunderbird-91.1.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "daecfd126e4e7f7eed943c715b7e0e17fb1b17b55963211130a2326bdeaf2fa9"; + sha256 = "57125635f8fe2cb50cfe9aecdfe06502cce9c746b346083b329d5e1123d4956d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hr/thunderbird-91.1.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f685cf4629e13337795d25f7e75bf2f24abca87e35e41c62b0f48613a2e57365"; + sha256 = "f6f28200c32cc2faa4a4e4a49eed5b4343586b52ca123dbce43d32a1c5059835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hsb/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hsb/thunderbird-91.1.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d9161bb816887e1fc2296dcd942f0fb4736f86bc8a8122f61caeffac75b0c19f"; + sha256 = "6290282252b9a61fc7ffb1e29b14f31c87832bd60a066c73f9966a10f75ac327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hu/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hu/thunderbird-91.1.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "80e69465e6afd1b50a695b30fcfdc13ad2c051e75fcec666276935874e79d5fe"; + sha256 = "fbd6be01153d67870565fc7230fba7b4a1f6151eeda54e84008b0943acfc4564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hy-AM/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hy-AM/thunderbird-91.1.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a1aff21e7b07bcc20685d906d69d6b2515983263d90d2a2533e58d6c74046fbf"; + sha256 = "3bfb7979fbfbf0cbdecb8b8030dd209a6e18020ff34a30223ce893c0cfe0a282"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/id/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/id/thunderbird-91.1.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e911dd870b7a33d50278597a6cd1970c15578716f97a1ca90bac2813c4aabcb6"; + sha256 = "4a8801e97b001c0e30ffc4f4a7c712017c1b1a96bf226ddc341728b22599920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/is/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/is/thunderbird-91.1.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ec91be584ef82def938d295925b1231f7ea50bf9e171d90ce74ae575970c5e5b"; + sha256 = "871a6393a716c4c8b2255a8903a4584c8ad4a7f5e1423550d3d96b9866929433"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/it/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/it/thunderbird-91.1.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "971d7ff2f20926b9148ac6386f2d5824a1443b3a4618e67cf4c30c14f126d711"; + sha256 = "8919dbd9e7b0155de288322f10bbb664189d03c1442657d07d577b33cfce0929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ja/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ja/thunderbird-91.1.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "17526869e3234f885f2078c98a8442b2dd5a019a529d31e0bb6df5b6be24be8b"; + sha256 = "42e1e1a2b55c97b05ec5424f6318d286f7fa497276ff745c6c221ee2b4c072cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ka/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ka/thunderbird-91.1.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "945beaab6b2bac56b13f7329b98fe6bf621fa9f3c022b3568dfa43bdce6e422c"; + sha256 = "4da9353667f109938ebc6740039a915f67d518c109915c1ed42f1552c3be719d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kab/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kab/thunderbird-91.1.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "39b6835112c58cba3b5e4b2f6964dbd9982c8146f0290aed9b13b10ae159bdd5"; + sha256 = "87c960236895eb1af70d2f50a839e55befc6486c4883d786b14a67e569c396ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kk/thunderbird-91.1.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a5c4fcd5d4e91c52814b2e8c6b0b239e0c430ea6169b351b33beb2b0736fa94b"; + sha256 = "38fdc0aa8fe98d83e52cf266776ebe7a52d7c80e98bc2372afcdeaf709ee8a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ko/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ko/thunderbird-91.1.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "97e5ae5cd2def5410de5b8a3194f77c53fc4ecb17572e9925a4bff56cb2ca73e"; + sha256 = "c960038e1764cc3a0203e2cdf8349ecfee951dbeb470cb58b66c66f0542ee790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lt/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lt/thunderbird-91.1.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2fc8d9d3fe286efa337d98d033b43d9d0b1c7fec15e566ed6ae98272df6adbb3"; + sha256 = "6387197f1fa9095d64ef3e7c73272f0e0a4a7b857d4be29899bfe2c7aa88a5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lv/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lv/thunderbird-91.1.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3a480801c29e7661b73a01d1d29455bbaa4f228a749da467400ebe0c973c5150"; + sha256 = "66021a590bb89b9fb50c90bc07788cbbb3d1acaceac5ebf562805d39bb59be3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ms/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ms/thunderbird-91.1.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "143e04a636d4e3df7ebab4a26419f0df6131a911c7b158848a1a0f4a51b8c6f5"; + sha256 = "a120efceac13b976b77a49dd2883f66a03c13f3243a53b66afbb372b87c15b16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nb-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nb-NO/thunderbird-91.1.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4f3f731b0a9b2dd7496b9cf9e3df7c54924f821b8afd404848b8bee4c37db7c6"; + sha256 = "ac5f404b3635b9b327458eb461148d94b52501621e78f2fafeff09c019651948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nl/thunderbird-91.1.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d6b758c9a5aff775088ebfe3c696d6275ecb2b2a4b7129ab3b79b23fe773e49a"; + sha256 = "f9dbbb9789a81ee6a40756039afefe542e1369b5de15d4ea728bd5fb5326c728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nn-NO/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nn-NO/thunderbird-91.1.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "89bdee0a436d53cba1acddc9187b8bf7036d3f8b2d6f8a60a1f7d1e7aae4687a"; + sha256 = "36d0cf0f3132f5365a9cfe5b2175ac6f42dbe25c41a03fbd177509b2cf13abce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pa-IN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pa-IN/thunderbird-91.1.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "9def18033f40abd87764ee12a0c9a104df9ffbf5813b398251d86b26676aa57a"; + sha256 = "776c3c215fd0e66eb81c2c91855233c4a7476aad534de555a6317b6a4f664b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pl/thunderbird-91.1.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e69e2f319a7691af209e517f7624a10e942c052fbff40cbe3e0cf057d5e8ce60"; + sha256 = "ba2aa2dda6c477f3ecb06d0f1d223928adc9a82e46432055783741064cf1e8f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-BR/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-BR/thunderbird-91.1.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ce0a025976a058e01dcec3c7c22005cc8061dd118cbb5766e34e1fa2e2d24ee6"; + sha256 = "314023714b6babde392b8a30d11e67fe5af9f47e2738d63a6231aa72e6e0b792"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-PT/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-PT/thunderbird-91.1.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0e46088f48739f26d94f92aeef401f136006f0cfc67b9445573539f08e9175fa"; + sha256 = "ea5895b796bbdf9ed5be1277dc0f32c70abb46f37a7d48ecacf39e7b7a5af082"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/rm/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/rm/thunderbird-91.1.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7efd235fd88601a74d2e6a2d9e481fbb011e4a3695128997754d97917a94669d"; + sha256 = "d295f9390b7dedec8592751142a42bc134ff3fca5a228d084eb176677c15c4bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ro/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ro/thunderbird-91.1.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9ada46d39f4eedb097b177d2c443dccc05af71a12f370b202aa0bf259c0cd7c5"; + sha256 = "b4504dd29ce68009c78b7194914c20d41024f92420564d6f4f34369717a49a90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ru/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ru/thunderbird-91.1.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0e4d029183f9125a4d1efe81cba348155336a37267db346436698430808a3da6"; + sha256 = "a8ba363a9bee130d05d028a84bfc10e8614ac3e3ee7e747d4987691d25423bb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sk/thunderbird-91.1.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a4712e2e477bb96bcb69eb8ea96200f81b1eb829db3675844380f68b1d264915"; + sha256 = "347a0e3e794bebc570aac65005edef1c311d7685d9b7ee4559121945cec1a40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sl/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sl/thunderbird-91.1.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "46f4f3dfe12614ceb8a249a4d38df2b40728082ce0448af03c2949f0d81d1969"; + sha256 = "1ae4c2615d9fc4e6b1ab270988de63ff425779945684811a1c9093940e7a9d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sq/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sq/thunderbird-91.1.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c5209bea51a081b6707ee79640ab663b3975af8c1bb26df05e480f5ad6dba723"; + sha256 = "207fb12cf9415e5a66bee33ee2f50adb970343b90bdde2c00c5b149e9ec829ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sr/thunderbird-91.1.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8cb6bb676a7143f10d5c666e41398b4045f32ca13bfd6a322d308f6b05dda441"; + sha256 = "45e7cb91506dfe353d86b8c6ae172b4a925f6b9ee631b542bc9a0fc77315d482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sv-SE/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sv-SE/thunderbird-91.1.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "33736665f7c38a62ed65340acead5435599dcbb8c7892ce939664662168078cf"; + sha256 = "634b1581237baa140d8711458cff99e979b3e33316b24925c6e5700da9603127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/th/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/th/thunderbird-91.1.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0fd5af0ffc983f58c85756274d9d94f26a44c32aff3852b22ac0554375b8eac3"; + sha256 = "a09336e75d270e9fdfaefd4f9e90cddf1f5135602998bfdd9a198e3f1544838c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/tr/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/tr/thunderbird-91.1.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6f8318a023062b306a64cc615bbffb96d06b608c625a0134f28d60629f5986c8"; + sha256 = "37874416c7bdd2c2b4303a55d14a82ce55a7d8cc6d51bc3b3d215489be3bc055"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uk/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uk/thunderbird-91.1.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "fede0c129370c93df5cb9e9f5e9bef69c6ad6bb96db11bdb520c743183ea2b41"; + sha256 = "faa0c411431a9b27a7c58c0c394804d3125e4f4e927387df8580c37738c2db44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uz/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uz/thunderbird-91.1.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "23db48eaf9101a4a838487ab4f31d7504036b0204a1624e0ac750bba6de24437"; + sha256 = "095e56a0fa0e85bebe9bc0044fc13f5da67c7267461b27fb8024947da3f423ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/vi/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/vi/thunderbird-91.1.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "55ec78e15967365bc41fc2b1469af78cc9300a0365587ec72463e9e97958020b"; + sha256 = "cae3582b504a38497dc63ba25d4be45e450b14cb588a9f52919d0fb4a5a04446"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-CN/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-CN/thunderbird-91.1.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "008216b04c79fb96686a747f9756caa2cc02aa052e7e682b0ba9bef0138d2ef6"; + sha256 = "58d542c3ceb5e36a83e424250c171477543bcd046f325c89b06f76090410b633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-TW/thunderbird-91.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-TW/thunderbird-91.1.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "bb222c6f9c8e5ed7681fa920ff6bb6e9d1262e16efb994dd5976e575e4f54a7c"; + sha256 = "13dfa3e7a8b5a69ab9072c21eb22373ff36bd54c9c7c39c3480681bd911043c0"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1aca35d56b..26c9c873ea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.1"; + version = "91.1.2"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f"; + sha512 = "f211ce2469f60862b1d641b5e165292d98db53695ab715090034c1ee2be7b04931f8e5e856b08b0c8c789e4d98df291d59283c257a38b556c0b4b0b63baa539f"; }; patches = [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix index 613226a2dc..75f620ead9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-s0mEZsZbZQrdGm55IJsnuoY3VnOkXJalknvtaFoyfcE="; + sha256 = "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 152cfb55e2..d3612321c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-9RumsGpPHWa3EQXobBC3RcDUqwHCKiff+ngpTXKLyaE="; + sha256 = "sha256-kqNN9P0G/Obi/8PStmLxImQdqkhLnJoFZ7dLpqe11TI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index f80fb3a739..074fb770b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -1,52 +1,52 @@ -{ - lib, - buildPythonApplication, - substituteAll, - fetchFromGitHub, - isPy3k, - colorama, - flask, - flask-httpauth, - flask-socketio, - stem, - psutil, - pyqt5, - pycrypto, - pyside2, - pytestCheckHook, - qrcode, - qt5, - requests, - unidecode, - tor, - obfs4, +{ lib +, buildPythonApplication +, substituteAll +, fetchFromGitHub +, isPy3k +, colorama +, flask +, flask-httpauth +, flask-socketio +, stem +, psutil +, pyqt5 +, pycrypto +, pynacl +, pyside2 +, pytestCheckHook +, qrcode +, qt5 +, requests +, unidecode +, tor +, obfs4 }: let - version = "2.3.3"; + version = "2.4"; src = fetchFromGitHub { - owner = "micahflee"; + owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-wU2020RNXlwJ2y9uzcLxIX4EECev1Z9YvNyiBalLj/Y="; + sha256 = "sha256-Lclm7mIkaAkQpWcNILTRJtLA43dpiyHtWAeHS2r3+ZQ="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; longDescription = '' - OnionShare is an open source tool for securely and anonymously sending - and receiving files using Tor onion services. It works by starting a web - server directly on your computer and making it accessible as an - unguessable Tor web address that others can load in Tor Browser to - download files from you, or upload files to you. It doesn't require - setting up a separate server, using a third party file-sharing service, - or even logging into an account. + OnionShare is an open source tool for securely and anonymously sending + and receiving files using Tor onion services. It works by starting a web + server directly on your computer and making it accessible as an + unguessable Tor web address that others can load in Tor Browser to + download files from you, or upload files to you. It doesn't require + setting up a separate server, using a third party file-sharing service, + or even logging into an account. - Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly - any other way people typically send files to each other, when you use - OnionShare you don't give any companies access to the files that you're - sharing. So long as you share the unguessable web address in a secure way - (like pasting it in an encrypted messaging app), no one but you and the - person you're sharing with can access the files. + Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly + any other way people typically send files to each other, when you use + OnionShare you don't give any companies access to the files that you're + sharing. So long as you share the unguessable web address in a secure way + (like pasting it in an encrypted messaging app), no one but you and the + person you're sharing with can access the files. ''; homepage = "https://onionshare.org/"; @@ -54,8 +54,19 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ lourkeur ]; }; + stem' = stem.overrideAttrs (_: rec { + version = "1.8.1"; -in rec { + src = fetchFromGitHub { + owner = "onionshare"; + repo = "stem"; + rev = version; + sha256 = "Dzpvx7CgAr5OtGmfubWAYDLqq5LkGqcwjr3bxpfL/3A="; + }; + }); + +in +rec { onionshare = buildPythonApplication { pname = "onionshare-cli"; inherit version meta; @@ -74,9 +85,10 @@ in rec { flask flask-httpauth flask-socketio - stem + stem' psutil pycrypto + pynacl requests unidecode ]; @@ -98,6 +110,7 @@ in rec { disabledTests = [ "test_firefox_like_behavior" "test_if_unmodified_since" + "test_get_tor_paths_linux" # expects /usr instead of /nix/store ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 6e1367a6b4..312023566b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation { include include include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ - curl libevent openssl pcre zlib + curl libevent openssl pcre zlib libnatpmp miniupnpc ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] )}" @@ -116,6 +116,7 @@ in stdenv.mkDerivation { ''; passthru.tests = { + apparmor = nixosTests.transmission; # starts the service with apparmor enabled smoke-test = nixosTests.bittorrent; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index b2eb18bd7b..50a26ef50f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,13 @@ let pname = "pcloud"; - version = "1.9.5"; - code = "XZy4VwXZjkvoMGM3x6kCTkIGLFYVKjqKbefX"; + version = "1.9.7"; + code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-GuO4wsSRT6WMlqYs2X+5oA7CykHb/NmhZ7UGA1FA6y4="; + hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix index 121a65f941..214b8376d8 100644 --- a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix @@ -147,10 +147,6 @@ stdenv.mkDerivation rec { ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors - wrapProgram $out/bin/DesktopEditors \ - --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${xorg.libX11.out}/share/X11/locale - substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" @@ -158,7 +154,13 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" ) + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) ''; passthru.updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index c6335b51c4..efd438adf6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 2e28d9d83e..02ef96e2e1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-dAdB57phD5phl8dQZIHtqtnA2LZqR+JoXTzIBtqBevA="; + sha256 = "sha256-bh00o++l3sqELX5kgRhiCcQOLVqvjEyEMcJTnnVPNU8="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix index 9ad53502cd..4328bbd975 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.8a"; + version = "2.7.9a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-2qqdCan67bcoUGgr5ro2LGGHDAyS/egTrT8pWX1chX0="; + sha256 = "sha256-p1yaIbSGu8K5AkqJj0BAzuoWsXr25eCNoQmLXYQeg4E="; }; sourceRoot = "source/source"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Spliced Transcripts Alignment to a Reference"; homepage = "https://github.com/alexdobin/STAR"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.arcadio ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 118bb8ecd2..87bd1e2e63 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "symbiyosys"; - version = "2020.08.22"; + version = "2021.09.13"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "SymbiYosys"; - rev = "33b0bb7d836fe2a73dc7b10587222f2a718beef4"; - sha256 = "03rbrbwsji1sqcp2yhgbc0fca04zsryv2g4izjhdzv64nqjzjyhn"; + rev = "15278f13467bea24a7300e23ebc5555b9261facf"; + sha256 = "sha256-gp9F4MaGgD6XfD7AjuB/LmMVcxFurqWHEiXPeyzlQzk="; }; buildInputs = [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index e482a071bb..4153ba5f66 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -19,13 +19,13 @@ with lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.10"; + version = "4.8.12"; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; rev = "z3-${version}"; - sha256 = "1w1ym2l0gipvjx322npw7lhclv8rslq58gnj0d9i96masi3gbycf"; + sha256 = "1wbcdc7h3mag8infspvxxja2hiz4igjwxzvss2kqar1rjj4ivfx0"; }; nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix index 0e4ad4dee9..bc7230f333 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/threejs-sage.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/lib/node_modules/three - cp -r build version $out/lib/node_modules/three + mkdir -p "$out/lib/node_modules/three/" + cp version "$out/lib/node_modules/three" + cp -r build "$out/lib/node_modules/three/$(cat version)" ''; } diff --git a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix index afe18c399a..f5d36c332a 100644 --- a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix @@ -10,7 +10,6 @@ , gettext , glib , gtk3 -, bamf , libwnck , libgee , libgtop @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-eTsPn2Z1++KsZnnBnZ2s9fKK2HguPw+JqaRRkxQDiAk="; + sha256 = "sha256-Gin/1vbQbOAKFrjzDuDTNDQlTGTIlb0NUfIWWXd5tQ4="; fetchSubmodules = true; }; @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - bamf glib gtk3 pantheon.granite diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix deleted file mode 100644 index 70d0d083dc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ buildGoPackage -, Carbon -, Cocoa -, Kernel -, fetchFromGitHub -, lib -, mesa_glu -, stdenv -, xorg -}: - -buildGoPackage rec { - pname = "aminal"; - version = "0.9.0"; - - goPackagePath = "github.com/liamg/aminal"; - - buildInputs = - lib.optionals stdenv.isLinux [ - mesa_glu - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]; - - src = fetchFromGitHub { - owner = "liamg"; - repo = "aminal"; - rev = "v${version}"; - sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; - }; - - ldflags = [ - "-X ${goPackagePath}/version.Version=${version}" - ]; - - meta = with lib; { - description = "Golang terminal emulator from scratch"; - longDescription = '' - Aminal is a modern terminal emulator for Mac/Linux implemented in Golang - and utilising OpenGL. - - The project is experimental at the moment, so you probably won't want to - rely on Aminal as your main terminal for a while. - - Features: - - Unicode support - - OpenGL rendering - - Customisation options - - True colour support - - Support for common ANSI escape sequences a la xterm - - Scrollback buffer - - Clipboard access - - Clickable URLs - - Multi platform support (Windows coming soon...) - - Sixel support - - Hints/overlays - - Built-in patched fonts for powerline - - Retina display support - ''; - homepage = "https://github.com/liamg/aminal"; - license = licenses.gpl3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 387a1cb59c..d57fe65751 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-ACuTb1DGft2/32Ezg23jhpl9yua5kUTZ2kKL8KHU+BU="; }; - nativeBuildInputs = [ unixtools.column which ]; + postPatch = '' + patchShebangs check_dependencies.sh + ''; + + nativeBuildInputs = [ + unixtools.column + which + ]; dontBuild = true; - preInstall = '' - patchShebangs . - ''; - - installFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/share" + ]; postInstall = '' # bash completion is already handled by make install diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix new file mode 100644 index 0000000000..2b7f265019 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, rustPlatform +, stdenv +, Security +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "git-quickfix"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "siedentop"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; + + cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q="; + + meta = with lib; { + description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; + homepage = "https://github.com/siedentop/git-quickfix"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ msfjarvis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 69689a49a9..4490f8068e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; - version = "unstable-2020-06-12"; + version = "1.0.2.1"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; - rev = "28ed63b707919734d230cb13bff7d231dfeee8fc"; - sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1"; + rev = "v${version}"; + sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index c06c70e267..047cc02192 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MHNhl6lrBqHZ6M4fVOnSDxEcF6RqfWHWx5cvUhRXJKw="; + sha256 = "sha256-naCCJ9s63UPDxRWbVjVikXtGUlM4Lp7vyDHlESEtXeI="; }; - vendorSha256 = "sha256-9+WBKc8PI0v6bnkC+78Ygv/eocQ3D7+xBb8lcv16QTE="; + vendorSha256 = "sha256-iiHDxiP6Dg7MK5jhSwly5oEhFZ8ByCx5WEyrbzL/u4w="; runVend = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 63f4296308..f1be6a4fc8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "sha256-CyXEmlsc40JtwDjRYNWqN+3cuoG8K07jAQdd1rktvS8="; + sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl"; }; subPackages = [ "." ]; - vendorSha256 = "sha256-PSS7OPbM+XsylqDlWc4h+oZrOua2kSWKLEuyjqo/cxM="; + vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 4393a9dc51..02888b3f87 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -4,6 +4,7 @@ , python3Packages , asciidoc , docbook_xsl +, docbook_xml_dtd_45 , git , perl , xmlto @@ -11,16 +12,16 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk="; + sha256 = "0wa3ba7afnbb1h08n9xr0cqsg93rx0qd9jv8a34mmpp0lpijmjw6"; }; - nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl ]; + nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; format = "other"; @@ -34,6 +35,14 @@ python3Packages.buildPythonApplication rec { --replace http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \ ${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl done + + substituteInPlace Documentation/texi.xsl \ + --replace http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd \ + ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd + + cat > stgit/_version.py < /dev/${qemuSerialDevice} + exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/${qemu-common.qemuSerialDevice} &> /dev/${qemu-common.qemuSerialDevice} fi ''; qemuCommandLinux = '' - ${qemuBinary qemu} \ + ${qemu-common.qemuBinary qemu} \ -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ @@ -206,7 +206,7 @@ rec { ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ + -append "console=${qemu-common.qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; @@ -257,14 +257,23 @@ rec { eval "$postVM" ''; - - createEmptyImage = {size, fullName}: '' - mkdir $out - diskImage=$out/disk-image.qcow2 + /* + A bash script fragment that produces a disk image at `destination`. + */ + createEmptyImage = { + # Disk image size in MiB + size, + # Name that will be written to ${destination}/nix-support/full-name + fullName, + # Where to write the image files, defaulting to $out + destination ? "$out" + }: '' + mkdir -p ${destination} + diskImage=${destination}/disk-image.qcow2 ${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" - mkdir $out/nix-support - echo "${fullName}" > $out/nix-support/full-name + mkdir ${destination}/nix-support + echo "${fullName}" > ${destination}/nix-support/full-name ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix index 28ec08f63b..e24bc8ae0d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix @@ -1,55 +1,61 @@ { stdenvNoCC , lib , fetchzip -, fetchurl }: let - makePackage = { family, description, rev, sha256 }: let - Family = + makePackage = + { family + , description + , rev + , sha256 + , postFetch ? '' + install -m444 -Dt $out/share/fonts/opentype/source-han-${family} $downloadedFile + '' + , zip ? "" + }: + let Family = lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family; + in + fetchzip { + name = "source-han-${family}-${lib.removeSuffix "R" rev}"; - ttc = fetchurl { - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc"; - inherit sha256; + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + inherit sha256 postFetch; + + meta = { + description = "An open source Pan-CJK ${description} typeface"; + homepage = "https://github.com/adobe-fonts/source-han-${family}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ taku0 emily ]; + }; }; - in stdenvNoCC.mkDerivation { - pname = "source-han-${family}"; - version = lib.removeSuffix "R" rev; - - buildCommand = '' - mkdir -p $out/share/fonts/opentype/source-han-${family} - ln -s ${ttc} $out/share/fonts/opentype/source-han-${family}/SourceHan${Family}.ttc - ''; - - meta = { - description = "An open source Pan-CJK ${description} typeface"; - homepage = "https://github.com/adobe-fonts/source-han-${family}"; - license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ taku0 emily ]; - }; - }; in { sans = makePackage { family = "sans"; description = "sans-serif"; - rev = "2.001R"; - sha256 = "101p8q0sagf1sd1yzwdrmmxvkqq7j0b8hi0ywsfck9w56r4zx54y"; + rev = "2.004R"; + sha256 = "052d17hvz435zc4r2y1p9cgkkgn0ps8g74mfbvnbm1pv8ykj40m9"; + postFetch = '' + mkdir -p $out/share/fonts/opentype/source-han-sans + unzip $downloadedFile -d $out/share/fonts/opentype/source-han-sans + ''; + zip = ".zip"; }; serif = makePackage { family = "serif"; description = "serif"; rev = "1.001R"; - sha256 = "1d968h30qvvwy3s77m9y3f1glq8zlr6bnfw00yinqa18l97n7k45"; + sha256 = "0nnsb2w140ih0cnp1fh7s4csvzp9y0cavz9df2ryhv215mh9z4m0"; }; mono = makePackage { family = "mono"; description = "monospaced"; rev = "1.002"; - sha256 = "1haqffkcgz0cc24y8rc9bg36v8x9hdl8fdl3xc8qz14hvr42868c"; + sha256 = "010h1y469c21bjavwdmkpbwk3ny686inz8i062wh1dhcv8cnqk3c"; }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix b/third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix index 92930c67cc..50ad1113aa 100644 --- a/third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix +++ b/third_party/nixpkgs/pkgs/data/misc/brise/fetchPackages.nix @@ -4,8 +4,8 @@ fetchFromGitHub: ln -sv ${fetchFromGitHub { owner = "rime"; repo = "rime-array"; - rev = "9ca2b725ae52c9b3185213e3555df1f9d4f1c53f"; - sha256 = "0x3sifdpdivr8ssynjhc4g1zfl6h9hm9nh9p9zb9wkh1ky9z7kha"; + rev = "d10f2f8b2aec7c7e736ace01e8a399e5ae5e7c3a"; + sha256 = "sha256-4t6+gh2V57SueDp9Tn6vTuxQCZNGzjLdJEhzIEqRjdI="; }} array ln -sv ${fetchFromGitHub { owner = "rime"; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 2a55794abf..73fce1dd61 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "6b93e40198f31ac2a9d52e4f3ce90f22f1e9e6f9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6b93e40198f31ac2a9d52e4f3ce90f22f1e9e6f9.tar.gz", - "sha256": "1zs9d0h55q6lj3v0d0n19yxl58lhn07lmnw2j5k2y8zbx3pcqi8l", - "msg": "Update from Hackage at 2021-09-17T18:08:40Z" + "commit": "e0bd041989865809059f6039125dfb93cb075f72", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bd041989865809059f6039125dfb93cb075f72.tar.gz", + "sha256": "1fpm2kawxlias5xxmiara6224akgii0mnwnlyklc8szflv9cbs17", + "msg": "Update from Hackage at 2021-09-19T21:23:33Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix b/third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix index 7bf7d8477c..c2841a9f1e 100644 --- a/third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix +++ b/third_party/nixpkgs/pkgs/data/misc/rime-data/fetchSchema.nix @@ -5,8 +5,8 @@ mkdir -p package/rime ln -sv ${fetchFromGitHub { owner = "rime"; repo = "rime-array"; - rev = "8514193da939bc8888ad6a744f5e5921d4baebc7"; - sha256 = "1fy7pcq7d8m0wzkkhklmv6p370ms9lqc1zpndyy2xjamzrbb9l83"; + rev = "d10f2f8b2aec7c7e736ace01e8a399e5ae5e7c3a"; + sha256 = "sha256-4t6+gh2V57SueDp9Tn6vTuxQCZNGzjLdJEhzIEqRjdI="; }} package/rime/array ln -sv ${fetchFromGitHub { owner = "rime"; diff --git a/third_party/nixpkgs/pkgs/data/themes/venta/default.nix b/third_party/nixpkgs/pkgs/data/themes/venta/default.nix index 83de638674..f536358d5d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/venta/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/venta/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "venta"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1fhiq1kji5qmwsh8335rzilvhs30g5jp126czf2rf532iba0ivd7"; + sha256 = "0vgm65mb8qd6nbkkinmqb1hldksfgd6281l58y28jc5q4244l9wp"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix index 3be7f5c878..d661c853bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix @@ -36,9 +36,12 @@ let echo "${metadata}" | base64 --decode > $out/metadata.json ''; }; - buildCommand = '' + dontBuild = true; + installPhase = '' + runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - cp -r -T $src $out/share/gnome-shell/extensions/${uuid} + cp -r -T . $out/share/gnome-shell/extensions/${uuid} + runHook postInstall ''; meta = { description = builtins.head (lib.splitString "\n" description); diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix index f98e2fb4e6..2937cf6ac7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix @@ -60,17 +60,24 @@ in rec { gnome38Extensions = mapUuidNames (produceExtensionsList "38"); gnome40Extensions = mapUuidNames (produceExtensionsList "40"); - gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames - (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) - ) - // lib.optionalAttrs (config.allowAliases or true) { + gnomeExtensions = lib.trivial.pipe gnome40Extensions [ + # Apply some custom patches for automatically packaged extensions + (callPackage ./extensionOverrides.nix {}) + # Add all manually packaged extensions + (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) + # Map the extension UUIDs to readable names + (lib.attrValues) + (mapReadableNames) + # Add some aliases + (extensions: extensions // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40."; - } - ); + }) + # Make the set "public" + lib.recurseIntoAttrs + ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix new file mode 100644 index 0000000000..182bdf6ecd --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -0,0 +1,32 @@ +{ + lib, + ddcutil, + gjs, +}: +# A set of overrides for automatically packaged extensions that require some small fixes. +# The input must be an attribute set with the extensions' UUIDs as keys and the extension +# derivations as values. Output is the same, but with patches applied. +# +# Note that all source patches refer to the built extension as published on extensions.gnome.org, and not +# the upstream repository's sources. +super: super // { + + "display-brightness-ddcutil@themightydeity.github.com" = super."display-brightness-ddcutil@themightydeity.github.com".overrideAttrs (old: { + # Has a hard-coded path to a run-time dependency + # https://github.com/NixOS/nixpkgs/issues/136111 + postPatch = '' + substituteInPlace "extension.js" --replace "/usr/bin/ddcutil" "${ddcutil}/bin/ddcutil" + ''; + }); + + "gnome-shell-screenshot@ttll.de" = super."gnome-shell-screenshot@ttll.de".overrideAttrs (old: { + # Requires gjs + # https://github.com/NixOS/nixpkgs/issues/136112 + postPatch = '' + for file in *.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + }); + +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix index 42c6467dba..fbf89ffa19 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-tilingnome-unstable"; + pname = "gnome-shell-extension-tilingnome"; version = "unstable-2019-09-19"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 60e6ca3d4e..745c4e71b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, glib , lxqt-build-tools , qtbase , qtx11extras @@ -34,6 +35,7 @@ mkDerivation rec { ]; buildInputs = [ + glib.bin qtbase qtx11extras qttools @@ -51,6 +53,12 @@ mkDerivation rec { xorg.xf86inputlibinput.dev ]; + postPatch = '' + substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \ + --replace 'QStringLiteral("gsettings' \ + 'QStringLiteral("${glib.bin}/bin/gsettings' + ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 8516133b18..df448079c5 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.0.0"; + version = "6.0.1"; repoName = "code"; @@ -39,18 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; + sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/code/pull/1090 - (fetchpatch { - url = "https://github.com/elementary/code/commit/88dc40d7bbcc2288ada6673eb8f4fab345d97882.patch"; - sha256 = "16y20bvslcm390irlib759703lvf7w6rz4xzaiazjj1r1njwinvv"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index dcdd1bb9ac..9ac1774174 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.0.2"; + version = "6.0.3"; repoName = "files"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1i514r3adypmcwinmv4c1kybims16xi4i3akx0yy04dib92hbk7c"; + sha256 = "10hgj5rrqxzk4q8jlhkwwrs4hgyavlhz3z1pqf36y663bq3h0izv"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 6d0b752c1d..743ed40d6d 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "6.1.1"; + version = "6.2.0"; repoName = "mail"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "15ai0x9236pjx76m0756nyc1by78v0lg1dgdiifk868krdvipzzx"; + sha256 = "1ab620zhwqqjq1bs1alvpcw9jmdxjij0ywczvwbg8gqvcsc80lkn"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index bec0556a37..545a21ba20 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-tasks"; - version = "6.0.3"; + version = "6.0.4"; repoName = "tasks"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0a6zgf7di4jyl764pn78wbanm0i5vrkk5ks3cfsvi3baprf3j9d5"; + sha256 = "1gb51gm8qgd8yzhqb7v69p2f1fgm3qf534if4lc85jrjsb8hgmhl"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 3b3cbf64ef..22c2f4f64a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -16,24 +15,15 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0hgvmrgg6g2sjb3sda7kzfcd3zgngd5w982drl6ll44k1mh16gsj"; + sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-applications/pull/163 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-applications/commit/25db490654ab41694be7b7ba19218376f42fbb8d.patch"; - sha256 = "16y8zcwnnjsh72ifpyqcdb9f5ajdj0iy8kb5sj6v77c1cxdhrv29"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 9aa9d7e678..5e8447f629 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1lp3i31jzp21n43d1mh4d4i8zgim3q3j4inw4hmyimyql2s83cc3"; + sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index 665007fcd6..db757b1aa4 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; + sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f"; }; passthru = { @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch - # https://github.com/elementary/gala/pull/1259 - # https://github.com/NixOS/nixpkgs/issues/139404 - # Remove this patch when it is included in a new release - # of gala OR when we no longer use mutter 3.38 for pantheon - ./fix-session-crash-when-taking-screenshots.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch deleted file mode 100644 index f2393a804b..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 25 Sep 2021 23:21:01 +0800 -Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38 - ---- - src/ScreenshotManager.vala | 5 ++--- - vapi/mutter-clutter.vapi | 2 +- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala -index 3ffb0123..388fee1a 100644 ---- a/src/ScreenshotManager.vala -+++ b/src/ScreenshotManager.vala -@@ -354,12 +354,11 @@ namespace Gala { - paint_flags |= Clutter.PaintFlag.FORCE_CURSORS; - } - -- unowned var data = image.get_data (); - if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.BGRA_8888_PRE, - paint_flags -@@ -368,7 +367,7 @@ namespace Gala { - wm.stage.paint_to_buffer ( - {x, y, width, height}, - scale, -- ref data, -+ image.get_data (), - image.get_stride (), - Cogl.PixelFormat.ARGB_8888_PRE, - paint_flags -diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi -index 5b778cb2..95de24be 100644 ---- a/vapi/mutter-clutter.vapi -+++ b/vapi/mutter-clutter.vapi -@@ -7336,7 +7336,7 @@ namespace Clutter { - [Version (since = "1.2")] - public bool get_use_alpha (); - #if HAS_MUTTER338 -- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; -+ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; - public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags); - #else - [Version (since = "0.4")] diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 29432bf196..6799887247 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -12,7 +12,6 @@ , libgee , gettext , gtk3 -, appstream , gnome-menus , json-glib , elementary-dock @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.8.2"; + version = "2.9.0"; repoName = "applications-menu"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q"; + sha256 = "0mwjw2ghbdj336ax5srxbqnjprdhj1if7sm9k9idqkmifpzccs7i"; }; passthru = { @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - appstream gettext meson ninja diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 1a101a8a88..46d90e4acc 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -3,7 +3,6 @@ , nix-update-script , pantheon , pkg-config -, fetchpatch , meson , ninja , vala @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1pvcpk1d2zh9pvw0clv3bhf2plcww6nbxs6j7xjbvnaqs7d6i1k2"; + sha256 = "1qrbg8l3ifz09jx6v5j7hmgw0hmirj6mh3z634yl1cadz45p8fc9"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-notifications/pull/218 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/c7e73f0683561345935a959dafa2083b7e22fe99.patch"; - sha256 = "10xiyq42bqfmih1jgqpq64nha3n0y7ra3j7j0q27rn5hhhgbyjs7"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 1ae9f9f4aa..4529b519bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0ycys24y1rrz0ydpvs4mc89p4k986q1ziwbvziinxr1wsli9v1dj"; + sha256 = "078yi36r452sc33mv2ck8z0icya1lhzhickllrlhc60rdri36sb8"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix index c21096b592..bf909016ac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -40,12 +40,14 @@ let # nixpkgs uses for the respective system. defaultLibc = { i686-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, # which link it against `libtinfo.so.5` (ncurses 5). # Other bindists are linked `libtinfo.so.6` (ncurses 6). @@ -53,43 +55,51 @@ let ]; }; x86_64-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } ]; }; armv7l-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } ]; }; aarch64-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } { nixPackage = numactl; fileToCheckFor = null; } ]; }; x86_64-darwin = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; }; exePathForLibraryCheck = null; # we don't have a library check for darwin yet archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; @@ -98,12 +108,14 @@ let # Binary distributions for the musl libc for the respective system. musl = { x86_64-linux = { + variantSuffix = "-musl"; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; sha256 = "0xpcbyaxqyhbl6f0i3s4rp2jm67nqpkfh2qlbj3i2fiaix89ml0l"; }; exePathForLibraryCheck = "bin/ghc"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } # In contrast to glibc builds, the musl-bindist uses `libncursesw.so.*` # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } @@ -121,11 +133,8 @@ let libPath = lib.makeLibraryPath ( - [ - gmp - ] # Add arch-specific libraries. - ++ map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries ); libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" @@ -135,11 +144,16 @@ in stdenv.mkDerivation rec { inherit version; - - name = "ghc-${version}-binary"; + pname = "ghc-binary${binDistUsed.variantSuffix}"; src = fetchurl binDistUsed.src; + # Note that for GHC 8.10 versions <= 8.10.5, the GHC HQ musl bindist + # has a `gmp` dependency: + # https://gitlab.haskell.org/ghc/ghc/-/commit/8306501020cd66f683ad9c215fa8e16c2d62357d + # Related nixpkgs issues: + # * https://github.com/NixOS/nixpkgs/pull/130441#issuecomment-922452843 + nativeBuildInputs = [ perl ]; propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ] @@ -147,6 +161,9 @@ stdenv.mkDerivation rec { # libgmp is (see not [musl bindists have no .buildinfo]), we need # to propagate `gmp`, otherwise programs built by this ghc will # fail linking with `cannot find -lgmp` errors. + # Concrete cases are listed in: + # https://github.com/NixOS/nixpkgs/pull/130441#issuecomment-922459988 + # # Also, as of writing, the release pages of musl bindists claim # that they use `integer-simple` and do not require `gmp`; however # that is incorrect, so `gmp` is required until a release has been @@ -154,6 +171,12 @@ stdenv.mkDerivation rec { # (Note that for packaging the `-binary` compiler, nixpkgs does not care # about whether or not `gmp` is used; this comment is just here to explain # why the `gmp` dependency exists despite what the release page says.) + # + # For GHC >= 8.10.6, `gmp` was switched out for `integer-simple` + # (https://gitlab.haskell.org/ghc/ghc/-/commit/8306501020cd66f683ad9c215fa8e16c2d62357d), + # fixing the above-mentioned release issue, + # and for GHC >= 9.* it is not clear as of writing whether that switch + # will be made there too. ++ lib.optionals stdenv.hostPlatform.isMusl [ gmp ]; # musl bindist needs this # Set LD_LIBRARY_PATH or equivalent so that the programs running as part diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix index ad106f2f2a..58be16dc56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -41,12 +41,14 @@ let # nixpkgs uses for the respective system. defaultLibc = { i686-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, # which link it against `libtinfo.so.5` (ncurses 5). # Other bindists are linked `libtinfo.so.6` (ncurses 6). @@ -54,54 +56,64 @@ let ]; }; x86_64-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; sha256 = "a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } ]; }; armv7l-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; sha256 = "3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } ]; }; aarch64-linux = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; sha256 = "fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55"; }; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } { nixPackage = numactl; fileToCheckFor = null; } ]; }; x86_64-darwin = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047"; }; exePathForLibraryCheck = null; # we don't have a library check for darwin yet archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; }; aarch64-darwin = { + variantSuffix = ""; src = { url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; sha256 = "dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c"; }; exePathForLibraryCheck = null; # we don't have a library check for darwin yet archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; @@ -110,12 +122,15 @@ let # Binary distributions for the musl libc for the respective system. musl = { x86_64-linux = { + variantSuffix = "-musl-integer-simple"; src = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; sha256 = "16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c"; }; exePathForLibraryCheck = "bin/ghc"; archSpecificLibraries = [ + # No `gmp` here, since this is an `integer-simple` bindist. + # In contrast to glibc builds, the musl-bindist uses `libncursesw.so.*` # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } @@ -133,11 +148,8 @@ let libPath = lib.makeLibraryPath ( - [ - gmp - ] # Add arch-specific libraries. - ++ map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries ); libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" @@ -147,26 +159,25 @@ in stdenv.mkDerivation rec { inherit version; - - name = "ghc-${version}-binary"; + pname = "ghc-binary${binDistUsed.variantSuffix}"; src = fetchurl binDistUsed.src; + # Note that for GHC 8.10 versions >= 8.10.6, the GHC HQ musl bindist + # uses `integer-simple` and has no `gmp` dependency: + # https://gitlab.haskell.org/ghc/ghc/-/commit/8306501020cd66f683ad9c215fa8e16c2d62357d + # Related nixpkgs issues: + # * https://github.com/NixOS/nixpkgs/pull/130441#issuecomment-922452843 + # TODO: When this file is copied to `ghc-9.*-binary.nix`, determine whether + # the GHC 9 branch also switched from `gmp` to `integer-simple` via the + # currently-open issue: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20059 + # and update this comment accordingly. + nativeBuildInputs = [ perl ]; propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ] - # Because musl bindists currently provide no way to tell where - # libgmp is (see not [musl bindists have no .buildinfo]), we need - # to propagate `gmp`, otherwise programs built by this ghc will - # fail linking with `cannot find -lgmp` errors. - # Also, as of writing, the release pages of musl bindists claim - # that they use `integer-simple` and do not require `gmp`; however - # that is incorrect, so `gmp` is required until a release has been - # made that includes https://gitlab.haskell.org/ghc/ghc/-/issues/20059. - # (Note that for packaging the `-binary` compiler, nixpkgs does not care - # about whether or not `gmp` is used; this comment is just here to explain - # why the `gmp` dependency exists despite what the release page says.) - ++ lib.optionals stdenv.hostPlatform.isMusl [ gmp ]; # musl bindist needs this + ; # Set LD_LIBRARY_PATH or equivalent so that the programs running as part # of the bindist installer can find the libraries they expect. @@ -227,9 +238,9 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/configure '' + # We have to patch the GMP paths for the integer-gmp package. - # Note [musl bindists have no .buildinfo] - # Note that musl bindists do not contain them; unclear if that's intended; + # Note that musl bindists do not contain them, # see: https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231 + # However, musl bindists >= 8.10.6 use `integer-simple`, not `gmp`. '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index 411146569a..7e59bd974a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -141,10 +141,16 @@ let targetPackages.stdenv.cc.bintools.bintools ]; + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableIntegerSimple "-integer-simple") + ]; + in stdenv.mkDerivation (rec { version = "8.10.7"; - name = "${targetPrefix}ghc-${version}"; + pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; @@ -341,10 +347,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index d30275dee1..b1126fda7d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -34,8 +34,7 @@ in stdenv.mkDerivation rec { version = "8.6.5"; - - name = "ghc-${version}-binary"; + pname = "ghc-binary"; # https://downloads.haskell.org/~ghc/8.6.5/ src = fetchurl ({ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index e2a65a1979..1d31ffba41 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -149,10 +149,16 @@ let targetPackages.stdenv.cc.bintools.bintools ]; + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableIntegerSimple "-integer-simple") + ]; + in stdenv.mkDerivation (rec { version = "8.8.4"; - name = "${targetPrefix}ghc-${version}"; + pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; @@ -340,10 +346,11 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; + # integer-simple builds are broken with musl when bootstrapping using + # GHC 8.10.2 and below, however it is not possible to reverse bootstrap + # GHC 8.8.4 with GHC 8.10.7. + # See https://github.com/NixOS/nixpkgs/pull/138523#issuecomment-927339953 + broken = hostPlatform.isMusl && enableIntegerSimple; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index af740c01f5..a673276239 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -135,10 +135,16 @@ let targetPackages.stdenv.cc.bintools.bintools ]; + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableIntegerSimple "-integer-simple") + ]; + in stdenv.mkDerivation (rec { version = "9.0.1"; - name = "${targetPrefix}ghc-${version}"; + pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; @@ -303,10 +309,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix index b565870add..703ba0a705 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx, xattr , bash , libiconv ? null, ncurses @@ -134,16 +134,32 @@ let targetPackages.stdenv.cc.bintools.bintools ]; + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableIntegerSimple "-integer-simple") + ]; + in stdenv.mkDerivation (rec { version = "9.2.0.20210821"; - name = "${targetPrefix}ghc-${version}"; + pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz"; sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw"; }; + patches = [ + # picked from release branch, remove with the next release candidate, + # see https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 + (fetchpatch { + name = "fix-darwin-link-failure.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/77456387025ca74299ecc70621cbdb62b1b6ffc9.patch"; + sha256 = "1g8smrn7hj8cbp9fhrylvmrb15s0xd8lhdgxqnx0asnd4az82gj8"; + }) + ]; + enableParallelBuilding = true; outputs = [ "out" "doc" ]; @@ -306,14 +322,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - # Linker failure on macOS: - # https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 - broken = (enableIntegerSimple && hostPlatform.isMusl) - || stdenv.hostPlatform.isDarwin; - hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index cb2cd79a48..9cca803ab2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -145,11 +145,17 @@ let targetPackages.stdenv.cc.bintools.bintools ]; + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + in stdenv.mkDerivation (rec { inherit version; inherit (src) rev; - name = "${targetPrefix}ghc-${version}"; + pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix index 0b88bc1ab1..26c855e4dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix @@ -1,15 +1,15 @@ { stdenv, pkgsHostTarget, cmake, makeWrapper, mkDerivation, fetchFromGitHub , alex, array, base, bytestring, cond, containers, directory, extra -, filepath, haskeline, hpack, hspec, hspec-core, json, lib, mtl +, filepath, hpack, hspec, hspec-core, isocline, json, lib, mtl , parsec, process, regex-compat, text, time }: let - version = "2.1.9"; + version = "2.3.1"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy"; + sha256 = "18f4hsqgc6c0cnayabj311n438fjhf217j1kjaysa8w4k4pxl58z"; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { @@ -33,14 +33,13 @@ mkDerivation rec { isExecutable = true; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ - array base bytestring cond containers directory haskeline mtl + array base bytestring cond containers directory isocline mtl parsec process text time kklib ]; executableToolDepends = [ alex makeWrapper ]; postInstall = '' mkdir -p $out/share/koka/v${version} cp -a lib $out/share/koka/v${version} - cp -a contrib $out/share/koka/v${version} cp -a kklib $out/share/koka/v${version} wrapProgram "$out/bin/koka" \ --set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \ @@ -50,6 +49,7 @@ mkDerivation rec { prePatch = "hpack"; description = "Koka language compiler and interpreter"; homepage = "https://github.com/koka-lang/koka"; + changelog = "${homepage}/blob/master/doc/spec/news.mdk"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ siraben sternenseemann ]; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 949c70318a..bb233e34c1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,21 +14,21 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.08.16"; + version = "2021.09.27"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "b37d133c43c45862bd5c550b5d7fffaa8c49b968"; - sha256 = "0qc9d8cay2j5ggn0mgjq484vv7a14na16s9dmp7bqz7r9cn4b98n"; + rev = "9d8d3bdbc48133ff7758c9c5293e5904bc6e5ba7"; + sha256 = "sha256-5Axo8qX2+ATqQ170QqfhRwYfCRQLCKBW1kc89x9XljE="; name = "nextpnr"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr-tests"; rev = "ccc61e5ec7cc04410462ec3196ad467354787afb"; - sha256 = "09a0bhrphr3rsppryrfak4rhziyj8k3s17kgb0vgm0abjiz0jgam"; + sha256 = "sha256-VT0JfpRLgfo2WG+eoMdE0scPM5nKZZ/v1XlkeDNcQCU="; name = "nextpnr-tests"; }) ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { patchPhase = with builtins; '' # use PyPy for icestorm if enabled - substituteInPlace ./ice40/family.cmake \ + substituteInPlace ./ice40/CMakeLists.txt \ --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 7a733ce2cb..f2624d1241 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+4276"; + version = "0.10+1"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "75a4cdfc8afc10fed80e43fb1ba31c7edaf6e361"; - sha256 = "13xb7ny6i0kr6z6xkj9wmmcj551si7w05r3cghq8h8wkikyh6c8p"; + rev = "7a7df9a3b4996b17bb774377483b15de49aa3d9b"; + sha256 = "sha256-gi/Q6loIQ75NTbS9b/Q8sdrl9NGBDae2+AAGHVYB0WI="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index 8f2ef30d37..e39fdc25ea 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,9 +3,13 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = if versions.range "8.7" "8.13" coq.coq-version - then "1.1.2+coq${coq.coq-version}" else null; - displayVersion = { paramcoq = "1.1.2"; }; + defaultVersion = with versions; switch coq.version [ + { case = range "8.13" "8.14"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } + ] null; + displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71"; + release."1.1.3+coq8.13".sha256 = "06ndly736k4pmdn4baqa7fblp6lx7a9pxm9gvz1vzd6ic51825wp"; release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22"; release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; diff --git a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix index 7b3a16fb75..f61c0cbe51 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/openocd/default.nix @@ -5,6 +5,7 @@ , hidapi , libftdi1 , libusb1 +, libgpiod }: stdenv.mkDerivation rec { @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ hidapi libftdi1 libusb1 ]; + buildInputs = [ hidapi libftdi1 libusb1 libgpiod ]; configureFlags = [ "--enable-jtag_vpi" @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { (lib.enableFeature (! stdenv.isDarwin) "oocd_trace") "--enable-buspirate" (lib.enableFeature stdenv.isLinux "sysfsgpio") + (lib.enableFeature stdenv.isLinux "linuxgpiod") "--enable-remote-bitbang" ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/HACKING.md b/third_party/nixpkgs/pkgs/development/haskell-modules/HACKING.md index 5e996548e4..51b0abb155 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/HACKING.md +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/HACKING.md @@ -206,13 +206,33 @@ opening the next one. When you want to merge the currently open script uses the `gh` command to merge the current PR and open a new one. You should only need to do this once. + This command can be used to authenticate: + ```console $ gh auth login ``` + This command can be used to confirm that you have already authenticated: + + ```console + $ gh auth status + ``` + +1. Make sure you have setup your `~/.cabal/config` file for authentication + for uploading the NixOS package versions to Hackage. See the following + section for details on how to do this. + 1. Make sure you have correctly marked packages broken. One of the previous sections explains how to do this. + In short: + + ```console + $ ./maintainers/scripts/haskell/hydra-report.hs get-report + $ ./maintainers/scripts/haskell/hydra-report.hs mark-broken-list + $ ./maintainers/scripts/haskell/mark-broken.sh --do-commit + ``` + 1. Merge `master` into `haskell-updates` and make sure to push to the `haskell-updates` branch. (This can be skipped if `master` has recently been merged into `haskell-updates`.) @@ -238,6 +258,8 @@ opening the next one. When you want to merge the currently open 1. Merges the currently open `haskell-updates` PR. + 1. Updates the version of Haskell packages in NixOS on Hackage. + 1. Updates Stackage and Hackage snapshots. Regenerates the Haskell package set. 1. Pushes the commits updating Stackage and Hackage and opens a new diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix index be80f3ed5c..b216bf9000 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-08-27"; + version = "unstable-2021-09-28"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/05b1b404e20eb6252f93c821d4d7974ab7277d90.tar.gz"; - sha256 = "03zvp3wwqph9niadgbvkfcqabafgyhnw12r09cw23hm69hsb64d5"; + url = "https://github.com/NixOS/cabal2nix/archive/b4d893ed1a7a66b0046dd8a48f62b81de670ab02.tar.gz"; + sha256 = "0xl5a0gfxrqz8pkx43zrj84xvcg15723lgvirxdcvc4zqa732zjg"; }; isLibrary = true; isExecutable = true; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 053752edd6..1d6850ee1d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -605,6 +605,25 @@ self: super: { ''; }); + d-bus = let + # The latest release on hackage is missing necessary patches for recent compilers + # https://github.com/Philonous/d-bus/issues/24 + newer = overrideSrc super.d-bus { + version = "unstable-2021-01-08"; + src = pkgs.fetchFromGitHub { + owner = "Philonous"; + repo = "d-bus"; + rev = "fb8a948a3b9d51db618454328dbe18fb1f313c70"; + hash = "sha256-R7/+okb6t9DAkPVUV70QdYJW8vRcvBdz4zKJT13jb3A="; + }; + }; + # Add now required extension on recent compilers. + # https://github.com/Philonous/d-bus/pull/23 + in appendPatch newer (pkgs.fetchpatch { + url = "https://github.com/Philonous/d-bus/commit/e5f37900a3a301c41d98bdaa134754894c705681.patch"; + sha256 = "6rQ7H9t483sJe1x95yLPAZ0BKTaRjgqQvvrQv7HkJRE="; + }); + # * The standard libraries are compiled separately. # * We need multiple patches from master to fix compilation with # updated dependencies (haskeline and megaparsec) which can be @@ -777,7 +796,13 @@ self: super: { # https://github.com/haskell-hvr/cryptohash-sha256/issues/11 # Jailbreak is necessary to break out of tasty < 1.x dependency. - cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256); + # hackage2nix generates this as a broken package due to the (fake) dependency + # missing from hackage, so we need to fix the meta attribute set. + cryptohash-sha256 = overrideCabal super.cryptohash-sha256 (drv: { + jailbreak = true; + broken = false; + hydraPlatforms = pkgs.lib.platforms.all; + }); # The test suite has all kinds of out-dated dependencies, so it feels easier # to just disable it. @@ -1148,6 +1173,15 @@ self: super: { sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; }); + # Pick patch from 1.6.0 which allows compilation with doctest 0.18 + polysemy = appendPatches super.polysemy [ + (pkgs.fetchpatch { + name = "allow-doctest-0.18.patch"; + url = "https://github.com/polysemy-research/polysemy/commit/dbcf851eb69395ce3143ecf2dd616dcad953a339.patch"; + sha256 = "1qf5pghc8p1glwaadkr95x12d74vhb98mg8dqwilyxbc6gq763w2"; + }) + ]; + # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) # This upstream issue is relevant: # https://github.com/polysemy-research/polysemy/issues/322 @@ -1231,6 +1265,12 @@ self: super: { gi-cairo-render = doJailbreak super.gi-cairo-render; gi-cairo-connector = doJailbreak super.gi-cairo-connector; + # Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged. + svgcairo = appendPatch super.svgcairo (pkgs.fetchpatch { + url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch"; + sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh"; + }); + # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; @@ -1272,7 +1312,7 @@ self: super: { })) (drv: { patches = [ ./patches/graphql-engine-mapkeys.patch ]; doHaddock = false; - version = "2.0.7"; + version = "2.0.9"; }); hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: { hspec = dontCheck self.hspec_2_8_3; @@ -1939,4 +1979,12 @@ EOT # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205 hls-stylish-haskell-plugin = doJailbreak super.hls-stylish-haskell-plugin; + # 2021-09-29: unnecessary lower bound on generic-lens + hw-ip = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; + doJailbreak super.hw-ip; + hw-eliasfano = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; + doJailbreak super.hw-eliasfano; + hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; + doJailbreak super.hw-xml; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index eac85d6b7a..1e8f3254af 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -58,7 +58,6 @@ self: super: { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; hackage-security = doJailbreak super.hackage-security; - hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); @@ -69,6 +68,7 @@ self: super: { resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; split = doJailbreak super.split; + splitmix = doJailbreak super.splitmix; tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; vector = doJailbreak (dontCheck super.vector); @@ -87,7 +87,11 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. + # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x + # Tests fail because random hasn't been updated for GHC 9.2.x + hashable = dontCheck super.hashable_1_3_3_0; + + # Tests fail because random hasn't been updated for GHC 9.2.x unordered-containers = dontCheck super.unordered-containers; # The test suite seems pretty broken. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6a7605d20c..42a4e30298 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3,6 +3,7 @@ broken-packages: - 3d-graphics-examples - 3dmodels - AAI + - abacate - abcnotation - abeson - abides @@ -32,6 +33,7 @@ broken-packages: - acme-hq9plus - acme-http - acme-inator + - acme-io - acme-kitchen-sink - acme-left-pad - acme-memorandom @@ -69,6 +71,7 @@ broken-packages: - aern2-mp - AERN-Basics - aeson-applicative + - aeson-bson - aeson-decode - aeson-diff-generic - aeson-filthy @@ -89,6 +92,7 @@ broken-packages: - affection - affine-invariant-ensemble-mcmc - Agata + - Agda-executable - agda-language-server - agda-snippets - agda-unused @@ -113,11 +117,13 @@ broken-packages: - align-text - ally-invest - alphachar + - alpino-tools - alsa - alsa-midi - altcomposition - alternative-extra - alternative-io + - altfloat - alto - alure - amazon-emailer @@ -234,6 +240,7 @@ broken-packages: - AttoBencode - atto-lisp - attomail + - attoparsec-csv - attoparsec-text - attoparsec-trans - attosplit @@ -251,6 +258,7 @@ broken-packages: - autonix-deps - autopack - avatar-generator + - aviation-cessna172-diagrams - avl-static - avr-shake - awesome-prelude @@ -285,9 +293,11 @@ broken-packages: - barchart - barcodes-code128 - barecheck + - barley - barrie - barrier - barrier-monad + - base58address - base62 - base64-conduit - base-compat-migrate @@ -295,6 +305,7 @@ broken-packages: - base-feature-macros - base-generics - base-io-access + - basen - basex-client - basic - basic-sop @@ -374,6 +385,7 @@ broken-packages: - bind-marshal - bindynamic - binembed + - binsm - bio - BiobaseNewick - biocore @@ -403,6 +415,7 @@ broken-packages: - blaze-json - blazeT - blaze-textual-native + - ble - bliplib - blockchain - blockhash @@ -431,6 +444,7 @@ broken-packages: - bottom - bounded-array - bound-extras + - box - braid - brain-bleep - Bravo @@ -567,6 +581,8 @@ broken-packages: - Cascade - cascading - caseof + - casr-logbook + - casr-logbook-types - Cassava - cassava-conduit - cassava-records @@ -581,6 +597,7 @@ broken-packages: - cautious-gen - cayene-lpp - cayley-client + - cblrepo - CCA - CC-delcont-cxe - CC-delcont-exc @@ -744,6 +761,7 @@ broken-packages: - composition-tree - comprehensions-ghc - compressed + - compression - compstrat - comptrans - computational-geometry @@ -848,6 +866,7 @@ broken-packages: - crc16 - crdt-event-fold - creatur + - credentials - credential-store - critbit - criterion-compare @@ -889,6 +908,7 @@ broken-packages: - CurryDB - curryer-rpc - curry-frontend + - curryrs - curves - custom-prelude - CV @@ -906,6 +926,7 @@ broken-packages: - darcs-monitor - darkplaces-rcon - darkplaces-text + - data-accessor-monadLib - data-accessor-monads-tf - data-aviary - data-base @@ -968,7 +989,6 @@ broken-packages: - dbmigrations-mysql - dbmigrations-postgresql - dbmigrations-sqlite - - d-bus - DBus - dbus-core - dbus-qq @@ -992,6 +1012,7 @@ broken-packages: - deepseq-magic - deepseq-th - deep-transformations + - definitive-base - deka - Delta-Lambda - delude @@ -1047,6 +1068,7 @@ broken-packages: - diffcabal - differential - DifferentialEvolution + - diff-gestalt - diffmap - difftodo - digestive-bootstrap @@ -1059,7 +1081,6 @@ broken-packages: - digits - DimensionalHash - dimensional-tf - - diohsc - diophantine - direct-binary-files - directed-cubical @@ -1165,6 +1186,7 @@ broken-packages: - dzen-dhall - dzen-utils - each + - eager-sockets - earclipper - early - easy-api @@ -1185,6 +1207,7 @@ broken-packages: - edit-lenses - editline - effect-handlers + - effective-aspects - effect-monad - effect-stack - effin @@ -1210,6 +1233,7 @@ broken-packages: - elision - elm-street - elm-websocket + - elocrypt - emacs-module - emailaddress - email-header @@ -1264,6 +1288,7 @@ broken-packages: - estimators - EstProgress - Etage + - etcd - eternal - ethereum-rlp - euphoria @@ -1456,6 +1481,7 @@ broken-packages: - fpco-api - FPretty - fptest + - fquery - Fractaler - fractals - fraction @@ -1580,6 +1606,7 @@ broken-packages: - GeocoderOpenCage - geodetics - geodetic-types + - GeoIp - geojson-types - geom2d - GeomPredicates-SSE @@ -1599,6 +1626,7 @@ broken-packages: - ghc-events-analyze - ghc-events-parallel - ghc-generic-instances + - ghc-hotswap - ghci-diagrams - ghci-haskeline - ghci-history-parser @@ -1627,6 +1655,7 @@ broken-packages: - ghc-tcplugin-api - ghc-time-alloc-prof - ghc-usage + - ghc-vis - gh-labeler - giak - Gifcurry @@ -1687,6 +1716,7 @@ broken-packages: - gochan - godot-haskell - gofer-prelude + - gogol-core - gooey - google-cloud - GoogleCodeJam @@ -1729,11 +1759,14 @@ broken-packages: - graql - grasp - gray-code + - graylog - greencard - greg-client - gremlin-haskell - Grempa - grenade + - greplicate + - gridfs - grm - groot - gross @@ -1749,6 +1782,7 @@ broken-packages: - gstreamer - GTALib - gtfs-realtime + - gtk2hs-cast-th - gtk2hs-hello - gtk2hs-rpn - gtk3-mac-integration @@ -1805,6 +1839,7 @@ broken-packages: - hakyll-contrib - hakyll-contrib-csv - hakyll-contrib-elm + - hakyll-contrib-i18n - hakyll-contrib-links - hakyll-dhall - hakyll-dir-list @@ -1856,6 +1891,7 @@ broken-packages: - HaPy - haquery - harchive + - HARM - haroonga - harpy - harvest-api @@ -1875,6 +1911,8 @@ broken-packages: - hashtables-plus - hasim - hask + - haskades + - haskanoid - haskbot-core - haskeline-class - haskelisp @@ -1962,6 +2000,7 @@ broken-packages: - hastache - haste - haste-prim + - hat - hatex-guide - hats - hatt @@ -2064,6 +2103,8 @@ broken-packages: - hfractal - HFrequencyQueue - hfusion + - HGamer3D + - HGamer3D-Data - hg-buildpackage - hgdbmi - HGE2D @@ -2162,6 +2203,7 @@ broken-packages: - hmumps - hnetcdf - hnn + - hnop - hoauth - hobbes - hocilib @@ -2169,6 +2211,7 @@ broken-packages: - hodatime - HODE - hoe + - hofix-mtl - hog - hogg - hois @@ -2459,6 +2502,7 @@ broken-packages: - ihaskell-parsec - ihaskell-widgets - illuminate + - imagemagick - imagepaste - imapget - imgur @@ -2499,6 +2543,8 @@ broken-packages: - integreat - intel-aes - intensional-datatys + - interleavableGen + - interleavableIO - interlude-l - internetmarke - intero @@ -2580,6 +2626,7 @@ broken-packages: - join-api - joinlist - jonathanscard + - jort - jpeg - jsaddle-hello - jsaddle-wkwebview @@ -2598,6 +2645,7 @@ broken-packages: - json-pointer-hasql - json-pointy - json-python + - json-qq - jsonresume - json-rpc-client - json-schema @@ -2638,6 +2686,7 @@ broken-packages: - kd-tree - keccak - keera-hails-reactivevalues + - keiretsu - kempe - kerry - Ketchup @@ -2650,6 +2699,7 @@ broken-packages: - kmonad - kmp-dfa - koellner-phonetic + - Konf - kontra-config - kparams - kraken @@ -2669,6 +2719,7 @@ broken-packages: - lambda2js - lambdaBase - lambdabot-utils + - lambdabot-xmpp - lambda-bridge - lambda-canvas - lambdacms-core @@ -2711,6 +2762,7 @@ broken-packages: - language-vhdl - language-webidl - lapack-ffi + - LargeCardinalHierarchy - Lastik - latest-npm-version - latex-formulae-image @@ -2728,6 +2780,7 @@ broken-packages: - lazyset - LazyVault - l-bfgs-b + - lcs - lda - ldif - ld-intervals @@ -2981,6 +3034,7 @@ broken-packages: - mega-sdist - mellon-core - melody + - memcached - memcached-binary - memcache-haskell - memis @@ -3024,6 +3078,7 @@ broken-packages: - miku - milena - mime-directory + - MiniAgda - miniforth - minilens - minilight @@ -3148,6 +3203,7 @@ broken-packages: - mtp - MuCheck - mud + - mudbath - muesli - mu-graphql - mulang @@ -3172,6 +3228,7 @@ broken-packages: - musicScroll - music-util - musicxml + - mustache2hs - mustache-haskell - mvar-lock - mvc @@ -3194,6 +3251,7 @@ broken-packages: - named-servant-server - named-sop - namelist + - nanoAgda - nanocurses - nano-hmac - nano-md5 @@ -3204,6 +3262,7 @@ broken-packages: - nanovg-simple - nanq - naperian + - Naperian - naqsha - narc - nationstates @@ -3243,6 +3302,7 @@ broken-packages: - network-bitcoin - network-builder - network-bytestring + - network-dbus - network-dns - networked-game - network-house @@ -3291,6 +3351,7 @@ broken-packages: - nlp-scores - nm - NMap + - nme - nntp - noether - nofib-analyse @@ -3300,6 +3361,7 @@ broken-packages: - NonEmpty - nonempty-lift - non-empty-zipper + - noodle - no-role-annots - notcpp - not-gloss-examples @@ -3348,6 +3410,7 @@ broken-packages: - OGL - ogmarkup - oi + - old-version - om-actor - omaketex - ombra @@ -3381,12 +3444,17 @@ broken-packages: - OpenCL - OpenCLRaw - OpenCLWrappers + - opencog-atomspace - opencv-raw - opendatatable + - openexchangerates + - openflow - opengles + - OpenGLRaw21 - open-haddock - openid-connect - open-pandoc + - openpgp - open-signals - opensoundcontrol-ht - openssh-protocol @@ -3448,6 +3516,7 @@ broken-packages: - pacman-memcache - pads-haskell - pagarme + - pagerduty - pagure-hook-receiver - Paillier - palette @@ -3592,6 +3661,7 @@ broken-packages: - phasechange - phaser - phoityne + - phone-metadata - phone-numbers - phone-push - phonetic-languages-plus @@ -3653,6 +3723,7 @@ broken-packages: - plex - plist - plist-buddy + - plivo - plot-gtk - plot-gtk3 - plot-gtk-ui @@ -3678,14 +3749,16 @@ broken-packages: - poly-cont - poly-control - polydata-core + - polynom - polynomial - - polysemy + - polysemy-plugin - polysemy-zoo - polytypeable - pomaps - pomohoro - ponder - pong-server + - pontarius-xpmn - pool - pool-conduit - pop3-client @@ -3702,6 +3775,7 @@ broken-packages: - posplyu - postcodes - postgres-embedded + - PostgreSQL - postgresql-lo-stream - postgresql-named - postgresql-resilient @@ -3728,6 +3802,7 @@ broken-packages: - pqc - praglude - preamble + - precis - precursor - predicate-class - predicate-typed @@ -3817,6 +3892,7 @@ broken-packages: - pubsub - pugixml - pugs-DrIFT + - pugs-HsSyck - PUH-Project - Pup-Events-Server - pure-io @@ -3844,6 +3920,7 @@ broken-packages: - qnap-decrypt - qr-imager - qsem + - qt - QuadEdge - QuadTree - quantfin @@ -3852,6 +3929,7 @@ broken-packages: - quarantimer - qudb - quenya-verb + - querystring-pickle - questioner - QuickAnnotate - quickbooks @@ -4002,6 +4080,7 @@ broken-packages: - remote - remote-debugger - remote-monad + - reorderable - reorder-expression - repa-algorithms - repa-bytestring @@ -4030,6 +4109,7 @@ broken-packages: - resource-embed - restartable - restyle + - resumable-exceptions - rethinkdb - rethinkdb-client-driver - rethinkdb-wereHamster @@ -4041,6 +4121,8 @@ broken-packages: - rfc - rfc-prelude - rhbzquery + - riak + - riak-protobuf-lens - ribbit - ribosome - RichConditional @@ -4158,12 +4240,14 @@ broken-packages: - ScratchFs - script-monad - scrobble + - scrz - scythe - scyther-proof - sdl2-cairo-image - sdl2-compositor - sdl2-fps - sdr + - seacat - seakale - sec - secdh @@ -4259,6 +4343,7 @@ broken-packages: - setters - set-with - sexp + - sexpresso - sexpr-parser - sext - SFML @@ -4270,6 +4355,7 @@ broken-packages: - sh2md - shade - shadower + - shady-gen - shake-bindist - shakebook - shake-cabal @@ -4316,7 +4402,9 @@ broken-packages: - simple-css - simple-download - simple-eval + - simple-form - simple-genetic-algorithm + - SimpleH - simple-index - simpleirc - simple-logging @@ -4345,6 +4433,7 @@ broken-packages: - singnal - singular-factory - sink + - Sit - sitepipe - sixfiguregroup - sized-grid @@ -4417,6 +4506,7 @@ broken-packages: - snaplet-ses-html - snaplet-sqlite-simple - snaplet-typed-sessions + - snap-predicates - snappy-conduit - snap-routes - snap-stream @@ -4555,6 +4645,7 @@ broken-packages: - Strafunski-ATermLib - Strafunski-StrategyLib - StrappedTemplates + - StrategyLib - stratum-tool - stratux-types - stream @@ -4623,7 +4714,6 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - svgcairo - svgutils - svm-light-utils - svm-simple @@ -4639,6 +4729,12 @@ broken-packages: - syb-extras - SybWidget - syb-with-class-instances-text + - sydtest-aeson + - sydtest-hedis + - sydtest-mongo + - sydtest-persistent-postgresql + - sydtest-rabbitmq + - sydtest-yesod - syfco - sym - symantic @@ -4750,6 +4846,7 @@ broken-packages: - testpack - testpattern - test-pkg + - testPkg - testrunner - test-sandbox - test-shouldbe @@ -4923,7 +5020,9 @@ broken-packages: - tropical - tropical-geometry - true-name + - trust-chain - tsession + - tslib - tsparse - tsp-viz - tsuntsun @@ -4946,6 +5045,7 @@ broken-packages: - twilio - twine - twirp + - twisty - twitter - twitter-feed - tx @@ -4983,6 +5083,7 @@ broken-packages: - type-unary - typograffiti - tyro + - uAgda - uberlast - ucam-webauth-types - ucd @@ -5216,6 +5317,7 @@ broken-packages: - webshow - websockets-rpc - webwire + - wedged - WEditor - weekdaze - weighted-regexp @@ -5246,6 +5348,7 @@ broken-packages: - wol - word2vec-model - wordify + - Wordlint - wordlist - WordNet - WordNet-ghc74 @@ -5293,6 +5396,7 @@ broken-packages: - xlsx-templater - xml2json - xml-conduit-decode + - xml-conduit-parse - xml-conduit-selectors - xml-conduit-stylist - xml-html-conduit-lens @@ -5328,6 +5432,7 @@ broken-packages: - yall - yam-app - yam-config + - yamlkeysdiff - yaml-pretty-extras - YamlReference - yaml-rpc @@ -5410,6 +5515,7 @@ broken-packages: - Yogurt - yst - yu-core + - yuiGrid - yu-tool - yxdb-utils - z3-encoding @@ -5436,6 +5542,7 @@ broken-packages: - zm - ZMachine - zmidi-score + - zmqat - zoneinfo - zoom - zoom-refs diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2b4ffb3c4e..796d1f3dc3 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.4 +compiler: ghc-8.10.7 core-packages: - array-0.5.4.0 @@ -150,6 +150,21 @@ package-maintainers: domenkozar: - cachix - cachix-api + dschrempf: + - circular + - covariance + - dirichlet + - elynx + - elynx-markov + - elynx-nexus + - elynx-seq + - elynx-tools + - elynx-tree + - glasso + - mcmc + - pava + - slynx + - tlynx expipiplus1: - VulkanMemoryAllocator - autoapply @@ -224,28 +239,35 @@ package-maintainers: - mattermost-api-qc - Unique maralorn: - - arbtt - cabal-fmt - generic-optics - ghcup + - ghcid - ghcide - haskell-language-server - hedgehog - hlint - hmatrix + - hspec-discover - iCalendar - matrix-client - neuron - optics + - paths + - postgresql-simple - reflex-dom - releaser + - replace-megaparsec - req - shake-bench - shh + - shh-extras - snap - stm-containers - streamly - taskwarrior + - tz + - weeder - witch ncfavier: - lambdabot @@ -395,8 +417,10 @@ unsupported-platforms: HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms HSoM: [ x86_64-darwin, aarch64-darwin ] iwlib: [ x86_64-darwin, aarch64-darwin ] + Jazzkell: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ] kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API + Kulitta: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea LambdaHack: [ x86_64-darwin, aarch64-darwin ] large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 libmodbus: [ x86_64-darwin, aarch64-darwin ] diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index ead6c306ed..e70544411c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -136,6 +136,7 @@ dont-distribute-packages: - GrammarProducts - GraphHammer - GraphHammer-examples + - Grow - GrowlNotify - Gtk2hsGenerics - GtkGLTV @@ -147,8 +148,22 @@ dont-distribute-packages: - HAppS-Server - HAppS-State - HGamer3D-API + - HGamer3D-Audio + - HGamer3D-Bullet-Binding - HGamer3D-CAudio-Binding + - HGamer3D-CEGUI-Binding + - HGamer3D-Common + - HGamer3D-Enet-Binding + - HGamer3D-GUI + - HGamer3D-Graphics3D + - HGamer3D-InputSystem + - HGamer3D-Network - HGamer3D-OIS-Binding + - HGamer3D-Ogre-Binding + - HGamer3D-SDL2-Binding + - HGamer3D-SFML-Binding + - HGamer3D-WinEvent + - HGamer3D-Wire - HJScript - HLearn-algebra - HLearn-approximation @@ -156,6 +171,7 @@ dont-distribute-packages: - HLearn-datastructures - HLearn-distributions - HNM + - HPhone - HPlot - HPong - HROOT @@ -445,7 +461,6 @@ dont-distribute-packages: - apotiki - approx-rand-test - arbor-monad-metric-datadog - - arch-hs - archlinux-web - arduino-copilot - arff @@ -474,6 +489,7 @@ dont-distribute-packages: - atuin - audiovisual - aura + - aura_3_2_6 - authoring - autonix-deps-kf5 - avers @@ -582,7 +598,6 @@ dont-distribute-packages: - blatex - blaze-builder-enumerator - blaze-colonnade - - ble - blink1 - blip - blogination @@ -602,6 +617,8 @@ dont-distribute-packages: - boots-web - borel - bowntz + - box-csv + - box-socket - breakout - bricks - bricks-internal-test @@ -659,6 +676,13 @@ dont-distribute-packages: - casadi-bindings-ipopt-interface - casadi-bindings-snopt-interface - cash + - casr-logbook-html + - casr-logbook-meta + - casr-logbook-meta-html + - casr-logbook-reports + - casr-logbook-reports-html + - casr-logbook-reports-meta + - casr-logbook-reports-meta-html - cassandra-cql - cassandra-thrift - cassy @@ -698,6 +722,7 @@ dont-distribute-packages: - chromatin - chronos_1_1_3 - chu2 + - chuchu - chunks - ciphersaber2 - citation-resolve @@ -824,6 +849,7 @@ dont-distribute-packages: - craftwerk-cairo - craftwerk-gtk - craze + - credentials-cli - crf-chain1 - crf-chain1-constrained - crf-chain2-generic @@ -897,7 +923,11 @@ dont-distribute-packages: - deeplearning-hs - deepzoom - defargs + - definitive-filesystem - definitive-graphics + - definitive-parser + - definitive-reactive + - definitive-sound - deka-tests - delaunay - delicious @@ -917,7 +947,6 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs - - di-polysemy - dia-functions - diagrams-haddock - diagrams-html5 @@ -1194,7 +1223,6 @@ dont-distribute-packages: - ghc-instances - ghc-mod - ghc-tags-plugin - - ghc-vis - ghci-pretty - ghcjs-hplay - ght @@ -1235,6 +1263,188 @@ dont-distribute-packages: - goal-probability - goal-simulation - goat + - gogol + - gogol-abusiveexperiencereport + - gogol-acceleratedmobilepageurl + - gogol-accessapproval + - gogol-accesscontextmanager + - gogol-adexchange-buyer + - gogol-adexchange-seller + - gogol-adexchangebuyer2 + - gogol-adexperiencereport + - gogol-admin-datatransfer + - gogol-admin-directory + - gogol-admin-emailmigration + - gogol-admin-reports + - gogol-adsense + - gogol-adsense-host + - gogol-affiliates + - gogol-alertcenter + - gogol-analytics + - gogol-analyticsreporting + - gogol-android-enterprise + - gogol-android-publisher + - gogol-androiddeviceprovisioning + - gogol-androidmanagement + - gogol-appengine + - gogol-apps-activity + - gogol-apps-calendar + - gogol-apps-licensing + - gogol-apps-reseller + - gogol-apps-tasks + - gogol-appstate + - gogol-autoscaler + - gogol-bigquery + - gogol-bigquerydatatransfer + - gogol-bigtableadmin + - gogol-billing + - gogol-binaryauthorization + - gogol-blogger + - gogol-books + - gogol-chat + - gogol-civicinfo + - gogol-classroom + - gogol-cloudasset + - gogol-clouderrorreporting + - gogol-cloudfunctions + - gogol-cloudidentity + - gogol-cloudiot + - gogol-cloudkms + - gogol-cloudmonitoring + - gogol-cloudprivatecatalog + - gogol-cloudprivatecatalogproducer + - gogol-cloudprofiler + - gogol-cloudscheduler + - gogol-cloudsearch + - gogol-cloudshell + - gogol-cloudtasks + - gogol-cloudtrace + - gogol-commentanalyzer + - gogol-composer + - gogol-compute + - gogol-consumersurveys + - gogol-container + - gogol-containeranalysis + - gogol-containerbuilder + - gogol-customsearch + - gogol-dataflow + - gogol-datafusion + - gogol-dataproc + - gogol-datastore + - gogol-debugger + - gogol-deploymentmanager + - gogol-dfareporting + - gogol-dialogflow + - gogol-digitalassetlinks + - gogol-discovery + - gogol-dlp + - gogol-dns + - gogol-docs + - gogol-doubleclick-bids + - gogol-doubleclick-search + - gogol-drive + - gogol-driveactivity + - gogol-factchecktools + - gogol-file + - gogol-firebase-dynamiclinks + - gogol-firebase-rules + - gogol-firebasehosting + - gogol-firebaseremoteconfig + - gogol-firestore + - gogol-fitness + - gogol-fonts + - gogol-freebasesearch + - gogol-fusiontables + - gogol-games + - gogol-games-configuration + - gogol-games-management + - gogol-genomics + - gogol-gmail + - gogol-groups-migration + - gogol-groups-settings + - gogol-healthcare + - gogol-iam + - gogol-iamcredentials + - gogol-iap + - gogol-identity-toolkit + - gogol-indexing + - gogol-jobs + - gogol-kgsearch + - gogol-language + - gogol-latencytest + - gogol-libraryagent + - gogol-logging + - gogol-manufacturers + - gogol-maps-coordinate + - gogol-maps-engine + - gogol-mirror + - gogol-ml + - gogol-monitoring + - gogol-oauth2 + - gogol-oslogin + - gogol-pagespeed + - gogol-partners + - gogol-people + - gogol-photoslibrary + - gogol-play-moviespartner + - gogol-playcustomapp + - gogol-plus + - gogol-plus-domains + - gogol-poly + - gogol-prediction + - gogol-proximitybeacon + - gogol-pubsub + - gogol-qpxexpress + - gogol-redis + - gogol-remotebuildexecution + - gogol-replicapool + - gogol-replicapool-updater + - gogol-resourcemanager + - gogol-resourceviews + - gogol-run + - gogol-runtimeconfig + - gogol-safebrowsing + - gogol-script + - gogol-searchconsole + - gogol-securitycenter + - gogol-servicebroker + - gogol-serviceconsumermanagement + - gogol-servicecontrol + - gogol-servicemanagement + - gogol-servicenetworking + - gogol-serviceusage + - gogol-serviceuser + - gogol-sheets + - gogol-shopping-content + - gogol-siteverification + - gogol-slides + - gogol-sourcerepo + - gogol-spanner + - gogol-spectrum + - gogol-speech + - gogol-sqladmin + - gogol-storage + - gogol-storage-transfer + - gogol-streetviewpublish + - gogol-surveys + - gogol-tagmanager + - gogol-taskqueue + - gogol-testing + - gogol-texttospeech + - gogol-toolresults + - gogol-tpu + - gogol-tracing + - gogol-translate + - gogol-urlshortener + - gogol-useraccounts + - gogol-vault + - gogol-videointelligence + - gogol-vision + - gogol-webmaster-tools + - gogol-websecurityscanner + - gogol-youtube + - gogol-youtube-analytics + - gogol-youtube-reporting - google-drive - google-mail-filters - google-maps-geocoding @@ -1288,6 +1498,7 @@ dont-distribute-packages: - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs + - gtk2hs-cast-gtk - gtk2hs-cast-gtkglext - gtk2hs-cast-gtksourceview2 - gtkimageview @@ -1691,6 +1902,7 @@ dont-distribute-packages: - hylotab - hyloutils - hyperpublic + - iException - ice40-prim - ide-backend - ide-backend-common @@ -1789,6 +2001,7 @@ dont-distribute-packages: - jobs-ui - join - jot + - jsc - jsmw - json-ast-json-encoder - json-autotype @@ -1867,6 +2080,7 @@ dont-distribute-packages: - lambdaFeed - lambdaLit - lambdabot-zulip + - lambdacat - lambdacms-media - lambdacube - lambdacube-bullet @@ -2027,7 +2241,9 @@ dont-distribute-packages: - majordomo - majority - manatee + - manatee-all - manatee-anything + - manatee-browser - manatee-core - manatee-curl - manatee-editor @@ -2037,6 +2253,7 @@ dont-distribute-packages: - manatee-mplayer - manatee-pdfviewer - manatee-processmanager + - manatee-reader - manatee-template - manatee-terminal - manatee-welcome @@ -2239,6 +2456,7 @@ dont-distribute-packages: - online-csv - open-adt-tutorial - open-union + - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys - opentracing-jaeger @@ -2342,36 +2560,12 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu - - polysemy-chronos - - polysemy-conc - - polysemy-extra - - polysemy-fs - - polysemy-fskvstore - polysemy-http - - polysemy-keyed-state - - polysemy-kvstore - - polysemy-kvstore-jsonfile - - polysemy-log - polysemy-log-co - - polysemy-log-di - - polysemy-methodology - polysemy-methodology-co-log - - polysemy-methodology-composite - - polysemy-mocks - polysemy-optics - - polysemy-path - - polysemy-plugin - - polysemy-plugin_0_4_0_0 - polysemy-readline - - polysemy-req - polysemy-resume - - polysemy-several - - polysemy-socket - - polysemy-test - - polysemy-time - - polysemy-uncontrolled - - polysemy-video - - polysemy-vinyl - polysemy-webserver - polyseq - polytypeable-utils @@ -2607,6 +2801,7 @@ dont-distribute-packages: - rio-process-pool - riot - ripple + - ripple-federation - risc-v - rivet - rlwe-challenges @@ -2738,6 +2933,7 @@ dont-distribute-packages: - sgf - sgrep - sha1 + - shady-graphics - shake-ats - shake-minify-css - shaker @@ -2840,6 +3036,7 @@ dont-distribute-packages: - sphero - sphinx-cli - spice + - spike - spline3 - splines - sprinkles @@ -2913,6 +3110,7 @@ dont-distribute-packages: - swapper - sweet-egison - switch + - sydtest-amqp - sylvia - sym-plot - symantic-atom @@ -2971,6 +3169,7 @@ dont-distribute-packages: - test-sandbox-quickcheck - test-simple - testbench + - text-json-qq - text-plus - text-trie - text-xml-generic @@ -3178,6 +3377,7 @@ dont-distribute-packages: - wavy - web-mongrel2 - web-page + - web-rep - web-routes-regular - web-routing - web3 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index f87aee89d4..6de0149a99 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -140,10 +140,6 @@ self: super: builtins.intersectAttrs super { # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; - # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; - websnap = super.websnap.override { webkit = pkgs.webkitgtk24x-gtk3; }; - hs-mesos = overrideCabal super.hs-mesos (drv: { # Pass _only_ mesos; the correct protobuf is propagated. extraLibraries = [ pkgs.mesos ]; @@ -212,7 +208,19 @@ self: super: builtins.intersectAttrs super { mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; # Help the test suite find system timezone data. - tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + tz = overrideCabal super.tz (drv: { + preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; + patches = [ + # Fix tests failing with libSystem, musl etc. due to a lack of + # support for glibc's non-POSIX TZDIR environment variable. + # https://github.com/nilcons/haskell-tz/pull/29 + (pkgs.fetchpatch { + name = "support-non-glibc-tzset.patch"; + url = "https://github.com/sternenseemann/haskell-tz/commit/64928f1a50a1a276a718491ae3eeef63abcdb393.patch"; + sha256 = "1f53w8k1vpy39hzalyykpvm946ykkarj2714w988jdp4c2c4l4cf"; + }) + ] ++ (drv.patches or []); + }); # Nix-specific workaround xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; @@ -824,6 +832,12 @@ self: super: builtins.intersectAttrs super { export HOME=$TMPDIR/home ''; }); + hls-rename-plugin = overrideCabal super.hls-rename-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + '' + (drv.preCheck or ""); + }); hls-splice-plugin = overrideCabal super.hls-splice-plugin (drv: { testToolDepends = [ pkgs.git ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index f2747b6a54..e3a3f9ff60 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -778,7 +778,6 @@ self: { ]; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "Agata" = callPackage @@ -830,7 +829,6 @@ self: { executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; @@ -846,6 +844,7 @@ self: { description = "Command-line program for type-checking and compiling Agda programs"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "AhoCorasick" = callPackage @@ -2284,7 +2283,6 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Delimited continuations and dynamically scoped variables"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "CC-delcont-alt" = callPackage @@ -3850,7 +3848,6 @@ self: { ]; description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "CurryDB" = callPackage @@ -7169,6 +7166,7 @@ self: { description = "Pure bindings for the MaxMind IP database"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "GeocoderOpenCage" = callPackage @@ -7799,6 +7797,7 @@ self: { description = "A simple ARM emulator in haskell"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HAppS-Data" = callPackage @@ -8219,6 +8218,7 @@ self: { description = "Toolset for the Haskell Game Programmer"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HGamer3D-API" = callPackage @@ -8329,6 +8329,7 @@ self: { description = "Toolset for the Haskell Game Programmer - Data Definitions"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HGamer3D-Enet-Binding" = callPackage @@ -11360,7 +11361,6 @@ self: { ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "Interpolation-maxs" = callPackage @@ -11372,7 +11372,6 @@ self: { libraryHaskellDepends = [ base syb template-haskell ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "IntervalMap" = callPackage @@ -11583,7 +11582,9 @@ self: { libraryHaskellDepends = [ base Euterpea random ]; description = "Library for modeling jazz improvisation"; license = "unknown"; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "Jdh" = callPackage @@ -12073,6 +12074,7 @@ self: { description = "A configuration language and a parser"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Kriens" = callPackage @@ -12101,7 +12103,9 @@ self: { ]; description = "Library for automated composition and musical learning"; license = "unknown"; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "KyotoCabinet" = callPackage @@ -12480,6 +12484,7 @@ self: { description = "A transfinite cardinal arithmetic library including all known large cardinals"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Lastik" = callPackage @@ -13514,6 +13519,7 @@ self: { description = "A toy dependently typed programming language with type-based termination"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "MissingH" = callPackage @@ -14275,6 +14281,7 @@ self: { description = "Naperian Functors for APL-like programming"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "NaperianNetCDF" = callPackage @@ -14436,7 +14443,6 @@ self: { ]; description = "High-level abstraction over 9P protocol"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "NewBinary" = callPackage @@ -15175,6 +15181,7 @@ self: { description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "OpenSCAD" = callPackage @@ -16066,6 +16073,7 @@ self: { description = "Thin wrapper over the C postgresql library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Prelude" = callPackage @@ -18738,6 +18746,7 @@ self: { description = "A light, clean and powerful Haskell utility library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "SimpleLog" = callPackage @@ -18812,6 +18821,7 @@ self: { description = "Prototypical type checker for Type Theory with Sized Natural Numbers"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "SizeCompare" = callPackage @@ -19416,6 +19426,7 @@ self: { libraryHaskellDepends = [ base mtl ]; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Stream" = callPackage @@ -20738,7 +20749,6 @@ self: { testToolDepends = [ c2hs ]; description = "ViennaRNA v2 bindings"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "ViennaRNA-extras" = callPackage @@ -21440,6 +21450,7 @@ self: { description = "Plaintext prose redundancy linter"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Workflow" = callPackage @@ -22212,6 +22223,7 @@ self: { description = "Parser for a language similar to Cucumber's Gherkin"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "abc-puzzle" = callPackage @@ -23454,6 +23466,7 @@ self: { description = "The only true way to do IO in Haskell!"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "acme-iot" = callPackage @@ -24482,6 +24495,7 @@ self: { description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aeson-casing" = callPackage @@ -25331,8 +25345,8 @@ self: { }: mkDerivation { pname = "aeson-via"; - version = "0.1.1"; - sha256 = "18b1pxvkrva6531v8x38vhqmyj48iddi49vgc79s0jx8sgb39l8d"; + version = "0.1.2"; + sha256 = "1dm90xx57c5d7x55zdq57pm78v1phii8gkb92y9nzvjjq5y6galy"; libraryHaskellDepends = [ aeson aeson-casing base newtype-generics text ]; @@ -26863,6 +26877,7 @@ self: { description = "Alpino data manipulation tools"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "alsa" = callPackage @@ -27110,6 +27125,7 @@ self: { description = "Alternative floating point support for GHC"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "alto" = callPackage @@ -32365,7 +32381,7 @@ self: { ]; description = "Automatic Rule-Based Time Tracker"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ maralorn rvl ]; + maintainers = with lib.maintainers; [ rvl ]; }) {}; "arcgrid" = callPackage @@ -32430,7 +32446,6 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "arch-web" = callPackage @@ -35260,6 +35275,7 @@ self: { description = "A parser for CSV files that uses Attoparsec"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "attoparsec-data" = callPackage @@ -35664,6 +35680,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aura_3_2_6" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring + , containers, filepath, hashable, http-client, http-client-tls + , http-types, language-bash, megaparsec, network-uri + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers + , typed-process, versions + }: + mkDerivation { + pname = "aura"; + version = "3.2.6"; + sha256 = "07sry2nf41f101ldcfcf2x5pp0w7qvlvl6m4j5bbkvxp3rmsjbx2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson algebraic-graphs aur base bytestring containers filepath + hashable http-client http-types language-bash megaparsec + network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler + stm text time transformers typed-process versions + ]; + executableHaskellDepends = [ + aeson aur base bytestring containers http-client http-client-tls + megaparsec optparse-applicative prettyprinter + prettyprinter-ansi-terminal rio scheduler text transformers + typed-process versions + ]; + testHaskellDepends = [ + base bytestring containers megaparsec rio tasty tasty-hunit text + versions + ]; + description = "A secure package manager for Arch Linux and the AUR"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, html-conduit, http-conduit @@ -36147,6 +36198,7 @@ self: { description = "Diagrams for the Cessna 172 aircraft in aviation"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aviation-cessna172-weight-balance" = callPackage @@ -36289,6 +36341,8 @@ self: { pname = "avro"; version = "0.5.2.1"; sha256 = "0g10nbcxz5ff7rckbzwb4sxh1qqg6ay5zwakmlxrsfj9srg8dq2d"; + revision = "1"; + editedCabalFile = "14kq896191zvqnsl3hgfxlwi7ajvagrbsiv5l8hxckp5glh5825j"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -37734,7 +37788,6 @@ self: { executableHaskellDepends = [ base gd X11 ]; description = "braindead utility to compose Xinerama backgrounds"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "bag" = callPackage @@ -38150,6 +38203,7 @@ self: { description = "A web based environment for learning and tinkering with Haskell"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "barrie" = callPackage @@ -38593,6 +38647,7 @@ self: { description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base58string" = callPackage @@ -38789,7 +38844,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Base64 implementation for String's"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "base91" = callPackage @@ -38842,6 +38896,7 @@ self: { testToolDepends = [ tasty-discover ]; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "basen-bytestring" = callPackage @@ -42229,6 +42284,7 @@ self: { description = "binary files splitter and merger"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bio" = callPackage @@ -44229,6 +44285,7 @@ self: { description = "Bluetooth Low Energy (BLE) peripherals"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "blindpass" = callPackage @@ -45820,6 +45877,8 @@ self: { ]; description = "boxes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "box-csv" = callPackage @@ -45835,6 +45894,7 @@ self: { ]; description = "CSV parsing in a box"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "box-socket" = callPackage @@ -45857,6 +45917,7 @@ self: { ]; description = "Box websockets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "box-tuples" = callPackage @@ -46718,7 +46779,6 @@ self: { ]; description = "Mapping between BSON and algebraic data types"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "bspack" = callPackage @@ -48144,7 +48204,6 @@ self: { ]; description = "A type-class to convert values from ByteString"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-handle" = callPackage @@ -48960,6 +49019,8 @@ self: { pname = "cabal-cache"; version = "1.0.3.0"; sha256 = "0xx0a53z7wj75p8dqypr6ys63cpw8acl49358f42xi5lgblvqnca"; + revision = "1"; + editedCabalFile = "19dr9x78xfgb8jnbj1i23mhzqnvixgh1azyq5fvccm6h4pcbjfzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52052,6 +52113,7 @@ self: { description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "casr-logbook-html" = callPackage @@ -52211,6 +52273,7 @@ self: { description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cassandra-cql" = callPackage @@ -52805,6 +52868,7 @@ self: { description = "Tool to maintain a database of CABAL packages and their dependencies"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cbor-tool" = callPackage @@ -55527,6 +55591,7 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "circular_0_4_0_1" = callPackage @@ -55545,6 +55610,7 @@ self: { description = "Circular fixed-sized mutable vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "circus" = callPackage @@ -57186,7 +57252,6 @@ self: { libraryHaskellDepends = [ base natural-induction peano ]; description = "Counted list"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "clit" = callPackage @@ -57720,7 +57785,6 @@ self: { ]; description = "CMA-ES wrapper in Haskell"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "cmake-syntax" = callPackage @@ -59848,7 +59912,6 @@ self: { testHaskellDepends = [ base QuickCheck text ]; description = "CSV Parser & Producer"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "command" = callPackage @@ -61095,6 +61158,7 @@ self: { description = "Common compression algorithms"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "compstrat" = callPackage @@ -65297,6 +65361,7 @@ self: { testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; description = "Well-conditioned estimation of large-dimensional covariance matrices"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "coverage" = callPackage @@ -65612,7 +65677,6 @@ self: { ]; description = "Cassandra CQL binary protocol"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "cql-io" = callPackage @@ -66206,6 +66270,7 @@ self: { description = "Secure Credentials Storage and Distribution"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "credentials-cli" = callPackage @@ -66632,10 +66697,10 @@ self: { }: mkDerivation { pname = "cropty"; - version = "0.2.0.0"; - sha256 = "1skw80716qwsmdg1m55bl556xc8mmailzhz7m8psgaf2ggiys3jc"; + version = "0.3.1.0"; + sha256 = "1syffvzak02j5rha2wc61yjw9g98g0mqq2j2smv1ri8y0p43gdii"; libraryHaskellDepends = [ base binary bytestring cryptonite ]; - testHaskellDepends = [ base hedgehog unliftio ]; + testHaskellDepends = [ base binary hedgehog unliftio ]; description = "Encryption and decryption"; license = lib.licenses.mit; }) {}; @@ -68295,7 +68360,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "bindings to libcurl, the multiprotocol file transfer library"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "curly-expander" = callPackage @@ -68334,7 +68398,6 @@ self: { ]; description = "Types representing standard and non-standard currencies"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "currency-codes" = callPackage @@ -68501,6 +68564,7 @@ self: { description = "Easy to use FFI Bridge for using Rust in Haskell"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cursedcsv" = callPackage @@ -68865,8 +68929,6 @@ self: { ]; description = "Permissively licensed D-Bus client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "d10" = callPackage @@ -69508,6 +69570,7 @@ self: { description = "Accessor functions for monadLib's monads"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-accessor-monads-fd" = callPackage @@ -72613,7 +72676,6 @@ self: { libraryHaskellDepends = [ base directory filepath HSH ]; description = "Utilities to work with debian binary packages"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "debian-build" = callPackage @@ -73175,6 +73237,7 @@ self: { description = "The base modules of the Definitive framework"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "definitive-filesystem" = callPackage @@ -73714,7 +73777,6 @@ self: { ]; description = "Dependent finite maps (partial dependent products)"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "dependent-monoidal-map" = callPackage @@ -75559,7 +75621,6 @@ self: { ]; description = "DI logger wrapped for Polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "dia-base" = callPackage @@ -76427,6 +76488,7 @@ self: { description = "A diff algorithm based on recursive longest common substrings"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diff-parse" = callPackage @@ -77101,8 +77163,6 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diophantine" = callPackage @@ -77444,6 +77504,7 @@ self: { testHaskellDepends = [ base hspec log-domain mwc-random vector ]; description = "Multivariate Dirichlet distribution"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "dirichlet_0_1_0_5" = callPackage @@ -77461,6 +77522,7 @@ self: { description = "Multivariate Dirichlet distribution"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "dirstream" = callPackage @@ -82356,6 +82418,7 @@ self: { description = "Socket operations with timeouts"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eap" = callPackage @@ -83238,6 +83301,7 @@ self: { description = "A monadic embedding of aspect oriented programming"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "effective-aspects-mzv" = callPackage @@ -84017,7 +84081,6 @@ self: { libraryHaskellDepends = [ base elerea SDL ]; description = "Elerea FRP wrapper for SDL"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "elevator" = callPackage @@ -84247,7 +84310,6 @@ self: { ]; description = "A library to generate Elm types from Haskell source"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "elm-export-persistent" = callPackage @@ -84610,6 +84672,7 @@ self: { description = "Generate easy-to-remember, hard-to-guess passwords"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elsa" = callPackage @@ -84649,6 +84712,7 @@ self: { ]; description = "Validate and (optionally) redo ELynx analyses"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx_0_6_1_0" = callPackage @@ -84667,6 +84731,7 @@ self: { description = "Validate and (optionally) redo ELynx analyses"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-markov" = callPackage @@ -84688,6 +84753,7 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Simulate molecular sequences along trees"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-markov_0_6_1_0" = callPackage @@ -84710,6 +84776,7 @@ self: { description = "Simulate molecular sequences along trees"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-nexus" = callPackage @@ -84722,6 +84789,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-nexus_0_6_1_0" = callPackage @@ -84735,6 +84803,7 @@ self: { description = "Import and export Nexus files"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-seq" = callPackage @@ -84755,6 +84824,7 @@ self: { ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-seq_0_6_1_0" = callPackage @@ -84776,6 +84846,7 @@ self: { description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-tools" = callPackage @@ -84798,6 +84869,7 @@ self: { ]; description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-tools_0_6_1_0" = callPackage @@ -84818,6 +84890,7 @@ self: { description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-tree" = callPackage @@ -84843,6 +84916,7 @@ self: { ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "elynx-tree_0_6_1_0" = callPackage @@ -84871,6 +84945,7 @@ self: { description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "ema" = callPackage @@ -87211,6 +87286,7 @@ self: { description = "Client for etcd, a highly-available key value store"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eternal" = callPackage @@ -88988,7 +89064,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Compression and decompression in the exomizer format"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "exon" = callPackage @@ -89222,6 +89297,24 @@ self: { broken = true; }) {}; + "explainable-predicates" = callPackage + ({ mkDerivation, array, base, doctest-exitcode-stdio, doctest-lib + , hspec, mono-traversable, regex-tdfa, syb, template-haskell + }: + mkDerivation { + pname = "explainable-predicates"; + version = "0.1.0.0"; + sha256 = "18rw0vb61pvysywqhdl4rwpc38h37g2fgj11abd9gxm44cy04plg"; + libraryHaskellDepends = [ + array base mono-traversable regex-tdfa syb template-haskell + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib hspec + ]; + description = "Predicates that can explain themselves"; + license = lib.licenses.bsd3; + }) {}; + "explicit-constraint-lens" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -93678,7 +93771,6 @@ self: { ]; description = "Fixes whitespace issues"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "fixed" = callPackage @@ -94713,7 +94805,6 @@ self: { ]; description = "Wrapper for flock(2)"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "floskell" = callPackage @@ -96735,6 +96826,7 @@ self: { description = "Installed package query tool for Gentoo Linux"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fractal" = callPackage @@ -97628,7 +97720,6 @@ self: { ]; description = "Fresco binding for Haskell"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "fresh" = callPackage @@ -102613,7 +102704,6 @@ self: { preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; description = "Grammatical Framework"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "ggtsTC" = callPackage @@ -103273,6 +103363,7 @@ self: { description = "Library for hot-swapping shared objects in GHC"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-imported-from" = callPackage @@ -104193,6 +104284,7 @@ self: { description = "Live visualization of data structures in GHCi"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcflags" = callPackage @@ -104397,6 +104489,7 @@ self: { ]; description = "GHCi based bare bones IDE"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "ghcide" = callPackage @@ -105903,7 +105996,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit"; @@ -105915,12 +106008,12 @@ self: { gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -106847,6 +106940,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "githash_0_1_6_2" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, th-compat, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.6.2"; + sha256 = "1vkwc7j71vdrxy01vlm6xfp16kam7m9bnj9y3h217fzhq5mjywhz"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + th-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary th-compat unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -107053,7 +107167,6 @@ self: { ]; description = "Type definitions for objects used by the GitHub v3 API"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "github-utils" = callPackage @@ -107693,6 +107806,7 @@ self: { libraryHaskellDepends = [ base vector ]; description = "Graphical Lasso algorithm"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "glaze" = callPackage @@ -109748,6 +109862,7 @@ self: { description = "Core data types and functionality for Gogol libraries"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gogol-customsearch" = callPackage @@ -113057,6 +113172,7 @@ self: { description = "Support for graylog output"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "greencard" = callPackage @@ -113194,6 +113310,7 @@ self: { description = "Generalised replicate functions"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "greskell" = callPackage @@ -113341,6 +113458,7 @@ self: { description = "GridFS (MongoDB file storage) implementation"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gridland" = callPackage @@ -114361,7 +114479,6 @@ self: { libraryHaskellDepends = [ base glib ]; description = "A type class for cast functions of Gtk2hs: glib package"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-gnomevfs" = callPackage @@ -114439,6 +114556,7 @@ self: { description = "A type class for cast functions of Gtk2hs: TH package"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gtk2hs-hello" = callPackage @@ -117224,6 +117342,7 @@ self: { description = "A Hakyll library for internationalization"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-links" = callPackage @@ -118214,8 +118333,8 @@ self: { }: mkDerivation { pname = "hanspell"; - version = "0.2.6.0"; - sha256 = "0qk7zxq43mjcxyzhiidk0zm4sb2ii5wwr4zqihky538s6mqf5ccz"; + version = "0.2.6.1"; + sha256 = "06a2jakdyrdnb0m4mdbsg7zvichp3r5na8v4di18v9rwmq1fx0ih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120147,6 +120266,7 @@ self: { description = "Utility to generate bindings for BlackBerry Cascades"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskakafka" = callPackage @@ -120191,6 +120311,7 @@ self: { description = "A breakout game written in Yampa using SDL"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskarrow" = callPackage @@ -124901,6 +125022,7 @@ self: { description = "The Haskell tracer, generating and viewing Haskell execution traces"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hatex-guide" = callPackage @@ -125547,7 +125669,6 @@ self: { executableHaskellDepends = [ base ]; description = "Minimal extensible web-browser"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hbro-contrib" = callPackage @@ -125580,7 +125701,6 @@ self: { ]; description = "Third-party extensions to hbro"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hburg" = callPackage @@ -132815,6 +132935,8 @@ self: { pname = "hls-ormolu-plugin"; version = "1.0.1.0"; sha256 = "0s7hynj50vldxgzii4gb0mml9gyizy3vaan1scpmhrj7kh44w746"; + revision = "1"; + editedCabalFile = "01g0csnjygylg0a0zmyz66rm7xvhnys40hgclm13g5rakh2jmfak"; libraryHaskellDepends = [ base filepath ghc ghc-api-compat ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -132884,6 +133006,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-rename-plugin" = callPackage + ({ mkDerivation, base, containers, extra, filepath, ghc + , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-retrie-plugin + , hls-test-utils, lsp, lsp-types, syb, text, transformers + }: + mkDerivation { + pname = "hls-rename-plugin"; + version = "1.0.0.0"; + sha256 = "0j13nh3fvvmj1sd11fiq9fccq23s6p7jz3m96b49kprkayx65zhh"; + libraryHaskellDepends = [ + base containers extra ghc ghc-exactprint ghcide hiedb + hls-plugin-api hls-retrie-plugin lsp lsp-types syb text + transformers + ]; + testHaskellDepends = [ base filepath hls-test-utils ]; + description = "Rename plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghc-api-compat, ghcide, hashable, hls-plugin-api, lsp @@ -132932,6 +133073,8 @@ self: { pname = "hls-stylish-haskell-plugin"; version = "1.0.0.2"; sha256 = "0i8kjxqwg8mkk2imbc36ic2n59c09zc79g12c64vrjb7pgxpxrid"; + revision = "1"; + editedCabalFile = "0hwjh5b71hj6gwr73r9imlggkzv4j3z116va3y4v3h7zcjs11c4k"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -133899,6 +134042,7 @@ self: { executableHaskellDepends = [ base ]; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hnormalise" = callPackage @@ -134195,6 +134339,7 @@ self: { description = "defining @mtl@-ready monads as * -> * fixed-points"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hog" = callPackage @@ -136455,7 +136600,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libpuz"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hpygments" = callPackage @@ -140252,6 +140396,7 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hspec-discover_2_8_3" = callPackage @@ -140273,6 +140418,7 @@ self: { description = "Automatically discover and run Hspec tests"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hspec-expectations" = callPackage @@ -142559,7 +142705,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Functions for working with HTTP Accept headers"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "http-api-data" = callPackage @@ -144732,8 +144877,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.1"; sha256 = "16v36fj5aawnx6glarzljl3yb93zkn06ij5cg40zba5rp8jhpg7z"; - revision = "3"; - editedCabalFile = "1myzy3wjwjaqlm31pa90msr8rl26vczd5yqd29mx0gy7p4x2dmgi"; + revision = "4"; + editedCabalFile = "0hw0qqkabv0i4zmr7436pl1xn9izxcm4p9flv2k697zyhqdaccik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144878,8 +145023,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "6"; - editedCabalFile = "0w0w2ir8z1v4zpjxx36slkqcpvgl1s9520cnnbqg9i0fnvydb50v"; + revision = "7"; + editedCabalFile = "1x7f6k3ih3270xapfc9fnm4d51fhnha71fz0r3l2l6xx4mghcby2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144918,8 +145063,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; - revision = "5"; - editedCabalFile = "1rkz578hcn7s9i08n5jc557vph7k017m8vbk6ijf5psa189w1dkh"; + revision = "6"; + editedCabalFile = "0aizgpq9cxhhnzczi39nf6whcxnwqiszrbax0mzb3fqjwi1sida1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144955,8 +145100,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; - revision = "5"; - editedCabalFile = "0w8kikrrkv8v1drnrjfabzflbgs768qbrfv8n17y4id76aqazml5"; + revision = "6"; + editedCabalFile = "0svym7gnvsd9aa2wabrpfqv5661s2fg1jsqibyyblcrjy0cicdrl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144992,8 +145137,8 @@ self: { pname = "hw-excess"; version = "0.2.3.0"; sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g"; - revision = "1"; - editedCabalFile = "0qq8svkn9365vdbb0y3y4m2pdklsrf6z3a1m0kyfmbr0vphza369"; + revision = "2"; + editedCabalFile = "03xn63rydgflzpyqshi7kd18llkzd8ma15ml846mw95ww97d4i9i"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -145075,8 +145220,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.0"; sha256 = "04r30hb4664yciwfl3kyx0xn6sqc6abwhavb4wxiaas8b4px9kyn"; - revision = "2"; - editedCabalFile = "16v3dcpm51m8g2va85jfnbxqyc6dds2nazyd31080fa4804a90wz"; + revision = "3"; + editedCabalFile = "0byjlgisygdak9pf9dfnpbj576mrjd7knx4kyfm12l6l5qhcw8n1"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -145118,8 +145263,8 @@ self: { pname = "hw-ip"; version = "2.4.2.0"; sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; - revision = "4"; - editedCabalFile = "0pjry2xjnhfl3jii8j9dqmqz88hw7g8wkwy4fqnajnchrxb8f06w"; + revision = "5"; + editedCabalFile = "18fr2r6bhcz1a78di6g2vb7k74xaxamw4azxrjyb1bkx234laj2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145153,8 +145298,8 @@ self: { pname = "hw-json"; version = "1.3.2.2"; sha256 = "03h5zv94ndsz4vh0jql8rg8pl95rbf8xkyzvr3r55i3kpmb85sbg"; - revision = "4"; - editedCabalFile = "0ys0xlmw2xdrrjjdjx1gwlh0qpig8b4ljqwrp2yhp3aihzsb5304"; + revision = "5"; + editedCabalFile = "0pln3fcdbsd2gzvpa29gc2krsqk5ndkgpygcskwakj25cw3irh76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145197,8 +145342,8 @@ self: { pname = "hw-json-lens"; version = "0.2.1.0"; sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; - revision = "3"; - editedCabalFile = "0svnn3wdm8adcyw1phk0k9ddzlk3ni1dar681vpq61xwd1xmgjgb"; + revision = "4"; + editedCabalFile = "0ajl6xqy7wyvwidpv07842wslrw9yc6n48n8gm14b1l3iiwj2kiz"; libraryHaskellDepends = [ aeson base bytestring containers hw-json lens scientific text word8 ]; @@ -145224,8 +145369,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.0"; sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; - revision = "3"; - editedCabalFile = "0f7y8kaj2bv3l1fscwxdnqj7378mrls1mcnsm23cpb5dizy3p2nf"; + revision = "4"; + editedCabalFile = "0ragyq509nxy5ax58h84b6984lwnhklkk8nfafmxh5fxq66214cy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -145255,8 +145400,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; - revision = "6"; - editedCabalFile = "1ws3mcyvba05s0wvwzbig54wxkw37pp55c5jwbsc96inic8cfq3y"; + revision = "7"; + editedCabalFile = "169aqi2vjzg38cljfipxaw7kzav5z3n9b68f32mjsk1drh1c5hpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145294,8 +145439,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.1"; sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; - revision = "4"; - editedCabalFile = "18x3vinc6j5nnq3j5x7zdcy3ys6b2clmb7lhz6qg1wklnfcyjxsb"; + revision = "5"; + editedCabalFile = "029hrckhsm0g1j2zijs3ff14qsk2cdw9m57l3jhjy0cw3ynwisds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145407,8 +145552,8 @@ self: { pname = "hw-mquery"; version = "0.2.1.0"; sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j"; - revision = "2"; - editedCabalFile = "1996bn28l3s2bgjgll17gpryvp61vxjz0d3zi5py6kk40hsb4y6z"; + revision = "3"; + editedCabalFile = "0mnra701p169xzibag8mvb2mrk5gdp42dwlhqr07b6dz2cly88sn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; @@ -145434,8 +145579,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; - revision = "5"; - editedCabalFile = "0pnrjx4sbbxpr1fvib5z95cxjgfif2iay1j6hk5ysavwn6i2qxqx"; + revision = "6"; + editedCabalFile = "1ryh9nmpg3925lrr5a4wfsdv3f4a6rshrqn5pzbkqchh4mx39cpf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145466,8 +145611,8 @@ self: { pname = "hw-parser"; version = "0.1.1.0"; sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; - revision = "2"; - editedCabalFile = "15r5ydza7dawa5b7y3xi80016pa3s5sb706hvsqvn82fhqp5dziw"; + revision = "3"; + editedCabalFile = "1rc0swmmnckp99qzmhl1acxykyhdyw1lvy73mn7c4dlv751gnlhk"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; @@ -145524,20 +145669,23 @@ self: { }) {}; "hw-prim-bits" = callPackage - ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog - , hw-hspec-hedgehog, QuickCheck, vector + ({ mkDerivation, base, criterion, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, hw-hedgehog, hw-hspec-hedgehog + , QuickCheck, vector }: mkDerivation { pname = "hw-prim-bits"; - version = "0.1.0.4"; - sha256 = "1k2fqsa4msd156ar5cx57r0gj5ppwp1929yv56spv6n7xar1ich4"; + version = "0.1.0.5"; + sha256 = "1km4gj6znva4yz99sg1imf1k820m4kdhpzn51alj6gv92x127kih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hedgehog hspec hw-hedgehog hw-hspec-hedgehog QuickCheck + base doctest doctest-discover hedgehog hspec hw-hedgehog + hw-hspec-hedgehog QuickCheck ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = lib.licenses.bsd3; @@ -145557,8 +145705,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; - revision = "5"; - editedCabalFile = "1jbfanh0028sxj0arx92w753dwgpazs8j2flqjq9svc91rpk82px"; + revision = "6"; + editedCabalFile = "1j287ynfgiz56bn0hqqppa03zn2gcllnmiz2azzvfx7xkq3nkdh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145623,8 +145771,8 @@ self: { pname = "hw-simd"; version = "0.1.2.0"; sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f"; - revision = "2"; - editedCabalFile = "05rax91afykkmwnxnyi6bmmjh0n9ryw006k9k3klwnvy8h2yaf4m"; + revision = "3"; + editedCabalFile = "1dl2zqyc3rcrlda6apy5afgvax5cah37n44hzlm81y9p1nbpd205"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base transformers vector @@ -145658,6 +145806,8 @@ self: { pname = "hw-simd-cli"; version = "0.0.0.1"; sha256 = "0fqkrhjrflkiacq1qfnfiy4rk6pg47j72d0ni0jwfdn6ajx22y90"; + revision = "1"; + editedCabalFile = "1djqcz745rwf6jx3r4gs6cnvnk5pacllral5yk85lixvl80dyb1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145687,8 +145837,8 @@ self: { pname = "hw-streams"; version = "0.0.1.0"; sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; - revision = "1"; - editedCabalFile = "0fib78604y6cjchah7zhjsfli820ks51qq7yjv81wwbckjjkpw5v"; + revision = "2"; + editedCabalFile = "1c9vll8i0pl4x3b3xpy3zxc581f7n7m6mvpgz7pfhcpikw426s9y"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector @@ -145820,8 +145970,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; - revision = "7"; - editedCabalFile = "1rikq6wxjg4h5pfg9miw14np7b1h2vf036gawyazq5c4d6l2wfzv"; + revision = "8"; + editedCabalFile = "049vaf01iw694kpgaaqk2wpg2bpd8s9f2xq39sc3wh7kz7c848fv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -146217,7 +146367,6 @@ self: { libraryHaskellDepends = [ base bytestring curl hxt parsec ]; description = "LibCurl interface for HXT"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hxt-expat" = callPackage @@ -146229,7 +146378,6 @@ self: { libraryHaskellDepends = [ base bytestring hexpat hxt ]; description = "Expat parser for HXT"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -146338,7 +146486,6 @@ self: { ]; description = "TagSoup parser for HXT"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hxt-unicode" = callPackage @@ -146364,7 +146511,6 @@ self: { ]; description = "The XPath modules for HXT"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hxt-xslt" = callPackage @@ -146380,7 +146526,6 @@ self: { ]; description = "The XSLT modules for HXT"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "hxthelper" = callPackage @@ -148500,6 +148645,7 @@ self: { description = "bindings to imagemagick library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -150950,6 +151096,7 @@ self: { description = "Generates a version of a module using InterleavableIO"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interleavableIO" = callPackage @@ -150962,6 +151109,7 @@ self: { description = "Use other Monads in functions that asks for an IO Monad"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interleave" = callPackage @@ -154117,7 +154265,6 @@ self: { executableToolDepends = [ alex happy ]; description = "Create immutable algebraic data structures for Java"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "java-bridge" = callPackage @@ -154787,6 +154934,7 @@ self: { description = "JP's own ray tracer"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jose" = callPackage @@ -155658,6 +155806,7 @@ self: { description = "Json Quasiquatation library for Haskell"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-query" = callPackage @@ -158260,6 +158409,7 @@ self: { description = "Multi-process orchestration for development and integration testing"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kempe" = callPackage @@ -158270,8 +158420,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.4"; - sha256 = "0rzpid5lnjnjgsip3fvm5d313hh8wb7gqla3dyf56l9q7y4r20js"; + version = "0.2.0.5"; + sha256 = "185kz7ssbh0zmac1n015chhdch41driqvm6f0l71flf70kh6183a"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -160239,6 +160389,7 @@ self: { description = "Lambdabot plugin for XMPP (Jabber) protocol"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lambdabot-zulip" = callPackage @@ -162959,7 +163110,6 @@ self: { libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "lca" = callPackage @@ -162983,6 +163133,7 @@ self: { description = "Find longest common sublist of two lists"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ld-intervals" = callPackage @@ -164242,7 +164393,6 @@ self: { ]; description = "mtl operations with Van Laarhoven lenses"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -164260,7 +164410,6 @@ self: { ]; description = "Van Laarhoven lens templates"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "less-arbitrary" = callPackage @@ -167078,7 +167227,6 @@ self: { libraryHaskellDepends = [ base bindings-DSL unix ]; description = "Linux fbdev (framebuffer device, /dev/fbX) utility functions"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "linux-inotify" = callPackage @@ -171713,6 +171861,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lzma-conduit_1_2_2" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lzma-conduit"; + version = "1.2.2"; + sha256 = "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb"; + libraryHaskellDepends = [ + base bytestring conduit lzma resourcet transformers + ]; + testHaskellDepends = [ + base base-compat bytestring conduit HUnit QuickCheck resourcet + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Conduit interface for lzma/xz compression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit , mtl, QuickCheck, test-framework, test-framework-hunit @@ -175271,6 +175440,7 @@ self: { ]; description = "Sample from a posterior using Markov chain Monte Carlo"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "mcmc_0_6_1_0" = callPackage @@ -175298,6 +175468,7 @@ self: { description = "Sample from a posterior using Markov chain Monte Carlo"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "mcmc-samplers" = callPackage @@ -176124,6 +176295,7 @@ self: { description = "haskell bindings for memcached"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "memcached-binary" = callPackage @@ -176446,8 +176618,8 @@ self: { ({ mkDerivation, base, profunctors }: mkDerivation { pname = "merge"; - version = "0.2.0.0"; - sha256 = "193xvnm5ahms8pg8g8jscrcfp29mwni9rssy5hci11z3b126s6wv"; + version = "0.3.1.1"; + sha256 = "1b03xp953d4kwz7n3p16djsmzzd935x111ngm53gzg1n5dfyqfn5"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base ]; description = "A functor for consistent merging of information"; @@ -176787,7 +176959,6 @@ self: { libraryHaskellDepends = [ base ]; description = "metamorphisms: ana . cata or understanding folds and unfolds"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "metaplug" = callPackage @@ -178046,7 +178217,6 @@ self: { ]; description = "MIME implementation for String's"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "mime-types" = callPackage @@ -178119,7 +178289,6 @@ self: { executableHaskellDepends = [ base directory mtl random ]; description = "Minesweeper simulation using neural networks"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "minesweeper" = callPackage @@ -178278,7 +178447,6 @@ self: { libraryHaskellDepends = [ base containers directory filepath ]; description = "Minimal ini like configuration library with a few extras"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "minimorph" = callPackage @@ -181149,7 +181317,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Stateful supply monad"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "monad-task" = callPackage @@ -184286,6 +184453,7 @@ self: { description = "Continuous deployment server for use with GitHub"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "muesli" = callPackage @@ -185613,6 +185781,7 @@ self: { description = "Utility to generate Haskell code from Mustache templates"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mutable" = callPackage @@ -186393,7 +186562,6 @@ self: { executableHaskellDepends = [ base HSH mtl process ]; description = "Utility to call iwconfig"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "n-tuple" = callPackage @@ -186836,6 +187004,7 @@ self: { description = "A toy dependently-typed language"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nanocurses" = callPackage @@ -188827,6 +188996,7 @@ self: { description = "D-Bus"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-dns" = callPackage @@ -190935,6 +191105,7 @@ self: { description = "Bindings to the Nyctergatis Markup Engine"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nmis-parser" = callPackage @@ -191336,7 +191507,6 @@ self: { testHaskellDepends = [ base doctest Glob hspec QuickCheck text ]; description = "Non empty Data.Text type"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "non-empty-zipper" = callPackage @@ -191553,6 +191723,7 @@ self: { description = "the noodle programming language"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "normaldistribution" = callPackage @@ -191666,7 +191837,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Useful utility functions that only depend on base"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "not-prelude" = callPackage @@ -192516,6 +192686,8 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; + revision = "1"; + editedCabalFile = "0a37gmm0xgjzh05i7ix3nkgr5d2qa824nsh2wg78ikyksfq46vfv"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework @@ -193977,6 +194149,7 @@ self: { description = "Basic versioning library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "olwrapper" = callPackage @@ -194163,7 +194336,6 @@ self: { ]; description = "Data encoding and decoding command line utilities"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "omnifmt" = callPackage @@ -194942,6 +195114,7 @@ self: { description = "Haskell Bindings for the AtomSpace"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {atomspace-cwrapper = null;}; "opencv" = callPackage @@ -195040,6 +195213,7 @@ self: { description = "Fetch exchange rates from OpenExchangeRates.org"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openexr-write" = callPackage @@ -195074,6 +195248,7 @@ self: { description = "OpenFlow"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opengl-dlp-stereo" = callPackage @@ -195201,6 +195376,7 @@ self: { description = "Implementation of the OpenPGP message format"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openpgp-Crypto" = callPackage @@ -197953,6 +198129,7 @@ self: { description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pagerduty-hs" = callPackage @@ -198031,7 +198208,6 @@ self: { executableHaskellDepends = [ base ]; description = "Colorization of text for command-line output"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "pairing" = callPackage @@ -200097,7 +200273,6 @@ self: { ]; description = "Parsec combinators for parsing Haskell numeric types"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "parsec-parsers" = callPackage @@ -200757,7 +200932,6 @@ self: { libraryHaskellDepends = [ base network-uri ]; description = "Datatype for passing around unresolved URIs"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "partly" = callPackage @@ -201367,6 +201541,7 @@ self: { ]; description = "Library for representing and manipulating type-safe file paths"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "pathtype" = callPackage @@ -201518,6 +201693,7 @@ self: { benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Greatest convex majorants and least concave minorants"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "pava_0_1_1_2" = callPackage @@ -201532,6 +201708,7 @@ self: { description = "Greatest convex majorants and least concave minorants"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "paymill" = callPackage @@ -202279,7 +202456,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -204490,6 +204666,7 @@ self: { description = "Phonenumber Metadata - NOTE: this is now deprecated!"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phone-numbers" = callPackage @@ -204936,8 +205113,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.8.1.0"; - sha256 = "1v2kyb631kf71j71gz0gmvzmmdhzby769gax4fr8p5yng4nabmxg"; + version = "0.9.0.0"; + sha256 = "01km8jaagffrqlg22apnb90dx9sykpcmjdby9w9g4q8w935ppzw6"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -207240,7 +207417,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Implementation of the PKTree spatial index data structure"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "place-cursor-at" = callPackage @@ -207641,6 +207817,7 @@ self: { description = "Plivo API wrapper for Haskell"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plocketed" = callPackage @@ -208218,7 +208395,6 @@ self: { ]; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "pointfree-fancy" = callPackage @@ -208701,6 +208877,7 @@ self: { description = "Polynomial types and operations"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polynomial" = callPackage @@ -208795,8 +208972,6 @@ self: { ]; description = "Higher-order, low-boilerplate free monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy_1_6_0_0" = callPackage @@ -208829,7 +209004,6 @@ self: { description = "Higher-order, low-boilerplate free monads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-RandomFu" = callPackage @@ -208872,7 +209046,6 @@ self: { ]; description = "Polysemy-time Interpreters for Chronos"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-conc" = callPackage @@ -208893,7 +209066,6 @@ self: { ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-extra" = callPackage @@ -208909,7 +209081,6 @@ self: { ]; description = "Extra Input and Output functions for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-fs" = callPackage @@ -208927,7 +209098,6 @@ self: { ]; description = "Low level filesystem operations for polysemy"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-fskvstore" = callPackage @@ -208943,7 +209113,6 @@ self: { ]; description = "Run a KVStore as a filesystem in polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-http" = callPackage @@ -208994,7 +209163,6 @@ self: { ]; description = "Effect for a set of stateful values indexed by a type of keys"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-kvstore" = callPackage @@ -209006,7 +209174,6 @@ self: { libraryHaskellDepends = [ base containers polysemy ]; description = "KVStore effect for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-kvstore-jsonfile" = callPackage @@ -209025,7 +209192,6 @@ self: { ]; description = "Run a KVStore as a single json file in polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-log" = callPackage @@ -209049,7 +209215,6 @@ self: { ]; description = "Polysemy Effects for Logging"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-log-co" = callPackage @@ -209094,7 +209259,6 @@ self: { ]; description = "Di Adapters for Polysemy-Log"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-methodology" = callPackage @@ -209111,7 +209275,6 @@ self: { ]; description = "Domain modelling algebra for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-methodology-co-log" = callPackage @@ -209148,7 +209311,6 @@ self: { ]; description = "Functions for using polysemy-methodology with composite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-mocks" = callPackage @@ -209164,7 +209326,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Mocking framework for polysemy effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-optics" = callPackage @@ -209190,7 +209351,6 @@ self: { libraryHaskellDepends = [ base path polysemy polysemy-extra ]; description = "Polysemy versions of Path functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-plugin" = callPackage @@ -209215,6 +209375,7 @@ self: { description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-plugin_0_4_0_0" = callPackage @@ -209239,6 +209400,7 @@ self: { description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-readline" = callPackage @@ -209274,7 +209436,6 @@ self: { libraryHaskellDepends = [ base polysemy req ]; description = "Polysemy effect for req"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-resume" = callPackage @@ -209283,12 +209444,12 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.1.0.4"; - sha256 = "0z7d40vimdl5dr05cxr9c88fayg6cx2km537z81c67sxdv79mgzp"; + version = "0.2.0.0"; + sha256 = "08m9h9yfi0wasyaxjs27km41q648p8qna8imc4dhcp75q6bwc65g"; libraryHaskellDepends = [ base polysemy relude transformers ]; testHaskellDepends = [ - base hedgehog polysemy polysemy-plugin polysemy-test relude tasty - tasty-hedgehog text transformers + base hedgehog polysemy polysemy-plugin polysemy-test tasty + tasty-hedgehog text ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; @@ -209306,7 +209467,6 @@ self: { libraryHaskellDepends = [ base polysemy ]; description = "Run several effects at once, taken from the polysemy-zoo"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-socket" = callPackage @@ -209320,7 +209480,6 @@ self: { libraryHaskellDepends = [ base bytestring polysemy socket ]; description = "Socket effect for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-test" = callPackage @@ -209345,7 +209504,6 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-time" = callPackage @@ -209369,7 +209527,6 @@ self: { ]; description = "Polysemy Effect for Time"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-uncontrolled" = callPackage @@ -209383,7 +209540,6 @@ self: { libraryHaskellDepends = [ base polysemy polysemy-methodology ]; description = "Uncontrolled toy effect for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-video" = callPackage @@ -209404,7 +209560,6 @@ self: { ]; description = "Experimental video processing DSL for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-vinyl" = callPackage @@ -209422,7 +209577,6 @@ self: { ]; description = "Functions for mapping vinyl records in polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-webserver" = callPackage @@ -209728,7 +209882,6 @@ self: { ]; description = "XEPs implementation on top of pontarius-xmpp"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -209745,6 +209898,7 @@ self: { description = "Extended Personal Media Network (XPMN) library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pony" = callPackage @@ -210082,7 +210236,6 @@ self: { librarySystemDepends = [ portaudio ]; description = "Haskell bindings for the PortAudio library"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -210232,7 +210385,6 @@ self: { libraryHaskellDepends = [ base directory process ]; description = "Library to interact with port tools on FreeBSD"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "poseidon" = callPackage @@ -210385,7 +210537,6 @@ self: { libraryHaskellDepends = [ base transformers unix ]; description = "Nice wrapper around POSIX fcntl advisory locks"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "posix-paths" = callPackage @@ -211024,6 +211175,7 @@ self: { benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "postgresql-simple-bind" = callPackage @@ -212083,6 +212235,7 @@ self: { description = "Diff Cabal packages"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "precursor" = callPackage @@ -216495,6 +216648,7 @@ self: { description = "Fast, lightweight YAML loader and dumper"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pugs-compat" = callPackage @@ -217903,6 +218057,7 @@ self: { description = "Qt bindings"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {qtc_core = null; qtc_gui = null; qtc_network = null; qtc_opengl = null; qtc_script = null; qtc_tools = null;}; @@ -218318,6 +218473,7 @@ self: { description = "Picklers for de/serialising Generic data types to and from query strings"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "questioner" = callPackage @@ -220185,6 +220341,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "random_1_2_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty + , tasty-bench, tasty-hunit, tasty-inspection-testing + , tasty-smallcheck, time, transformers + }: + mkDerivation { + pname = "random"; + version = "1.2.1"; + sha256 = "0mqlcr9l9wh3q4rykv6yqdsd9jj88imp0zm8wv6m7jpjqn7pcp16"; + libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; + testHaskellDepends = [ + base bytestring containers doctest smallcheck stm tasty tasty-hunit + tasty-inspection-testing tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base mtl primitive rdtsc split splitmix tasty-bench time + ]; + description = "Pseudo-random number generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-access-file" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , criterion, directory, lrucaching, mwc-random, random, stm, unix @@ -225353,8 +225532,8 @@ self: { pname = "relation"; version = "0.5.2.0"; sha256 = "1sinb0rw2jq1xjy80rsxnjf5va33n2i67km55hxfls9w15wsg2yw"; - revision = "1"; - editedCabalFile = "18nh56qp1cjpg28sagwiy4h44v5dvm5rhm3wqyyz4mw3k78x71kh"; + revision = "2"; + editedCabalFile = "1af9snfvk46h4gqxs688wyhlc85b753prfmbqyldfbhsjg61jap5"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest doctest-discover hedgehog hspec @@ -225972,6 +226151,7 @@ self: { description = "Define compound types that do not depend on member order"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "repa" = callPackage @@ -226332,6 +226512,7 @@ self: { testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "replica" = callPackage @@ -227466,6 +227647,7 @@ self: { description = "A monad transformer for resumable exceptions"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rethinkdb" = callPackage @@ -228191,6 +228373,7 @@ self: { description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "riak-protobuf" = callPackage @@ -228202,7 +228385,6 @@ self: { libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "riak-protobuf-lens" = callPackage @@ -228225,6 +228407,7 @@ self: { description = "Lenses for riak-protobuf"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rib" = callPackage @@ -229327,7 +229510,6 @@ self: { ]; description = "Sci-fi roguelike game. Client application."; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "roguestar-engine" = callPackage @@ -230461,7 +230643,6 @@ self: { testHaskellDepends = [ base QuickCheck safe ]; description = "Range set"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "rspp" = callPackage @@ -230598,7 +230779,6 @@ self: { libraryHaskellDepends = [ base ]; description = "dynamic linker tools for Haskell"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "rtlsdr" = callPackage @@ -234398,6 +234578,7 @@ self: { description = "Process management and supervision daemon"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "scuttlebutt-types" = callPackage @@ -234989,6 +235170,7 @@ self: { description = "Small web framework using Warp and WAI"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "seakale" = callPackage @@ -240269,8 +240451,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.1.0.0"; - sha256 = "0y08m020bs1133b6jh6lb20bpa1kpd1ib0b51vdpf9n2pzpqy3jr"; + version = "1.2.0.0"; + sha256 = "1q1b1kzc4578drz92r666gl2l02pn4zdbbbnjcwwkklccslb3zcd"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -240281,6 +240463,7 @@ self: { description = "A flexible library for parsing and printing S-expression"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sext" = callPackage @@ -240313,7 +240496,6 @@ self: { librarySystemDepends = [ libsndfile openal ]; description = "minimal bindings to the audio module of sfml"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -240553,6 +240735,7 @@ self: { description = "Functional GPU programming - DSEL & compiler"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shady-graphics" = callPackage @@ -241677,6 +241860,7 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "shift" = callPackage @@ -242876,6 +243060,7 @@ self: { description = "Forms that configure themselves based on type"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "simple-genetic-algorithm" = callPackage @@ -244630,14 +244815,14 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "skylighting_0_11" = callPackage + "skylighting_0_12" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.11"; - sha256 = "12m119j65yngryrx23jiz6c86wihqp47ysv0wnmqfgc6cbv0k97r"; + version = "0.12"; + sha256 = "1hd3ryv9g5cp0l9jrdmav7vkhx5hqdx830bx0xixfikqzigdsg3y"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -244683,7 +244868,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_11" = callPackage + "skylighting-core_0_12" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -244693,8 +244878,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.11"; - sha256 = "1pgi0xfwbvgpgdcka3z3zl1hg1y4n3s2r9561gzclydyldb2jxc3"; + version = "0.12"; + sha256 = "15ph640qrx4l31h8wa80yivgvsabm92clkk2fba4zr032dxg7d0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245301,6 +245486,7 @@ self: { executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "slynx_0_6_1_0" = callPackage @@ -245324,6 +245510,7 @@ self: { description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "small-bytearray-builder" = callPackage @@ -246460,6 +246647,7 @@ self: { description = "Declarative routing for Snap"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-routes" = callPackage @@ -251858,7 +252046,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Numerical statistics for Foldable containers"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "staged-gg" = callPackage @@ -251985,7 +252172,6 @@ self: { libraryHaskellDepends = [ base ]; description = "the * -> * types, operators, and covariant instances"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "star-to-star-contra" = callPackage @@ -251997,7 +252183,6 @@ self: { libraryHaskellDepends = [ base star-to-star ]; description = "contravariant instances for * -> * types and operators"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "starling" = callPackage @@ -252230,7 +252415,6 @@ self: { librarySystemDepends = [ libstatgrab ]; description = "Collect system level metrics and statistics"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libstatgrab;}; "static" = callPackage @@ -257380,8 +257564,6 @@ self: { libraryPkgconfigDepends = [ librsvg ]; description = "Binding to the libsvg-cairo library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) librsvg;}; "svgone" = callPackage @@ -257502,7 +257684,6 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "swagger-petstore" = callPackage @@ -257892,7 +258073,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest_0_4_0_0" = callPackage @@ -257938,6 +258118,7 @@ self: { description = "An aeson companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-amqp" = callPackage @@ -257978,7 +258159,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatic test suite discovery for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-hedis" = callPackage @@ -257999,6 +258179,7 @@ self: { description = "An hedis companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-hspec" = callPackage @@ -258014,7 +258195,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An Hspec companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-mongo" = callPackage @@ -258035,6 +258215,7 @@ self: { description = "An mongoDB companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-persistent" = callPackage @@ -258055,7 +258236,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A persistent companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-persistent-postgresql" = callPackage @@ -258078,6 +258258,7 @@ self: { description = "An persistent-postgresql companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-persistent-sqlite" = callPackage @@ -258098,7 +258279,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-persistent-sqlite_0_2_0_0" = callPackage @@ -258136,7 +258316,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-rabbitmq" = callPackage @@ -258157,6 +258336,7 @@ self: { description = "An rabbitmq companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-servant" = callPackage @@ -258177,7 +258357,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-servant_0_2_0_0" = callPackage @@ -258214,7 +258393,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-wai" = callPackage @@ -258236,7 +258414,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-wai_0_2_0_0" = callPackage @@ -258287,6 +258464,7 @@ self: { description = "A yesod companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-yesod_0_3_0_0" = callPackage @@ -258318,6 +258496,7 @@ self: { description = "A yesod companion library for sydtest"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "syfco" = callPackage @@ -259890,7 +260069,6 @@ self: { libraryHaskellDepends = [ base safe text ]; description = "Table layout"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "table" = callPackage @@ -260028,7 +260206,6 @@ self: { ]; description = "Pretty-printing of CSV files"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "tabloid" = callPackage @@ -264427,6 +264604,7 @@ self: { description = "Small test package"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "testbench" = callPackage @@ -269122,6 +269300,7 @@ self: { executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "tlynx_0_6_1_0" = callPackage @@ -269146,6 +269325,7 @@ self: { description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ dschrempf ]; }) {}; "tmapchan" = callPackage @@ -269265,7 +269445,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring utf8-string ]; description = "Library for encoding/decoding TNET strings for PGI"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "to" = callPackage @@ -272335,6 +272514,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "trust-chain" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, cropty + , merge, network, text + }: + mkDerivation { + pname = "trust-chain"; + version = "0.1.3.0"; + sha256 = "0ff5ppmq3c5291y9ir3yybbsabpwcy3av7p7xl6mwzzzpw6zbknl"; + libraryHaskellDepends = [ + base binary bytestring containers cropty merge network text + ]; + testHaskellDepends = [ base binary containers cropty merge text ]; + description = "An implementation of a trust chain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "truthful" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -272417,6 +272614,7 @@ self: { description = "-"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tslogger" = callPackage @@ -273541,6 +273739,7 @@ self: { description = "Simulator of twisty puzzles à la Rubik's Cube"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twitch" = callPackage @@ -275278,6 +275477,7 @@ self: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; description = "Efficient time zone handling"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "tzdata" = callPackage @@ -275338,6 +275538,7 @@ self: { description = "A simplistic dependently-typed language with parametricity"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ua-parser" = callPackage @@ -276147,7 +276348,6 @@ self: { ]; description = "IO without any non-error, synchronous exceptions"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "unexceptionalio-trans" = callPackage @@ -276161,7 +276361,6 @@ self: { libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "unfix-binders" = callPackage @@ -278275,7 +278474,6 @@ self: { executableHaskellDepends = [ base ports-tools process ]; description = "Software management tool"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "update-monad" = callPackage @@ -279554,7 +279752,6 @@ self: { executableHaskellDepends = [ base process ]; description = "A debugger for the UUAG system"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "uuid" = callPackage @@ -283329,7 +283526,6 @@ self: { ]; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -284518,7 +284714,6 @@ self: { ]; description = "WAI request predicates"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "wai-rate-limit" = callPackage @@ -284730,7 +284925,6 @@ self: { ]; description = "Flexible session middleware for WAI"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "wai-session-alt" = callPackage @@ -284765,7 +284959,6 @@ self: { ]; description = "Session store based on clientsession"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "wai-session-mysql" = callPackage @@ -284983,7 +285176,6 @@ self: { ]; description = "Collection of utility functions for use with WAI"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "wai-websockets" = callPackage @@ -285779,6 +285971,7 @@ self: { executableHaskellDepends = [ base optparse-generic ]; description = "representations of a web page"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "web-routes" = callPackage @@ -286502,7 +286695,7 @@ self: { "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk24x-gtk3 + , webkitgtk }: mkDerivation { pname = "webkitgtk3"; @@ -286513,27 +286706,26 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 - }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either @@ -286818,6 +287010,7 @@ self: { description = "Wedged postcard generator"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "weeder" = callPackage @@ -286842,6 +287035,7 @@ self: { ]; description = "Detect dead code"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "weekdaze" = callPackage @@ -288681,8 +288875,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wrapped"; - version = "0.1.0.0"; - sha256 = "07xvml89ml36qx23114qr72sk1kqfpj3dassfs5mwhaw45016rk2"; + version = "0.1.0.1"; + sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; libraryHaskellDepends = [ base ]; description = "Provides a single standardized place to hang DerivingVia instances"; license = lib.licenses.asl20; @@ -288692,10 +288886,8 @@ self: { ({ mkDerivation, base, data-default-class, wrapped }: mkDerivation { pname = "wrapped-generic-default"; - version = "0.1.0.0"; - sha256 = "0h1aay81l8b2nih08pli30ly0vcwvi8n2kdxck60ww2qb2b7wzzc"; - revision = "1"; - editedCabalFile = "03wvdf76ddn4xsyc94ya3hycl7isi18lbbn0lsigicas7nhbc2sl"; + version = "0.1.0.1"; + sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; libraryHaskellDepends = [ base data-default-class wrapped ]; description = "Provides an orphan instance Default (Wrapped Generic a)"; license = lib.licenses.asl20; @@ -289839,7 +290031,6 @@ self: { ]; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -290513,6 +290704,7 @@ self: { description = "Streaming XML parser based on conduits"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "xml-conduit-selectors" = callPackage @@ -291901,6 +292093,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "xss-sanitize_0_3_7" = callPackage + ({ mkDerivation, attoparsec, base, containers, css-text, hspec + , HUnit, network-uri, tagsoup, text, utf8-string + }: + mkDerivation { + pname = "xss-sanitize"; + version = "0.3.7"; + sha256 = "1wnzx5nv8p4ppphcvjp6x8wna0kpw9jn85gn1qbhjqhrl5nqy1vw"; + libraryHaskellDepends = [ + attoparsec base containers css-text network-uri tagsoup text + utf8-string + ]; + testHaskellDepends = [ + attoparsec base containers css-text hspec HUnit network-uri tagsoup + text utf8-string + ]; + description = "sanitize untrusted HTML to prevent XSS attacks"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "xtc" = callPackage ({ mkDerivation, base, wx, wxcore }: mkDerivation { @@ -292467,6 +292680,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "yaml_0_11_6_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.6.0"; + sha256 = "0hxg9mfi1dn9a7kp3imzfvnk7jj4sdjdxi6xyqz9ra7lqg14np3r"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -292689,6 +292932,7 @@ self: { description = "Compares the keys from two yaml files"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yamlparse-applicative" = callPackage @@ -296280,6 +296524,7 @@ self: { description = "Grids defined by layout hints and implemented on top of Yahoo grids"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yuuko" = callPackage @@ -297525,6 +297770,7 @@ self: { description = "A socat-like tool for zeromq library"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zoneinfo" = callPackage diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff new file mode 100644 index 0000000000..d3f7f497fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff @@ -0,0 +1,15 @@ +diff --git a/makefile b/makefile +index a5f3d75..f617e25 100644 +--- a/makefile ++++ b/makefile +@@ -109,9 +109,7 @@ ${bd}/%.o: src/builtins/%.c + + + src/gen/customRuntime: +- @echo "Copying precompiled bytecode from the bytecode branch" +- git checkout remotes/origin/bytecode src/gen/{compiler,formatter,runtime0,runtime1,src} +- git reset src/gen/{compiler,formatter,runtime0,runtime1,src} ++ echo "src/gen/ files retrieved externally" + ${bd}/load.o: src/gen/customRuntime + + -include $(bd)/*.d diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix new file mode 100644 index 0000000000..e80844f1b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchFromGitHub +, bqn-path ? null +}: + +let + mlochbaum-bqn = fetchFromGitHub { + owner = "mlochbaum"; + repo = "BQN"; + rev = "97cbdc67fe6a9652c42daefadd658cc41c1e5ae3"; + hash = "sha256-F2Bv3n3C7zAhqKCMB6hT2iIWTjEqFdLBMyX6/w7V1SY="; + }; +in +stdenv.mkDerivation rec { + pname = "cbqn"; + version = "0.0.0+unstable=2021-09-29"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "CBQN"; + rev = "1c83483d5395e097f60de299274ebe0df590217e"; + hash = "sha256-C34DpXab08mBm2oCQuaeq4fJPtQ5rVa/HlpL/nB9XjQ="; + }; + + cbqn-bytecode = fetchFromGitHub { + owner = "dzaima"; + repo = "CBQN"; + rev = "fdf0b93409d68d5ffd86c5670db27c240e6039e0"; + hash = "sha256-A0zvpg+G37WNgyfrJuc5rH6L7Wntdbrz8pYEPreqgKE="; + }; + + dontConfigure = true; + + patches = [ + # self-explaining + ./001-remove-vendoring.diff + ]; + + postPatch = '' + sed -i '/SHELL =.*/ d' makefile + ''; + + preBuild = + if bqn-path == null + then '' + cp ${cbqn-bytecode}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/ + '' + else '' + ${bqn-path} genRuntime ${mlochbaum-bqn} + ''; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "single-o3" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin/ + cp BQN -t $out/bin/ + ln -s $out/bin/BQN $out/bin/bqn + ln -s $out/bin/BQN $out/bin/cbqn + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dzaima/CBQN/"; + description = "BQN implementation in C"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +} +# TODO: factor BQN +# TODO: test suite (dependent on BQN from mlochbaum) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 659f9b87e6..4ce8cacb84 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.943"; + version = "1.10.3.986"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-w3DRvZsie22uoJMrNQTxN5hW0pIFjH5zAw5Z41I1M/s="; + sha256 = "1xhfp186mk9h3jdl9bpkigqrrrgdhgij7ba65j6783nh11llpa3x"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 98de7c71ab..7bc067c92c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -170,14 +170,14 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "01c176ac0f57d40cc3b6f8e441062780f073d952"; # Aug 22, 2021 + crossVersion = "393821c7cf53774233aaf130ff2c8ccec701b0a9"; # Sep 22, 2021 perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "19mwr1snwl4156rlhn74kmpl1wyc7ahhlrjfpnfcj3n63ic0c56y"; + sha256 = "1fn35b1773aibi2z54m0mar7114737mvfyp81wkdwhakrmzr5nv1"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +214,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.35.3"; - sha256 = "06442zc5rvisl120f58jpy95bkf8f1cc4n577nzihdavlbfmnyyn"; + version = "5.35.4"; + sha256 = "1ss2r0qq5li6d2qghfv1iah5nl6nraymd7b7ib1iy1395rwyhl4q"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 7ac6918ef7..e2a16cce7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "sha256-4ZyTp0TOKqDbziqBTkeUs3J+f3stFyUVpkzk4Jx6CDc="; + sha256 = "sha256-Q09+6dPwdeW3jkGgPNAcHI3FHcYPQ+w61PmV+TkQ+H8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix index a7dd1f9801..5aa1c487b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdome2/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; - patches = [ ./xml-document.patch ]; + patches = [ + ./xml-document.patch + ./fno-common.patch + ]; meta = with lib; { homepage = "http://gdome2.cs.unibo.it/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch b/third_party/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch new file mode 100644 index 0000000000..f9dc93c48f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gdome2/fno-common.patch @@ -0,0 +1,11 @@ +On gcc-10 -fno-common is the default which forbids miltiple definitions. +--- a/libgdome/xpath/gdome-xpath-xpnsresolv.h ++++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h +@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc + void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc); + GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc); + +-const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; ++extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; + + #endif /* GDOME_XPNSRESOLV_FILE */ diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 4a9fce0421..2000bdccb0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.40.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.41.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "08l2dyf3g3zrffy60ycid6jngvhfaghg792yrkfjcpcif5dqfd9f"; + sha256 = "1mcgnzwc2mcdpcfhc1b37vff0biwyd3v0a2ack58wgf4336pzlsb"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index f1a2aa0c6c..bc651dc4ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -806,7 +806,7 @@ in rec { meta = with lib; { description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal"; homepage = "https://www.opentaal.org/"; - license = with licenses; [ bsd3 cc-by-nc-30 ]; + license = with licenses; [ bsd3 ]; # and/or cc-by-nc-30 maintainers = with maintainers; [ artturin ]; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch deleted file mode 100644 index 0093eb556b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 9 Dec 2020 10:01:59 -0600 -Subject: [PATCH] platform plugins path - ---- - src/pluginwrapper.cpp | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp -index a255d83..9699b08 100644 ---- a/src/pluginwrapper.cpp -+++ b/src/pluginwrapper.cpp -@@ -25,20 +25,19 @@ static QStringList pluginCandidates() - { - QStringList ret; - const auto paths = QCoreApplication::libraryPaths(); -- for (const QString &path : paths) { -- static const QStringList searchFolders{ -- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -- QStringLiteral("/kf5/kwindowsystem"), -- }; -- for (const QString &searchFolder : searchFolders) { -- QDir pluginDir(path + searchFolder); -- if (!pluginDir.exists()) { -- continue; -- } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -+ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH); -+ static const QStringList searchFolders { -+ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -+ QStringLiteral("/kf5/kwindowsystem"), -+ }; -+ for (const QString &searchFolder : searchFolders) { -+ QDir pluginDir(path + searchFolder); -+ if (!pluginDir.exists()) { -+ continue; -+ } -+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -+ for (const QString &entry : entries) { -+ ret << pluginDir.absoluteFilePath(entry); - } - } - return ret; --- -2.28.0 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 4092930933..7643572a7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -10,11 +10,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = [ - ./0001-platform-plugins-path.patch - ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" - ''; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix index 0fabdb49ca..26ac159646 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU="; + sha256 = "sha256-u5yLrAXaavALNArj6yw+v5Yn4eqXWTHmUxHe+pVCbXM="; }; buildInputs = [ libyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index dfb540b0bd..91ec5a5ed0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "pantoniou"; repo = pname; rev = "v${version}"; - sha256 = "10w1n4zzgw33j755pkv73fxdn93kwbzg486b5m9i0bh5d76jp4ax"; + sha256 = "1367cbny5msapy48z0yysbkawmk1qjqk7cjnqkjszs47riwvjz3h"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix index 798a993718..c778ae485b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libspng"; - version = "0.7.0-rc3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "randy408"; repo = pname; rev = "v${version}"; - sha256 = "0n91mr06sr34cqq91738251iaw21h5c4jgjpn0kqfx69ywxcl9fj"; + sha256 = "0zk0w09is4g7gysax4h0f4xj5f40vm6ipc1wi98ymzban89cjjnz"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix index 6b5246d09e..05ba3519ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1a4d75gc7rcfwpsh7fn8mygvi4w0jym4szdhw6jpfywvll37lffi"; + sha256 = "0ahbwikdb0chf76whm62zz0a7zqil3gzsxmq38ccbqlmnnyjkbbb"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix index e46064ae56..f34834ae31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "libytnef"; - version = "1.9.3"; + version = "2.0"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"; + sha256 = "sha256-P5eTH5pKK+v4LCMAe6JbEbTYOJypmLMYVDYk5tGVZ14="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix index 4544fd08aa..6ba5517c02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lirc/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--enable-uinput" # explicit activation because build env has no uinput "--enable-devinput" # explicit activation because build env has no /dev/input + "--with-lockdir=/run/lirc/lock" # /run/lock is not writable for 'lirc' user ]; installFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix index 6d12ed6ef1..8be2fe9fe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-Oyjdmmb+rqPgkwVJw3y4NKGPABmCZFyGFBzBJn6IEHk="; + sha256 = "sha256-EtHyxnTH2bVoVnWB9wvmF/nCdecvL1TTiVRaajFVC/0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix index 005257780e..ed2f700dc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -9,6 +9,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen +, enableUnfree ? false , Cocoa, QTKit }: @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) (opencvFlag "GSTREAMER" enableGStreamer) - ]; + ] ++ lib.optional (!enableUnfree) "-DBUILD_opencv_nonfree=OFF"; hardeningDisable = [ "bindnow" "relro" ]; @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; - license = licenses.bsd3; + license = if enableUnfree then licenses.unfree else licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 4589a2fde1..f25173c41c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0rj7zfm2h6812ga1xypism8a48jj669nh10jmhpf2mjriyaar3di"; + sha256 = "145wm8c5v56djmvgjhksmywx6ak81vhxyg6yy3jj7wlvcan4p238"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index 9b7a2e9101..d2942e6be2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2021-04-01"; + version = "2021-09-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "1iia0883lssj7ckbsr0n7yb3gdw24c8wnl2q5hhzlml23h4ipbh3"; + sha256 = "1fyhypw345xz8zdh53gz6j1fwgrx0gszk1d349ja37dpxh4jp2jh"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix index a5299f865d..99b7f8fdc3 100644 --- a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , cmake , fetchFromGitHub }: @@ -22,9 +23,11 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/uber/h3"; + homepage = "https://h3geo.org/"; description = "Hexagonal hierarchical geospatial indexing system"; license = licenses.asl20; + changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md"; + platforms = platforms.all; maintainers = [ maintainers.kalbasit ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix index d8faf17145..ba9d1d5bf9 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -3,35 +3,37 @@ { mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding , asn1-types, async, attoparsec, attoparsec-iso8601, auto-update , base, base16-bytestring, base64-bytestring, binary, byteorder -, bytestring, case-insensitive, ci-info, containers, cron -, cryptonite, data-has, deepseq, dependent-map, dependent-sum -, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit -, file-embed, filepath, ghc-heap-view, graphql-parser, hashable -, hashable-time, hspec, hspec-core, hspec-expectations -, hspec-expectations-lifted, http-api-data, http-client -, http-client-tls, http-conduit, http-types, immortal -, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson -, lib, lifted-async, lifted-base, list-t, memory, mime-types -, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache -, mysql, mysql-simple, natural-transformation, network, network-uri -, odbc, optparse-applicative, pem, pg-client, postgresql-binary +, bytestring, case-insensitive, ci-info, connection, containers +, cron, cryptonite, data-default-class, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, exceptions, fast-logger, fetchgit, file-embed, filepath +, ghc-heap-view, graphql-parser, hashable, hashable-time, hspec +, hspec-core, hspec-expectations, hspec-expectations-lifted +, http-api-data, http-client, http-client-tls, http-conduit +, http-types, immortal, insert-ordered-containers, jose +, kan-extensions, lens, lens-aeson, lib, lifted-async, lifted-base +, list-t, memory, mime-types, mmorph, monad-control, monad-loops +, monad-validate, mtl, mustache, mysql, mysql-simple +, natural-transformation, network, network-uri, odbc +, optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, pretty-simple, process, profunctors, psqueues , QuickCheck, quickcheck-instances, random, regex-tdfa , resource-pool, retry, safe, safe-exceptions, scientific , semialign, semigroups, semver, shakespeare, some, split , Spock-core, stm, stm-containers, tagged, template-haskell, text -, text-builder, text-conversions, these, time, transformers +, text-builder, text-conversions, these, time, tls, transformers , transformers-base, unix, unordered-containers, uri-encode , utf8-string, uuid, validation, vector, vector-instances, wai -, warp, websockets, wreq, x509, x509-store, yaml, zlib +, warp, websockets, wreq, x509, x509-store, x509-system +, x509-validation, yaml, zlib }: mkDerivation { pname = "graphql-engine"; version = "1.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7"; - rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133"; + sha256 = "0ky23f700pmzb6anx44xzh6dixixmn7kq1ypj0yy4kqiqzqdb2dg"; + rev = "7c35ffb36561214390d0d545d418746f29a29ba4"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; @@ -41,23 +43,24 @@ mkDerivation { aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async attoparsec attoparsec-iso8601 auto-update base base16-bytestring base64-bytestring binary byteorder bytestring case-insensitive - ci-info containers cron cryptonite data-has deepseq dependent-map - dependent-sum directory ekg-core ekg-json exceptions fast-logger - file-embed filepath ghc-heap-view graphql-parser hashable - hashable-time http-api-data http-client http-client-tls - http-conduit http-types immortal insert-ordered-containers jose - kan-extensions lens lens-aeson lifted-async lifted-base list-t - memory mime-types mmorph monad-control monad-loops monad-validate - mtl mustache mysql mysql-simple network network-uri odbc - optparse-applicative pem pg-client postgresql-binary - postgresql-libpq pretty-simple process profunctors psqueues - QuickCheck quickcheck-instances random regex-tdfa resource-pool - retry safe-exceptions scientific semialign semigroups semver - shakespeare some split Spock-core stm stm-containers tagged - template-haskell text text-builder text-conversions these time - transformers transformers-base unix unordered-containers uri-encode - utf8-string uuid validation vector vector-instances wai warp - websockets wreq x509 x509-store yaml zlib + ci-info connection containers cron cryptonite data-default-class + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json exceptions fast-logger file-embed filepath ghc-heap-view + graphql-parser hashable hashable-time http-api-data http-client + http-client-tls http-conduit http-types immortal + insert-ordered-containers jose kan-extensions lens lens-aeson + lifted-async lifted-base list-t memory mime-types mmorph + monad-control monad-loops monad-validate mtl mustache mysql + mysql-simple network network-uri odbc optparse-applicative pem + pg-client postgresql-binary postgresql-libpq pretty-simple process + profunctors psqueues QuickCheck quickcheck-instances random + regex-tdfa resource-pool retry safe-exceptions scientific semialign + semigroups semver shakespeare some split Spock-core stm + stm-containers tagged template-haskell text text-builder + text-conversions these time tls transformers transformers-base unix + unordered-containers uri-encode utf8-string uuid validation vector + vector-instances wai warp websockets wreq x509 x509-store + x509-system x509-validation yaml zlib ]; executableHaskellDepends = [ base bytestring ekg-core kan-extensions pg-client text diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix index 0033584a15..a447ac0154 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.2.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj"; - rev = "79beb0e85e00422a8a15318c0bc573765fc7b246"; + sha256 = "0zqrh7y0cjjrscsw2hmyhdcm4nzvb5pw394pcxk8q19xx13jp9xd"; + rev = "43562a5b7b41d380e3e31732b48637702e5aa97d"; fetchSubmodules = true; }; libraryHaskellDepends = [ diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix index d1eb5e156e..52f179f992 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix @@ -13,8 +13,8 @@ mkDerivation { version = "0.1.0"; src = fetchgit { url = "https://github.com/hasura/pg-client-hs.git"; - sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2"; - rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f"; + sha256 = "00h9hskv3p4mg35php5wsr2d2rjahcv29rqidb2lxl11r05psr4m"; + rev = "5e8a2d7ebe8b96518e5a70f4d61be2550eaa4e70"; fetchSubmodules = true; }; setupHaskellDepends = [ base Cabal ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix index a12d61f0fe..48954114a4 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix @@ -8,8 +8,8 @@ mkDerivation { version = "0.2.3.2"; src = fetchgit { url = "https://github.com/hasura/pool.git"; - sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms"; - rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf"; + sha256 = "02wa32fl5wq5fk59id54xmxiqjl564r4rhsc79xsgf2j2spj0v94"; + rev = "dc56753338e7b61220a09bed0469c6dcc5e9fb52"; fetchSubmodules = true; }; libraryHaskellDepends = [ diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix index ca8a51c705..dd84746242 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix @@ -3,6 +3,8 @@ , callPackage , resholve , resholvePackage +, resholveScript +, resholveScriptBin , shunit2 , coreutils , gnused @@ -22,35 +24,6 @@ }: let - inherit (callPackage ./default.nix { }) - resholve resholvePackage resholveScript resholveScriptBin; - - # ourCoreutils = coreutils.override { singleBinary = false; }; - - /* - TODO: wrapped copy of find so that we can eventually test - our ability to see through wrappers. Unused for now. - Note: grep can serve the negative case; grep doesn't match, and - egrep is a shell wrapper for grep. - */ - # wrapfind = runCommand "wrapped-find" { } '' - # source ${makeWrapper}/nix-support/setup-hook - # makeWrapper ${findutils}/bin/find $out/bin/wrapped-find - # ''; - /* TODO: - unrelated, but is there already a function (or would - there be demand for one?) along the lines of: - wrap = { drv, executable(s?), args ? { } }: that: - - generates a sane output name - - sources makewrapper - - retargets real executable if already wrapped - - wraps the executable - - I wonder because my first thought here was overrideAttrs, - but I realized rebuilding just for a custom wrapper is an - ongoing waste of time. If it is a common pattern in the - wild, it would be a nice QoL improvement. - */ in rec { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix index e78cb2bc51..1be437b4ee 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit }: +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit +, core, ipaddr, ipaddr-sexp, sexplib +}: buildDunePackage { pname = "conduit-async"; @@ -11,7 +13,16 @@ buildDunePackage { buildInputs = [ ppx_sexp_conv ppx_here ]; - propagatedBuildInputs = [ async async_ssl conduit uri ]; + propagatedBuildInputs = [ + async + async_ssl + conduit + uri + ipaddr + ipaddr-sexp + core + sexplib + ]; meta = conduit.meta // { description = "A network connection establishment library for Async"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 96f5bf43d2..077180124e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,14 @@ buildDunePackage rec { pname = "conduit"; - version = "4.0.0"; + version = "4.0.1"; useDune2 = true; minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz"; - sha256 = "74b29d72bf47adc5d5c4cae6130ad5a2a4923118b9c571331bd1cb3c56decd2a"; + sha256 = "500d95bf2a524f4851e94373e32d26b6e99ee04e5134db69fe6e151c3aad9b1f"; }; buildInputs = [ ppx_sexp_conv ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 8b0c4ee9eb..70f49ab147 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "cstruct"; - version = "6.0.0"; + version = "6.0.1"; useDune2 = true; @@ -10,7 +10,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "0xi6cj85z033fqrqdkwac6gg07629vzdhx03c3lhiwwc4lpnv8bq"; + sha256 = "4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed"; }; propagatedBuildInputs = [ bigarray-compat ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index aa003295e9..523a2c04f6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,6 +1,5 @@ { lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims , ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp -, fetchpatch }: if !lib.versionAtLeast (cstruct.version or "1") "3" @@ -11,22 +10,10 @@ buildDunePackage { pname = "ppx_cstruct"; inherit (cstruct) version src useDune2 meta; - minimumOCamlVersion = "4.07"; - - # prevent ANSI escape sequences from messing up the test cases - # https://github.com/mirage/ocaml-cstruct/issues/283 - patches = [ - (fetchpatch { - url = "https://github.com/mirage/ocaml-cstruct/pull/285/commits/60dfed98b4c34455bf339ac60e2ed5ef05feb48f.patch"; - sha256 = "1x9i62nrlfy9l44vb0a7qjfrg2wyki4c8nmmqnzwpcbkgxi3q6n5"; - }) - ]; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; - # disable until ppx_sexp_conv uses ppxlib 0.20.0 (or >= 0.16.0) - # since the propagation of the older ppxlib breaks the ppx_cstruct - # build. - doCheck = false; + doCheck = true; checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 954e4956c8..b359a397f3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.4.0"; + version = "3.5.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "6eef1240c7c85a8e495b82ef863c509ad41d75e0c45cf73c34ed1bdafd03413f"; + sha256 = "bcd5a0aef9957193cbaeeb17c22201e5ca4e815e67bbc696e88efdb38c25ec03"; }; # remove changelog for the carton package diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix index cf0272ddf3..9db8c87279 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/paf.nix @@ -3,8 +3,6 @@ , mimic , paf , ca-certs-nss -, cohttp -, cohttp-lwt , fmt , ipaddr , logs @@ -16,6 +14,12 @@ , rresult , tls , uri +, bigarray-compat +, bigstringaf +, domain-name +, httpaf +, mirage-flow +, tls-mirage }: buildDunePackage { @@ -28,8 +32,6 @@ buildDunePackage { mimic paf ca-certs-nss - cohttp - cohttp-lwt fmt lwt result @@ -41,6 +43,12 @@ buildDunePackage { mirage-time tls uri + bigarray-compat + bigstringaf + domain-name + httpaf + mirage-flow + tls-mirage ]; meta = git.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/app.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/app.nix new file mode 100644 index 0000000000..dc9006d6d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, letsencrypt +, letsencrypt-dns +, cmdliner +, cohttp-lwt-unix +, logs +, fmt +, lwt +, mirage-crypto-rng +, ptime +, bos +, fpath +, randomconv +}: + +buildDunePackage { + pname = "letsencrypt-app"; + + inherit (letsencrypt) + src + version + useDune2 + minimumOCamlVersion + ; + + buildInputs = [ + letsencrypt + letsencrypt-dns + cmdliner + cohttp-lwt-unix + logs + fmt + lwt + mirage-crypto-rng + ptime + bos + fpath + randomconv + ]; + + meta = letsencrypt.meta // { + description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index 0a70bf3024..623fba942f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -6,11 +6,6 @@ , uri , rresult , base64 -, cmdliner -, cohttp -, cohttp-lwt -, cohttp-lwt-unix -, zarith , logs , fmt , lwt @@ -20,38 +15,25 @@ , x509 , yojson , ounit -, dns -, dns-tsig , ptime -, bos -, fpath -, randomconv , domain-name }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; + sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; }; minimumOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ - cmdliner - cohttp - cohttp-lwt-unix - zarith fmt - mirage-crypto-rng ptime - bos - fpath - randomconv domain-name ]; @@ -65,11 +47,8 @@ buildDunePackage rec { asn1-combinators x509 uri - dns - dns-tsig rresult astring - cohttp-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/dns.nix new file mode 100644 index 0000000000..99058f48d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -0,0 +1,35 @@ +{ lib +, buildDunePackage +, letsencrypt +, logs +, fmt +, lwt +, dns +, dns-tsig +, domain-name +}: + +buildDunePackage { + pname = "letsencrypt-dns"; + + inherit (letsencrypt) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + letsencrypt + dns + dns-tsig + domain-name + logs + lwt + fmt + ]; + + meta = letsencrypt.meta // { + description = "A DNS solver for the ACME implementation in OCaml"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix index fedfb1c763..e786b02d93 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild -, topkg, result, lwt, cmdliner, fmt }: +, topkg, result, lwt, cmdliner, fmt +, js_of_ocaml +}: let pname = "logs"; webpage = "https://erratique.ch/software/${pname}"; @@ -19,10 +21,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg fmt cmdliner lwt ]; + buildInputs = [ findlib topkg fmt cmdliner js_of_ocaml lwt ]; propagatedBuildInputs = [ result ]; - buildPhase = "${topkg.run} build --with-js_of_ocaml false"; + buildPhase = "${topkg.run} build --with-js_of_ocaml true"; inherit (topkg) installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix new file mode 100644 index 0000000000..34feaf85c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl, ocaml_extlib, lutils, rdbg }: + +buildDunePackage rec { + pname = "lustre-v6"; + version = "6.103.3"; + + useDune2 = true; + + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.6.103.3.tgz"; + sha512 = "8d452184ee68edda1b5a50717e6a5b13fb21f9204634fc5898280e27a1d79c97a6e7cc04424fc22f34cdd02ed3cc8774dca4f982faf342980b5f9fe0dc1a017d"; + }; + + propagatedBuildInputs = [ + ocaml_extlib + lutils + rdbg + ]; + + meta = with lib; { + homepage = "http://www-verimag.imag.fr/lustre-v6.html"; + description = "Lustre V6 compiler"; + license = lib.licenses.cecill21; + maintainers = [ lib.maintainers.delta ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix new file mode 100644 index 0000000000..492a987dc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl, num }: + +buildDunePackage rec { + pname = "lutils"; + version = "1.51.2"; + + useDune2 = true; + + minimalOCamlVersion = "4.02"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz"; + sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8"; + }; + + propagatedBuildInputs = [ + num + ]; + + meta = with lib; { + homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; + description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; + license = lib.licenses.cecill21; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 4f6f2e4287..f81529ed3a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.1.0"; + version = "5.2.0"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; - sha256 = "7e9328222c1a5f39b0751baecd7e27a842bdb0082fd48126eacbbad8816fbf5a"; + sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"; }; checkInputs = [ ppx_sexp_conv ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 9d0cdd435c..4787373c1e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix @@ -1,9 +1,17 @@ -{ buildDunePackage, mirage-block, io-page, logs }: +{ buildDunePackage, fetchpatch, mirage-block, io-page, logs }: buildDunePackage rec { pname = "mirage-block-combinators"; inherit (mirage-block) version src useDune2; + patches = [ + (fetchpatch { + name = "cstruct-6.0.0-compat.patch"; + url = "https://github.com/mirage/mirage-block/pull/49/commits/ff54105b21fb32d0d6977b419db0776e6c2ea166.patch"; + sha256 = "0bwgypnsyn4d9b46q6r7kh5qfcy58db7krs6z5zw83hc7y20y2sd"; + }) + ]; + propagatedBuildInputs = [ mirage-block io-page logs ]; meta = mirage-block.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index a6867aac63..004b785410 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.12" then { - version = "1.7.0"; - sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya"; + version = "1.8.3"; + sha256 = "sha256-WO9ap78XZxJCi04LEBX+r21nfL2UdPiCLRMrJSI7FOk="; } else { version = "1.4.1"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 869e9f6335..cd01116b82 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -13,6 +13,7 @@ , pp , csexp , cmdliner +, ocamlformat-rpc-lib }: buildDunePackage rec { @@ -35,7 +36,7 @@ buildDunePackage rec { buildInputs = if lib.versionAtLeast version "1.7.0" then - [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ] + [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ cppo ppx_yojson_conv_lib diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix new file mode 100644 index 0000000000..9a1d26f21f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage, csexp, sexplib0 }: + +buildDunePackage rec { + pname = "ocamlformat-rpc-lib"; + version = "0.19.0"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; + sha256 = "sha256-YvxGqujwpKM85/jXcm1xCb/2Fepvy1DRSC8h0g7lD0Y="; + }; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + propagatedBuildInputs = [ csexp sexplib0 ]; + + meta = with lib; { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code (RPC mode)"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix new file mode 100644 index 0000000000..3ea55b8e71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -0,0 +1,51 @@ +{ lib +, buildDunePackage +, paf +, cohttp-lwt +, domain-name +, httpaf +, ipaddr +, alcotest-lwt +, fmt +, logs +, mirage-crypto-rng +, mirage-time-unix +, tcpip +, uri +, lwt +}: + +buildDunePackage { + pname = "paf-cohttp"; + + inherit (paf) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + paf + cohttp-lwt + domain-name + httpaf + ipaddr + ]; + + doCheck = true; + checkInputs = [ + alcotest-lwt + fmt + logs + mirage-crypto-rng + mirage-time-unix + tcpip + uri + lwt + ]; + + meta = paf.meta // { + description = "A CoHTTP client with its HTTP/AF implementation"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 375ba1c125..a4f3a99ce4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -4,7 +4,6 @@ , fetchpatch , mirage-stack , mirage-time -, httpaf , h2 , tls-mirage , mimic @@ -28,15 +27,16 @@ , ptime , uri , alcotest-lwt +, cstruct }: buildDunePackage rec { pname = "paf"; - version = "0.0.3"; + version = "0.0.5"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "a0bbb84b19e1f0255337fc4d7017f3ea3611b241746e391b11c1d8b1f5f30a2b"; + sha256 = "e85a018046eb062d2399fdbe8d9d3400a4d5cd51bb62840446503f557c3eeff1"; }; useDune2 = true; @@ -45,7 +45,6 @@ buildDunePackage rec { propagatedBuildInputs = [ mirage-stack mirage-time - httpaf h2 tls-mirage mimic @@ -60,6 +59,7 @@ buildDunePackage rec { faraday tls x509 + cstruct ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix new file mode 100644 index 0000000000..9281e48b6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/le.nix @@ -0,0 +1,39 @@ +{ lib +, buildDunePackage +, paf +, duration +, emile +, httpaf +, letsencrypt +, mirage-stack +, mirage-time +, tls-mirage +}: + +buildDunePackage { + pname = "paf-le"; + + inherit (paf) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + paf + duration + emile + httpaf + letsencrypt + mirage-stack + mirage-time + tls-mirage + ]; + + doCheck = true; + + meta = paf.meta // { + description = "A CoHTTP client with its HTTP/AF implementation"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rdbg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rdbg/default.nix new file mode 100644 index 0000000000..9b33678590 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rdbg/default.nix @@ -0,0 +1,31 @@ +{ lib, buildDunePackage, fetchurl, num, lutils, ounit}: + +buildDunePackage rec { + pname = "rdbg"; + version = "1.196.12"; + + useDune2 = true; + + minimalOCamlVersion = "4.07"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.1.196.12.tgz"; + sha512 = "8e88034b1eda8f1233b4990adc9746782148254c93d8d0c99c246c0d50f306eeb6aa4afcfca8834acb3e268860647f47a24cc6a2d29fb45cac11f098e2ede275"; + }; + + buildInputs = [ + num + ounit + ]; + + propagatedBuildInputs = [ + lutils + ]; + + meta = with lib; { + homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/rdbg"; + description = "A programmable debugger that targets reactive programs for which a rdbg-plugin exists. Currently two plugins exist : one for Lustre, and one for Lutin (nb: both are synchronous programming languages)"; + license = lib.licenses.cecill21; + maintainers = [ lib.maintainers.delta ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix index ceac7a7c07..0215ac1808 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: +{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async, async_find }: buildDunePackage rec { pname = "tls-async"; @@ -12,6 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ async + async_find core cstruct cstruct-async diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 5a5479c9fe..e5c9b7b54b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -5,11 +5,11 @@ buildDunePackage rec { pname = "tls"; - version = "0.13.2"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "sha256-IE6Fuvem8A3lZ/M8GLNYNwCG+v7BbPQ4QdYS+fKT50c="; + sha256 = "58cf2d517d6eac5b1ccc5eeb656da690aef2125a19c1eca3fbececd858046216"; }; minimumOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix index f5d9323361..244f3f36dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "13.0.0"; + version = "14.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1fg77hg4ibidkv1x8hhzl8z3rzmyymn8m4i35jrdibb8adigi8v2"; + sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index bb70ff6a4b..2e8a360d45 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -2,7 +2,7 @@ let pname = "uucp"; - version = "13.0.0"; + version = "14.0.0"; webpage = "https://erratique.ch/software/${pname}"; minimumOCamlVersion = "4.03"; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY="; + sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj"; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index 8520909855..8330eb2796 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "9b42f34171261b2193ee662f096566c48c48e087949c186c288f90c9b3b9f498"; + sha256 = "d91eb4f2790f9d098713c71cc4b5d12706aedb1795666b5e6d667fe5c262f9c3"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix deleted file mode 100644 index 6da500413f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, requests }: - -buildPythonPackage rec { - pname = "WazeRouteCalculator"; - version = "0.12"; - - src = fetchPypi { - inherit pname version; - sha256 = "889fe753a530b258bd23def65616666d32c48d93ad8ed211dadf2ed9afcec65b"; - }; - - propagatedBuildInputs = [ requests ]; - - # there are no tests - doCheck = false; - - meta = with lib; { - description = "Calculate actual route time and distance with Waze API"; - homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 14a2957131..84e9c9ed89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10010"; + version = "9.0.10055"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kEHbuc5gmurMznTyfn/KnZEClLHJgv2CzK4O30dIgTg="; + sha256 = "sha256-RaYwPWKFYbDbWm5lZYk9qaDCgL8HcimIRZasbPPOlqo="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 7d6276e53e..e537222f4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -1,26 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, aiohttp }: +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "aiounifi"; - version = "26"; + version = "27"; - disabled = ! isPy3k; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "3dd0f9fc59edff5d87905ddef3eecc93f974c209d818d3a91061b05925da04af"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = pname; + rev = "v${version}"; + sha256 = "09bxyfrwhqwlfxwgbbnkyd7md9wz05y3fjvc9f0rrj70z7qcicnv"; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - # upstream has no tests - doCheck = false; + checkInputs = [ + aioresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiounifi" ]; meta = with lib; { - description = "An asynchronous Python library for communicating with Unifi Controller API"; - homepage = "https://pypi.python.org/pypi/aiounifi/"; - license = licenses.mit; + description = "Python library for communicating with Unifi Controller API"; + homepage = "https://github.com/Kane610/aiounifi"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix index 1117557a8a..562ec0d2c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k -, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme +{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook +, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false }: buildPythonPackage rec { pname = "alot"; - version = "0.9.1"; + version = "0.10"; outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "pazz"; repo = "alot"; rev = version; - sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; + sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; }; postPatch = '' @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ - notmuch + notmuch2 urwid urwidtrees twisted @@ -35,11 +35,14 @@ buildPythonPackage rec { gpgme ]; - # some twisted tests need the network (test_env_set... ) - doCheck = false; postBuild = lib.optionalString withManpage "make -C docs man"; - checkInputs = [ gawk future mock gnupg procps ]; + checkInputs = [ gawk future mock gnupg procps pytestCheckHook ]; + # some twisted tests need internet access + disabledTests = [ + "test_env_set" + "test_no_spawn_no_stdin_attached" + ]; postInstall = let completionPython = python.withPackages (ps: [ ps.configobj ]); @@ -61,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ edibopp ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 7ec9305689..cf1c5c160c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10010"; + version = "9.0.10055"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-UWg3lrBMfQsR09wbx8F2nml8eymk7V60gwFbPXwNqAw="; + sha256 = "sha256-egj24DBP2Bq2GMYOhZZPXmnobpbjxbD2V8MWwZpqhUg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index e7a3585c0f..4b16964fa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10010"; + version = "9.0.10055"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VCVvJI98gyVZC2SPb5hd8FKLTYUhEILJtieb4IQGL2c="; + sha256 = "sha256-OAn57lt25ZmEU62pJLJd+3T0v2nCYRDnwuVhiZfA7Uk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index c5777d7c51..9c15537af3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.1.0"; + version = "5.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; + sha256 = "d167890e37f14f3f26b588ff2598af35faa5c27612264ea1125509c8ff860834"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 9ef6cd046d..6f7f3c47ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10010"; + version = "9.0.10055"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eyquud4Cc0bU4z+ElWs/gPzuNRtNKPMxWjSLpwFlBXQ="; + sha256 = "sha256-eQBART7WSAJKQRKNwmR1JKTkrlerHeHVgTK5v0R644Q="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asmog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asmog/default.nix new file mode 100644 index 0000000000..a1d8c340ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asmog/default.nix @@ -0,0 +1,38 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asmog"; + version = "0.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "14b8hdxcks6qyrqpp4mm77fvzznbskqn7fw9qgwgcqx81pg45iwk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project doesn't ship the tests + # https://github.com/kstaniek/python-ampio-smog-api/issues/2 + doCheck = false; + + pythonImportsCheck = [ "asmog" ]; + + meta = with lib; { + description = "Python module for Ampio Smog Sensors"; + homepage = "https://github.com/kstaniek/python-ampio-smog-api"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix index 251205419f..1e44ee8fa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix @@ -29,13 +29,17 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Test is currently failing on Hydra, works locally + "test_slices" + ]; + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; description = "Annotate Python AST trees with source text and token information"; license = licenses.asl20; - platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index f9256b11ae..a4cd45ccde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.21.3"; + version = "0.22.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-85MdzvNac199pZObhfGv33ycgzt4nr9eHYvSjMW6kq8="; + sha256 = "sha256-bo01BMBf2AWpJPkHdAMpxz6UtHYs02TwNOOCKn/HLmI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index 1826291da5..2ccba6995a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -1,5 +1,17 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytestCheckHook, autoconf -, automake, cmake, gcc, libtool, perl, simplejson }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, isPy27 +, pytestCheckHook +, autoconf +, automake +, cmake +, gcc +, libtool +, perl +, simplejson +}: buildPythonPackage rec { pname = "awslambdaric"; @@ -13,6 +25,14 @@ buildPythonPackage rec { sha256 = "1r4b4w5xhf6p4vs7yx89kighlqim9f96v2ryknmrnmblgr4kg0h1"; }; + patches = [ + (fetchpatch { + # https://github.com/aws/aws-lambda-python-runtime-interface-client/pull/58 + url = "https://github.com/aws/aws-lambda-python-runtime-interface-client/commit/162c3c0051bb9daa92e4a2a4af7e90aea60ee405.patch"; + sha256 = "09qqq5x6npc9jw2qbhzifqn5sqiby4smiin1aw30psmlp21fv7j8"; + }) + ]; + postPatch = '' substituteInPlace requirements/base.txt \ --replace 'simplejson==3' 'simplejson~=3' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index a63810af11..40e5cbab3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-extendedlocation"; - version = "1.0.0b2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A="; + sha256 = "e2388407dc27b93dec3314bfa64210d3514b98a4f961c410321fb4292b9b3e9a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index dea3506999..dbe22478d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "5.0.0"; + version = "5.1.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2d5163c49f91636809ef1cacd48d91130803594855f43afe0f2b31fc5f02d53c"; + sha256 = "306088088ee10e86c4cf24cc82a9ca619db5cdfc0da3fa207d00ec7f77f06e8e"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index b813eb47c6..a83574629f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.9.0"; + version = "1.9.1"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "01prcwkmh3a4ggzjiaai489rrpmgwvqpjcavwjxw60mspyhsbv86"; + sha256 = "0pwaqajwxkb8c7rnb6cvpz877azs13f1mdq33z5gp2v09fj8s2b0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 1db9b5959e..e403891726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10010"; + version = "9.0.10055"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bcVbGDUTVLQ6ybPA2HjRlHJj1gnYK2dazhZXc9k0uSY="; + sha256 = "sha256-QHhZVnUv54I8R7oCOBJgBcKZr8csg2OEOGxn4MKgmtk="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix index 3faf07966d..1accefe5f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix @@ -1,32 +1,32 @@ -{ - buildPythonPackage, - fetchPypi, - lib, - nose, - six, - typing ? null, - isPy27, +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pythonOlder }: buildPythonPackage rec { pname = "class-registry"; - version = "2.1.2"; + version = "3.0.5"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0zjf9nczl1ifzj07bgs6mwxsfd5xck9l0lchv2j0fv2n481xp2v7"; + src = fetchFromGitHub { + owner = "todofixthis"; + repo = pname; + rev = version; + sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; }; - propagatedBuildInputs = [ six ] ++ lib.optional isPy27 typing; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; - # Tests currently failing. - doCheck = false; + pythonImportsCheck = [ "class_registry" ]; - meta = { - description = "Factory+Registry pattern for Python classes."; + meta = with lib; { + description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kevincox ]; + license = licenses.mit; + maintainers = with maintainers; [ kevincox ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 3d709b749d..0a55542b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10010"; + version = "9.0.10055"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fq/xkcG6wLRaXG37UEf/3r+EsacpkP2iA+HZLT05ETg="; + sha256 = "sha256-fqnumSz3BfpG5/ReQQOhSGvsOMuinLs8q2HlPAxYQWM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix index f42a97c065..21993af3eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, cchardet , chardet , cleo , clikit @@ -12,17 +13,18 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "v${version}"; - sha256 = "09ccgydnrfdgxjz6ph829l9q62jkzqrak0k6yjik2rvs33jn0dhc"; + sha256 = "sha256-ynS3G2ZcEqVlC2d6n5ZQ1Em5lh/dWESj9jEO8C4WzZQ="; }; propagatedBuildInputs = [ + cchardet chardet cleo clikit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index c165c9af7a..c3b06b7d9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.4.0"; + version = "9.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; + sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index 42fa8fd8dd..2f1797bf4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.7"; + version = "6.8.1"; src = fetchPypi { inherit pname version; - sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; + sha256 = "3f16d3d40f7f2e1f6032132170d8fd4ba2f4f9ea419f13d7a68091bbe1949583"; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix index 9ffb579639..a1010f96d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "380b660474be40ce88b5f04fa93470449124dbc850a0318f2ef186162bc1360b"; + sha256 = "0e967db31ea10699667dd07790f98cf9d612ee6864df162c64e4954a8e30f90d"; }; buildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix new file mode 100644 index 0000000000..05625f9283 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyserial-asyncio +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "elkm1-lib"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "gwww"; + repo = "elkm1"; + rev = version; + sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyserial-asyncio + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/gwww/elkm1/pull/45 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch"; + sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9"; + }) + ]; + + pythonImportsCheck = [ "elkm1_lib" ]; + + meta = with lib; { + description = "Python module for interacting with ElkM1 alarm/automation panel"; + homepage = "https://github.com/gwww/elkm1"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix index a859f509f3..4a8085e0d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.0.0.2"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4="; + sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix new file mode 100644 index 0000000000..ba0e120442 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, marshmallow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faraday-agent-parameters-types"; + version = "1.0.1"; + + src = fetchPypi { + pname = "faraday_agent_parameters_types"; + inherit version; + sha256 = "0q2cngxgkvl74mhkibvdsvjjrdfd7flxd6a4776wmxkkn0brzw66"; + }; + + propagatedBuildInputs = [ + marshmallow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ "faraday_agent_parameters_types" ]; + + meta = with lib; { + description = "Collection of Faraday agent parameters types"; + homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix new file mode 100644 index 0000000000..a65daa55f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix @@ -0,0 +1,41 @@ +{ lib +, bleak +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fjaraskupan"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "elupus"; + repo = pname; + rev = version; + sha256 = "0r6l9cbl41ddg4mhw9g9rly9r7s70sscg1ysb99bsi8z6xml9za3"; + }; + + propagatedBuildInputs = [ + bleak + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "fjaraskupan" ]; + + meta = with lib; { + description = "Python module for controlling Fjäråskupan kitchen fans"; + homepage = "https://github.com/elupus/fjaraskupan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index b7b81b6b44..cf9924f528 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "1js1nbal020ilqdrmd471zjab9jj6489fxy4583n55bh5fyiac6i"; + sha256 = "sha256-yjb4dpcQt2se5GT+wodh4UC9LAF4JmYrdX89VIdkk0U="; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch @@ -63,8 +63,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3, <5" \ - --replace "click>=6.7, <8" "click" \ + --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ --replace "Flask>=0.12, <2" "Flask" \ --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \ --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \ @@ -72,6 +71,7 @@ buildPythonPackage rec { --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \ --replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \ + --replace "prison>=0.2.1, <1.0.0" "prison" \ --replace "SQLAlchemy<1.4.0" "SQLAlchemy" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index 9739659560..5cb1bac878 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,19 +1,24 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, requests +}: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.6.0"; + version = "1.7.0"; + + disabled = pythonOlder "3.6"; - # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "16sbv6ql6jd13lim88z8vl5205xppza10340bmq5m5f3lvzb7mpc"; + sha256 = "sha256-1HzeNtSqzqr9zyxF1PVWi6QfRupw8huMYmdFI6rzIdY="; }; - disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ requests ]; checkInputs = [ pytestCheckHook ]; @@ -21,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fritzconnection" ]; meta = with lib; { - description = "Python-Tool to communicate with the AVM Fritz!Box"; + description = "Python module to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 1528136bc3..41220683a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "3.13.1"; + version = "3.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vh1NKRPk1e5cT3cVj8IrzmpaZ9yY2KtWrTGsCU9KkP4="; + sha256 = "sha256-pxmdfmt3YQnyUWEYadDde6IC5Nm5faNugvn8omLMXSE="; }; propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix new file mode 100644 index 0000000000..089c4240f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix @@ -0,0 +1,55 @@ +{ buildPythonApplication +, click +, fetchPypi +, git +, httpretty +, lib +, qrcode +, pygments +, pyopenssl +, pytestCheckHook +, requests +, rollbar +, stripe +, sure +}: + +buildPythonApplication rec { + pname = "gigalixir"; + version = "1.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b7a9aed7e61a3828f5a11774803edc39358e2ac463b3b5e52af267f3420dc66"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + click + requests + stripe + rollbar + pygments + qrcode + pyopenssl + ]; + + checkInputs = [ + httpretty + sure + pytestCheckHook + git + ]; + + pythonImportsCheck = [ "gigalixir" ]; + + meta = with lib; { + description = "Gigalixir Command-Line Interface"; + homepage = "https://github.com/gigalixir/gigalixir-cli"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index fccae98ac0..9bac30fd3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.7.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nMUMGFU383TC7cXkj6EHaEe4HHS5NzcLBIxp1xgWUzg="; + sha256 = "f58192b534b5324c874547835808ed7d5c116e986f07e57b27b0ac5e12baddca"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index c0ec04b433..f476dcea7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "6e2eb65ccd75c6579214fb2099cfb98c57b2b4907ccb38a2ed21f00f492b7a50"; + sha256 = "ef7572cbc83412dbc9cadd95962e77bfa9962a5cb030706638a4aafa7cad84aa"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 0daff0ac2c..702deeb6eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.3.1"; + version = "2.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "166pcra1x8lisgf7cla4vq97qpc1hrpwnvlj1sza1igny2m59w5i"; + sha256 = "c59ceebe2ff5d45a7367ddbe1a702bbbb010d6d3423d278797835d59e885fa50"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index f3a5642927..507ba6aef1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vMzq4ffA7877zRtdZ+VpFdEHU0BZhDdhgxuk5154hMU="; + sha256 = "cb31a864be75c47880748b6c81f0c57cbce190a87e402ce32b2b772be2dba5fa"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index b521854c4b..5dc2f5eead 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4"; + sha256 = "4dc498d6fede223049c415f301ba1129ecaf628f31a77ae87d2678e6d71556f6"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index a18872d562..632a81691e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "a88f21b7a110dc9b5fd8e5bc9c07330fafc9ef150921505250aec0f0b25cf5e8"; + sha256 = "1d2c86cf6df12b5fc024b8035ca1130d93654ba984f3026eaa5854dd538d7841"; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6436fe9d60..e204436b33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "84ae86a2320425df2e78d981d4ab26bff591ade1b978c18c929188b741a7b37d"; + sha256 = "6508a260ea273de0ff17d0bf66a3f93009a9b02ace7736486f70a91789c3e34a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 1832978aab..bb74540b0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.10.0"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "49b946f9ae67ebae69d39f1f4ceabe88971b880b92277ce037651db49e5cf167"; + sha256 = "8ffb36f3c1392213c9dff57f1dcb18810f6e805898ee7b4626a4da2b9b6c4b63"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 59d08bd8e5..9eb3fcf242 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.9.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "2368beb60e5cdeb6db527509cdcc8fc1156eddfc0c73da8f62d60658a551eee1"; + sha256 = "321a11863124d2fba73c519594d5a8803650f1f4323b08b9de3d096e536e98c1"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index db74ce3981..138637d70a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4QOKG7Forf3x5l1XQbbX4A8upIxe+eCiwhPily26du4="; + sha256 = "af870971187b3d58fc87a81323cabec1628fac910c6af82076dd6270b111f17e"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index cbe06a7226..4b328e139e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oq7AMZ1so8IR7nn8fIhUr4oOJEJp1FQPxiJIh+1bMLA="; + sha256 = "593e73edb31ecb8e079c83c65dca29a593208f81a7506e6ef20aeecf611f2a9d"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix index 31ac03347c..ddc638b55c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d"; + sha256 = "a208264ed252a39b29a0b0f7ccc4c4ffb941398715aec84c3a547281a43c4eb8"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index eb27a5596b..690e4e8141 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "d440f2bc089ff628618c536904d5bc39d0b44f7afdda4c4c1ecd15fcf385bfba"; + sha256 = "3891b1df82369acbc8451d4952cd20755f49a82398dce62437511ad17b47290e"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix index ce2acc33a9..ba9511a078 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,15 +6,17 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-25pfMciEJUFjr2ocOb6ByAel6Je6lYdiTWcG3RBI8WA="; + sha256 = "sha256-1KENsAnBQXWSu/s96+yt+gTY2NXVG2Spcelp12Gp8+E="; }; checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "hijri_converter" ]; + meta = with lib; { description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; homepage = "https://github.com/dralshehri/hijri-converter"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 48892b8d79..7ac02fa05a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.11.2"; + version = "0.11.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0nqxan6nr3jp63i3sbb9s1v5dlig22bl927a6pl1ahks8cnr7rkn"; + sha256 = "4855afe0ebf428efbcf848477828b889f8515be7f4f15ae26682919369d92774"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index aad2e3e07a..bb29504d63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w"; + sha256 = "eaf576b1ba3523a0facf3aaa483ca17e326301e53e7678c54d73b7e0250edd43"; }; propagatedBuildInputs = [ scikit-learn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index d050bd1c8d..d884e7ff45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1c6inlhpxarvkniq8j5j2pgl32dmggn14s8c3c0xx15j7cg90413"; + sha256 = "f963e90671fec51d1b248862a9bcc4639c1d6d3b1dbc1ee34d042cb765d8730a"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index 0ccb1b2a4e..a600c28846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.5.0"; + version = "1.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e8549a7ac7dc45948a5f2735e17f97622313c7fea24ea3c1bd4a5ebf02bf5638"; + sha256 = "61c21e698d99ec9dc22a155e8c00d50add99a2976b48cdfeab6bc010d2414f8b"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index 86f435bc8f..7a4873a00e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.2"; + version = "1.17.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QTisaO0LNjZ+dltHCqyWDQDNCGTqc8woMSwqsoyfhbk="; + sha256 = "sha256-8GTRBoZuA/fsfVxCBpvNefWHuWLvN/L/BT31OFpslxA="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 570fb0a1d1..0ad388db32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.2"; + version = "0.4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "340915c17ebef7451948341542bf4789fc8d8c9fe604e86f00b722b6074a89f0"; + sha256 = "f6f376c72ec1c0dfd69fcc2721d711f6ca1fe22bf71f99e6884c5e43e9b58c95"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 9ab6b3b842..2562f1738d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.13"; + version = "3.1.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "48a6214ba8310d8bdb3eb6bac8eedf449c77d1bbb6f81b586267c158ad00b899"; + sha256 = "13174cb6076dd5da6f1b85725ccfcc9518d8f98e86b8b644fc89b1dfaeda63a9"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index ea9710ecd3..ca2703389b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -3,19 +3,22 @@ , chardet , fetchFromGitHub , karton-core -, python +, pytestCheckHook , python_magic +, pythonOlder }: buildPythonPackage rec { pname = "karton-classifier"; - version = "1.1.0"; + version = "1.2.0"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0s09mzsw546klnvm59wzj9vdwd2hyzgxvapi20k86q3prs9ncds6"; + sha256 = "sha256-AG2CtNMgXYfbdlOqB1ZdjMT8H67fsSMXTgiFg6K41IQ="; }; propagatedBuildInputs = [ @@ -30,11 +33,9 @@ buildPythonPackage rec { --replace "python-magic==0.4.18" "python-magic" ''; - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest discover - runHook postCheck - ''; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "karton.classifier" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix index fe35126ea2..8cfd377a4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion."; - homepage = https://github.com/mnmelo/lazy_import; + homepage = "https://github.com/mnmelo/lazy_import"; license = licenses.gpl3; maintainers = [ maintainers.marenz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index f33e63db02..a6882850f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "maxminddb"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c47b8acba98d03b8c762684d899623c257976f3eb0c9d557ff865d20cddc9d6b"; + sha256 = "e37707ec4fab115804670e0fb7aedb4b57075a8b6f80052bdc648d3c005184e5"; }; buildInputs = [ libmaxminddb ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mbddns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mbddns/default.nix new file mode 100644 index 0000000000..05137b56b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mbddns/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mbddns"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "thinkl33t"; + repo = "mb-ddns"; + rev = version; + sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mbddns" ]; + + meta = with lib; { + description = "Mythic Beasts Dynamic DNS updater"; + homepage = "https://github.com/thinkl33t/mb-ddns"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix index eb7fc8ca60..a90b3868eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-19K5DZMstRWu/6+N/McEdM1swedI5qr15kmnIAMA60Y="; + sha256 = "878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165"; }; propagatedBuildInputs = [ mutagen six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 3c68a57672..f24be42191 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.5.2"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "0ndfxdg10m9mahnwbs66dnyc1lr8q7vs71y6zwxlc0h27hr3gr0d"; + sha256 = "sha256-goKJLI1iUHR6CrciwzsOHyN7EjdLHJufDVuA9Qa9Ftk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index bd6ada6ecd..4f31c51219 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.3"; + version = "7.0.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-j1lipshccPUpMR+o28hDyaJbrVgj6AHijFqOgVmrBkg="; + sha256 = "sha256-424WNG9Yj+Zfo1UTh7emknZ7xTtpFPz7Ph+FpE149FM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index e0a67d4f65..0a82522345 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.4.0"; + version = "5.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE="; + sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 645606ffc0..9bcb20595e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.48"; + version = "1.18.51"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a14917021aac10432887b2acb634be8d66401ffb87cdb0fc271aff867929538c"; + sha256 = "3e932af8f4b400df54f93ec48da31c365d2068b31e4e8d04705510f787e6a5f6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix index c63c6df86f..6c7935c39b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.44.0"; + version = "1.44.1"; src = fetchPypi { inherit pname version; - sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; + sha256 = "ec0f40465fad5260a1b2c1ad39dc12c5df65828e171bf2aafb13c1c3883628ba"; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 019acbd656..38acf736b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.4"; + version = "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d2288d9607097a08529d9165970261c1be956934e8a8f6d9ed2a96d9b8f03fc6"; + sha256 = "3bb74df084b149e8bf969380d88b1980fbd1aeda7f7057f4dee6751d854d6ae6"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix index 2b12c16135..34cea0a222 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "5dc7d76bfb1da06ac048066ced75603340d0d7ba8a7dbfce4040d6f126eda0d5"; + sha256 = "27c2a87a98ea0e9a08c7c46e6df47d6d4e753ad9991fea2901892425d89c99a6"; }; propagatedBuildInputs = [ pyparsing amply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix index 93f7dcdc0a..009bb44602 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "0.1.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "v${version}"; - sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d"; + sha256 = "sha256-z7MDz9fGwZY4JcqabeYFGZ9nsRU2qa5LYnNQx/ae/4Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydoods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydoods/default.nix new file mode 100644 index 0000000000..ff0872e423 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydoods/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pydoods"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1brpcfj1iy9mhf2inla4gi681zlh7g4qvhr6vrprk6r693glpn3x"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pydoods" ]; + + meta = with lib; { + description = "Python wrapper for the DOODS service"; + homepage = "https://github.com/snowzach/pydoods"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflexit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflexit/default.nix new file mode 100644 index 0000000000..6f1f582a93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflexit/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyflexit"; + version = "0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Sabesto"; + repo = pname; + rev = version; + sha256 = "1ajlqr3z6zj4fyslqzpwpfkvh8xjx94wsznzij0vx0q7jp43bqig"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyflexit" ]; + + meta = with lib; { + description = "Python library for Flexit A/C units"; + homepage = "https://github.com/Sabesto/pyflexit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynello/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynello/default.nix new file mode 100644 index 0000000000..43852cbcd4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynello/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, pythonOlder +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "pynello"; + version = "2.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = pname; + rev = version; + sha256 = "015rlccsn2vff9if82rjj2fza3bjbmawqhamc22wq40gq7pbfk5i"; + }; + + propagatedBuildInputs = [ + python-dateutil + requests + requests_oauthlib + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pynello" ]; + + meta = with lib; { + description = "Python library for nello.io intercoms"; + homepage = "https://github.com/pschmitt/pynello"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynobo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynobo/default.nix index 52cada8278..e70010901e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynobo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynobo/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "echoromeo"; repo = pname; rev = "v${version}"; - sha256 = "0f98qm9vp7f0hqaxhihv7y5swciyp60222la44f4936g0rvs005x"; + sha256 = "sha256-tcDSI5GODV53o4m35B4CXscVCnwt7gqRu7qohEnvyz8="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyombi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyombi/default.nix new file mode 100644 index 0000000000..912c076ae3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyombi/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyombi"; + version = "0.1.10"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ykbmdc2v05ly9q358j7g73ma9fsqdlclc8i0k1yd0bn7219icpx"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyombi" ]; + + meta = with lib; { + description = "Python module to retrieve information from Ombi"; + homepage = "https://github.com/larssont/pyombi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix new file mode 100644 index 0000000000..b49599cfda --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pypoolstation"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyPoolstation"; + inherit version; + sha256 = "0qacrjv3qybgx052i8jqs4il3k2g0cdhjcn2lqapv87iqyp287k0"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pypoolstation" ]; + + meta = with lib; { + description = "Python library to interact the the Poolstation platform"; + homepage = "https://github.com/cibernox/PyPoolstation"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix index aaecd191e9..3005c26f77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4a2138d7d567bc581fe081b6a5975849a2a36b3925cb0f066d2380103e13741c"; + sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3"; }; postPatch = '' # setuptools-scm is pinned to <6 because it dropped Python 3.5 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 1b35f64bd7..7f51ccac6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU="; + sha256 = "sha256-aAoTeQZCtxddVBPwlyv2j4aACMO9p0vQ/ESkkv4E3VE="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix new file mode 100644 index 0000000000..6bb111a07e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyhamcrest +, pytestCheckHook +, requests +, requests-mock +, six +}: + +buildPythonPackage rec { + pname = "python-owasp-zap-v2-4"; + version = "0.0.18"; + + src = fetchFromGitHub { + owner = "zaproxy"; + repo = "zap-api-python"; + rev = version; + sha256 = "0b46m9s0vwaaq8vhiqspdr2ns9qdw65fnjh8mf58gjinlsd27ygk"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + pyhamcrest + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "zapv2" ]; + + meta = with lib; { + description = "Python library to access the OWASP ZAP API"; + homepage = "https://github.com/zaproxy/zap-api-python"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 2b5c9c84a8..5a672b2dec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -3,19 +3,20 @@ , buildPythonPackage , fetchFromGitHub , mock +, msgpack , pytestCheckHook , python-engineio }: buildPythonPackage rec { pname = "python-socketio"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ="; + sha256 = "sha256-0Q1R8XPciU5AEkj7Exlc906eyA5juYKzzA/Ygnzx7XU="; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { checkInputs = [ mock + msgpack pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index aebc5d7598..adb675c0db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -25,6 +25,10 @@ buildPythonApplication rec { stestr ]; + postInstall = '' + install -Dm644 tools/swift.bash_completion $out/share/bash_completion.d/swift + ''; + checkPhase = '' stestr run ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 2b7b56a340..8e35569925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.27.0"; + version = "2.29.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "1j14m4mdvpq740bxz3mhs5k02jfp425xig4yb13drx37p4yyl9zn"; + sha256 = "sha256-Hq58DJe8ZLZSJdhqSxfTaZPnWae2aQFCe7lH+6Y6ABg="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 786eb56066..6a4215236d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10010"; + version = "9.0.10055"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1vAiDXMYiclK5P8QZUBuy6KllcAQm8d7rQpN+CBDVVA="; + sha256 = "sha256-ZfsFr8EkzdDYMyE/OJVwQylHVKcOrW1NBMI8cGmyF9A="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index 57b50f820f..c0992e9825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.22.0"; + version = "0.23.0"; checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "1d7fc613fbe30189cfa970a863a5955865b1116ff651d20325c721b6f0ef1f52"; + sha256 = "642bc86ce937621ddfb1291cbff0851be16b26feb5eec562296999e36181cee3"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix index 9508a86e33..cf7bed958e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -5,7 +5,6 @@ , click , dateparser , fetchFromGitHub -, fetchpatch , marshmallow-dataclass , poetry-core , pyjwt @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "049kh63yk0r0falqbl5akcwgzqjrkqqhf9y537rrlzc85ihf28b8"; + sha256 = "sha256-b3oHpERUqeIw0yOxZytQuRE4jVUcahWlMQ+7ZBX0KL8="; }; nativeBuildInputs = [ @@ -48,15 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/hacf-fr/renault-api/pull/371 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/hacf-fr/renault-api/commit/5457a612b9ff9f323e8449cbe9dbce465bd65a79.patch"; - sha256 = "0ds9m4j2qpv0nyg9p8dk9klnarl8wckwclddgnii6h47qci362yy"; - }) - ]; - pythonImportsCheck = [ "renault_api" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix new file mode 100644 index 0000000000..60787d5158 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix @@ -0,0 +1,47 @@ +{ aiocontextvars +, blinker +, buildPythonPackage +, fetchPypi +, httpx +, lib +, mock +, pytestCheckHook +, requests +, six +, unittest2 +, webob +}: + +buildPythonPackage rec { + pname = "rollbar"; + version = "0.16.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + webob + blinker + unittest2 + mock + httpx + aiocontextvars + pytestCheckHook + ]; + + pythonImportsCheck = [ "rollbar" ]; + + meta = with lib; { + description = "Error tracking and logging from Python to Rollbar"; + homepage = "https://github.com/rollbar/pyrollbar"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix index 742c404a84..ab51a47d19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2021.7.8"; + version = "2021.9.23"; src = fetchPypi { inherit pname version; - sha256 = "f931a2600e7f0824ac51ebde86ee40295146cc1ad5f88fdc208b0a12fcb2ddb3"; + sha256 = "94808e6d747143cc9d50aa946cf5b1e61dbd4d8bc6229a7a5f57db6cedf38a47"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index d4e31966da..8f02f67c1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.8"; + version = "0.4.9"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0x5p42c9iqwdx15gdvccddlx4a5a8aix7h01345afrlgpnnpqcv4"; + sha256 = "0y70nx94y2qf0zmaqjq4ljld31jh277ica0j4c3ck2ph7jrs5pg0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index a3cd63d485..d3b027924c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = version; - sha256 = "1lbarsa9wpm7hnhgf2g253w0gs80cn989dnj4aqmic57x5isikhz"; + sha256 = "sha256-XZvx/GWpz49dsiY9pgMfX+6gUfWA8q6IpnzmCRPFHus="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 2f8930cd67..d767894159 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.4.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "4297555ddc37c7136740e6b547b7d68f5bca0b4832f94ac097e5d531a4c77528"; + sha256 = "b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index e0f6c1b14d..3f4ec9a0f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.6.1"; + version = "2.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "dbe6f7d84debd27b117e17fdb280be27695cf6ae54009c49495584d1b7776d1b"; + sha256 = "ce131b1dd059a4d081e78595d618654bf9b9fc184d78352f24512375467257d1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix index c5f1ad73fc..621da7ae8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "somecomfort"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "681f44449e8c0a923305aa05aa5262f4d2304a6ecea496caa8d5a51b724a0fef"; + sha256 = "sha256-CbV8NOpCXzVz0dBKhUclUCPrD4530zv5HIYxsbNO+OA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 490b2d25a2..b82d1afe47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.21"; + version = "0.22"; src = fetchPypi { inherit pname version; - sha256 = "53e1808dc2b1f3ec20c177fa3fa6d438d75ef572a25a489e330bb01130508d87"; + sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686"; }; # No tests included. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunwatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunwatcher/default.nix new file mode 100644 index 0000000000..ee3a2e200b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunwatcher/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "sunwatcher"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sunwatcher" ]; + + meta = with lib; { + description = "Python module for the SolarLog HTTP API"; + homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix index b0966ca2c7..ec4a63f65d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "What-If Tool TensorBoard plugin."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix index 7b16d66687..5e80ac14e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thrift/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "thrift"; - version = "0.13.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89"; + sha256 = "87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29"; }; propagatedBuildInputs = [ six ]; @@ -18,11 +18,12 @@ buildPythonPackage rec { # No tests. Breaks when not disabling. doCheck = false; + pythonImportsCheck = [ "thrift" ]; + meta = with lib; { description = "Python bindings for the Apache Thrift RPC system"; - homepage = "http://thrift.apache.org/"; + homepage = "https://thrift.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index 93d401bf9a..4463b9fcc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.7.1"; + version = "2021.8.3"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-F7qVvQVU6OlVU98zmFSQ1SLVCAx+lhz+cFS//d0SHUQ="; + sha256 = "sha256-2iTH/Him4iMZadkmBR8Rwlt3RCqDXzR6ZqNHciNiHIk="; }; propagatedBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { export PYTHONPATH="total_connect_client:$PYTHONPATH" ''; + disabledTests = [ + # Tests require network access + "tests_request" + ]; + pythonImportsCheck = [ "total_connect_client" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix index 8428f0b06e..b472042dd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "translatepy"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "Animenosekai"; repo = "translate"; rev = "v${version}"; - sha256 = "Rt6FvB4kZVaB/jxxqOHsnkReTFCCyiEaZf240n0zVZs="; + sha256 = "0xj97s6zglvq2894wpq3xbjxgfkrfk2414vmcszap8h9j2zxz8gf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 1a06448db9..3420773372 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.8"; + version = "3.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "821eda19809dca7ad50eaf42ed8debb72ec0e3b1f04f63b8b2414a05075c132e"; + sha256 = "ef3a931fc1f1db74edf8660e475b9295e0904ee922030ef0e45b0c73f4be65ae"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix new file mode 100644 index 0000000000..49ff7ddf08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix @@ -0,0 +1,50 @@ +{ lib +, appdirs +, buildPythonPackage +, dnspython +, fetchPypi +, filelock +, idna +, pytestCheckHook +, uritools +}: + +buildPythonPackage rec { + pname = "urlextract"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yxOuiswFOJnAvxwTT++Zhk8nZWK2f4ePsQpUYI7EYS4="; + }; + + propagatedBuildInputs = [ + appdirs + filelock + idna + uritools + ]; + + checkInputs = [ + dnspython + pytestCheckHook + ]; + + disabledTests = [ + # fails with dns.resolver.NoResolverConfiguration due to network sandboxing + "test_check_dns_enabled" + "test_check_dns_find_urls" + "test_dns_cache_init" + "test_dns_cache_negative" + "test_dns_cache_reuse" + ]; + + pythonImportsCheck = [ "urlextract" ]; + + meta = with lib; { + description = "Collects and extracts URLs from given text"; + homepage = "https://github.com/lipoja/URLExtract"; + license = licenses.mit; + maintainers = with maintainers; [ ilkecan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix index 9882724fbb..cc9d772eda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix @@ -1,22 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: buildPythonPackage rec { pname = "voluptuous"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0js4avmhmmys78z376xk1w9305hq5nad8zqrnksgmpc1j90p4db6"; + sha256 = "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM="; }; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; + checkPhase = '' nosetests ''; + pythonImportsCheck = [ "voluptuous" ]; + meta = with lib; { - description = "Voluptuous is a Python data validation library"; + description = "Python data validation library"; homepage = "http://alecthomas.github.io/voluptuous/"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix new file mode 100644 index 0000000000..e208e3a768 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-httpserver +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "vt-py"; + version = "0.7.4"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "VirusTotal"; + repo = pname; + rev = version; + sha256 = "149fgrqnwf8nyv3msj6p614zbdi7m7s785y3fvh8fm8k7lmgqk8w"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytest-httpserver + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ "vt" ]; + + meta = with lib; { + description = "Python client library for VirusTotal"; + homepage = "https://virustotal.github.io/vt-py/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix new file mode 100644 index 0000000000..dd84096246 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "wazeroutecalculator"; + version = "0.13"; + + src = fetchPypi { + pname = "WazeRouteCalculator"; + inherit version; + sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ "WazeRouteCalculator" ]; + + meta = with lib; { + description = "Calculate actual route time and distance with Waze API"; + homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index a2bd27d9f1..0232092c48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "1.7.1"; + version = "1.8.0"; pname = "xmlschema"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "124wq44aqzxrh92ylm44rry9dsyb68drgzbhzacrm511n1j0ziww"; + sha256 = "1k41zzffg9srhgnvi1s1akaqpwz2z003xbvig8axwlkm7z0d4xiz"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix index 8f31c892d0..8c10105522 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.4.8"; + version = "1.4.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "aafa940d77ecd37bb7af802da53caed9be8861c6abe3004abb04315155b4a3ad"; + sha256 = "9c75540d41f6dcfd19f2f70fbe8346406e026a016aae56b87c207a0b4ff571e0"; }; propagatedBuildInputs = [ httpx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix index 9a0727c82e..864155c2a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "2.0.0"; + version = "2.2.0"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "0fb7c7pnz86pcs6qqwlyw72vnijc04ns2h1zfrm0h7yl8q7r7ng0"; + sha256 = "584127173db0a2647af0fc8cb935130b1594398c611e94fb09a719e09e1ed4bd"; }; # fails.. diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index 65416d9295..70afd412f3 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -38,7 +38,7 @@ let filteredGemset = filterGemset { inherit ruby groups; } importedGemset; configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs: - applyGemConfigs (attrs // { inherit ruby; gemName = name; }) + applyGemConfigs (attrs // { inherit ruby document; gemName = name; }) ); hasBundler = builtins.hasAttr "bundler" filteredGemset; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 66e876ec81..2902041e51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.10"; + version = "0.58.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VMnc4frDBAkVc9hqUdXAiJ2vNsK9NzkLOUaQWhQQUBU="; + sha256 = "sha256-IapWH7bkjrFmdkGHUHROECmfF3su4HtJJ8Ii5a4GSRg="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 90b17ed9bb..592564878e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.6"; + version = "2.9.7"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0a8lq0yalar8szw155cxa8kywnk6yvakwi3xmxm1ahivn7i5hjq9"; + sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; }; jarsrc = fetchurl { - # NOTE: This is actually a .jar, Github has issues - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; - sha256 = "1f3hb57rqp9qkh5n2wf65dvxraf21y15s3g643f2fhzc7vvl7ia1"; + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 5484652d38..45348b562c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2021.03.31"; + version = "2021.09.25"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-XSs0u758wEuaqZvFIevBrL61YNPUJ9Sc1DS+O9agj94="; + sha256 = "sha256-kS6bwsYH/cbjJlIeiDAy6QsAw+D1uHp26d4NBLfStjg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/gobang/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/gobang/default.nix new file mode 100644 index 0000000000..dc861337c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/gobang/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "gobang"; + version = "0.1.0-alpha.5"; + + src = fetchFromGitHub { + owner = "tako8ki"; + repo = pname; + rev = "v${version}"; + sha256 = "02glb3hlprpdc72ji0248a7g0vr36yxr0gfbbms2m25v251dyaa6"; + }; + + cargoSha256 = "sha256-Tiefet5gLpiuYY6Scg5fjnaPiZfVl5Gy2oZFdhgNRxY="; + + meta = with lib; { + description = "A cross-platform TUI database management tool written in Rust"; + homepage = "https://github.com/tako8ki/gobang"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock index d147a5a745..e6cb2fb570 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - parallel (1.20.1) + parallel (1.21.0) pg (1.2.3) - pgsync (0.6.7) + pgsync (0.6.8) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.9.0) + slop (4.9.1) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) @@ -20,4 +20,4 @@ DEPENDENCIES pgsync BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix index f89b25bf0a..7e075784f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix @@ -1,15 +1,16 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp rec { gemdir = ./.; pname = "pgsync"; exes = [ "pgsync" ]; + passthru.updateScript = bundlerUpdateScript "pgsync"; + meta = with lib; { description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)"; homepage = "https://github.com/ankane/pgsync"; license = with licenses; mit; maintainers = with maintainers; [ fabianhjr ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix index 0240300ff0..cc456be8eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; type = "gem"; }; - version = "1.20.1"; + version = "1.21.0"; }; pg = { groups = ["default"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6"; + sha256 = "1rsm1irmz97v1kxhnq4lbwwiapqa2zkx0n0xlcf68ca8sfcfql1z"; type = "gem"; }; - version = "0.6.7"; + version = "0.6.8"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj"; + sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9"; type = "gem"; }; - version = "4.9.0"; + version = "4.9.1"; }; tty-cursor = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix index 5e457227c8..c781cb815f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix @@ -13,13 +13,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0rfm6sbbwzvsn76a8aqagd7cqdzmk8qxphgl89k7y982l9a5sz50"; + sha256 = "0bkng0iwsfawxk8bxlq01ib4n6kaxjkbwcif1bhpvw5ra19430rg"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix b/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix new file mode 100644 index 0000000000..0d93976076 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "google-java-format"; + version = "1.11.0"; + + src = fetchurl { + url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; + sha256 = "1ixpg8ljg819fq94mxyypknmslva3rkifphbnq3ic71b7iip6lia"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/${pname}} + install -D ${src} $out/share/${pname}/google-java-format-${version}-all-deps.jar + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --argv0 ${pname} \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" \ + --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" \ + --add-flags "-jar $out/share/${pname}/google-java-format-${version}-all-deps.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "Java source formatter by Google"; + longDescription = '' + A program that reformats Java source code to comply with Google Java Style. + ''; + homepage = "https://github.com/google/google-java-format"; + license = licenses.asl20; + maintainers = [ maintainers.emptyflask ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/img/default.nix b/third_party/nixpkgs/pkgs/development/tools/img/default.nix new file mode 100644 index 0000000000..cce8a622d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/img/default.nix @@ -0,0 +1,55 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, makeWrapper +, runc +, wrapperDir ? "/run/wrappers/bin" # Default for NixOS, other systems might need customization. +}: + +buildGoModule rec { + pname = "img"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "genuinetools"; + repo = "img"; + rev = "v${version}"; + sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08"; + }; + + vendorSha256 = null; + + postPatch = '' + V={newgidmap,newgidmap} \ + substituteInPlace ./internal/unshare/unshare.c \ + --replace "/usr/bin/$V" "${wrapperDir}/$V" + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + tags = [ + "seccomp" + "noembed" # disables embedded `runc` + ]; + + ldflags = [ + "-X github.com/genuinetools/img/version.VERSION=v${version}" + "-s -w" + ]; + + postInstall = '' + wrapProgram "$out/bin/img" --prefix PATH : ${lib.makeBinPath [ runc ]} + ''; + + # Tests fail as: internal/binutils/install.go:57:15: undefined: Asset + doCheck = false; + + meta = with lib; { + description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. "; + license = licenses.mit; + homepage = "https://github.com/genuinetools/img"; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 9e852793ab..8306092c53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-KC/m+I4uOBS0bJb5yvxSkj+1Jlq+bekLTqHlz4vqv8I="; + sha256 = "sha256-AR1bNsyex+kfXdiSF3QgeqK8qwIssLfaaY0qNhnp7ak="; }; - cargoSha256 = "sha256-et7V7orw2msv30nJ9sntzEQoeN1YqhHMnHOUt4a6e2I="; + cargoSha256 = "sha256-Ukhp8mPXD/dDolfSugOCVwRMgkjmDRCoNzthgqrN6p0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix index 614b5d4c9d..ab206a090b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix @@ -7,23 +7,32 @@ buildGoModule rec { pname = "ko"; - version = "0.8.3"; + version = "0.9.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; + sha256 = "sha256-cIrlhhk5Lt0Qt7q7rKw8EXrJqZWZEjrEUyHOvHiT6bs="; }; vendorSha256 = null; - # Don't build the legacy main.go or test dir - excludedPackages = "\\(cmd/ko\\|test\\)"; + nativeBuildInputs = [ installShellFiles ]; + # Pin so that we don't build the several other development tools + subPackages = "."; + ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; checkInputs = [ git ]; preCheck = '' + # Feed in all the tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + getGoDirs() { + go list ./... + } + # resolves some complaints from ko export GOROOT="$(go env GOROOT)" git init diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index a6fbacfa6f..357a46c081 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , binutils , asciidoctor @@ -15,25 +14,18 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-zsJoaaxYVV78vsxq2nbOh9ZAU1giKp8Kh6qJFL120CQ="; + hash = "sha256-VtwykRX5so6LqyC0En/Jx7anXD7qW47zqq3awCY0lJE="; }; outputs = [ "out" "man" ]; patches = [ - # Use the shell builtin pwd for the basedir test - # See https://github.com/ccache/ccache/pull/933 - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/58fd1fbe75a1b5dc3f9151947ace15164fdef91c.patch"; - sha256 = "BoBn4YSDy8pQxJ+fQHSsrUZDBVeLFWXIQ6CunDwMO7o="; - }) - # When building for Darwin, test/run uses dwarfdump, whereas on # Linux it uses objdump. We don't have dwarfdump packaged for # Darwin, so this patch updates the test to also use objdump on diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix new file mode 100644 index 0000000000..3c22e0d64e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -0,0 +1,100 @@ +{ lib, stdenvNoCC, fetchurl, fetchgit, + gnumake, patch, zlib, git, bison, + flex, gnat11, curl, perl +}: + +let + version_coreboot = "4.14"; + + version_gmp = "6.2.0"; + version_mpfr = "4.1.0"; + version_mpc = "1.2.0"; + version_gcc = "8.3.0"; + version_binutils = "2.35.1"; + version_acpica = "20200925"; + version_nasm = "2.15.05"; + + tar_name_gmp = "gmp-${version_gmp}.tar.xz"; + tar_gmp = fetchurl { + url = "https://ftpmirror.gnu.org/gmp/${tar_name_gmp}"; + sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5"; + }; + + tar_name_mpfr = "mpfr-${version_mpfr}.tar.xz"; + tar_mpfr = fetchurl { + url = "https://ftpmirror.gnu.org/mpfr/${tar_name_mpfr}"; + sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; + }; + + tar_name_mpc = "mpc-${version_mpc}.tar.gz"; + tar_mpc = fetchurl { + url = "https://ftpmirror.gnu.org/mpc/${tar_name_mpc}"; + sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; + }; + + tar_name_gcc = "gcc-${version_gcc}.tar.xz"; + tar_gcc = fetchurl { + url = "https://ftpmirror.gnu.org/gcc/gcc-${version_gcc}/${tar_name_gcc}"; + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; + }; + + tar_name_binutils = "binutils-${version_binutils}.tar.xz"; + tar_binutils = fetchurl { + url = "https://ftpmirror.gnu.org/binutils/${tar_name_binutils}"; + sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w"; + }; + + tar_name_acpica = "acpica-unix2-${version_acpica}.tar.gz"; + tar_acpica = fetchurl { + url = "https://acpica.org/sites/acpica/files/${tar_name_acpica}"; + sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"; + }; + + tar_name_nasm = "nasm-${version_nasm}.tar.bz2"; + tar_nasm = fetchurl { + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version_nasm}/${tar_name_nasm}"; + sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw"; + }; + + tar_coreboot_name = "coreboot-${version_coreboot}.tar.xz"; + tar_coreboot = fetchurl { + url = "https://coreboot.org/releases/${tar_coreboot_name}"; + sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr"; + }; +in stdenvNoCC.mkDerivation rec { + name = "coreboot-toolchain"; + version = version_coreboot; + src = tar_coreboot; + + nativeBuildInputs = [ perl curl gnumake git bison ]; + + buildInputs = [ gnat11 flex zlib ]; + + enableParallelBuilding = true; + dontConfigure = true; + dontInstall = true; + + patchPhase = '' + mkdir util/crossgcc/tarballs + ln -s ${tar_gmp} util/crossgcc/tarballs/${tar_name_gmp} + ln -s ${tar_mpfr} util/crossgcc/tarballs/${tar_name_mpfr} + ln -s ${tar_mpc} util/crossgcc/tarballs/${tar_name_mpc} + ln -s ${tar_gcc} util/crossgcc/tarballs/${tar_name_gcc} + ln -s ${tar_binutils} util/crossgcc/tarballs/${tar_name_binutils} + ln -s ${tar_acpica} util/crossgcc/tarballs/${tar_name_acpica} + ln -s ${tar_nasm} util/crossgcc/tarballs/${tar_name_nasm} + patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc + ''; + + buildPhase = '' + make crossgcc-i386 CPUS=$NIX_BUILD_CORES DEST=$out + ''; + + meta = with lib; { + homepage = "https://www.coreboot.org"; + description = "coreboot toolchain"; + license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index 80c7222211..6318dbb3ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, gtk3 }: +{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; version = "2.3.37"; @@ -6,6 +6,15 @@ let url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45"; }; + desktopItem = makeDesktopItem { + inherit name; + exec = name; + icon = "Logic"; + comment = "Software for Saleae logic analyzers"; + desktopName = "Saleae Logic"; + genericName = "Logic analyzer"; + categories = "Development"; + }; in appimageTools.wrapType2 { inherit name src; @@ -17,6 +26,9 @@ appimageTools.wrapType2 { '' mkdir -p $out/etc/udev/rules.d cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + mkdir -p $out/share/pixmaps + ln -s ${desktopItem}/share/applications $out/share/ + cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png ''; profile = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index a6dd19bf45..adc89609c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.16"; + version = "0.8.17"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU="; + sha256 = "sha256-E71I2fRGg8HTa9vFMQqjIxtqoR0J4Puz2AmlyZMhye8="; }; - vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA="; + vendorSha256 = "sha256-x5wyje27029BZMk17sIHzd68Nlh5ifLn+YXv4hPs04Q="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index 87cb582417..0a39f47c0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , lib , autoPatchelfHook , cmake @@ -12,23 +11,15 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "0.9.3"; + version = "0.9.6"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1z9i8nvdl9h0zydh1gd9244q96n9x1gh5y90m71bghnh7nws0zmd"; + sha256 = "0mj258fy8l4i23jd6ail0xrrq3das7lmrf1brrr1591ahx4vjj14"; }; - patches = [ - # Intercept all invocations of ld, ld.gold or ld.lld - (fetchpatch { - url = "https://github.com/rui314/mold/commit/d25c2553ad3cfa39d99043927db1af2c028b5acf.patch"; - sha256 = "1ic1dyvjcrj6834n6mw9id50l6nymrfn6hws6pjpy8gjk6mqfvnk"; - }) - ]; - buildInputs = [ zlib openssl ]; nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix index ee8edfdf5b..ddf2a851b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mustache-go"; - version = "1.2.2"; + version = "1.3.0"; goPackagePath = "github.com/cbroglie/mustache"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; - sha256 = "sha256-ziWfkRUHYYyo1FqVVXFFDlTsBbsn59Ur9YQi2ZnTSRg="; + sha256 = "sha256-Z33hHOcx2K34v3j/qFD1VqeuUaqH0jqoMsVZQnLFx4U="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 01108d1501..fa8ee6f499 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -26,6 +26,7 @@ tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json)); tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); + tree-sitter-norg = (builtins.fromJSON (builtins.readFile ./tree-sitter-norg.json)); tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json)); tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json new file mode 100644 index 0000000000..f5a2194b25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/nvim-neorg/tree-sitter-norg.git", + "rev": "84949f0c05195907c416cb7d02cf1369b9458b5f", + "date": "2021-09-25T17:47:36+00:00", + "path": "/nix/store/wa653ml1ajl8923f4am505asxwvsxbzq-tree-sitter-norg", + "sha256": "07pzz9acg01r4yyws6savprjn3pccyylx6vq8q9lvrp76pnflks4", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index c6e819465a..4f1e69a585 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -138,6 +138,10 @@ let orga = "rydesun"; repo = "tree-sitter-dot"; }; + "tree-sitter-norg" = { + orga = "nvim-neorg"; + repo = "tree-sitter-norg"; + }; }; allGrammars = diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 22ab121492..dae0a02b61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.20.0"; + version = "1.21.0"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -339,6 +339,9 @@ lib.makeScope pkgs.newScope (self: { ) { inherit app; }; }; + # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals + pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs; + meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) { inherit (pyProject.tool.poetry) description; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index daf536561f..ab1a5324c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -156,6 +156,12 @@ self: super: } ); + cheroot = super.cheroot.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + colour = super.colour.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; @@ -547,6 +553,7 @@ self: super: self.pytestrunner self.cryptography self.pyjwt + self.setuptools-scm-git-archive ]; } ); diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix index 1a1991be94..4774d1a11d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,17 +1,17 @@ { buildGoModule, fetchFromGitHub, lib }: -buildGoModule { +buildGoModule rec { pname = "protoc-gen-doc-unstable"; - version = "2019-04-22"; + version = "1.5.0"; src = fetchFromGitHub { owner = "pseudomuto"; repo = "protoc-gen-doc"; - rev = "f824a8908ce33f213b2dba1bf7be83384c5c51e8"; - sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj"; + rev = "v${version}"; + sha256 = "1bpb5wv76p0sjffh5d1frbygp3q1p07sdh5c8pznl5bdh5pd7zxq"; }; - vendorSha256 = "17qdpsff8jk7ks5v6ix1rb966x3yvq03vk5bs2zbnxfdra7bv3n6"; + vendorSha256 = "08pk9nxsl28dw3qmrlb7vsm8xbdzmx98qwkxgg93ykrhzx235k1b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 9df547308f..8340891da0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, fetchgit, fetchpatch -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf , withDocumentation ? false, withClangPlugins ? true }: @@ -28,7 +28,7 @@ mkDerivation rec { sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j"; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++ optionals withClangPlugins [ llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ]; @@ -49,6 +49,8 @@ mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; + preConfigure = '' substituteInPlace src/plugins/plugins.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix new file mode 100644 index 0000000000..7def38d199 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "roogle"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "hkmatsumoto"; + repo = pname; + rev = version; + sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r"; + }; + + cargoSha256 = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; + + postInstall = '' + mkdir -p $out/share/roogle + cp -r assets $out/share/roogle + ''; + + meta = with lib; { + description = "A Rust API search engine which allows you to search functions by names and type signatures"; + homepage = "https://github.com/hkmatsumoto/roogle"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index d777d788ae..4df279f731 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, nspr, nss, pango, gconf -, libxcb, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext, dbus +, testVersion, chromedriver }: let @@ -27,6 +28,7 @@ let gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender gconf libxcb libXext libXi + dbus ]; in stdenv.mkDerivation rec { @@ -46,9 +48,11 @@ in stdenv.mkDerivation rec { install -m755 -D chromedriver $out/bin/chromedriver '' + lib.optionalString (!stdenv.isDarwin) '' patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver - wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" + wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}" ''; + passthru.tests.version = testVersion { package = chromedriver; }; + meta = with lib; { homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; diff --git a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix index 1d47b32510..b7490d4108 100644 --- a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "simavr"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "buserror"; repo = "simavr"; - rev = "e0d4de41a72520491a4076b3ed87beb997a395c0"; - sha256 = "0b2lh6l2niv80dmbm9xkamvnivkbmqw6v97sy29afalrwfxylxla"; + rev = "v${version}"; + sha256 = "0njz03lkw5374x1lxrq08irz4b86lzj2hibx46ssp7zv712pq55q"; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix index 2371600a7f..146ff9df76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslmate"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; - sha256 = "sha256-A1TkGi6b1psWflN0ogM1r/pYSVXcOi6aQEb6xtOsAsk="; + sha256 = "sha256-PkASJIRJH1kXjegOFMz36QzqT+qUBWslx/iavjFoW5g="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix index 4ad539e709..e35613d659 100644 --- a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "taplo-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - sha256 = "0hh9l83z7qymakyf7ka756gwxpzirgdhf6kpzh89bcmpdfz70005"; + sha256 = "sha256-bGQLAANVahpiiiKKJPNmtr4uT5iKHqyLS5yVm+rSHPg="; }; - cargoSha256 = "0bkpcnbrrfv07czs1gy8r9q1cp6fdfz2vmlfk9lsg3iapvyi5s1c"; + cargoSha256 = "sha256-T3fbG5HKOG90kawjQK8D0PIonB6ErNfR3hVIZ5N8zgA="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix index caa7facc0b..07fcfaec93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "taplo-lsp"; - version = "0.2.5"; + version = "0.2.6"; src = fetchCrate { inherit pname version; - sha256 = "0a8y2fdkflc7lq0q40j7dr80hbj56bbsc585isbd7lk6xavg7cvi"; + sha256 = "sha256-jd4l9iTCeHnUa/GC13paD3zDiCZBk9VgEbCDsOs/Xq4="; }; - cargoSha256 = "133p5kmcfq5ksrri2f8jvnc1ljmsczq49gh3k0gmgby45yvy6xa1"; + cargoSha256 = "sha256-zQ303JFqnbulkWL4t5+fRWijaY9zd9tLKvrvdUEvKpY="; # excludes test_tcp since it fails cargoTestFlags = [ "test_stdio" ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 83a49cceda..5a218f908e 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WTBurNXI+t8S0f2ER6zw+6SlkzKYLDGFQcEVbXSQAtc="; + sha256 = "sha256-7FcGwmJKKOmpuCJgHl65+EnwOWQAbmq6X1lZMhTlDaE="; }; - cargoSha256 = "sha256-/ohAzcfsoarPicinsZf5fi2cQwYD1oW5TOdWP8RbXos="; + cargoSha256 = "sha256-mPxPieatGuROIwLGuQHBrZ8VTGd8c/6bKA+tt3Iv3OI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index ed2bca5d9b..d7b16d6a59 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.28.0"; + version = "0.30.0"; shas = { - x86_64-linux = "sha256-Kz2sAAUux1BcrU2vukGybSs+REAIRUWMxqZakRPEeic="; - aarch64-linux = "sha256-QXj9y6NrvxU6oL9QO2dYH4Fz+MbTzON7w8sTCei7Mqs="; - x86_64-darwin = "sha256-zW1g3DZ4Mh4j3UYE312dDkbX6ngg50GaKCHYPa6H0Dk="; - aarch64-darwin = "sha256-hLIRxApjTbkfDVPhK3EC7X/p6uQK5kOEILZfAmFV5AA="; + x86_64-linux = "sha256-p5Vbt2fQPFR9SfLJ03f62/a8o9QIJOTXbA1s2liwNXY="; + aarch64-linux = "sha256-j12KjdnL19d5U/QRfB/7ahUzcYnUddItp29bLM/mWzs="; + x86_64-darwin = "sha256-w3k9oj+mP+i/hSf+ZjYLF+zsAcyLezbxhWXYoaPpn+U="; + aarch64-darwin = "sha256-bOtZoG8vXnSBNTPJDkyW0xbMEbmGNtq+mEPKoP78Yew="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 1ec04407f8..cb8d8aac36 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.6"; - sha256 = "0pmd0haav2ychhcsw44klx6wfn8c7j1rsw08rc8hcm5i3h5wsn7l"; + version = "14.18.0"; + sha256 = "0naqv0aglsqy51pyiz42xz7wx5pfsbyscpdl8rir6kmfl1c52j3b"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch b/third_party/nixpkgs/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch deleted file mode 100644 index 8cec26026e..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch +++ /dev/null @@ -1,231 +0,0 @@ -From: Evgeni Golov -Subject: use the system tinyxml instead of the embedded copy -Last-Update: 2015-08-09 - -diff --git a/src/Makefile.am b/src/Makefile.am -index 7b9e263..bc7ba8c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -81,12 +81,6 @@ libdesmume_a_SOURCES = \ - utils/libfat/mem_allocate.h \ - utils/libfat/partition.cpp \ - utils/libfat/partition.h \ -- utils/tinyxml/tinystr.cpp \ -- utils/tinyxml/tinystr.h \ -- utils/tinyxml/tinyxml.cpp \ -- utils/tinyxml/tinyxml.h \ -- utils/tinyxml/tinyxmlerror.cpp \ -- utils/tinyxml/tinyxmlparser.cpp \ - utils/glcorearb.h \ - addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \ - cheatSystem.cpp cheatSystem.h \ -@@ -204,3 +198,4 @@ if HAVE_GDB_STUB - libdesmume_a_SOURCES += gdbstub.h - endif - libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) -+LIBS += -ltinyxml -diff --git a/src/Makefile.in b/src/Makefile.in -index 9cf26a3..d9ff7b2 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -184,9 +184,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \ - utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ - utils/libfat/lock.h utils/libfat/mem_allocate.h \ - utils/libfat/partition.cpp utils/libfat/partition.h \ -- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ -- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ -- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ - utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ - addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ - addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ -@@ -324,10 +321,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \ - utils/libfat/libfat.$(OBJEXT) \ - utils/libfat/libfat_public_api.$(OBJEXT) \ - utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \ -- utils/tinyxml/tinystr.$(OBJEXT) \ -- utils/tinyxml/tinyxml.$(OBJEXT) \ -- utils/tinyxml/tinyxmlerror.$(OBJEXT) \ -- utils/tinyxml/tinyxmlparser.$(OBJEXT) \ - addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \ - addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \ - addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \ -@@ -475,7 +468,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@ - LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ - LIBGLADE_LIBS = @LIBGLADE_LIBS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -ltinyxml - LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@ - LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ -@@ -625,9 +618,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \ - utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ - utils/libfat/lock.h utils/libfat/mem_allocate.h \ - utils/libfat/partition.cpp utils/libfat/partition.h \ -- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ -- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ -- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ - utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ - addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ - addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ -@@ -760,20 +750,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \ - utils/libfat/$(DEPDIR)/$(am__dirstamp) - utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \ - utils/libfat/$(DEPDIR)/$(am__dirstamp) --utils/tinyxml/$(am__dirstamp): -- @$(MKDIR_P) utils/tinyxml -- @: > utils/tinyxml/$(am__dirstamp) --utils/tinyxml/$(DEPDIR)/$(am__dirstamp): -- @$(MKDIR_P) utils/tinyxml/$(DEPDIR) -- @: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp) --utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ -- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) --utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ -- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) --utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ -- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) --utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ -- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) - addons/$(am__dirstamp): - @$(MKDIR_P) addons - @: > addons/$(am__dirstamp) -@@ -1035,10 +1011,6 @@ mostlyclean-compile: - -rm -f utils/libfat/partition.$(OBJEXT) - -rm -f utils/md5.$(OBJEXT) - -rm -f utils/task.$(OBJEXT) -- -rm -f utils/tinyxml/tinystr.$(OBJEXT) -- -rm -f utils/tinyxml/tinyxml.$(OBJEXT) -- -rm -f utils/tinyxml/tinyxmlerror.$(OBJEXT) -- -rm -f utils/tinyxml/tinyxmlparser.$(OBJEXT) - -rm -f utils/vfat.$(OBJEXT) - -rm -f utils/xstring.$(OBJEXT) - -@@ -1175,10 +1147,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/libfat_public_api.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@@ -1449,8 +1417,6 @@ distclean-generic: - -rm -f utils/decrypt/$(am__dirstamp) - -rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp) - -rm -f utils/libfat/$(am__dirstamp) -- -rm -f utils/tinyxml/$(DEPDIR)/$(am__dirstamp) -- -rm -f utils/tinyxml/$(am__dirstamp) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -1460,7 +1426,7 @@ clean: clean-recursive - clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am - - distclean: distclean-recursive -- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) -+ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags -@@ -1506,7 +1472,7 @@ install-ps-am: - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) -+ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) - -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - -diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am -index 1985209..d958323 100755 ---- a/src/cli/Makefile.am -+++ b/src/cli/Makefile.am -@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GT - - bin_PROGRAMS = desmume-cli - desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp --desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml - if HAVE_GDB_STUB - desmume_cli_LDADD += ../gdbstub/libgdbstub.a - endif -diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in -index 14efd77..f04ab7d 100644 ---- a/src/cli/Makefile.in -+++ b/src/cli/Makefile.in -@@ -311,7 +311,7 @@ AM_LDFLAGS = - desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp - desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \ - $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \ -- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) -+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) - all: all-recursive - - .SUFFIXES: -diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am -index b667fca..c79fdac 100755 ---- a/src/gtk-glade/Makefile.am -+++ b/src/gtk-glade/Makefile.am -@@ -33,7 +33,7 @@ desmume_glade_SOURCES = \ - desmume_glade_LDADD = ../libdesmume.a \ - $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ - $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ -- $(LIBSOUNDTOUCH_LIBS) -+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml - if HAVE_GDB_STUB - desmume_glade_LDADD += ../gdbstub/libgdbstub.a - endif -diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in -index 5f77ec5..012aa72 100644 ---- a/src/gtk-glade/Makefile.in -+++ b/src/gtk-glade/Makefile.in -@@ -367,7 +367,7 @@ desmume_glade_SOURCES = \ - - desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \ - $(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ -- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) -+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) - all: all-recursive - - .SUFFIXES: -diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am -index 59cb1f2..e451102 100755 ---- a/src/gtk/Makefile.am -+++ b/src/gtk/Makefile.am -@@ -32,7 +32,7 @@ desmume_SOURCES = \ - ../filter/videofilter.cpp ../filter/videofilter.h \ - main.cpp main.h - desmume_LDADD = ../libdesmume.a \ -- $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -+ $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml - if HAVE_GDB_STUB - desmume_LDADD += ../gdbstub/libgdbstub.a - endif -diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in -index e1a2c37..75f392f 100644 ---- a/src/gtk/Makefile.in -+++ b/src/gtk/Makefile.in -@@ -382,7 +382,7 @@ desmume_SOURCES = \ - - desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \ - $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ -- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \ -+ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \ - $(am__append_3) - UPDATE_DESKTOP = \ - appsdir=$(DESTDIR)$(datadir)/applications ; \ -diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp -index 8d8f370..09c35bb 100755 ---- a/src/utils/advanscene.cpp -+++ b/src/utils/advanscene.cpp -@@ -19,7 +19,7 @@ - #include - - #define TIXML_USE_STL --#include "tinyxml/tinyxml.h" -+#include - - #include "advanscene.h" - #include "../common.h" diff --git a/third_party/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/desmume/default.nix index 03e9774390..49cb2498e6 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -1,57 +1,87 @@ -{ lib, stdenv, fetchurl, fetchpatch -, pkg-config, libtool, intltool -, libXmu -, lua -, tinyxml -, agg, alsa-lib, soundtouch, openal +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, agg +, alsa-lib , desktop-file-utils -, gtk2, gtkglext, libglade -, libGLU, libpcap, SDL, zziplib }: +, gtk3 +, intltool +, libGLU +, libXmu +, libpcap +, libtool +, lua +, meson +, ninja +, openal +, pkg-config +, soundtouch +, tinyxml +, zlib +}: -with lib; stdenv.mkDerivation rec { - pname = "desmume"; - version = "0.9.11"; + version = "0.9.11+unstable=2021-09-22"; - src = fetchurl { - url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz"; - sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; + src = fetchFromGitHub { + owner = "TASVideos"; + repo = pname; + rev = "7fc2e4b6b6a58420de65a4089d4df3934d7a46b1"; + hash = "sha256-sTCyjQ31w1Lp+aa3VQ7/rdLbhjnqthce54mjKJZQIDM="; }; - patches = [ - ./gcc6_fixes.patch - ./gcc7_fixes.patch - ./01_use_system_tinyxml.patch + nativeBuildInputs = [ + desktop-file-utils + intltool + libtool + lua + meson + ninja + pkg-config ]; - CXXFLAGS = "-fpermissive"; + buildInputs = [ + SDL2 + agg + alsa-lib + gtk3 + libGLU + libXmu + libpcap + openal + soundtouch + tinyxml + zlib + ]; - buildInputs = - [ pkg-config libtool intltool libXmu lua agg alsa-lib soundtouch - openal desktop-file-utils gtk2 gtkglext libglade - libGLU libpcap SDL zziplib tinyxml ]; + hardeningDisable = [ "format" ]; - configureFlags = [ - "--disable-glade" # Failing on compile step - "--enable-openal" - "--enable-glx" - "--enable-hud" - "--enable-wifi" ]; + preConfigure = '' + cd desmume/src/frontend/posix + ''; - meta = { + mesonFlags = [ + "-Db_pie=true" + "-Dopenal=true" + "-Dwifi=true" + ]; + + meta = with lib; { + homepage = "https://www.github.com/TASVideos/desmume/"; description = "An open-source Nintendo DS emulator"; longDescription = '' - DeSmuME is a freeware emulator for the NDS roms & Nintendo DS - Lite games created by YopYop156. It supports many homebrew nds - rom demoes as well as a handful of Wireless Multiboot demo nds - roms. DeSmuME is also able to emulate nearly all of the + DeSmuME is a freeware emulator for the NDS roms & Nintendo DS Lite games + created by YopYop156 and now maintained by the TASvideos team. It supports + many homebrew nds rom demoes as well as a handful of Wireless Multiboot + demo nds roms. DeSmuME is also able to emulate nearly all of the commercial nds rom titles which other DS Emulators aren't. ''; - homepage = "http://www.desmume.com"; - license = licenses.gpl1Plus; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } -# TODO: investigate glade +# TODO: investigate the patches +# TODO: investigate other platforms diff --git a/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc6_fixes.patch b/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc6_fixes.patch deleted file mode 100644 index 6eb9576f64..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc6_fixes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: zeromus -Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430 -Subject: fix GCC6 issues -Bug: https://sourceforge.net/p/desmume/bugs/1570/ -Bug-Debian: http://bugs.debian.org/811691 - -Index: desmume/src/MMU_timing.h -=================================================================== ---- desmume/src/MMU_timing.h (revision 5513) -+++ desmume/src/MMU_timing.h (revision 5517) -@@ -155,8 +155,8 @@ - enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; - enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; - enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; -- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; -- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; -+ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; -+ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; - enum { WORDSIZE = sizeof(u32) }; - enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; - enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; -Index: desmume/src/ctrlssdl.cpp -=================================================================== ---- desmume/src/ctrlssdl.cpp (revision 5513) -+++ desmume/src/ctrlssdl.cpp (revision 5517) -@@ -200,7 +200,7 @@ - break; - case SDL_JOYAXISMOTION: - /* Dead zone of 50% */ -- if( (abs(event.jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) - { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); - if (event.jaxis.value > 0) { -@@ -370,7 +370,7 @@ - Note: button constants have a 1bit offset. */ - case SDL_JOYAXISMOTION: - key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); -- if( (abs(event->jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) - { - if (event->jaxis.value > 0) - key_code |= 1; -Index: desmume/src/wifi.cpp -=================================================================== ---- desmume/src/wifi.cpp (revision 5429) -+++ desmume/src/wifi.cpp (revision 5430) -@@ -320,9 +320,9 @@ - - #if (WIFI_LOGGING_LEVEL >= 1) - #if WIFI_LOG_USE_LOGC -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); - #else -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); - #endif - #else - #define WIFI_LOG(level, ...) {} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc7_fixes.patch b/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc7_fixes.patch deleted file mode 100644 index a4934ff6e6..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/desmume/gcc7_fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Mon, 17 Aug 2015 21:15:04 +0000 -Subject: Fix bug with libfat string handling. - -diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp -index 765d7ae5..b6d7f01f 100644 ---- a/src/utils/libfat/directory.cpp -+++ b/src/utils/libfat/directory.cpp -@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len - int bytes; - size_t count = 0; - -- while (count < len-1 && src != '\0') { -+ while (count < len-1 && *src != '\0') { - bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); - if (bytes > 0) { - *dst = (ucs2_t)tempChar; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix index eef361ecd0..65081153ab 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "emu2"; - version = "unstable-2020-06-04"; + version = "0.0.0+unstable=2021-09-22"; src = fetchFromGitHub { - owner = "dmsc"; - repo = "emu2"; - rev = "f9599d347aab07d9281400ec8b214aabd187fbcd"; - sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4"; + owner = "dmsc"; + repo = "emu2"; + rev = "8d01b53f154d6bfc9561a44b9c281b46e00a4e87"; + hash = "sha256-Jafl0Pw2k5RCF9GgpdAWcQ+HBTsiX7dOKSMCWPHQ+2E="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmsc/emu2/"; description = "A simple text-mode x86 + DOS emulator"; platforms = platforms.linux; - maintainers = with maintainers; [ dramaturg ]; - license = licenses.gpl2; + maintainers = with maintainers; [ AndersonTorres ]; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff b/third_party/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff deleted file mode 100644 index 745bba5d51..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur higan-110-old/higan/GNUmakefile higan-110-new/higan/GNUmakefile ---- higan-110-old/higan/GNUmakefile 2020-04-15 11:06:00.279935557 -0300 -+++ higan-110-new/higan/GNUmakefile 2020-04-15 11:08:32.982417291 -0300 -@@ -11,7 +11,7 @@ - include $(nall.path)/GNUmakefile - - ifeq ($(platform),local) -- flags += -march=native -+ flags += - endif - - ifeq ($(platform),windows) -diff -Naur higan-110-old/nall/GNUmakefile higan-110-new/nall/GNUmakefile ---- higan-110-old/nall/GNUmakefile 2020-04-15 11:06:00.396935154 -0300 -+++ higan-110-new/nall/GNUmakefile 2020-04-15 11:10:37.738011488 -0300 -@@ -127,7 +127,8 @@ - - # linux settings - ifeq ($(platform),linux) -- options += -ldl -+ flags += $(CXXFLAGS) -+ options += $(LDFLAGS) -ldl - endif - - # bsd settings diff --git a/third_party/nixpkgs/pkgs/misc/emulators/higan/001-include-cmath.patch b/third_party/nixpkgs/pkgs/misc/emulators/higan/001-include-cmath.patch new file mode 100644 index 0000000000..67644e656a --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/higan/001-include-cmath.patch @@ -0,0 +1,8 @@ +diff -Naur source-old/higan/fc/ppu/ppu.cpp source-new/higan/fc/ppu/ppu.cpp +--- source-old/higan/fc/ppu/ppu.cpp 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/higan/fc/ppu/ppu.cpp 2021-09-29 22:23:19.107527772 -0300 +@@ -1,3 +1,4 @@ ++#include + #include + + namespace higan::Famicom { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/third_party/nixpkgs/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch new file mode 100644 index 0000000000..0585c8a38c --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch @@ -0,0 +1,24 @@ +diff -Naur source-old/higan-ui/GNUmakefile source-new/higan-ui/GNUmakefile +--- source-old/higan-ui/GNUmakefile 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/higan-ui/GNUmakefile 2021-09-29 22:35:35.744721052 -0300 +@@ -61,7 +61,7 @@ + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: nall.verbose ruby.verbose hiro.verbose all; +diff -Naur source-old/icarus/GNUmakefile source-new/icarus/GNUmakefile +--- source-old/icarus/GNUmakefile 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/icarus/GNUmakefile 2021-09-29 22:35:53.639846113 -0300 +@@ -26,7 +26,7 @@ + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/higan/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/higan/default.nix index 8e10b7bb31..558cb53c3d 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/higan/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/higan/default.nix @@ -1,135 +1,156 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config -, libX11, libXv -, udev -, libGLU, libGL, SDL2 -, libao, openal, libpulseaudio +{ lib +, stdenv +, fetchFromGitHub +, SDL2 , alsa-lib -, gtk2, gtksourceview +, gtk3 +, gtksourceview3 +, libGL +, libGLU +, libX11 +, libXv +, libao +, libpulseaudio +, openal +, pkg-config , runtimeShell +, udev # Darwin dependencies -, libicns, Carbon, Cocoa, OpenGL, OpenAL}: +, libicns +, Carbon +, Cocoa +, OpenAL +, OpenGL +}: -let - inherit (lib) optionals; -in stdenv.mkDerivation rec { - pname = "higan"; - version = "110"; + version = "115+unstable=2021-08-18"; src = fetchFromGitHub { owner = "higan-emu"; repo = "higan"; - rev = "v${version}"; - sha256 = "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2"; + rev = "9bf1b3314b2bcc73cbc11d344b369c31562aff10"; + hash = "sha256-HZItJ97x20OjFKv2OVbMja7g+c1ZXcgcaC/XDe3vMZM="; }; - patches = [ ./0001-change-flags.diff ]; - postPatch = '' - sed '1i#include ' -i higan/fc/ppu/ppu.cpp + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + libicns + ]; - for file in icarus/GNUmakefile higan/target-higan/GNUmakefile; do - substituteInPlace "$file" \ - --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ - 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' - done - ''; + buildInputs = [ + SDL2 + libao + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + gtk3 + gtksourceview3 + libGL + libGLU + libX11 + libXv + libpulseaudio + openal + udev + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + OpenAL + OpenGL + ]; - nativeBuildInputs = [ pkg-config ] - ++ optionals stdenv.isDarwin [ libicns ]; + patches = [ + # Includes cmath header + ./001-include-cmath.patch + # Uses png2icns instead of sips + ./002-sips-to-png2icns.patch + ]; - buildInputs = [ SDL2 libao ] - ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal - gtk2 gtksourceview libX11 libXv - libGLU libGL ] - ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; + dontConfigure = true; + + enableParallelBuilding = true; buildPhase = '' - make compiler=c++ -C higan openmp=true target=higan - make compiler=c++ -C genius openmp=true - make compiler=c++ -C icarus openmp=true + runHook preBuild + + make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ + platform=linux openmp=true hiro=gtk3 build=accuracy local=false \ + cores="cv fc gb gba md ms msx ngp pce sfc sg ws" -C higan-ui + make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ + platform=linux openmp=true hiro=gtk3 -C icarus + + runHook postBuild ''; - installPhase = (if stdenv.isDarwin then '' - mkdir "$out" - mv higan/out/higan.app "$out"/ - mv icarus/out/icarus.app "$out"/ - mv genius/out/genius.app "$out"/ + installPhase = '' + runHook preInstall + + '' + (if stdenv.isDarwin then '' + mkdir ${placeholder "out"} + mv higan/out/higan.app ${placeholder "out"}/ + mv icarus/out/icarus.app ${placeholder "out"}/ '' else '' - install -dm 755 "$out"/bin "$out"/share/applications "$out"/share/pixmaps + install -d ${placeholder "out"}/bin + install higan-ui/out/higan -t ${placeholder "out"}/bin/ + install icarus/out/icarus -t ${placeholder "out"}/bin/ - install -m 755 higan/out/higan -t "$out"/bin/ - install -m 644 higan/target-higan/resource/higan.desktop \ - -t $out/share/applications/ - install -m 644 higan/target-higan/resource/higan.svg \ - $out/share/pixmaps/higan-icon.svg - install -m 644 higan/target-higan/resource/higan.png \ - $out/share/pixmaps/higan-icon.png + install -d ${placeholder "out"}/share/applications + install higan-ui/resource/higan.desktop -t ${placeholder "out"}/share/applications/ + install icarus/resource/icarus.desktop -t ${placeholder "out"}/share/applications/ - install -m 755 icarus/out/icarus -t "$out"/bin/ - install -m 644 icarus/data/icarus.desktop -t $out/share/applications/ - install -m 644 icarus/data/icarus.svg $out/share/pixmaps/icarus-icon.svg - install -m 644 icarus/data/icarus.png $out/share/pixmaps/icarus-icon.png - - install -m 755 genius/out/genius -t "$out"/bin/ - install -m 644 genius/data/genius.desktop -t $out/share/applications/ - install -m 644 genius/data/genius.svg $out/share/pixmaps/genius-icon.svg - install -m 644 genius/data/genius.png $out/share/pixmaps/genius-icon.png + install -d ${placeholder "out"}/share/pixmaps + install higan/higan/resource/higan.svg ${placeholder "out"}/share/pixmaps/higan-icon.svg + install higan/higan/resource/logo.png ${placeholder "out"}/share/pixmaps/higan-icon.png + install icarus/resource/icarus.svg ${placeholder "out"}/share/pixmaps/icarus-icon.svg + install icarus/resource/icarus.png ${placeholder "out"}/share/pixmaps/icarus-icon.png '') + '' - mkdir -p "$out"/share/higan "$out"/share/icarus - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/System/ "$out"/share/higan/ - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - icarus/Database icarus/Firmware $out/share/icarus/ - ''; + install -d ${placeholder "out"}/share/higan + cp -rd extras/ higan/System/ ${placeholder "out"}/share/higan/ - fixupPhase = let - dest = if stdenv.isDarwin - then "\\$HOME/Library/Application Support/higan" - else "\\$HOME/higan"; - in '' + install -d ${placeholder "out"}/share/icarus + cp -rd icarus/Database icarus/Firmware ${placeholder "out"}/share/icarus/ + '' + ( # A dirty workaround, suggested by @cpages: # we create a first-run script to populate # $HOME with all the stuff needed at runtime - - mkdir -p "$out"/bin - cat < $out/bin/higan-init.sh + let + dest = if stdenv.isDarwin + then "\\$HOME/Library/Application Support/higan" + else "\\$HOME/higan"; + in '' + mkdir -p ${placeholder "out"}/bin + cat < ${placeholder "out"}/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/System/ "${dest}"/ + cp --recursive --update ${placeholder "out"}/share/higan/System/ "${dest}"/ EOF - chmod +x $out/bin/higan-init.sh + chmod +x ${placeholder "out"}/bin/higan-init.sh + '') + '' + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/higan-emu/higan"; description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' - higan is a multi-system game console emulator. The purpose of higan is to - serve as hardware documentation in source code form: it is meant to be as - accurate and complete as possible, with code that is easy to read and - understand. + higan is a multi-system emulator, originally developed by Near, with an + uncompromising focus on accuracy and code readability. - It currently supports the following systems: - - Famicom + Famicom Disk System - - Super Famicom + Super Game Boy - - Game Boy + Game Boy Color - - Game Boy Advance + Game Boy Player - - SG-1000 + SC-3000 - - Master System + Game Gear - - Mega Drive + Mega CD - - PC Engine + SuperGrafx - - MSX + MSX2 - - ColecoVision - - Neo Geo Pocket + Neo Geo Pocket Color - - WonderSwan + WonderSwan Color + SwanCrystal + Pocket Challenge V2 + It currently emulates the following systems: Famicom, Famicom Disk System, + Super Famicom, Super Game Boy, Game Boy, Game Boy Color, Game Boy Advance, + Game Boy Player, SG-1000, SC-3000, Master System, Game Gear, Mega Drive, + Mega CD, PC Engine, SuperGrafx, MSX, MSX2, ColecoVision, Neo Geo Pocket, + Neo Geo Pocket Color, WonderSwan, WonderSwan Color, SwanCrystal, Pocket + Challenge V2. ''; - homepage = "https://byuu.org/higan/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } -# TODO: Qt and GTK3+ support +# TODO: select between Qt, GTK2 and GTK3 diff --git a/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix index bd3bffde54..7123f496fa 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix @@ -26,12 +26,13 @@ mkDerivation rec { buildInputs = [ epoxy libarchive - libpcap libslirp qtbase SDL2 ]; + qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; + meta = with lib; { homepage = "http://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 852ccb6830..da53357c7a 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-09-21"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f8a4c78b5b293d11da9075373c9de0bb5afdeffe"; - sha256 = "0jmcsaz9hswcwkdmisggr34sn10mrfvybk5b8cmi86v8swz559yw"; + rev = "c9c89a1853c01f3451edd7105814d123023ddbd8"; + sha256 = "1szaw6jar86376wflzy644zm8l1ah8h5bvqkl7sxd8wijkxn1gph"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2021-08-16"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "7a19aac3d401c997a6fb7067a7756a4a77184c2e"; - sha256 = "1jbbnd7s2kql44zv7xkv9hmyj0482yjnm57l8nl0kdf8b61zzi3s"; + rev = "6ee1ce39f7294397a651546f708953faecb7869b"; + sha256 = "176cv5k2k4ygrdyigikakbjm6hn4lbn1n919nafvkrhnwmkw05gv"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -365,12 +365,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-09-09"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "39d7bfa1802895920f2327b41ab8e41f4b14c866"; - sha256 = "0j1h6h6frngpwx4z42jpxlmpqh736lilvkxhdlc8hcx6cxvw3z0r"; + rev = "456a08ff8dad82d52fdc439a44bfc8626f92cb0f"; + sha256 = "1ybfnizdr14gixv19vqm8jh1lvw9aka26r7yizsfik3jc6rqrjnf"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-09-21"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "037682510c0229437b4969dd1780d88b4eb10718"; - sha256 = "0y34w513wl77i5iq1930xv04hhd4ndiy21n728bj6bv7fkqbs95c"; + rev = "fad83b8841b6f0de00d70d771ee975e15d2d4f23"; + sha256 = "0fzr7b9a1h7d85skiy9pm2c7v03symvkrzsyp6cnrm0rcbs001d9"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -689,12 +689,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-09-20"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "a0fb34a0ecfd06ae74f90517bb4da1e27223ec34"; - sha256 = "1y6vpb5l2qy9vis2flm5s074lkhagbibgjwrzh8vzbfjghywadls"; + rev = "a93949643912a5e8cb64075af4b50d38a0b2fb22"; + sha256 = "12qdi9hsrhpf67m5im7y3hgq33dsfkqnvvyqx3ddqk1y5mdgc069"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -942,12 +942,12 @@ final: prev: completion-tabnine = buildVimPluginFrom2Nix { pname = "completion-tabnine"; - version = "2020-12-08"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "aca"; repo = "completion-tabnine"; - rev = "278a6c6ae65fa753f21add8d797572043d8315d5"; - sha256 = "00a0bpjpnykr625dyavczg5ca4mbbw2j0g7l66v3kjn67r2wr18y"; + rev = "5d2c49aee5b5443d58cceb0c8411429d5fae1b6f"; + sha256 = "1cbdw1lby0v3i8xf1f5lcmafwq9rpsyk3x8hzq3k28nffckfrwnk"; }; meta.homepage = "https://github.com/aca/completion-tabnine/"; }; @@ -1062,12 +1062,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-09-18"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "89d1032cc53fc7f846af98d1c63a0bdb6d9b5a34"; - sha256 = "01xqkadd85a91z1did0d7mj1m805ilm88bsk0a893s66viyvqx57"; + rev = "af2e0db3addbb67b2d10805a5d3e9aa69d183257"; + sha256 = "18izhqhas33rabq08gsjinz09zwaxkqb6slzv8n14df9n5cl4np7"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1242,12 +1242,12 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite.nvim"; - version = "2021-08-28"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6260889ce501ea6f09967e23295bc2adf5cc480f"; - sha256 = "1akps9sxcyi9q07mg0vrn4fqhanmzx82npbillq0qbv8y41s75f5"; + rev = "6be8af3a55b79afad17714c8c8b12b2900a330b1"; + sha256 = "1x7zgb3cldc900fikfa83x0xvndsbvzjbykw16gnn224mf6kbacs"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1520,12 +1520,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-09-08"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "520bb5c34dd24e70fc063d28bd6d0e8181bff118"; - sha256 = "0iz98b75alndxlgyabprk7vmgshqjiigmqmha5pjfw92z4g5lyw8"; + rev = "e525bbd4735436b8a521ec659f34b8b364d4096f"; + sha256 = "0551p0ffnq9zr3fpgc1bzcn71s8a5c1ah1qkvdbpw4n7k6mdy37h"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1544,12 +1544,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-09-05"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "a60ba5554efbab56112a06d9a1f09271fe23e96b"; - sha256 = "02idfg57j01y6d8zr2wddj7f79bk8cnqmb88h9s1b25zlf7yazmq"; + rev = "db5030876212e559c9050160b593e1e4e23216fe"; + sha256 = "1mv22ixfxmgifvlgf9fpvvy33iyns7m0b6hk0hg72g6bb224x3j7"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1568,36 +1568,36 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-09-04"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d1864ac0734ce51150affa96a35a1e01ade08b79"; - sha256 = "1jyhkj22ivav6kp7rh3fkjka8w5phvsa4r82s9b6lv39vr10nj4w"; + rev = "86eb25b3dc8aa228373723c92f102f9d5fffdf11"; + sha256 = "178wmg12bl30nq3plxa43j7597lzq7dm9hi7zi07p2xxg4ipnzh6"; }; meta.homepage = "https://github.com/dracula/vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-09-19"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "da6ce88098c71b1b959471af06b2f9f2412145a9"; - sha256 = "1n321bglnmd9xi7zrvg32l4ilanvx5aiqq4kcqrb9cai5dw8arla"; + rev = "7a43055fe5307ac2a44532fab0dc65538e5c9895"; + sha256 = "00kxkqybfziq1bk3wbfc1r2ni74w9svi3vafsz5azixylabx4grr"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-09-18"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "25fbb8d382aa43432ae76ac8c4725de3e4ce3551"; - sha256 = "0s2vihz6z33h5r1nly9h40s5yvrgpm8maa9xfbxqk6xf960kydi2"; + rev = "3c4d98eec6604fdbbfec9dd86e8fd2a3d3c4b113"; + sha256 = "1624gwlkvr6myw0l7srha0dk9053g0dsnfkbxsyrq1s17day69zf"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1750,12 +1750,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-09-17"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "5d152e2cc28c172b42f4caba8baf0973f6a6ece6"; - sha256 = "0mzvh62zphb35kjzx9d09k7sak6fqsk1lcmycgjxk4kydjiw68za"; + rev = "a67897405f23cce54473d2afbc1a7df63688b815"; + sha256 = "1wi2rqbkp6hz454kxi5fznb0lkac59f99ffj0s0snzzq21d3k5d5"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1895,12 +1895,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-09-16"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "31cdf6ab00898ae80e2bfe870378a499697da725"; - sha256 = "0iafqh05h3v5bnvigrb6bnv0sn6lps64blqfnksr35i60yljw878"; + rev = "4b64ba3e4ed30e96125b5725a3475ca6fb417c6c"; + sha256 = "0i5qp89ggwknh99yxrsdb8ywffsdhr2lrigllhl4ad1lrgbfmjz7"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1967,12 +1967,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-09-14"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "8757eccc3948aa6107448d7fee2de226f0b7040b"; - sha256 = "0fjjwqkb5xl2prk8im8ndci73zlaaazr5x92aa69qvsjkbzvq7fw"; + rev = "6ccdcc3527848af12093a6e4c47dc8cbbe59b8dd"; + sha256 = "0a5d17ik3jvxd0nv3djp4x2drxbg121pl4v1gn2bgwl2mf0rgdn5"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -2123,12 +2123,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-09-20"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "60403b46c67ee3ead7e59715ceab27a2affb2e6e"; - sha256 = "1mq5nyhy9cxp45bk261jzbh1yaniy0xh22v6yzqg5mfbjipmvcpc"; + rev = "805b12a9b7b1997a47b185cdb2938e0f3e428714"; + sha256 = "0lvf9i2px2s54rn0ahp0z0adn8d9qm051jaxqxmpn718kibknl7k"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2195,12 +2195,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-09-21"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "0f2f5a960f4de920741614bc5142d9c83a775254"; - sha256 = "1g9mf0zyd5favsspy8sa7j25x0981n4fyhrdxix3m1dglcpc1h5b"; + rev = "22e1a28b4189fe693efc52f3ada4a6103f40dc46"; + sha256 = "17jk0b5cbiy4l7vrqc22ncixqj2lxnjicjld65dsg4gcrjmhy17y"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2255,24 +2255,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-09-18"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "94477f86aba2eef070497c1624c7b8d06e183b15"; - sha256 = "1wpmk6addq754172fp4pxcad6sik85kssqzg23asjvk0sviaf9i7"; + rev = "b8be59288d8f120bd24c456c6ec62b6ea03d0fa0"; + sha256 = "158sd6n6hali2zaxq8wnjp4qd0nndfkv84fvlln7mm6mp22ynq7k"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-08-19"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "24494189e723b71c1683c58ecfd0825d202b2bf8"; - sha256 = "1zv7gmq8q5qszb2pxfiwkzwbm4yk2zbrly1whv2kpymlik37i7as"; + rev = "88202213fea9e2e081ad6a40bfb975b2b9434733"; + sha256 = "1vwjq6wgayh7n7lxaj5qqyf7xjqfgqp9mb9jlnqyfxl4b6phm2aa"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2483,12 +2483,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-21"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f39a3a58baa7f6dbe76db9c8b36473eedb27348d"; - sha256 = "00qwhvhfx8a6nbw6b2jjrgnj1drslqqx8yrd50324iblxhs9gbf4"; + rev = "1b852dcb92fbef837ff6a0ef0f9269e4fd234370"; + sha256 = "0r63crm8bymq44wbmc563gdhqvwmyfb1qsyyjkdayvyp45bq9ms0"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2664,12 +2664,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-08-04"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "9d7d6af330f9cbd7d4d536b5952b71a64790621d"; - sha256 = "1vzwa0nrwvfpiqvaad4jykpx1h5blsl3l125xzhx7vxgksmmrxbs"; + rev = "ee8465c7c21ea9a3ebcac30156105bdadd23751c"; + sha256 = "10a9kwsws9haribmw7r3c80cygwza3cihs2i096vzg8010yx78fx"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2916,12 +2916,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-09-17"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "6ca32a155406d11093f64fa97e0ba8c6802fb7e1"; - sha256 = "0f886hldkv4ws18m492lhymp92mxympp2maqr8zy4hh06i7k123a"; + rev = "27625ea437f44570477a608a1091ece9e244fb53"; + sha256 = "0fbksvyrwrs9kmmwnpa6rj5rsir37d27kfmxlvj8sbayn8ch95hl"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-19"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "99a81120838dad866a42823670e6b6666eb8c9c5"; - sha256 = "0mvv9xkks18d581jc6s2j2hkds3ajg7r9qsxxrrfn4g0n03gcka4"; + rev = "8f89ab239ef2569096b6805ea093a322985b8e4e"; + sha256 = "0cjx5xbmwkjbvcg0ak33lbz14ssqn84rikwkc0615fsrz323r36j"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3072,12 +3072,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-09-21"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "800e1876df24a178252520253eb63cb5c9f0e1b9"; - sha256 = "1w334jqw7b0bmrhx0036iaxb9lpi17vb1wq99kgwada7yxl5a72s"; + rev = "528611c602c3e18526fcd9d0663799f7011b00ae"; + sha256 = "00nsr58j4982pc8s8ncsnv0nv0g5kz63p8m1w4jc62m89ww7fd8h"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3492,24 +3492,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-09-14"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f072ef425be8a51d2130edeb7d773a1f8dc20313"; - sha256 = "0av57z1smv6nj64d5hdqgvzcrd3h0bypi1hcl22k5zpwmaqf40m2"; + rev = "964c66fa22500ae7375114342d212d7fe15da341"; + sha256 = "18gfwjgmk56n5xw4xrl8kn860a5sjqsbk14zjbc599id7m4jnaw9"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-09-16"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "28e652d110e7bda263bd4b0cb3c1484dce89cd93"; - sha256 = "0106iy1zkd13i26dviv6w8jgm9hapimpj97passh2khac3ajln5c"; + rev = "d57271a25fd2ccc06c23ab34dc7f8c90825b6ca6"; + sha256 = "1vwr61grlyrdj5kg0gqw33ww0f58ifcnwp2d6w905a8zilnvm37l"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3696,12 +3696,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-09-20"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "e731b845590017493224dfcb7403c2332105b700"; - sha256 = "1ksvs97cck1m8k1m6gngv62c7hh3l9ray82nmwyghs68mncn87nc"; + rev = "9310f91476a94ee9c2f3a587171893743a343e26"; + sha256 = "1si8qla86ng8cffbmfrk9gss0i3912yw0f1ph4bsiq0kk837lccp"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3732,12 +3732,12 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2021-02-25"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "7b8e3ef48d8e60fe64bb1a85be52e66dd412c84d"; - sha256 = "00n3kx4gczryx968n0l7hqdxg6i4vfi3n3m4bdl5d3rwpbwdy6zy"; + rev = "b42ba30810d8cc7d765df98e09b9e3e473e35922"; + sha256 = "1ka85zsw1g1g2rqvq34wwh0n7wpgmvg8i5cxj39p4j5vxg14in46"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; @@ -3768,12 +3768,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-09-14"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "8833bbfa7b341896cbb9f3ed9a3b4687461e6aad"; - sha256 = "0ilkspfnlqflp0854gmha4v6zlnmslb83laab25a972svpqrg8pf"; + rev = "93680e52a43b5c402ec20bb026fbdb5ec89b1906"; + sha256 = "1gvajghkipddaqw69h7iys7pm3f6k0y5pa52giddq2rsgkqsq399"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3792,12 +3792,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-09-20"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "ebd3ff7b96ff8f9e75ec19f77bd10cb2bb7c8e84"; - sha256 = "1grnvi8glqffbr1k4sifr0bg6dkflarzj3f6c2jbm98l4dk3vps8"; + rev = "46d9df8bf6535c1bc751a4134fc52ea91068cfaa"; + sha256 = "19b4ix8py8vg2jrzhhzcp69jyl6snplii6bpyaasj5nhhjxslmlq"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3828,12 +3828,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "96b977966810b5038cb3b96ec54247c7a63c9c92"; - sha256 = "1yhcm3p9msw09jh968isg09dqn49gfbjbdpvqd638siij70zs9ki"; + rev = "204b4e66f13f72ff3f4d50b2484aaef7b17a733d"; + sha256 = "0ah3c4k5h7wy1nb5dazm2mpww1rsx4gzn8qpwlyl5jgwl0h76k3x"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3876,12 +3876,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-09-20"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "19bb83320aec21d7fcb1514f3cb8bd8496d22ea8"; - sha256 = "18xwwdbzggfyy86mh1ji17a9b62d86cc1jnw9r93996ynqdrs87n"; + rev = "9196a8fa36d0a259f6b3fac5685c6427f02a35f9"; + sha256 = "1jcj4qmjhx4jvkc4y0vjl05dd9z55n296n2mwr2ps8xi5s56xhyf"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3900,12 +3900,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-09-01"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "8f0eb6ba45acd8e9b3d4aeb4428cd22167c96c20"; - sha256 = "1pz4l85radaf71qbsdf8bnb4zf3c77x40hwnyy72p3mk6r1wivfd"; + rev = "84789c508a1d4323f494faa5cf18f7cb00b5cb81"; + sha256 = "0ddfkgx8235p07bnjmk01n9z5gnb51s8y22f905lfv2cn1jnaag5"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -3936,16 +3936,28 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-09-21"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "0a8ca50d9e96ae5b84e71146b5eb9d30baabc84a"; - sha256 = "1lbp45hbwzprfpzrhkws853dnv1ax63bqnzav04bl787kk5ryajn"; + rev = "cc21a61910b89422122cc0c67a8265247bd0db6a"; + sha256 = "0lql5v1dc3lwp85xkkj2xjqi7hbhhwnp84j704ay1mgxb2h7jqin"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; + nvim-code-action-menu = buildVimPluginFrom2Nix { + pname = "nvim-code-action-menu"; + version = "2021-09-28"; + src = fetchFromGitHub { + owner = "weilbith"; + repo = "nvim-code-action-menu"; + rev = "0fea23ef716546ed1491d9d27d1c58ba658c2e01"; + sha256 = "0s7ijj8323baxfamxk8zncdyf2zpl5c6pgfzy9kssv0z1ayl4463"; + }; + meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; + }; + nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; version = "2020-06-11"; @@ -3984,36 +3996,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-09-20"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1ccfcc12f7d1019e4afa0a1bb64c371d0944d179"; - sha256 = "1xvvv6sxcsf6n3gxfrdxdcbvqfs8sc2fjwg6jz0rgbsavlis476b"; + rev = "00339d33dbde7aae1424e4cda53c8799e026b934"; + sha256 = "1fmp03xsr0flx9j8mbzs4s19zy1xzfjk78w9av8a6g3lpag5iinj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-09-10"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "945ab8c0def213b26fb87f24c1953541b60bd7e8"; - sha256 = "11jznj4a45i6221s1izr17nhlayi6ry6ma0a7x01cblfzdcg60as"; + rev = "547635e7ba1dace13189386c98c3c7b064d585c4"; + sha256 = "00i55cccg65r0zz58ap6if6wgrsm1n6r0clgf959sigmj8q9559h"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-07-25"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "ebd0a7850432e2c9b9651b8e4091e74e59604c77"; - sha256 = "17z8g124cg3m28fn418d3rgia6aa44xyw70h7kkl0w1xpa908n03"; + rev = "8ab2aa7b04a4f3c0c8d72dc6affc8e5e20410d93"; + sha256 = "1llrx9n0jg7j9q37lzjax2h1y1z6xp6a2d701q30j6l98yan6x9n"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4032,24 +4044,24 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-08-02"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "f2c8d5b70f4cad18db5f15e897ba006aeba08f80"; - sha256 = "0vq9lb2vir0am85nwjqphdmlx7akvpvcfgw3mr15rvnc9spzh8ix"; + rev = "b35e18e02b9500fbb2773f6d494727cdca25e2d7"; + sha256 = "1l9flkh38l9iwp1dbnx3fpyv6x2680bshalyw9nw1ixxhx6ys456"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-09-19"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "aebf14fa2fdbdc468045d55d07641f498c548374"; - sha256 = "01hfm570hrx2paifnxxqirailxl5hfx22ay7j0cxk9v9z01p4dks"; + rev = "f73a6f012ee43013c8e6d8cfbb987208ead34182"; + sha256 = "0d088wkm3m8s4zipj7i8fd7lr6wakh725plxnsirdfljc3krv5cq"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4092,12 +4104,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2aae87e2f5f7afd2a6fb8c75bcb63908299390b2"; - sha256 = "1lxlh0jbz2krfl4f037h2x992yc5riqznq257rahy7n7nydd0yma"; + rev = "f9fcc46771bed33aa894b15d01e16812a6a80cb2"; + sha256 = "11dm843bzq3jm1q4jn0lna600wl8g70g7prgmwcgf0wisclxsyqw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4116,24 +4128,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-09-16"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "aa0b9fd746d73a5ebbc72c732c645e96423d4504"; - sha256 = "01jgxf8bgra4sgh63zpb5xga9lyb3bvpqcdzjk3vp6gyks66fb6h"; + rev = "9ca394ec3a9305a6c30018ee6f731c9b23a4b25e"; + sha256 = "0w1nkiqnbskz8cj02nm9idhsavilk0akvfh4nagk72xvxvmxggi9"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-17"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "e09390daebda810e24c7feb060fde2ea51f99a6c"; - sha256 = "1638an4mx5z0w9w3sinr4s3h6y3wsmymqh59pb5s6rx9pimqw7b2"; + rev = "3cd91183422c4a06f2a3477f909908331787351d"; + sha256 = "1sncdlwwfcqswa3xwk83ky5z6g5n40cg3fapixh54pg0iczak9ws"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -4200,12 +4212,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-09-21"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-spectre"; - rev = "966a8ca70599e818108b92f49ff45105df98f3cc"; - sha256 = "1x20a8pklmhanqvbiykwznwpgsg2mr6l2m3w6xkhjxpll7kb2vy4"; + rev = "b755466cb3efe2b8c2c0e5f06f850b49b7ac2e79"; + sha256 = "0xn6n01s9smhpwl4w1d8i2hhwckw2slaq9pdyl2gm2dpmvk7sb2f"; }; meta.homepage = "https://github.com/windwp/nvim-spectre/"; }; @@ -4224,12 +4236,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-09-12"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "d7f73b5ae9c8fa85535c32e2861c2cb97df5d56b"; - sha256 = "15j4q0qa84mg5bnnr216njbq26pq0a9z5ggd6s0wdfzkiqkhswz1"; + rev = "f8b5eb0bd84744a1434bae83692d6c7eb8dcb91a"; + sha256 = "0iyw7nwg2xz151748n4aqcrm5gi027rblppglnyx63qpwf128wav"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4248,12 +4260,12 @@ final: prev: nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-08-08"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "9c71ace8af7bfbfef3beb25c648c8d41f72bd09a"; - sha256 = "1jp4an8nni9m8528lza6vc0bj5pkmzfadzvqrgh6vi545ppmxihl"; + rev = "d4f0193c2a5e947247c2fc407c266bfb09b55a7b"; + sha256 = "1pg3yc1vlx7a0iwx1cgkzs3jpmg1rlw6db7dyjxkp0926vz7dv0k"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -4320,12 +4332,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-09-11"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "be8bb70502441e3bdd4911cf7998dc16d7535706"; - sha256 = "0sz6y0jzzb84ws5p8m49ry43dl9y0ahbppx5qy61i72bahv9hkpj"; + rev = "ba8a9362c96bc1fe62038640aa8ce902516707e4"; + sha256 = "06g7vcvvx1j5gl1143s6s41swix28qkf0c7185m7zn6yl0aljglz"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4416,24 +4428,24 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-09-16"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "8eceb078f8093c10b4a68d68203f4edf99db112a"; - sha256 = "1wnhgbi8hgrsnsq78iz7z1v7acfjrbhs08dykf0g4km03s4wa7qb"; + rev = "092e270b76940dff9a8270f97c2cec7eca97d31e"; + sha256 = "0c3axfdr2mz5sgmpsk510z9yj62iw58ds3amkbqd03nywn3s6bjv"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-08-12"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "bd199dfa76cd0ff4abef2a8ad19c44d35552879d"; - sha256 = "1xh3ypma3kmn0nb8szq14flfca6ss8k2f1vlnvyapa8dc9i731yy"; + rev = "cc8ecccd324ea0d8f07dc54806057806d0aff1d8"; + sha256 = "19jairk59a0f4p34h84sy8ia1qk2bcbwxk5i49vf5gxmi31pjpy4"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -4476,24 +4488,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-09-21"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "09d3d87b5a48cb31b8b1ddd84a1aa2012771fb9a"; - sha256 = "1l1jlcabjhqbz7dv0mr1qwajavq288y1ki07sjq70r8dzpzprg27"; + rev = "1f7b6a42102e13d4c14985e4e889e95ea91babde"; + sha256 = "1bzjcplg969krngln8kf07fjwlgd4817kv4rz9jbv96h503wfava"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-20"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "0a2d8cbaa2045bdf3797af7a5abb2d42d0edecb0"; - sha256 = "01xx86wj4yx730mpzzy805dh72ridvbhk5540zylbjxwwb5dh1y7"; + rev = "a97caceb6b911bfd4b9fff91d38dae845192eb82"; + sha256 = "0j15m3xyw315rs0hhp86aqwk13bjac2q7z1zxa0zpq236njcr6ch"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4596,12 +4608,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "03ac32af651bb33acfc4ce20d5cb51bf5a424aa1"; - sha256 = "1rvw01i89mz43fzyxrynvfyxhb0xsijllf3y8yp5dvy61i9c7yar"; + rev = "8c6cc07a68b65eb707be44598f0084647d495978"; + sha256 = "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4873,12 +4885,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-09-16"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "fbea6d958aa337194d4c4fbcac9a983d7b99815e"; - sha256 = "0wpdy8ng64c0nn6fakg4yc4z8wrkligwfg70sdlyfcg2qi1skj87"; + rev = "040bf049b4696b1f9413a915f94bf49e41e53817"; + sha256 = "0ws3vc3iildz4w425w8dg6pximx27m3ikw6jllg8ass2sf7izf55"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -4933,12 +4945,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2021-08-22"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "9f75ac3734bde4cd2cc1726b6936650ac4e144d6"; - sha256 = "03jgq6rd3rxs6hn2ksh8nbkbv7lpabcb7372xifq5vhgqqfj447j"; + rev = "ad2d155d7e1a633a597ed3b01e5a8eb084471620"; + sha256 = "1h9d1pqqs1vzk8qiqzjpycv880m3amb1synfp0sl43a1lbavk8qr"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -4981,12 +4993,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-09-18"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "83bf0cabe040a6e02b59296622c838831a2b5c4f"; - sha256 = "0d2gl768rgd5l1wh9sq2z24rdmg5g27ib6fjfdcvxdlc2s5g333l"; + rev = "eb6ac6ca69ec76fb5fde75d421022f6fd474629f"; + sha256 = "0fwkqpx8rcmfryzkzgm6wzzi5mdx9q6zhwcysxigx0i4xqlhdrrf"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5234,12 +5246,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-09-18"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "7722b4b25bd6319ed059ecebeb7857471b8357c9"; - sha256 = "129lcawsg31xbbw0h63f92g0dy5idgdb4v8sd1rl5sp9qqvzfp5a"; + rev = "3f34e4a1e78ab1049aa6b350008f8902f2855467"; + sha256 = "1hzqrx7dp9yv276fr9sddwpds50n1vmfik9fiq44djdqwd0z092v"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5342,12 +5354,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2021-08-02"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "a27352edee29fad650f129a41908bc62efc82978"; - sha256 = "111z3kc3wc8n8cdmc0v4aysh8irfg4px0n0224wvsswax8ql2q74"; + rev = "fd0723bde223c8431746ecfc5cf2608c3bae828f"; + sha256 = "01s4kqv5jn15cdxwvbn7raikslqwrbmpf7gg2qwc51v1ynzi4iqk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -5355,24 +5367,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "828cf63fd2494cd47bd6d2a3a5b927157d3204d1"; - sha256 = "0h34xl1ich9m4xgz3a9ck9liyya6swmmc9iqcr61lihhgh5fz3qz"; + rev = "2bd7cda0ba014af27f5459588eceafe1e0250eea"; + sha256 = "1cdpq27phc6h23yv5hqisqa5yg3kcgf44d3yld2f277h32q4yp7i"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-09-04"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "c4d0ae8e25528cdfaa18144b12ddd95ced21bef8"; - sha256 = "04ma5si8ig169gfq7pqjxx24fg6mmys41z4581dajrsfqbajc727"; + rev = "0325ba54262c7d03450d877b44e692c88b17cf7a"; + sha256 = "1vrvmp3ihjb8zlg5f00hs7d6km8p30g7pakaw5rdk60pxj21sw2v"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -5475,12 +5487,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-09-15"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "a8cab53271c97ff6d2a0c18756d7b4e71012d41c"; - sha256 = "1nkc0qj4birsydd278hkkjyvkyi69gva367h8fpnk0ss2i621rcc"; + rev = "a56d5bdb0a3bf6b9cedf44654c3a132809793a4c"; + sha256 = "0lz8w8pjyjjjybsd7qgdh0br4ygixh563fk3w14sdsqyz86dy57l"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5572,12 +5584,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-08-24"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "bb8ca482a5d14a771f718bd794b5945be3a6ff74"; - sha256 = "074dvmc7cnwqjx7dy8zsp6ikdzh9gxralf41vs17z8qr6pd4y7g0"; + rev = "b6669c7c9de542c53f2d19a806abb7610e9ef813"; + sha256 = "07nzjcp714g2jd9ys7md78yvxq2mz6s6yb06v1yxn5qfnlc7sjxk"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5608,12 +5620,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-09-21"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "70b33f336a0388c2d4fc72ecf7cab2245df580b8"; - sha256 = "1k3yh2ypzy6vwdvf1rrnswnpc9cqnjhvdsjal7yfqk2brvwawk46"; + rev = "c4392c36c01cfffcb06f460d722990b98bc53bdb"; + sha256 = "1z60rb7nbxmbjw8vbfb1f2dg0w7sfsp9923abjj5rs6qxym4bg22"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5741,12 +5753,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-20"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "60660334c70d9d81dccc10a563e01920b9455e76"; - sha256 = "1ss1yrbsp4hnw7h1aqb7bkpd9p594r0g1906sgsmcglyjyc1zasc"; + rev = "4e629cdea197b7c4f3c476346a8841b74bf9fd56"; + sha256 = "0g7bkay3pj81rb5d91phfzcvs63xk9gqarax7nm7d7mcjncs570a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6102,12 +6114,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "858ef2d7a637b1c50c9266806473d895829d0775"; - sha256 = "1fbnhcxwic629nz49vp8qdxr164dqnlp7gfdb4qngj2j2mv6g44r"; + rev = "8cce1f208d8c26df3d3513a0f730dda70b201d48"; + sha256 = "18waprn9caa69r60hgs67g1wpclm03k1jzj4l68g98cky04b33in"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -6702,12 +6714,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-09-20"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e5490b568561d51ea41ccc72e3cef88f85c8968a"; - sha256 = "19r3kgr2ahfyvm7slf6qvyxbzjviiq6ckkrqnkws6pr0n3jz1irl"; + rev = "c0cb720b416d9641f37c11abd9bcc005cfe4d8cd"; + sha256 = "1zw9ygsmzs6n30vra8yxz2rglh5gm6zv81hvfrbvhmvw3cyz7yxf"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7290,12 +7302,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2021-09-06"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "461717a931a7d985ac0ac8f4d856a7564b4d3f18"; - sha256 = "1axs13d5jz7vsckyl3v44vli096p991rp67gcvpis4isg609ld8f"; + rev = "f62fa7eb5c17e8fbf93d7dcc5ff593dc534fd44b"; + sha256 = "0h4n6r8zpwqlh635nqig8bisc6djq2by51nilra90i524lxw8fz5"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -7506,12 +7518,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-09-19"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "e1d382b3e7e7491acea8546ef3bdfa9ce7e54fef"; - sha256 = "1y1iascskvqq08020c7ks8xhn0b4zrsxva326iaa3ypwhsjada94"; + rev = "7b05afd548bd5e3f45e61fee3defc024a762adfd"; + sha256 = "1w1rlzhbyjrwvq6d624js238lvsm319lhk103lwq9xzdg5za9lj2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7530,12 +7542,12 @@ final: prev: vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2020-06-19"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "77330855a36350e75393cdeefb743da1040627ce"; - sha256 = "0g3wvp02cv69v7xcsbib35bw9yf36iq6ffny7lmaf0s1pj2kwpzz"; + rev = "115e2600481c92c0bfb69d82ccbd8af7dc052a03"; + sha256 = "15bpxhqdbs3sw2d3w1xa5l8yml67h1fjjqhf1m3zpplqy20kfbxh"; }; meta.homepage = "https://github.com/raghur/vim-ghost/"; }; @@ -8059,12 +8071,12 @@ final: prev: vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2021-05-23"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "f8345cdb6734aefa5c0f9cb128c9efd005410a43"; - sha256 = "0s8bsfsjzc2djy2gvvf44g5ypsr7r3ax436xn0qpvhr58aa5m4dv"; + rev = "d6e137563c47fb59f26ed25d044c0c7532304f18"; + sha256 = "0pps9mqkkmmlqy0ir64gvwbz9jngcgvhy8d9hqb7bkps92ya6zr5"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -8252,12 +8264,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2021-03-06"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "96ec5f9a14211c3b1b2e4632c07df3a5fb68ef3b"; - sha256 = "0kawxaxahg7sdpkyp65k7gy6hqbfcs1hy8w8rzvi2h9kw4y8xkr7"; + rev = "5461c6911ee4d61d1f729c66cd3514905203be34"; + sha256 = "0k2l8z8qkjqj4swwzlc0mf1r77n1rxi5skxwlvvwcldx0gh0mv4r"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -8300,12 +8312,12 @@ final: prev: vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2021-07-22"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "447c69b59fadcf04f96d99873126953eae7aa235"; - sha256 = "0cglf4kfb07jwz1v14gl83rnfjm4c1b69nih3g7yj001ddyj5amx"; + rev = "dd5243a34e97c15e1a128b6ec440a0368e583900"; + sha256 = "0kn4w2i83fwhjcpmj1zym9hr4lvl27vcl0f1cz3n3lv3jhr7g7zg"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; @@ -8360,12 +8372,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-09-07"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "14f9ab319ff96eea16ef6dbf57ed801c8fc8967e"; - sha256 = "04kj6q2kgl1m4l6z2v74c3mjab4rmi43ly2rpyvq4xqf25him10k"; + rev = "ee38eb1bc6c898fee0e980276a2d9d2104f014e4"; + sha256 = "0k9wy5aciibhjn9l9q4w75jlv764db86sn2pxjfvwiskcqwfny1g"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8469,12 +8481,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-09-20"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "daaa7dbde55d829dd456f458d90ae2ba98717ed2"; - sha256 = "1lqx3ixdf3l4pd4k2cbhxpsja66lm30bas4zciyxq5c9fgbpg091"; + rev = "35899fd1ed8e6a40708e3980cb15ac12d48bf067"; + sha256 = "1xnnldnqghb1vdls0lnzi710n7wgkf5wanyq4hhdizgqgsm6mwdp"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8709,12 +8721,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-09-20"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "d02e928db459d3c9e9727d990838caa70b83714a"; - sha256 = "0qqyr1r4sgbwylr2i1rpqkx9ww2im5nk3c2qai420ywp3y4hr8x5"; + rev = "71a92858d614e1682db36fc414ca54c7d7199a24"; + sha256 = "08q84zvj2mbkc0bxgyxzmkjd7j0jahbi4fhw5b2xjxdavi4f18n2"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -9561,12 +9573,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-06-07"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "2cc8c80c0a88e0d47de85bef1d50df86e197c302"; - sha256 = "0djk8s8q4b72blw73r4m7z9gc15gys167xgnvd1avmfyfw8fb22a"; + rev = "66d206292bd2e556bbf729ef808f0fffbab92c88"; + sha256 = "1431dk1ffcvgjj0zm4sj7z6csmw8hvmf05pxl5p45jj15xbqikzh"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -9789,12 +9801,12 @@ final: prev: vim-tabpagecd = buildVimPluginFrom2Nix { pname = "vim-tabpagecd"; - version = "2013-11-29"; + version = "2021-09-23"; src = fetchFromGitHub { owner = "kana"; repo = "vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + rev = "5f647097d868318002de4d971ed446b8b44e4e90"; + sha256 = "1nbgjl7qbklh9d2xrlxcpmppp2408lcxm2lddiwdh4v38hqpka7s"; }; meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; @@ -9838,12 +9850,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-09-15"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "bf200532aa8e2097af0f26e73b4f00c0cadb3118"; - sha256 = "1s6qqpj1iyrm2cxig3vhxmpb4mcg0d82j1ai7iz4r2rq008m2aqv"; + rev = "4a515c01a93254f920bcf7aeb7b3b61da2a7e041"; + sha256 = "062gfj4z3cd1hy951gn831ag4dv13gmq7shdd00w4q5nyjbkmf7d"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10006,12 +10018,12 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "9a05931018f4046179b76dec5b3932b48f3e3fb9"; - sha256 = "11ck5flydf48hpagl0v6ik6cd05il6jv57hixnhg7pzyrjp5q26y"; + rev = "8f40e6db284db7e893fceff64c62358862bceb88"; + sha256 = "1cna785z0y2w20psx43346vx03i2li7i1a1mf01x0a2qd557bw15"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; @@ -10078,12 +10090,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-08-18"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "416c58d00280c452f4c8c75866393394031fcb6b"; - sha256 = "0vm91shvwzq6x3llxjrprx2vimk73hkcdcmivbpkmvbsx0z33480"; + rev = "dfea06dc0e8da24338eef3414259055f360449cb"; + sha256 = "1h8g3pcwgjlm68rlzb0v9xwbgccklig68pd8i8g18bzw341b622b"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10106,8 +10118,8 @@ final: prev: src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "9cf8b258e444b393784c32d7560fff25b24c79d3"; - sha256 = "0bd9k8446163n8f5f3w3sxvx2s72b2mv0zjphkxxyhy9h7jycmz8"; + rev = "112e23a22ff41d090c2440aeaf12d2a6c5486bc6"; + sha256 = "05vc09g91c6zz37p6as3q1fm9c7ahvjih1jd607bhgbzys8342c7"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -10186,12 +10198,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2021-09-19"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "21c77665bd9d57416be2b6d11378347e163cfaa4"; - sha256 = "0wpscf9mavc7g1494c53bghh733db7v02lvqv2ggskjygz7v7ikc"; + rev = "c16628dd4b8f48eb22a597c9a5cba1a04ec3c41a"; + sha256 = "1p5fnjn8cxy4xkppml4bxnadz2zazprkn19b1drwdsk3kmfg625b"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10210,12 +10222,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-09-09"; + version = "2021-09-27"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5ef2cc4c68af5d291ba85dc444ebb1b26158444c"; - sha256 = "1crzqn6g80kjhjsp9azh48xh9m5zcjr7vfazssh02sads02nppcw"; + rev = "a59c321ed5043ccbd47b3d00185890fa13035ce3"; + sha256 = "1ni6hdqiwswg1f5igqxikk18n45p1rabzahx9zwz9dzk2clrinfs"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10246,12 +10258,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-05-04"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "da2934fcd36350b871ed8ccd54c8eae3a0dfc8ae"; - sha256 = "18n5mqwgkjsf67jg2r24d4w93hadg7fnqyvmqq6dd5bsmqwp9v14"; + rev = "2c915b6de918c073fbd83809e51343651f00f9a8"; + sha256 = "05jdjmpyczcgqsm5mznyb79bq10ianv7v3rhxy9wrklkama3jrgs"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -10306,12 +10318,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-08-13"; + version = "2021-09-22"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "9e1ee818616edc38a52dbc3956a3046393384d05"; - sha256 = "0j2z5mkdpfp6wzz7saqnpla0wmsr1c42gvjs0n2i4385phlg93vz"; + rev = "6ff20c655dd5b6f6050a234638d83ee7f65ba164"; + sha256 = "08mg6kcayp8m0vfcvk0afppslkszf7fjskb39b94df0sh7ymkw5p"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -10354,12 +10366,12 @@ final: prev: vim_current_word = buildVimPluginFrom2Nix { pname = "vim_current_word"; - version = "2021-01-27"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "dominikduda"; repo = "vim_current_word"; - rev = "84ae9300de73cf878c805a6228a58d408b6b829d"; - sha256 = "0k0wq3aqrbwrqyfz36qdqzyq7cw16d34yvw0gvzyg7iany0z0r6r"; + rev = "5cfee50ec35d011478c4ec9805a0e5d9a92f09ea"; + sha256 = "0l543hg5wyrbqykbm8vvhcb8wq9gwkc8y4nq9f7qy5a2qssvvd31"; }; meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; @@ -10498,12 +10510,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-21"; + version = "2021-09-28"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "eb782756ac46a1f09dfaa1664fae3b9722876b8a"; - sha256 = "08hcd0gai7hxs6632s3w4yp93kpvz0525rps68g0nyyr8blrlp0i"; + rev = "83741ac1abb2e3f9d4bc42f1ec3a06989c5ff379"; + sha256 = "0j61n112cn3szy0w1aq1xgrqfnhp38gzdj9rck9illqc4jy7gsaa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10511,12 +10523,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-09-21"; + version = "2021-09-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "562afdb82a58f105ae17c3e93e37ee233ae166a9"; - sha256 = "0nysplhi5yj7y4ngij284hp4g45f3qbf0fmssinhyl75miz102i4"; + rev = "fbe94cd3eaed89d6c1236af486466b1fcc3b82c9"; + sha256 = "0bffxnna70ah7cw6c58ih1a9rczvq4hjh44b4y3pj7v88i19w62i"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 234b2a2355..29aa160411 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -644,7 +644,7 @@ rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim saadparwaiz1/cmp_luasnip -saecki/crates.nvim +saecki/crates.nvim@main sainnhe/edge sainnhe/gruvbox-material sainnhe/sonokai @@ -868,6 +868,7 @@ w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim wbthomason/packer.nvim +weilbith/nvim-code-action-menu@main wellle/targets.vim wellle/tmux-complete.vim wfxr/minimap.vim diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix index e27272a614..62437d662b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2021-06-25-${kernel.version}"; + version = "unstable-2021-09-21-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "2ce6d06dc73036d113da5166c59393233bf54229"; - sha256 = "sha256-18HFtPr0qcTIZ8njwEtveiPYO+HGlj90bdUoL47UUY0="; + rev = "362c4e32ab585b9234a26aa3e49f29b605612a31"; + sha256 = "sha256-Y8/PGPLirNrICF+Bum60v/DBPa1xpox5VBvt64myZzs="; }; hardeningDisable = [ "pic" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.19"; + broken = kernel.kernelOlder "4.9"; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix index 73e50c5740..242f9e8391 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/erofs-utils/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.2.1"; + version = "1.3"; outputs = [ "out" "man" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"; rev = "v" + version; - sha256 = "1vb4mxsb59g29x7l22cffsqa8x743sra4j5zbmx89hjwpwm9vvcg"; + sha256 = "0sqiw05zbxr6l0g9gn3whkc4qc5km2qvfg4lnm08nppwskm8yaw8"; }; - buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ fuse libuuid lz4 ]; configureFlags = [ "--enable-fuse" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 1ae8ed3ec7..b06b239221 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-08-18"; + version = "2021-09-19"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings [ "-" ] [ "" ] version; - sha256 = "sha256-RLPTbH2quBqCF3fi70GtOE0i3lEdaL5xo67xk8gbYMo="; + sha256 = "1ix43qqpl5kvs6xpqrs3l5aj6vmwcaxcnv8l04mqqkyi9wamjydn"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-0ZNgRGImh6sqln7bNP0a0lbSPEp7GwVoIuuOxW2Y9OM="; + outputHash = "02nzl7bwvkcxd499glfbrkpyndrlmqkxvpjwgjr0rccaqdhfl21j"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index fa3dea08ec..983a7df80d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch" }, - "5.13": { - "extra": "-hardened1", - "name": "linux-hardened-5.13.19-hardened1.patch", - "sha256": "1cj99y2xn7l89lf4mn7arp0r98r4nmvql3ffjpngzv8hsf79xgg7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.19-hardened1/linux-hardened-5.13.19-hardened1.patch" - }, "5.14": { "extra": "-hardened1", "name": "linux-hardened-5.14.8-hardened1.patch", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix deleted file mode 100644 index 3f5ae2e13f..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.13.19"; - - # 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; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yxbcd1k4l4cmdn0hzcck4s0yvhvq9fpwp120dv9cz4i9rrfqxz8"; - }; -} // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a12633eb6d..b5c629e850 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -9,7 +9,7 @@ , ... } @ args: -kernel.override ( args // { +(kernel.override ( args // { argsOverride = { version = "${kernel.version}-bcachefs-unstable-${date}"; @@ -30,4 +30,4 @@ kernel.override ( args // { extraConfig = "BCACHEFS_FS m"; } ] ++ kernelPatches; -}) +})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index 1c06405904..df740845b6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.14.3-zen1"; + modDirVersion = "5.14.8-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY="; + sha256 = "sha256-hquMBDjP4fBMNdjxxnJJKx/oVNd2DwBPmVpZQeEQvHQ="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix index fda11400e8..3590f87e37 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, bash , bison , flex , which @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex which ]; - buildInputs = [ perl ] + # bash is required for correctly replacing the shebangs in all tools for cross-compilation. + buildInputs = [ bash perl ] ++ lib.optional sensord rrdtool; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index 3a30650848..57d59c27b6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0dpadz945482srqpsbfx1bh7rc499fgpyzz1flhk9g9xjbpapkzc"; + sha256 = "0qr1wa163cb7z6g083nl3zcc28mmlbxh1m97pd54bp3gyrhmdhhr"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 1dbe281e09..656fa47776 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl +, nixosTests , withDbus ? true, dbus , withReadline ? true, readline , withPcsclite ? true, pcsclite @@ -139,6 +140,10 @@ stdenv.mkDerivation rec { install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; + passthru.tests = { + inherit (nixosTests) wpa_supplicant; + }; + meta = with lib; { homepage = "https://w1.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/servers/dex/default.nix index 0f4282699e..16dc5f8baf 100644 --- a/third_party/nixpkgs/pkgs/servers/dex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dex/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dex"; - version = "2.28.1"; + version = "2.30.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MdrkQ4qclylkan8y845BjLiL+W16iqRuNMmvWsKo+zw="; + sha256 = "sha256-Z/X9Db57eNUJdjzLCJNIW3lCRw05JP2TQ43PqKO6CiI="; }; - vendorSha256 = "sha256-rAqqvnP72BQY/qbSvqNzxh2ZUlF/rP0MR/+yqJai+KY="; + vendorSha256 = "sha256-ksN/1boBQVhevlDseVZsGUWL+Bwy4AMgGNdOPgsNNxk="; subPackages = [ "cmd/dex" @@ -26,6 +26,8 @@ buildGoModule rec { cp -r $src/web $out/share/web ''; + passthru.tests = { inherit (nixosTests) dex-oidc; }; + meta = with lib; { description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; homepage = "https://github.com/dexidp/dex"; diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix index e0bfc3a622..e41118e370 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-mPZvREBwSyy7dhVl2mJt58T09a0CYaMfJn7GEvfuupI="; + sha256 = "sha256-Tegpc6SspDoVPVD6fXNciVEp4/X1z3HMRWxfjc463PM="; }; - vendorSha256 = "sha256-DTw7SVZGl7QdlSpqWx11bjeNUwfb4VlwsGxqPVz6vhI="; + vendorSha256 = "sha256-fWK8sGd3yycgFz4ipAmYJ3ye4OtbjpSzuK4fwIjfor8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix index e7746fa34f..cf23ef9d2f 100644 --- a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.23"; + version = "3.23.1"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UiwjYqfrLXrDfqoVBPEq3tHDc0eah7oGzGeVl0tWe7w="; + sha256 = "sha256-C5kc6aRlOMTqRQ96juQo/0T7T41mX93y/+QP4K6abAk="; }; # TODO: render & install HTML documentation using asciidoctor diff --git a/third_party/nixpkgs/pkgs/servers/grocy/default.nix b/third_party/nixpkgs/pkgs/servers/grocy/default.nix index a417b8e38f..d8c73ad39b 100644 --- a/third_party/nixpkgs/pkgs/servers/grocy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-xoYjaZF7Frz+QPZ37fBSbgXTwsR/+Na+XsP5tfATgNg="; + sha256 = "sha256-Kw2UA3jJEfGPr9jMnDmJ4GW87fwM80pQpqTz9ugXzow="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix index a65d4bb382..a19a2773ce 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "1pkc9bh5s2vqnpkmnm91zaihh98b3drhiv4lcpi98rhln8r52b1k"; + vendorSha256 = "0c0zn3a3bq3g13zj1b7hz1gfd9mcc5wlch80vjgp31vgm23vvd8d"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 37b95cf8c9..f0f2009fad 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.2.0"; + version = "1.2.1"; # Use the release tarball because it has the version set correctly using the # version.txt file. src = fetchurl { url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-xSqtgUlB7/4QWsq5+8YhxxfQyufpuscIIROJnlnFZn0="; + sha256 = "sha256-w+8gsuPlnT1pl+jiZFBYcIAN4agIAcvwkmdysj3+RAQ="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 39a5ed3e2b..347caca827 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -33,7 +33,7 @@ "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; - "ampio" = ps: with ps; [ ]; # missing inputs: asmog + "ampio" = ps: with ps; [ asmog ]; "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; @@ -188,7 +188,7 @@ "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods + "doods" = ps: with ps; [ pillow pydoods ]; "doorbird" = ps: with ps; [ aiohttp-cors doorbirdpy ]; "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; @@ -218,7 +218,7 @@ "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline - "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib + "elkm1" = ps: with ps; [ elkm1-lib ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; @@ -267,7 +267,7 @@ "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; - "fjaraskupan" = ps: with ps; [ ]; # missing inputs: fjaraskupan + "fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; "flic" = ps: with ps; [ pyflic ]; @@ -551,14 +551,14 @@ "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; - "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns + "mythicbeastsdns" = ps: with ps; [ mbddns ]; "nad" = ps: with ps; [ nad-receiver ]; "nam" = ps: with ps; [ nettigo-air-monitor ]; "namecheapdns" = ps: with ps; [ defusedxml ]; "nanoleaf" = ps: with ps; [ pynanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; - "nello" = ps: with ps; [ ]; # missing inputs: pynello + "nello" = ps: with ps; [ pynello ]; "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; @@ -599,7 +599,7 @@ "octoprint" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; - "ombi" = ps: with ps; [ ]; # missing inputs: pyombi + "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; @@ -795,7 +795,7 @@ "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local - "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher + "solarlog" = ps: with ps; [ sunwatcher ]; "solax" = ps: with ps; [ solax ]; "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; @@ -961,7 +961,7 @@ "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ibm-watson ]; - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; + "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ aiopylgtv ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index dc17991461..57f753439f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -177,7 +177,8 @@ in with py.pkgs; buildPythonApplication rec { --replace "cryptography==3.3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ --replace "requests==2.25.1" "requests>=2.25.1" \ - --replace "ruamel.yaml==0.15.100" "ruamel.yaml" + --replace "ruamel.yaml==0.15.100" "ruamel.yaml" \ + --replace "voluptuous==0.12.1" "voluptuous==0.12.2" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -338,6 +339,7 @@ in with py.pkgs; buildPythonApplication rec { "ee_brightbox" "efergy" "elgato" + "elkm1" "emonitor" "emulated_hue" "emulated_kasa" @@ -361,6 +363,7 @@ in with py.pkgs; buildPythonApplication rec { "filter" "fireservicerota" "firmata" + "fjaraskupan" "flick_electric" "flipr" "flo" @@ -520,6 +523,7 @@ in with py.pkgs; buildPythonApplication rec { "my" "myq" "mysensors" + "mythicbeastsdns" "nam" "namecheapdns" "neato" diff --git a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix index 71490b3428..3c30b2c3ed 100644 --- a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -8,12 +8,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.19.3"; - version = "${nginxVersion}.2"; + nginxVersion = "1.19.9"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f"; + sha256 = "1xn1d0x2y63z0mi0qq3js6lz6ziba92r7vyyfkj1qc738vjz8vsp"; }; # generic.nix applies fixPatch on top of every patch defined there. This diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index baa1461df8..4814f95641 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.545"; + version = "0.18.582"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-aHb7bhqagf60YkzL5II/mGPeUibH655QH8Qx3+EqWjY="; + sha256 = "sha256-WwTeUvBD790CP+mph2xKm/m7csYQgmXgJa4TLn5nsVI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix index 702808f950..c69e699a3a 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.94.2"; + version = "4.95"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - sha256 = "0x4j698gsawm8a3bz531pf1k6izyxfvry4hj5wb0aqphi7y62605"; + sha256 = "0rzi0kc3qiiaw8vnv5qrpwdvvh4sr5chns026xy99spjzx9vd76c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index fe61e5fc8b..a550ba9ae8 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.31"; + version = "2.0.33"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "sha256-01v5gwUv0SfX/9AJgo4HiBcmoCfQbnKIGcS26IebU2Q="; + sha256 = "0vcfpy71gdvd0z20v6d36l3yvmnm4nmfplivw9yjzv8kbnf9mabc"; }; - vendorSha256 = "sha256-69iTdrjgBmJHeVa8Tq47clQR5Xhy4rWcp2OwS4nIw/c="; + vendorSha256 = "1j4jskcply9mxz9bggw1c6368k22rga6f3f6mgs1pklz5v7r7n2j"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/owncast/default.nix b/third_party/nixpkgs/pkgs/servers/owncast/default.nix index 7359b8c2ba..65fa8a0f22 100644 --- a/third_party/nixpkgs/pkgs/servers/owncast/default.nix +++ b/third_party/nixpkgs/pkgs/servers/owncast/default.nix @@ -1,18 +1,17 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }: buildGoModule rec { - pname = "owncast"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - sha256 = "0md4iafa767yxkwh6z8zpcjv9zd79ql2wapx9vzyd973ksvrdaw2"; + sha256 = "sha256-pJb11ifaiamp7P7d/xCwDKfOFufLmDDroUJPnWlTOkI="; }; - vendorSha256 = "sha256-bH2CWIgpOS974/P98n0R9ebGTJ0YoqPlH8UmxSYNHeM="; + vendorSha256 = "sha256-NARHYeOVT7sxfL1BdJc/CPCgHNZzjWE7kACJvrEC71Y="; propagatedBuildInputs = [ ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix index 74851446c9..14161b5d5a 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix @@ -15,20 +15,20 @@ stdenv.mkDerivation rec { pname = "roon-bridge"; version = "1.8-814"; - # N.B. The URL is unstable. I've asked for them to provide a stable URL but - # they have ignored me. If this package fails to build for you, you may need - # to update the version and sha256. - # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 - src = { - x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; - sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; - }; - aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20210803071334/http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2"; - sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; - }; - }.${system} or throwSystem; + src = + let + urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; + in + { + x86_64-linux = fetchurl { + url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; + sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; + }; + aarch64-linux = fetchurl { + url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; + sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; + }; + }.${system} or throwSystem; buildInputs = [ alsa-lib @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; - platforms = platforms.linux; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index b657f1b957..d97a5df42e 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -9,18 +9,19 @@ , makeWrapper , stdenv , zlib -}: stdenv.mkDerivation rec { +}: +stdenv.mkDerivation rec { pname = "roon-server"; version = "1.8-831"; - # N.B. The URL is unstable. I've asked for them to provide a stable URL but - # they have ignored me. If this package fails to build for you, you may need - # to update the version and sha256. - # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 - src = fetchurl { - url = "https://web.archive.org/web/20210921161727/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-SeMSC7K6DV7rVr1w/SqMnLvipoWbypS/gJnSZmpfXZk="; - }; + src = + let + urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; + in + fetchurl { + url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; + sha256 = "sha256-SeMSC7K6DV7rVr1w/SqMnLvipoWbypS/gJnSZmpfXZk="; + }; buildInputs = [ alsa-lib @@ -68,6 +69,6 @@ homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index d991b858a3..0d6e5d9afe 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -244,9 +244,9 @@ in self: { }; postgresql_14 = self.callPackage generic { - version = "14beta3"; + version = "14.0"; psqlSchema = "14"; - sha256 = "1yjbc8q4hk9pvlfr3lwhk2zp4bavxqpil83ncl871nwk06c6b8if"; + sha256 = "08m14zcrcvc2i0xl10p0wgzycsmfmk27gny40a8mwdx74s8xfapf"; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 74cb0674f3..73d90ccdec 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.3.1"; + version = "1.4.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0vhqm9xi84v21ijlbi3fznj799j81mmc9kaawhwn0djhxcs2symd"; + sha256 = "1fknr7z1m24dpp4hm5s6y5phdns7yvvj88cl481wjhw8bigz6kns"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix index f93a15f6b4..02a5f4fe13 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1wdm4wwwv7n73fi330szcnyf25zhvj6dgy839aawh84ik118yg2v"; + sha256 = "0v102hbszq52jvydj2qrysfs1g46wv4vmgwaa9zj0pvknh58lb43"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { installPhase = '' install -D pgroonga.so -t $out/lib/ - install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension + install -D pgroonga.control -t $out/share/postgresql/extension + install -D data/pgroonga-*.sql -t $out/share/postgresql/extension ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 8e9e06d7ef..89573ed754 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.16.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZZvRrt2JaAWruAT4FXB6ChS0jLKpUEDCF2UmAAH4BRQ="; + sha256 = "0a3p0hqya0g87rdc0ka024als07xa7xgpv6fs0q3mj80v6416r3v"; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index f8e3f00b79..dc66534cd8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.4.1"; + version = "2.4.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0nc6nvngp5skz8rasvb7pyi9nlw642iwk19p17lizmw8swdm5nji"; + sha256 = "10c5qx8qq7gbs2pq56gn4nadbc8i6r28528hp2nqdg881yaiga3m"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 1a592494f1..67e18f104d 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }: buildGoModule rec { pname = "tailscale"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; @@ -25,7 +25,7 @@ buildGoModule rec { ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]} wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]} @@ -36,7 +36,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://tailscale.com"; description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; - platforms = platforms.linux; license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index 5acbc8e806..d9629207a8 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -4,20 +4,20 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "2891baa0de7283f61c08ff2fa4494e53f9d4afc1"; - sha256 = "sha256-AvhCOLa+mgty9METlOCARlUOEDMAW6Kk1esSmBbVcok="; + rev = "07493a5e78677de448b0e35bd72bf1dc6498b5ea"; + sha256 = "sha256-V1vGGC8Q257iQMhxCBEBkZntt0ckppCJMCEr2Nqxo/M="; }; in buildGoModule rec { pname = "teleport"; - version = "7.1.3"; + version = "7.2.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-upzEfImMuYU/6F5HSR3Jah3QiMXEt0XMpNAPzEYV1Nk="; + sha256 = "sha256-JLYma/LB/3xLWaFcIbe32pAz6P8hBiLlMuTUBVfqfsw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 641554e1d6..fab7806bac 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.2"; + version = "2.5.3"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1q93l7jb0vs1d324453gk307hlhav2g0xjqkcz3f43rxhb0jbwpk"; + sha256 = "sha256-Bq7wuc127aC/GO5wsgNkwvZsRbxFnZk2fzTWTygl6Sw="; stripRoot = false; }; - vendorSha256 = "054l0b6xlbl9sh2bisnydm9dha30jrafybb06ggzbjffsqcgj7qw"; + vendorSha256 = "sha256-NyIPT2NmJFB1wjNNteAEpTPYSYQZtEWJBOvG0YtxUGc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix new file mode 100644 index 0000000000..6338b61954 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitea +, rustPlatform +, makeWrapper +, protobuf +, Security +, imagemagick +, ffmpeg +, exiftool +}: + +rustPlatform.buildRustPackage rec { + pname = "pict-rs"; + version = "0.3.0-alpha.37"; + + src = fetchFromGitea { + domain = "git.asonix.dog"; + owner = "asonix"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-21yfsCicn2bjSNEMMWDG8wvnw10uT3M1L3cXCUhc24c="; + }; + + cargoSha256 = "sha256-F/mqdIjF5QOq5Plnq0DyeFP1+b7dCBcoU9iFxzcaZws="; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + wrapProgram "$out/bin/pict-rs" \ + --prefix PATH : "${lib.makeBinPath [ imagemagick ffmpeg exiftool ]}" + ''; + + meta = with lib; { + description = "A simple image hosting service"; + homepage = "https://git.asonix.dog/asonix/pict-rs"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index 5c082641e9..4d3038079a 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { '' + lib.optionalString (!stdenv.isDarwin && !stdenv.isAarch64) '' patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + lib.optionalString (!stdenv.isDarwin) '' + # Remove liblttng-ust from dependencies once + # https://github.com/PowerShell/PowerShell/pull/14688 is in a release + patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so '' + '' mkdir -p $out/bin @@ -69,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = with maintainers; [ yrashk srgom ]; + maintainers = with maintainers; [ yrashk srgom p3psi ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux"]; license = with licenses; [ mit ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index f217408c28..4bf2049d97 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.42.0"; + version = "1.44.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4="; + sha256 = "sha256-1ntKm6OA20+/gMVufbmM6fZ2UIXG/0SzH9vZQUvsIUQ="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix new file mode 100644 index 0000000000..55fa2cc1bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/rar/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: + +let + version = "6.0.2"; + # TODO: add support for macOS + srcUrl = + if stdenv.isi686 then { + url = "https://www.rarlab.com/rar/rarlinux-${version}.tar.gz"; + sha256 = "sha256-5iqK7eOo+hgLtGSCqUoB+wOFZHUqZ0M/8Jf7bxdf9qA="; + } else if stdenv.isx86_64 then { + url = "https://www.rarlab.com/rar/rarlinux-x64-${version}.tar.gz"; + sha256 = "sha256-WAvrUGCgfwI51Mo/RYSSF0OLPPrTegUCuDEsnBeR9uQ="; + } + else throw "Unknown architecture"; + manSrc = fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10"; + name = "rar.1"; + sha256 = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw="; + }; +in +stdenv.mkDerivation rec { + pname = "rar"; + inherit version; + + src = fetchurl srcUrl; + + dontBuild = true; + + buildInputs = [ stdenv.cc.cc.lib ]; + + nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + + installPhase = '' + runHook preInstall + + install -Dm755 {rar,unrar} -t "$out/bin" + install -Dm755 default.sfx -t "$out/lib" + install -Dm644 {acknow.txt,license.txt} -t "$out/share/doc/rar" + install -Dm644 rarfiles.lst -t "$out/etc" + + runHook postInstall + ''; + + postInstall = '' + installManPage ${manSrc} + ''; + + meta = with lib; { + description = "Utility for RAR archives"; + homepage = "https://www.rarlab.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ thiagokokada ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix index b06242a98c..25c8ce9b55 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.9.2"; + version = "6.0.7"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "19nsxdvf9ll99hvgzq6f89ymxhwki224lygjdabrg8ghikqvmlvk"; + sha256 = "sha256-pwKZQgBsvM7T87cyLsGXaD+Oe+QIlyyggJmxlsA49Rg="; }; postPatch = '' @@ -17,21 +17,27 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + # `make {unrar,lib}` call `make clean` implicitly + # move build results to another dir to avoid deleting them + mkdir -p bin + make unrar - make clean + mv unrar bin + make lib + mv libunrar.so bin ''; outputs = [ "out" "dev" ]; installPhase = '' - install -Dt "$out/bin" unrar + install -Dt "$out/bin" bin/unrar mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ $out/share/doc/unrar - install -Dm755 libunrar.so $out/lib/libunrar.so + install -Dm755 bin/libunrar.so $out/lib/libunrar.so install -Dt $dev/include/unrar/ *.hpp ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 426aff81f0..0f28ad1441 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -146,10 +146,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.5"; + version = "16.2.6"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4="; + sha256 = "sha256-TXGyZnyVTYAf7G7BcTv3dAfK/54JfOKObcyTRhCrnYA="; }; in rec { ceph = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 8cb9d58bc4..2211d0e310 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -51,9 +51,11 @@ buildGoModule rec { popd ''; + # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, + # as the setuid wrapper is required to use gocryptfs as non-root on NixOS postInstall = '' wrapProgram $out/bin/gocryptfs \ - --prefix PATH : ${lib.makeBinPath [ fuse ]} + --suffix PATH : ${lib.makeBinPath [ fuse ]} ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs ''; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 99b9e3e0e4..a813212047 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin , openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm +, fftw, gsl, libexif, perl, qtbase, netpbm +, enableUnfree ? false, opencv2 }: mkDerivation rec { @@ -28,12 +29,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openexr zlib imagemagick6 fftwFloat - fftw gsl libexif perl opencv2 qtbase netpbm + fftw gsl libexif perl qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ libGLU libGL freeglut - ]); + ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index 7463e2a45e..b2b0691718 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pngquant"; - version = "2.14.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "kornelski"; repo = "pngquant"; rev = version; - sha256 = "054hi33qp3jc7hv0141wi8drwdg24v5zfp8znwjmz4mcdls8vxbb"; + sha256 = "0ny6h3fwf6gvzkqkc3zb5mrkqxm6s7xzb6bvzn6vlamklncqgl78"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/Cargo.lock b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/Cargo.lock new file mode 100644 index 0000000000..8daf4c4f83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/Cargo.lock @@ -0,0 +1,256 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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 = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "error-chain" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" + +[[package]] +name = "fern" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" +dependencies = [ + "chrono", + "log", +] + +[[package]] +name = "float-cmp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be876712b52d3970d361df27210574630d8d44d6461f0b55745d56e88ac10b0" +dependencies = [ + "num", +] + +[[package]] +name = "libc" +version = "0.2.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "num" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +dependencies = [ + "num-integer", + "num-iter", + "num-traits", +] + +[[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-iter" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +dependencies = [ + "autocfg", + "num-integer", + "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 = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ + "siphasher", +] + +[[package]] +name = "simplecss" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135685097a85a64067df36e28a243e94a94f76d829087ce0be34eeb014260c0e" + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "svgcleaner" +version = "0.9.5" +dependencies = [ + "clap", + "error-chain", + "fern", + "log", + "svgdom", +] + +[[package]] +name = "svgdom" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac5d235d251b4266fb95bdf737fe0c546b26327a127e35ad33effdd78cb2e83" +dependencies = [ + "error-chain", + "float-cmp", + "log", + "simplecss", + "svgparser", +] + +[[package]] +name = "svgparser" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b2a4d5f7d25526c750e436fb5a224e06579f32581515bf511b37210007a3cb" +dependencies = [ + "error-chain", + "log", + "phf", + "xmlparser", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[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" + +[[package]] +name = "xmlparser" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4fb8cb7e78fcf5055e751eae348c81bba17b6c84c8ed9fc5f6cf60e3e15d4aa" +dependencies = [ + "error-chain", + "log", +] diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix index 4224bde723..48902f322e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = "svgcleaner"; rev = "v${version}"; - sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; + sha256 = "sha256-nc+lKL6CJZid0WidcBwILhn81VgmmFrutfKT5UffdHA="; }; - cargoSha256 = "172kdnd11xb2qkklqdkdcwi3g55k0d67p8g8qj7iq34bsnfb5bnr"; + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock; + ''; meta = with lib; { description = "A tool for tidying and optimizing SVGs"; homepage = "https://github.com/RazrFalcon/svgcleaner"; - license = licenses.gpl2; - maintainers = [ maintainers.mehandes ]; + changelog = "https://github.com/RazrFalcon/svgcleaner/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mehandes ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix index 8b26e35c05..368f1efa75 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix @@ -4,19 +4,20 @@ , writeText , libinput , libX11 +, wayland , conf ? null , patches ? [ ] }: stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - sha256 = "sha256-A8SsF5k4GwfVCj8JtodNWoLdPzaA9YsoP5EHHakUguc="; + sha256 = "sha256-yE2CUv1XDvo8fW0bLS1O2oxgDUu4drCO3jFpxPgAYKU="; }; inherit patches; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libinput libX11 + wayland ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index bf5d460147..1733e1309b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,17 +9,22 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "183"; + version = "185"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-XFFrRmCpE2UvZRCELfPaotLklyjLiCDWkyFWkISOHZM="; + sha256 = "sha256-Spw7/+vQ1jd3rMZ792du04di0zleRNp8LUEki1374O8="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + + # due to https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/953a599c2b903298b038b34abf515cea69f4fc19 + # the version detection of LLVM is broken and the comparison result is compared against + # the expected result from LLVM 10 (rather than 7 which is our default). + ./fix-tests.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-tests.patch b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-tests.patch new file mode 100644 index 0000000000..b5566cb932 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-tests.patch @@ -0,0 +1,14 @@ +diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py +index 8d201ab..05960aa 100644 +--- a/tests/comparators/test_rlib.py ++++ b/tests/comparators/test_rlib.py +@@ -81,9 +81,6 @@ def rlib_dis_expected_diff(): + if actual_ver >= "7.0": + diff_file = "rlib_llvm_dis_expected_diff_7" + +- if actual_ver >= "10.0": +- diff_file = "rlib_llvm_dis_expected_diff_10" +- + return get_data(diff_file) + + diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index a4678e3570..d366aaec68 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.9.1"; + version = "2021.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JWUGOvY34wZSBTZdpuApPjEfBtgPSFKiVk89TUK441I="; + sha256 = "sha256-u79Hh1LJMaHm9TeNuMd5IQkJgOMIKDbUwW6KHhTHv2Q="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix new file mode 100644 index 0000000000..18efb8c952 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ledit/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip, ocaml, camlp5}: + +stdenv.mkDerivation { + pname = "ledit"; + version = "2.04"; + + src = fetchzip { + url = "http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.04.tgz"; + sha512 = "16vlv6rcsddwrvsqqiwxdfv5rxvblhrx0k84g7pjibi0an241yx8aqf8cj4f4sgl5xfs3frqrdf12zqwjf2h4jvk8jyhyar8n0nj3g0"; + }; + + preBuild = '' + mkdir -p $out/bin + substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin + ''; + + buildInputs = [ + ocaml + camlp5 + ]; + + meta = with lib; { + homepage = "http://pauillac.inria.fr/~ddr/ledit/"; + description = "A line editor, allowing to use shell commands with control characters like in emacs"; + license = licenses.bsd3; + maintainers = [ maintainers.delta ]; + broken = lib.versionOlder ocaml.version "4.03"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 3d4bf8500b..77af8d5d78 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -1,5 +1,5 @@ { lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils -, x11Support ? true, ueberzug +, x11Support ? true, ueberzug, fetchpatch }: stdenvNoCC.mkDerivation rec { @@ -13,6 +13,14 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/413c32e55dc16f0360f8e84af2b59fe45505f81b.patch"; + sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph"; + name = "avoid_overwriting_gio_extra_modules_env_var.patch"; + }) + ]; + strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 26427d3803..b54c2e37d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkg-config, readline, postgresql }: +{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkg-config, installShellFiles, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; @@ -11,11 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xJ7kgEvIsTufAZa5x3YpElTc74nEs9C+baVjbheHySM="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ gnugrep ncurses readline postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; + postInstall = '' + installShellCompletion --bash --name pspg.bash bash-completion.sh + ''; + meta = with lib; { homepage = "https://github.com/okbob/pspg"; description = "Postgres Pager"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix new file mode 100644 index 0000000000..fed2a82645 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -0,0 +1,95 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, ffmpeg +, yt-dlp +, electron +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, yarn2nix-moretea +, chromium +}: + +let + binPath = lib.makeBinPath ([ + ffmpeg + yt-dlp + ]); + + pname = "Sharedown"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "kylon"; + repo = pname; + rev = version; + sha256 = "sha256-Z6OsZvVzk//qEkl4ciNz4cQRqC2GFg0qYgmliAyz6fo="; + }; + + modules = yarn2nix-moretea.mkYarnModules { + name = "${pname}-modules-${version}"; + inherit pname version; + + yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ + "--production" + ]; + + packageJSON = "${src}/package.json"; + yarnLock = ./yarn.lock; + yarnNix = ./yarndeps.nix; + }; +in +stdenvNoCC.mkDerivation rec { + inherit pname version src; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + desktopItems = [ + (makeDesktopItem { + name = "Sharedown"; + exec = "Sharedown"; + icon = "Sharedown"; + comment = "An Application to save your Sharepoint videos for offline usage."; + desktopName = "Sharedown"; + categories = "Network;Archiving"; + }) + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps" + + # Electron app + cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown" + + # Desktop Launcher + cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png" + + # Install electron wrapper script + makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \ + --add-flags "$out/share/Sharedown" \ + --prefix PATH : "${binPath}" \ + --set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Application to save your Sharepoint videos for offline usage"; + homepage = "https://github.com/kylon/Sharedown"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + jtojnar + ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh b/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh new file mode 100755 index 0000000000..5ba572f236 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix + +set -euo pipefail + +dirname="$(realpath "$(dirname "$0")")" +sourceDir="$(nix-build -A sharedown.src --no-out-link)" +tempDir="$(mktemp -d)" + +nix-update sharedown + +cp -r "$sourceDir"/* "$tempDir" +cd "$tempDir" +PUPPETEER_SKIP_DOWNLOAD=1 yarn install +yarn2nix > "$dirname/yarndeps.nix" +cp -r yarn.lock "$dirname" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock new file mode 100644 index 0000000000..48f5917ec2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock @@ -0,0 +1,2193 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@electron/get@^1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" + integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^9.6.0" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^2.0.2" + global-tunnel-ng "^2.7.1" + +"@electron/universal@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" + integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.0.3" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@tedconf/fessonia@*": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz#24499e69c3aeda4926670675b9fdfeb9ab15f19d" + integrity sha512-eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A== + +"@types/debug@^4.1.5": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" + +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + +"@types/glob@^7.1.1": + version "7.1.4" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" + integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/minimatch@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== + +"@types/node@*": + version "16.9.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz#040a64d7faf9e5d9e940357125f0963012e66f04" + integrity sha512-YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ== + +"@types/node@^14.6.2": + version "14.17.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz#0198489a751005f71217744aa966cd1f29447c81" + integrity sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA== + +"@types/plist@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + +"@types/verror@^1.10.3": + version "1.10.5" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" + integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== + +"@types/yargs-parser@*": + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + +"@types/yargs@^16.0.2": + version "16.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== + dependencies: + "@types/yargs-parser" "*" + +"@types/yauzl@^2.9.1": + version "2.9.2" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" + integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== + dependencies: + "@types/node" "*" + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv-keywords@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.10.0, ajv@^6.12.0: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + dependencies: + string-width "^3.0.0" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +app-builder-bin@3.5.13: + version "3.5.13" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" + integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== + +app-builder-lib@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" + integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.0.5" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "22.11.7" + builder-util-runtime "8.7.7" + chromium-pickle-js "^0.2.0" + debug "^4.3.2" + ejs "^3.1.6" + electron-publish "22.11.7" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.0.4" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.5" + temp-file "^3.4.0" + +arch@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +asar@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +axios@*: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1, base64-js@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +boolean@^3.0.1: + version "3.1.4" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435" + integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w== + +bootstrap@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.1.tgz#9d6eed81e08feaccedf3adaca51fe4b73a2871df" + integrity sha512-/jUa4sSuDZWlDLQ1gwQQR8uoYSvLJzDd8m5o6bPKh3asLAMYVZKdRCjb1joUd5WXf0WwCNzd2EjwQQhupou0dA== + +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@8.7.6: + version "8.7.6" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" + integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util-runtime@8.7.7: + version "8.7.7" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" + integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" + integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.5" + "@types/fs-extra" "^9.0.11" + app-builder-bin "3.5.13" + bluebird-lst "^1.0.9" + builder-util-runtime "8.7.7" + chalk "^4.1.1" + debug "^4.3.2" + fs-extra "^10.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.1.0, chalk@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +charenc@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" + integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-truncate@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" + integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== + dependencies: + slice-ansi "^1.0.0" + string-width "^2.0.0" + +clipboardy@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" + integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== + dependencies: + arch "^2.1.1" + execa "^1.0.0" + is-wsl "^2.1.1" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + +core-js@^3.6.5: + version "3.18.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz#9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49" + integrity sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w== + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypt@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs= + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +devtools-protocol@0.0.901419: + version "0.0.901419" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" + integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== + +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + +dmg-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" + integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== + dependencies: + app-builder-lib "22.11.7" + builder-util "22.11.7" + builder-util-runtime "8.7.6" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.9" + +dmg-license@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" + integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + cli-truncate "^1.1.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.6" + plist "^3.0.1" + smart-buffer "^4.0.2" + verror "^1.10.0" + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ejs@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + dependencies: + jake "^10.6.1" + +electron-builder@^22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" + integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== + dependencies: + "@types/yargs" "^16.0.2" + app-builder-lib "22.11.7" + builder-util "22.11.7" + builder-util-runtime "8.7.7" + chalk "^4.1.1" + dmg-builder "22.11.7" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + update-notifier "^5.1.0" + yargs "^17.0.1" + +electron-publish@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" + integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "22.11.7" + builder-util-runtime "8.7.7" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron@*: + version "15.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.0.0.tgz#b1b6244b1cffddf348c27c54b1310b3a3680246e" + integrity sha512-LlBjN5nCJoC7EDrgfDQwEGSGSAo/o08nSP5uJxN2m+ZtNA69SxpnWv4yPgo1K08X/iQPoGhoZu6C8LYYlk1Dtg== + dependencies: + "@electron/get" "^1.13.0" + "@types/node" "^14.6.2" + extract-zip "^1.0.3" + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +encodeurl@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +extract-zip@^1.0.3: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +filelist@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + dependencies: + minimatch "^3.0.4" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +follow-redirects@^1.14.0: + version "1.14.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" + integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== + +font-awesome@*: + version "4.7.0" + resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" + integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0, fs-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-stream@^4.0.0, get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +glob@^7.1.3, glob@^7.1.6: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-agent@^2.0.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" + integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== + dependencies: + boolean "^3.0.1" + core-js "^3.6.5" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + dependencies: + ini "2.0.0" + +global-tunnel-ng@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" + integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== + dependencies: + encodeurl "^1.0.2" + lodash "^4.17.10" + npm-conf "^1.1.3" + tunnel "^0.0.6" + +globalthis@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + dependencies: + define-properties "^1.1.3" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +hosted-git-info@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +https-proxy-agent@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +iconv-corefoundation@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" + integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== + dependencies: + cli-truncate "^1.1.0" + node-addon-api "^1.6.3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.4, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +is-buffer@~1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-ci@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" + integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== + dependencies: + ci-info "^3.1.1" + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +iso8601-duration@*: + version "1.3.0" + resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz#29d7b69e0574e4acdee50c5e5e09adab4137ba5a" + integrity sha512-K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ== + +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash@^4.17.10, lodash@^4.17.15: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +md5@*: + version "2.3.0" + resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f" + integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== + dependencies: + charenc "0.0.2" + crypt "0.0.2" + is-buffer "~1.1.6" + +mime@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@3.0.4, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.1, mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-fetch@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +npm-conf@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +object-keys@^1.0.12: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pkg-dir@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +plist@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== + dependencies: + base64-js "^1.5.1" + xmlbuilder "^9.0.7" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" + integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== + +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + +proxy-from-env@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +pupa@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + +puppeteer@10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.2.0.tgz#7d8d7fda91e19a7cfd56986e0275448e6351849e" + integrity sha512-OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw== + dependencies: + debug "4.3.1" + devtools-protocol "0.0.901419" + extract-zip "2.0.1" + https-proxy-agent "5.0.0" + node-fetch "2.6.1" + pkg-dir "4.2.0" + progress "2.0.1" + proxy-from-env "1.1.0" + rimraf "3.0.2" + tar-fs "2.0.0" + unbzip2-stream "1.3.3" + ws "7.4.6" + +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== + dependencies: + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + +readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +rimraf@3.0.2, rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +semver@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7" + integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q== + +slice-ansi@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== + dependencies: + is-fullwidth-code-point "^2.0.0" + +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +source-map-support@^0.5.19: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + +string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +tar-fs@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" + integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== + dependencies: + chownr "^1.1.1" + mkdirp "^0.5.1" + pump "^3.0.0" + tar-stream "^2.0.0" + +tar-stream@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^10.0.0" + +through@^2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +tmp-promise@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz#6e933782abff8b00c3119d63589ca1fb9caaa62a" + integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== + dependencies: + tmp "^0.2.0" + +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +unbzip2-stream@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" + integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== + dependencies: + boxen "^5.0.0" + chalk "^4.1.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +verror@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@7.4.6: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + +xmlbuilder@>=11.0.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^17.0.1: + version "17.1.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba" + integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix new file mode 100644 index 0000000000..a980ad628f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix @@ -0,0 +1,2565 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + path = fetchurl { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; + sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + }; + } + { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + path = fetchurl { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + }; + } + { + name = "_electron_get___get_1.13.0.tgz"; + path = fetchurl { + name = "_electron_get___get_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz"; + sha1 = "95c6bcaff4f9a505ea46792424f451efea89228c"; + }; + } + { + name = "_electron_universal___universal_1.0.5.tgz"; + path = fetchurl { + name = "_electron_universal___universal_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; + sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + }; + } + { + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; + sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + }; + } + { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + path = fetchurl { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; + sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; + path = fetchurl { + name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; + sha1 = "24499e69c3aeda4926670675b9fdfeb9ab15f19d"; + }; + } + { + name = "_types_debug___debug_4.1.7.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; + }; + } + { + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; + sha1 = "7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"; + }; + } + { + name = "_types_glob___glob_7.1.4.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz"; + sha1 = "ea59e21d2ee5c517914cb4bc8e4153b99e566672"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + }; + } + { + name = "_types_ms___ms_0.7.31.tgz"; + path = fetchurl { + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + }; + } + { + name = "_types_node___node_16.9.6.tgz"; + path = fetchurl { + name = "_types_node___node_16.9.6.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz"; + sha1 = "040a64d7faf9e5d9e940357125f0963012e66f04"; + }; + } + { + name = "_types_node___node_14.17.18.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.18.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz"; + sha1 = "0198489a751005f71217744aa966cd1f29447c81"; + }; + } + { + name = "_types_plist___plist_3.0.2.tgz"; + path = fetchurl { + name = "_types_plist___plist_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; + sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + }; + } + { + name = "_types_verror___verror_1.10.5.tgz"; + path = fetchurl { + name = "_types_verror___verror_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; + sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; + }; + } + { + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + }; + } + { + name = "_types_yargs___yargs_16.0.4.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_16.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz"; + sha1 = "26aad98dd2c2a38e421086ea9ad42b9e51642977"; + }; + } + { + name = "_types_yauzl___yauzl_2.9.2.tgz"; + path = fetchurl { + name = "_types_yauzl___yauzl_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ansi_align___ansi_align_3.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; + sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + path = fetchurl { + name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz"; + sha1 = "6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz"; + sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6"; + }; + } + { + name = "arch___arch_2.2.0.tgz"; + path = fetchurl { + name = "arch___arch_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; + sha1 = "1bc47818f305764f23ab3306b0bfc086c5a29d11"; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } + { + name = "asar___asar_3.1.0.tgz"; + path = fetchurl { + name = "asar___asar_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; + sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + path = fetchurl { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + } + { + name = "at_least_node___at_least_node_1.0.0.tgz"; + path = fetchurl { + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + }; + } + { + name = "axios___axios_0.21.4.tgz"; + path = fetchurl { + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "bl___bl_4.1.0.tgz"; + path = fetchurl { + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + }; + } + { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + path = fetchurl { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; + sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "boolean___boolean_3.1.4.tgz"; + path = fetchurl { + name = "boolean___boolean_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; + sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; + }; + } + { + name = "bootstrap___bootstrap_5.1.1.tgz"; + path = fetchurl { + name = "bootstrap___bootstrap_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.1.tgz"; + sha1 = "9d6eed81e08feaccedf3adaca51fe4b73a2871df"; + }; + } + { + name = "boxen___boxen_5.1.2.tgz"; + path = fetchurl { + name = "boxen___boxen_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; + sha1 = "788cb686fc83c1f486dfa8a40c68fc2b831d2b50"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz"; + sha1 = "4b43c96db2bd494ced7694bcd7674934655e8324"; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz"; + sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"; + }; + } + { + name = "builder_util___builder_util_22.11.7.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz"; + sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467"; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.2.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + }; + } + { + name = "charenc___charenc_0.0.2.tgz"; + path = fetchurl { + name = "charenc___charenc_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + path = fetchurl { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "ci_info___ci_info_3.2.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; + sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; + }; + } + { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + }; + } + { + name = "cli_truncate___cli_truncate_1.1.0.tgz"; + path = fetchurl { + name = "cli_truncate___cli_truncate_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + }; + } + { + name = "clipboardy___clipboardy_2.3.0.tgz"; + path = fetchurl { + name = "clipboardy___clipboardy_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; + sha1 = "3c2903650c68e46a91b388985bc2774287dba290"; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colors___colors_1.0.3.tgz"; + path = fetchurl { + name = "colors___colors_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + } + { + name = "commander___commander_2.9.0.tgz"; + path = fetchurl { + name = "commander___commander_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + } + { + name = "commander___commander_5.1.0.tgz"; + path = fetchurl { + name = "commander___commander_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; + sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "config_chain___config_chain_1.1.13.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + }; + } + { + name = "configstore___configstore_5.0.1.tgz"; + path = fetchurl { + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + }; + } + { + name = "core_js___core_js_3.18.0.tgz"; + path = fetchurl { + name = "core_js___core_js_3.18.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz"; + sha1 = "9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "core_util_is___core_util_is_1.0.3.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypt___crypt_0.0.2.tgz"; + path = fetchurl { + name = "crypt___crypt_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + } + { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "detect_node___detect_node_2.1.0.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; + sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + }; + } + { + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + path = fetchurl { + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; + sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + }; + } + { + name = "dir_compare___dir_compare_2.4.0.tgz"; + path = fetchurl { + name = "dir_compare___dir_compare_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; + sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + }; + } + { + name = "dmg_builder___dmg_builder_22.11.7.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz"; + sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89"; + }; + } + { + name = "dmg_license___dmg_license_1.0.9.tgz"; + path = fetchurl { + name = "dmg_license___dmg_license_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; + sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + }; + } + { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + path = fetchurl { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + }; + } + { + name = "dotenv___dotenv_9.0.2.tgz"; + path = fetchurl { + name = "dotenv___dotenv_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; + sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "ejs___ejs_3.1.6.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; + sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + }; + } + { + name = "electron_builder___electron_builder_22.11.7.tgz"; + path = fetchurl { + name = "electron_builder___electron_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz"; + sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596"; + }; + } + { + name = "electron_publish___electron_publish_22.11.7.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz"; + sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"; + }; + } + { + name = "electron___electron_15.0.0.tgz"; + path = fetchurl { + name = "electron___electron_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-15.0.0.tgz"; + sha1 = "b1b6244b1cffddf348c27c54b1310b3a3680246e"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "env_paths___env_paths_2.2.1.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + }; + } + { + name = "es6_error___es6_error_4.1.1.tgz"; + path = fetchurl { + name = "es6_error___es6_error_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; + sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "extract_zip___extract_zip_2.0.1.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + }; + } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "filelist___filelist_1.0.2.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; + sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "follow_redirects___follow_redirects_1.14.4.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.14.4.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz"; + sha1 = "838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"; + }; + } + { + name = "font_awesome___font_awesome_4.7.0.tgz"; + path = fetchurl { + name = "font_awesome___font_awesome_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; + sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_10.0.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; + sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_extra___fs_extra_9.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "global_agent___global_agent_2.2.0.tgz"; + path = fetchurl { + name = "global_agent___global_agent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; + sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; + }; + } + { + name = "global_dirs___global_dirs_3.0.0.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; + sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + }; + } + { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + path = fetchurl { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; + sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + }; + } + { + name = "globalthis___globalthis_1.0.2.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; + sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + }; + } + { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + path = fetchurl { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + }; + } + { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + }; + } + { + name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + path = fetchurl { + name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; + sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_2.0.0.tgz"; + path = fetchurl { + name = "ini___ini_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; + sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_ci___is_ci_3.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; + sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; + }; + } + { + name = "is_docker___is_docker_2.2.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + }; + } + { + name = "is_npm___is_npm_5.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; + sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha1 = "d502d3382590ea3004893746754c89139973e232"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; + path = fetchurl { + name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz"; + sha1 = "29d7b69e0574e4acdee50c5e5e09adab4137ba5a"; + }; + } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + }; + } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonfile___jsonfile_6.1.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + }; + } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + }; + } + { + name = "lazy_val___lazy_val_1.0.5.tgz"; + path = fetchurl { + name = "lazy_val___lazy_val_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; + sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "matcher___matcher_3.0.0.tgz"; + path = fetchurl { + name = "matcher___matcher_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; + sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + }; + } + { + name = "md5___md5_2.3.0.tgz"; + path = fetchurl { + name = "md5___md5_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; + sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + }; + } + { + name = "mime___mime_2.5.2.tgz"; + path = fetchurl { + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; + sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + }; + } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { + name = "normalize_url___normalize_url_4.5.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; + sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + }; + } + { + name = "npm_conf___npm_conf_1.1.3.tgz"; + path = fetchurl { + name = "npm_conf___npm_conf_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; + sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "plist___plist_3.0.4.tgz"; + path = fetchurl { + name = "plist___plist_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; + sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "progress___progress_2.0.1.tgz"; + path = fetchurl { + name = "progress___progress_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz"; + sha1 = "c9242169342b1c29d275889c95734621b1952e31"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + } + { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + path = fetchurl { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "pupa___pupa_2.1.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; + sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + }; + } + { + name = "puppeteer___puppeteer_10.2.0.tgz"; + path = fetchurl { + name = "puppeteer___puppeteer_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.2.0.tgz"; + sha1 = "7d8d7fda91e19a7cfd56986e0275448e6351849e"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { + name = "read_config_file___read_config_file_6.2.0.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; + sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "roarr___roarr_2.15.4.tgz"; + path = fetchurl { + name = "roarr___roarr_2.15.4.tgz"; + url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; + sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + path = fetchurl { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } + { + name = "semver_diff___semver_diff_3.1.1.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "serialize_error___serialize_error_7.0.1.tgz"; + path = fetchurl { + name = "serialize_error___serialize_error_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; + sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "signal_exit___signal_exit_3.0.4.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz"; + sha1 = "366a4684d175b9cab2081e3681fda3747b6c51d7"; + }; + } + { + name = "slice_ansi___slice_ansi_1.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + }; + } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + }; + } + { + name = "source_map_support___source_map_support_0.5.20.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.20.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; + sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + }; + } + { + name = "stat_mode___stat_mode_1.0.0.tgz"; + path = fetchurl { + name = "stat_mode___stat_mode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; + sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "sumchecker___sumchecker_3.0.1.tgz"; + path = fetchurl { + name = "sumchecker___sumchecker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; + sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "tar_fs___tar_fs_2.0.0.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz"; + sha1 = "677700fc0c8b337a78bee3623fdc235f21d7afad"; + }; + } + { + name = "tar_stream___tar_stream_2.2.0.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + }; + } + { + name = "temp_file___temp_file_3.4.0.tgz"; + path = fetchurl { + name = "temp_file___temp_file_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; + sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "tmp_promise___tmp_promise_3.0.2.tgz"; + path = fetchurl { + name = "tmp_promise___tmp_promise_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz"; + sha1 = "6e933782abff8b00c3119d63589ca1fb9caaa62a"; + }; + } + { + name = "tmp___tmp_0.2.1.tgz"; + path = fetchurl { + name = "tmp___tmp_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; + sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } + { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + path = fetchurl { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + } + { + name = "tunnel___tunnel_0.0.6.tgz"; + path = fetchurl { + name = "tunnel___tunnel_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; + sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + }; + } + { + name = "type_fest___type_fest_0.13.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; + sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + path = fetchurl { + name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; + sha1 = "d156d205e670d8d8c393e1c02ebd506422873f6a"; + }; + } + { + name = "unique_string___unique_string_2.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "universalify___universalify_2.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + }; + } + { + name = "update_notifier___update_notifier_5.1.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; + sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + } + { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + path = fetchurl { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "widest_line___widest_line_3.1.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } + { + name = "ws___ws_7.4.6.tgz"; + path = fetchurl { + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + }; + } + { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + }; + } + { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + }; + } + { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + }; + } + { + name = "yargs___yargs_17.1.1.tgz"; + path = fetchurl { + name = "yargs___yargs_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz"; + sha1 = "c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + ]; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix new file mode 100644 index 0000000000..1b9158df1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "viddy"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "sachaos"; + repo = pname; + rev = "v${version}"; + sha256 = "18ms4kfv332863vd8b7mmrz39y4b8gvhi6lx9x5385jfzd19w5wx"; + }; + + vendorSha256 = "0789wq4d9cynyadvlwahs4586gc3p78gdpv5wf733lpv1h5rjbv3"; + + ldflags = [ + "-s" + "-w" + "-X" + "main.version=${version}" + ]; + + meta = with lib; { + description = "A modern watch command"; + homepage = "https://github.com/sachaos/viddy"; + license = licenses.mit; + maintainers = with maintainers; [ j-hui ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index 81400bcd38..7c56f43ca1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -10,20 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-ZV908Zrvx075TTbrYsw0JdQD+66XRfd7EW48lNZLNik="; + sha256 = "sha256-r9RZVmWKJJLiNSbSQPVJPR5koLR6DoAwlitTiQOc1fI="; }; - cargoSha256 = "sha256-Wpg75RU1ANEnxgx28oy1kp4xt3HwIThNjHwmN8CRkjA="; + cargoSha256 = "sha256-xaC9wuT21SYH7H8/d4usDjHeojNZ2d/NkqMqNlQQ1n0="; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ]; preCheck = '' HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index c55eeff8c1..4f7b76ad8c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.6.1"; + version = "0.6.2"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-E+AQhm2ddaDU8G0KuK0dC4wUU4YFELwO/q+8d2kpnV8="; - aarch64-linux = "sha256-RG4hazKsuUCYYBfDJ9OWghHlBNLEaxVOz5YGHP+ySbA="; - x86_64-darwin = "sha256-h0EjoEU+U3HQhmnPBKGijFJrkg9yPPP7zyWNbrn2e5Q="; + x86_64-linux = "sha256-qO74R6L2kTHXCNtka9SHT4lZo4Gr15w6K3e43+p2HW4="; + aarch64-linux = "sha256-apd16BuusNI5P2Qr8Hj95dRwoAk/ZEZa6TQi+0paIzs="; + x86_64-darwin = "sha256-LdCakVru1sbB88plsGrJiMDQl5HtH1GkCkcjmIVjeec="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix new file mode 100644 index 0000000000..d32cf0fedb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dnstake"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "pwnesia"; + repo = pname; + rev = "v${version}"; + sha256 = "0mjwnb0zyqnwk26f32v9vqxc9k6zcks9nn1595mf2hck5xwn86yk"; + }; + + vendorSha256 = "1xhzalx1x8js449w1qs2qdwbnz2s8mmypz9maj7jzl5mqfyhlwlp"; + + meta = with lib; { + description = "Tool to check missing hosted DNS zones"; + homepage = "https://github.com/pwnesia/dnstake"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix index ba31aba8d6..aebf7e3cd1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "dnsviz"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "dnsviz"; repo = "dnsviz"; rev = "v${version}"; - sha256 = "sha256-QsTYpNaAJiIRUrr2JYjXWOKFihENhAccvmB/DRhX1PA="; + sha256 = "sha256-x6LdPVQFfsJIuKde1+LbFKz5bBEi+Mri9sVH0nGsbCU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix index a7ecabe8e6..e81706a343 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -1,88 +1,67 @@ -{ lib, fetchFromGitHub, python3Packages, docutils }: +{ lib +, fetchFromGitHub +, installShellFiles +, python3Packages +, pandoc +}: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "00lafjqg9nfnak0nhcr2l2hzzkwn2y6qv0wdkm6r6f69snizy3hf"; + sha256 = "sha256-GwwZLXf9CH024gKfWsYPnr/oqQcxR/lQIToFRh59B+E="; }; - patches = [ - ./strip-venv.patch + nativeBuildInputs = [ + installShellFiles + pandoc ]; - outputs = [ "out" "doc" "man" ]; - - nativeBuildInputs = [ docutils ]; - - propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ]; + propagatedBuildInputs = with python3Packages; [ + defusedxml + pygments + requests + requests-toolbelt + setuptools + ]; checkInputs = with python3Packages; [ mock pytest pytest-httpbin pytestCheckHook + responses ]; postInstall = '' # install completions - install -Dm555 \ - extras/httpie-completion.bash \ - $out/share/bash-completion/completions/http.bash - install -Dm555 \ - extras/httpie-completion.fish \ - $out/share/fish/vendor_completions.d/http.fish + installShellCompletion --bash \ + --name http.bash extras/httpie-completion.bash + installShellCompletion --fish \ + --name http.fish extras/httpie-completion.fish - mkdir -p $man/share/man/man1 - - docdir=$doc/share/doc/httpie - mkdir -p $docdir/html - - cp AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst $docdir - - # helpfully, the readme has a `no-web` class to exclude - # the parts that are not relevant for offline docs - - # this one build link was not marked however - sed -e 's/^|build|//g' -i README.rst - - toHtml() { - rst2html5 \ - --strip-elements-with-class=no-web \ - --title=http \ - --no-generator \ - --no-datestamp \ - --no-source-link \ - "$1" \ - "$2" - } - - toHtml README.rst $docdir/html/index.html - toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html - toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html - - rst2man \ - --strip-elements-with-class=no-web \ - --title=http \ - --no-generator \ - --no-datestamp \ - --no-source-link \ - README.rst \ - $man/share/man/man1/http.1 + # convert the docs/README.md file + pandoc --standalone -f markdown -t man docs/README.md -o docs/http.1 + installManPage docs/http.1 ''; - # the tests call rst2pseudoxml.py from docutils - preCheck = '' - export PATH=${docutils}/bin:$PATH - ''; + pytestFlagsArray = [ + "httpie" + "tests" + ]; - checkPhase = '' - py.test ./httpie ./tests --doctest-modules --verbose ./httpie ./tests -k 'not test_chunked and not test_verbose_chunked and not test_multipart_chunked and not test_request_body_from_file_by_path_chunked' - ''; + disabledTests = [ + "test_chunked" + "test_verbose_chunked" + "test_multipart_chunked" + "test_request_body_from_file_by_path_chunked" + ]; + + pythonImportsCheck = [ "httpie" ]; meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 9fe476906b..0182440a8e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -19,6 +19,8 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; + postInstall = ''chmod +x "$out"/lib/libminiupnpc.so''; + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 9fce8d7a5f..9fc159d810 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -2,7 +2,7 @@ , nixosTests , fetchurl, autoreconfHook , zlib, pcre, w3m, man -, mbedtls, brotli +, openssl, brotli }: stdenv.mkDerivation rec { @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ autoreconfHook w3m man ]; - buildInputs = [ zlib pcre mbedtls brotli ]; + buildInputs = [ zlib pcre openssl brotli ]; makeFlags = [ "STRIP=" ]; configureFlags = [ - "--with-mbedtls" + "--with-openssl" "--with-brotli" "--enable-external-filters" "--enable-compression" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Non-caching web proxy with advanced filtering capabilities"; # When linked with mbedtls, the license becomes GPLv3 (or later), otherwise # GPLv2 (or later). See https://www.privoxy.org/user-manual/copyright.html - license = licenses.gpl3Plus; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix new file mode 100644 index 0000000000..f35a91722f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "rustcat"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "robiot"; + repo = pname; + rev = "v${version}"; + sha256 = "0f4g0fk3i9p403r21w1cdz4r9778pkz58y8h7w2fmj27bamsyfhb"; + }; + + cargoSha256 = "0zlgnnlnglix0qrjc5v0g91v083lm20iw1fhvjpvjlfq7shdkhyd"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Port listener and reverse shell"; + homepage = "https://github.com/robiot/rustcat"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/s3cmd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s3cmd/default.nix index 888d6a05c6..88af5a1362 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s3cmd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "s3cmd"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; + sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; }; propagatedBuildInputs = [ python_magic python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index e0bbad3486..7d7afa6249 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.27.1"; + x86_64-linux = "1.28.1"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-CqyIARPHri018AOgI1rFJ9Td3K8OamXVgupAINME7BY="; + x86_64-linux = "sha256-vyEbISZDTN+CHqSEtElzfg4M4i+2RjUux5vzwJw8/dc="; }.${system} or ""; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cve-bin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/development/python-modules/cve-bin-tool/default.nix rename to third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix index 61ae897681..fac9226287 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cve-bin-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonPackage +, buildPythonApplication , fetchFromGitHub , jsonschema , plotly @@ -18,6 +18,7 @@ , rich , aiohttp , toml +, distro # aiohttp[speedups] , aiodns , brotlipy @@ -25,15 +26,15 @@ , pillow , pytestCheckHook }: -buildPythonPackage { +buildPythonApplication rec { pname = "cve-bin-tool"; - version = "unstable-2021-04-15"; + version = "2.2.1"; src = fetchFromGitHub { owner = "intel"; repo = "cve-bin-tool"; - rev = "10cb6fd0baffe35babfde024bc8c70aa58629237"; - sha256 = "STf0tJBpadBqsbC+MghBai8zahDkrXfLoFRJ+84wvvY="; + rev = "v${version}"; + sha256 = "087w7fsc4vd4sjz8ww6q71b108yhz94ydr76d99rhlmcqsq7fihs"; }; # Wants to open a sqlite database, access the internet, etc @@ -57,7 +58,7 @@ buildPythonPackage { rich aiohttp toml - + distro # aiohttp[speedups] aiodns brotlipy diff --git a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix index 82a1f7e583..9303058b38 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.4.9"; + version = "2.5.2"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - sha256 = "1g0bafg3lgsqy8mjyzvvy9l1wp1rxqwpba3dkx6xisjkpbycxql8"; + sha256 = "sha256-/tS9/VxH5r4CSmxZ7uZOgAMLRtmPs+bgPtvljOhLALc="; }; - vendorSha256 = "1mw58zbihw2fzbpqwydfrrkcwqjkjqdzp37m4dijhx1pbzkv9gzl"; + vendorSha256 = "sha256-AZbzcGqje2u9waH2NGWITXpax2GCFqbIEd4uNiDmcIY="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index c2aafacee4..f83ebc928d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-25"; + version = "2021-09-30"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU="; + sha256 = "sha256-chGmv6zeiYKNY8oA54FmVU7RGXd+uM6MHfUQXb6YfqE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/go365/default.nix b/third_party/nixpkgs/pkgs/tools/security/go365/default.nix new file mode 100644 index 0000000000..432dfb49da --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/go365/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go365"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "optiv"; + repo = "Go365"; + rev = version; + sha256 = "0dh89hf00fr62gjdw2lb1ncdxd26nvlsh2s0i6981bp8xfg2pk5r"; + }; + + vendorSha256 = "0fx2966xfzmi8yszw1cq6ind3i2dvacdwfs029v3bq0n8bvbm3r2"; + + postInstall = '' + mv $out/bin/Go365 $out/bin/$pname + ''; + + meta = with lib; { + description = "Office 365 enumeration tool"; + homepage = "https://github.com/optiv/Go365"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix new file mode 100644 index 0000000000..1ad7bfd85f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ioccheck"; + version = "unstable-2021-09-29"; + format = "pyproject"; + + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ranguli"; + repo = pname; + rev = "db02d921e2519b77523a200ca2d78417802463db"; + sha256 = "0lgqypcd5lzb2yqd5lr02pba24m26ghly4immxgz13svi8f6vzm9"; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + backoff + click + emoji + jinja2 + pyfiglet + ratelimit + requests + shodan + tabulate + termcolor + tweepy + vt-py + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + # Can be removed with the next release + substituteInPlace pyproject.toml \ + --replace '"hurry.filesize" = "^0.9"' "" + ''; + + pythonImportsCheck = [ "ioccheck" ]; + + meta = with lib; { + description = "Tool for researching IOCs"; + homepage = "https://github.com/ranguli/ioccheck"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index 2bf6bb8cad..43046ab903 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.85"; + version = "1.0.88"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "19r7dgr0y1k9qa4llxbgaf69j88vs9h2gx29bwbh6dq17q58sfdl"; + sha256 = "sha256-ITN/HsXZWH1v23R5TSEd8vq/DkhiCypJM+hg879ZWlc="; }; vendorSha256 = "18mvv70g65pq1c7nn752j26d0vasx6cl2rqp5g1hg3cb61hjbn0n"; diff --git a/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix index 891311ddaa..46bae3c20c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -19,23 +19,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "PREFIX=$(out)" + "GITVER=${version}" + "CC=${stdenv.cc.targetPrefix}cc" + ]; - preInstall = '' - mkdir -p $out/bin - ''; + enableParallelBuilding = true; postInstall = '' - installManPage doc/masscan.8 + installManPage doc/masscan.? - mkdir -p $out/share/{doc,licenses}/masscan - mkdir -p $out/etc/masscan + install -Dm444 -t $out/etc/masscan data/exclude.conf + install -Dm444 -t $out/share/doc/masscan doc/*.{html,js,md} + install -Dm444 -t $out/share/licenses/masscan LICENSE - cp data/exclude.conf $out/etc/masscan - cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.html - cp LICENSE $out/share/licenses/masscan/LICENSE + wrapProgram $out/bin/masscan \ + --prefix LD_LIBRARY_PATH : "${libpcap}/lib" + ''; - wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/masscan --selftest ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 5af7eca138..cca9791391 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.56" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.7" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 6fd30d8d6a..3c744fb084 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: d818269c546bd165c29652768cd2058fcb56c4fa - ref: refs/tags/6.0.56 + revision: 6dddd6d372c75acadc183f6a4efdd44e453559b4 + ref: refs/tags/6.1.7 specs: - metasploit-framework (6.0.56) - actionpack (~> 5.2.2) - activerecord (~> 5.2.2) - activesupport (~> 5.2.2) + metasploit-framework (6.1.7) + actionpack (~> 6.0) + activerecord (~> 6.0) + activesupport (~> 6.0) aws-sdk-ec2 aws-sdk-iam aws-sdk-s3 @@ -22,17 +22,17 @@ GIT faraday faye-websocket filesize - hrr_rb_ssh (= 0.3.0.pre2) + hrr_rb_ssh-ed25519 http-cookie irb jsobfu json metasm - metasploit-concern (~> 3.0.0) - metasploit-credential (~> 4.0.0) - metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.50) - metasploit_data_models (~> 4.1.0) + metasploit-concern + metasploit-credential + metasploit-model + metasploit-payloads (= 2.0.54) + metasploit_data_models metasploit_payloads-mettle (= 1.0.10) mqtt msgpack @@ -47,7 +47,7 @@ GIT openvas-omp packetfu patch_finder - pcaprub + pcaprub (= 0.12.4) pdf-reader pg puma @@ -88,6 +88,7 @@ GIT unix-crypt warden windows_error + winrm xdr xmlrpc zeitwerk @@ -96,57 +97,56 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6) - activesupport (= 5.2.6) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) - arel (>= 9.0) - activesupport (5.2.6) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activemodel (6.1.4.1) + activesupport (= 6.1.4.1) + activerecord (6.1.4.1) + activemodel (= 6.1.4.1) + activesupport (= 6.1.4.1) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - arel (9.0.0) - arel-helpers (2.12.0) + arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) - aws-eventstream (1.1.1) - aws-partitions (1.484.0) - aws-sdk-core (3.119.0) + aws-eventstream (1.2.0) + aws-partitions (1.506.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.254.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ec2 (1.265.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.59.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-iam (1.61.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.98.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.103.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) @@ -156,7 +156,7 @@ GEM concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) - daemons (1.4.0) + daemons (1.4.1) dnsruby (1.61.7) simpleidn (~> 0.1) domain_name (0.5.20190701) @@ -172,9 +172,9 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) eventmachine (1.2.7) - faker (2.18.0) + faker (2.19.0) i18n (>= 1.6, < 2) - faraday (1.6.0) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -196,13 +196,21 @@ GEM faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) + ffi (1.15.4) filesize (0.2.0) + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) hashery (2.1.2) - hrr_rb_ssh (0.3.0.pre2) + hrr_rb_ssh (0.4.2) + hrr_rb_ssh-ed25519 (0.4.2) ed25519 (~> 1.2) + hrr_rb_ssh (>= 0.4) http-cookie (1.0.4) domain_name (~> 0.5) - http_parser.rb (0.7.0) + http_parser.rb (0.8.0) + httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) @@ -212,37 +220,41 @@ GEM jsobfu (0.4.2) rkelly-remix json (2.5.1) - loofah (2.11.0) + little-plugger (1.1.4) + logging (2.3.0) + little-plugger (~> 1.1) + multi_json (~> 1.14) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) - metasploit-concern (3.0.2) - activemodel (~> 5.2.2) - activesupport (~> 5.2.2) - railties (~> 5.2.2) - metasploit-credential (4.0.5) + metasploit-concern (4.0.3) + activemodel (~> 6.0) + activesupport (~> 6.0) + railties (~> 6.0) + metasploit-credential (5.0.4) metasploit-concern metasploit-model - metasploit_data_models (>= 3.0.0) + metasploit_data_models (>= 5.0.0) net-ssh pg railties rex-socket rubyntlm rubyzip - metasploit-model (3.1.4) - activemodel (~> 5.2.2) - activesupport (~> 5.2.2) - railties (~> 5.2.2) - metasploit-payloads (2.0.50) - metasploit_data_models (4.1.4) - activerecord (~> 5.2.2) - activesupport (~> 5.2.2) + metasploit-model (4.0.3) + activemodel (~> 6.0) + activesupport (~> 6.0) + railties (~> 6.0) + metasploit-payloads (2.0.54) + metasploit_data_models (5.0.4) + activerecord (~> 6.0) + activesupport (~> 6.0) arel-helpers metasploit-concern metasploit-model (>= 3.1) pg - railties (~> 5.2.2) + railties (~> 6.0) recog (~> 2.0) webrick metasploit_payloads-mettle (1.0.10) @@ -251,6 +263,7 @@ GEM minitest (5.14.4) mqtt (0.5.0) msgpack (1.4.2) + multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -260,9 +273,10 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.12.2) + nokogiri (1.12.4) mini_portile2 (~> 2.6.1) racc (~> 1.4) + nori (2.6.0) octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -272,7 +286,7 @@ GEM packetfu (1.1.13) pcaprub patch_finder (1.0.2) - pcaprub (0.13.0) + pcaprub (0.12.4) pdf-reader (2.5.0) Ascii85 (~> 1.0) afm (~> 0.2.1) @@ -281,7 +295,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.4.0) + puma (5.5.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -292,14 +306,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (6.1.4.1) + actionpack (= 6.1.4.1) + activesupport (= 6.1.4.1) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 0.13) + thor (~> 1.0) rake (13.0.6) rb-readline (0.5.5) recog (2.3.21) @@ -309,18 +323,18 @@ GEM io-console (~> 0.5) rex-arch (0.1.14) rex-text - rex-bin_tools (0.1.7) + rex-bin_tools (0.1.8) metasm rex-arch rex-core rex-struct2 rex-text rex-core (0.1.17) - rex-encoder (0.1.5) + rex-encoder (0.1.6) metasm rex-arch rex-text - rex-exploitation (0.1.27) + rex-exploitation (0.1.28) jsobfu metasm rex-arch @@ -334,25 +348,25 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.92) + rex-powershell (0.1.93) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.7) + rex-random_identifier (0.1.8) rex-text rex-registry (0.1.4) rex-rop_builder (0.1.4) metasm rex-core rex-text - rex-socket (0.1.32) + rex-socket (0.1.33) rex-core rex-sslscan (0.1.6) rex-core rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.35) + rex-text (0.2.37) rex-zip (0.1.4) rex-text rexml (3.2.5) @@ -360,7 +374,7 @@ GEM ruby-macho (2.5.1) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (2.0.10) + ruby_smb (2.0.11) bindata openssl-ccm openssl-cmac @@ -386,16 +400,15 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.1.0) - thread_safe (0.3.6) tilt (2.0.10) ttfunk (1.7.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - tzinfo-data (1.2021.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + tzinfo-data (1.2021.2) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.8) unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) @@ -404,6 +417,15 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) windows_error (0.1.2) + winrm (2.3.6) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.3) xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) @@ -418,4 +440,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.2.20 + 2.2.24 diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index ee10319592..afd852f106 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, ruby +, bundlerEnv +}: let env = bundlerEnv { @@ -8,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.56"; + version = "6.1.7"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-FQxxQ4Lsoktl/Ld+nvBNHCTsZ3PFDQ4GEMrh/CMZrZ0="; + sha256 = "sha256-UzWNQnDo/o296GGd+C1ImHccOMAXfE55dJDB9hw9B8s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 77b2468886..f985d592ca 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; + sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; + sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; addressable = { groups = ["default"]; @@ -69,25 +69,15 @@ }; version = "0.2.2"; }; - arel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; - }; arel-helpers = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx"; + sha256 = "1733g96xxmmgjxambhnr98aj2yq401vgg0afyf46ayzgablij4cb"; type = "gem"; }; - version = "2.12.0"; + version = "2.12.1"; }; Ascii85 = { groups = ["default"]; @@ -104,80 +94,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "012hf08bmzmk2sjynrgzfg0ssa26fkvjm47ixjnmb9byrqmh3mwr"; + sha256 = "1gfp7hqflr5gd3xfvcrwdmx4zzmhr6511bflwkfvrs5rn6n5dacs"; type = "gem"; }; - version = "1.484.0"; + version = "1.506.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1azyn5hj41q1r9wcr0k12xb9j3v1v9ikyxnzjpizhsla44lg3270"; + sha256 = "0njlpd4w008whz7bd7rrqs3k1m6xbm33hblzwh67pnk1frabv4q6"; type = "gem"; }; - version = "3.119.0"; + version = "3.121.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i06ml61fr7qlxfbi98dg4lg40skjj5abfpz60jx7ml5dma13qma"; + sha256 = "1ymrwsc1caf9rfl5613w1xpckzx7v9l4y20dpmzzq72ih0y6lijn"; type = "gem"; }; - version = "1.254.0"; + version = "1.265.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16am0mpagfzi5n6gsnd4yyiwy8ni312b3kxswq0jvr3wh8ab0r5h"; + sha256 = "1m5cc26kkh83f6c05y2a07nfz3dsdvkdf7jfrjkrhlkmdq9hha0m"; type = "gem"; }; - version = "1.59.0"; + version = "1.61.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h70lz5pblw0sy82j6kv4q4d8h2rb1p6v650kaq8lh6iyjc6il9a"; + sha256 = "0aa7n3bad4h8sipzb31inc0q2r5k2nviaihmhqdv7mqnpylvcgia"; type = "gem"; }; - version = "1.46.0"; + version = "1.48.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0799n1j8cxcn79k5zhy8vcpbh4q8vyi1fxqqs20sxh7yhyhrybw9"; + sha256 = "1xsa6nsdflwkm2wzmsr6kiy4am44f9f9459lbkrwxlcl166g05jq"; type = "gem"; }; - version = "1.98.0"; + version = "1.103.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0"; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; type = "gem"; }; - version = "1.2.4"; + version = "1.4.0"; }; bcrypt = { groups = ["default"]; @@ -264,10 +254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3"; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; dnsruby = { groups = ["default"]; @@ -344,20 +334,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hwir9b9zy0asy0vap7zfqv75lbws4a1pmh74lhqd2rndv32vfc5"; + sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmi0yl9sniicvyh2k437dicvvzkryrc1ckr8dic84a98bbl32gy"; + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; }; faraday-em_http = { groups = ["default"]; @@ -449,6 +439,16 @@ }; version = "0.11.1"; }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + type = "gem"; + }; + version = "1.15.4"; + }; filesize = { groups = ["default"]; platforms = []; @@ -459,6 +459,26 @@ }; version = "0.2.0"; }; + gssapi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + gyoku = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + type = "gem"; + }; + version = "1.3.1"; + }; hashery = { groups = ["default"]; platforms = []; @@ -474,10 +494,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066dj9sw5p8aa54vqc1bw7a8nfpf5rggrjyxqw2ccyxp10964qkz"; + sha256 = "1dr6mv98ll0crdn2wm2yy9ywh130iljcsvnnvs6639k19qbfk7qf"; type = "gem"; }; - version = "0.3.0.pre2"; + version = "0.4.2"; + }; + hrr_rb_ssh-ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mfsvjcjmm63fwjf3zqkmg3cf55vx34vmvix0wj0ba4h9dzjq7p8"; + type = "gem"; + }; + version = "0.4.2"; }; http-cookie = { groups = ["default"]; @@ -494,10 +524,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xha614fi6l04wryqjj1xmpalzlmhb6lb9qmlh8mmliycdhvcshp"; + sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; }; i18n = { groups = ["default"]; @@ -559,15 +599,35 @@ }; version = "2.5.1"; }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; loofah = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; metasm = { groups = ["default"]; @@ -584,62 +644,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zbcnhji80cyj19jkdp8wpi1msg9xfm0lacpm8ggm8fca56234zv"; + sha256 = "0lmvwja6v7s12g0fq9mp2d3sgashl526apfjqk5fchqvnfqw4gsb"; type = "gem"; }; - version = "3.0.2"; + version = "4.0.3"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wflb4r5mz2g29bzjpwc004h6vca9kd0z02v27wc378jgg6q0gna"; + sha256 = "1czh3a3bi54l5i7j9jw4p0arf8i3y8pm08w2f995x02rk4f7x5wf"; type = "gem"; }; - version = "4.0.5"; + version = "5.0.4"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "d818269c546bd165c29652768cd2058fcb56c4fa"; - sha256 = "17dd34izrqfa2030w3f5fdkyq90w9pq9wzmpzijlp8pch91p230m"; + rev = "6dddd6d372c75acadc183f6a4efdd44e453559b4"; + sha256 = "1jq77lfgdhchfiwlwz0pq0w1qxwq90nzi7b1x2yqvzp8f118sdak"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.56"; + version = "6.1.7"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ndgv4c30rq211f5lyngfcp87lxzgc9h8a7jx40wih43dj6faxq"; + sha256 = "13zg6jw8vbspq95s4dpcbjxnjiacy21il7y8l2dq3rd04mickryy"; type = "gem"; }; - version = "3.1.4"; + version = "4.0.3"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn6whvisps6fxd5fqbf6rr6znc3miqn8dwk3x8a6aycffphc75j"; + sha256 = "0javwkzhfngjdhz8rn566gli3a0jd1ns6hajim1nwwwiaici2bdc"; type = "gem"; }; - version = "2.0.50"; + version = "2.0.54"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gzfvfqs9mf50dcnirc1944a25920s1swjd9g97d1x340651xmmr"; + sha256 = "12hnkrkgx89dskfr8ywpxk51y0nqnnj37qjz856f45z7ymx1nzip"; type = "gem"; }; - version = "4.1.4"; + version = "5.0.4"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -701,6 +761,16 @@ }; version = "1.4.2"; }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; multipart-post = { groups = ["default"]; platforms = []; @@ -782,14 +852,25 @@ version = "2.5.8"; }; nokogiri = { + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iav4jrklvm8938bxhby0khs36mdndhvwia4hc85zxcb0yl1k8ll"; + sha256 = "1sad16idsxayhaaswc3bksii1ydiqyzikl7y0ng35cn7w4g1dv3z"; type = "gem"; }; - version = "1.12.2"; + version = "1.12.4"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; }; octokit = { groups = ["default"]; @@ -856,10 +937,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q"; + sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; type = "gem"; }; - version = "0.13.0"; + version = "0.12.4"; }; pdf-reader = { groups = ["default"]; @@ -896,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; + sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.0"; }; racc = { groups = ["default"]; @@ -956,20 +1037,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; railties = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; + sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; rake = { groups = ["default"]; @@ -1036,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7"; + sha256 = "0p5r2h0zaixdjhp9k0jq0vgsvbhifx2jh3p9pr2w80qda1hkgqgj"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-core = { groups = ["default"]; @@ -1056,20 +1137,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7"; + sha256 = "15c2yqrvn3hxf6gn4cqrz2l65rdh68gbk2a7lwdq43nchfjnsnvg"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b10rcrw52nj2aswsn0kwv0s601rbn077k0r6n5lblip6fbrqz9i"; + sha256 = "08v5nam0xp6f8qi3nyqzh97sz07hy59w82y213jz919mrgpb70vc"; type = "gem"; }; - version = "0.1.27"; + version = "0.1.28"; }; rex-java = { groups = ["default"]; @@ -1116,20 +1197,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02gpfw43r0pkzp7jj3n0lwn4lgbgkgadrn4p33x7b0xh1dalzgj1"; + sha256 = "1qpf4na2c57bypyxna7pqll8ym643cydh347v5zvlxknripjhjyz"; type = "gem"; }; - version = "0.1.92"; + version = "0.1.93"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zaqndyy04c4fn021ibh05xim3wr7l2i71713amz6pvhgs2939r3"; + sha256 = "1zy8zkkv530iqzsc7apx4hq9ij30h5628slkmc80aqzva9z0fm0d"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-registry = { groups = ["default"]; @@ -1156,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03cvgmg0wswqcr70mhc6802vvgcg62f7vkbj0i7sskgy3cl9lryx"; + sha256 = "1kl221lsf1dk62vsf6fsgcx54crav0wgqsb9rwjxl7gfd7kmyz04"; type = "gem"; }; - version = "0.1.32"; + version = "0.1.33"; }; rex-sslscan = { groups = ["default"]; @@ -1186,10 +1267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0idgw5z813h5dp82n07g5ldpyfnk7mhvnzl87d9fpy6invixnnbq"; + sha256 = "0xzym86blrah88qyi1m9f7pc53m6ssmr4d1znc8izbh90z38y51y"; type = "gem"; }; - version = "0.2.35"; + version = "0.2.37"; }; rex-zip = { groups = ["default"]; @@ -1256,10 +1337,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h8p6ksfr9xhpj9p38b4mjj76zm4d0dg06hhp00ii9hh7vy6mryd"; + sha256 = "06szny4dcbwlcq2fki1fbrghsbk2dgwy3zyl9y8zjkf334yjb57k"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; }; rubyntlm = { groups = ["default"]; @@ -1361,16 +1442,6 @@ }; version = "1.1.0"; }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; tilt = { groups = ["default"]; platforms = []; @@ -1396,20 +1467,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; tzinfo-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ik16lnsyr2739jzwl4r5sz8q639lqw8f9s68iszwhm2pcq8p4w2"; + sha256 = "1a0d3smxpdn6i5vjc616wnva8c9nvh8mvsjyvwcxlsj1qsih2l21"; type = "gem"; }; - version = "1.2021.1"; + version = "1.2021.2"; }; unf = { groups = ["default"]; @@ -1426,10 +1497,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unix-crypt = { groups = ["default"]; @@ -1491,6 +1562,16 @@ }; version = "0.1.2"; }; + winrm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + type = "gem"; + }; + version = "2.3.6"; + }; xdr = { groups = ["default"]; platforms = []; diff --git a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix index 9f5465901b..9cf0f2f0c0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "sha256-lvINDtOG2mmz0ESxL11DQVZh3IcEiZYYMu5oN5Q9WKA="; + sha256 = "sha256-3OlsCRpxRDKlfC0sa9MlFCupyRbDuqJQzDb9SQob1O0="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${openssl.out}/lib ''; - cargoSha256 = "sha256-F2RMfHVFqCq9cb+9bjPWaRcQWKYIwwffWCssoQ6sSdU="; + cargoSha256 = "sha256-YxuBABGaZ+ti31seEYR6bB+OMgrSvl1lZyu4bqdxPIk="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix index 5d8d9413ae..d0908c3595 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix @@ -2,23 +2,28 @@ buildGoModule rec { pname = "scorecard"; - version = "2.1.3"; + version = "2.2.8"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lTaFSQ3yyzQGdiKwev38iEpV+ELKg9f1rMYdbqVuiSs="; + sha256 = "sha256-U29NCZFXOhu0xLfDlJ1Q7m8TbAm+C6+ecYFhcI5gg6s="; }; - vendorSha256 = "sha256-eFu954gwoL5z99cJGhSnvliAzwxv3JJxfjmBF+cx7Dg="; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" "-X github.com/ossf/scorecard/v2/cmd.gitVersion=v${version}" ]; + vendorSha256 = "sha256-hOATCXjBE0doHnY2BaRKZocQ6SIigL0q4m9eEJGKh6Q="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ossf/scorecard/v2/pkg.gitVersion=v${version}" + "-X github.com/ossf/scorecard/v2/pkg.gitTreeState=clean" + ]; + preCheck = '' # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we diff --git a/third_party/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock index 65e09d0aec..23e4a17ea8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - cms_scanner (0.13.5) + cms_scanner (0.13.6) ethon (~> 0.14.0) get_process_mem (~> 0.2.5) - nokogiri (~> 1.11.4) - opt_parse_validator (~> 1.9.4) + nokogiri (>= 1.11.4, < 1.13.0) + opt_parse_validator (~> 1.9.5) public_suffix (~> 4.0.3) ruby-progressbar (>= 1.10, < 1.12) sys-proctable (~> 1.2.2) @@ -23,19 +23,17 @@ GEM concurrent-ruby (1.1.9) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.3) + ffi (1.15.4) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.8.10) concurrent-ruby (~> 1.0) - mini_portile2 (2.5.3) minitest (5.14.4) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.4-x86_64-linux) racc (~> 1.4) - opt_parse_validator (1.9.4) + opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) - addressable (>= 2.5, < 2.8) + addressable (>= 2.5, < 2.9) public_suffix (4.0.6) racc (1.5.2) ruby-progressbar (1.11.0) @@ -46,18 +44,18 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) webrick (1.7.0) - wpscan (3.8.18) - cms_scanner (~> 0.13.5) + wpscan (3.8.19) + cms_scanner (~> 0.13.6) xmlrpc (0.3.2) webrick yajl-ruby (1.4.1) zeitwerk (2.4.2) PLATFORMS - ruby + x86_64-linux DEPENDENCIES wpscan BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/third_party/nixpkgs/pkgs/tools/security/wpscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/wpscan/default.nix index 6a41611e67..965c48b304 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wpscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wpscan/default.nix @@ -1,11 +1,18 @@ -{ bundlerApp, lib, makeWrapper, curl }: +{ lib +, bundlerApp +, makeWrapper +, curl +}: bundlerApp { pname = "wpscan"; gemdir = ./.; exes = [ "wpscan" ]; - buildInputs = [ makeWrapper ]; + buildInputs = [ + makeWrapper + ]; + postBuild = '' wrapProgram "$out/bin/wpscan" \ --prefix PATH : ${lib.makeBinPath [ curl ]} diff --git a/third_party/nixpkgs/pkgs/tools/security/wpscan/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/wpscan/gemset.nix index 80b5ec290c..d62c17bc94 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wpscan/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; cms_scanner = { dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15qh28drxkyv294l1qcpsghfa875p71q0vkmmv5l6fbmpapmllrk"; + sha256 = "1kpp3598xs79irb9g2wkcxjwlszj37sb7lp3xmvf6s5s40p0ccwf"; type = "gem"; }; - version = "0.13.5"; + version = "0.13.6"; }; concurrent-ruby = { groups = ["default"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.4"; }; get_process_mem = { dependencies = ["ffi"]; @@ -85,16 +85,6 @@ }; version = "1.8.10"; }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; - type = "gem"; - }; - version = "2.5.3"; - }; minitest = { groups = ["default"]; platforms = []; @@ -105,16 +95,26 @@ }; version = "5.14.4"; }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + type = "gem"; + }; + version = "2.6.1"; + }; nokogiri = { dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "1sad16idsxayhaaswc3bksii1ydiqyzikl7y0ng35cn7w4g1dv3z"; type = "gem"; }; - version = "1.11.7"; + version = "1.12.4"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -122,10 +122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n297vrxq7r1fsh0x8yf1nhgdawmcl0sq04l468gwrd4y754rjyx"; + sha256 = "1jzmn3h9sr7bhjj1fdfvh4yzvqx7d3vsbwbqrf718dh427ifqs9c"; type = "gem"; }; - version = "1.9.4"; + version = "1.9.5"; }; public_suffix = { groups = ["default"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ig3fbxxm0gnvqkzmsc4zcipijprrw5xs84rnwp50w0crww842c"; + sha256 = "0gv5ym8sxr9901z55d0dakc7af954rp2asnd1a68arjvfyj96sq3"; type = "gem"; }; - version = "3.8.18"; + version = "3.8.19"; }; xmlrpc = { dependencies = ["webrick"]; diff --git a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix index 5425b6e5f5..2884e509b4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.0.5"; + version = "1.0.10"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pa9i65ndx8LMTMRXyL2GXCauM6Q8gAb16zGOylQFwL0="; + sha256 = "14d41q9hfwmzhxqrnrz17rgbi03j0xga2jmw8n9y2v21rqxg73y0"; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 6d748749a0..46a1fdfd8d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.13.01"; + version = "0.13.03"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-839znk0VNDNgpHmAtn3Isqa/PU0+9yfVXi3Zmgtk+eo="; + sha256 = "sha256-PmDWBeN42GqFkaMNblV77XCdgqWxlhY3gALNj/ADeos="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix index c17488bf67..00ab04a56c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+gBxZCBJmwe92DhfVorkfXsjpjkgm7JO/p/SHta9ly8="; + sha256 = "sha256-DUFJZEtJM5Sv41zJvSZ8KsNWFzlictM2T1wS7VxPL04="; }; - cargoSha256 = "sha256-lAKMaUrXjplh5YhMZuLhTNDQBzDPHCfFrELHicwgi6U="; + cargoSha256 = "sha256-kubQL+p7J2koPDOje5wMxKDeCY4yi0kupfHsJCKYf44="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix index a3a7a8bd54..ce757401b3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.30"; pname = "wgetpaste"; + version = "2.32"; src = fetchurl { - url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; - sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73"; + url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"; + sha256 = "04yv1hndxhrc5axwiw1yy0yrw1kli5fk4yj4267l7xdwqzxvl7b2"; }; # currently zsh-autocompletion support is not installed @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; - homepage = "http://wgetpaste.zlin.dk/"; + homepage = "https://github.com/zlin/wgetpaste"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ qknight domenkozar ]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix index bb20222a9b..195c0b1bf3 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-ZnZ9g8o1+VfhpDqxqtknNJ7dcyt5yuQcH3txxA3HICU="; + sha256 = "sha256-B19cHdoiCbxhvRGi3NzKPKneKgOI4+l8+Qg9/YVgUV8="; }; - cargoSha256 = "sha256-0EhHFxbQi3Jgu13pXIjYYFYDEOQjwN5h+jE+22gJG0s="; + cargoSha256 = "sha256-iO64K+d/wEyY/tVztIG8zYSha5X0iTHV7IDVthMJQGA="; patches = [ ./icon-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix index 00dc1d7491..32fb81fe18 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,20 +1,17 @@ -{ lib, stdenv, fetchFromSourcehut +{ lib, stdenv, fetchFromGitHub , meson, pkg-config, wayland-scanner, ninja , cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon }: -let - version = "2020-03-29"; - commit = "6388a49e0f431d6d5fcbd152b8ae4fa8e87884ee"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "wshowkeys-unstable"; - inherit version; + version = "2021-08-01"; - src = fetchFromSourcehut { - owner = "~sircmpwn"; + src = fetchFromGitHub { + owner = "ammgws"; repo = "wshowkeys"; - rev = commit; - sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; + rev = "e8bfc78f08ebdd1316daae59ecc77e62bba68b2b"; + sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4="; }; nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; @@ -29,13 +26,11 @@ in stdenv.mkDerivation rec { permissions are dropped after startup. The NixOS module provides such a setuid binary (use "programs.wshowkeys.enable = true;"). ''; - homepage = "https://git.sr.ht/~sircmpwn/wshowkeys"; + homepage = "https://github.com/ammgws/wshowkeys"; license = with licenses; [ gpl3Only mit ]; # Some portions of the code are taken from Sway which is MIT licensed. # TODO: gpl3Only or gpl3Plus (ask upstream)? platforms = platforms.unix; maintainers = with maintainers; [ primeos berbiche ]; - broken = true; # Unmaintained and fails to run (Wayland protocol error) - # TODO (@primeos): Remove this package after the NixOS 21.11 branch-off }; } diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 3ff67aec28..c81ee814bc 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ alsaTools = alsa-tools; # added 2021-06-10 alsaUtils = alsa-utils; # added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 + aminal = throw "aminal was renamed to darktile."; # added 2021-09-28 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 @@ -465,7 +466,6 @@ mapAliases ({ linuxPackages_4_19 = linuxKernel.packages.linux_4_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; - linuxPackages_5_13 = linuxKernel.packages.linux_5_13; linuxPackages_5_14 = linuxKernel.packages.linux_5_14; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; @@ -482,7 +482,6 @@ mapAliases ({ linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; - linux_5_13 = linuxKernel.kernels.linux_5_13; linux_5_14 = linuxKernel.kernels.linux_5_14; # added 2020-04-04 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index a561b3672c..d31c80ac41 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -618,7 +618,15 @@ with pkgs; drvPath = (f args).drvPath; # It's safe to discard the context, because we don't access the path. salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); - in f (args // { name = "${args.name or "source"}-salted-${salt}"; }); + # New derivation incorporating the original drv hash in the name + salted = f (args // { name = "${args.name or "source"}-salted-${salt}"; }); + # Make sure we did change the derivation. If the fetcher ignores `name`, + # `invalidateFetcherByDrvHash` doesn't work. + checked = + if salted.drvPath == drvPath + then throw "invalidateFetcherByDrvHash: Adding the derivation hash to the fixed-output derivation name had no effect. Make sure the fetcher's name argument ends up in the derivation name. Otherwise, the fetcher will not be re-run when its implementation changes. This is important for testing." + else salted; + in checked; lazydocker = callPackage ../tools/misc/lazydocker { }; @@ -699,7 +707,8 @@ with pkgs; inherit (darwin) signingUtils; }; - vmTools = callPackage ../build-support/vm { }; + # No callPackage. In particular, we don't want `img` *package* in parameters. + vmTools = makeOverridable (import ../build-support/vm) { inherit pkgs lib; }; releaseTools = callPackage ../build-support/release { }; @@ -970,10 +979,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - aminal = callPackage ../applications/terminal-emulators/aminal { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; - }; - archi = callPackage ../tools/misc/archi { }; contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; @@ -1329,6 +1334,8 @@ with pkgs; bitwise = callPackage ../tools/misc/bitwise { }; + blanket = callPackage ../applications/audio/blanket { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -4204,6 +4211,8 @@ with pkgs; cwebbin = callPackage ../development/tools/misc/cwebbin { }; + cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { }; + cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { }; dadadodo = callPackage ../tools/text/dadadodo { }; @@ -5423,6 +5432,10 @@ with pkgs; git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; + git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { }; git-recent = callPackage ../applications/version-management/git-and-tools/git-recent { @@ -5669,6 +5682,8 @@ with pkgs; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + google-java-format = callPackage ../development/tools/google-java-format { }; + gdown = with python3Packages; toPythonApplication gdown; gopro = callPackage ../tools/video/gopro { }; @@ -6233,6 +6248,8 @@ with pkgs; iodine = callPackage ../tools/networking/iodine { }; + ioccheck = callPackage ../tools/security/ioccheck { }; + ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; @@ -6902,6 +6919,10 @@ with pkgs; leatherman = callPackage ../development/libraries/leatherman { }; + ledit = callPackage ../tools/misc/ledit { + inherit (ocamlPackages) camlp5; + }; + ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; @@ -8632,6 +8653,8 @@ with pkgs; ranger = callPackage ../applications/misc/ranger { }; + rar = callPackage ../tools/archivers/rar { }; + rarcrack = callPackage ../tools/security/rarcrack { }; rarian = callPackage ../development/libraries/rarian { }; @@ -8744,7 +8767,7 @@ with pkgs; rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; inherit (callPackage ../development/misc/resholve { }) - resholve resholvePackage; + resholve resholvePackage resholveScript resholveScriptBin; restool = callPackage ../os-specific/linux/restool {}; @@ -8868,6 +8891,10 @@ with pkgs; rust-petname = callPackage ../tools/text/rust-petname { }; + rustcat = callPackage ../tools/networking/rustcat { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9058,6 +9085,8 @@ with pkgs; schema2ldif = callPackage ../tools/text/schema2ldif { }; + sharedown = callPackage ../tools/misc/sharedown { }; + shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; shen-sources = callPackage ../development/interpreters/shen-sources { }; @@ -11678,6 +11707,8 @@ with pkgs; pscid = nodePackages.pscid; + coreboot-toolchain = callPackage ../development/tools/misc/coreboot-toolchain { }; + remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; @@ -11753,6 +11784,8 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gobang = callPackage ../development/tools/database/gobang { }; + gogetdoc = callPackage ../development/tools/gogetdoc { }; gox = callPackage ../development/tools/gox { }; @@ -12540,6 +12573,7 @@ with pkgs; rhack = callPackage ../development/tools/rust/rhack { }; inherit (rustPackages) rls; + roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; @@ -12791,6 +12825,19 @@ with pkgs; babashka = callPackage ../development/interpreters/clojure/babashka.nix { }; + # BQN interpreters and compilers + cbqn = cbqn-phase2; + # And the classic bootstrapping process + cbqn-phase0 = callPackage ../development/interpreters/bqn/cbqn { + bqn-path = null; + }; + cbqn-phase1 = callPackage ../development/interpreters/bqn/cbqn { + bqn-path = "${cbqn-phase0}/bin/bqn"; + }; + cbqn-phase2 = callPackage ../development/interpreters/bqn/cbqn { + bqn-path = "${cbqn-phase1}/bin/bqn"; + }; + chibi = callPackage ../development/interpreters/chibi { }; ceptre = callPackage ../development/interpreters/ceptre { }; @@ -14241,6 +14288,8 @@ with pkgs; inherit (llvmPackages_9) stdenv clang llvm; }; + img = callPackage ../development/tools/img { }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { llvmPackages = llvmPackages_12; }; @@ -14602,7 +14651,9 @@ with pkgs; pycritty = with python3Packages; toPythonApplication pycritty; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { + inherit (linuxPackages) perf; + }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -20447,6 +20498,11 @@ with pkgs; petidomo = callPackage ../servers/mail/petidomo { }; + pict-rs = callPackage ../servers/web-apps/pict-rs { + inherit (darwin.apple_sdk.frameworks) Security; + ffmpeg = ffmpeg_4; + }; + popa3d = callPackage ../servers/mail/popa3d { }; postfix = callPackage ../servers/mail/postfix { }; @@ -21549,8 +21605,6 @@ with pkgs; linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; - linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened; - linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened; linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; @@ -23431,6 +23485,8 @@ with pkgs; berry = callPackage ../applications/window-managers/berry { }; + bespokesynth = callPackage ../applications/audio/bespokesynth { }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; @@ -24106,6 +24162,8 @@ with pkgs; fnott = callPackage ../applications/misc/fnott { }; + gigalixir = with python3Packages; toPythonApplication gigalixir; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -24740,6 +24798,8 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; + limesctl = callPackage ../applications/misc/limesctl { }; + linssid = libsForQt5.callPackage ../applications/networking/linssid { }; deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; @@ -26053,7 +26113,8 @@ with pkgs; mopidy-spotify-tunigo mopidy-subidy mopidy-tunein - mopidy-youtube; + mopidy-youtube + mopidy-ytmusic; motif = callPackage ../development/libraries/motif { }; @@ -26939,6 +27000,7 @@ with pkgs; qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.stubs) rez setfile; + inherit (darwin) sigtool; python = python3; }; @@ -28913,7 +28975,9 @@ with pkgs; eclair = callPackage ../applications/blockchains/eclair { }; - electrs = callPackage ../applications/blockchains/electrs { }; + electrs = callPackage ../applications/blockchains/electrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; elements = libsForQt5.callPackage ../applications/blockchains/elements { miniupnpc = miniupnpc_2; @@ -31369,7 +31433,7 @@ with pkgs; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { inherit (gnome2) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -31482,6 +31546,8 @@ with pkgs; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + go365 = callPackage ../tools/security/go365 { }; + gobuster = callPackage ../tools/security/gobuster { }; gotestwaf = callPackage ../tools/security/gotestwaf { }; @@ -32326,6 +32392,8 @@ with pkgs; vice = callPackage ../misc/emulators/vice { }; + viddy = callPackage ../tools/misc/viddy { }; + ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; viewnior = callPackage ../applications/graphics/viewnior { }; @@ -32576,7 +32644,6 @@ with pkgs; }; higan = callPackage ../misc/emulators/higan { - inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; @@ -32725,6 +32792,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + dnstake = callPackage ../tools/networking/dnstake {}; + dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 159e846fc3..3b89aabf1f 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -71,12 +71,10 @@ in { }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - # the oldest ghc with aarch64-darwin support is 8.10.5 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then - packages.ghc8107BinaryMinimal + bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then + if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then packages.ghc8102BinaryMinimal else packages.ghc865Binary; @@ -85,15 +83,14 @@ in { llvmPackages = pkgs.llvmPackages_7; }; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { - # the oldest ghc with aarch64-darwin support is 8.10.5 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then - packages.ghc8107BinaryMinimal + bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + # the oldest ghc with aarch64-darwin support is 8.10.5 # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then - packages.ghc8102BinaryMinimal + if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8107BinaryMinimal else - packages.ghc865Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -103,24 +100,24 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { - # the oldest ghc with aarch64-darwin support is 8.10.5 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + # the oldest ghc with aarch64-darwin support is 8.10.5 + if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8107BinaryMinimal - # aarch64 ghc8102Binary exceeds max output size on hydra - else if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal else - packages.ghc8102Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { - # aarch64 ghc8102Binary exceeds max output size on hydra - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8107BinaryMinimal else - packages.ghc8102Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 82ad3ed0ff..d1afd34228 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -155,13 +155,6 @@ in { ]; }; - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -177,7 +170,7 @@ in { }; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_13; + kernel = linux_5_14; kernelPatches = kernel.kernelPatches; }; @@ -220,7 +213,6 @@ in { linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; - linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { }; linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; })); @@ -458,7 +450,6 @@ in { linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); - linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13); linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14); }; @@ -489,7 +480,6 @@ in { linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { }); linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); - linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { }); linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 058a1166d6..c9ab3fc2ab 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -611,6 +611,10 @@ let letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; + letsencrypt-app = callPackage ../development/ocaml-modules/letsencrypt/app.nix { }; + + letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { }; + linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { @@ -623,6 +627,10 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; + lustre-v6 = callPackage ../development/ocaml-modules/lustre-v6 { }; + + lutils = callPackage ../development/ocaml-modules/lutils { }; + luv = callPackage ../development/ocaml-modules/luv { inherit (pkgs) file; }; @@ -843,6 +851,8 @@ let frontc = callPackage ../development/ocaml-modules/frontc { }; + ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { }; @@ -990,6 +1000,10 @@ let paf = callPackage ../development/ocaml-modules/paf { }; + paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { }; + + paf-le = callPackage ../development/ocaml-modules/paf/le.nix { }; + parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; path_glob = callPackage ../development/ocaml-modules/path_glob { }; @@ -1172,6 +1186,8 @@ let randomconv = callPackage ../development/ocaml-modules/randomconv { }; + rdbg = callPackage ../development/ocaml-modules/rdbg { }; + re = callPackage ../development/ocaml-modules/re { }; react = callPackage ../development/ocaml-modules/react { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 0c375a6649..039b921ee9 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ sphinxcontrib_plantuml = sphinxcontrib-plantuml; topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 + WazeRouteCalculator = wazeroutecalculator; # 2021-09-29 websocket_client = websocket-client; zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index e6bc727b08..648a94ff42 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -579,6 +579,8 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; + asmog = callPackage ../development/python-modules/asmog { }; + asn1 = callPackage ../development/python-modules/asn1 { }; asn1ate = callPackage ../development/python-modules/asn1ate { }; @@ -1782,8 +1784,6 @@ in { curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - cve-bin-tool = callPackage ../development/python-modules/cve-bin-tool { }; - cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; @@ -2328,6 +2328,8 @@ in { elgato = callPackage ../development/python-modules/elgato { }; + elkm1-lib = callPackage ../development/python-modules/elkm1-lib { }; + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; @@ -2520,6 +2522,8 @@ in { falcon = callPackage ../development/python-modules/falcon { }; + faraday-agent-parameters-types = callPackage ../development/python-modules/faraday-agent-parameters-types { }; + faraday-plugins = callPackage ../development/python-modules/faraday-plugins { }; fastapi = callPackage ../development/python-modules/fastapi { }; @@ -2625,6 +2629,8 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; + fjaraskupan = callPackage ../development/python-modules/fjaraskupan { }; + flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; flake8 = callPackage ../development/python-modules/flake8 { }; @@ -2976,6 +2982,8 @@ in { gidgethub = callPackage ../development/python-modules/gidgethub { }; + gigalixir = callPackage ../development/python-modules/gigalixir { }; + gin-config = callPackage ../development/python-modules/gin-config { }; gios = callPackage ../development/python-modules/gios { }; @@ -4530,6 +4538,8 @@ in { inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; + mbddns = callPackage ../development/python-modules/mbddns { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mcstatus = callPackage ../development/python-modules/mcstatus { }; @@ -5561,6 +5571,8 @@ in { pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; + pyflexit = callPackage ../development/python-modules/pyflexit { }; + pyflick = callPackage ../development/python-modules/pyflick { }; pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; @@ -5587,6 +5599,8 @@ in { pypoint = callPackage ../development/python-modules/pypoint { }; + pypoolstation = callPackage ../development/python-modules/pypoolstation { }; + pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; pyrogram = callPackage ../development/python-modules/pyrogram { }; @@ -5627,6 +5641,8 @@ in { python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; + python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { }; + python-songpal = callPackage ../development/python-modules/python-songpal { }; python-swiftclient = callPackage ../development/python-modules/python-swiftclient { }; @@ -6138,6 +6154,8 @@ in { pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + pydoods = callPackage ../development/python-modules/pydoods { }; + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; @@ -6550,6 +6568,8 @@ in { inherit (pkgs) coreutils which; }; + pynello = callPackage ../development/python-modules/pynello { }; + pynest2d = callPackage ../development/python-modules/pynest2d { }; pynetbox = callPackage ../development/python-modules/pynetbox { }; @@ -6580,6 +6600,8 @@ in { pyogg = callPackage ../development/python-modules/pyogg { }; + pyombi = callPackage ../development/python-modules/pyombi { }; + pyomo = callPackage ../development/python-modules/pyomo { }; pyp = callPackage ../development/python-modules/pyp { @@ -7977,6 +7999,8 @@ in { rokuecp = callPackage ../development/python-modules/rokuecp { }; + rollbar = callPackage ../development/python-modules/rollbar { }; + roman = callPackage ../development/python-modules/roman { }; roombapy = callPackage ../development/python-modules/roombapy { }; @@ -8745,6 +8769,8 @@ in { sunpy = callPackage ../development/python-modules/sunpy { }; + sunwatcher = callPackage ../development/python-modules/sunwatcher { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; supervisor = callPackage ../development/python-modules/supervisor { }; @@ -9352,6 +9378,8 @@ in { url-normalize = callPackage ../development/python-modules/url-normalize { }; + urlextract = callPackage ../development/python-modules/urlextract { }; + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; urllib3 = callPackage ../development/python-modules/urllib3 { }; @@ -9476,6 +9504,8 @@ in { vsure = callPackage ../development/python-modules/vsure { }; + vt-py = callPackage ../development/python-modules/vt-py { }; + vtk = toPythonModule (pkgs.vtk.override { pythonInterpreter = python; enablePython = true; @@ -9526,7 +9556,7 @@ in { wavedrom = callPackage ../development/python-modules/wavedrom { }; - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 8801fc5246..566a1addd7 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -243,19 +243,20 @@ let elmPackages.elm = pkgsPlatforms.elmPackages.elm; # GHCs linked to musl. - pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - # TODO: remove ghc865Binary altogether and use ghc8102Binary - ghc865Binary = {}; + pkgsMusl.haskell.compiler = lib.recursiveUpdate + (packagePlatforms pkgs.pkgsMusl.haskell.compiler) + { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; - # remove integer-simple because it appears to be broken with - # musl and non-static-linking. - integer-simple = {}; + ghcjs = {}; + ghcjs810 = {}; - ghcjs = {}; - ghcjs810 = {}; - }; + # Can't be built with musl, see meta.broken comment in the drv + integer-simple.ghc884 = {}; + }; # Get some cache going for MUSL-enabled GHC. pkgsMusl.haskellPackages = @@ -380,9 +381,16 @@ let }; constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary + jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc901 + jobs.pkgsMusl.haskell.compiler.ghc921 + jobs.pkgsMusl.haskell.compiler.ghcHEAD + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc901 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index e37c9e277a..18c75ebd95 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -265,14 +265,15 @@ version = "2.1.532"; }; CFPropertyList = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk"; type = "gem"; }; - version = "3.0.3"; + version = "3.0.4"; }; charlock_holmes = { groups = ["default"]; @@ -446,10 +447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; + sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; cocoapods-expert-difficulty = { groups = ["default"]; @@ -561,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; + sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; cocoapods-try = { groups = ["default"]; @@ -723,10 +724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3"; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; data_objects = { dependencies = ["addressable"]; @@ -888,10 +889,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; faraday-em_http = { groups = ["default"]; @@ -978,10 +979,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.4"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1611,10 +1612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; markaby = { dependencies = ["builder"]; @@ -1683,10 +1684,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; type = "gem"; }; - version = "3.2021.0704"; + version = "3.2021.0901"; }; mini_magick = { groups = ["default"]; @@ -1703,10 +1704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih"; + sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; mini_portile2 = { groups = ["default"]; @@ -1886,10 +1887,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q71y7pdihz26m3n2fnm2hd7wllmnxgxk6vcbbh27rqa14q5x5yi"; + sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; type = "gem"; }; - version = "1.12.3"; + version = "1.12.5"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -1951,10 +1952,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; type = "gem"; }; - version = "1.20.1"; + version = "1.21.0"; }; parser = { dependencies = ["ast"]; @@ -2045,10 +2046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrf2whjycv4sd7qvf5m6zdpk0lhf1p63v66w9ha146fc7rcjkc1"; + sha256 = "11gczh6fggly245r774yl2phcnh33iv6xpqw7p9dggqrmcyaslq3"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; public_suffix = { groups = ["default"]; @@ -2066,10 +2067,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; + sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.0"; }; racc = { groups = ["default"]; @@ -2141,10 +2142,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0whc4d4jqm8kd4x3jzbax54sscm1k4pfkr5d1gpapjbzqkfj77yy"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -2498,10 +2499,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd93idvk2qs3accbfg7g77fb02k8qlrq1arqm4bbx2ylk9j66kf"; + sha256 = "0qx9r75bfwglzv03lwvghd9gzw66wnbhdj5pc1qg896cbzna2cc0"; type = "gem"; }; - version = "2.1.2"; + version = "2.1.3"; }; ruby2_keywords = { groups = ["default"]; @@ -2539,10 +2540,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dld1z2mdnsf9i4fs74zdr6rfk75pkgzvvyxask5w2dsmkj7bb4m"; + sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; safe_yaml = { groups = ["default"]; @@ -2624,10 +2625,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03pmhj4kc3ga75wy397l57bvd18jxxmrk3qsznjw93b993qgvj3z"; + sha256 = "0dxwkacc0scc1bqq10wc3v7wbh5j0jl5zcmw90kmfbgfjzl0drbr"; type = "gem"; }; - version = "5.47.0"; + version = "5.48.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2802,10 +2803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16x542qnzybzsi65ngd16921m88sh47l8fi21y8gbz08daq4rpab"; + sha256 = "0rb9nax4k72zbriq7k98shfcj4lf54sqjpin2xm6ma7bb48ra8mc"; type = "gem"; }; - version = "0.14.2"; + version = "0.15.0"; }; tilt = { groups = ["default"]; @@ -2876,20 +2877,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; uuid4r = { groups = ["default"]; @@ -2989,9 +2990,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1blww00r5za6vl46psaldxpllsxll78ms8rrs6qfwb1iaa8rla2d"; + sha256 = "1prdwbi9prykva3iqyk23fzgi0z7pphldybba8s76mil1fd3svif"; type = "gem"; }; - version = "1.4.11"; + version = "1.5.0"; }; }